fix: keep opened project metadata single-sourced

refactor(desktop): store local server config in electron store

fix: restore remote desktop session handling on upstream dev

Author: wangzexi

packages/app/src/app.tsx

@@ -287,7 +287,7 @@ function ConnectionError(props: { onRetry?: () => void; onServerSelected?: (key:
 function ServerKey(props: ParentProps) {
   const server = useServer()
   return (
-    <Show when={server.key} keyed>
+    <Show when={server.connectionKey} keyed>
       {props.children}
     </Show>
   )

packages/app/src/components/dialog-select-file.tsx

@@ -17,6 +17,7 @@ import { useLanguage } from "@/context/language"
 import { useSessionLayout } from "@/pages/session/session-layout"
 import { createSessionTabs } from "@/pages/session/helpers"
 import { decode64 } from "@/utils/base64"
+import { sessionListItems } from "@/utils/session-list"
 import { getRelativeTime } from "@/utils/time"
 
 type EntryType = "command" | "file" | "session"
@@ -210,7 +211,7 @@ function createSessionEntries(props: {
         return props.globalSDK.client.session
           .list({ directory, roots: true })
           .then((x) =>
-            (x.data ?? [])
+            sessionListItems(x.data)
               .filter((s) => !!s?.id)
               .map((s) => ({
                 id: s.id,

packages/app/src/components/dialog-select-server.tsx

@@ -14,7 +14,7 @@ import { createEffect, createMemo, createResource, createSignal, onCleanup, Show
 import { createStore, reconcile } from "solid-js/store"
 import { ServerHealthIndicator, ServerRow } from "@/components/server/server-row"
 import { useLanguage } from "@/context/language"
-import { type InboundServerConfig, usePlatform } from "@/context/platform"
+import { type LocalServerConfig, usePlatform } from "@/context/platform"
 import { normalizeServerUrl, ServerConnection, useServer } from "@/context/server"
 import { type ServerHealth, useCheckServerHealth } from "@/utils/server-health"
 
@@ -275,8 +275,8 @@ export function DialogSelectServer() {
   const { defaultKey, canDefault, setDefault } = useDefaultServer()
   const { previewStatus } = useServerPreview()
   const checkServerHealth = useCheckServerHealth()
-  const [inboundConfig] = createResource(() => platform.getInboundServerConfig?.())
-  const [savedInboundConfig, setSavedInboundConfig] = createSignal<InboundServerConfig>()
+  const [localServerConfig] = createResource(() => platform.getLocalServerConfig?.())
+  const [savedLocalServerConfig, setSavedLocalServerConfig] = createSignal<LocalServerConfig>()
   const [store, setStore] = createStore({
     status: {} as Record<ServerConnection.Key, ServerHealth | undefined>,
     addServer: {
@@ -432,10 +432,10 @@ export function DialogSelectServer() {
 
   const current = createMemo(() => items().find((x) => ServerConnection.key(x) === server.key) ?? items()[0])
   const canEditInbound = createMemo(
-    () => !!platform.getInboundServerConfig && !!platform.setInboundServerConfig && server.list.some((item) => item.type === "sidecar"),
+    () => !!platform.getLocalServerConfig && !!platform.setLocalServerConfig && server.list.some((item) => item.type === "sidecar"),
   )
   const localServerDetails = createMemo(() => {
-    const config = platform.inboundRuntimeServerConfig?.()
+    const config = platform.localServerRuntimeConfig?.()
     if (!config?.enabled || config.port === null) return
     return {
       name: "Local Server",
@@ -598,7 +598,7 @@ export function DialogSelectServer() {
       status: store.status[ServerConnection.key(conn)]?.healthy,
     })
   }
-  const syncInboundForm = (config: InboundServerConfig) => {
+  const syncInboundForm = (config: LocalServerConfig) => {
     setStore("inboundServer", {
       open: true,
       enabled: config.enabled,
@@ -613,7 +613,7 @@ export function DialogSelectServer() {
   const startInboundEdit = () => {
     resetAdd()
     resetEdit()
-    const config = savedInboundConfig() ?? inboundConfig.latest
+    const config = savedLocalServerConfig() ?? localServerConfig.latest
     if (config) {
       syncInboundForm(config)
       return
@@ -644,7 +644,7 @@ export function DialogSelectServer() {
     })
   }
   const saveInboundConfig = async () => {
-    if (!platform.setInboundServerConfig) return
+    if (!platform.setLocalServerConfig) return
 
     const port = parseInboundPort(store.inboundServer.port)
     if (store.inboundServer.enabled && port === null) {
@@ -664,7 +664,7 @@ export function DialogSelectServer() {
       password: store.inboundServer.password.trim(),
       port: port ?? null,
     }
-    const current = savedInboundConfig() ?? inboundConfig.latest
+    const current = savedLocalServerConfig() ?? localServerConfig.latest
     const changed =
       !current ||
       current.enabled !== next.enabled ||
@@ -679,8 +679,8 @@ export function DialogSelectServer() {
 
     setStore("inboundServer", "saving", true)
     try {
-      await platform.setInboundServerConfig(next)
-      setSavedInboundConfig(next)
+      await platform.setLocalServerConfig(next)
+      setSavedLocalServerConfig(next)
       showToast({
         variant: "success",
         icon: "circle-check",
@@ -745,7 +745,7 @@ export function DialogSelectServer() {
   })
   createEffect(() => {
     if (!store.inboundServer.open || store.inboundServer.hydrated) return
-    const config = savedInboundConfig() ?? inboundConfig()
+    const config = savedLocalServerConfig() ?? localServerConfig()
     if (!config) return
     syncInboundForm(config)
   })
@@ -791,7 +791,7 @@ export function DialogSelectServer() {
                 port={store.inboundServer.port}
                 portError={store.inboundServer.portError}
                 busy={store.inboundServer.saving}
-                loading={inboundConfig.state === "pending"}
+                loading={localServerConfig.state === "pending"}
                 onEnabledChange={setInboundEnabled}
                 onUsernameChange={(value) => setStore("inboundServer", "username", value)}
                 onPasswordChange={(value) => setStore("inboundServer", "password", value)}

packages/app/src/context/global-sync.test.ts

@@ -61,6 +61,40 @@ describe("loadRootSessionsWithFallback", () => {
       { directory: "dir", roots: true },
     ])
   })
+
+  test("normalizes v2 session list responses", async () => {
+    const result = await loadRootSessionsWithFallback({
+      directory: "dir",
+      limit: 10,
+      list: async () => ({
+        data: {
+          items: [
+            {
+              id: "ses_1",
+              slug: "ses-1",
+              projectID: "proj_1",
+              directory: "/tmp/project",
+              title: "Session",
+              version: "1",
+              time: { created: 1, updated: 1 },
+            },
+          ],
+        },
+      }),
+    })
+
+    expect(result.data).toEqual([
+      {
+        id: "ses_1",
+        slug: "ses-1",
+        projectID: "proj_1",
+        directory: "/tmp/project",
+        title: "Session",
+        version: "1",
+        time: { created: 1, updated: 1 },
+      },
+    ])
+  })
 })
 
 describe("estimateRootSessionTotal", () => {

packages/app/src/context/global-sync.tsx

@@ -32,6 +32,7 @@ import { trimSessions } from "./global-sync/session-trim"
 import type { ProjectMeta } from "./global-sync/types"
 import { SESSION_RECENT_LIMIT } from "./global-sync/types"
 import { formatServerError } from "@/utils/server-errors"
+import { sessionListItems } from "@/utils/session-list"
 import { queryOptions, useMutation, useQueries, useQuery, useQueryClient } from "@tanstack/solid-query"
 import { createRefreshQueue } from "./global-sync/queue"
 import { directoryKey } from "./global-sync/utils"
@@ -257,7 +258,7 @@ function createGlobalSync() {
             list: (query) => globalSDK.client.session.list(query),
           })
             .then((x) => {
-              const nonArchived = (x.data ?? [])
+              const nonArchived = sessionListItems(x.data)
                 .filter((s) => !!s?.id)
                 .filter((s) => !s.time?.archived)
                 .sort((a, b) => (a.id < b.id ? -1 : a.id > b.id ? 1 : 0))

packages/app/src/context/global-sync/session-load.ts

@@ -1,17 +1,18 @@
 import type { RootLoadArgs } from "./types"
+import { sessionListItems } from "@/utils/session-list"
 
 export async function loadRootSessionsWithFallback(input: RootLoadArgs) {
   try {
     const result = await input.list({ directory: input.directory, roots: true, limit: input.limit })
     return {
-      data: result.data,
+      data: sessionListItems(result.data),
       limit: input.limit,
       limited: true,
     } as const
   } catch {
     const result = await input.list({ directory: input.directory, roots: true })
     return {
-      data: result.data,
+      data: sessionListItems(result.data),
       limit: input.limit,
       limited: false,
     } as const

packages/app/src/context/global-sync/types.ts

@@ -124,7 +124,7 @@ export type DisposeCheck = {
 export type RootLoadArgs = {
   directory: string
   limit: number
-  list: (query: { directory: string; roots: true; limit?: number }) => Promise<{ data?: Session[] }>
+  list: (query: { directory: string; roots: true; limit?: number }) => Promise<{ data?: Session[] | { items?: Session[] } }>
 }
 
 export type RootLoadResult = {

packages/app/src/context/opened-projects.tsx

@@ -15,7 +15,6 @@ export type ConfigProjectEntry = {
   icon?: {
     color?: string
     override?: string
-    emoji?: string
   }
   commands?: {
     start?: string
@@ -53,7 +52,7 @@ export const { use: useOpenedProjects, provider: OpenedProjectsProvider } = crea
       })
     }
 
-    const queryKey = createMemo(() => ["opened-projects", server.key] as const)
+    const queryKey = createMemo(() => ["opened-projects", server.connectionKey] as const)
 
     const query = createQuery(() => ({
       queryKey: queryKey(),

packages/app/src/context/platform.tsx

@@ -8,7 +8,7 @@ type OpenDirectoryPickerOptions = { title?: string; multiple?: boolean }
 type OpenFilePickerOptions = { title?: string; multiple?: boolean; accept?: string[]; extensions?: string[] }
 type SaveFilePickerOptions = { title?: string; defaultPath?: string }
 type UpdateInfo = { updateAvailable: boolean; version?: string }
-export type InboundServerConfig = {
+export type LocalServerConfig = {
   enabled: boolean
   username: string
   password: string
@@ -82,17 +82,14 @@ export type Platform = {
   /** Set the preferred display backend (desktop only) */
   setDisplayBackend?(backend: DisplayBackend): Promise<void>
 
-  /** Get inbound sidecar config (desktop only) */
-  getInboundServerConfig?(): Promise<InboundServerConfig>
+  /** Get local server config (desktop only) */
+  getLocalServerConfig?(): Promise<LocalServerConfig>
 
-  /** Get the inbound config currently used by the running sidecar (desktop only) */
-  getInboundRuntimeServerConfig?(): Promise<InboundServerConfig>
+  /** The local server config currently used by the running sidecar (desktop only) */
+  localServerRuntimeConfig?: Accessor<LocalServerConfig | undefined>
 
-  /** The inbound config currently used by the running sidecar (desktop only) */
-  inboundRuntimeServerConfig?: Accessor<InboundServerConfig | undefined>
-
-  /** Set inbound sidecar config (desktop only) */
-  setInboundServerConfig?(config: InboundServerConfig): Promise<void>
+  /** Set local server config (desktop only) */
+  setLocalServerConfig?(config: LocalServerConfig): Promise<void>
 
   /** Parse markdown to HTML using native parser (desktop only, returns unprocessed code blocks) */
   parseMarkdown?(markdown: string): Promise<string>

packages/app/src/context/server.tsx

@@ -205,6 +205,11 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
     const current: Accessor<ServerConnection.Any | undefined> = createMemo(
       () => allServers().find((s) => ServerConnection.key(s) === state.active) ?? allServers()[0],
     )
+    const connectionKey = createMemo(() => {
+      const conn = current()
+      if (!conn) return state.active
+      return [ServerConnection.key(conn), conn.http.url, conn.http.username ?? "", conn.http.password ?? ""].join("\0")
+    })
 
     createEffect(() => {
       const current_ = current()
@@ -230,6 +235,9 @@ export const { use: useServer, provider: ServerProvider } = createSimpleContext(
       get key() {
         return state.active
       },
+      get connectionKey() {
+        return connectionKey()
+      },
       get name() {
         return serverName(current())
       },