Skip to content

Commit 40a6235

Browse files
committed
Reset stale picker state on context changes
- Clear MCP server loads when thread or environment changes - Keep model picker aligned with the active provider and favorites state - Add regression coverage for open-menu rerenders and stale responses
1 parent a6da0ea commit 40a6235

4 files changed

Lines changed: 288 additions & 5 deletions

File tree

‎apps/web/src/components/chat/McpToggleButton.browser.tsx‎

Lines changed: 117 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ vi.mock("~/environmentApi", () => ({
2727
import { McpToggleButton } from "./McpToggleButton";
2828

2929
const THREAD_ID = ThreadId.make("thread-mcp-toggle-browser");
30+
const SECOND_THREAD_ID = ThreadId.make("thread-mcp-toggle-browser-2");
3031
const ENVIRONMENT_ID = EnvironmentId.make("environment-mcp-toggle-browser");
3132

3233
function createServer(name: string, status: McpServerSnapshot["status"]): McpServerSnapshot {
@@ -40,16 +41,26 @@ function isLoadingRowVisible(): boolean {
4041
return document.querySelector('[data-mcp-loading-state="visible"]') !== null;
4142
}
4243

43-
async function mountButton() {
44+
async function mountButton(props?: { threadId?: ThreadId; environmentId?: EnvironmentId }) {
4445
const host = document.createElement("div");
4546
document.body.append(host);
47+
const threadId = props?.threadId ?? THREAD_ID;
48+
const environmentId = props?.environmentId ?? ENVIRONMENT_ID;
4649

4750
const screen = await render(
48-
<McpToggleButton environmentId={ENVIRONMENT_ID} threadId={THREAD_ID} />,
51+
<McpToggleButton environmentId={environmentId} threadId={threadId} />,
4952
{ container: host },
5053
);
5154

5255
return {
56+
rerender: async (nextProps?: { threadId?: ThreadId; environmentId?: EnvironmentId }) => {
57+
await screen.rerender(
58+
<McpToggleButton
59+
environmentId={nextProps?.environmentId ?? environmentId}
60+
threadId={nextProps?.threadId ?? threadId}
61+
/>,
62+
);
63+
},
5364
cleanup: async () => {
5465
await screen.unmount();
5566
host.remove();
@@ -146,4 +157,108 @@ describe("McpToggleButton", () => {
146157
await mounted.cleanup();
147158
}
148159
});
160+
161+
it("clears stale servers when the thread changes while the menu stays open", async () => {
162+
let resolveCurrentListServers: (value: {
163+
servers: ReadonlyArray<McpServerSnapshot>;
164+
}) => void = () => {
165+
throw new Error("Expected MCP list resolver to be captured.");
166+
};
167+
const listServers = vi.fn(
168+
({ threadId }: { threadId: ThreadId }) =>
169+
new Promise<{ servers: ReadonlyArray<McpServerSnapshot> }>((resolve) => {
170+
resolveCurrentListServers = resolve;
171+
if (threadId === THREAD_ID) {
172+
resolve({ servers: [createServer("filesystem", "connected")] });
173+
}
174+
}),
175+
);
176+
environmentApiById.set(ENVIRONMENT_ID, {
177+
mcp: {
178+
listServers,
179+
toggleServer: vi.fn(async () => undefined),
180+
},
181+
});
182+
183+
const mounted = await mountButton();
184+
185+
try {
186+
await page.getByRole("button", { name: "MCP" }).click();
187+
188+
await expect.element(page.getByText("filesystem")).toBeVisible();
189+
190+
await mounted.rerender({ threadId: SECOND_THREAD_ID });
191+
192+
await vi.waitFor(() => {
193+
expect(listServers).toHaveBeenCalledTimes(2);
194+
});
195+
196+
expect(document.body.textContent ?? "").not.toContain("filesystem");
197+
198+
resolveCurrentListServers({ servers: [createServer("github", "connected")] });
199+
await vi.runAllTimersAsync();
200+
201+
await expect.element(page.getByText("github")).toBeVisible();
202+
expect(document.body.textContent ?? "").not.toContain("filesystem");
203+
} finally {
204+
await mounted.cleanup();
205+
}
206+
});
207+
208+
it("ignores a late response from a closed menu before reopening", async () => {
209+
let requestCount = 0;
210+
let resolveFirstListServers: (value: {
211+
servers: ReadonlyArray<McpServerSnapshot>;
212+
}) => void = () => {
213+
throw new Error("Expected first MCP list resolver to be captured.");
214+
};
215+
let resolveSecondListServers: (value: {
216+
servers: ReadonlyArray<McpServerSnapshot>;
217+
}) => void = () => {
218+
throw new Error("Expected second MCP list resolver to be captured.");
219+
};
220+
const listServers = vi.fn(
221+
() =>
222+
new Promise<{ servers: ReadonlyArray<McpServerSnapshot> }>((resolve) => {
223+
requestCount += 1;
224+
if (requestCount === 1) {
225+
resolveFirstListServers = resolve;
226+
return;
227+
}
228+
resolveSecondListServers = resolve;
229+
}),
230+
);
231+
environmentApiById.set(ENVIRONMENT_ID, {
232+
mcp: {
233+
listServers,
234+
toggleServer: vi.fn(async () => undefined),
235+
},
236+
});
237+
238+
const mounted = await mountButton();
239+
240+
try {
241+
const trigger = page.getByRole("button", { name: "MCP", exact: true });
242+
await trigger.click();
243+
await trigger.click();
244+
resolveFirstListServers({ servers: [createServer("filesystem", "connected")] });
245+
await vi.runAllTimersAsync();
246+
247+
await trigger.click();
248+
249+
await vi.waitFor(() => {
250+
expect(listServers).toHaveBeenCalledTimes(2);
251+
});
252+
253+
expect(document.body.textContent ?? "").not.toContain("filesystem");
254+
255+
resolveSecondListServers({ servers: [createServer("github", "connected")] });
256+
await vi.runAllTimersAsync();
257+
258+
await expect.element(page.getByText("github")).toBeVisible();
259+
expect(document.body.textContent ?? "").not.toContain("filesystem");
260+
} finally {
261+
await mounted.cleanup();
262+
}
263+
});
149264
});

‎apps/web/src/components/chat/McpToggleButton.tsx‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,13 @@ export const McpToggleButton = memo(function McpToggleButton(props: {
6666
}
6767
}, []);
6868

69+
const invalidateLoads = useCallback(() => {
70+
loadGenerationRef.current += 1;
71+
clearLoadingIndicatorDelay();
72+
setIsLoading(false);
73+
setShowLoadingIndicator(false);
74+
}, [clearLoadingIndicatorDelay]);
75+
6976
const queueLoadingIndicator = useCallback(
7077
(generation: number) => {
7178
clearLoadingIndicatorDelay();
@@ -118,15 +125,22 @@ export const McpToggleButton = memo(function McpToggleButton(props: {
118125
}
119126
}, [api, clearLoadingIndicatorDelay, queueLoadingIndicator, threadId]);
120127

128+
useEffect(() => {
129+
setPendingServerNames(new Set());
130+
setServers([]);
131+
setHasResolvedServers(false);
132+
setLoadingError(null);
133+
invalidateLoads();
134+
}, [environmentId, invalidateLoads, threadId]);
135+
121136
useEffect(() => {
122137
if (!open) {
123-
clearLoadingIndicatorDelay();
124-
setShowLoadingIndicator(false);
138+
invalidateLoads();
125139
return;
126140
}
127141

128142
void loadServers();
129-
}, [clearLoadingIndicatorDelay, loadServers, open]);
143+
}, [invalidateLoads, loadServers, open]);
130144

131145
useEffect(() => () => clearLoadingIndicatorDelay(), [clearLoadingIndicatorDelay]);
132146

‎apps/web/src/components/chat/ModelPickerContent.tsx‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
109109
[providedKeybindings],
110110
);
111111
const { updateSettings } = useUpdateSettings();
112+
const availableInstanceIds = useMemo(
113+
() => new Set(instanceEntries.map((entry) => entry.instanceId)),
114+
[instanceEntries],
115+
);
112116

113117
const focusSearchInput = useCallback(() => {
114118
searchInputRef.current?.focus({ preventScroll: true });
@@ -124,6 +128,21 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
124128
[focusSearchInput],
125129
);
126130

131+
useEffect(() => {
132+
setSelectedInstanceId((current) => {
133+
if (props.lockedProvider !== null) {
134+
return props.activeInstanceId;
135+
}
136+
if (current === "favorites") {
137+
return favorites.length > 0 ? current : props.activeInstanceId;
138+
}
139+
if (!availableInstanceIds.has(current)) {
140+
return props.activeInstanceId;
141+
}
142+
return current === props.activeInstanceId ? current : props.activeInstanceId;
143+
});
144+
}, [availableInstanceIds, favorites.length, props.activeInstanceId, props.lockedProvider]);
145+
127146
useLayoutEffect(() => {
128147
focusSearchInput();
129148
const frame = window.requestAnimationFrame(() => {

‎apps/web/src/components/chat/ProviderModelPicker.browser.tsx‎

Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,40 @@ async function mountPicker(props: {
289289
get onProviderModelChange() {
290290
return onInstanceModelChange;
291291
},
292+
rerender: async (nextProps: {
293+
activeInstanceId?: ProviderInstanceId;
294+
model: string;
295+
lockedProvider: ProviderDriverKind | null;
296+
lockedContinuationGroupKey?: string | null;
297+
providers?: ReadonlyArray<ServerProvider>;
298+
settings?: UnifiedSettings;
299+
triggerVariant?: "ghost" | "outline";
300+
}) => {
301+
const nextProviders = nextProps.providers ?? TEST_PROVIDERS;
302+
const nextActiveInstanceId = nextProps.activeInstanceId ?? CODEX_INSTANCE_ID;
303+
const nextInstanceEntries = sortProviderInstanceEntries(
304+
deriveProviderInstanceEntries(nextProviders),
305+
);
306+
const nextModelOptionsByInstance = getCustomModelOptionsByInstance(
307+
nextProps.settings ?? DEFAULT_UNIFIED_SETTINGS,
308+
nextProviders,
309+
nextActiveInstanceId,
310+
nextProps.model,
311+
);
312+
313+
await screen.rerender(
314+
<ProviderModelPicker
315+
activeInstanceId={nextActiveInstanceId}
316+
model={nextProps.model}
317+
lockedProvider={nextProps.lockedProvider}
318+
lockedContinuationGroupKey={nextProps.lockedContinuationGroupKey ?? null}
319+
instanceEntries={nextInstanceEntries}
320+
modelOptionsByInstance={nextModelOptionsByInstance}
321+
triggerVariant={nextProps.triggerVariant}
322+
onInstanceModelChange={onInstanceModelChange}
323+
/>,
324+
);
325+
},
292326
cleanup: async () => {
293327
await screen.unmount();
294328
host.remove();
@@ -372,6 +406,107 @@ describe("ProviderModelPicker", () => {
372406
}
373407
});
374408

409+
it("opens on the active provider even when favorites exist", async () => {
410+
localStorage.setItem(
411+
"t3code:client-settings:v1",
412+
JSON.stringify({
413+
...DEFAULT_CLIENT_SETTINGS,
414+
favorites: [{ provider: "codex", model: "gpt-5-codex" }],
415+
}),
416+
);
417+
418+
const mounted = await mountPicker({
419+
activeInstanceId: CLAUDE_INSTANCE_ID,
420+
model: "claude-opus-4-6",
421+
lockedProvider: null,
422+
});
423+
424+
try {
425+
await page.getByRole("button").click();
426+
427+
await vi.waitFor(() => {
428+
expect(getVisibleModelNames()).toEqual([
429+
"Claude Opus 4.6",
430+
"Claude Sonnet 4.6",
431+
"Claude Haiku 4.5",
432+
]);
433+
});
434+
} finally {
435+
localStorage.removeItem("t3code:client-settings:v1");
436+
await mounted.cleanup();
437+
}
438+
});
439+
440+
it("resyncs the visible model list when the active instance changes while open", async () => {
441+
const mounted = await mountPicker({
442+
activeInstanceId: CLAUDE_INSTANCE_ID,
443+
model: "claude-opus-4-6",
444+
lockedProvider: null,
445+
});
446+
447+
try {
448+
await page.getByRole("button").click();
449+
450+
await vi.waitFor(() => {
451+
expect(getVisibleModelNames()).toEqual([
452+
"Claude Opus 4.6",
453+
"Claude Sonnet 4.6",
454+
"Claude Haiku 4.5",
455+
]);
456+
});
457+
458+
await mounted.rerender({
459+
activeInstanceId: CODEX_INSTANCE_ID,
460+
model: "gpt-5-codex",
461+
lockedProvider: null,
462+
});
463+
464+
await vi.waitFor(() => {
465+
expect(getVisibleModelNames()).toEqual(["GPT-5 Codex", "GPT-5.3 Codex"]);
466+
});
467+
} finally {
468+
await mounted.cleanup();
469+
}
470+
});
471+
472+
it("falls back to the active provider when the favorites section becomes empty", async () => {
473+
localStorage.setItem(
474+
"t3code:client-settings:v1",
475+
JSON.stringify({
476+
...DEFAULT_CLIENT_SETTINGS,
477+
favorites: [{ provider: "claudeAgent", model: "claude-opus-4-6" }],
478+
}),
479+
);
480+
481+
const mounted = await mountPicker({
482+
activeInstanceId: CLAUDE_INSTANCE_ID,
483+
model: "claude-opus-4-6",
484+
lockedProvider: null,
485+
});
486+
487+
try {
488+
await page.getByRole("button").click();
489+
await page.getByRole("button", { name: "Favorites", exact: true }).click();
490+
491+
await vi.waitFor(() => {
492+
expect(getVisibleModelNames()).toEqual(["Claude Opus 4.6"]);
493+
});
494+
495+
await page.getByRole("button", { name: "Remove from favorites" }).click();
496+
497+
await vi.waitFor(() => {
498+
expect(getVisibleModelNames()).toEqual([
499+
"Claude Opus 4.6",
500+
"Claude Sonnet 4.6",
501+
"Claude Haiku 4.5",
502+
]);
503+
});
504+
} finally {
505+
localStorage.removeItem("t3code:client-settings:v1");
506+
await mounted.cleanup();
507+
}
508+
});
509+
375510
it("filters models by selected provider in sidebar", async () => {
376511
const mounted = await mountPicker({
377512
activeInstanceId: CLAUDE_INSTANCE_ID,

0 commit comments

Comments
 (0)