Skip to content

Commit 445b96e

Browse files
fix(server): key settlement sweeps on settlement overrides only
A project override on an unrelated key (model, workspace, scripts) changed the settlement key and queued a sweep with its pull request lookups. The key now keeps only entries that touch settlement, in project id order.
1 parent 554fe2a commit 445b96e

2 files changed

Lines changed: 32 additions & 6 deletions

File tree

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,21 @@ describe("ThreadSettlementReactor", () => {
316316
assert.notStrictEqual(inherits, never);
317317
});
318318

319+
it("ignores project overrides that do not touch settlement", () => {
320+
const base = ThreadSettlementReactor.autoSettlementSettingsKey({
321+
...DEFAULT_SERVER_SETTINGS,
322+
projectSettingsOverrides: { [PROJECT_ID]: { sidebarAutoSettleOnMerge: false } },
323+
});
324+
const unrelated = ThreadSettlementReactor.autoSettlementSettingsKey({
325+
...DEFAULT_SERVER_SETTINGS,
326+
projectSettingsOverrides: {
327+
[LINKED_PROJECT_ID]: { defaultThreadEnvMode: "worktree" },
328+
[PROJECT_ID]: { sidebarAutoSettleOnMerge: false, defaultAutoPull: true },
329+
},
330+
});
331+
assert.strictEqual(base, unrelated);
332+
});
333+
319334
it.effect(
320335
"settles all-terminal links from snapshots and keeps open or unsynced links active",
321336
() =>

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

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,23 @@ export function autoSettlementSettingsKey(settings: ServerSettingsValue): string
5252
return JSON.stringify([
5353
settings.sidebarAutoSettleOnMerge,
5454
settings.sidebarAutoSettleAfterDays,
55-
// JSON drops undefined, so inherit (absent) and never (null) need distinct marks.
56-
Object.entries(settings.projectSettingsOverrides).map(([projectId, entry]) => [
57-
projectId,
58-
entry.sidebarAutoSettleOnMerge ?? "inherit",
59-
entry.sidebarAutoSettleAfterDays === undefined ? "inherit" : entry.sidebarAutoSettleAfterDays,
60-
]),
55+
// Only entries that touch settlement, in a stable order, so a project
56+
// override on an unrelated key does not queue a sweep. JSON drops
57+
// undefined, so inherit (absent) and never (null) need distinct marks.
58+
Object.entries(settings.projectSettingsOverrides)
59+
.filter(
60+
([, entry]) =>
61+
entry.sidebarAutoSettleOnMerge !== undefined ||
62+
entry.sidebarAutoSettleAfterDays !== undefined,
63+
)
64+
.sort(([left], [right]) => left.localeCompare(right))
65+
.map(([projectId, entry]) => [
66+
projectId,
67+
entry.sidebarAutoSettleOnMerge ?? "inherit",
68+
entry.sidebarAutoSettleAfterDays === undefined
69+
? "inherit"
70+
: entry.sidebarAutoSettleAfterDays,
71+
]),
6172
]);
6273
}
6374

0 commit comments

Comments
 (0)