@neuralis/brain-core 0.2.0 → 0.3.0

package/app/filesystem/store/gitSlice.ts

@@ -5,7 +5,7 @@ import { sourceFromUri } from './helpers';
 /**
  * gitSlice (G2.1 / spellbound-heron) — client state for the read-only "Git
  * Control" sidebar panel. Mirrors `searchSlice`'s shape: a plain slice combined
- * into the single `useFilesystemStore`, with async actions calling the `../api`
+ * into each window's Files store (`createFilesystemStore`), with async actions calling the `../api`
  * git fetchers.
  *
  * The FOCUSED repo is NOT a git-slice field — it is the PAIR
@@ -18,9 +18,6 @@ import { sourceFromUri } from './helpers';
  * branch repo-correct for free. Write actions pass both explicitly.
  */
 
-let gitStatusSeq = 0;
-let gitBranchSeq = 0;
-
 export interface GitSliceState {
   gitStatus: GitControlStatus | null;
   /**
@@ -144,6 +141,9 @@ export function createGitSlice(
   set: (fn: (s: any) => any) => void,
   get: () => any,
 ): GitSliceActions {
+  // The newest status / branch request of THIS store — an older answer is dropped.
+  let gitStatusSeq = 0;
+  let gitBranchSeq = 0;
   return {
     setGitViewMode: (mode) => set(() => ({ gitViewMode: mode })),
 
@@ -196,7 +196,7 @@ export function createGitSlice(
           ...(projectId ? { projectId } : {}),
           source: slug,
           ...(repoRel ? { repo: repoRel } : {}),
-        });
+        }, get().client);
         if (mySeq !== gitStatusSeq) return;
         // `totals` rides the SAME response as the rows it sums (the server
         // computes it after its read filter and cap), so the header can never
@@ -232,7 +232,7 @@ export function createGitSlice(
           ...(projectId ? { projectId } : {}),
           source: slug,
           ...(repoRel ? { repo: repoRel } : {}),
-        });
+        }, get().client);
         if (mySeq !== gitBranchSeq) return;
         set(() => ({ gitBranches: Array.isArray(res?.branches) ? res.branches : [] }));
       } catch (error) {

package/app/filesystem/store/listSlice.ts

@@ -8,8 +8,6 @@ import {
   sourceFromUri,
 } from './helpers';
 
-const listInFlight = new Map<string, Promise<void>>();
-
 export interface ListSliceActions {
   /**
    * Load the SOURCE SUMMARIES — the registry rows the tree headers and the Sources
@@ -50,9 +48,10 @@ export interface ListSliceActions {
  * context's slice — THESE keys — there and restores it from there; a context
  * reset must never wipe it, that is the whole point of it),
  * or the named-exception list — so a new key has to be filed somewhere:
- *  - preferences, deliberately kept: `activeAgentId`/`activeProjectId` (the callers
- *    own them), `sidebarOpen`, `sidebarWidth`, `gitViewMode`, `searchMode`,
- *    `previewEditorsEnabled`, `diffViewMode`;
+ *  - preferences and window identity, deliberately kept: `activeAgentId`/
+ *    `activeProjectId` (the callers own them), `windowId` + `client` (the window
+ *    the store was created for), `sidebarOpen`, `sidebarWidth`, `gitViewMode`,
+ *    `searchMode`, `previewEditorsEnabled`, `diffViewMode`;
  *  - NOT reset, deliberately: `uploading` alone — it self-heals through the
  *    upload's `finally`, and an upload in flight across a switch must still
  *    release it.
@@ -77,6 +76,7 @@ export function contextResetPatch(): Record<string, unknown> {
     pendingReviewPaths: new Set<string>(),
     // The Changes badge count is the context's own server answer.
     pendingCount: 0,
+    pendingCountState: 'stale',
     // Nothing is pre-expanded — under lazy hydration an expanded entry is a
     // FETCH, and every source branch (including `brain://`) starts collapsed.
     expandedFolders: new Set<string>(),
@@ -230,6 +230,9 @@ export function createListSlice(
   set: (fn: (s: any) => any) => void,
   get: () => any,
 ): ListSliceActions {
+  // The root-listing dedup belongs to ONE store (one Files window): two windows
+  // listing the same agent must each get their own answer into their own store.
+  const listInFlight = new Map<string, Promise<void>>();
   return {
     async loadList({ agentId, projectId, userId, withCounts }) {
       if (!agentId) return;
@@ -312,7 +315,7 @@ export function createListSlice(
             sources_only: true,
             recursive: false,
             ...(withCounts ? { include_counts: true } : {}),
-          });
+          }, get().client);
         } catch {
           set(() => ({ snapshotError: 'Filesystem service unavailable', sourcesLoading: false }));
           return;

package/app/filesystem/store/searchSlice.ts

@@ -1,8 +1,6 @@
 import { searchFiles } from '../api';
 import { sourceRootUri } from './helpers';
 
-let searchSeq = 0;
-
 export type SearchSliceHit = {
   id: string;
   uri: string;
@@ -95,6 +93,8 @@ export function createSearchSlice(
   set: (fn: (s: any) => any) => void,
   get: () => any,
 ): SearchSliceActions {
+  // The newest search of THIS store — an older answer never overwrites a newer one.
+  let searchSeq = 0;
   return {
     setSearchQuery: (query) => set(() => ({ searchQuery: query })),
     setSearchMode: (mode) => set(() => ({ searchMode: mode })),
@@ -167,7 +167,7 @@ export function createSearchSlice(
           ...(searchMode !== 'grep' && filters.createdAfter.trim() ? { created_after: filters.createdAfter.trim() } : {}),
           ...(searchMode !== 'grep' && filters.createdBefore.trim() ? { created_before: filters.createdBefore.trim() } : {}),
           limit: searchMode === 'semantic' ? 30 : 50,
-        });
+        }, get().client);
         if (mySeq !== searchSeq) return;
         const rows = res.results || [];
         // Backend error rows (grep guidance, index-unavailable) carry `error`

package/app/filesystem/ui/FileEditor.tsx

@@ -6,7 +6,7 @@ import { RefreshCw, FileCode, Pencil, Trash2, Loader2, Upload, Check, X, GitComp
 import { cn } from '../lib/cn';
 import { useFilesystemHost } from '../FilesystemHost';
 import { buildAgentIndex } from '../lib/agentUtils';
-import { useContainerWidth } from '../hooks/useContainerWidth';
+import { useContainerWidth } from '@neuralis/package-system/client';
 import { detectCodeLanguage } from '../lib/detectLanguage';
 import { parseGitLineStatus, isEmptyGitLineStatus, type GitLineStatusMap } from './codeEditor/gitLineStatus';
 import { EditorTabBar, EditorTabsMenu, TAB_SCROLLER_ATTR } from './EditorTabBar';
@@ -21,6 +21,10 @@ import { getRawFileUrl, approveFileReview, writeFile, writeRefusalMessage, getGi
 import { InlineUploader } from './InlineUploader';
 import { SourcesPanel } from './SourcesPanel';
 import { PackagesPanel } from './PackagesPanel';
+import { PendingReviewDialog, type ReviewRequest, type ReviewAction } from './PendingReviewDialog';
+import { useVisibleDiffCards } from '../hooks/useVisibleDiffCards';
+import { normalizePolicyUri } from '@neuralis/package-system/policies';
+import { listPendingChanges } from '../api';
 import { PendingChangesPanel } from './PendingChangesPanel';
 import { getDeltaTone } from '../lib/treeVisualState';
 import { fileKeyFromNode, folderUri, hasCompletedRead, sourceFromUri, extractFilename, sourceRootUri } from '../store/helpers';
@@ -45,6 +49,7 @@ function normalizeUserUriInput(raw: string, fallbackUri: string): string {
 }
 
 export function FileEditor() {
+  const client = useFilesystemStore((s) => s.client);
   const openFiles = useFilesystemStore((s) => s.openFiles);
   const activeFile = useFilesystemStore((s) => s.activeFile);
   const files = useFilesystemStore((s) => s.files);
@@ -98,6 +103,7 @@ export function FileEditor() {
   const [reverting, setReverting] = useState(false);
   const [showDiff, setShowDiff] = useState(true);
   const [metaExpanded, setMetaExpanded] = useState(false);
+  const refreshPendingCount = useFilesystemStore((s) => s.refreshPendingCount);
   const filePrevByPath = useFilesystemStore((s) => s.filePrevByPath);
   const activePrev = activeFile ? filePrevByPath[activeFile] : undefined;
   const hasPendingChanges = !!activePrev && activeNode?.status === 'pending_review';
@@ -137,6 +143,31 @@ export function FileEditor() {
     !showUploadTab && !showSourcesTab && !showPackagesTab && !showPendingTab && !showGitDiff && !showGitCommit;
   const rawAgentId = activeNode?.sourceAgentId ?? agentId ?? undefined;
   const targetAgentId = activeNode?.sourceAgentId ?? agentId ?? null;
+  const reviewQueue = useVisibleDiffCards(null);
+  const [pendingReview, setPendingReview] = useState<ReviewRequest | null>(null);
+  const [pendingReviewError, setPendingReviewError] = useState<string | null>(null);
+  const reviewEpoch = useRef(0);
+  const pendingReviewEpoch = useRef(0);
+  useEffect(() => {
+    reviewEpoch.current++; setPendingReview(null); setPendingReviewError(null);
+    return () => { reviewEpoch.current++; };
+  }, [client, targetAgentId, projectId, activeUri, activeFile]);
+  const openPendingReview = useCallback(async (action: ReviewAction) => {
+    if (!targetAgentId || !activeUri) return;
+    const epoch = reviewEpoch.current;
+    setPendingReviewError(null);
+    try {
+      const page = await listPendingChanges({ agentId: targetAgentId, ...(projectId ? { projectId } : {}), uri: activeUri }, client);
+      if (epoch !== reviewEpoch.current) return;
+      const records = page.changes.filter(rec => normalizePolicyUri(rec.uri) === normalizePolicyUri(activeUri));
+      if (page.partial || page.complete === false || page.restartRequired || records.length !== 1) {
+        setPendingReviewError('The pending change is unavailable or ambiguous. Refresh and try again.'); return;
+      }
+      pendingReviewEpoch.current = epoch;
+      setPendingReview({ kind: 'single', rec: records[0]!, action });
+    } catch (error) { if (epoch === reviewEpoch.current) setPendingReviewError(error instanceof Error ? error.message : 'Could not load the pending change.'); }
+  }, [client, targetAgentId, projectId, activeUri]);
+
   const rawUrl = useMemo(() => {
     if (!activeNode?.uri || !rawAgentId) return null;
     return getRawFileUrl(rawAgentId, activeNode.uri, projectId ?? undefined);
@@ -169,7 +200,7 @@ export function FileEditor() {
     }
     void (async () => {
       try {
-        const res = await getGitDiff({ agentId: targetAgentId, ...(projectId ? { projectId } : {}), source, path, staged: false });
+        const res = await getGitDiff({ agentId: targetAgentId, ...(projectId ? { projectId } : {}), source, path, staged: false }, client);
         if (cancelled) return;
         if (res && (res as { ok?: boolean }).ok === false) {
           setGitLineStatus(undefined);
@@ -243,7 +274,7 @@ export function FileEditor() {
         id: activeNode.id,
         uri: activeNode.uri,
         fields: { status: 'active' },
-      });
+      }, client);
       if (res && res.ok === false) {
         setEditError(writeRefusalMessage(res, 'Restore failed'));
         return;
@@ -266,7 +297,7 @@ export function FileEditor() {
   const handleApprove = useCallback(async () => {
     if (!targetAgentId || !activeNode || approving) return;
     if (activeNode.status === 'pending_review') {
-      setWorkspacePanelOpen('pending', true); setActiveWorkspaceTab('pending'); return;
+      await openPendingReview('approve'); return;
     }
     setApproving(true);
     try {
@@ -275,7 +306,7 @@ export function FileEditor() {
         ...(projectId ? { projectId } : {}),
         id: activeNode.id,
         uri: activeNode.uri,
-      });
+      }, client);
       if (res && res.ok) {
         const nodeKey = activeNode.storeKey || activeFile || fileKeyFromNode(activeNode);
         if (nodeKey) {
@@ -295,12 +326,12 @@ export function FileEditor() {
     } finally {
       setApproving(false);
     }
-  }, [targetAgentId, activeNode, approving, projectId, openFile, resolvedAgent?.id, activeFile, patchFileNode, clearFilePrev]);
+  }, [openPendingReview, client, targetAgentId, activeNode, approving, projectId, openFile, resolvedAgent?.id, activeFile, patchFileNode, clearFilePrev]);
 
   const handleRevert = useCallback(async () => {
     if (!targetAgentId || !activeNode || reverting) return;
     if (activeNode.status === 'pending_review') {
-      setWorkspacePanelOpen('pending', true); setActiveWorkspaceTab('pending'); return;
+      await openPendingReview('revert'); return;
     }
     setReverting(true);
     try {
@@ -310,7 +341,7 @@ export function FileEditor() {
         id: activeNode.id,
         uri: activeNode.uri,
         revert: true,
-      });
+      }, client);
       if (res && res.ok === false) {
         setEditError(writeRefusalMessage(res, 'Revert failed'));
         return;
@@ -334,7 +365,7 @@ export function FileEditor() {
     } finally {
       setReverting(false);
     }
-  }, [targetAgentId, activeNode, reverting, projectId, openFile, resolvedAgent?.id, activeFile, activePrev, patchFileNode, clearFilePrev]);
+  }, [openPendingReview, client, targetAgentId, activeNode, reverting, projectId, openFile, resolvedAgent?.id, activeFile, activePrev, patchFileNode, clearFilePrev]);
 
   useEffect(() => {
     if (!activeNode) {
@@ -419,6 +450,14 @@ export function FileEditor() {
 
   return (
     <div className="h-full w-full flex flex-col min-w-0 min-h-0">
+      {pendingReviewError ? <div role="alert" className="px-3 py-2 text-xs text-red-300">{pendingReviewError}</div> : null}
+      {pendingReview && targetAgentId ? <PendingReviewDialog request={pendingReview} agentId={targetAgentId} projectId={projectId}
+        run={reviewQueue.run} onClose={() => setPendingReview(null)} onDone={done => {
+          if (pendingReviewEpoch.current !== reviewEpoch.current || !done.some(result => result.outcome === 'ok')) return;
+          setPendingReview(null);
+          void refreshPendingCount({ agentId: targetAgentId, projectId });
+          void openFile({ agentId: targetAgentId, projectId: projectId ?? null, uri: activeUri, force: true });
+        }} /> : null}
       {openFiles.length > 0 || workspacePanels.upload || (supportsSources && workspacePanels.sources) || workspacePanels.packages || workspacePanels.pending || gitDiffTarget || gitCommitTarget ? (
         <div
           className="flex shrink-0 items-stretch"
@@ -434,98 +473,107 @@ export function FileEditor() {
           <div {...{ [TAB_SCROLLER_ATTR]: '' }} className="flex min-w-0 flex-1 overflow-x-auto overflow-y-hidden">
           <EditorTabBar />
           {workspacePanels.upload ? (
+            <div className="group flex shrink-0 items-center">
             <button
               type="button"
               className={cn(
-                'group flex items-center gap-1.5 px-3 py-2 text-xs min-w-[120px] max-w-[240px] rounded-lg',
+                'flex items-center gap-1.5 px-3 py-2 text-xs min-w-[120px] max-w-[240px] rounded-lg',
                 showUploadTab ? 'bg-white/10 text-white' : 'text-white/50 hover:bg-white/5 hover:text-white/80',
               )}
               onClick={() => setActiveWorkspaceTab('upload')}
             >
               <Upload className="w-3.5 h-3.5 shrink-0" />
               <span className="truncate flex-1">Upload</span>
-              <span
-                className="opacity-0 group-hover:opacity-100 p-0.5 rounded hover:bg-white/10"
+            </button>
+              <button type="button" aria-label="Close Upload"
+                className="opacity-0 group-hover:opacity-100 focus-visible:opacity-100 p-0.5 rounded hover:bg-white/10"
                 onClick={(e) => {
                   e.stopPropagation();
                   setWorkspacePanelOpen('upload', false);
                 }}
               >
                 <X className="w-3 h-3" />
-              </span>
-            </button>
+              </button>
+            </div>
           ) : null}
           {supportsSources && workspacePanels.sources ? (
+            <div className="group flex shrink-0 items-center">
             <button
               type="button"
               className={cn(
-                'group flex items-center gap-1.5 px-3 py-2 text-xs min-w-[120px] max-w-[240px] rounded-lg',
+                'flex items-center gap-1.5 px-3 py-2 text-xs min-w-[120px] max-w-[240px] rounded-lg',
                 showSourcesTab ? 'bg-white/10 text-white' : 'text-white/50 hover:bg-white/5 hover:text-white/80',
               )}
               onClick={() => setActiveWorkspaceTab('sources')}
             >
               <SlidersHorizontal className="w-3.5 h-3.5 shrink-0" />
               <span className="truncate flex-1">Sources</span>
-              <span
-                className="opacity-0 group-hover:opacity-100 p-0.5 rounded hover:bg-white/10"
+            </button>
+              <button type="button" aria-label="Close Sources"
+                className="opacity-0 group-hover:opacity-100 focus-visible:opacity-100 p-0.5 rounded hover:bg-white/10"
                 onClick={(e) => {
                   e.stopPropagation();
                   setWorkspacePanelOpen('sources', false);
                 }}
               >
                 <X className="w-3 h-3" />
-              </span>
-            </button>
+              </button>
+            </div>
           ) : null}
           {workspacePanels.packages ? (
+            <div className="group flex shrink-0 items-center">
             <button
               type="button"
               className={cn(
-                'group flex items-center gap-1.5 px-3 py-2 text-xs min-w-[120px] max-w-[240px] rounded-lg',
+                'flex items-center gap-1.5 px-3 py-2 text-xs min-w-[120px] max-w-[240px] rounded-lg',
                 showPackagesTab ? 'bg-white/10 text-white' : 'text-white/50 hover:bg-white/5 hover:text-white/80',
               )}
               onClick={() => setActiveWorkspaceTab('packages')}
             >
               <Package className="w-3.5 h-3.5 shrink-0" />
               <span className="truncate flex-1">Packages</span>
-              <span
-                className="opacity-0 group-hover:opacity-100 p-0.5 rounded hover:bg-white/10"
+            </button>
+              <button type="button" aria-label="Close Packages"
+                className="opacity-0 group-hover:opacity-100 focus-visible:opacity-100 p-0.5 rounded hover:bg-white/10"
                 onClick={(e) => {
                   e.stopPropagation();
                   setWorkspacePanelOpen('packages', false);
                 }}
               >
                 <X className="w-3 h-3" />
-              </span>
-            </button>
+              </button>
+            </div>
           ) : null}
           {workspacePanels.pending ? (
+            <div className="group flex shrink-0 items-center">
             <button
               type="button"
               className={cn(
-                'group flex items-center gap-1.5 px-3 py-2 text-xs min-w-[120px] max-w-[240px] rounded-lg',
+                'flex items-center gap-1.5 px-3 py-2 text-xs min-w-[120px] max-w-[240px] rounded-lg',
                 showPendingTab ? 'bg-white/10 text-white' : 'text-white/50 hover:bg-white/5 hover:text-white/80',
               )}
               onClick={() => setActiveWorkspaceTab('pending')}
             >
               <FileDiff className="w-3.5 h-3.5 shrink-0" />
               <span className="truncate flex-1">Changes</span>
-              <span
-                className="opacity-0 group-hover:opacity-100 p-0.5 rounded hover:bg-white/10"
+            </button>
+              <button type="button" aria-label="Close Changes"
+                className="opacity-0 group-hover:opacity-100 focus-visible:opacity-100 p-0.5 rounded hover:bg-white/10"
                 onClick={(e) => {
                   e.stopPropagation();
                   setWorkspacePanelOpen('pending', false);
                 }}
               >
                 <X className="w-3 h-3" />
-              </span>
-            </button>
+              </button>
+            </div>
           ) : null}
           {gitDiffTarget ? (
+            <div className="group flex shrink-0 items-center">
             <button
               type="button"
               className={cn(
-                'group flex items-center gap-1.5 px-3 py-2 text-xs min-w-[120px] max-w-[240px] rounded-lg',
+                'flex items-center gap-1.5 px-3 py-2 text-xs min-w-[120px] max-w-[240px] rounded-lg',
                 showGitDiff ? 'bg-white/10 text-white' : 'text-white/50 hover:bg-white/5 hover:text-white/80',
               )}
               onClick={() => setActiveWorkspaceTab('git-diff')}
@@ -537,8 +585,9 @@ export function FileEditor() {
               <span className="truncate flex-1">
                 {repoQualifiedLabel(gitDiffTarget.repo, extractFilename(gitDiffTarget.path) || gitDiffTarget.path)}
               </span>
-              <span
-                className="opacity-0 group-hover:opacity-100 p-0.5 rounded hover:bg-white/10"
+            </button>
+              <button type="button" aria-label="Close Git diff"
+                className="opacity-0 group-hover:opacity-100 focus-visible:opacity-100 p-0.5 rounded hover:bg-white/10"
                 onClick={(e) => {
                   e.stopPropagation();
                   setGitDiffTarget(null);
@@ -546,14 +595,15 @@ export function FileEditor() {
                 }}
               >
                 <X className="w-3 h-3" />
-              </span>
-            </button>
+              </button>
+            </div>
           ) : null}
           {gitCommitTarget ? (
+            <div className="group flex shrink-0 items-center">
             <button
               type="button"
               className={cn(
-                'group flex items-center gap-1.5 px-3 py-2 text-xs min-w-[120px] max-w-[240px] rounded-lg',
+                'flex items-center gap-1.5 px-3 py-2 text-xs min-w-[120px] max-w-[240px] rounded-lg',
                 showGitCommit ? 'bg-white/10 text-white' : 'text-white/50 hover:bg-white/5 hover:text-white/80',
               )}
               onClick={() => setActiveWorkspaceTab('git-commit')}
@@ -575,8 +625,9 @@ export function FileEditor() {
                   ? repoQualifiedLabel(gitCommitTarget.repo, `${shortSha(gitCommitTarget.sha)} ${gitCommitTarget.subject}`)
                   : repoQualifiedLabel(gitCommitTarget.repo, 'Outgoing changes')}
               </span>
-              <span
-                className="opacity-0 group-hover:opacity-100 p-0.5 rounded hover:bg-white/10"
+            </button>
+              <button type="button" aria-label="Close Git commit"
+                className="opacity-0 group-hover:opacity-100 focus-visible:opacity-100 p-0.5 rounded hover:bg-white/10"
                 onClick={(e) => {
                   e.stopPropagation();
                   // The 'file' fallback for an ACTIVE git-commit tab lives in
@@ -585,8 +636,8 @@ export function FileEditor() {
                 }}
               >
                 <X className="w-3 h-3" />
-              </span>
-            </button>
+              </button>
+            </div>
           ) : null}
           </div>
           <EditorTabsMenu />

package/app/filesystem/ui/FileTree.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { useFilesystemStore, type SidebarView } from '../store/filesystemStore';
+import { useFilesystemStore, useFilesystemStoreApi, type SidebarView } from '../store/filesystemStore';
 import React, { useMemo, useState, useCallback, useRef, useEffect } from 'react';
 import { SkillLauncher } from '@neuralis/package-system/client';
 import { meetsRequires } from '@neuralis/package-system/access';
@@ -197,6 +197,7 @@ export function flattenSource(
 export function FileTree(props: { agentId: string; sidebarView?: SidebarView }) {
   const { agentId, sidebarView = 'tree' } = props;
   const host = useFilesystemHost();
+  const storeApi = useFilesystemStoreApi();
 
   const files = useFilesystemStore((s) => s.files);
   const folderBadges = useFilesystemStore((s) => s.folderBadges);
@@ -527,12 +528,12 @@ export function FileTree(props: { agentId: string; sidebarView?: SidebarView })
         // Expand + load the parent so the inline input row is visible in place.
         if (!parentUri.endsWith('://') && !expanded.has(parentUri)) {
           toggleFolder(parentUri);
-          void useFilesystemStore.getState().ensureFolderLoaded({ agentId, projectId, uri: parentUri });
+          void storeApi.getState().ensureFolderLoaded({ agentId, projectId, uri: parentUri });
         }
         setCreating({ parentUri, kind });
       }
     },
-    [contextMenu, menuTargets, expanded, toggleFolder, agentId, projectId, clipboard, pasteNodes],
+    [contextMenu, menuTargets, expanded, toggleFolder, agentId, projectId, clipboard, pasteNodes, storeApi],
   );
 
   const handleCreateCommit = useCallback(
@@ -607,12 +608,12 @@ export function FileTree(props: { agentId: string; sidebarView?: SidebarView })
     setActiveFolderPath(params.key);
     toggleFolder(params.key);
     if (wasExpanded) return;
-    await useFilesystemStore.getState().ensureFolderLoaded({
+    await storeApi.getState().ensureFolderLoaded({
       agentId,
       projectId,
       uri: params.key,
     });
-  }, [agentId, expanded, projectId, setActiveFolderPath, toggleFolder]);
+  }, [agentId, expanded, projectId, setActiveFolderPath, toggleFolder, storeApi]);
 
   const handleOpenFile = useCallback((params: { agentId: string; projectId: string | null; uri: string; readAgentId?: string }) => {
     if (params.uri) {
@@ -644,7 +645,7 @@ export function FileTree(props: { agentId: string; sidebarView?: SidebarView })
    */
   const handleRefreshSource = useCallback(async (uriRoot: string) => {
     if (!agentId) return;
-    const store = useFilesystemStore.getState();
+    const store = storeApi.getState();
     setSourceBranchExpanded((prev) => (prev[uriRoot] ? prev : { ...prev, [uriRoot]: true }));
     if (store.loadedFolders?.[uriRoot]) {
       const source = sourceFromUri(uriRoot);
@@ -652,7 +653,7 @@ export function FileTree(props: { agentId: string; sidebarView?: SidebarView })
       return;
     }
     await store.ensureFolderLoaded({ agentId, projectId, uri: uriRoot, force: true });
-  }, [agentId, projectId]);
+  }, [agentId, projectId, storeApi]);
 
   // Hydrate what is VISIBLE and not yet fetched.
   //
@@ -664,7 +665,7 @@ export function FileTree(props: { agentId: string; sidebarView?: SidebarView })
   // rather than retry-looping. `ensureFolderLoaded` is itself idempotent.
   useEffect(() => {
     if (!agentId) return;
-    const state = useFilesystemStore.getState();
+    const state = storeApi.getState();
     const wanted: string[] = [];
     for (const info of sourceInfos) {
       if (sourceBranchExpanded[info.uri_root]) wanted.push(info.uri_root);
@@ -676,7 +677,7 @@ export function FileTree(props: { agentId: string; sidebarView?: SidebarView })
       if (hydration && hydration !== 'idle') continue;
       void state.ensureFolderLoaded({ agentId, projectId, uri });
     }
-  }, [agentId, projectId, sourceInfos, sourceBranchExpanded, expanded]);
+  }, [agentId, projectId, sourceInfos, sourceBranchExpanded, expanded, storeApi]);
 
   const handleMoveFileToFolder = useCallback(
     async ({ fromUri, id, toFolderUri }: { fromUri: string; id?: string; toFolderUri: string }) => {

package/app/filesystem/ui/GitCommitChangesView.tsx

@@ -16,6 +16,7 @@ import type { GitCommitFileChange, GitCommitTarget } from '../domain/types';
 import { useVisibleDiffCards, type VisibleDiffQueue } from '../hooks/useVisibleDiffCards';
 import { GitFileDiff } from './GitFileDiff';
 import { shortSha, type GitFileDiffMode } from './gitFileDiffMode';
+import { useFilesystemStore } from '../store/filesystemStore';
 
 /**
  * GitCommitChangesView (G2.4/C2+C3 / cobalt-wren) — the multi-file stacked
@@ -182,6 +183,7 @@ export function GitCommitChangesView({
   agentId: string | null;
   projectId: string | null;
 }): React.ReactElement {
+  const client = useFilesystemStore((s) => s.client);
   const [scrollRoot, setScrollRoot] = useState<HTMLDivElement | null>(null);
   const queue = useVisibleDiffCards(scrollRoot);
   const [state, setState] = useState<ListState>({ phase: 'loading' });
@@ -211,7 +213,7 @@ export function GitCommitChangesView({
             source,
             ...(repo ? { repo } : {}),
             sha: target.sha,
-          });
+          }, client);
           if (cancelled) return;
           if (res.ok === false) {
             setState({ phase: 'unavailable' });
@@ -228,7 +230,7 @@ export function GitCommitChangesView({
               ...(repo ? { repo } : {}),
               maxCount: 1,
               ref: target.sha,
-            });
+            }, client);
             const head = Array.isArray(log?.commits) ? log.commits[0] : undefined;
             if (!cancelled && head) setMeta({ author: head.author, date: head.date });
           } catch {
@@ -240,7 +242,7 @@ export function GitCommitChangesView({
             ...(projectId ? { projectId } : {}),
             source,
             ...(repo ? { repo } : {}),
-          });
+          }, client);
           if (cancelled) return;
           // 3b: a deep-fail is a typed `{ok:false,'unavailable'}` refusal now — treat
           // it like no-upstream (nothing to show), never crash on a missing files[].

package/app/filesystem/ui/GitCommitGraph.tsx

@@ -431,6 +431,7 @@ export function GitCommitGraph({
    *  E) — two-part `slug:// Name` header render; absent → slug-only fallback. */
   repoName?: string;
 }) {
+  const client = useFilesystemStore((s) => s.client);
   const [page, setPage] = useState<GraphPageState>(emptyGraphPageState);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
@@ -508,7 +509,7 @@ export function GitCommitGraph({
           ...(repo ? { repo } : {}),
           maxCount,
           skip,
-        });
+        }, client);
         if (mySeq !== seqRef.current) return;
         const fetched = {
           commits: Array.isArray(res?.commits) ? res.commits : [],
@@ -530,7 +531,7 @@ export function GitCommitGraph({
             ...(repo ? { repo } : {}),
             maxCount,
             skip,
-          })
+          }, client)
             .then((stats) => {
               if (mySeq !== seqRef.current) return;
               setCommitStats((cur) => (mode === 'append' ? { ...cur, ...stats.stats } : { ...stats.stats }));
@@ -643,7 +644,7 @@ export function GitCommitGraph({
           source,
           ...(repo ? { repo } : {}),
           sha,
-        });
+        }, client);
         if (epoch !== filesEpochRef.current) return;
         setCommitFiles((prev) =>
           new Map(prev).set(
@@ -702,7 +703,7 @@ export function GitCommitGraph({
           ...(projectId ? { projectId } : {}),
           source,
           ...(repo ? { repo } : {}),
-        });
+        }, client);
         if (epoch !== outgoingEpochRef.current) return;
         // 3b: a deep-fail is a typed `{ok:false,'unavailable'}` refusal now — treat
         // it like no-upstream (nothing to show), never crash on a missing files[].
@@ -812,7 +813,7 @@ export function GitCommitGraph({
           ...(projectId ? { projectId } : {}),
           source,
           ...(repo ? { repo } : {}),
-        });
+        }, client);
         if (epoch !== outgoingEpochRef.current) return;
         // 3b: a deep-fail is a typed `{ok:false,'unavailable'}` refusal now — treat
         // it like no-upstream (nothing to show), never crash on a missing files[].