Skip to content

Commit 554fe2a

Browse files
fix(settings): harden the project override layer against review findings
- Never fold over an unreadable settings.json: the fold and its write run only when the file decoded, so a malformed file stays for the user to repair instead of being replaced with defaults. - A canonical projectSettingsOverrides entry wins over a legacy map for the same project in one patch, so omitting a key to clear it sticks. - A project defaultModelSelection on a disabled provider falls back to the environment, like the text generation model already did. - Agent access without orchestration withholds only the capability some project overrides; a device-only override no longer revokes browser access. - Server stop resolves continueThreadsAfterServerUpdate per session project, so a project override marks its running turns for continuation. - The settlement key encodes an absent threshold differently from null, so switching a project from inherit to never sweeps immediately.
1 parent acbdb5c commit 554fe2a

9 files changed

Lines changed: 170 additions & 40 deletions

File tree

‎apps/server/src/orchestration/ThreadSettlementReactor.test.ts‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,20 @@ const startHarness = Effect.fn("startThreadSettlementHarness")(function* (
302302
});
303303

304304
describe("ThreadSettlementReactor", () => {
305+
it("distinguishes a project that inherits the threshold from one that disables it", () => {
306+
const inherits = ThreadSettlementReactor.autoSettlementSettingsKey({
307+
...DEFAULT_SERVER_SETTINGS,
308+
projectSettingsOverrides: { [PROJECT_ID]: { sidebarAutoSettleOnMerge: true } },
309+
});
310+
const never = ThreadSettlementReactor.autoSettlementSettingsKey({
311+
...DEFAULT_SERVER_SETTINGS,
312+
projectSettingsOverrides: {
313+
[PROJECT_ID]: { sidebarAutoSettleOnMerge: true, sidebarAutoSettleAfterDays: null },
314+
},
315+
});
316+
assert.notStrictEqual(inherits, never);
317+
});
318+
305319
it.effect(
306320
"settles all-terminal links from snapshots and keeps open or unsynced links active",
307321
() =>

‎apps/server/src/orchestration/ThreadSettlementReactor.ts‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,16 @@ function autoSettlementConfigured(settings: ServerSettingsValue): boolean {
4747
}
4848

4949
/** Identity of every settlement input, so unrelated settings edits do not trigger a sweep. */
50-
function autoSettlementSettingsKey(settings: ServerSettingsValue): string {
50+
/** @internal Exported for tests. */
51+
export function autoSettlementSettingsKey(settings: ServerSettingsValue): string {
5152
return JSON.stringify([
5253
settings.sidebarAutoSettleOnMerge,
5354
settings.sidebarAutoSettleAfterDays,
55+
// JSON drops undefined, so inherit (absent) and never (null) need distinct marks.
5456
Object.entries(settings.projectSettingsOverrides).map(([projectId, entry]) => [
5557
projectId,
56-
entry.sidebarAutoSettleOnMerge,
57-
entry.sidebarAutoSettleAfterDays,
58+
entry.sidebarAutoSettleOnMerge ?? "inherit",
59+
entry.sidebarAutoSettleAfterDays === undefined ? "inherit" : entry.sidebarAutoSettleAfterDays,
5860
]),
5961
]);
6062
}

‎apps/server/src/provider/Layers/ProviderService.test.ts‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4803,6 +4803,7 @@ describe("agent browser access", () => {
48034803
access: boolean | { readonly browser: boolean; readonly device: boolean },
48044804
threadId: ThreadId,
48054805
projectOverride?: boolean | { readonly browser?: boolean; readonly device?: boolean },
4806+
options?: { readonly withoutOrchestration?: boolean },
48064807
) =>
48074808
Effect.gen(function* () {
48084809
const enableAgentBrowserAccess = typeof access === "boolean" ? access : access.browser;
@@ -4875,7 +4876,7 @@ describe("agent browser access", () => {
48754876
}).pipe(
48764877
Layer.provide(providerAdapterLayer),
48774878
Layer.provide(directoryLayer),
4878-
Layer.provide(projectionLayer),
4879+
Layer.provide(options?.withoutOrchestration ? Layer.empty : projectionLayer),
48794880
Layer.provide(
48804881
ServerSettings.ServerSettingsService.layerTest({
48814882
enableAgentBrowserAccess,
@@ -4988,4 +4989,19 @@ describe("agent browser access", () => {
49884989
assert.deepEqual(issued, [{ threadId, capabilities: ["device", "pull-requests"] }]);
49894990
}).pipe(Effect.provide(NodeServices.layer)),
49904991
);
4992+
4993+
// Without orchestration the project cannot be resolved, so an overridden
4994+
// capability is withheld; one no project overrides keeps its environment value.
4995+
it.effect("withholds only the overridden capability when the project cannot be resolved", () =>
4996+
Effect.gen(function* () {
4997+
const threadId = asThreadId("thread-no-orchestration-device-override");
4998+
const issued = yield* startSessionWith(
4999+
{ browser: true, device: true },
5000+
threadId,
5001+
{ device: false },
5002+
{ withoutOrchestration: true },
5003+
);
5004+
assert.deepEqual(issued, [{ threadId, capabilities: ["preview", "pull-requests"] }]);
5005+
}).pipe(Effect.provide(NodeServices.layer)),
5006+
);
49915007
});

‎apps/server/src/provider/Layers/ProviderService.ts‎

Lines changed: 52 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,12 @@ import {
2828
ProviderUploadFeedbackInput,
2929
ThreadId,
3030
TurnId,
31+
type ProjectId,
3132
type ProviderInstanceId,
3233
type ProviderDriverKind,
3334
type ProviderRuntimeEvent,
3435
type ProviderSession,
36+
type ServerSettings as ServerSettingsValue,
3537
} from "@t3tools/contracts";
3638
import { expandAssistantCitationsForProvider } from "@t3tools/shared/assistantCitations";
3739
import { HostProcessPlatform } from "@t3tools/shared/hostProcess";
@@ -867,22 +869,26 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
867869
const agentAccessSettings = Effect.fn("ProviderService.agentAccessSettings")(
868870
function* (threadId: ThreadId) {
869871
const settings = yield* serverSettings.getSettings;
870-
const overridden = Object.values(settings.projectSettingsOverrides).some(
871-
(entry) =>
872-
entry.enableAgentBrowserAccess !== undefined ||
873-
entry.enableAgentDeviceAccess !== undefined,
872+
const entries = Object.values(settings.projectSettingsOverrides);
873+
const browserOverridden = entries.some(
874+
(entry) => entry.enableAgentBrowserAccess !== undefined,
874875
);
875-
if (!overridden) {
876-
return {
877-
browser: settings.enableAgentBrowserAccess,
878-
device: settings.enableAgentDeviceAccess,
879-
};
880-
}
876+
const deviceOverridden = entries.some((entry) => entry.enableAgentDeviceAccess !== undefined);
877+
const environment = {
878+
browser: settings.enableAgentBrowserAccess,
879+
device: settings.enableAgentDeviceAccess,
880+
};
881+
if (!browserOverridden && !deviceOverridden) return environment;
881882
// Provider-only runtimes may omit orchestration. An unresolved project
882-
// must not bypass an explicit project override.
883-
if (Option.isNone(projectionQuery)) return { browser: false, device: false };
883+
// must not bypass an explicit project override, but a capability no
884+
// project overrides keeps its environment value.
885+
const denied = {
886+
browser: browserOverridden ? false : environment.browser,
887+
device: deviceOverridden ? false : environment.device,
888+
};
889+
if (Option.isNone(projectionQuery)) return denied;
884890
const thread = yield* projectionQuery.value.getThreadShellById(threadId);
885-
if (Option.isNone(thread)) return { browser: false, device: false };
891+
if (Option.isNone(thread)) return denied;
886892
const resolved = resolveProjectSettings(settings, thread.value.projectId).settings;
887893
return {
888894
browser: resolved.enableAgentBrowserAccess,
@@ -2227,10 +2233,30 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
22272233
);
22282234

22292235
const runStopAll = Effect.fn("runStopAll")(function* () {
2230-
const continueAfterRestart = yield* serverSettings.getSettings.pipe(
2231-
Effect.map((settings) => settings.continueThreadsAfterServerUpdate),
2232-
Effect.orElseSucceed(() => false),
2236+
// Continuation is project-scopable, so decide it per session's project;
2237+
// without orchestration the environment value is all there is.
2238+
const stopSettings = yield* serverSettings.getSettings.pipe(
2239+
Effect.map(Option.some),
2240+
Effect.orElseSucceed(() => Option.none<ServerSettingsValue>()),
22332241
);
2242+
const continueAfterRestartFor = Effect.fn("continueAfterRestartFor")(function* (
2243+
threadId: ThreadId,
2244+
) {
2245+
if (Option.isNone(stopSettings)) return false;
2246+
const settings = stopSettings.value;
2247+
const overridden = Object.values(settings.projectSettingsOverrides).some(
2248+
(entry) => entry.continueThreadsAfterServerUpdate !== undefined,
2249+
);
2250+
if (!overridden || Option.isNone(projectionQuery)) {
2251+
return settings.continueThreadsAfterServerUpdate;
2252+
}
2253+
const thread = yield* projectionQuery.value
2254+
.getThreadShellById(threadId)
2255+
.pipe(Effect.orElseSucceed(() => Option.none<{ projectId: ProjectId }>()));
2256+
if (Option.isNone(thread)) return settings.continueThreadsAfterServerUpdate;
2257+
return resolveProjectSettings(settings, thread.value.projectId).settings
2258+
.continueThreadsAfterServerUpdate;
2259+
});
22342260
const properties = yield* Ref.modify(turnAnalytics, (state) => {
22352261
const completed: Array<Readonly<Record<string, unknown>>> = [];
22362262
for (const [sessionKey, session] of state.sessions) {
@@ -2256,15 +2282,20 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
22562282
),
22572283
).pipe(Effect.map((sessionsByAdapter) => sessionsByAdapter.flatMap((sessions) => sessions)));
22582284
yield* Effect.forEach(activeSessions, (session) =>
2259-
Effect.flatMap(nowIso, (lastRuntimeEventAt) =>
2260-
upsertSessionBinding(session, session.threadId, {
2261-
...(continueAfterRestart && session.status === "running" && session.activeTurnId
2285+
Effect.gen(function* () {
2286+
const continueAfterRestart =
2287+
session.status === "running" && session.activeTurnId
2288+
? yield* continueAfterRestartFor(session.threadId)
2289+
: false;
2290+
const lastRuntimeEventAt = yield* nowIso;
2291+
yield* upsertSessionBinding(session, session.threadId, {
2292+
...(continueAfterRestart && session.activeTurnId
22622293
? { continueAfterServerUpdate: session.activeTurnId }
22632294
: {}),
22642295
lastRuntimeEvent: "provider.stopAll",
22652296
lastRuntimeEventAt,
2266-
}),
2267-
),
2297+
});
2298+
}),
22682299
).pipe(Effect.asVoid);
22692300
yield* Effect.forEach(currentAdapters, ([, adapter]) => adapter.stopAll()).pipe(Effect.asVoid);
22702301
yield* McpSessionRegistry.revokeAllActiveMcpCredentials();

‎apps/server/src/serverSettings.test.ts‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1363,4 +1363,30 @@ it.layer(NodeServices.layer)("server settings", (it) => {
13631363
assert.isUndefined(persisted.projectSettingsOverrides[legacyProject]);
13641364
}).pipe(Effect.provide(makeServerSettingsLayer())),
13651365
);
1366+
1367+
it.effect("leaves an unreadable settings.json untouched instead of folding over it", () =>
1368+
Effect.gen(function* () {
1369+
const serverConfig = yield* ServerConfig.ServerConfig;
1370+
const fileSystem = yield* FileSystem.FileSystem;
1371+
const sql = yield* SqlClient.SqlClient;
1372+
const serverSettings = yield* ServerSettingsModule.ServerSettingsService;
1373+
yield* sql`
1374+
INSERT INTO projection_projects (
1375+
project_id, title, workspace_root, auto_pull, scripts_json, created_at, updated_at
1376+
)
1377+
VALUES (
1378+
${"project-broken"}, ${"Project"}, ${"/tmp/project-broken"}, ${1}, ${"[]"},
1379+
${"2026-08-25T00:00:00.000Z"}, ${"2026-08-25T00:00:00.000Z"}
1380+
)
1381+
`;
1382+
const broken = '{"defaultAutoPull": tru';
1383+
yield* fileSystem.writeFileString(serverConfig.settingsPath, broken);
1384+
1385+
const settings = yield* serverSettings.getSettings;
1386+
assert.isFalse(settings.projectSettingsFolded);
1387+
assert.deepEqual(settings.projectSettingsOverrides, {});
1388+
// The user's file is still there to repair; nothing was written over it.
1389+
assert.equal(yield* fileSystem.readFileString(serverConfig.settingsPath), broken);
1390+
}).pipe(Effect.provide(makeServerSettingsLayer())),
1391+
);
13661392
});

‎apps/server/src/serverSettings.ts‎

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,9 @@ const make = Effect.gen(function* () {
555555
const loadSettingsFromDisk = Effect.gen(function* () {
556556
let settings = DEFAULT_SERVER_SETTINGS;
557557
let persisted: typeof PersistedOptionalProviderSettings.Type = {};
558+
// A file that failed to decode must stay on disk for the user to repair;
559+
// the fold below only writes when it started from the file's real contents.
560+
let settingsFileTrusted = true;
558561

559562
if (yield* readConfigExists) {
560563
const raw = yield* readRawConfig;
@@ -565,6 +568,7 @@ const make = Effect.gen(function* () {
565568
}
566569
if (decoded._tag === "Failure" || persistedSettings._tag === "Failure") {
567570
const failure = decoded._tag === "Failure" ? decoded : persistedSettings;
571+
settingsFileTrusted = false;
568572
if (failure._tag === "Failure") {
569573
yield* Effect.logWarning("failed to parse settings.json, using defaults", {
570574
path: settingsPath,
@@ -603,9 +607,10 @@ const make = Effect.gen(function* () {
603607
),
604608
);
605609

606-
const legacyProjectRows = settings.projectSettingsFolded
607-
? []
608-
: yield* sql<LegacyProjectSettingsRow>`
610+
const legacyProjectRows =
611+
settings.projectSettingsFolded || !settingsFileTrusted
612+
? []
613+
: yield* sql<LegacyProjectSettingsRow>`
609614
SELECT
610615
project_id AS "projectId",
611616
default_model_selection_json AS "defaultModelSelection",
@@ -615,20 +620,22 @@ const make = Effect.gen(function* () {
615620
FROM projection_projects
616621
WHERE deleted_at IS NULL
617622
`.pipe(
618-
Effect.mapError(
619-
(cause) =>
620-
new ServerSettingsError({
621-
settingsPath,
622-
operation: "read-project-settings",
623-
cause,
624-
}),
625-
),
626-
);
623+
Effect.mapError(
624+
(cause) =>
625+
new ServerSettingsError({
626+
settingsPath,
627+
operation: "read-project-settings",
628+
cause,
629+
}),
630+
),
631+
);
627632

628633
const loaded = foldProviderInstanceEnabledFlags(
629634
restoreUsedProviders(settings, persisted, providerHistory),
630635
);
631-
const folded = foldLegacyProjectSettings(loaded, legacyProjectRows);
636+
const folded = settingsFileTrusted
637+
? foldLegacyProjectSettings(loaded, legacyProjectRows)
638+
: loaded;
632639
if (folded !== loaded) {
633640
yield* writeSettingsAtomically(folded);
634641
}

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,17 @@ describe("resolveProjectSettings", () => {
6161
);
6262
expect(resolved.sources.textGenerationModelSelection).toBe("environment");
6363
});
64+
65+
it("keeps the environment default model when the override's provider is disabled", () => {
66+
const disabledSelection = createModelSelection(ProviderInstanceId.make("claudeAgent"), "opus");
67+
const settings = applyServerSettingsPatch(DEFAULT_SERVER_SETTINGS, {
68+
providers: { claudeAgent: { enabled: false } },
69+
projectSettingsOverrides: { [projectId]: { defaultModelSelection: disabledSelection } },
70+
});
71+
const resolved = resolveProjectSettings(settings, projectId);
72+
expect(resolved.settings.defaultModelSelection).toBeNull();
73+
expect(resolved.sources.defaultModelSelection).toBe("environment");
74+
});
6475
});
6576

6677
describe("projectSettingsOverrides patches", () => {
@@ -119,6 +130,22 @@ describe("projectSettingsOverrides patches", () => {
119130
expect(cleared.projectSettingsOverrides).toEqual({ [projectId]: { defaultAutoPull: true } });
120131
});
121132

133+
it("lets a canonical entry win over a legacy map for the same project", () => {
134+
const current = applyServerSettingsPatch(DEFAULT_SERVER_SETTINGS, {
135+
projectSettingsOverrides: { [projectId]: { defaultAutoPull: true } },
136+
});
137+
// The canonical entry omits defaultAutoPull to clear it; the stale legacy
138+
// map in the same patch must not put it back.
139+
const next = applyServerSettingsPatch(current, {
140+
projectSettingsOverrides: { [projectId]: { defaultThreadEnvMode: "local" } },
141+
projectAutoPullOverrides: { [projectId]: true, [otherProjectId]: false },
142+
});
143+
expect(next.projectSettingsOverrides).toEqual({
144+
[projectId]: { defaultThreadEnvMode: "local" },
145+
[otherProjectId]: { defaultAutoPull: false },
146+
});
147+
});
148+
122149
it("builds replacement entries and clears individual keys", () => {
123150
const settings = applyServerSettingsPatch(DEFAULT_SERVER_SETTINGS, {
124151
projectSettingsOverrides: {

‎packages/shared/src/projectSettings.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import {
2+
type ModelSelection,
23
PROJECT_SCOPED_SERVER_SETTING_KEYS,
34
type ProjectId,
45
type ProjectScopedServerSettingKey,
@@ -58,11 +59,13 @@ export function resolveProjectSettings(
5859
for (const key of PROJECT_SCOPED_SERVER_SETTING_KEYS) {
5960
if (!Object.hasOwn(overrides, key)) continue;
6061
const value = overrides[key];
62+
// A model on a disabled provider falls back to the environment, like the
63+
// environment-level guards do for these keys.
6164
if (
62-
key === "textGenerationModelSelection" &&
65+
(key === "textGenerationModelSelection" || key === "defaultModelSelection") &&
6366
value !== undefined &&
6467
value !== null &&
65-
!isModelSelectionProviderEnabled(settings, value as ServerSettings[typeof key])
68+
!isModelSelectionProviderEnabled(settings, value as ModelSelection)
6669
) {
6770
continue;
6871
}

‎packages/shared/src/serverSettings.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,12 +229,16 @@ function translateLegacyProjectOverridePatch(
229229
const entries = new Map<string, ProjectSettingsOverrides | null>(
230230
Object.entries(rest.projectSettingsOverrides ?? {}),
231231
);
232+
// A canonical entry in the same patch is the newer representation; a legacy
233+
// map must not resurrect a key that entry deliberately omits.
234+
const canonicalProjectIds = new Set(Object.keys(rest.projectSettingsOverrides ?? {}));
232235
const applyKey = <K extends ProjectScopedServerSettingKey>(
233236
map: Readonly<Record<string, ProjectSettingsOverrides[K] | null>> | undefined,
234237
key: K,
235238
) => {
236239
if (map === undefined) return;
237240
for (const [projectId, value] of Object.entries(map)) {
241+
if (canonicalProjectIds.has(projectId)) continue;
238242
const entry: ProjectSettingsOverrides = {
239243
...(entries.get(projectId) ?? currentEntries[projectId] ?? {}),
240244
};

0 commit comments

Comments
 (0)