@devries-cameron20 / t3code-1 / commits / 506a0438a3
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

fix(web): keep Pi and ACP model selections during catalog gaps (#37528)

Co-authored-by: Julius Marminge <julius0216@outlook.com>

Wout Stiens committed Nov 16, 2026 at 07:48 UTC 506a0438a31733a16a7440919c16db54acd0c7ac
8 files changed +204 -93
apps/web/src/components/chat/ModelPickerContent.tsx
+2 -3
@@ -66,6 +66,7 @@ import {
66 type ProviderInstanceEntry,
67 } from "../../providerInstances";
68 import { providerModelKey, sortProviderModelItems } from "../../modelOrdering";
69 +import { hasRuntimeModelCatalog } from "../../providerModels";
70
71 type ModelPickerItem = {
72 slug: string;
@@ -113,9 +114,7 @@ function shouldIncludeModelPickerOption(input: {
114 if (isProviderInstancePickerReady(input.entry)) return true;
115 return (
116 input.entry.enabled &&
116 - (input.entry.driverKind === "opencode" ||
117 - input.entry.driverKind === "antigravity" ||
118 - input.entry.driverKind === "cursor") &&
117 + hasRuntimeModelCatalog(input.entry.driverKind) &&
118 input.entry.instanceId === input.activeInstanceId &&
119 input.option.slug === input.activeModel &&
120 input.option.isUnavailable === true
apps/web/src/components/chat/TraitsPicker.tsx
+2 -2
@@ -34,7 +34,7 @@ import {
34 MenuTrigger,
35 } from "../ui/menu";
36 import { useComposerDraftStore, DraftId } from "../../composerDraftStore";
37 -import { getProviderModelCapabilities } from "../../providerModels";
37 +import { getProviderModelCapabilities, keepsUnavailableModelOptions } from "../../providerModels";
38 import { cn } from "~/lib/utils";
39 import { Badge } from "../ui/badge";
40 import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
@@ -122,7 +122,7 @@ function getSelectedTraits(
122 ) {
123 const caps = getProviderModelCapabilities(models, model, provider, includePlanAgent);
124 const modelIsUnavailable =
125 - (provider === "opencode" || provider === "cursor") &&
125 + keepsUnavailableModelOptions(provider, model) &&
126 !models.some((candidate) => candidate.slug === normalizeModelSlug(model, provider));
127 const descriptors = modelIsUnavailable
128 ? buildUnavailableModelOptionDescriptors(
apps/web/src/components/chat/composerProviderState.test.tsx
+30 -17
@@ -147,25 +147,38 @@ describe("getComposerProviderState", () => {
147 expect(state.modelOptionsForDispatch).toEqual(selections(["agent", "build"]));
148 });
149
150 - it("preserves explicit options when the selected model is absent from the catalog", () => {
151 - const state = getComposerProviderState({
152 - provider: ProviderDriverKind.make("opencode"),
150 + it.each([
151 + {
152 + driver: "opencode",
153 model: "opencode/kimi-k3",
154 - models: [
155 - {
156 - slug: "opencode/big-pickle",
157 - name: "Big Pickle",
158 - isCustom: false,
159 - capabilities: {},
160 - },
161 - ],
162 - modelOptions: selections(["variant", "max"], ["agent", "build"]),
163 - });
154 + catalogModel: "opencode/big-pickle",
155 + options: selections(["variant", "max"], ["agent", "build"]),
156 + },
157 + {
158 + driver: "pi",
159 + model: "anthropic/claude-sonnet-4",
160 + catalogModel: "default",
161 + options: selections(["thinking", "high"]),
162 + },
163 + {
164 + driver: "acpRegistry",
165 + model: "gateway/chosen-model",
166 + catalogModel: "default",
167 + options: selections(["reasoning", "high"]),
168 + },
169 + ])(
170 + "preserves explicit $driver options when the selected model is absent from the catalog",
171 + ({ driver, model, catalogModel, options }) => {
172 + const state = getComposerProviderState({
173 + provider: ProviderDriverKind.make(driver),
174 + model,
175 + models: [{ slug: catalogModel, name: catalogModel, isCustom: false, capabilities: {} }],
176 + modelOptions: options,
177 + });
178
165 - expect(state.modelOptionsForDispatch).toEqual(
166 - selections(["variant", "max"], ["agent", "build"]),
167 - );
168 - });
179 + expect(state.modelOptionsForDispatch).toEqual(options);
180 + },
181 + );
182
183 it("validates options for a known model selected through a legacy alias", () => {
184 const state = getComposerProviderState({
apps/web/src/components/chat/composerProviderState.tsx
+2 -2
@@ -17,7 +17,7 @@ import {
17 } from "@t3tools/shared/model";
18
19 import type { DraftId } from "../../composerDraftStore";
20 -import { getProviderModelCapabilities } from "../../providerModels";
20 +import { getProviderModelCapabilities, keepsUnavailableModelOptions } from "../../providerModels";
21 import {
22 getReasoningTraitStep,
23 type PromptUltrathink,
@@ -86,7 +86,7 @@ export function getComposerProviderState(input: ComposerProviderStateInput): Com
86 promptInjectionState = "none",
87 includePlanAgent,
88 } = input;
89 - if (provider === "opencode" || provider === "cursor") {
89 + if (keepsUnavailableModelOptions(provider, model)) {
90 const normalizedModel = normalizeModelSlug(model, provider);
91 const modelIsInCatalog = models.some((candidate) => candidate.slug === normalizedModel);
92 if (!modelIsInCatalog) {
apps/web/src/modelSelection.test.ts
+62 -57
@@ -394,6 +394,16 @@ describe("instance-scoped model selection", () => {
394 });
395
396 describe.each([
397 + {
398 + driverName: "pi",
399 + availableModel: "default",
400 + missingModel: "anthropic/claude-sonnet-4",
401 + },
402 + {
403 + driverName: "acpRegistry",
404 + availableModel: "default",
405 + missingModel: "gateway/chosen-model",
406 + },
407 {
408 driverName: "opencode",
409 availableModel: "opencode/big-pickle",
@@ -662,66 +672,61 @@ describe("instance-scoped model selection", () => {
672 }
673 });
674
665 - it("resolves the Antigravity default marker without creating an unavailable model", () => {
666 - const instanceId = ProviderInstanceId.make("antigravity_work");
667 - const nativeModel = "gemini-3.1-pro";
668 - const base = provider({
669 - provider: ProviderDriverKind.make("antigravity"),
670 - instanceId,
671 - models: [nativeModel],
672 - });
673 - const liveProvider = {
674 - ...base,
675 - models: base.models.map((model) => ({
676 - ...model,
677 - isDefault: true,
678 - aliases: [ANTIGRAVITY_DEFAULT_MODEL],
679 - })),
680 - };
681 - const settings = settingsWithProviderInstances();
682 -
683 - expect(
684 - getAppModelOptionsForInstance(
685 - settings,
686 - deriveProviderInstanceEntries([liveProvider])[0]!,
687 - ANTIGRAVITY_DEFAULT_MODEL,
688 - ).map((model) => model.slug),
689 - ).toEqual([nativeModel]);
690 - expect(
691 - resolveAppModelSelectionForInstance(
675 + it.each([
676 + { driver: "antigravity", marker: ANTIGRAVITY_DEFAULT_MODEL, nativeModel: "gemini-3.1-pro" },
677 + { driver: "acpRegistry", marker: "default", nativeModel: "agent-model" },
678 + ])(
679 + "resolves the $driver default marker without creating an unavailable model",
680 + ({ driver, marker, nativeModel }) => {
681 + const instanceId = ProviderInstanceId.make(`${driver}_work`);
682 + const base = provider({
683 + provider: ProviderDriverKind.make(driver),
684 instanceId,
693 - settings,
694 - [liveProvider],
695 - ANTIGRAVITY_DEFAULT_MODEL,
696 - {
685 + models: [nativeModel],
686 + });
687 + const liveProvider = {
688 + ...base,
689 + models: base.models.map((model) => ({
690 + ...model,
691 + isDefault: true,
692 + ...(driver === "antigravity" ? { aliases: [marker] } : {}),
693 + })),
694 + };
695 + const settings = settingsWithProviderInstances();
696 +
697 + expect(
698 + getAppModelOptionsForInstance(
699 + settings,
700 + deriveProviderInstanceEntries([liveProvider])[0]!,
701 + marker,
702 + ).map((model) => model.slug),
703 + ).toEqual([nativeModel]);
704 + expect(
705 + resolveAppModelSelectionForInstance(instanceId, settings, [liveProvider], marker, {
706 preserveUnavailableSelection: true,
698 - },
699 - ),
700 - ).toBe(nativeModel);
707 + }),
708 + ).toBe(nativeModel);
709
702 - const hiddenSettings: UnifiedSettings = {
703 - ...settings,
704 - providerModelPreferences: {
705 - [instanceId]: { hiddenModels: [nativeModel], modelOrder: [] },
706 - },
707 - };
708 - expect(
709 - resolveAppModelSelectionForInstance(
710 - instanceId,
711 - hiddenSettings,
712 - [liveProvider],
713 - ANTIGRAVITY_DEFAULT_MODEL,
714 - { preserveUnavailableSelection: true },
715 - ),
716 - ).toBeNull();
717 - expect(
718 - getAppModelOptionsForInstance(
719 - settings,
720 - deriveProviderInstanceEntries([{ ...base, models: [] }])[0]!,
721 - ANTIGRAVITY_DEFAULT_MODEL,
722 - ),
723 - ).toEqual([]);
724 - });
710 + const hiddenSettings: UnifiedSettings = {
711 + ...settings,
712 + providerModelPreferences: {
713 + [instanceId]: { hiddenModels: [nativeModel], modelOrder: [] },
714 + },
715 + };
716 + expect(
717 + resolveAppModelSelectionForInstance(instanceId, hiddenSettings, [liveProvider], marker, {
718 + preserveUnavailableSelection: true,
719 + }),
720 + ).toBeNull();
721 + expect(
722 + getAppModelOptionsForInstance(
723 + settings,
724 + deriveProviderInstanceEntries([{ ...base, models: [] }])[0]!,
725 + marker,
726 + ),
727 + ).toEqual([]);
728 + },
729 + );
730
731 it("preserves saved options through dispatch when the model is absent from the catalog", () => {
732 const instanceId = ProviderInstanceId.make("opencode");
apps/web/src/modelSelection.ts
+6 -12
@@ -1,5 +1,4 @@
1 import {
2 - ANTIGRAVITY_DEFAULT_MODEL,
2 DEFAULT_TEXT_GENERATION_MODEL,
3 DEFAULT_TEXT_GENERATION_MODEL_BY_PROVIDER,
4 defaultInstanceIdForDriver,
@@ -26,6 +25,8 @@ import * as Result from "effect/Result";
25 import {
26 getDefaultServerModel,
27 getProviderModels,
28 + hasRuntimeModelCatalog,
29 + isRuntimeModelDefaultAlias,
30 resolveSelectableProvider,
31 } from "./providerModels";
32 import { ModelEsque } from "./components/chat/providerIconUtils";
@@ -80,12 +81,10 @@ function appendUnavailableDynamicModelSelection(
81 selectedModel: string | null | undefined,
82 hiddenModels: ReadonlyArray<string>,
83 ): AppModelOption[] {
83 - if (provider !== "opencode" && provider !== "antigravity" && provider !== "cursor") {
84 - return options;
85 - }
84 + if (!hasRuntimeModelCatalog(provider)) return options;
85 const slug = normalizeCustomModelSlug(selectedModel);
86 if (!slug) return options;
88 - if (provider === "antigravity" && slug === ANTIGRAVITY_DEFAULT_MODEL) return options;
87 + if (isRuntimeModelDefaultAlias(provider, slug)) return options;
88
89 if (resolveSelectableModel(provider, slug, rawModels) !== null) return options;
90 if (hiddenModels.includes(slug)) return options;
@@ -282,19 +281,14 @@ export function resolveAppModelSelectionForInstance(
281 if (resolvedSelection) {
282 return resolvedSelection;
283 }
285 - if (
286 - resolutionOptions?.preserveUnavailableSelection &&
287 - (entry.driverKind === "opencode" ||
288 - entry.driverKind === "antigravity" ||
289 - entry.driverKind === "cursor")
290 - ) {
284 + if (resolutionOptions?.preserveUnavailableSelection && hasRuntimeModelCatalog(entry.driverKind)) {
285 const unavailableSelection = normalizeCustomModelSlug(selectedModel);
286 const hiddenModels = readInstanceModelPreferences(settings, entry.instanceId).hiddenModels;
287 if (
288 unavailableSelection &&
289 !hiddenModels.includes(unavailableSelection) &&
290 resolveSelectableModel(entry.driverKind, selectedModel, entry.models) === null &&
297 - (entry.driverKind !== "antigravity" || unavailableSelection !== ANTIGRAVITY_DEFAULT_MODEL)
291 + !isRuntimeModelDefaultAlias(entry.driverKind, unavailableSelection)
292 ) {
293 return unavailableSelection;
294 }
apps/web/src/providerModels.ts
+35
@@ -14,6 +14,41 @@ const EMPTY_CAPABILITIES: ModelCapabilities = createModelCapabilities({
14 optionDescriptors: [],
15 });
16 const DEFAULT_DRIVER_KIND = ProviderDriverKind.make("codex");
17 +const RUNTIME_MODEL_CATALOG_DRIVERS: ReadonlySet<string> = new Set([
18 + "opencode",
19 + "antigravity",
20 + "cursor",
21 + "pi",
22 + "acpRegistry",
23 +]);
24 +
25 +// These drivers discover models at runtime, so a refresh can briefly omit a model the user chose.
26 +export function hasRuntimeModelCatalog(provider: ProviderDriverKind): boolean {
27 + return RUNTIME_MODEL_CATALOG_DRIVERS.has(provider);
28 +}
29 +
30 +// These markers follow the session's current model rather than naming an unavailable model.
31 +export function isRuntimeModelDefaultAlias(
32 + provider: ProviderDriverKind,
33 + model: string | null | undefined,
34 +): boolean {
35 + return (
36 + (provider === "antigravity" || provider === "acpRegistry") &&
37 + model === DEFAULT_MODEL_BY_PROVIDER[provider]
38 + );
39 +}
40 +
41 +// Antigravity lists its default model only as an alias, which a slug lookup would call missing.
42 +export function keepsUnavailableModelOptions(
43 + provider: ProviderDriverKind,
44 + model: string | null | undefined,
45 +): boolean {
46 + return (
47 + provider !== "antigravity" &&
48 + !isRuntimeModelDefaultAlias(provider, model) &&
49 + hasRuntimeModelCatalog(provider)
50 + );
51 +}
52
53 export function formatProviderDriverKindLabel(provider: ProviderDriverKind): string {
54 return provider
scripts/scenarios/pi-catalog-gap-keeps-chosen-model.e2e.ts new
+65
@@ -0,0 +1,65 @@
1 +// @effect-diagnostics nodeBuiltinImport:off - the scenario writes a fake Pi CLI and its settings.
2 +import * as NodeFSP from "node:fs/promises";
3 +import * as NodePath from "node:path";
4 +
5 +import { expect } from "e2e";
6 +
7 +import { T3_HOME } from "../e2e.config.ts";
8 +import { makeState, runPromise, test, WEB } from "./t3.ts";
9 +
10 +const CHOSEN_MODEL = "anthropic/claude-sonnet-4";
11 +// A supported Pi whose RPC discovery fails, so its catalog falls back to the "default" alias.
12 +const FAKE_PI = `#!/bin/sh
13 +if [ "$1" = "--version" ]; then echo "0.84.3"; exit 0; fi
14 +echo "scenario Pi cannot list models" >&2
15 +exit 1
16 +`;
17 +
18 +test(
19 + "A Pi model chosen in Settings is still the one sent while Pi cannot list its models",
20 + WEB,
21 + async ({ t3, app, screen, browser }) => {
22 + const project = await t3.project("demo");
23 + const fakePi = NodePath.join(T3_HOME, "bin/fake-pi");
24 + const settingsPath = NodePath.join(T3_HOME, "userdata/settings.json");
25 + const originalSettings = await NodeFSP.readFile(settingsPath, "utf8");
26 + const settings = JSON.parse(originalSettings);
27 + try {
28 + await NodeFSP.writeFile(fakePi, FAKE_PI, { mode: 0o755 });
29 + settings.providerInstances.pi = {
30 + driver: "pi",
31 + enabled: true,
32 + config: { binaryPath: fakePi },
33 + };
34 + settings.defaultModelSelection = { instanceId: "pi", model: CHOSEN_MODEL };
35 + await NodeFSP.writeFile(settingsPath, JSON.stringify(settings));
36 +
37 + await t3.open();
38 + // The composer shows a Pi model once the settings watcher has enabled Pi.
39 + await expect(browser.locator("[data-chat-provider-model-picker-label]").first()).toHaveText(
40 + /sonnet|default/i,
41 + { timeout: 60_000 },
42 + );
43 + await app.screenshot("composer");
44 +
45 + await screen.getByRole("textbox").fill("Which model is this?");
46 + await screen.getByRole("textbox").press("Enter");
47 + const { cli } = makeState(T3_HOME);
48 + await expect
49 + .poll(
50 + async () => {
51 + const listed = await runPromise(
52 + cli(["thread", "list", "--project", project, "--json"]),
53 + );
54 + const threads = JSON.parse(listed.stdout) as Array<{ model: string }>;
55 + return threads[0]?.model ?? null;
56 + },
57 + { timeout: 30_000 },
58 + )
59 + .toBe(CHOSEN_MODEL);
60 + } finally {
61 + await NodeFSP.writeFile(settingsPath, originalSettings);
62 + await NodeFSP.rm(fakePi, { force: true });
63 + }
64 + },
65 +);