@devries-cameron20 / t3code Mirror · read-only / commits / 08a463e299
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 12:00 UTC

fix(settings): project edits keep overrides the client does not know (#24472)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net> Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>

Victor Vogel committed Oct 29, 2026 at 13:34 UTC 08a463e29976617134de01e9341f898bc881d0eb
6 files changed +125 -13
apps/server/src/serverSettings.test.ts
+25
@@ -212,6 +212,31 @@ it.layer(NodeServices.layer)("server settings", (it) => {
212 }).pipe(Effect.provide(layerServerSettings())),
213 );
214
215 + it.effect("keeps an override key a newer server saved when a project setting is edited", () =>
216 + Effect.gen(function* () {
217 + const config = yield* ServerConfig.ServerConfig;
218 + const fs = yield* FileSystem.FileSystem;
219 + const service = yield* ServerSettingsModule.ServerSettingsService;
220 + const projectId = ProjectId.make("project-a");
221 + yield* fs.writeFileString(
222 + config.settingsPath,
223 + `{ "projectSettingsOverrides": { "project-a": { "defaultAutoPull": true, "addedByNewerServer": 3 } } }`,
224 + );
225 + const loaded = yield* service.getSettings;
226 +
227 + yield* service.updateSettings({
228 + projectSettingsOverrides: {
229 + [projectId]: { ...loaded.projectSettingsOverrides[projectId], defaultAutoPull: false },
230 + },
231 + });
232 +
233 + const persisted = JSON.parse(yield* fs.readFileString(config.settingsPath));
234 + assert.deepEqual(persisted.projectSettingsOverrides, {
235 + [projectId]: { defaultAutoPull: false, addedByNewerServer: 3 },
236 + });
237 + }).pipe(Effect.provide(layerServerSettings())),
238 + );
239 +
240 it.effect("moves an idle compaction mode saved in the legacy switch to its own field", () =>
241 Effect.gen(function* () {
242 const config = yield* ServerConfig.ServerConfig;
apps/server/src/serverSettings.ts
+7 -4
@@ -3,6 +3,7 @@ import {
3 ModelSelection,
4 ProjectId,
5 ProjectScript,
6 + keepUnknownOverrideKeys,
7 ProjectSettingsOverrides,
8 type ProviderInstanceConfig,
9 type ProviderInstanceMutation,
@@ -292,10 +293,12 @@ const ServerSettingsJson = fromLenientJson(
293 ),
294 projectSettingsOverrides: Schema.Record(
295 ProjectId,
295 - Schema.Struct({
296 - ...ProjectSettingsOverrides.fields,
297 - responseStreamingMode: Schema.optionalKey(PersistedResponseStreamingMode),
298 - }),
296 + keepUnknownOverrideKeys(
297 + Schema.Struct({
298 + ...ProjectSettingsOverrides.fields,
299 + responseStreamingMode: Schema.optionalKey(PersistedResponseStreamingMode),
300 + }),
301 + ),
302 ).pipe(Schema.withDecodingDefault(Effect.succeed({}))),
303 }),
304 );
packages/contracts/src/settings.test.ts
+22
@@ -25,6 +25,7 @@ const encodeClientSettings = Schema.encodeSync(ClientSettingsSchema);
25 const decodeServerSettings = Schema.decodeUnknownSync(ServerSettings);
26 const decodeServerSettingsPatch = Schema.decodeUnknownSync(ServerSettingsPatch);
27 const encodeServerSettings = Schema.encodeSync(ServerSettings);
28 +const encodeServerSettingsPatch = Schema.encodeSync(ServerSettingsPatch);
29 const decodeClaudeSettings = Schema.decodeUnknownSync(ClaudeSettings);
30
31 describe("storage cleanup settings", () => {
@@ -372,6 +373,27 @@ it("validates remote device hosts and rejects ambiguous host ids", () => {
373 expect(() => decodeDeviceHostSettings({ deviceHosts: [{ ...host, port: 0 }] })).toThrow();
374 });
375
376 +describe("ServerSettings project overrides across versions", () => {
377 + it("sends back an override key from a newer server when an older client edits the entry", () => {
378 + const projectId = ProjectId.make("project-a");
379 + // As an older client reads a newer server's settings, with one key it does not know.
380 + const entry = decodeServerSettings({
381 + projectSettingsOverrides: {
382 + [projectId]: { defaultAutoPull: true, addedByNewerServer: { mode: "kept" } },
383 + },
384 + }).projectSettingsOverrides[projectId];
385 +
386 + const sent = encodeServerSettingsPatch({
387 + projectSettingsOverrides: { [projectId]: { ...entry, defaultAutoPull: false } },
388 + });
389 +
390 + expect(decodeServerSettingsPatch(sent).projectSettingsOverrides?.[projectId]).toEqual({
391 + defaultAutoPull: false,
392 + addedByNewerServer: { mode: "kept" },
393 + });
394 + });
395 +});
396 +
397 describe("resolveProjectProviderInstanceEnabled", () => {
398 const projectId = "project-a" as ProjectId;
399 const instanceId = ProviderInstanceId.make("codex_work");
packages/contracts/src/settings.ts
+20 -7
@@ -1137,6 +1137,16 @@ export const ProjectSettingsOverrides = Schema.Struct({
1137 } satisfies Record<ProjectScopedServerSettingKey | "providerInstances", unknown>);
1138 export type ProjectSettingsOverrides = typeof ProjectSettingsOverrides.Type;
1139
1140 +// Whole-entry writers must round-trip unknown keys; keep the type closed to catch misspellings.
1141 +export const keepUnknownOverrideKeys = <Entry extends Schema.Struct<Schema.Struct.Fields>>(
1142 + entry: Entry,
1143 +): Schema.Codec<
1144 + Entry["Type"],
1145 + Entry["Encoded"],
1146 + Entry["DecodingServices"],
1147 + Entry["EncodingServices"]
1148 +> => Schema.StructWithRest(entry, [Schema.Record(Schema.String, Schema.Unknown)]);
1149 +
1150 /** True if null stores an override; otherwise null removes it. */
1151 export function isNullableProjectSettingsOverride(key: ProjectScopedServerSettingKey): boolean {
1152 return NULLABLE_PROJECT_SETTINGS_OVERRIDES.has(key);
@@ -1263,9 +1273,10 @@ export const ServerSettings = Schema.Struct({
1273 Schema.withDecodingDefault(Effect.succeed(DEFAULT_RUNTIME_MODE)),
1274 ),
1275
1266 - projectSettingsOverrides: Schema.Record(ProjectId, ProjectSettingsOverrides).pipe(
1267 - Schema.withDecodingDefault(Effect.succeed({})),
1268 - ),
1276 + projectSettingsOverrides: Schema.Record(
1277 + ProjectId,
1278 + keepUnknownOverrideKeys(ProjectSettingsOverrides),
1279 + ).pipe(Schema.withDecodingDefault(Effect.succeed({}))),
1280 /** Fold once so restarts cannot undo later UI resets. */
1281 projectSettingsFolded: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
1282
@@ -1626,10 +1637,12 @@ export const ServerSettingsPatch = Schema.Struct({
1637 Schema.Record(
1638 ProjectId,
1639 Schema.NullOr(
1629 - Schema.Struct({
1630 - ...ProjectSettingsOverrides.fields,
1631 - sourceControlWritingStyle: Schema.optionalKey(SourceControlWritingStyleSettings),
1632 - }),
1640 + keepUnknownOverrideKeys(
1641 + Schema.Struct({
1642 + ...ProjectSettingsOverrides.fields,
1643 + sourceControlWritingStyle: Schema.optionalKey(SourceControlWritingStyleSettings),
1644 + }),
1645 + ),
1646 ),
1647 ),
1648 ),
packages/shared/src/serverSettings.test.ts
+37
@@ -6,10 +6,13 @@ import {
6 ProviderInstanceId,
7 SecretProviderId,
8 SecretProviderKind,
9 + ServerSettings,
10 + ServerSettingsPatch,
11 UsageLimitSourceId,
12 type ServerProvider,
13 } from "@t3tools/contracts";
14 import * as Duration from "effect/Duration";
15 +import * as Schema from "effect/Schema";
16 import { describe, expect, it } from "vite-plus/test";
17 import { resolveServerBackgroundActivitySettings } from "./backgroundActivitySettings.ts";
18 import { createModelSelection } from "./model.ts";
@@ -24,6 +27,9 @@ import {
27 resolveSourceControlWriterModelSelection,
28 } from "./serverSettings.ts";
29
30 +const decodeServerSettings = Schema.decodeUnknownSync(ServerSettings);
31 +const decodeServerSettingsPatch = Schema.decodeUnknownSync(ServerSettingsPatch);
32 +
33 const FOLDED_SERVER_SETTINGS = { ...DEFAULT_SERVER_SETTINGS, projectSettingsFolded: true };
34
35 describe("fallbackTextGenerationModelSelection", () => {
@@ -499,6 +505,37 @@ describe("serverSettings helpers", () => {
505 });
506 });
507
508 + // regression: #18334 a newer client must still see this server drop a key it does not know
509 + it("drops an override key this server does not know from a patch and keeps one it stored", () => {
510 + const projectId = ProjectId.make("project-a");
511 + const current = decodeServerSettings({
512 + projectSettingsFolded: true,
513 + projectSettingsOverrides: {
514 + [projectId]: { defaultAutoPull: true, addedByNewerServer: 3 },
515 + },
516 + });
517 + const patch = decodeServerSettingsPatch({
518 + projectSettingsOverrides: {
519 + [projectId]: { defaultAutoPull: false, addedByNewerServer: 4, addedByNewerClient: "x" },
520 + },
521 + });
522 +
523 + const updated = applyServerSettingsPatch(current, patch);
524 + expect(updated.projectSettingsOverrides[projectId]).toEqual({
525 + defaultAutoPull: false,
526 + addedByNewerServer: 3,
527 + });
528 + const reset = applyServerSettingsPatch(updated, {
529 + projectSettingsOverrides: { [projectId]: {} },
530 + });
531 + expect(reset.projectSettingsOverrides[projectId]).toEqual({ addedByNewerServer: 3 });
532 + expect(
533 + applyServerSettingsPatch(reset, {
534 + projectSettingsOverrides: { [projectId]: null },
535 + }).projectSettingsOverrides[projectId],
536 + ).toBeUndefined();
537 + });
538 +
539 it("clears a project's providerInstances override when a patch entry sends an empty map", () => {
540 const instanceId = ProviderInstanceId.make("codex_work");
541 const projectId = ProjectId.make("project-a");
packages/shared/src/serverSettings.ts
+14 -2
@@ -14,7 +14,7 @@ import {
14 type ModelSelection,
15 type ProjectId,
16 type ProjectScopedServerSettingKey,
17 - type ProjectSettingsOverrides,
17 + ProjectSettingsOverrides,
18 ProviderDriverKind,
19 ProviderInstanceId,
20 type ServerProvider,
@@ -226,6 +226,16 @@ function mergeSettingsEntries<Value>(
226 return Object.fromEntries(next);
227 }
228
229 +const knownProjectOverrideKeys = new Set(Object.keys(ProjectSettingsOverrides.fields));
230 +
231 +function pickOverrideKeys(entry: ProjectSettingsOverrides | undefined, known: boolean) {
232 + return Object.fromEntries(
233 + Object.entries<unknown>(entry ?? {}).filter(
234 + ([key]) => knownProjectOverrideKeys.has(key) === known,
235 + ),
236 + );
237 +}
238 +
239 // Older clients omit providerInstances during whole-entry replacement; preserve it to avoid wiping overrides.
240 function mergeProjectSettingsOverridesPatch(
241 current: Readonly<Record<string, ProjectSettingsOverrides>>,
@@ -239,7 +249,9 @@ function mergeProjectSettingsOverridesPatch(
249 }
250 const storedProviderInstances = current[projectId]?.providerInstances;
251 next.set(projectId, {
242 - ...entry,
252 + // Preserve downgraded storage, but reject new unknown writes so clients can detect unsupported settings.
253 + ...pickOverrideKeys(current[projectId], false),
254 + ...pickOverrideKeys(entry, true),
255 ...(Object.hasOwn(entry, "providerInstances") || storedProviderInstances === undefined
256 ? {}
257 : { providerInstances: storedProviderInstances }),