graff — a fast agentic coding harness in Zig: multi-provider, MCP, workflows, DGM evolution loop, TS/Python SDKs
Python
Keep catalog results scoped to their workspace
Rach Pradhanaea45c01bb21
diff --git a/apps/native/components/site/useHarnessSessions.ts b/apps/native/components/site/useHarnessSessions.tsindex 3585226f..790a0faf 100644--- a/apps/native/components/site/useHarnessSessions.ts+++ b/apps/native/components/site/useHarnessSessions.ts@@ -32,12 +32,10 @@ export function useHarnessSessions({onPermission, sessionsRef, sessionNamesRef,const catalogForSpawn = useRef<Record<number, { cwd?: string; models: PromptModel[] }>>({});const [catalogStatus, setCatalogStatus] = useState<Record<number, { loading: boolean; error?: string }>>({});const catalogPending = useRef(new Map<number, Promise<void>>());- const applyCatalog = (chatId: number, catalog: Awaited<ReturnType<typeof fetchModels>>) => {+ const cwdOf = (chatId: number) => chatsRef.current.find(chat => chat.id === chatId)?.cwd ?? activePathRef.current ?? undefined;+ const applyCatalog = (chatId: number, catalog: Awaited<ReturnType<typeof fetchModels>>, source?: { cwd?: string }) => {if (!catalog.models.length) return;- catalogForSpawn.current[chatId] = {- cwd: chatsRef.current.find(chat => chat.id === chatId)?.cwd ?? activePathRef.current ?? undefined,- models: catalog.models,- };+ if (source) catalogForSpawn.current[chatId] = { cwd: source.cwd, models: catalog.models };setChatCatalogs(old => rememberChatCatalog(old, chatId, catalog.models));// Effort and fast settings belong to the replying worker, never another chat.const common = sharedModelChoices(catalog.models);@@ -67,11 +65,16 @@ export function useHarnessSessions({onPermission, sessionsRef, sessionNamesRef,const fetchCatalog = async (chatId: number) => {// Pill follows this chat's agent. A transient /api/models process is not that agent.const handle = sessionsRef.current.has(chatId) ? handleOf(chatId) : undefined;+ const cwd = cwdOf(chatId);setCatalogStatus(old => ({ ...old, [chatId]: { loading: true } }));try {- const catalog = await fetchModels(handle, chatsRef.current.find(chat => chat.id === chatId)?.cwd ?? activePathRef.current ?? undefined);+ const catalog = await fetchModels(handle, cwd);+ if (cwdOf(chatId) !== cwd) {+ setCatalogStatus(old => ({ ...old, [chatId]: { loading: false } }));+ return;+ }const { current, commands: available } = catalog;- applyCatalog(chatId, catalog);+ applyCatalog(chatId, catalog, { cwd });if (available?.length) { setCatalogCommands(available); setCommands(old => ({ ...old, [chatId]: available })); }if (current && handle) {const chat = chatsRef.current.find((c) => c.id === chatId);@@ -133,7 +136,8 @@ export function useHarnessSessions({onPermission, sessionsRef, sessionNamesRef,// A changed workspace needs its own transient catalog, not the old// chat worker's model list. This query does not send a prompt.const catalog = await fetchModels(undefined, cwd);- applyCatalog(chatId, catalog);+ if (cwdOf(chatId) !== cwd) throw new Error("Workspace changed while loading models. Retry the model choice.");+ applyCatalog(chatId, catalog, { cwd });return catalog.models;}, selected => ensureSession(handleOf(chatId), {model: selected,diff --git a/apps/native/lib/composer-model.test.ts b/apps/native/lib/composer-model.test.tsindex 6a5e9518..db13fe2f 100644--- a/apps/native/lib/composer-model.test.ts+++ b/apps/native/lib/composer-model.test.ts@@ -22,6 +22,20 @@ test("ACP startup waits for this workspace's catalog and keeps the selected routexpect(calls).toHaveLength(3);expect(await startWithSelectedModel(undefined, [], load, start)).toBeUndefined();expect(calls.at(-1)).toBe("start:undefined");++ let releaseCatalog!: () => void;+ const waiting = new Promise<void>(resolve => { releaseCatalog = resolve; });+ let workspace = "/first";+ const startsBeforeMove = calls.length;+ const moved = startWithSelectedModel(catalog[0].key, [], async () => {+ await waiting;+ if (workspace !== "/first") throw new Error("Workspace changed while loading models.");+ return catalog;+ }, start);+ workspace = "/second";+ releaseCatalog();+ await expect(moved).rejects.toThrow("Workspace changed");+ expect(calls).toHaveLength(startsBeforeMove);});test("the pill keeps an unknown live key instead of catalog[0]", () => {