@lmzhen/dsh-evolution-state-json 0.3.64 → 0.3.66

package/lib/index.js

@@ -1,6 +1,6 @@
 import z from "@deepseek-ai/schemastery";
 import { evolutionHome, makeSerialQueue, transactIo } from "@lmzhen/dsh-evolution-core";
-import { CURATOR_STATE_FILE, CURATOR_STATE_KEY, PENDING_ARCHIVE_BAK_FILE, PENDING_ARCHIVE_FILE, PENDING_LEGACY_FILE, PENDING_RESOLVED_CAP, PENDING_STATE_FILE, PROVIDER_JSON, REVIEW_STATE_FILE, canClaimPending, canResolvePending, releasedStatus } from "@lmzhen/dsh-evolution-state-storage";
+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_TABLE, assertCloneable, canClaimPending, canResolvePending, recordIssue, releasedStatus } from "@lmzhen/dsh-evolution-state-storage";
 import { isAbsolute, join } from "node:path";
 //#region lib/types/index.js
 /**
@@ -56,8 +56,17 @@ const QUARANTINE_ERROR_NAME = "EvolutionStateCorruptFile";
 * accumulate. The old `.corrupt-<stamp>-<rand>` name minted a fresh file on
 * EVERY read of a corrupt file: unbounded growth with no sweep. The fixed
 * copy is swept after 7 days by the node backend's sweepStaleTmps (S-10). */
+/** P2-19 (v19): pick the quarantine destination. The documented fixed name is
+* reused when it already holds the SAME bytes (a repeated read of one corrupt
+* file must still yield exactly one copy — V10-05's bounded-growth rule); a
+* 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()}`;
+}
 async function quarantine(io, root, file, raw, reason) {
-	const dest = `${join(root, file)}.corrupt`;
+	const dest = await quarantineTarget(io, `${join(root, file)}.corrupt`, raw);
 	let preservedNote = `; original preserved at ${dest} — inspect and fix it, then retry.`;
 	try {
 		await io().writeText(dest, raw);
@@ -76,27 +85,12 @@ function firstNonRecordValue(parsed) {
 	for (const [recordId, record] of Object.entries(parsed)) if (!isPlainRecord(record)) return `expected a plain object for record "${recordId}", got ${record === null ? "null" : Array.isArray(record) ? "an array" : typeof record}`;
 	return null;
 }
-const isNonNegInt = (value) => typeof value === "number" && Number.isInteger(value) && value >= 0;
-const optionalString = (value) => value === void 0 || typeof value === "string";
-const PENDING_KINDS = new Set([
-	"memory",
-	"skill",
-	"capability"
-]);
-const PENDING_STATUSES = new Set([
-	"pending",
-	"executing",
-	"approved",
-	"rejected"
-]);
-const gateReviewRecord = (record) => isNonNegInt(record.turnsSinceMemory) && isNonNegInt(record.turnsSinceSkill) && isNonNegInt(record.lastTurn);
-const gateCuratorRecord = (record) => typeof record.lastRunAt === "number" && Number.isFinite(record.lastRunAt) && record.lastRunAt >= 0 && isNonNegInt(record.runCount) && typeof record.lastSummary === "string" && typeof record.paused === "boolean";
-const gatePendingRecord = (record) => typeof record.id === "string" && typeof record.kind === "string" && PENDING_KINDS.has(record.kind) && typeof record.summary === "string" && "args" in record && typeof record.createdAt === "string" && typeof record.status === "string" && PENDING_STATUSES.has(record.status) && optionalString(record.resolvedAt) && optionalString(record.claimedBy) && optionalString(record.claimedAt) && optionalString(record.origin) && optionalString(record.sessionId);
+const gateFor = (table) => (record) => recordIssue(table, record) === null && assertCloneable(record) === null;
 const RECORD_FIELD_GATES = {
-	[REVIEW_STATE_FILE]: gateReviewRecord,
-	[CURATOR_STATE_FILE]: gateCuratorRecord,
-	[PENDING_STATE_FILE]: gatePendingRecord,
-	[PENDING_LEGACY_FILE]: gatePendingRecord
+	[REVIEW_STATE_FILE]: gateFor(REVIEW_STATE_TABLE),
+	[CURATOR_STATE_FILE]: gateFor(CURATOR_STATE_TABLE),
+	[PENDING_STATE_FILE]: gateFor(PENDING_TABLE),
+	[PENDING_LEGACY_FILE]: gateFor(PENDING_TABLE)
 };
 /** 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
@@ -139,19 +133,23 @@ function reportGateViolation(ctx, file, failing) {
 	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(", ")}`);
 }
 async function ensureCorruptCopy(ctx, io, root, file, bad) {
-	const corruptPath = `${join(root, file)}.corrupt`;
+	const base = `${join(root, file)}.corrupt`;
 	const corruptKey = JSON.stringify(Object.entries(bad).map(([id, record]) => ({
 		id,
 		fields: typeof record === "object" && record !== null ? Object.entries(record).map(([field, value]) => `${field}:${Array.isArray(value) ? "array" : typeof value}`).sort() : [typeof record]
 	})).sort((a, b) => a.id.localeCompare(b.id)));
-	if (corruptWritten.get(file) === corruptKey && await io().exists(corruptPath)) return;
-	if (await io().writeText(corruptPath, JSON.stringify(bad, null, 2)).then(() => true).catch(() => false)) {
+	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);
+	if (wrote) {
 		corruptWritten.set(file, corruptKey);
 		corruptWriteWarned.delete(file);
 	} else if (!corruptWriteWarned.has(file)) {
 		corruptWriteWarned.add(file);
-		ctx.logger.warn(`evolution-state-json: could not write quarantine copy "${corruptPath}" for ${Object.keys(bad).length} failed record(s) — the main file keeps them; the copy is retried on the next access`);
+		ctx.logger.warn(`evolution-state-json: could not write quarantine copy "${dest}" for ${Object.keys(bad).length} failed record(s) — the main file keeps them; the copy is retried on the next access`);
 	}
+	return wrote;
 }
 async function jsonTransact(ctx, io, root, file, task) {
 	await transactIo(io(), join(root, file), async (current) => {
@@ -172,8 +170,8 @@ async function jsonTransact(ctx, io, root, file, task) {
 				for (const [id, record] of Object.entries(parsed)) if (failing.some(([failedId]) => failedId === id)) bad[id] = record;
 				else good[id] = record;
 				reportGateViolation(ctx, file, failing);
-				await ensureCorruptCopy(ctx, io, root, file, bad);
-				parsed = good;
+				if (await ensureCorruptCopy(ctx, io, root, file, bad)) parsed = good;
+				else ctx.logger.warn(`evolution-state-json: keeping ${failing.length} malformed record(s) in ${file} — the quarantine copy could not be written, so rewriting the file without them would destroy the only copy`);
 			}
 		}
 		const next = await task(parsed);
@@ -241,14 +239,21 @@ function apply(ctx, rawConfig = {}) {
 		}
 		return retired;
 	}
-	async function retireLegacyOnce(legacy, current) {
+	async function retireLegacyOnce(legacy) {
 		if (legacyMigrated) return {};
 		try {
-			const retired = filterLegacy(legacy, current, await readArchivedIds());
-			await jsonTransact(ctx, io, root, PENDING_STATE_FILE, (fresh) => ({
-				...retired,
-				...fresh ?? {}
-			}));
+			const retired = {};
+			await jsonTransact(ctx, io, root, PENDING_STATE_FILE, async (fresh) => {
+				const merged = { ...fresh ?? {} };
+				const archivedIds = await readArchivedIds();
+				for (const [id, record] of Object.entries(legacy)) {
+					if (id in merged) continue;
+					if (archivedIds.has(id)) continue;
+					merged[id] = record;
+					retired[id] = record;
+				}
+				return merged;
+			});
 			await io().rename(pathOf(PENDING_LEGACY_FILE), `${pathOf(PENDING_LEGACY_FILE)}.migrated`);
 			legacyMigrated = true;
 			return retired;
@@ -261,7 +266,7 @@ function apply(ctx, rawConfig = {}) {
 	async function loadPendingMap() {
 		const [current, legacy] = await Promise.all([readJson(PENDING_STATE_FILE), readJson(PENDING_LEGACY_FILE)]);
 		if (legacy !== null) return {
-			...await retireLegacyOnce(legacy, current),
+			...await retireLegacyOnce(legacy),
 			...current ?? {}
 		};
 		return { ...current ?? {} };
@@ -284,7 +289,7 @@ function apply(ctx, rawConfig = {}) {
 	* 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");
+		const resolved = Object.values(map).filter((record) => (record.status === "approved" || record.status === "rejected") && record.kind !== "capability");
 		if (resolved.length <= PENDING_RESOLVED_CAP$1) return {
 			map,
 			evicted: []
@@ -323,7 +328,10 @@ function apply(ctx, rawConfig = {}) {
 					const parsed = JSON.parse(current);
 					if (Array.isArray(parsed)) archive = parsed;
 				} catch {
-					await io().writeText(`${pathOf(PENDING_ARCHIVE_FILE)}.corrupt`, current).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;
+					}
 				}
 				const shaped = archive.filter((entry) => entry !== null && typeof entry === "object");
 				const archiveKeys = /* @__PURE__ */ new Set();

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