Skip to content

graff — a fast agentic coding harness in Zig: multi-provider, MCP, workflows, DGM evolution loop, TS/Python SDKs

Python

Preserve provider selection at desktop startup

Rach Pradhan739d0129147e
diff --git a/apps/native/components/site/useHarnessSessions.ts b/apps/native/components/site/useHarnessSessions.ts
index 11569e13..3585226f 100644
--- a/apps/native/components/site/useHarnessSessions.ts
+++ b/apps/native/components/site/useHarnessSessions.ts
@@ -2,7 +2,7 @@ import type { PermissionRequest } from "@/lib/acp-permission";
import { useEffect, useRef, useState, type MutableRefObject, type Dispatch, type SetStateAction } from "react";
import { bindMcpAppChat, checkHealth, disposePage, ensureSession, fetchModels, type Health } from "@/lib/acp-client";
import { shouldReapPage } from "@/lib/acp-terminate";
-import { catalogMayWriteChatModel, catalogMayWriteGlobalKey, sameModels, rememberChatCatalog, sharedModelChoices } from "@/lib/composer-model";
+import { catalogMayWriteChatModel, catalogMayWriteGlobalKey, sameModels, rememberChatCatalog, sharedModelChoices, startWithSelectedModel } from "@/lib/composer-model";
import { pumpIdlePeerTurns } from "./idle-peer-turns";
import type { AcpCommand } from "@/lib/acp";
import type { PromptModel } from "@/components/primitives/PromptBar";
@@ -29,10 +29,15 @@ const SIDEBAR_PAGE = 12;
export function useHarnessSessions({onPermission, sessionsRef, sessionNamesRef, chatsRef, workspacesRef, activePathRef, pageRef, runningRef, model, activeId, handleOf, setModels, setCommands, setCatalogCommands, setChatModel, setModelKey, setSessionIds, setHealth, setWorkspaces, setActivePath, setChats, setStored, setStoredTotal, pendingPick}: Props) {
const [projectsReady, setProjectsReady] = useState(false);
const [chatCatalogs, setChatCatalogs] = useState<Record<number, PromptModel[]>>({});
+ 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>>) => {
if (!catalog.models.length) return;
+ catalogForSpawn.current[chatId] = {
+ cwd: chatsRef.current.find(chat => chat.id === chatId)?.cwd ?? activePathRef.current ?? undefined,
+ 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);
@@ -122,14 +127,22 @@ export function useHarnessSessions({onPermission, sessionsRef, sessionNamesRef,
const cwd = chat?.cwd ?? activePathRef.current ?? undefined;
const ws = findWorkspace(workspacesRef.current, cwd);
const spawnModel = key ?? chat?.model ?? ws?.model ?? model ?? undefined;
- const { sessionId: id, commands, cwd: checkout } = await ensureSession(handleOf(chatId), {
- model: spawnModel,
- reset,
- resume: sessionNamesRef.current.get(chatId),
- cwd,
- yolo: ws?.yolo,
- mcp: ws?.mcp,
- });
+ const cached = catalogForSpawn.current[chatId];
+ const { sessionId: id, commands, cwd: checkout } = await startWithSelectedModel(spawnModel,
+ cached?.cwd === cwd ? cached.models : [], async () => {
+ // 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);
+ return catalog.models;
+ }, selected => ensureSession(handleOf(chatId), {
+ model: selected,
+ reset,
+ resume: sessionNamesRef.current.get(chatId),
+ cwd,
+ yolo: ws?.yolo,
+ mcp: ws?.mcp,
+ }));
if (checkout && checkout !== cwd) {
const next = chatsRef.current.map((c) => (c.id === chatId ? { ...c, cwd: checkout } : c));
chatsRef.current = next;
diff --git a/apps/native/lib/acp-client.ts b/apps/native/lib/acp-client.ts
index d2b3d3f6..d5ad62f3 100644
--- a/apps/native/lib/acp-client.ts
+++ b/apps/native/lib/acp-client.ts
@@ -251,7 +251,7 @@ type GraffModelsResult = {
/** The models THIS install can reach: `graff/models` filtered to providers
* with live credentials, already in the agent's election order. The same
* model name can be served by several providers; the highest-ranked seat
- * wins its row (spawn-by-name resolves through graff's own routing anyway). */
+ * wins its row, and the desktop passes that row's provider at worker startup. */
export async function fetchModels(chat?: ChatHandle, root?: string, refresh = true): Promise<{ models: ModelChoice[]; current: string | null; commands?: AcpCommand[] }> {
const res = chat ? await rpc(chat, "graff/models", { refresh }) : await fetch(`/api/models?${new URLSearchParams(root ? { root } : {})}`, { cache: "no-store" });
const body = (await res.json()) as { result?: GraffModelsResult; error?: string };
diff --git a/apps/native/lib/composer-model.test.ts b/apps/native/lib/composer-model.test.ts
index 2a6ebf43..6a5e9518 100644
--- a/apps/native/lib/composer-model.test.ts
+++ b/apps/native/lib/composer-model.test.ts
@@ -4,7 +4,25 @@ import { mkdtempSync, writeFileSync, rmSync } from "node:fs";
import os from "node:os";
import path from "node:path";
import { modelChoices } from "./acp-client";
-import { liveComposerKey, paneComposerKey, pillFromAcp, resolveComposerModel, sameModels, rememberChatCatalog, sharedModelChoices } from "./composer-model";
+import { liveComposerKey, paneComposerKey, pillFromAcp, resolveComposerModel, sameModels, rememberChatCatalog, sharedModelChoices, startWithSelectedModel } from "./composer-model";
+
+test("ACP startup waits for this workspace's catalog and keeps the selected route", async () => {
+ const calls: string[] = [];
+ const catalog = [
+ { key: "xiaomi/mimo-v2.6-pro-ultraspeed", name: "MiMo", provider: "codegraff" },
+ { key: "mimo-v2.6-pro-ultraspeed", name: "MiMo Direct", provider: "xiaomi" },
+ ];
+ const load = async () => { calls.push("catalog"); return catalog; };
+ const start = async (model?: string) => { calls.push(`start:${model}`); return model; };
+ expect(await startWithSelectedModel(catalog[0].key, [], load, start)).toBe("codegraff/xiaomi/mimo-v2.6-pro-ultraspeed");
+ expect(calls).toEqual(["catalog", "start:codegraff/xiaomi/mimo-v2.6-pro-ultraspeed"]);
+ expect(await startWithSelectedModel(catalog[1].key, catalog, load, start)).toBe("xiaomi/mimo-v2.6-pro-ultraspeed");
+ expect(calls.filter(call => call === "catalog")).toHaveLength(1);
+ await expect(startWithSelectedModel("saved-legacy-model", [], async () => [], start)).rejects.toThrow("Could not verify model");
+ expect(calls).toHaveLength(3);
+ expect(await startWithSelectedModel(undefined, [], load, start)).toBeUndefined();
+ expect(calls.at(-1)).toBe("start:undefined");
+});
test("the pill keeps an unknown live key instead of catalog[0]", () => {
const decoy = { key: "catalog-zero", name: "catalog-zero" };
diff --git a/apps/native/lib/composer-model.ts b/apps/native/lib/composer-model.ts
index 307443ba..95ac1652 100644
--- a/apps/native/lib/composer-model.ts
+++ b/apps/native/lib/composer-model.ts
@@ -6,6 +6,16 @@ export function resolveComposerModel(catalog: ModelChoice[], modelKey?: string |
return catalog[0] ?? { key: "", name: "Loading graff models…" };
}
+/** Resolve the selected route before starting a worker; an unavailable catalog cannot choose it. */
+export async function startWithSelectedModel<T>(key: string | undefined, catalog: ModelChoice[],
+ loadCatalog: () => Promise<ModelChoice[]>, start: (model?: string) => Promise<T>): Promise<T> {
+ if (!key) return start();
+ const rows = catalog.length ? catalog : await loadCatalog();
+ const provider = rows.find(model => model.key === key)?.provider;
+ if (!provider) throw new Error(`Could not verify model '${key}' in this workspace's catalog. Refresh models and retry.`);
+ return start(`${provider}/${key}`);
+}
+
/** Display key: this chat's ACP model. Global inherit is only for a tab with no agent yet. */
export function liveComposerKey(
threadModel: string | undefined,
diff --git a/src/startup_keys.zig b/src/startup_keys.zig
index a6866b59..3691dbd8 100644
--- a/src/startup_keys.zig
+++ b/src/startup_keys.zig
@@ -31,6 +31,36 @@ fn explicitProvider(model_flag: ?[]const u8) ?[]const u8 {
return catalog_selection.explicitProvider(model_flag orelse return null);
}
+fn qualifiedProvider(keys: provider_mod.Keys, query: []const u8) error{ MissingKey, UnknownModel }!?provider_mod.Provider {
+ const slash = std.mem.indexOfScalar(u8, query, '/') orelse return null;
+ const pid = query[0..slash];
+ const spec = provider_mod.specFor(pid) orelse return null;
+ const model = query[slash + 1 ..];
+ if (model.len == 0 or (!keys_cli.isLocalUrl(spec.url) and !pricing.providerModelInTable(pid, model)))
+ return error.UnknownModel;
+ return try keys.providerById(pid, model);
+}
+
+test "qualified startup model keeps its catalog provider and validates the exact row" {
+ var keys: provider_mod.Keys = .{ .values = @splat(null) };
+ for (provider_mod.provider_specs, &keys.values) |spec, *value| {
+ if (std.mem.eql(u8, spec.id, "xiaomi") or std.mem.eql(u8, spec.id, "codegraff")) value.* = "test";
+ }
+ const direct = (try qualifiedProvider(keys, "xiaomi/mimo-v2.6-pro-ultraspeed")).?;
+ try std.testing.expectEqualStrings("xiaomi", direct.id);
+ try std.testing.expectEqualStrings("mimo-v2.6-pro-ultraspeed", direct.model);
+ const gateway = (try qualifiedProvider(keys, "codegraff/mimo-v2.6-pro")).?;
+ try std.testing.expectEqualStrings("codegraff", gateway.id);
+ try std.testing.expectEqualStrings("mimo-v2.6-pro", gateway.model);
+ try std.testing.expectError(error.UnknownModel, qualifiedProvider(keys, "xiaomi/not-a-real-model"));
+ try std.testing.expectError(error.UnknownModel, qualifiedProvider(keys, "xiaomi/"));
+ try std.testing.expect((try qualifiedProvider(keys, "mimo-v2.6-pro")) == null);
+ for (provider_mod.provider_specs, &keys.values) |spec, *value| {
+ if (std.mem.eql(u8, spec.id, "xiaomi")) value.* = null;
+ }
+ try std.testing.expectError(error.MissingKey, qualifiedProvider(keys, "xiaomi/mimo-v2.6-pro-ultraspeed"));
+}
+
/// Whether one stored credential can affect an explicit startup selection:
/// provider ids need one key; exact catalog models need only providers that
/// serve them (aliases/fuzzy retain the full scan); --subagent-provider (worker_hint) is
@@ -233,6 +263,17 @@ pub fn resolveKeysOptional(io: Io, gpa: Allocator, arena: Allocator, environ_map
break :pick;
} else |_| std.process.fatal("no key/login for provider '{s}' (--model)", .{mname});
}
+ // `/model provider/model` pins the route. Keep the same meaning at
+ // startup, including ACP launches from a desktop model selection.
+ if (qualifiedProvider(keys, mname)) |qualified| {
+ if (qualified) |p| {
+ default_provider = p;
+ break :pick;
+ }
+ } else |err| switch (err) {
+ error.UnknownModel => std.process.fatal("unknown --model '{s}' for its provider — run `graff models refresh` or see /models", .{mname}),
+ error.MissingKey => std.process.fatal("no key/login for --model '{s}'", .{mname}),
+ }
const nm = pricing.resolveModelName(keys, mname) orelse std.process.fatal("unknown --model '{s}' — run `graff models refresh` or see /models", .{mname});
default_provider = keys.providerFor(nm) catch {
// #294: name the credential that actually needs repair. A Codex-only