cleanup

Author: Brendonovich

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

@@ -33,7 +33,7 @@ export const DialogSelectMcp: Component = () => {
       if (sync.data.mcp[name]?.status === "connected") await sdk.client.mcp.disconnect({ name })
       else await sdk.client.mcp.connect({ name })
     },
-    onSuccess: () => queryClient.refetchQueries({ queryKey: queryOptions.mcp(sync.directory).queryKey }),
+    onSuccess: () => queryClient.refetchQueries(queryOptions.mcp(sync.directory)),
   }))
 
   const enabledCount = createMemo(() => items().filter((i) => i.status === "connected").length)

packages/app/src/components/status-popover-body.tsx

@@ -146,7 +146,7 @@ const useMcpToggleMutation = () => {
       const status = sync.data.mcp[name]
       await (status?.status === "connected" ? sdk.client.mcp.disconnect({ name }) : sdk.client.mcp.connect({ name }))
     },
-    onSuccess: () => queryClient.refetchQueries({ queryKey: queryOptions.mcp(sync.directory).queryKey }),
+    onSuccess: () => queryClient.refetchQueries(queryOptions.mcp(sync.directory)),
     onError: (err) => {
       showToast({
         variant: "error",

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

@@ -62,6 +62,21 @@ export const loadLspQuery = (directory: string, sdk: OpencodeClient) =>
     queryFn: () => sdk.lsp.status().then((r) => r.data ?? []),
   })
 
+function makeQueryOptionsApi(globalSDK: () => OpencodeClient, sdkFor: (dir: string) => OpencodeClient) {
+  return {
+    globalConfig: () => loadGlobalConfigQuery(globalSDK()),
+    projects: () => loadProjectsQuery(globalSDK()),
+    providers: (directory: string | null) =>
+      loadProvidersQuery(directory, directory === null ? globalSDK() : sdkFor(directory)),
+    path: (directory: string | null) => loadPathQuery(directory, directory === null ? globalSDK() : sdkFor(directory)),
+    agents: (directory: string) => loadAgentsQuery(directory, sdkFor(directory)),
+    mcp: (directory: string) => loadMcpQuery(directory, sdkFor(directory)),
+    lsp: (directory: string) => loadLspQuery(directory, sdkFor(directory)),
+    sessions: (directory: string) => ({ queryKey: [directory, "loadSessions"] as const }),
+  }
+}
+export type QueryOptionsApi = ReturnType<typeof makeQueryOptionsApi>
+
 function createGlobalSync() {
   const globalSDK = useGlobalSDK()
   const language = useLanguage()
@@ -85,18 +100,7 @@ function createGlobalSync() {
     return sdk
   }
 
-  const queryOptionsApi = {
-    globalConfig: () => loadGlobalConfigQuery(globalSDK.client),
-    projects: () => loadProjectsQuery(globalSDK.client),
-    providers: (directory: string | null) =>
-      loadProvidersQuery(directory, directory === null ? globalSDK.client : sdkFor(directory)),
-    path: (directory: string | null) =>
-      loadPathQuery(directory, directory === null ? globalSDK.client : sdkFor(directory)),
-    agents: (directory: string) => loadAgentsQuery(directory, sdkFor(directory)),
-    mcp: (directory: string) => loadMcpQuery(directory, sdkFor(directory)),
-    lsp: (directory: string) => loadLspQuery(directory, sdkFor(directory)),
-    sessions: (directory: string) => ({ queryKey: [directory, "loadSessions"] as const }),
-  }
+  const queryOptionsApi = makeQueryOptionsApi(() => globalSDK.client, sdkFor)
 
   const [configQuery, providerQuery, pathQuery] = useQueries(() => ({
     queries: [queryOptionsApi.globalConfig(), queryOptionsApi.providers(null), queryOptionsApi.path(null)],

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

@@ -22,12 +22,7 @@ describe("createChildStoreManager", () => {
       onBootstrap() {},
       onDispose() {},
       translate: (key) => key,
-      queryOptions: {
-        lsp: () => null!,
-        mcp: () => null!,
-        path: () => null!,
-        providers: () => null!,
-      },
+      queryOptions: {} as any,
       global: { provider: null! },
     })
 

packages/app/src/context/global-sync/child-store.ts

@@ -15,8 +15,7 @@ import {
 } from "./types"
 import { canDisposeDirectory, pickDirectoriesToEvict } from "./eviction"
 import { useQueries } from "@tanstack/solid-query"
-import { loadPathQuery, loadProvidersQuery } from "./bootstrap"
-import { loadLspQuery, loadMcpQuery } from "../global-sync"
+import { QueryOptionsApi } from "../global-sync"
 import { directoryKey, type DirectoryKey } from "./utils"
 
 export function createChildStoreManager(input: {
@@ -26,12 +25,7 @@ export function createChildStoreManager(input: {
   onBootstrap: (directory: string) => void
   onDispose: (directory: string) => void
   translate: (key: string, vars?: Record<string, string | number>) => string
-  queryOptions: {
-    lsp: (directory: string) => ReturnType<typeof loadLspQuery>
-    mcp: (directory: string) => ReturnType<typeof loadMcpQuery>
-    path: (directory: string) => ReturnType<typeof loadPathQuery>
-    providers: (directory: string) => ReturnType<typeof loadProvidersQuery>
-  }
+  queryOptions: QueryOptionsApi
   global: {
     provider: ProviderListResponse
   }

packages/app/src/pages/layout/sidebar-workspace.tsx

@@ -321,7 +321,7 @@ export const SortableWorkspace = (props: {
   const boot = createMemo(() => open() || active())
   const count = createMemo(() => sessions()?.length ?? 0)
   const hasMore = createMemo(() => workspaceStore.sessionTotal > count())
-  const fetching = useIsFetching(() => ({ queryKey: queryOptions.sessions(props.directory).queryKey }))
+  const fetching = useIsFetching(() => queryOptions.sessions(props.directory))
   const busy = createMemo(() => props.ctx.isBusy(props.directory))
   const loading = () => fetching() > 0 && count() === 0
   const touch = createMediaQuery("(hover: none)")
@@ -456,7 +456,7 @@ export const LocalWorkspace = (props: {
   const slug = createMemo(() => base64Encode(props.project.worktree))
   const sessions = createMemo(() => sortedRootSessions(workspace().store, props.sortNow()))
   const count = createMemo(() => sessions()?.length ?? 0)
-  const fetching = useIsFetching(() => ({ queryKey: queryOptions.sessions(props.project.worktree).queryKey }))
+  const fetching = useIsFetching(() => queryOptions.sessions(props.project.worktree))
   const hasMore = createMemo(() => workspace().store.sessionTotal > count())
   const loading = () => fetching() > 0 && count() === 0
   const loadMore = async () => {