Skip to content

Commit e2b5532

Browse files
Bil0000juliusmarminge
authored andcommitted
fix(settings): preserve models on incompatible provider connections
1 parent b49f9dc commit e2b5532

5 files changed

Lines changed: 101 additions & 6 deletions

File tree

‎apps/mobile/src/features/settings/SettingsRouteScreen.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -669,6 +669,8 @@ function AutoSettleSettingsRows() {
669669
patch: filterSharedServerPatch(
670670
patch,
671671
target?.serverConfig?.environment.capabilities,
672+
target?.serverConfig?.settings,
673+
referenceSettings,
672674
),
673675
},
674676
});

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2718,7 +2718,7 @@ export function GeneralSettingsPanel() {
27182718
<SettingsRow
27192719
serverScoped
27202720
{...searchableSetting("text-generation-model")}
2721-
description="Used for thread titles and other generated text on all connected devices. Source control can override it."
2721+
description="Used for thread titles and other generated text on connected devices with this provider. Source control can override it."
27222722
resetAction={
27232723
isTextGenerationModelDirty ? (
27242724
<SettingResetButton

‎apps/web/src/hooks/useSettings.ts‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,6 +450,9 @@ function useUpdateSettingsTarget(environmentId: EnvironmentId | null) {
450450
}
451451
}
452452
if (Object.keys(sharedPatch).length > 0) {
453+
const sourceSettings = environments.find(
454+
(target) => target.environmentId === environmentId,
455+
)?.serverConfig?.settings;
453456
const targets = new Set(
454457
environments.filter(supportsSharedSettingsSync).map((target) => target.environmentId),
455458
);
@@ -462,6 +465,8 @@ function useUpdateSettingsTarget(environmentId: EnvironmentId | null) {
462465
const targetPatch = filterSharedServerPatch(
463466
sharedPatch,
464467
target?.serverConfig?.environment.capabilities,
468+
target?.serverConfig?.settings,
469+
sourceSettings,
465470
);
466471
if (Object.keys(targetPatch).length === 0) continue;
467472
wroteToTarget = true;
@@ -540,7 +545,12 @@ export function useSharedSettingsSync() {
540545
void persistServerSettings({
541546
environmentId: mismatch.environmentId,
542547
input: {
543-
patch: filterSharedServerPatch(patch, target?.serverConfig?.environment.capabilities),
548+
patch: filterSharedServerPatch(
549+
patch,
550+
target?.serverConfig?.environment.capabilities,
551+
target?.serverConfig?.settings,
552+
primarySettings,
553+
),
544554
},
545555
});
546556
}

‎packages/client-runtime/src/state/sharedSettings.test.ts‎

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
import { DEFAULT_SERVER_SETTINGS, EnvironmentId, ProviderInstanceId } from "@t3tools/contracts";
1+
import {
2+
DEFAULT_SERVER_SETTINGS,
3+
EnvironmentId,
4+
ProviderDriverKind,
5+
ProviderInstanceId,
6+
} from "@t3tools/contracts";
27
import { describe, expect, it } from "@effect/vitest";
38

49
import {
@@ -117,6 +122,52 @@ describe("pickSharedServerSettings", () => {
117122
});
118123

119124
describe("filterSharedServerPatch", () => {
125+
it.each(["missing", "disabled", "different-driver", "enabled"] as const)(
126+
"shares a custom model only when its target provider is enabled (%s)",
127+
(availability) => {
128+
const instanceId = ProviderInstanceId.make("codex_personal");
129+
const selection = {
130+
instanceId,
131+
model: "gpt-5.6-luna",
132+
options: [{ id: "reasoningEffort", value: "low" }],
133+
};
134+
const instance = {
135+
driver: ProviderDriverKind.make(
136+
availability === "different-driver" ? "claudeAgent" : "codex",
137+
),
138+
enabled: availability !== "disabled",
139+
config: {},
140+
};
141+
const settings = {
142+
...DEFAULT_SERVER_SETTINGS,
143+
providerInstances: availability === "missing" ? {} : { [instanceId]: instance },
144+
};
145+
const patch = { sidebarAutoSettleAfterDays: 7, textGenerationModelSelection: selection };
146+
const sourceSettings = {
147+
...settings,
148+
providerInstances: {
149+
[instanceId]: { ...instance, driver: ProviderDriverKind.make("codex"), enabled: true },
150+
},
151+
};
152+
expect(filterSharedServerPatch(patch, restartCapabilities, settings, sourceSettings)).toEqual(
153+
availability === "enabled" ? patch : { sidebarAutoSettleAfterDays: 7 },
154+
);
155+
const primarySettings = {
156+
...sourceSettings,
157+
textGenerationModelSelection: selection,
158+
};
159+
expect(
160+
findSharedSettingsMismatches({
161+
primaryEnvironmentId: primaryId,
162+
primarySettings,
163+
environments: [
164+
{ environmentId: boxId, label: "Remote Box", syncEligible: true, settings },
165+
],
166+
}),
167+
).toEqual(availability === "enabled" ? [{ environmentId: boxId, label: "Remote Box" }] : []);
168+
},
169+
);
170+
120171
it.each([true, false])("preserves supported restart preference %s", (enabled) => {
121172
const patch = { continueThreadsAfterServerUpdate: enabled, sidebarAutoSettleAfterDays: 7 };
122173
expect(filterSharedServerPatch(patch, restartCapabilities)).toEqual(patch);

‎packages/client-runtime/src/state/sharedSettings.ts‎

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import type {
1414
ServerSettings,
1515
ServerSettingsPatch,
1616
} from "@t3tools/contracts";
17+
import { isModelSelectionProviderEnabled } from "@t3tools/shared/serverSettings";
1718
import * as Equal from "effect/Equal";
1819
import * as Struct from "effect/Struct";
1920

@@ -57,7 +58,25 @@ export function splitSharedServerPatch(patch: ServerSettingsPatch): {
5758
export function filterSharedServerPatch(
5859
patch: ServerSettingsPatch,
5960
capabilities: Pick<ExecutionEnvironmentCapabilities, "threadRestartContinuation"> | undefined,
61+
settings?: ServerSettings,
62+
sourceSettings = settings,
6063
): ServerSettingsPatch {
64+
const instanceId =
65+
patch.textGenerationModelSelection?.instanceId ??
66+
sourceSettings?.textGenerationModelSelection.instanceId;
67+
if (
68+
patch.textGenerationModelSelection &&
69+
(!settings ||
70+
(instanceId !== undefined &&
71+
(sourceSettings?.providerInstances[instanceId]?.driver ?? instanceId) !==
72+
(settings.providerInstances[instanceId]?.driver ?? instanceId)) ||
73+
!isModelSelectionProviderEnabled(settings, {
74+
...settings.textGenerationModelSelection,
75+
...patch.textGenerationModelSelection,
76+
}))
77+
) {
78+
patch = Struct.omit(patch, ["textGenerationModelSelection"]);
79+
}
6180
return capabilities?.threadRestartContinuation === true
6281
? patch
6382
: Struct.omit(patch, ["continueThreadsAfterServerUpdate"]);
@@ -68,7 +87,11 @@ export function pickSharedServerSettings(
6887
settings: ServerSettings,
6988
capabilities?: Pick<ExecutionEnvironmentCapabilities, "threadRestartContinuation">,
7089
): ServerSettingsPatch {
71-
return filterSharedServerPatch(Struct.pick(settings, SHARED_SERVER_SETTING_KEYS), capabilities);
90+
return filterSharedServerPatch(
91+
Struct.pick(settings, SHARED_SERVER_SETTING_KEYS),
92+
capabilities,
93+
settings,
94+
);
7295
}
7396

7497
/**
@@ -130,11 +153,20 @@ export function findSharedSettingsMismatches(input: {
130153
) {
131154
return [];
132155
}
133-
const expected = filterSharedServerPatch(primarySettings, environment.capabilities);
134-
const actual = filterSharedServerPatch(
156+
const expected = filterSharedServerPatch(
157+
primarySettings,
158+
environment.capabilities,
159+
environment.settings,
160+
input.primarySettings ?? undefined,
161+
);
162+
let actual = filterSharedServerPatch(
135163
pickSharedServerSettings(environment.settings, environment.capabilities),
136164
input.primaryCapabilities,
165+
environment.settings,
137166
);
167+
if (!expected.textGenerationModelSelection) {
168+
actual = Struct.omit(actual, ["textGenerationModelSelection"]);
169+
}
138170
return Equal.equals(actual, expected)
139171
? []
140172
: [{ environmentId: environment.environmentId, label: environment.label }];

0 commit comments

Comments
 (0)