Skip to content

Commit faf79f1

Browse files
committed
fix(web): show mixed automatic defaults across environments
1 parent 961026c commit faf79f1

3 files changed

Lines changed: 134 additions & 9 deletions

File tree

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

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ import { createModelSelection } from "@t3tools/shared/model";
77
import { resolveProjectSettings } from "@t3tools/shared/projectSettings";
88
import { useNavigate } from "@tanstack/react-router";
99

10+
import { mergeEnvironmentSettings } from "../../hooks/useSettings";
1011
import {
12+
defaultModelSelectionsAreMixed,
1113
getCustomModelOptionsByInstance,
1214
resolveEffectiveDefaultModelSelection,
1315
} from "../../modelSelection";
@@ -48,7 +50,7 @@ function isWorktreeSubmodules(value: string | null): value is WorktreeSubmodules
4850
}
4951

5052
export function ProjectDefaultsSettings({ category }: { category: ProjectSettingsCategory }) {
51-
const { scope, target, connectedEnvironments } = useSettingsScope();
53+
const { scope, target, targets, connectedEnvironments } = useSettingsScope();
5254
const settings = useScopedSettings();
5355
const updateSettings = useUpdateScopedSettings();
5456
const navigate = useNavigate();
@@ -76,7 +78,15 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
7678
selection?.model,
7779
);
7880
const activeEntry = entries.find((entry) => entry.instanceId === selection?.instanceId);
79-
const mixedModel = useScopedSettingsMixed(["defaultModelSelection"]);
81+
const mixedModel = defaultModelSelectionsAreMixed(
82+
targets.map((candidate) => ({
83+
settings: mergeEnvironmentSettings(candidate.settings, settings),
84+
providers: providersByEnvironment.get(candidate.environmentId) ?? EMPTY_SERVER_PROVIDERS,
85+
})),
86+
);
87+
const automaticModel =
88+
targets.length > 0 &&
89+
targets.every((candidate) => candidate.settings.defaultModelSelection === null);
8090
const mixedFallback = useScopedSettingsMixed(["fallbackModelSelection"]);
8191
const fallbackSelection = settings.fallbackModelSelection ?? selection;
8292
const fallbackModelOptions = getCustomModelOptionsByInstance(
@@ -99,6 +109,9 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
99109
: null;
100110

101111
const modelDisabledReason = useScopedModelDisabledReason(settings, entries);
112+
const effortDisabledReason = selection
113+
? modelDisabledReason(selection.instanceId, selection.model)
114+
: null;
102115

103116
const setModel = (value: ModelSelection | null) => {
104117
const reason = value ? modelDisabledReason(value.instanceId, value.model) : null;
@@ -119,13 +132,15 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
119132
description={
120133
isProjectScope
121134
? "Model for new threads in this project."
122-
: !unavailable &&
123-
!mixedModel &&
124-
modelSource !== "project" &&
125-
settings.defaultModelSelection === null
135+
: !unavailable && modelSource !== "project" && automaticModel
126136
? "Default model for new threads, selected automatically. Projects can override it."
127137
: "Default model for new threads. Projects can override it."
128138
}
139+
status={
140+
mixedModel
141+
? `${automaticModel ? "Automatic defaults differ." : "Defaults differ."} Select one environment or choose a shared model to edit effort.`
142+
: effortDisabledReason
143+
}
129144
resetAction={
130145
settings.defaultModelSelection !== null ? (
131146
<SettingResetButton label="default model" onClick={() => setModel(null)} />
@@ -142,7 +157,9 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
142157
instanceEntries={entries}
143158
modelOptionsByInstance={modelOptions}
144159
triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
145-
{...(mixedModel ? { triggerLabel: "Mixed" } : {})}
160+
{...(mixedModel
161+
? { triggerLabel: automaticModel ? "Automatic (mixed)" : "Mixed" }
162+
: {})}
146163
getModelDisabledReason={modelDisabledReason}
147164
onOpenProviderSetup={(instanceId) => {
148165
if (representative)
@@ -155,7 +172,7 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
155172
setModel(createModelSelection(instanceId, model))
156173
}
157174
/>
158-
{!mixedModel ? (
175+
{!mixedModel && !effortDisabledReason ? (
159176
<TraitsPicker
160177
provider={activeEntry.driverKind}
161178
models={activeEntry.models}
@@ -171,7 +188,9 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
171188
) : null}
172189
</div>
173190
) : (
174-
<span className="text-sm text-muted-foreground">No providers available</span>
191+
<span className="text-sm text-muted-foreground">
192+
{mixedModel ? "Mixed" : "No providers available"}
193+
</span>
175194
)
176195
}
177196
/>

‎apps/web/src/modelSelection.test.ts‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import {
1717
providerInstanceEntriesFor,
1818
} from "./providerInstances";
1919
import {
20+
defaultModelSelectionsAreMixed,
2021
getAppModelOptionsForInstance,
2122
resolveAppModelSelectionForInstance,
2223
resolveAppModelSelectionState,
@@ -73,6 +74,90 @@ function settingsWithProviderInstances(): UnifiedSettings {
7374
};
7475
}
7576

77+
describe("scoped default model selections", () => {
78+
// regression: #27997 equal automatic defaults can resolve to different providers
79+
it("compares automatic defaults using each environment's models", () => {
80+
const codex = {
81+
settings: DEFAULT_UNIFIED_SETTINGS,
82+
providers: [provider({ instanceId: "codex", models: ["gpt-6-astra"] })],
83+
};
84+
const claude = {
85+
settings: DEFAULT_UNIFIED_SETTINGS,
86+
providers: [
87+
provider({
88+
instanceId: "claudeAgent",
89+
provider: ProviderDriverKind.make("claudeAgent"),
90+
models: ["claude-sonnet-4-6"],
91+
}),
92+
],
93+
};
94+
95+
expect(defaultModelSelectionsAreMixed([codex, claude])).toBe(true);
96+
expect(defaultModelSelectionsAreMixed([claude, codex])).toBe(true);
97+
expect(defaultModelSelectionsAreMixed([codex, codex])).toBe(false);
98+
expect(defaultModelSelectionsAreMixed([claude])).toBe(false);
99+
expect(defaultModelSelectionsAreMixed([])).toBe(false);
100+
expect(defaultModelSelectionsAreMixed([codex, { ...codex, providers: [] }])).toBe(true);
101+
expect(
102+
defaultModelSelectionsAreMixed([
103+
codex,
104+
{ ...codex, providers: [provider({ instanceId: "codex", models: ["gpt-6-sol"] })] },
105+
]),
106+
).toBe(true);
107+
expect(
108+
defaultModelSelectionsAreMixed([
109+
codex,
110+
{
111+
...codex,
112+
settings: {
113+
...codex.settings,
114+
providerModelPreferences: {
115+
[ProviderInstanceId.make("codex")]: {
116+
hiddenModels: ["gpt-6-astra"],
117+
modelOrder: [],
118+
},
119+
},
120+
},
121+
providers: [provider({ instanceId: "codex", models: ["gpt-6-astra", "gpt-6-sol"] })],
122+
},
123+
]),
124+
).toBe(true);
125+
});
126+
127+
it("keeps automatic, explicit, and different saved options distinct", () => {
128+
const providers = [provider({ instanceId: "codex", models: ["gpt-6-astra"] })];
129+
const selected = {
130+
providers,
131+
settings: {
132+
...DEFAULT_UNIFIED_SETTINGS,
133+
defaultModelSelection: createModelSelection(
134+
ProviderInstanceId.make("codex"),
135+
"gpt-6-astra",
136+
),
137+
},
138+
};
139+
expect(defaultModelSelectionsAreMixed([selected, { ...selected }])).toBe(false);
140+
expect(
141+
defaultModelSelectionsAreMixed([selected, { providers, settings: DEFAULT_UNIFIED_SETTINGS }]),
142+
).toBe(true);
143+
expect(
144+
defaultModelSelectionsAreMixed([
145+
selected,
146+
{
147+
...selected,
148+
settings: {
149+
...selected.settings,
150+
defaultModelSelection: {
151+
...selected.settings.defaultModelSelection,
152+
options: [{ id: "reasoningEffort", value: "xhigh" }],
153+
},
154+
},
155+
},
156+
]),
157+
).toBe(true);
158+
});
159+
});
160+
76161
describe("instance-scoped model selection", () => {
77162
it("keeps custom models on the provider instance that declared them", () => {
78163
const providers = [

‎apps/web/src/modelSelection.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
import { getComposerProviderState } from "./components/chat/composerProviderState";
1919
import { UnifiedSettings } from "@t3tools/contracts/settings";
2020
import * as Arr from "effect/Array";
21+
import * as Equal from "effect/Equal";
2122
import * as Result from "effect/Result";
2223
import {
2324
getDefaultServerModel,
@@ -29,6 +30,7 @@ import {
2930
type ProviderInstanceEntry,
3031
deriveProviderInstanceEntries,
3132
NO_PROVIDER_MODEL_SELECTION,
33+
resolveDefaultProviderModelSelection,
3234
} from "./providerInstances";
3335
import { sortModelsForProviderInstance } from "./modelOrdering";
3436
import { resolveModelShortName } from "@t3tools/client-runtime/provider-clients";
@@ -308,6 +310,25 @@ export function resolveEffectiveDefaultModelSelection(
308310
return model === null || model === selection.model ? selection : { ...selection, model };
309311
}
310312

313+
export function defaultModelSelectionsAreMixed(
314+
targets: ReadonlyArray<{
315+
settings: UnifiedSettings;
316+
providers: ReadonlyArray<ServerProvider>;
317+
}>,
318+
): boolean {
319+
const selections = targets.map(({ settings, providers }) => {
320+
const stored = settings.defaultModelSelection;
321+
const selection = resolveDefaultProviderModelSelection(providers, stored);
322+
return {
323+
stored,
324+
effective: selection
325+
? resolveEffectiveDefaultModelSelection(settings, providers, selection)
326+
: null,
327+
};
328+
});
329+
return selections.some((selection) => !Equal.equals(selection, selections[0]));
330+
}
331+
311332
export function getCustomModelOptionsByInstance(
312333
settings: UnifiedSettings,
313334
providers: ReadonlyArray<ServerProvider>,

0 commit comments

Comments
 (0)