Skip to content

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

Python

Refresh desktop settings after ACP configuration updates

Rach Pradhan2e0f196f24eb
diff --git a/apps/native/components/site/GraffHarness.tsx b/apps/native/components/site/GraffHarness.tsx
index 07d6650d..05049401 100644
--- a/apps/native/components/site/GraffHarness.tsx
+++ b/apps/native/components/site/GraffHarness.tsx
@@ -222,7 +222,9 @@ export default function GraffHarness() {
const modelLabel = (key: string | null | undefined) => modelDisplayName(models, key);
const runPrompt = createPromptRunner({ onPermission: permissions.update, onStarted: started, onCompleted: completed,
- runningRef, steerer, setFollowing, chatsRef, model, msgIdRef, setChats, setBusyFor, setHistory, pinsRef, handleOf, setPins, requireSession, prepareModel, adoptCatalog, refreshStored, takeQueuedPrompt, setCancelError
+ runningRef, steerer, setFollowing, chatsRef, model, msgIdRef, setChats, setBusyFor, setHistory, pinsRef, handleOf, setPins, requireSession,
+ sessionIsCurrent: (id, sessionId) => sessionsRef.current.get(id) === sessionId && chatsRef.current.some(chat => chat.id === id),
+ prepareModel, adoptCatalog, refreshStored, takeQueuedPrompt, setCancelError
});
const settings = useQuietSettings({ requireSession, handleOf, running: runningRef.current, apply: applyCatalog });
const send = async (text: string, forChat?: number) => {
diff --git a/apps/native/components/site/harness-prompt-runner.ts b/apps/native/components/site/harness-prompt-runner.ts
index da48d1c4..a10df6bb 100644
--- a/apps/native/components/site/harness-prompt-runner.ts
+++ b/apps/native/components/site/harness-prompt-runner.ts
@@ -23,11 +23,12 @@ type Props = {
setBusyFor(id: number, on: boolean): void; setHistory: Setter<string[]>;
pinsRef: Ref<Record<number, BrowserPin[]>>; handleOf(id: number): string;
setPins(id: number, pins: BrowserPin[]): void; requireSession(id: number): Promise<string>;
+ sessionIsCurrent(id: number, sessionId: string): boolean;
prepareModel(id: number): Promise<void>;
adoptCatalog(id: number): Promise<void>; refreshStored(): Promise<void>;
takeQueuedPrompt(id: number): QueuedPrompt | undefined;
};
-export function createPromptRunner({onPermission, onStarted, onCompleted, runningRef, steerer, setFollowing, chatsRef, model, msgIdRef, setChats, setBusyFor, setHistory, pinsRef, handleOf, setPins, requireSession, prepareModel, adoptCatalog, refreshStored, takeQueuedPrompt, setCancelError}: Props) {
+export function createPromptRunner({onPermission, onStarted, onCompleted, runningRef, steerer, setFollowing, chatsRef, model, msgIdRef, setChats, setBusyFor, setHistory, pinsRef, handleOf, setPins, requireSession, sessionIsCurrent, prepareModel, adoptCatalog, refreshStored, takeQueuedPrompt, setCancelError}: Props) {
const patchAssistant = (chatId: number, msgId: number, next: AssistantTurn) => {
setChats((current) =>
current.map((c) =>
@@ -86,7 +87,8 @@ export function createPromptRunner({onPermission, onStarted, onCompleted, runnin
// so the agent can drive the same page; they are spent on send. Behind,
// not ahead: graff titles the session from the message's first line.
let wire = trimmed;
- const pins = /^\/(effort|reasoning|fast)(?:\s|$)/.test(trimmed) ? [] : pinsRef.current[chatId] ?? [];
+ const settingsCommand = /^\/(effort|reasoning|fast)(?:\s|$)/.test(trimmed);
+ const pins = settingsCommand ? [] : pinsRef.current[chatId] ?? [];
if (pins.length > 0) {
const handle = await browserHandle(handleOf(chatId)).catch(() => null);
const blocks = [annotationsBlock(pins.filter((p) => p.source !== "extension"), handle),
@@ -97,9 +99,13 @@ export function createPromptRunner({onPermission, onStarted, onCompleted, runnin
let turn: AssistantTurn = { ...emptyTurn(), model: spawnModel, startedAt: Date.now() };
const painter = createTurnPainter<AssistantTurn>(next => patchAssistant(chatId, asstId, next));
const startedAt = Date.now();
+ let sessionId: string | null = null;
+ let configChanged = false;
+ let promptCompleted = false;
try {
await prepareModel(chatId);
const id = await requireSession(chatId);
+ sessionId = id;
if (editN) {
for await (const _ of prompt(handleOf(chatId), id, `/edit ${editN} ${trimmed}`)) { /* rewind only */ }
}
@@ -107,6 +113,7 @@ export function createPromptRunner({onPermission, onStarted, onCompleted, runnin
painter.update(turn);
for await (const update of prompt(handleOf(chatId), id, wire)) {
if (update.sessionUpdate === "gui_permission") { onPermission?.(chatId, update.permission as PermissionRequest); continue; }
+ if (update.sessionUpdate === "config_option_update") configChanged = true;
// The bridge acknowledges prompt dispatch before model output, so
// queued steering can cancel even during a slow first response.
if (update.sessionUpdate === "gui_turn_end") steerer.finish(chatId);
@@ -115,10 +122,10 @@ export function createPromptRunner({onPermission, onStarted, onCompleted, runnin
if (turn.thoughtMs === undefined && turn.status !== "thinking") turn = { ...turn, thoughtMs: Date.now() - startedAt };
painter.update(turn);
}
+ promptCompleted = true;
// The turn carried pins, so the agent most likely changed the page:
// reload the chat's tab so the pane shows the result without a click.
if (pins.length > 0) void browserNav(handleOf(chatId), "reload").catch(() => undefined);
- if (/^\/(effort|reasoning|fast)(?:\s|$)/.test(trimmed)) void adoptCatalog(chatId);
turn = finishAcpTurn(turn);
painter.finish(turn);
if (turn.status === "done" && !turn.error) {
@@ -135,6 +142,11 @@ export function createPromptRunner({onPermission, onStarted, onCompleted, runnin
steerer.finish(chatId);
runningRef.current.delete(chatId);
setBusyFor(chatId, false);
+ // A turn may change effort without a slash command. Refresh once after
+ // its stream ends, even on cancellation or a later transport error.
+ if ((configChanged || (settingsCommand && promptCompleted)) && sessionId && sessionIsCurrent(chatId, sessionId)) {
+ void adoptCatalog(chatId).catch(() => undefined);
+ }
void refreshStored();
setTimeout(() => void refreshStored(), 2500);
const next = takeQueuedPrompt(chatId);
diff --git a/apps/native/components/site/useHarnessSessions.ts b/apps/native/components/site/useHarnessSessions.ts
index f7596ec5..ff17bfaa 100644
--- a/apps/native/components/site/useHarnessSessions.ts
+++ b/apps/native/components/site/useHarnessSessions.ts
@@ -64,12 +64,13 @@ 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 sessionId = sessionsRef.current.get(chatId);
+ const handle = sessionId ? handleOf(chatId) : undefined;
const cwd = cwdOf(chatId);
setCatalogStatus(old => ({ ...old, [chatId]: { loading: true } }));
try {
const catalog = await fetchModels(handle, cwd);
- if (cwdOf(chatId) !== cwd) {
+ if (cwdOf(chatId) !== cwd || sessionsRef.current.get(chatId) !== sessionId || !chatsRef.current.some(chat => chat.id === chatId)) {
setCatalogStatus(old => ({ ...old, [chatId]: { loading: false } }));
return;
}
diff --git a/apps/native/lib/acp-client-stream.test.ts b/apps/native/lib/acp-client-stream.test.ts
index 4b4fe53b..b985f80e 100644
--- a/apps/native/lib/acp-client-stream.test.ts
+++ b/apps/native/lib/acp-client-stream.test.ts
@@ -1,6 +1,8 @@
import {test} from 'node:test';
import assert from 'node:assert/strict';
import {prompt} from './acp-client';
+import {createPromptRunner} from '../components/site/harness-prompt-runner';
+import {createQueueSteerer} from './prompt-queue-steer';
const chunk = {method:'session/update',params:{sessionId:'test',update:{sessionUpdate:'agent_message_chunk',content:{type:'text',text:'Visible partial reply'}}}};
async function withWire(lines:unknown[], body:(received:unknown[])=>Promise<void>) {
const original=globalThis.fetch, received:unknown[]=[];
@@ -57,3 +59,53 @@ test('a terminal reply is authoritative even if the connection fails immediately
assert.deepEqual(received, [{sessionUpdate:'gui_turn_end',stopReason:'end_turn'}]);
} finally { globalThis.fetch = original; }
});
+
+test('prompt catalog refresh follows configuration updates once after this chat turn', async () => {
+ const savedFetch = globalThis.fetch;
+ const savedWindow = globalThis.window;
+ const savedFrame = globalThis.requestAnimationFrame;
+ const savedCancelFrame = globalThis.cancelAnimationFrame;
+ globalThis.window = { localStorage: { setItem() {} } } as unknown as Window & typeof globalThis;
+ globalThis.requestAnimationFrame = callback => setTimeout(callback, 0) as unknown as number;
+ globalThis.cancelAnimationFrame = id => clearTimeout(id);
+ const update = { method: 'session/update', params: { sessionId: 's1', update: { sessionUpdate: 'config_option_update', configOptions: [] } } };
+ const terminal = { id: 1, result: { stopReason: 'end_turn' } };
+ let lines: unknown[] = [];
+ globalThis.fetch = async () => new Response(lines.map(line => JSON.stringify(line)).join('\n') + '\n');
+ try {
+ const run = async (text: string, reply: unknown[], current = true) => {
+ lines = reply;
+ const chatsRef = { current: [{ id: 1, title: 'Existing chat', messages: [] }] };
+ const runningRef = { current: new Set<number>() };
+ const msgIdRef = { current: 0 };
+ let refreshes = 0;
+ const steerer = createQueueSteerer({ getQueue: () => [], setQueue: () => {}, status: () => {} });
+ const runner = createPromptRunner({
+ onStarted() {}, onCompleted() {}, runningRef, steerer, setFollowing() {}, chatsRef,
+ model: null, msgIdRef, setChats: action => { chatsRef.current = typeof action === 'function' ? action(chatsRef.current) : action; },
+ setCancelError() {}, setBusyFor() {}, setHistory() {}, pinsRef: { current: {} },
+ handleOf: id => `test:${id}`, setPins() {}, requireSession: async () => 's1',
+ sessionIsCurrent: (id, sessionId) => current && id === 1 && sessionId === 's1',
+ prepareModel: async () => {}, adoptCatalog: async () => {
+ assert.equal(runningRef.current.has(1), false, 'refresh starts after turn cleanup');
+ refreshes++;
+ }, refreshStored: async () => {}, takeQueuedPrompt: () => undefined,
+ });
+ await runner(1, text);
+ return refreshes;
+ };
+ assert.equal(await run('ordinary prompt', [update, update, terminal]), 1, 'repeated updates coalesce');
+ assert.equal(await run('ordinary prompt', [terminal]), 0, 'unrelated turns do not refresh');
+ assert.equal(await run('/effort high', [terminal]), 1, 'existing slash refresh remains');
+ assert.equal(await run('/effort high', [update, terminal]), 1, 'slash and update still refresh once');
+ assert.equal(await run('/effort high', [{ id: 1, error: { code: -32603, message: 'rejected' } }]), 0, 'rejected slash change does not refresh');
+ assert.equal(await run('ordinary prompt', [update, { id: 1, result: { stopReason: 'cancelled' } }]), 1, 'cancelled turn still reconciles a reported change');
+ assert.equal(await run('ordinary prompt', [update, { id: 1, error: { code: -32603, message: 'stopped' } }]), 1, 'later failure still reconciles a reported change');
+ assert.equal(await run('ordinary prompt', [update, terminal], false), 0, 'replaced session cannot refresh another worker');
+ } finally {
+ globalThis.fetch = savedFetch;
+ globalThis.window = savedWindow;
+ globalThis.requestAnimationFrame = savedFrame;
+ globalThis.cancelAnimationFrame = savedCancelFrame;
+ }
+});