@lmzhen/dsh-evolution-state-json 0.3.67 → 0.3.69

package/lib/index.js

@@ -1,7 +1,7 @@
 import z from "@deepseek-ai/schemastery";
 import { evolutionHome, makeSerialQueue, transactIo } from "@lmzhen/dsh-evolution-core";
-import { CURATOR_STATE_FILE, CURATOR_STATE_KEY, CURATOR_STATE_TABLE, PENDING_ARCHIVE_BAK_FILE, PENDING_ARCHIVE_FILE, PENDING_LEGACY_FILE, PENDING_RESOLVED_CAP, PENDING_STATE_FILE, PENDING_TABLE, PROVIDER_JSON, REVIEW_STATE_FILE, REVIEW_STATE_SESSION_CAP, REVIEW_STATE_TABLE, assertCloneable, canClaimPending, canResolvePending, recordIssue, releasedStatus } from "@lmzhen/dsh-evolution-state-storage";
-import { isAbsolute, join } from "node:path";
+import { CURATOR_STATE_FILE, CURATOR_STATE_KEY, CURATOR_STATE_TABLE, PENDING_ARCHIVE_BAK_FILE, PENDING_ARCHIVE_FILE, PENDING_LEGACY_FILE, PENDING_RESOLVED_CAP, PENDING_STATE_FILE, PENDING_TABLE, PROVIDER_JSON, REVIEW_STATE_FILE, REVIEW_STATE_SESSION_CAP, REVIEW_STATE_TABLE, assertCloneable, canClaimPending, canResolvePending, recordIssue, releasedStatus, selectPendingOverflow, selectSessionOverflow } from "@lmzhen/dsh-evolution-state-storage";
+import { basename, dirname, isAbsolute, join } from "node:path";
 //#region lib/types/index.js
 /**
 * JSON-file evolution state provider over the IO seam.
@@ -62,18 +62,42 @@ const QUARANTINE_ERROR_NAME = "EvolutionStateCorruptFile";
 * DIFFERENT payload gets a stamped sibling so the earlier rescue copy is never
 * overwritten. The node backend's 7-day `.corrupt` sweep bounds the set. */
 async function quarantineTarget(io, base, content) {
-	if (!await io().exists(base).catch(() => false)) return base;
-	return await io().readText(base).catch(() => null) === content ? base : `${base}.${Date.now()}`;
+	if (!await io().exists(base).catch(() => false)) return {
+		dest: base,
+		needsWrite: true
+	};
+	if (await io().readText(base).catch(() => null) === content) return {
+		dest: base,
+		needsWrite: false
+	};
+	const dir = dirname(base);
+	const stem = `${basename(base)}.`;
+	try {
+		for (const name of await io().list(dir)) {
+			if (!name.startsWith(stem)) continue;
+			if (!/^\d+$/.test(name.slice(stem.length))) continue;
+			const sibling = join(dir, name);
+			if (await io().readText(sibling).catch(() => null) === content) return {
+				dest: sibling,
+				needsWrite: false
+			};
+		}
+	} catch {}
+	return {
+		dest: `${base}.${Date.now()}`,
+		needsWrite: true
+	};
 }
 async function quarantine(io, root, file, raw, reason) {
-	const dest = await quarantineTarget(io, `${join(root, file)}.corrupt`, raw);
+	const { dest, needsWrite } = await quarantineTarget(io, `${join(root, file)}.corrupt`, raw);
 	let preservedNote = `; original preserved at ${dest} — inspect and fix it, then retry.`;
-	try {
+	if (needsWrite) try {
 		await io().writeText(dest, raw);
 		corruptWritten.delete(file);
 	} 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.`;
 	}
+	else corruptWritten.delete(file);
 	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
@@ -140,8 +164,8 @@ async function ensureCorruptCopy(ctx, io, root, file, bad) {
 	})).sort((a, b) => a.id.localeCompare(b.id)));
 	if (corruptWritten.get(file) === corruptKey && await io().exists(base)) return true;
 	const payload = JSON.stringify(bad, null, 2);
-	const dest = await quarantineTarget(io, base, payload);
-	const wrote = await io().writeText(dest, payload).then(() => true).catch(() => false);
+	const { dest, needsWrite } = await quarantineTarget(io, base, payload);
+	const wrote = needsWrite ? await io().writeText(dest, payload).then(() => true).catch(() => false) : true;
 	if (wrote) {
 		corruptWritten.set(file, corruptKey);
 		corruptWriteWarned.delete(file);
@@ -290,24 +314,19 @@ function apply(ctx, rawConfig = {}) {
 		};
 	}
 	/** 0.3.22 (F-336): when the live pending map holds more than
-	* `PENDING_RESOLVED_CAP` resolved records, drop the oldest (by resolvedAt,
-	* then insertion order on ties) from the map and return them for archiving.
+	* `PENDING_RESOLVED_CAP` resolved records, drop the oldest (by resolvedAt;
+	* a missing/unparseable timestamp sorts LAST and leaves first only when the
+	* overflow exceeds every known timestamp — v28 G2.4 wording, shared seam
+	* rule) from the map and return them for archiving.
 	* Only approved/rejected records are candidates — pending/executing are
 	* live work and are never trimmed. Returns the pruned map (rather than
 	* mutating in place) plus the evicted records. */
 	function enforceResolvedCap(map) {
-		const resolved = Object.values(map).filter((record) => (record.status === "approved" || record.status === "rejected") && record.kind !== "capability");
-		if (resolved.length <= PENDING_RESOLVED_CAP$1) return {
+		const oldest = selectPendingOverflow(Object.values(map), PENDING_RESOLVED_CAP$1);
+		if (oldest.length === 0) return {
 			map,
 			evicted: []
 		};
-		const overflow = resolved.length - PENDING_RESOLVED_CAP$1;
-		const entryTime = (record) => {
-			if (!record.resolvedAt) return Number.MAX_SAFE_INTEGER;
-			const parsed = Date.parse(record.resolvedAt);
-			return Number.isNaN(parsed) ? Number.MAX_SAFE_INTEGER : parsed;
-		};
-		const oldest = resolved.sort((a, b) => entryTime(a) - entryTime(b)).slice(0, overflow);
 		const oldestKeys = /* @__PURE__ */ new Set();
 		for (const [key, value] of Object.entries(map)) if (oldest.includes(value)) oldestKeys.add(key);
 		const kept = {};
@@ -326,19 +345,34 @@ function apply(ctx, rawConfig = {}) {
 	* read-only legacy `pending.json` re-introduces an evicted record on the
 	* next resolve) and rotate the sidecar to `.bak` past ARCHIVE_RESOLVED_CAP
 	* so neither the file nor the per-append full-array rewrite grows without
-	* bound. */
+	* bound.
+	* v28 G0.2 (STATE-01): returns whether the records' resolved evidence
+	* LANDED. `false` (rescue-skip or write failure) hands the caller the
+	* replay-window responsibility: the evicted records are no longer in the
+	* live map and their only durable "resolved" copy failed to land, so the
+	* caller must compensate (merge them back) before the legacy merge can
+	* revive a ghost twin. A dedupe no-op counts as success — the records are
+	* already in the archive. */
 	async function appendArchive(records) {
+		let landed = true;
 		try {
 			await transactIo(io(), pathOf(PENDING_ARCHIVE_FILE), async (current) => {
 				let archive = [];
-				if (current !== null) try {
-					const parsed = JSON.parse(current);
-					if (Array.isArray(parsed)) archive = parsed;
-				} catch {
-					if (!await io().writeText(`${pathOf(PENDING_ARCHIVE_FILE)}.corrupt`, current).then(() => true, () => false)) {
-						ctx.logger.warn(`evolution-state-json: corrupt ${PENDING_ARCHIVE_FILE} could not be quarantined to .corrupt — skipping this audit append to preserve the recoverable bytes`);
-						return current;
+				if (current !== null) {
+					let parsed;
+					let unparseable = false;
+					try {
+						parsed = JSON.parse(current);
+					} catch {
+						unparseable = true;
 					}
+					if (unparseable || !Array.isArray(parsed)) {
+						if (!await io().writeText(`${pathOf(PENDING_ARCHIVE_FILE)}.corrupt`, current).then(() => true, () => false)) {
+							ctx.logger.warn(`evolution-state-json: corrupt ${PENDING_ARCHIVE_FILE} could not be quarantined to .corrupt — skipping this audit append to preserve the recoverable bytes`);
+							landed = false;
+							return current;
+						}
+					} else archive = parsed;
 				}
 				const shaped = archive.filter((entry) => entry !== null && typeof entry === "object");
 				const archiveKeys = /* @__PURE__ */ new Set();
@@ -355,13 +389,15 @@ function apply(ctx, rawConfig = {}) {
 				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(() => {});
-					return JSON.stringify((fresh.length > 0 ? fresh : next).slice(-5e3), null, 2);
+					if (archive.length > 0) await io().writeText(pathOf(PENDING_ARCHIVE_BAK_FILE), JSON.stringify(archive)).catch(() => {});
+					return JSON.stringify((fresh.length > 0 ? fresh : next).slice(-5e3));
 				}
-				return JSON.stringify(next, null, 2);
+				return JSON.stringify(next);
 			});
+			return landed;
 		} catch (error) {
 			ctx.logger.warn(`evolution-state-json: archive append deferred: ${error instanceof Error ? error.message : String(error)}`);
+			return false;
 		}
 	}
 	const provider = {
@@ -384,9 +420,10 @@ function apply(ctx, rawConfig = {}) {
 					};
 					const others = Object.keys(stamped).filter((id) => id !== sessionId);
 					if (others.length < REVIEW_STATE_SESSION_CAP) return stamped;
-					const stampOf = (id) => stamped[id]?.updatedAt ?? 0;
-					others.sort((a, b) => stampOf(a) - stampOf(b));
-					const evict = new Set(others.slice(0, others.length - REVIEW_STATE_SESSION_CAP + 1));
+					const evict = new Set(selectSessionOverflow(others, {
+						keyOf: (id) => id,
+						stampOf: (id) => stamped[id]?.updatedAt ?? 0
+					}));
 					const pruned = {};
 					for (const [id, row] of Object.entries(stamped)) if (!evict.has(id)) pruned[id] = row;
 					return pruned;
@@ -474,7 +511,6 @@ function apply(ctx, rawConfig = {}) {
 					record: null,
 					applied: false
 				};
-				let evicted = [];
 				await jsonTransact(ctx, io, root, PENDING_STATE_FILE, async (current) => {
 					const map = { ...await mergedWithFilteredLegacy(legacyMigrated ? null : await readJson(PENDING_LEGACY_FILE), current ?? {}) };
 					const record = map[id] ?? null;
@@ -503,10 +539,18 @@ function apply(ctx, rawConfig = {}) {
 						applied: true
 					};
 					const pruned = enforceResolvedCap(map);
-					evicted = pruned.evicted;
+					if (pruned.evicted.length === 0) return pruned.map;
+					if (!await appendArchive(pruned.evicted)) {
+						const restored = { ...pruned.map };
+						for (const record of pruned.evicted) {
+							if (record.id in restored) continue;
+							restored[record.id] = record;
+						}
+						ctx.logger.warn(`evolution-state-json: archive append deferred — ${pruned.evicted.length} evicted resolved record(s) were merged back into the live map (retried on the next resolve)`);
+						return restored;
+					}
 					return pruned.map;
 				});
-				if (evicted.length > 0) await appendArchive(evicted);
 				return result;
 			});
 		}

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.67",
+  "version": "0.3.69",
   "publishConfig": {
     "access": "public"
   },
@@ -31,18 +31,18 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-core": "^0.3.67"
+    "@lmzhen/dsh-evolution-core": "^0.3.69"
   },
   "peerDependencies": {
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
     "@deepseek-ai/cordis": "^4.0.1",
-    "@lmzhen/dsh-evolution-io": "^0.3.67",
-    "@lmzhen/dsh-evolution-state-storage": "^0.3.67"
+    "@lmzhen/dsh-evolution-io": "^0.3.69",
+    "@lmzhen/dsh-evolution-state-storage": "^0.3.69"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
-    "@lmzhen/dsh-evolution-io": "^0.3.67",
-    "@lmzhen/dsh-evolution-state-storage": "^0.3.67",
-    "@lmzhen/dsh-evolution-io-node": "^0.3.67"
+    "@lmzhen/dsh-evolution-io": "^0.3.69",
+    "@lmzhen/dsh-evolution-state-storage": "^0.3.69",
+    "@lmzhen/dsh-evolution-io-node": "^0.3.69"
   }
 }