Skip to content

Self-hosted, Self-Improving, Federated Everything App — dev management, agent orchestration, persistent mind, digital twin, second brain, and creative pipeline from a single dashboard over Tailscale to port the user into the OS

fix: read settings metadata before loading cache snapshots (#12569)

[._.]/ Adam Eivyb573a95087b6
diff --git a/server/services/codeReview.diskSettings.test.js b/server/services/codeReview.diskSettings.test.js
index 9ca57f9ba4..da23851bd7 100644
--- a/server/services/codeReview.diskSettings.test.js
+++ b/server/services/codeReview.diskSettings.test.js
@@ -3,7 +3,21 @@ import { mkdtemp, writeFile, rm, utimes } from 'node:fs/promises';
import { join } from 'node:path';
import { tmpdir } from 'node:os';
-const context = vi.hoisted(() => ({ data: '', afterHydrate: null }));
+const context = vi.hoisted(() => ({ data: '', afterHydrate: null, beforeStat: null, strictReads: 0 }));
+vi.mock('node:fs/promises', async importActual => {
+ const actual = await importActual();
+ return { ...actual, stat: async (...args) => {
+ await context.beforeStat?.();
+ return actual.stat(...args);
+ } };
+});
+vi.mock('../lib/fileUtils.js', async importActual => {
+ const actual = await importActual();
+ return { ...actual, tryReadFileStrict: (...args) => {
+ context.strictReads++;
+ return actual.tryReadFileStrict(...args);
+ } };
+});
vi.mock('../lib/paths.js', async importActual => {
const actual = await importActual();
return { ...actual, PATHS: { ...actual.PATHS, get data() { return context.data; } } };
@@ -22,6 +36,8 @@ let getCodeReviewDefaults;
let file;
beforeEach(async () => {
context.afterHydrate = null;
+ context.beforeStat = null;
+ context.strictReads = 0;
context.data = await mkdtemp(join(tmpdir(), 'review-settings-'));
file = join(context.data, 'settings.json');
vi.resetModules();
@@ -101,3 +117,32 @@ it('observes a bridge write landing after local persistence but before save comp
await settings.updateSettings({ localSave: true }, { skipUserAction: true });
expect(await getCodeReviewDefaults()).toMatchObject({ reviewers: ['claude'], reviewerHealth: health });
});
+
+it.each(['getSettings', 'reloadSettings'])('finishes metadata before reading a %s snapshot', async method => {
+ await writeFile(file, JSON.stringify({ codeReview: { reviewers: ['codex'] } }));
+ let release;
+ let entered;
+ const barrier = new Promise(resolve => { release = resolve; });
+ const started = new Promise(resolve => { entered = resolve; });
+ context.beforeStat = async () => { entered(); await barrier; };
+ const load = settings[method]();
+ await started;
+ try {
+ // A concurrent read could capture old bytes before stat captures a bridge
+ // replacement, permanently labelling the old cache with the new metadata.
+ expect(context.strictReads).toBe(0);
+ } finally {
+ context.beforeStat = null;
+ release();
+ await load;
+ }
+ await writeFile(file, JSON.stringify({ codeReview: { reviewers: ['claude'] } }));
+ expect((await getCodeReviewDefaults()).reviewers).toEqual(['claude']);
+});
+
+it('does not confuse unavailable metadata with a previously absent settings file', async () => {
+ expect((await getCodeReviewDefaults()).reviewers).toEqual([]);
+ await writeFile(file, JSON.stringify({ codeReview: { reviewers: ['claude'] } }));
+ context.beforeStat = async () => { throw Object.assign(new Error('Unavailable metadata'), { code: 'EACCES' }); };
+ expect((await getCodeReviewDefaults()).reviewers).toEqual(['claude']);
+});
diff --git a/server/services/settings.js b/server/services/settings.js
index b90316ab78..7589f6f30e 100644
--- a/server/services/settings.js
+++ b/server/services/settings.js
@@ -172,7 +172,8 @@ export const __resetSettingsCache = () => {
// since such a write bypasses the save()-emitted event the cache rides on and
// would otherwise leave every settings consumer serving pre-restore values.
const reloadSettingsFromDisk = async (signaturePromise = readSettingsSignature()) => {
- const [signature, { corrupt, settings }] = await Promise.all([signaturePromise, readSettingsStrict()]);
+ const signature = await signaturePromise;
+ const { corrupt, settings } = await readSettingsStrict();
if (corrupt) {
// Do NOT broadcast a corrupt on-disk settings.json as `{}` (issue #2684). The
// concrete path is a backup restore of a malformed snapshot: backup.js calls
@@ -205,7 +206,7 @@ const queueWrite = createFileWriteQueue();
// in-process save. reloadSettings itself stays usable inside the restore lock.
export const refreshSettingsIfChangedOnDisk = () => queueWrite(async () => {
const signature = await readSettingsSignature();
- if (settingsCache !== null && settingsSignature !== undefined
+ if (settingsCache !== null && settingsSignature !== undefined && signature !== undefined
&& signature?.mtimeMs === settingsSignature?.mtimeMs
&& signature?.size === settingsSignature?.size) return;
await reloadSettingsFromDisk(signature);
@@ -393,7 +394,8 @@ export const getSettingsWithStatus = async () => {
// defeating the no-restart self-heal the auth fail-closed path promises. This
// covers BOTH failure modes (malformed content and an unreadable-but-present
// file); only a genuinely ABSENT file (fresh install) caches `{}`.
- const [signature, { corrupt, settings }] = await Promise.all([readSettingsSignature(), readSettingsStrict()]);
+ const signature = await readSettingsSignature();
+ const { corrupt, settings } = await readSettingsStrict();
const loaded = stripStoreKeys(await hydratePrivateKeys(settings, PATHS.data));
// A save()/reloadSettings() may have populated the cache via the
// settings:updated listener while this cold read was awaiting the disk read.
diff --git a/server/services/settings.test.js b/server/services/settings.test.js
index b9b7e94f0d..55475cfa3d 100644
--- a/server/services/settings.test.js
+++ b/server/services/settings.test.js
@@ -126,9 +126,15 @@ describe('settings.js', () => {
// Hold the cold read's disk load open until we release it, so we can slip a
// save() in while getSettings() is awaiting loadRaw().
let releaseRead;
- tryReadFile.mockReturnValue(new Promise((resolve) => { releaseRead = resolve; }));
+ let readStarted;
+ const started = new Promise(resolve => { readStarted = resolve; });
+ tryReadFile.mockImplementation(() => new Promise(resolve => {
+ releaseRead = resolve;
+ readStarted();
+ }));
- const inflight = getSettings(); // cold — now awaiting the disk read
+ const inflight = getSettings();
+ await started;
// A save completes mid-flight and populates the cache with fresh settings.
settingsEvents.emit('settings:updated', { theme: 'fresh' });
// Only now does the older on-disk snapshot resolve.