@lmzhen/dsh-evolution-state-json 0.3.56 → 0.3.58

package/lib/index.js

@@ -57,8 +57,13 @@ const QUARANTINE_ERROR_NAME = "EvolutionStateCorruptFile";
 * copy is swept after 7 days by the node backend's sweepStaleTmps (S-10). */
 async function quarantine(io, root, file, raw, reason) {
 	const dest = `${join(root, file)}.corrupt`;
-	await io().writeText(dest, raw).catch(() => {});
-	throw Object.assign(/* @__PURE__ */ new Error(`evolution state file "${file}" is not valid JSON (${reason}); original preserved at ${dest} — inspect and fix it, then retry.`), { name: QUARANTINE_ERROR_NAME });
+	let preservedNote = `; original preserved at ${dest} — inspect and fix it, then retry.`;
+	try {
+		await io().writeText(dest, raw);
+	} catch (writeError) {
+		preservedNote = `; the quarantine copy at ${dest} FAILED to write (${writeError instanceof Error ? writeError.message : String(writeError)}) — the original file is left in place.`;
+	}
+	throw Object.assign(/* @__PURE__ */ new Error(`evolution state file "${file}" is not valid JSON (${reason})${preservedNote}`), { name: QUARANTINE_ERROR_NAME });
 }
 /** S-05: the V8-16 record-shape gate existed as two verbatim ~15-line
 * copies (jsonTransact + readJson); this private helper is the single owner.
@@ -91,6 +96,16 @@ const RECORD_FIELD_GATES = {
 	[PENDING_STATE_FILE]: gatePendingRecord,
 	[PENDING_LEGACY_FILE]: gatePendingRecord
 };
+/** V11-B1 (P2-23): shared per-record field-gate scan for BOTH paths (readJson
+* + jsonTransact — the transaction baseline used to skip the field gates, so
+* a string `runCount` became `"x1"` through `(current?.runCount ?? 0) + 1` at
+* the next save). Returns the failing [id, record] entries; empty when the
+* file has no gate, the value is not a plain map, or everything passes. */
+function gateScan(file, parsed) {
+	const gate = RECORD_FIELD_GATES[file];
+	if (gate === void 0 || !isPlainRecord(parsed)) return [];
+	return Object.entries(parsed).filter(([, record]) => !isPlainRecord(record) || !gate(record));
+}
 /**
 * Cross-process JSON-file RMW (v3-audit M-8): every read-modify-write state
 * mutation runs inside the IO backend's transact lock (via transactIo) so a
@@ -116,6 +131,15 @@ async function jsonTransact(io, root, file, task) {
 			if (RECORD_MAP_FILES.has(file) && !isPlainRecord(parsed)) return await quarantine(io, root, file, current, `expected a plain JSON object (map of records), got ${Array.isArray(parsed) ? "an array" : parsed === null ? "null" : typeof parsed}`);
 			const malformed = firstNonRecordValue(parsed);
 			if (malformed !== null) return await quarantine(io, root, file, current, malformed);
+			const failing = gateScan(file, parsed);
+			if (failing.length > 0) {
+				const bad = {};
+				const good = {};
+				for (const [id, record] of Object.entries(parsed)) if (failing.some(([failedId]) => failedId === id)) bad[id] = record;
+				else good[id] = record;
+				await io().writeText(`${join(root, file)}.corrupt`, JSON.stringify(bad, null, 2)).catch(() => {});
+				parsed = good;
+			}
 		}
 		const next = await task(parsed);
 		if (next !== null && RECORD_MAP_FILES.has(file) && !isPlainRecord(next)) throw new Error(`evolution state file "${file}" task returned ${Array.isArray(next) ? "an array" : typeof next} (expected null or a plain JSON object map of records); not written.`);
@@ -128,6 +152,7 @@ function apply(ctx, rawConfig) {
 	const io = () => ctx.evolutionIo.provider();
 	const pathOf = (file) => join(root, file);
 	const recordGateWarned = /* @__PURE__ */ new Set();
+	const corruptWritten = /* @__PURE__ */ new Map();
 	async function readJson(file) {
 		const raw = await io().readText(pathOf(file));
 		if (raw === null) return null;
@@ -140,30 +165,28 @@ function apply(ctx, rawConfig) {
 		if (RECORD_MAP_FILES.has(file) && !isPlainRecord(parsed)) return await quarantine(io, root, file, raw, `expected a plain JSON object (map of records), got ${Array.isArray(parsed) ? "an array" : parsed === null ? "null" : typeof parsed}`);
 		const malformed = firstNonRecordValue(parsed);
 		if (malformed !== null) return await quarantine(io, root, file, raw, malformed);
-		const gate = RECORD_FIELD_GATES[file];
-		if (gate !== void 0 && isPlainRecord(parsed)) {
-			const entries = Object.entries(parsed);
-			const failing = entries.filter(([, record]) => !isPlainRecord(record) || !gate(record)).map(([id]) => id);
-			if (failing.length > 0) {
-				const bad = {};
-				const good = {};
-				for (const [id, record] of entries) if (failing.includes(id)) bad[id] = record;
-				else good[id] = record;
+		const failing = gateScan(file, parsed);
+		if (failing.length > 0) {
+			const bad = {};
+			const good = {};
+			for (const [id, record] of Object.entries(parsed)) if (failing.some(([failedId]) => failedId === id)) bad[id] = record;
+			else good[id] = record;
+			const corruptKey = JSON.stringify(failing.map(([id]) => id).sort());
+			if (corruptWritten.get(file) !== corruptKey) {
 				await io().writeText(`${pathOf(file)}.corrupt`, JSON.stringify(bad, null, 2)).catch(() => {});
-				if (!recordGateWarned.has(file)) {
-					recordGateWarned.add(file);
-					ctx.logger.warn(`evolution-state-json: ${failing.length} record(s) in "${file}" failed the record schema gate and were quarantined to "${file}.corrupt": ${failing.join(", ")}`);
-				}
-				return good;
+				corruptWritten.set(file, corruptKey);
 			}
+			if (!recordGateWarned.has(file)) {
+				recordGateWarned.add(file);
+				ctx.logger.warn(`evolution-state-json: ${failing.length} record(s) in "${file}" failed the record schema gate and were quarantined to "${file}.corrupt": ${failing.map(([id]) => id).join(", ")}`);
+			}
+			return good;
 		}
 		return parsed;
 	}
 	const mutate = makeSerialQueue();
 	let legacyMigrated = false;
-	let archivedIdsCache = null;
 	async function readArchivedIds() {
-		if (archivedIdsCache !== null) return archivedIdsCache;
 		const ids = /* @__PURE__ */ new Set();
 		try {
 			const rawArchive = await readJson(PENDING_ARCHIVE_FILE);
@@ -177,7 +200,6 @@ function apply(ctx, rawConfig) {
 				}
 			} catch {}
 		} catch {}
-		archivedIdsCache = ids;
 		return ids;
 	}
 	function filterLegacy(legacy, current, archivedIds) {
@@ -203,7 +225,7 @@ function apply(ctx, rawConfig) {
 		} catch (error) {
 			if (error instanceof Error && error.name === QUARANTINE_ERROR_NAME) throw error;
 			ctx.logger.warn(`evolution-state-json: legacy pending retirement deferred: ${error instanceof Error ? error.message : String(error)}`);
-			return legacy;
+			return {};
 		}
 	}
 	async function loadPendingMap() {
@@ -271,8 +293,9 @@ function apply(ctx, rawConfig) {
 					const parsed = JSON.parse(current);
 					if (Array.isArray(parsed)) archive = parsed;
 				} catch {}
+				const shaped = archive.filter((entry) => entry !== null && typeof entry === "object");
 				const archiveKeys = /* @__PURE__ */ new Set();
-				const collapsed = archive.filter((entry) => {
+				const collapsed = shaped.filter((entry) => {
 					const key = pendingArchiveKey(entry);
 					if (archiveKeys.has(key)) return false;
 					archiveKeys.add(key);
@@ -280,19 +303,19 @@ function apply(ctx, rawConfig) {
 				});
 				const hadDuplicates = collapsed.length !== archive.length;
 				archive = collapsed;
-				const seen = new Set(archive.map(pendingArchiveKey));
+				const seen = new Set(collapsed.map(pendingArchiveKey));
 				const fresh = records.filter((record) => !seen.has(pendingArchiveKey(record)));
 				if (fresh.length === 0 && !hadDuplicates) return current;
 				const next = [...archive, ...fresh];
 				if (next.length > ARCHIVE_RESOLVED_CAP) {
 					if (archive.length > 0) await io().writeText(pathOf(PENDING_ARCHIVE_BAK_FILE), JSON.stringify(archive, null, 2)).catch(() => {});
-					archivedIdsCache = null;
 					return JSON.stringify((fresh.length > 0 ? fresh : next).slice(-5e3), null, 2);
 				}
-				archivedIdsCache = null;
 				return JSON.stringify(next, null, 2);
 			});
-		} catch {}
+		} catch (error) {
+			ctx.logger.warn(`evolution-state-json: archive append deferred: ${error instanceof Error ? error.message : String(error)}`);
+		}
 	}
 	const provider = {
 		name: PROVIDER_JSON,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-state-json",
   "description": "JSON-file evolution state provider over the IO seam (community build)",
-  "version": "0.3.56",
+  "version": "0.3.58",
   "publishConfig": {
     "access": "public"
   },
@@ -31,18 +31,18 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-core": "^0.3.56"
+    "@lmzhen/dsh-evolution-core": "^0.3.58"
   },
   "peerDependencies": {
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
     "@deepseek-ai/cordis": "^4.0.1",
-    "@lmzhen/dsh-evolution-io": "^0.3.56",
-    "@lmzhen/dsh-evolution-state-storage": "^0.3.56"
+    "@lmzhen/dsh-evolution-io": "^0.3.58",
+    "@lmzhen/dsh-evolution-state-storage": "^0.3.58"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
-    "@lmzhen/dsh-evolution-io": "^0.3.56",
-    "@lmzhen/dsh-evolution-state-storage": "^0.3.56",
-    "@lmzhen/dsh-evolution-io-node": "^0.3.56"
+    "@lmzhen/dsh-evolution-io": "^0.3.58",
+    "@lmzhen/dsh-evolution-state-storage": "^0.3.58",
+    "@lmzhen/dsh-evolution-io-node": "^0.3.58"
   }
 }