Skip to content

Commit e37e99d

Browse files
committed
fix(web): keep the saved default model when effort changes
Changing effort in Settings wrote the fallback from resolveDefaultProviderModelSelection, so a turned-off or unavailable provider was replaced by another model. The row now keeps the saved model, notes that its provider cannot run, and hides effort until that provider is back.
1 parent e287582 commit e37e99d

3 files changed

Lines changed: 281 additions & 19 deletions

File tree

Lines changed: 188 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,188 @@
1+
import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3tools/contracts";
2+
import { DEFAULT_UNIFIED_SETTINGS, type UnifiedSettings } from "@t3tools/contracts/settings";
3+
import { createModelSelection } from "@t3tools/shared/model";
4+
import { describe, expect, it } from "vite-plus/test";
5+
6+
import {
7+
applyProviderInstanceSettings,
8+
deriveProviderInstanceEntries,
9+
sortProviderInstanceEntries,
10+
} from "../../providerInstances";
11+
import {
12+
modelSelectionForEffortChange,
13+
resolveDefaultModelSettingsPresentation,
14+
} from "./ProjectDefaultsSettings.logic";
15+
16+
const claudeId = ProviderInstanceId.make("claudeAgent");
17+
const codexId = ProviderInstanceId.make("codex");
18+
const high = [{ id: "effort", value: "high" }];
19+
const savedClaude = createModelSelection(claudeId, "claude-opus-4-8", high);
20+
function provider(input: {
21+
instanceId: string;
22+
driver: string;
23+
enabled?: boolean;
24+
availability?: ServerProvider["availability"];
25+
models: ReadonlyArray<string>;
26+
}): ServerProvider {
27+
return {
28+
instanceId: ProviderInstanceId.make(input.instanceId),
29+
driver: ProviderDriverKind.make(input.driver),
30+
enabled: input.enabled ?? true,
31+
installed: true,
32+
version: null,
33+
status: "ready",
34+
...(input.availability ? { availability: input.availability } : {}),
35+
auth: { status: "authenticated" },
36+
checkedAt: "2026-01-01T00:00:00.000Z",
37+
models: input.models.map((slug, index) => ({
38+
slug,
39+
name: slug,
40+
isCustom: false,
41+
...(index === 0 ? { isDefault: true } : {}),
42+
capabilities: {},
43+
})),
44+
slashCommands: [],
45+
skills: [],
46+
};
47+
}
48+
49+
const claudeAndCodex = [
50+
provider({ instanceId: "codex", driver: "codex", models: ["gpt-5.6"] }),
51+
provider({ instanceId: "claudeAgent", driver: "claudeAgent", models: ["claude-opus-4-8"] }),
52+
];
53+
54+
function present(input: {
55+
providers: ReadonlyArray<ServerProvider>;
56+
saved: ReturnType<typeof createModelSelection> | null;
57+
settings?: UnifiedSettings;
58+
}) {
59+
const settings = input.settings ?? DEFAULT_UNIFIED_SETTINGS;
60+
return resolveDefaultModelSettingsPresentation({
61+
entries: sortProviderInstanceEntries(
62+
applyProviderInstanceSettings(deriveProviderInstanceEntries(input.providers), settings, null),
63+
),
64+
providers: input.providers,
65+
settings,
66+
saved: input.saved,
67+
});
68+
}
69+
70+
function claudeOff(): UnifiedSettings {
71+
return {
72+
...DEFAULT_UNIFIED_SETTINGS,
73+
providerInstances: {
74+
[claudeId]: { driver: ProviderDriverKind.make("claudeAgent"), enabled: false },
75+
},
76+
};
77+
}
78+
79+
describe("resolveDefaultModelSettingsPresentation", () => {
80+
it("keeps a saved model when its provider is turned off and locks effort", () => {
81+
const row = present({
82+
providers: claudeAndCodex.map((entry) =>
83+
entry.instanceId === claudeId ? { ...entry, enabled: false } : entry,
84+
),
85+
saved: savedClaude,
86+
settings: claudeOff(),
87+
});
88+
expect(row).toMatchObject({
89+
selection: savedClaude,
90+
effortLocked: true,
91+
note: "Claude is turned off.",
92+
});
93+
});
94+
95+
it("keeps the saved model when settings turn the provider off before the snapshot updates", () => {
96+
const row = present({ providers: claudeAndCodex, saved: savedClaude, settings: claudeOff() });
97+
expect(row.selection).toBe(savedClaude);
98+
expect(row.effortLocked).toBe(true);
99+
expect(row.note).toBe("Claude is turned off.");
100+
});
101+
102+
it("keeps the saved model when its provider is unavailable", () => {
103+
const row = present({
104+
providers: claudeAndCodex.map((entry) =>
105+
entry.instanceId === claudeId ? { ...entry, availability: "unavailable" as const } : entry,
106+
),
107+
saved: savedClaude,
108+
});
109+
expect(row).toMatchObject({
110+
selection: savedClaude,
111+
effortLocked: true,
112+
note: "Claude is unavailable.",
113+
});
114+
});
115+
116+
it("keeps the saved model when its provider is absent from this environment", () => {
117+
const row = present({
118+
providers: claudeAndCodex.filter((entry) => entry.instanceId !== claudeId),
119+
saved: savedClaude,
120+
});
121+
expect(row).toMatchObject({
122+
selection: savedClaude,
123+
effortLocked: true,
124+
note: "This provider is not available on this environment.",
125+
});
126+
});
127+
128+
it("leaves effort editable when the saved provider can run", () => {
129+
const row = present({ providers: claudeAndCodex, saved: savedClaude });
130+
expect(row.selection).toBe(savedClaude);
131+
expect(row.effortLocked).toBe(false);
132+
expect(row.note).toBeNull();
133+
});
134+
135+
it("shows the automatic fallback when nothing is saved", () => {
136+
const row = present({ providers: claudeAndCodex, saved: null });
137+
expect(row).toMatchObject({
138+
effortLocked: false,
139+
note: null,
140+
selection: { instanceId: codexId, model: "gpt-5.6" },
141+
});
142+
});
143+
144+
it("still follows a hidden model on the same provider", () => {
145+
const settings: UnifiedSettings = {
146+
...DEFAULT_UNIFIED_SETTINGS,
147+
providerModelPreferences: {
148+
[claudeId]: { hiddenModels: ["claude-opus-4-8"], modelOrder: [] },
149+
},
150+
};
151+
const row = present({
152+
providers: [
153+
provider({
154+
instanceId: "claudeAgent",
155+
driver: "claudeAgent",
156+
models: ["claude-sonnet-5", "claude-opus-4-8"],
157+
}),
158+
],
159+
saved: savedClaude,
160+
settings,
161+
});
162+
expect(row.effortLocked).toBe(false);
163+
expect(row.selection).toMatchObject({ instanceId: claudeId, model: "claude-sonnet-5" });
164+
});
165+
});
166+
167+
describe("modelSelectionForEffortChange", () => {
168+
it("writes effort onto the saved model when another instance is displayed", () => {
169+
const displayed = createModelSelection(codexId, "gpt-5.6");
170+
expect(modelSelectionForEffortChange(savedClaude, displayed, high)).toEqual(
171+
createModelSelection(claudeId, "claude-opus-4-8", high),
172+
);
173+
});
174+
175+
it("writes effort onto the displayed model when it is the saved instance", () => {
176+
const displayed = createModelSelection(claudeId, "claude-sonnet-5");
177+
expect(
178+
modelSelectionForEffortChange(savedClaude, displayed, [{ id: "effort", value: "low" }]),
179+
).toEqual(createModelSelection(claudeId, "claude-sonnet-5", [{ id: "effort", value: "low" }]));
180+
});
181+
182+
it("pins the displayed automatic model when nothing is saved", () => {
183+
const displayed = createModelSelection(codexId, "gpt-5.6");
184+
expect(modelSelectionForEffortChange(null, displayed, high)).toEqual(
185+
createModelSelection(codexId, "gpt-5.6", high),
186+
);
187+
});
188+
});
Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
import type { ModelSelection, ServerProvider } from "@t3tools/contracts";
2+
import type { UnifiedSettings } from "@t3tools/contracts/settings";
3+
import { createModelSelection } from "@t3tools/shared/model";
4+
5+
import { resolveEffectiveDefaultModelSelection } from "../../modelSelection";
6+
import {
7+
resolveDefaultProviderModelSelection,
8+
type ProviderInstanceEntry,
9+
} from "../../providerInstances";
10+
11+
export interface DefaultModelSettingsPresentation {
12+
readonly selection: ModelSelection | null;
13+
readonly effortLocked: boolean;
14+
readonly note: string | null;
15+
}
16+
17+
export function resolveDefaultModelSettingsPresentation(input: {
18+
readonly entries: ReadonlyArray<ProviderInstanceEntry>;
19+
readonly providers: ReadonlyArray<ServerProvider>;
20+
readonly settings: UnifiedSettings;
21+
readonly saved: ModelSelection | null | undefined;
22+
}): DefaultModelSettingsPresentation {
23+
const saved = input.saved ?? null;
24+
const savedEntry = saved
25+
? input.entries.find((entry) => entry.instanceId === saved.instanceId)
26+
: undefined;
27+
const resolved = resolveDefaultProviderModelSelection(input.providers, saved);
28+
const providerUnusable = saved !== null && !isUsableProviderEntry(savedEntry);
29+
const substituted =
30+
saved !== null && (resolved === null || resolved.instanceId !== saved.instanceId);
31+
32+
if (saved && (providerUnusable || substituted)) {
33+
return {
34+
selection: saved,
35+
effortLocked: true,
36+
note: defaultModelProviderNote(savedEntry),
37+
};
38+
}
39+
40+
return {
41+
selection: resolved
42+
? resolveEffectiveDefaultModelSelection(input.settings, input.providers, resolved)
43+
: null,
44+
effortLocked: false,
45+
note: null,
46+
};
47+
}
48+
49+
export function modelSelectionForEffortChange(
50+
saved: ModelSelection | null | undefined,
51+
displayed: ModelSelection,
52+
options: ModelSelection["options"],
53+
): ModelSelection {
54+
const base = saved && saved.instanceId !== displayed.instanceId ? saved : displayed;
55+
return createModelSelection(base.instanceId, base.model, options);
56+
}
57+
58+
function isUsableProviderEntry(entry: ProviderInstanceEntry | undefined): boolean {
59+
return entry !== undefined && entry.enabled && entry.isAvailable;
60+
}
61+
62+
function defaultModelProviderNote(entry: ProviderInstanceEntry | undefined): string {
63+
if (!entry) return "This provider is not available on this environment.";
64+
if (!entry.enabled) return `${entry.displayName} is turned off.`;
65+
return `${entry.displayName} is unavailable.`;
66+
}

‎apps/web/src/components/settings/ProjectDefaultsSettings.tsx‎

Lines changed: 27 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,10 @@ import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
99
import { useNavigate } from "@tanstack/react-router";
1010

1111
import { mergeEnvironmentSettings } from "../../hooks/useSettings";
12-
import {
13-
getCustomModelOptionsByInstance,
14-
resolveEffectiveDefaultModelSelection,
15-
} from "../../modelSelection";
12+
import { getCustomModelOptionsByInstance } from "../../modelSelection";
1613
import {
1714
applyProviderInstanceSettings,
1815
deriveProviderInstanceEntries,
19-
resolveDefaultProviderModelSelection,
2016
sortProviderInstanceEntries,
2117
} from "../../providerInstances";
2218
import { useEnvironmentProviders, useEnvironments } from "../../state/environments";
@@ -29,6 +25,10 @@ import { TraitsPicker } from "../chat/TraitsPicker";
2925
import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "../ui/select";
3026
import { toastManager } from "../ui/toast";
3127
import { Switch } from "../ui/switch";
28+
import {
29+
modelSelectionForEffortChange,
30+
resolveDefaultModelSettingsPresentation,
31+
} from "./ProjectDefaultsSettings.logic";
3232
import type { ProjectSettingsCategory } from "./ProjectSettingsPanel";
3333
import { searchableSetting } from "./settingsSearch";
3434
import { useSettingsScope } from "./SettingsScopeContext";
@@ -64,20 +64,20 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
6464
(representative?.serverConfig
6565
? providersByEnvironment.get(representative.environmentId)
6666
: undefined) ?? EMPTY_SERVER_PROVIDERS;
67-
const storedSelection = resolveDefaultProviderModelSelection(
68-
providers,
69-
settings.defaultModelSelection,
70-
);
71-
const selection = storedSelection
72-
? resolveEffectiveDefaultModelSelection(settings, providers, storedSelection)
73-
: null;
7467
const entries = sortProviderInstanceEntries(
7568
applyProviderInstanceSettings(
7669
deriveProviderInstanceEntries(providers),
7770
settings,
7871
target?.projectId ?? null,
7972
),
8073
);
74+
const presentation = resolveDefaultModelSettingsPresentation({
75+
entries,
76+
providers,
77+
settings,
78+
saved: settings.defaultModelSelection,
79+
});
80+
const selection = presentation.selection;
8181
const modelOptions = getCustomModelOptionsByInstance(
8282
settings,
8383
providers,
@@ -151,19 +151,21 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
151151
: "Default model for new threads. Projects can override it."
152152
}
153153
status={
154-
unavailable || mixedModel || modelSource === "project"
154+
unavailable || mixedModel
155155
? undefined
156-
: settings.defaultModelSelection === null
157-
? "Automatic"
158-
: undefined
156+
: presentation.note
157+
? presentation.note
158+
: modelSource === "project" || settings.defaultModelSelection !== null
159+
? undefined
160+
: "Automatic"
159161
}
160162
resetAction={
161163
settings.defaultModelSelection !== null ? (
162164
<SettingResetButton label="default model" onClick={() => setModel(null)} />
163165
) : null
164166
}
165167
control={
166-
selection && activeEntry ? (
168+
selection ? (
167169
<div className="flex min-w-0 flex-wrap items-center justify-end gap-1.5">
168170
<ProviderModelPicker
169171
environmentId={representative?.environmentId ?? null}
@@ -186,7 +188,7 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
186188
setModel(createModelSelection(instanceId, model))
187189
}
188190
/>
189-
{!mixedModel ? (
191+
{!mixedModel && !presentation.effortLocked && activeEntry ? (
190192
<TraitsPicker
191193
provider={activeEntry.driverKind}
192194
models={activeEntry.models}
@@ -198,7 +200,13 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
198200
planModeEnabled={settings.planModeEnabled}
199201
triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
200202
onModelOptionsChange={(options) =>
201-
setModel(createModelSelection(selection.instanceId, selection.model, options))
203+
setModel(
204+
modelSelectionForEffortChange(
205+
settings.defaultModelSelection,
206+
selection,
207+
options,
208+
),
209+
)
202210
}
203211
/>
204212
) : null}

0 commit comments

Comments
 (0)