Skip to content

Commit b4c1bd1

Browse files
fix(web): re-picking the current model in Settings keeps its traits (#35612)
Co-authored-by: Julius Marminge <[email protected]>
1 parent c0b140b commit b4c1bd1

7 files changed

Lines changed: 63 additions & 12 deletions

File tree

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
type WorktreeSubmodules,
55
managedRuntimeModeDenial,
66
} from "@t3tools/contracts";
7-
import { createModelSelection } from "@t3tools/shared/model";
7+
import { createModelSelection, pickModelSelection } from "@t3tools/shared/model";
88
import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
99
import { useNavigate } from "@tanstack/react-router";
1010

@@ -172,7 +172,7 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
172172
});
173173
}}
174174
onInstanceModelChange={(instanceId, model) =>
175-
setModel(createModelSelection(instanceId, model))
175+
setModel(pickModelSelection(mixedModel ? null : selection, instanceId, model))
176176
}
177177
/>
178178
{!mixedModel && !presentation.providerNote && !effortDisabledReason && activeEntry ? (
@@ -288,7 +288,13 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
288288
});
289289
return;
290290
}
291-
updateSettings({ fallbackModelSelection: createModelSelection(instanceId, model) });
291+
updateSettings({
292+
fallbackModelSelection: pickModelSelection(
293+
mixedFallback ? null : settings.fallbackModelSelection,
294+
instanceId,
295+
model,
296+
),
297+
});
292298
}}
293299
/>
294300
{settings.fallbackModelSelection !== null && fallbackEntry && !mixedFallback ? (

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import {
2727
ToolCallVisibility,
2828
} from "@t3tools/contracts/settings";
2929
import { desktopUpdateChannelOf } from "@t3tools/shared/cliRelease";
30-
import { createModelSelection } from "@t3tools/shared/model";
30+
import { createModelSelection, pickModelSelection } from "@t3tools/shared/model";
3131
import { resolvePastedPath } from "@t3tools/shared/path";
3232
import * as Equal from "effect/Equal";
3333
import * as Schema from "effect/Schema";
@@ -2046,7 +2046,11 @@ export function ThreadsSettingsPanel() {
20462046
textGenerationModelSelection: resolveAppModelSelectionState(
20472047
{
20482048
...settings,
2049-
textGenerationModelSelection: createModelSelection(instanceId, model),
2049+
textGenerationModelSelection: pickModelSelection(
2050+
textGenerationModelSelection,
2051+
instanceId,
2052+
model,
2053+
),
20502054
},
20512055
textGenerationProviders,
20522056
),

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

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
textGeneratorForSelection,
88
} from "@t3tools/contracts";
99
import { DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts/settings";
10-
import { createModelSelection } from "@t3tools/shared/model";
10+
import { createModelSelection, pickModelSelection } from "@t3tools/shared/model";
1111
import {
1212
resolveReviewGuideModelSelection,
1313
resolveSourceControlWriterModelSelection,
@@ -365,7 +365,11 @@ export function SourceControlWritingSettingsSection() {
365365
return;
366366
}
367367
updateSettings({
368-
reviewGuideModelSelection: createModelSelection(instanceId, model),
368+
reviewGuideModelSelection: pickModelSelection(
369+
mixedReviewGuideModel ? null : reviewGuideSelection,
370+
instanceId,
371+
model,
372+
),
369373
});
370374
}}
371375
/>
@@ -564,7 +568,11 @@ export function SourceControlWritingSettingsSection() {
564568
return;
565569
}
566570
updateSettings({
567-
sourceControlWriterModelSelection: createModelSelection(instanceId, model),
571+
sourceControlWriterModelSelection: pickModelSelection(
572+
mixedWriterModel ? null : activeSelection,
573+
instanceId,
574+
model,
575+
),
568576
});
569577
}}
570578
/>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
TextGeneratorConfig,
88
type TextGeneratorModel,
99
} from "@t3tools/contracts";
10-
import { createModelSelection } from "@t3tools/shared/model";
10+
import { pickModelSelection } from "@t3tools/shared/model";
1111
import { AsyncResult } from "effect/reactivity";
1212
import * as Option from "effect/Option";
1313
import * as Schema from "effect/Schema";
@@ -571,7 +571,7 @@ function TextGenerationTaskPicker({
571571
)}
572572
triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
573573
onInstanceModelChange={(instanceId, model) =>
574-
updateSettings({ [settingKey]: createModelSelection(instanceId, model) })
574+
updateSettings({ [settingKey]: pickModelSelection(selection, instanceId, model) })
575575
}
576576
/>
577577
</div>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
type SpeechModelUnloadTimeout,
2929
type VoiceShortcutMode,
3030
} from "@t3tools/contracts";
31-
import { createModelSelection } from "@t3tools/shared/model";
31+
import { createModelSelection, pickModelSelection } from "@t3tools/shared/model";
3232
import { resolveSpeechPostProcessingModelSelection } from "@t3tools/shared/serverSettings";
3333
import { cloudSpeechLanguages } from "@t3tools/shared/speech";
3434
import {
@@ -576,7 +576,7 @@ function CleanupModelRow() {
576576
triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
577577
getModelDisabledReason={modelDisabledReason}
578578
onInstanceModelChange={(instanceId, model) =>
579-
setModel(createModelSelection(instanceId, model))
579+
setModel(pickModelSelection(selection, instanceId, model))
580580
}
581581
/>
582582
<TraitsPicker

‎packages/shared/src/model.test.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import {
1111
getProviderOptionDescriptors,
1212
readCustomModelEntries,
1313
modelSelectionsEqual,
14+
pickModelSelection,
1415
withImplicitFastModeDefault,
1516
} from "./model.ts";
1617

@@ -99,6 +100,27 @@ describe("descriptor helpers", () => {
99100
).toBe(false);
100101
expect(modelSelectionsEqual(left, { ...reordered, model: "gpt-5.5" })).toBe(false);
101102
});
103+
104+
it("keeps the options when the current model is picked again", () => {
105+
const codex = ProviderInstanceId.make("codex");
106+
const current = createModelSelection(codex, "gpt-5.4", [
107+
{ id: "reasoningEffort", value: "high" },
108+
]);
109+
110+
expect(pickModelSelection(current, codex, "gpt-5.4")).toBe(current);
111+
expect(pickModelSelection(current, codex, "gpt-5.5")).toEqual({
112+
instanceId: "codex",
113+
model: "gpt-5.5",
114+
});
115+
expect(pickModelSelection(current, ProviderInstanceId.make("codex_work"), "gpt-5.4")).toEqual({
116+
instanceId: "codex_work",
117+
model: "gpt-5.4",
118+
});
119+
expect(pickModelSelection(null, codex, "gpt-5.4")).toEqual({
120+
instanceId: "codex",
121+
model: "gpt-5.4",
122+
});
123+
});
102124
});
103125

104126
describe("applyClaudePromptEffortPrefix", () => {

‎packages/shared/src/model.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -538,6 +538,17 @@ export function createModelSelection(
538538
return selections.length > 0 ? { ...base, options: selections } : base;
539539
}
540540

541+
/** A model picker's pick: re-picking the current model keeps its options, another model starts without any. */
542+
export function pickModelSelection(
543+
current: ModelSelection | null | undefined,
544+
instanceId: ProviderInstanceId,
545+
model: string,
546+
): ModelSelection {
547+
return current?.instanceId === instanceId && current.model === model
548+
? current
549+
: createModelSelection(instanceId, model);
550+
}
551+
541552
export function resolvePromptInjectedEffort(
542553
caps: ModelCapabilities,
543554
rawEffort: string | null | undefined,

0 commit comments

Comments
 (0)