Skip to content

Commit 1daf7f0

Browse files
committed
fix(web): resolve default preferences per environment
1 parent faf79f1 commit 1daf7f0

3 files changed

Lines changed: 68 additions & 30 deletions

File tree

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ 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";
10+
import { useClientSettings } from "../../hooks/useSettings";
1111
import {
1212
defaultModelSelectionsAreMixed,
1313
getCustomModelOptionsByInstance,
@@ -52,6 +52,7 @@ function isWorktreeSubmodules(value: string | null): value is WorktreeSubmodules
5252
export function ProjectDefaultsSettings({ category }: { category: ProjectSettingsCategory }) {
5353
const { scope, target, targets, connectedEnvironments } = useSettingsScope();
5454
const settings = useScopedSettings();
55+
const clientSettings = useClientSettings();
5556
const updateSettings = useUpdateScopedSettings();
5657
const navigate = useNavigate();
5758
const { environments } = useEnvironments();
@@ -79,8 +80,9 @@ export function ProjectDefaultsSettings({ category }: { category: ProjectSetting
7980
);
8081
const activeEntry = entries.find((entry) => entry.instanceId === selection?.instanceId);
8182
const mixedModel = defaultModelSelectionsAreMixed(
83+
clientSettings,
8284
targets.map((candidate) => ({
83-
settings: mergeEnvironmentSettings(candidate.settings, settings),
85+
settings: candidate.settings,
8486
providers: providersByEnvironment.get(candidate.environmentId) ?? EMPTY_SERVER_PROVIDERS,
8587
})),
8688
);

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

Lines changed: 50 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
import {
22
ANTIGRAVITY_DEFAULT_MODEL,
33
DEFAULT_TEXT_GENERATION_MODEL,
4+
DEFAULT_SERVER_SETTINGS,
45
ProviderDriverKind,
56
ProviderInstanceId,
67
type ServerProvider,
78
} from "@t3tools/contracts";
8-
import { DEFAULT_UNIFIED_SETTINGS, type UnifiedSettings } from "@t3tools/contracts/settings";
9+
import {
10+
DEFAULT_CLIENT_SETTINGS,
11+
DEFAULT_UNIFIED_SETTINGS,
12+
type UnifiedSettings,
13+
} from "@t3tools/contracts/settings";
914
import { describe, expect, it } from "vite-plus/test";
1015
import { createModelSelection } from "@t3tools/shared/model";
1116
import { deriveEffectiveComposerModelState } from "./composerDraftStore";
@@ -92,34 +97,49 @@ describe("scoped default model selections", () => {
9297
],
9398
};
9499

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);
100+
expect(defaultModelSelectionsAreMixed(DEFAULT_CLIENT_SETTINGS, [codex, claude])).toBe(true);
101+
expect(defaultModelSelectionsAreMixed(DEFAULT_CLIENT_SETTINGS, [claude, codex])).toBe(true);
102+
expect(defaultModelSelectionsAreMixed(DEFAULT_CLIENT_SETTINGS, [codex, codex])).toBe(false);
103+
expect(defaultModelSelectionsAreMixed(DEFAULT_CLIENT_SETTINGS, [claude])).toBe(false);
104+
expect(defaultModelSelectionsAreMixed(DEFAULT_CLIENT_SETTINGS, [])).toBe(false);
105+
expect(
106+
defaultModelSelectionsAreMixed(DEFAULT_CLIENT_SETTINGS, [codex, { ...codex, providers: [] }]),
107+
).toBe(true);
101108
expect(
102-
defaultModelSelectionsAreMixed([
109+
defaultModelSelectionsAreMixed(DEFAULT_CLIENT_SETTINGS, [
103110
codex,
104111
{ ...codex, providers: [provider({ instanceId: "codex", models: ["gpt-6-sol"] })] },
105112
]),
106113
).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-
},
114+
const configured = {
115+
settings: {
116+
...DEFAULT_SERVER_SETTINGS,
117+
providerModelPreferences: {
118+
[ProviderInstanceId.make("codex")]: {
119+
hiddenModels: ["gpt-6-astra"],
120+
modelOrder: [],
120121
},
121-
providers: [provider({ instanceId: "codex", models: ["gpt-6-astra", "gpt-6-sol"] })],
122122
},
123+
},
124+
providers: [provider({ instanceId: "codex", models: ["gpt-6-astra", "gpt-6-sol"] })],
125+
};
126+
const inherited = { ...configured, settings: DEFAULT_SERVER_SETTINGS };
127+
expect(defaultModelSelectionsAreMixed(DEFAULT_CLIENT_SETTINGS, [configured, inherited])).toBe(
128+
true,
129+
);
130+
expect(defaultModelSelectionsAreMixed(DEFAULT_CLIENT_SETTINGS, [inherited, configured])).toBe(
131+
true,
132+
);
133+
const clientSettings = {
134+
...DEFAULT_CLIENT_SETTINGS,
135+
providerModelPreferences: configured.settings.providerModelPreferences,
136+
};
137+
expect(defaultModelSelectionsAreMixed(clientSettings, [configured, inherited])).toBe(false);
138+
expect(defaultModelSelectionsAreMixed(clientSettings, [inherited, configured])).toBe(false);
139+
expect(
140+
defaultModelSelectionsAreMixed(clientSettings, [
141+
{ ...inherited, settings: { ...DEFAULT_SERVER_SETTINGS, providerModelPreferences: {} } },
142+
inherited,
123143
]),
124144
).toBe(true);
125145
});
@@ -136,12 +156,17 @@ describe("scoped default model selections", () => {
136156
),
137157
},
138158
};
139-
expect(defaultModelSelectionsAreMixed([selected, { ...selected }])).toBe(false);
140159
expect(
141-
defaultModelSelectionsAreMixed([selected, { providers, settings: DEFAULT_UNIFIED_SETTINGS }]),
160+
defaultModelSelectionsAreMixed(DEFAULT_CLIENT_SETTINGS, [selected, { ...selected }]),
161+
).toBe(false);
162+
expect(
163+
defaultModelSelectionsAreMixed(DEFAULT_CLIENT_SETTINGS, [
164+
selected,
165+
{ providers, settings: DEFAULT_UNIFIED_SETTINGS },
166+
]),
142167
).toBe(true);
143168
expect(
144-
defaultModelSelectionsAreMixed([
169+
defaultModelSelectionsAreMixed(DEFAULT_CLIENT_SETTINGS, [
145170
selected,
146171
{
147172
...selected,

‎apps/web/src/modelSelection.ts‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
ProviderDriverKind,
88
ProviderInstanceId,
99
type ServerProvider,
10+
type ServerSettings,
1011
} from "@t3tools/contracts";
1112
import {
1213
type CustomModelDefinition,
@@ -16,7 +17,8 @@ import {
1617
resolveSelectableModel,
1718
} from "@t3tools/shared/model";
1819
import { getComposerProviderState } from "./components/chat/composerProviderState";
19-
import { UnifiedSettings } from "@t3tools/contracts/settings";
20+
import { type ClientSettings, UnifiedSettings } from "@t3tools/contracts/settings";
21+
import { resolveModelPreferences } from "@t3tools/shared/serverSettings";
2022
import * as Arr from "effect/Array";
2123
import * as Equal from "effect/Equal";
2224
import * as Result from "effect/Result";
@@ -311,8 +313,9 @@ export function resolveEffectiveDefaultModelSelection(
311313
}
312314

313315
export function defaultModelSelectionsAreMixed(
316+
clientSettings: ClientSettings,
314317
targets: ReadonlyArray<{
315-
settings: UnifiedSettings;
318+
settings: ServerSettings;
316319
providers: ReadonlyArray<ServerProvider>;
317320
}>,
318321
): boolean {
@@ -322,7 +325,15 @@ export function defaultModelSelectionsAreMixed(
322325
return {
323326
stored,
324327
effective: selection
325-
? resolveEffectiveDefaultModelSelection(settings, providers, selection)
328+
? resolveEffectiveDefaultModelSelection(
329+
{
330+
...clientSettings,
331+
...settings,
332+
...resolveModelPreferences(settings, clientSettings),
333+
},
334+
providers,
335+
selection,
336+
)
326337
: null,
327338
};
328339
});

0 commit comments

Comments
 (0)