The best way to control Claude Code, Codex and more from any computer or phone
fix(web): keep model favorites usable after disabling a provider (#23479)
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Julius Marminge committed
Nov 11, 2026 at 11:57 UTC
cff8bfcef0ca6c73080a673508d7c91a8913c8d3
4 files changed
+102
-3
apps/web/src/components/chat/ModelPickerContent.tsx
+17
-1
@@ -416,7 +416,23 @@ export const ModelPickerContent = memo(function ModelPickerContent(props: {
416
) {
417
return props.activeInstanceId;
418
}
419
- return favorites.length > 0 ? "favorites" : props.activeInstanceId;
419
+ const hasPickableFavorite = favorites.some((favorite) => {
420
+ const entry = instanceEntries.find((entry) => entry.instanceId === favorite.provider);
421
+ return (
422
+ entry !== undefined &&
423
+ (modelOptionsByInstance.get(favorite.provider) ?? []).some(
424
+ (option) =>
425
+ option.slug === favorite.model &&
426
+ shouldIncludeModelPickerOption({
427
+ entry,
428
+ option,
429
+ activeInstanceId: props.activeInstanceId,
430
+ activeModel: activeModelSlug,
431
+ }),
432
+ )
433
+ );
434
+ });
435
+ return hasPickableFavorite ? "favorites" : props.activeInstanceId;
436
},
437
);
438
const favoritesSet = new Set(favorites.map((fav) => providerModelKey(fav.provider, fav.model)));
apps/web/src/components/chat/ProviderModelPicker.browser.test.tsx
+50
-1
@@ -1,4 +1,9 @@
1
-import { ProviderDriverKind, ProviderInstanceId, type ModelSelection } from "@t3tools/contracts";
1
+import {
2
+ DEFAULT_CLIENT_SETTINGS,
3
+ ProviderDriverKind,
4
+ ProviderInstanceId,
5
+ type ModelSelection,
6
+} from "@t3tools/contracts";
7
import { useState } from "react";
8
import { expect, it, vi } from "vite-plus/test";
9
import { page, userEvent } from "vite-plus/test/browser";
@@ -6,6 +11,7 @@ import { page, userEvent } from "vite-plus/test/browser";
11
import "~/index.css";
12
13
import { render } from "../../../test/render";
14
+import { __setClientSettingsForTests } from "../../hooks/useSettings";
15
import { deriveProviderInstanceEntries } from "../../providerInstances";
16
import { ProviderModelPicker } from "./ProviderModelPicker";
17
@@ -169,3 +175,46 @@ it("keeps a docked picker open after a pick and hands focus to that model's effo
175
await userEvent.keyboard("{Escape}");
176
await expect.element(search).not.toBeInTheDocument();
177
});
178
+
179
+it("opens on the active provider when every favorite belongs to a disabled provider", async () => {
180
+ const entries = deriveProviderInstanceEntries(
181
+ ["Codex", "Claude"].map((name) => ({
182
+ instanceId: ProviderInstanceId.make(name.toLowerCase()),
183
+ driver: ProviderDriverKind.make(name.toLowerCase()),
184
+ enabled: name === "Codex",
185
+ installed: true,
186
+ version: null,
187
+ status: "ready" as const,
188
+ auth: { status: "authenticated" as const },
189
+ checkedAt: "2026-01-01T00:00:00.000Z",
190
+ models: [
191
+ { slug: name.toLowerCase(), name: `${name} model`, isCustom: false, capabilities: {} },
192
+ ],
193
+ slashCommands: [],
194
+ skills: [],
195
+ })),
196
+ );
197
+ const [codex, claude] = entries;
198
+ __setClientSettingsForTests({
199
+ ...DEFAULT_CLIENT_SETTINGS,
200
+ favorites: [{ provider: claude!.instanceId, model: "claude" }],
201
+ });
202
+ using _settings = {
203
+ [Symbol.dispose]: () => __setClientSettingsForTests(DEFAULT_CLIENT_SETTINGS),
204
+ };
205
+
206
+ await using screen = await render(
207
+ <ProviderModelPicker
208
+ environmentId={null}
209
+ activeInstanceId={codex!.instanceId}
210
+ model="codex"
211
+ lockedProvider={null}
212
+ instanceEntries={entries}
213
+ modelOptionsByInstance={new Map(entries.map((entry) => [entry.instanceId, entry.models]))}
214
+ triggerAriaLabel="Choose model"
215
+ onInstanceModelChange={() => {}}
216
+ />,
217
+ );
218
+ await screen.getByRole("button", { name: "Choose model" }).click();
219
+ await expect.element(page.getByRole("option", { name: /Codex model/ })).toBeVisible();
220
+});
apps/web/src/components/settings/ProviderModelsSection.browser.test.tsx
new
+28
@@ -0,0 +1,28 @@
1
+import { ProviderDriverKind, ProviderInstanceId } from "@t3tools/contracts";
2
+import { expect, it, vi } from "vite-plus/test";
3
+
4
+import { render } from "../../../test/render";
5
+import { ProviderModelsSection } from "./ProviderModelsSection";
6
+
7
+it("lists a favorite the provider no longer reports so it can be unstarred", async () => {
8
+ const onToggleFavorite = vi.fn();
9
+ await using screen = await render(
10
+ <ProviderModelsSection
11
+ instanceId={ProviderInstanceId.make("claude")}
12
+ driverKind={ProviderDriverKind.make("claude")}
13
+ models={[]}
14
+ customModels={[]}
15
+ canManageCustomModels
16
+ hiddenModels={[]}
17
+ favoriteModels={["retired-model"]}
18
+ modelOrder={[]}
19
+ onChange={() => {}}
20
+ onHiddenModelsChange={() => {}}
21
+ onFavoriteModelsChange={() => {}}
22
+ onToggleFavorite={onToggleFavorite}
23
+ onModelOrderChange={() => {}}
24
+ />,
25
+ );
26
+ await screen.getByRole("button", { name: "Remove retired-model from favorites" }).click();
27
+ expect(onToggleFavorite).toHaveBeenCalledWith("retired-model");
28
+});
apps/web/src/components/settings/ProviderModelsSection.tsx
+7
-1
@@ -144,7 +144,13 @@ export function ProviderModelsSection({
144
const scrollToSlugRef = useRef<string | null>(null);
145
const hiddenModelSet = new Set(hiddenModels);
146
const favoriteModelSet = new Set(favoriteModels);
147
- const displayModels = groupModelsForDisplay(models, {
147
+ const reportedSlugs = new Set(models.map((model) => model.slug));
148
+ // A favorite the provider no longer reports (disabled, signed out, model removed)
149
+ // still needs a row, or its star could never be cleared.
150
+ const unreportedFavoriteModels = favoriteModels.flatMap((slug): ServerProviderModel[] =>
151
+ reportedSlugs.has(slug) ? [] : [{ slug, name: slug, isCustom: false, capabilities: null }],
152
+ );
153
+ const displayModels = groupModelsForDisplay([...models, ...unreportedFavoriteModels], {
154
favoriteModels: favoriteModelSet,
155
hiddenModels: hiddenModelSet,
156
modelOrder,