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
JavaScript ai-agentsdashboarddeveloper-toolsdigital-twinquantified-selfsecond-brainself-hostedtailscale
fix: settle sibling category scans before a strict overview rejects (#12994)
[._.]/ Adam Eivyeb63142b406e
diff --git a/server/services/dataManager.js b/server/services/dataManager.jsindex 0ba19780b8..2c6012a6ad 100644--- a/server/services/dataManager.js+++ b/server/services/dataManager.js@@ -364,10 +364,8 @@ async function getDirSizeAndCount(dirPath, { strict = false } = {}) {// never cached. Busy state and disk capacity are read fresh on every call.const OVERVIEW_SCAN_TTL_MS = 30_000;const overviewScans = new Map();-let overviewScanGeneration = 0;export function invalidateOverviewScan() {- overviewScanGeneration++;overviewScans.clear();}@@ -381,16 +379,23 @@ async function scanDataTree(strict) {// The root is the sum of its parts: scanning DATA_DIR itself would re-walk// every category. Top-level files are sized by allocated blocks to match du.- const [dirResults, fileSizes] = await Promise.all([- Promise.all(dirs.map(d => getDirSizeAndCount(join(DATA_DIR, d.name), { strict }))),- Promise.all(topFiles.map(f => stat(join(DATA_DIR, f.name)).then(+ // allSettled: a strict failure waits for its sibling scans rather than+ // leaving them running unobserved after the rejection.+ const settled = await Promise.allSettled([+ ...dirs.map(d => getDirSizeAndCount(join(DATA_DIR, d.name), { strict })),+ ...topFiles.map(f => stat(join(DATA_DIR, f.name)).then(st => (typeof st.blocks === 'number' ? st.blocks * 512 : st.size),(err) => {if (strict) throw err;return 0;},- ))),+ )),]);+ const failed = settled.find(r => r.status === 'rejected');+ if (failed) throw failed.reason;+ const values = settled.map(r => r.value);+ const dirResults = values.slice(0, dirs.length);+ const fileSizes = values.slice(dirs.length);let totalSize = fileSizes.reduce((sum, n) => sum + n, 0);let totalFileCount = topFiles.length;@@ -405,17 +410,12 @@ async function scanDataTree(strict) {function getCachedOverviewScan(strict) {const cached = overviewScans.get(strict);if (cached && Date.now() - cached.at < OVERVIEW_SCAN_TTL_MS) return cached.promise;- const generation = overviewScanGeneration;const promise = scanDataTree(strict);const entry = { at: Date.now(), promise };overviewScans.set(strict, entry);promise.catch(() => {if (overviewScans.get(strict) === entry) overviewScans.delete(strict);});- // A mutation that landed mid-scan makes this result stale for later callers.- promise.then(() => {- if (generation !== overviewScanGeneration && overviewScans.get(strict) === entry) overviewScans.delete(strict);- }, () => {});return promise;}diff --git a/server/services/dataManager.strict.test.js b/server/services/dataManager.strict.test.jsindex d4969d9a55..7b7f66e89c 100644--- a/server/services/dataManager.strict.test.js+++ b/server/services/dataManager.strict.test.js@@ -46,9 +46,7 @@ const { getDataOverview, deleteBackup, invalidateOverviewScan } = await import('afterAll(() => rmSync(testDataRoot, { recursive: true, force: true }));-beforeEach(async () => {- // A strict scan rejects before its sibling category scans finish; let those settle so they don't spill into the next case's call log.- await new Promise(resolve => setTimeout(resolve, 10));+beforeEach(() => {invalidateOverviewScan();mocks.statErrorPath = null; mocks.countErrorPath = null; mocks.virtualCount = 0;rmSync(testDataRoot, { recursive: true, force: true });