@neuralis/brain-core 0.2.0 → 0.2.1

package/app/filesystem/ui/GitFileDiff.tsx

@@ -36,7 +36,7 @@ import {
 import { computeGitDiffTokens, renderShikiToken } from './gitDiffShikiTokenizer';
 import { resolveShikiLang, isShikiReady, ensureLanguage, getHighlighter } from './codeEditor/shikiHighlighter';
 import { detectCodeLanguage } from '../lib/detectLanguage';
-import { useContainerWidth } from '../hooks/useContainerWidth';
+import { useContainerWidth } from '@neuralis/package-system/client';
 import type { VisibleDiffQueue } from '../hooks/useVisibleDiffCards';
 import { DiffModeToggle } from './DiffModeToggle';
 
@@ -156,6 +156,7 @@ export function GitFileDiff({
   /** The lane's synchronous cache read: a re-mounted card paints its last answer on its first frame. */
   peekContent?: VisibleDiffQueue['peek'];
 }): React.ReactElement {
+  const client = useFilesystemStore((s) => s.client);
   const [initial] = useState(() => peekContent?.<DiffAnswer>(`${diffFamily(source, repo, path, mode)}\u0000${revision}`, diffFamily(source, repo, path, mode)));
   const [raw, setRaw] = useState<string | null>(() => initial === undefined ? null : initial && initial.ok !== false ? initial.diff : '');
   const [loading, setLoading] = useState(false);
@@ -262,7 +263,7 @@ export function GitFileDiff({
           path,
           // ONE mode per request — the server 400s any combination.
           ...diffRequestParams(normalizedMode),
-        });
+        }, client);
         // Keyed on everything the answer depends on; after a hunk apply the refetch
         // replaces the cached answer instead of reading it.
         const family = diffFamily(source, repo, path, normalizedMode);
@@ -364,7 +365,7 @@ export function GitFileDiff({
           ...(repo ? { repo } : {}),
           path,
           rev: expanderSrc.rev,
-        });
+        }, client);
         const res = runContent ? await runContent(fetchSource, () => mySeq === seqRef.current) : await fetchSource();
         if (!res || mySeq !== seqRef.current) return null;
         return settle(res.ok ? { ok: true, content: res.content } : { ok: false });
@@ -376,7 +377,7 @@ export function GitFileDiff({
         agentId,
         ...(projectId ? { projectId } : {}),
         files: [`${source}://${repo ? `${repo}/` : ''}${path}`],
-      });
+      }, client);
       const res = runContent ? await runContent(fetchSource, () => mySeq === seqRef.current) : await fetchSource();
       if (!res || mySeq !== seqRef.current) return null;
       const file = extractReadFilesPayload(res)[0];
@@ -467,9 +468,9 @@ export function GitFileDiff({
       setHunkError(null);
       try {
         if (staged) {
-          await unstageHunk({ agentId, ...(projectId ? { projectId } : {}), source, ...(repo ? { repo } : {}), hunk: patch });
+          await unstageHunk({ agentId, ...(projectId ? { projectId } : {}), source, ...(repo ? { repo } : {}), hunk: patch }, client);
         } else {
-          await stageHunk({ agentId, ...(projectId ? { projectId } : {}), source, ...(repo ? { repo } : {}), hunk: patch });
+          await stageHunk({ agentId, ...(projectId ? { projectId } : {}), source, ...(repo ? { repo } : {}), hunk: patch }, client);
         }
         // The index changed → the cached `rev=index` source is stale (the WT
         // entry would survive, but a whole-map clear is cheap and race-free).

package/app/filesystem/ui/PendingChangesPanel.tsx

@@ -23,7 +23,7 @@ import {
   ChevronLeft, CheckCheck, X, XCircle, Wrench, Unlink, ShieldAlert,
 } from 'lucide-react';
 import { SkillLauncher } from '@neuralis/package-system/client';
-import { useFilesystemStore } from '../store/filesystemStore';
+import { useFilesystemStore, useFilesystemStoreApi } from '../store/filesystemStore';
 import {
   listPendingChanges, previewPendingChange, discardPendingChange, discardOrphanedPending,
   type PendingChangeRecord, type PendingPreview,
@@ -115,6 +115,7 @@ export const PendingDiffCard = memo(function PendingDiffCard({
   /** The dialog's post-409 refetch: `'wait'` while in flight, then its answer ONCE for the key it was taken for. */
   takeRefetch: (id: string, key: string) => PendingPreview | 'wait' | undefined; extra?: React.ReactNode;
 }) {
+  const client = useFilesystemStore((s) => s.client);
   // Cards open inline by default — the diff is the review unit.
   const [expanded, setExpanded] = useState(true);
   // The last answer this record had (a remount or a new source revision) stays on screen
@@ -140,7 +141,7 @@ export const PendingDiffCard = memo(function PendingDiffCard({
     if (adopted === 'wait') { setLoading(true); return; }
     if (adopted) { setPreview(adopted); setLoadError(null); setAnswerKey(cacheKey); loadedKey.current = cacheKey; setLoading(false); return; }
     setLoading(true);
-    void queue.run(() => previewPendingChange({ agentId, ...(projectId ? { projectId } : {}), id: rec.id }),
+    void queue.run(() => previewPendingChange({ agentId, ...(projectId ? { projectId } : {}), id: rec.id }, client),
       () => generation === seq.current && active.current, { key: cacheKey, bytes: previewBytes }).then(next => {
       if (!next || generation !== seq.current || !active.current) return;
       onPreview(next);
@@ -212,8 +213,10 @@ const NO_FILTERS: ChangeFilters = { kind: 'all', source: '', repo: '', branch: '
 /** One bulk pass (the sweep and the grouped dialog) covers at most this many records. */ const REVIEW_BATCH = 100;
 
 export function PendingChangesPanel({ agentId, projectId }: Props) {
+  const client = useFilesystemStore((s) => s.client);
   const host = useFilesystemHost();
   const canWrite = hasFeature({ grantedFeatures: [...(host.grantedFeatures ?? [])] }, 'drive.write');
+  const storeApi = useFilesystemStoreApi();
   const sources = useFilesystemStore(s => s.sources);
   const liveRevisions = useFilesystemStore(s => s.sourceChangeRevision);
   // A review batch (the sweep, a dialog group) HOLDS the revisions its own writes bump: one re-list
@@ -261,7 +264,7 @@ export function PendingChangesPanel({ agentId, projectId }: Props) {
     refetches.current.set(rec.id, null);
     try {
       const listed = (await relisted.current.promise)?.find(r => r.id === rec.id) ?? rec;
-      const fresh = await previewPendingChange({ agentId, ...(projectId ? { projectId } : {}), id: rec.id });
+      const fresh = await previewPendingChange({ agentId, ...(projectId ? { projectId } : {}), id: rec.id }, client);
       const revision = (latest.current.nonces[rec.id] ?? 0) + 1 + (latest.current.revisions[listed.sourceSlug] ?? 0);
       refetches.current.set(rec.id, { key: previewKey(listed, revision), preview: fresh });
       previews.current.set(rec.id, fresh);
@@ -289,7 +292,7 @@ export function PendingChangesPanel({ agentId, projectId }: Props) {
     setLoading(true); setError(null);
     try {
       const list = await listPendingChanges({ agentId, ...(projectId ? { projectId } : {}),
-        ...(convFilter ? { conversationId: convFilter } : {}), ...(withOrphans ? { include_orphans: true } : {}) });
+        ...(convFilter ? { conversationId: convFilter } : {}), ...(withOrphans ? { include_orphans: true } : {}) }, client);
       if (mine !== listSeq.current) return undefined;
       const ids = new Set(list.changes.map(rec => rec.id));
       setChanges(list.changes);
@@ -372,9 +375,9 @@ export function PendingChangesPanel({ agentId, projectId }: Props) {
    */
   const dropResolvedDeleteRow = useCallback((rec: PendingChangeRecord) => {
     if (rec.op !== 'delete' || !rec.uri) return;
-    const node = useFilesystemStore.getState().files[rec.uri];
+    const node = storeApi.getState().files[rec.uri];
     if (!node || node.status === 'deleted') removeFilePath(rec.uri);
-  }, [removeFilePath]);
+  }, [removeFilePath, storeApi]);
 
   const afterMutation = useCallback(async (done: ReviewResult[]) => {
     for (const result of done) {
@@ -388,17 +391,17 @@ export function PendingChangesPanel({ agentId, projectId }: Props) {
     setResults(done);
     const after = await fetchPending(false);
     // The STORE's value, not the last render's: the batch's own bumps may not have rendered yet.
-    listedRevisions.current = useFilesystemStore.getState().sourceChangeRevision; setHeld(null);
+    listedRevisions.current = storeApi.getState().sourceChangeRevision; setHeld(null);
     relisted.current.resolve(after); relisted.current = Promise.withResolvers();
     void refreshPendingCount({ agentId, projectId });
-  }, [changes, dropResolvedDeleteRow, fetchPending, refreshPendingCount, agentId, projectId]);
+  }, [changes, dropResolvedDeleteRow, fetchPending, refreshPendingCount, agentId, projectId, storeApi]);
 
   const resolveReview = useCallback(async (rec: PendingChangeRecord, action: ReviewAction) => {
     if (!canWrite) return;
     const preview = previews.current.get(rec.id);
     if (!preview || preview.requiresAcknowledgement.length) { setReview({ kind: 'single', rec, action, ...(preview ? { preview } : {}) }); return; }
     setBusyId(rec.id);
-    try { await afterMutation([await applyReview({ agentId, projectId }, rec, preview, action, false)]); }
+    try { await afterMutation([await applyReview({ agentId, projectId, client }, rec, preview, action, false)]); }
     finally { setBusyId(null); }
   }, [canWrite, agentId, projectId, afterMutation]);
 
@@ -406,7 +409,7 @@ export function PendingChangesPanel({ agentId, projectId }: Props) {
   const discard = useCallback(async (rec: PendingChangeRecord) => {
     setBusyId(rec.id);
     try {
-      const res = await discardPendingChange({ agentId, ...(projectId ? { projectId } : {}), id: rec.id });
+      const res = await discardPendingChange({ agentId, ...(projectId ? { projectId } : {}), id: rec.id }, client);
       if (!res.ok) setError(res.error || 'Discard failed'); else dropResolvedDeleteRow(rec);
       await fetchPending(false);
       void refreshPendingCount({ agentId, projectId });
@@ -419,7 +422,7 @@ export function PendingChangesPanel({ agentId, projectId }: Props) {
     if (repairTimer.current) { clearTimeout(repairTimer.current); repairTimer.current = null; }
     setRepairing(true); setConfirmRepair(false); setError(null);
     try {
-      await discardOrphanedPending({ agentId, ...(projectId ? { projectId } : {}), ...(convFilter ? { conversationId: convFilter } : {}) });
+      await discardOrphanedPending({ agentId, ...(projectId ? { projectId } : {}), ...(convFilter ? { conversationId: convFilter } : {}) }, client);
       const candidates = changes.filter((rec) => orphanIds.has(rec.id));
       const after = await fetchPending(true);
       if (after) {
@@ -446,12 +449,12 @@ export function PendingChangesPanel({ agentId, projectId }: Props) {
       for (const rec of approvable) {
         let preview = previews.current.get(rec.id);
         if (!preview) {
-          try { preview = await previewPendingChange({ agentId, ...(projectId ? { projectId } : {}), id: rec.id }); }
+          try { preview = await previewPendingChange({ agentId, ...(projectId ? { projectId } : {}), id: rec.id }, client); }
           catch (e) { done.push({ id: rec.id, uri: rec.uri, action: 'approve', outcome: 'error', detail: e instanceof Error ? e.message : 'Preview failed' }); continue; }
           previews.current.set(rec.id, preview);
         }
         if (preview.requiresAcknowledgement.length) { done.push({ id: rec.id, uri: rec.uri, action: 'approve', outcome: 'needs-ack' }); continue; }
-        done.push(await applyReview({ agentId, projectId }, rec, preview, 'approve', false));
+        done.push(await applyReview({ agentId, projectId, client }, rec, preview, 'approve', false));
       }
     } finally {
       setApprovingAll(false);

package/app/filesystem/ui/PendingReviewDialog.tsx

@@ -19,6 +19,8 @@ import { DiffView } from '../../cards/DiffView';
 import { detectLanguage } from '../../cards/diffUtils';
 import type { VisibleDiffQueue } from '../hooks/useVisibleDiffCards';
 import { acceptsAbsence, classifyReviewOutcome, hunksOf, type ReviewOutcome } from './pendingChangesModel';
+import { useFilesystemStore } from '../store/filesystemStore';
+import type { PackageApi } from '@neuralis/package-system/client';
 
 export type ReviewAction = 'approve' | 'dismiss' | 'revert';
 export type ReviewRequest =
@@ -42,13 +44,13 @@ const OUTCOME: Record<ReviewOutcome, { label: string; tone: string }> = {
 export type ReviewResult = { id: string; uri: string; action: ReviewAction; outcome: ReviewOutcome; detail?: string };
 
 /** Run one review verb with the record's own fingerprint; never throws. */
-export async function applyReview(params: { agentId: string; projectId: string | null }, rec: PendingChangeRecord,
+export async function applyReview(params: { agentId: string; projectId: string | null; client: PackageApi }, rec: PendingChangeRecord,
   preview: PendingPreview, action: ReviewAction, acknowledge: boolean): Promise<ReviewResult> {
   const body = { agentId: params.agentId, ...(params.projectId ? { projectId: params.projectId } : {}), id: rec.id,
     expectedFingerprint: preview.expectedFingerprint, ...(acknowledge ? { acknowledgeCurrentState: true as const } : {}) };
   try {
-    const result = action === 'approve' ? await approveFileReview({ ...body, uri: rec.uri })
-      : action === 'revert' ? await revertPendingChange(body) : await dismissPendingChange(body);
+    const result = action === 'approve' ? await approveFileReview({ ...body, uri: rec.uri }, params.client)
+      : action === 'revert' ? await revertPendingChange(body, params.client) : await dismissPendingChange(body, params.client);
     if (result && result.ok === false) {
       const detail = 'error' in result && result.error ? String(result.error) : 'Review refused';
       return { id: rec.id, uri: rec.uri, action, outcome: classifyReviewOutcome(detail), detail };
@@ -90,6 +92,7 @@ export function PendingReviewDialog({ request, agentId, projectId, run, onClose,
   /** Records still waiting outside this batch; `onNext` (given this batch's ids) opens the next one. */
   next?: number; onNext?: (batch: string[]) => void;
 }): React.ReactElement | null {
+  const client = useFilesystemStore((s) => s.client);
   const records = useMemo(() => request.kind === 'single' ? [request.rec] : request.records, [request]);
   const [previews, setPreviews] = useState<Record<string, PendingPreview | Error>>(
     () => request.kind === 'single' && request.preview ? { [request.rec.id]: request.preview } : {});
@@ -104,7 +107,7 @@ export function PendingReviewDialog({ request, agentId, projectId, run, onClose,
     const seq = (loads.current.get(rec.id) ?? 0) + 1;
     loads.current.set(rec.id, seq);
     const current = () => mounted.current && loads.current.get(rec.id) === seq;
-    const load = () => previewPendingChange({ agentId, ...(projectId ? { projectId } : {}), id: rec.id });
+    const load = () => previewPendingChange({ agentId, ...(projectId ? { projectId } : {}), id: rec.id }, client);
     void (again && refetch ? refetch(rec) : run(load, current))
       .then(preview => { if (current() && preview) setPreviews(p => ({ ...p, [rec.id]: preview })); },
         error => { if (current()) setPreviews(p => ({ ...p, [rec.id]: error instanceof Error ? error : new Error('Preview failed') })); });
@@ -140,7 +143,7 @@ export function PendingReviewDialog({ request, agentId, projectId, run, onClose,
     for (const rec of targets) {
       const preview = previews[rec.id];
       if (!preview || preview instanceof Error || results[rec.id]?.outcome === 'ok') continue;
-      const result = await applyReview({ agentId, projectId }, rec, preview, action, preview.requiresAcknowledgement.length > 0);
+      const result = await applyReview({ agentId, projectId, client }, rec, preview, action, preview.requiresAcknowledgement.length > 0);
       done.push(result);
       setResults(r => ({ ...r, [rec.id]: result }));
       // The state moved under the preview: fetch ONE fresh preview for this record

package/app/filesystem/ui/ReembedDialog.tsx

@@ -18,6 +18,7 @@ import { useEffect, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { Loader2, RefreshCcw, X } from 'lucide-react';
 import { estimateReembed, startReembed, type ReembedEstimate, type ReembedKind } from '../api';
+import { useFilesystemStore } from '../store/filesystemStore';
 
 export type ReembedTarget = {
   source: string;
@@ -58,6 +59,7 @@ export function ReembedDialog({
   /** Called after a job was queued — the caller follows it however it follows sync jobs. */
   onStarted?: () => void;
 }) {
+  const client = useFilesystemStore((s) => s.client);
   const [estimate, setEstimate] = useState<ReembedEstimate | null>(null);
   const [estimating, setEstimating] = useState(true);
   const [starting, setStarting] = useState(false);
@@ -75,7 +77,7 @@ export function ReembedDialog({
   useEffect(() => {
     let live = true;
     setEstimating(true);
-    estimateReembed(scope, kind)
+    estimateReembed(scope, kind, client)
       .then((result) => {
         if (live) setEstimate(result);
       })
@@ -108,7 +110,7 @@ export function ReembedDialog({
     setStarting(true);
     setError(null);
     try {
-      const started = await startReembed(scope, kind);
+      const started = await startReembed(scope, kind, client);
       if (!started.job) {
         // Nothing readable in scope — the route queued nothing. Say so.
         setNothingToDo(true);

package/app/filesystem/ui/SourcesPanel.tsx

@@ -470,6 +470,7 @@ const textareaCls = cn(
 // ---------------------------------------------------------------------------
 
 export function SourcesPanel(props: Props) {
+  const client = useFilesystemStore((s) => s.client);
   const { agentId, projectId, isDocker } = props;
   const open = useFilesystemStore((s) => s.workspacePanels.sources);
   const setWorkspacePanelOpen = useFilesystemStore((s) => s.setWorkspacePanelOpen);
@@ -577,7 +578,7 @@ export function SourcesPanel(props: Props) {
   // schema-driven picker (replacing the old hardcoded KIND_META).
   useEffect(() => {
     let cancelled = false;
-    listSourceKinds()
+    listSourceKinds(client)
       .then((res) => {
         if (cancelled) return;
         setKinds(res.kinds ?? []);
@@ -704,8 +705,8 @@ export function SourcesPanel(props: Props) {
           agentId,
           projectId,
           scope: activeScope,
-        }),
-        listDiscoverableSources({ agentId, projectId })
+        }, client),
+        listDiscoverableSources({ agentId, projectId }, client)
           .catch(() => ({ suggestions: [] as DiscoverableSourceSuggestion[] })),
       ]);
       setConfigs(next);
@@ -746,7 +747,7 @@ export function SourcesPanel(props: Props) {
     });
     if (alreadyLoading) return;
     try {
-      const info = await fetchSourceCounts(agentId, projectId ?? undefined, source);
+      const info = await fetchSourceCounts(agentId, projectId ?? undefined, source, client);
       if (info) setCountsBySource((prev) => ({ ...prev, [source]: info }));
     } catch {
       // Count failure is non-fatal — the row still works, the stats row just stays blank.
@@ -793,7 +794,7 @@ export function SourcesPanel(props: Props) {
   useEffect(() => {
     if (!showAddForm || !isDocker || !canMount) return;
     setDockerMountsLoading(true);
-    browseDirectories({ path: '/mounts', agentId, ...(projectId ? { projectId } : {}) })
+    browseDirectories({ path: '/mounts', agentId, ...(projectId ? { projectId } : {}) }, client)
       .then((result) => {
         // Filter out volumes already configured as sources
         const configuredSources = new Set(configs.map((c) => c.source));
@@ -905,7 +906,7 @@ export function SourcesPanel(props: Props) {
         agentId,
         ...(projectId ? { projectId } : {}),
         config: { ...payload, ...(clearSync ? { clearSync: true } : {}) },
-      });
+      }, client);
       setConfigs((s) => s.map((e) => (e.source === updated.source ? updated : e)));
       setDrafts((s) => ({ ...s, [updated.source]: buildDraft(updated) }));
       // Counted refresh ONLY when the save moved the sync FILTER set — that is
@@ -943,7 +944,7 @@ export function SourcesPanel(props: Props) {
           agentId,
           ...(projectId ? { projectId } : {}),
           config: { ...currentDraft, permissions: nextPerms },
-        });
+        }, client);
         setConfigs((s) => s.map((e) => (e.source === updated.source ? updated : e)));
         setDrafts((s) => ({ ...s, [updated.source]: buildDraft(updated) }));
         // A permissions edit moves no number: the indexed count is a
@@ -977,7 +978,7 @@ export function SourcesPanel(props: Props) {
       // is cleared on UNMOUNT ONLY (never in a dependency-change cleanup), so a
       // live poll is never dropped while the panel is still mounted.
       if (!mountedRef.current) return null;
-      const status = await getSyncStatus({ agentId, ...(projectId ? { projectId } : {}), source });
+      const status = await getSyncStatus({ agentId, ...(projectId ? { projectId } : {}), source }, client);
       const job = status.job;
       if (!job) return null;
       if (job.status === 'pending' || job.status === 'running') continue;
@@ -1005,7 +1006,7 @@ export function SourcesPanel(props: Props) {
     setSyncingSource(source);
     setError(null);
     try {
-      await triggerSourceSync({ agentId, ...(projectId ? { projectId } : {}), source });
+      await triggerSourceSync({ agentId, ...(projectId ? { projectId } : {}), source }, client);
       await pollSyncJob(source);
       await load();
       await refresh({ agentId, projectId, withCounts: true });
@@ -1019,7 +1020,7 @@ export function SourcesPanel(props: Props) {
 
   const handleCancelSync = async (source?: string) => {
     try {
-      await cancelSync({ agentId, ...(projectId ? { projectId } : {}), ...(source ? { source } : {}) });
+      await cancelSync({ agentId, ...(projectId ? { projectId } : {}), ...(source ? { source } : {}) }, client);
       // The polling loop in handleSync/handleReindex observes the cancelled
       // status and clears the spinner; clear eagerly for instant feedback.
       setSyncingSource(null);
@@ -1058,7 +1059,7 @@ export function SourcesPanel(props: Props) {
   const handleResumeEmbedding = (source: string) =>
     followReindex(
       source,
-      () => startReembed({ agentId, ...(projectId ? { projectId } : {}), source }, 'pending'),
+      () => startReembed({ agentId, ...(projectId ? { projectId } : {}), source }, 'pending', client),
       'Embedding failed',
     );
 
@@ -1066,7 +1067,7 @@ export function SourcesPanel(props: Props) {
   const handleReindex = (source: string) =>
     followReindex(
       source,
-      () => reindexSource({ agentId, ...(projectId ? { projectId } : {}), source }),
+      () => reindexSource({ agentId, ...(projectId ? { projectId } : {}), source }, client),
       'Rescan failed',
     );
 
@@ -1076,7 +1077,7 @@ export function SourcesPanel(props: Props) {
     setPurgeBusy(true);
     setError(null);
     try {
-      const counts = await purgeSourceIndex({ agentId, ...(projectId ? { projectId } : {}), source, selector, mode, obsoleteOnly: purgeObsoleteOnly });
+      const counts = await purgeSourceIndex({ agentId, ...(projectId ? { projectId } : {}), source, selector, mode, obsoleteOnly: purgeObsoleteOnly }, client);
       if (epoch !== purgeEpoch.current) return;
       if (mode === 'estimate') setPurgeCounts(counts);
       else { setPurgeFor(null); setPurgeCounts(null); clearCachedCounts(source); await load(); await refresh({ agentId, projectId, withCounts: true }); }
@@ -1088,7 +1089,7 @@ export function SourcesPanel(props: Props) {
     setResettingSource(source);
     setError(null);
     try {
-      await resetSync({ agentId, ...(projectId ? { projectId } : {}), source });
+      await resetSync({ agentId, ...(projectId ? { projectId } : {}), source }, client);
       await load();
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Reset failed');
@@ -1107,7 +1108,7 @@ export function SourcesPanel(props: Props) {
     setTogglingEnabledSource(source);
     setError(null);
     try {
-      await setSourceEnabled({ agentId, ...(projectId ? { projectId } : {}), source, enabled: next });
+      await setSourceEnabled({ agentId, ...(projectId ? { projectId } : {}), source, enabled: next }, client);
       await load();
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Toggle failed');
@@ -1125,7 +1126,7 @@ export function SourcesPanel(props: Props) {
         ...(projectId ? { projectId } : {}),
         source,
         ...(opts.purgeVectors ? { purgeVectors: true } : {}),
-      });
+      }, client);
       await load();
       // The deleted row is gone; no surviving source's count moved, so the
       // refresh runs count-free. `clearCachedCounts` still drops the row's own
@@ -1151,7 +1152,7 @@ export function SourcesPanel(props: Props) {
     setBrowseLoading(true);
     setBrowseError(null);
     try {
-      const result = await browseDirectories({ path, agentId, ...(projectId ? { projectId } : {}) });
+      const result = await browseDirectories({ path, agentId, ...(projectId ? { projectId } : {}) }, client);
       setBrowseEntries(result.entries);
       setBrowsePath(path);
     } catch {
@@ -1212,7 +1213,7 @@ export function SourcesPanel(props: Props) {
         ...(isOwnerEffective && addKind === 'local' && addDraft.recognizesPackages
           ? { recognizesPackages: true }
           : {}),
-      });
+      }, client);
       setShowAddForm(false);
       {
         const reset = buildAddDraft(selectedKind, sourceKeyIds);
@@ -1672,13 +1673,11 @@ export function SourcesPanel(props: Props) {
 
           return (
             <div key={fileKey(sourceRootUri(config.source))} className="rounded-sm">
-              {/* Accordion header */}
-              <button
-                type="button"
-                onClick={() => toggleSource(config.source)}
-                title={disconnected ? sourceLiveReasonLabel(config.live_reason) : undefined}
-                className="w-full flex items-center gap-2 py-2 text-left group hover:bg-white/[0.02] rounded-md px-1 transition"
-              >
+              {/* Accordion header: selection and enabled actions are siblings. */}
+              <div className="w-full flex items-center gap-2 py-2 text-left group hover:bg-white/[0.02] rounded-md px-1 transition">
+                <button type="button" onClick={() => toggleSource(config.source)} aria-expanded={isOpen}
+                  title={disconnected ? sourceLiveReasonLabel(config.live_reason) : undefined}
+                  className="min-w-0 flex-1 flex items-center gap-2">
                 {/* Git indicator (G2.1) — a GitBranch overlay on a git-repo
                     source's icon, ORTHOGONAL to the sync tone (visualTone still
                     owns the icon colour). */}
@@ -1713,6 +1712,7 @@ export function SourcesPanel(props: Props) {
                 {dirty && (
                   <span className="shrink-0 rounded px-1 py-0.5 text-[8px] font-medium text-amber-300/80 bg-amber-500/10">unsaved</span>
                 )}
+                </button>
                 {/* W3K — enabled toggle (per scope, per source). Machine sources also offer Auto. */}
                 {(() => {
                   const enabled = config.enabled ?? true;
@@ -1763,7 +1763,7 @@ export function SourcesPanel(props: Props) {
                   {describeConn(config, meta)}
                 </span>
                 <ChevronDown className={cn('h-3 w-3 text-white/25 shrink-0 transition-transform', isOpen && 'rotate-180')} />
-              </button>
+              </div>
 
               {/* Expanded body — when open it expands to full height (no clamp)
                   so every Path Rule / uri-policy is visible; the outer panel

package/app/filesystem/ui/VectorHealthPanel.tsx

@@ -7,6 +7,7 @@ import { hasFeature } from '@neuralis/package-system/access';
 import { useFilesystemHost } from '../FilesystemHost';
 import { cn } from '../lib/cn';
 import { checkVectorHealth, scanVectorHealth, runHealthAction, getSourcesHealth } from '../api';
+import { useFilesystemStore } from '../store/filesystemStore';
 
 type Props = {
   agentId: string;
@@ -73,6 +74,7 @@ const ACTION_COPY: Record<ActionKind, { label: string; explainer: string; toolti
 };
 
 export function VectorHealthPanel({ agentId, projectId }: Props) {
+  const client = useFilesystemStore((s) => s.client);
   const host = useFilesystemHost();
   // A mirror only — the server's `drive.write` escalation is the gate.
   const canWrite = hasFeature({ grantedFeatures: [...(host.grantedFeatures ?? [])] }, 'drive.write');
@@ -108,8 +110,8 @@ export function VectorHealthPanel({ agentId, projectId }: Props) {
       // table so it surfaces real "when was this source last synced"
       // info instead of being a count-only view.
       const [data, sourcesHealth] = await Promise.all([
-        checkVectorHealth({ agentId, ...(projectId ? { projectId } : {}) }),
-        getSourcesHealth({ agentId, ...(projectId ? { projectId } : {}) })
+        checkVectorHealth({ agentId, ...(projectId ? { projectId } : {}) }, client),
+        getSourcesHealth({ agentId, ...(projectId ? { projectId } : {}) }, client)
           .catch(() => [] as Array<{ source: string; last_sync?: string; sync_status: string }>),
       ]);
       const lastSyncBySource = new Map<string, { last_sync?: string; sync_status: string }>();
@@ -138,7 +140,7 @@ export function VectorHealthPanel({ agentId, projectId }: Props) {
     setScanLoading(true);
     setError(null);
     try {
-      const result = await scanVectorHealth({ agentId, ...(projectId ? { projectId } : {}) });
+      const result = await scanVectorHealth({ agentId, ...(projectId ? { projectId } : {}) }, client);
       setScan({ orphanChunkCount: result.orphanChunkCount ?? 0, duplicateGroups: result.duplicateGroups ?? 0 });
     } catch (err) {
       setError(err instanceof Error ? err.message : 'Scan failed');
@@ -168,7 +170,7 @@ export function VectorHealthPanel({ agentId, projectId }: Props) {
     // we're actually deleting something (`dryRun=false`).
     setPrevReport(!dryRun ? report : null);
     try {
-      const result = await runHealthAction({ agentId, ...(projectId ? { projectId } : {}), action, dryRun, retentionHours });
+      const result = await runHealthAction({ agentId, ...(projectId ? { projectId } : {}), action, dryRun, retentionHours }, client);
       setActionResult(result);
       if (!dryRun) {
         void fetchReport();