diff --git a/packages/desktop/src/context/global-sync.tsx b/packages/desktop/src/context/global-sync.tsx index 4ac86b9fd..9a113578e 100644 --- a/packages/desktop/src/context/global-sync.tsx +++ b/packages/desktop/src/context/global-sync.tsx @@ -22,7 +22,7 @@ type State = { ready: boolean provider: Provider[] agent: Agent[] - project: Project + project: string config: Config path: Path session: Session[] @@ -60,11 +60,10 @@ export const { use: useGlobalSync, provider: GlobalSyncProvider } = createSimple }) const children: Record>> = {} - function child(directory: string) { if (!children[directory]) { setGlobalStore("children", directory, { - project: { id: "", worktree: "", time: { created: 0, initialized: 0, updated: 0 } }, + project: "", config: {}, path: { state: "", config: "", worktree: "", directory: "" }, ready: false, @@ -88,9 +87,29 @@ export const { use: useGlobalSync, provider: GlobalSyncProvider } = createSimple const sdk = useGlobalSDK() sdk.event.listen((e) => { const directory = e.name - const [store, setStore] = child(directory) - const event = e.details + + if (directory === "global") { + switch (event.type) { + case "project.updated": { + const result = Binary.search(globalStore.projects, event.properties.id, (s) => s.id) + if (result.found) { + setGlobalStore("projects", result.index, reconcile(event.properties)) + break + } + setGlobalStore( + "projects", + produce((draft) => { + draft.splice(result.index, 0, event.properties) + }), + ) + break + } + } + return + } + + const [store, setStore] = child(directory) switch (event.type) { case "session.updated": { const result = Binary.search(store.session, event.properties.info.id, (s) => s.id) @@ -166,7 +185,7 @@ export const { use: useGlobalSync, provider: GlobalSyncProvider } = createSimple "projects", x .data!.filter((x) => !x.worktree.includes("opencode-test") && x.vcs) - .sort((a, b) => b.time.created - a.time.created), + .sort((a, b) => a.id.localeCompare(b.id)), ), ), ]).then(() => setGlobalStore("ready", true)) diff --git a/packages/desktop/src/context/layout.tsx b/packages/desktop/src/context/layout.tsx index 58d947af4..b7d1fabb5 100644 --- a/packages/desktop/src/context/layout.tsx +++ b/packages/desktop/src/context/layout.tsx @@ -12,7 +12,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext( const globalSync = useGlobalSync() const [store, setStore] = makePersisted( createStore({ - projects: [] as { directory: string; expanded: boolean }[], + projects: [] as { worktree: string; expanded: boolean }[], sidebar: { opened: false, width: 280, @@ -26,7 +26,7 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext( }, }), { - name: "default-layout.v4", + name: "default-layout.v6", }, ) @@ -43,32 +43,43 @@ export const { use: useLayout, provider: LayoutProvider } = createSimpleContext( onMount(() => { Promise.all( - store.projects.map(({ directory }) => { - return loadProjectSessions(directory) + store.projects.map(({ worktree }) => { + return loadProjectSessions(worktree) }), ) }) + function enrich(project: { worktree: string; expanded: boolean }) { + const metadata = globalSync.data.projects.find((x) => x.worktree === project.worktree) + if (!metadata) return [] + return [ + { + ...project, + ...metadata, + }, + ] + } + return { projects: { - list: createMemo(() => store.projects), + list: createMemo(() => store.projects.flatMap(enrich)), open(directory: string) { - if (store.projects.find((x) => x.directory === directory)) return + if (store.projects.find((x) => x.worktree === directory)) return loadProjectSessions(directory) - setStore("projects", (x) => [...x, { directory, expanded: true }]) + setStore("projects", (x) => [...x, { worktree: directory, expanded: true }]) }, close(directory: string) { - setStore("projects", (x) => x.filter((x) => x.directory !== directory)) + setStore("projects", (x) => x.filter((x) => x.worktree !== directory)) }, expand(directory: string) { - setStore("projects", (x) => x.map((x) => (x.directory === directory ? { ...x, expanded: true } : x))) + setStore("projects", (x) => x.map((x) => (x.worktree === directory ? { ...x, expanded: true } : x))) }, collapse(directory: string) { - setStore("projects", (x) => x.map((x) => (x.directory === directory ? { ...x, expanded: false } : x))) + setStore("projects", (x) => x.map((x) => (x.worktree === directory ? { ...x, expanded: false } : x))) }, move(directory: string, toIndex: number) { setStore("projects", (projects) => { - const fromIndex = projects.findIndex((x) => x.directory === directory) + const fromIndex = projects.findIndex((x) => x.worktree === directory) if (fromIndex === -1 || fromIndex === toIndex) return projects const result = [...projects] const [item] = result.splice(fromIndex, 1) diff --git a/packages/desktop/src/context/session.tsx b/packages/desktop/src/context/session.tsx index 2a0391d6b..31004811b 100644 --- a/packages/desktop/src/context/session.tsx +++ b/packages/desktop/src/context/session.tsx @@ -7,7 +7,6 @@ import { TextSelection } from "./local" import { pipe, sumBy } from "remeda" import { AssistantMessage, UserMessage } from "@opencode-ai/sdk/v2" import { useParams } from "@solidjs/router" -import { base64Encode } from "@opencode-ai/util/encode" import { useSDK } from "./sdk" export type LocalPTY = { @@ -25,9 +24,7 @@ export const { use: useSession, provider: SessionProvider } = createSimpleContex const sdk = useSDK() const params = useParams() const sync = useSync() - const name = createMemo( - () => `${base64Encode(sync.data.project.worktree)}/session${params.id ? "/" + params.id : ""}.v2`, - ) + const name = createMemo(() => `${params.dir}/session${params.id ? "/" + params.id : ""}.v3`) const [store, setStore] = makePersisted( createStore<{ diff --git a/packages/desktop/src/context/sync.tsx b/packages/desktop/src/context/sync.tsx index d8d7c7b95..85986c327 100644 --- a/packages/desktop/src/context/sync.tsx +++ b/packages/desktop/src/context/sync.tsx @@ -13,7 +13,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ const [store, setStore] = globalSync.child(sdk.directory) const load = { - project: () => sdk.client.project.current().then((x) => setStore("project", x.data!)), + project: () => sdk.client.project.current().then((x) => setStore("project", x.data!.id)), provider: () => sdk.client.config.providers().then((x) => setStore("provider", x.data!.providers)), path: () => sdk.client.path.get().then((x) => setStore("path", x.data!)), agent: () => sdk.client.app.agents().then((x) => setStore("agent", x.data ?? [])), @@ -41,6 +41,11 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ get ready() { return store.ready }, + get project() { + const match = Binary.search(globalSync.data.projects, store.project, (p) => p.id) + if (match.found) return globalSync.data.projects[match.index] + return undefined + }, session: { get(sessionID: string) { const match = Binary.search(store.session, sessionID, (s) => s.id) diff --git a/packages/desktop/src/pages/home.tsx b/packages/desktop/src/pages/home.tsx index 517926613..4aac241e1 100644 --- a/packages/desktop/src/pages/home.tsx +++ b/packages/desktop/src/pages/home.tsx @@ -7,6 +7,7 @@ import { useNavigate } from "@solidjs/router" import { base64Encode } from "@opencode-ai/util/encode" import { Icon } from "@opencode-ai/ui/icon" import { usePlatform } from "@/context/platform" +import { DateTime } from "luxon" export default function Home() { const sync = useGlobalSync() @@ -47,8 +48,12 @@ export default function Home() { -
    - +
      + (b.time.updated ?? b.time.created) - (a.time.updated ?? a.time.created)) + .slice(0, 5)} + > {(project) => ( )} -
+ diff --git a/packages/desktop/src/pages/layout.tsx b/packages/desktop/src/pages/layout.tsx index 4d3f6a268..3ff3abb0e 100644 --- a/packages/desktop/src/pages/layout.tsx +++ b/packages/desktop/src/pages/layout.tsx @@ -16,7 +16,7 @@ import { DiffChanges } from "@opencode-ai/ui/diff-changes" import { getFilename } from "@opencode-ai/util/path" import { Select } from "@opencode-ai/ui/select" import { DropdownMenu } from "@opencode-ai/ui/dropdown-menu" -import { Session } from "@opencode-ai/sdk/v2/client" +import { Session, Project } from "@opencode-ai/sdk/v2/client" import { usePlatform } from "@/context/platform" import { createStore } from "solid-js/store" import { @@ -106,8 +106,8 @@ export default function Layout(props: ParentProps) { const { draggable, droppable } = event if (draggable && droppable) { const projects = layout.projects.list() - const fromIndex = projects.findIndex((p) => p.directory === draggable.id.toString()) - const toIndex = projects.findIndex((p) => p.directory === droppable.id.toString()) + const fromIndex = projects.findIndex((p) => p.worktree === draggable.id.toString()) + const toIndex = projects.findIndex((p) => p.worktree === droppable.id.toString()) if (fromIndex !== toIndex && toIndex !== -1) { layout.projects.move(draggable.id.toString(), toIndex) } @@ -140,8 +140,8 @@ export default function Layout(props: ParentProps) { return <> } - const ProjectVisual = (props: { directory: string; class?: string }): JSX.Element => { - const name = createMemo(() => getFilename(props.directory)) + const ProjectVisual = (props: { project: Project & { expanded: boolean }; class?: string }): JSX.Element => { + const name = createMemo(() => getFilename(props.project.worktree)) return ( @@ -149,11 +149,16 @@ export default function Layout(props: ParentProps) { as={"div"} variant="ghost" data-active - class="flex items-center justify-between gap-3 w-full px-1 self-stretch h-8 border-none" + class="flex items-center justify-between gap-3 w-full px-1 self-stretch h-8 border-none rounded-lg" >
- +
{name()}
@@ -163,12 +168,17 @@ export default function Layout(props: ParentProps) { @@ -176,11 +186,11 @@ export default function Layout(props: ParentProps) { ) } - const SortableProject = (props: { project: { directory: string; expanded: boolean } }): JSX.Element => { - const sortable = createSortable(props.project.directory) - const [projectStore] = globalSync.child(props.project.directory) - const slug = createMemo(() => base64Encode(props.project.directory)) - const name = createMemo(() => getFilename(props.project.directory)) + const SortableProject = (props: { project: Project & { expanded: boolean } }): JSX.Element => { + const sortable = createSortable(props.project.worktree) + const [projectStore] = globalSync.child(props.project.worktree) + const slug = createMemo(() => base64Encode(props.project.worktree)) + const name = createMemo(() => getFilename(props.project.worktree)) return ( // @ts-ignore
@@ -190,13 +200,14 @@ export default function Layout(props: ParentProps) {