Skip to content

Commit 45810da

Browse files
Pysephclaude
andcommitted
fix(server): an unreadable settings.json still never resumes threads
Keeping the last good settings while the file is invalid also kept their continueThreadsAfterServerUpdate, which main deliberately forces off for an unreadable file because it may hold an opt-out. Keep forcing it off while the file is invalid; the real value comes back when it parses. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 0906dd5 commit 45810da

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ it.layer(NodeServices.layer)("server settings", (it) => {
344344
yield* service.start;
345345
yield* Queue.clear(reads);
346346
const changes = yield* service.subscribeChanges;
347+
assert.isTrue((yield* service.getSettings).continueThreadsAfterServerUpdate);
347348

348349
// A write caught halfway, then one the schema rejects.
349350
for (const contents of [
@@ -359,6 +360,8 @@ it.layer(NodeServices.layer)("server settings", (it) => {
359360
kept.defaultProjectScripts.map((script) => script.id),
360361
["usage"],
361362
);
363+
// The unreadable file may hold an opt-out, so threads are not resumed meanwhile.
364+
assert.isFalse(kept.continueThreadsAfterServerUpdate);
362365
}
363366
assert.lengthOf(
364367
messages.filter((message) => message.includes("failed to parse settings.json")),
@@ -377,6 +380,7 @@ it.layer(NodeServices.layer)("server settings", (it) => {
377380
Option.getOrUndefined(change)?.defaultProjectScripts.map((script) => script.id),
378381
["usage", "perf-lab"],
379382
);
383+
assert.isTrue(Option.getOrUndefined(change)?.continueThreadsAfterServerUpdate);
380384
}),
381385
).pipe(
382386
Effect.provide(

‎apps/server/src/serverSettings.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -806,15 +806,18 @@ const make = Effect.gen(function* () {
806806

807807
// A file caught mid-write or left invalid keeps the settings that last loaded instead of
808808
// resetting them to defaults, also for readers that join a reload. Its parse failure still
809-
// blocks saves.
809+
// blocks saves, and it still never resumes threads, as at startup: the unreadable file may
810+
// hold an opt-out.
810811
const loadKeepingLastGoodSettings = Effect.gen(function* () {
811812
const loaded = yield* loadSettingsFromDisk;
812813
if (Option.isNone(loaded.parseFailure)) {
813814
yield* Ref.set(lastGoodSettingsRef, Option.some(loaded.settings));
814815
return loaded;
815816
}
816817
const lastGood = yield* Ref.get(lastGoodSettingsRef);
817-
return Option.isSome(lastGood) ? { ...loaded, settings: lastGood.value } : loaded;
818+
return Option.isSome(lastGood)
819+
? { ...loaded, settings: { ...lastGood.value, continueThreadsAfterServerUpdate: false } }
820+
: loaded;
818821
});
819822

820823
const settingsCache = yield* Cache.makeWith(

0 commit comments

Comments
 (0)