@lmzhen/dsh-evolution-state-json 0.3.16 → 0.3.18

package/lib/index.js

@@ -2,6 +2,7 @@ import z from "@deepseek-ai/schemastery";
 import { join } from "node:path";
 import { createHash } from "node:crypto";
 import { homedir } from "node:os";
+import { CLAIM_EXPIRY_MS, canClaimPending, canResolvePending, releasedStatus } from "@lmzhen/dsh-evolution-state-storage";
 //#region ../evolution-core/src/io.ts
 /**
 * Run `task` inside `io.transact` when the backend provides it; otherwise fall
@@ -301,6 +302,24 @@ createPromptBundle({
 const FILLER = String.raw`(?:\w+\s+){0,8}`;
 new RegExp(String.raw`ignore\s+${FILLER}(?:previous|above|prior|all)\s+${FILLER}instructions`, "i"), new RegExp(String.raw`new\s+${FILLER}system\s+${FILLER}prompt`, "i"), new RegExp(String.raw`forget\s+${FILLER}(?:everything|all)\s+${FILLER}(?:discussed|you\s+know)`, "i"), new RegExp(String.raw`you\s+have\s+been\s+${FILLER}(?:updated|upgraded|patched)\s+to`, "i"), new RegExp(String.raw`do\s+not\s+${FILLER}tell\s+${FILLER}the\s+user`, "i"), new RegExp(String.raw`output\s+${FILLER}(?:system|initial)\s+prompt`, "i");
 //#endregion
+//#region ../evolution-core/src/serial.ts
+/**
+* A process-local serial task queue: each task starts only after the previous
+* one settles (success or failure), so read-modify-write sequences that share
+* one file never interleave inside this process. The durable cross-process
+* serialization layer is the IO backend's transact lock; this chain is the
+* second layer (0.3.17 S2.8, T-1: the shape was duplicated in state-json and
+* memory-files — one factory now).
+*/
+function makeSerialQueue() {
+	let chain = Promise.resolve();
+	return (task) => {
+		const run = chain.then(task, task);
+		chain = run.then(() => void 0, () => void 0);
+		return run;
+	};
+}
+//#endregion
 //#region ../../../node_modules/.pnpm/js-yaml@4.2.0/node_modules/js-yaml/dist/js-yaml.mjs
 /*! js-yaml 4.2.0 https://github.com/nodeca/js-yaml @license MIT */
 var __create = Object.create;
@@ -2648,13 +2667,24 @@ function apply(ctx, rawConfig) {
 	const root = rawConfig.root || defaultRoot();
 	const io = () => ctx.evolutionIo.provider();
 	const pathOf = (file) => join(root, file);
+	/** 0.3.17 (E-9): a malformed state file used to parse to `null` and was then
+	* OVERWRITTEN by the next save — every other session's review state / the
+	* whole pending table vanished silently. Fail loud instead: preserve the
+	* original bytes beside it and throw, so the operator can rescue and the
+	* corruption is never accepted as "empty". */
+	async function quarantine(file, raw, reason) {
+		const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-");
+		const dest = `${pathOf(file)}.corrupt-${stamp}-${Math.random().toString(36).slice(2, 6)}`;
+		await io().writeText(dest, raw).catch(() => {});
+		throw new Error(`evolution state file "${file}" is not valid JSON (${reason}); original preserved at ${dest} — inspect and fix it, then retry.`);
+	}
 	async function readJson(file) {
 		const raw = await io().readText(pathOf(file));
 		if (raw === null) return null;
 		try {
 			return JSON.parse(raw);
-		} catch {
-			return null;
+		} catch (error) {
+			return await quarantine(file, raw, error instanceof Error ? error.message : String(error));
 		}
 	}
 	/**
@@ -2669,19 +2699,14 @@ function apply(ctx, rawConfig) {
 			let parsed = null;
 			if (current !== null) try {
 				parsed = JSON.parse(current);
-			} catch {
-				parsed = null;
+			} catch (error) {
+				return await quarantine(file, current, error instanceof Error ? error.message : String(error));
 			}
 			const next = await task(parsed);
 			return next === null ? null : JSON.stringify(next, null, 2);
 		});
 	}
-	let chain = Promise.resolve();
-	function mutate(task) {
-		const run = chain.then(task, task);
-		chain = run.then(() => void 0, () => void 0);
-		return run;
-	}
+	const mutate = makeSerialQueue();
 	async function loadPendingMap() {
 		const [current, legacy] = await Promise.all([readJson("pending-state.json"), readJson("pending.json")]);
 		return {
@@ -2717,6 +2742,21 @@ function apply(ctx, rawConfig) {
 				}));
 			});
 		},
+		async transactCuratorState(task) {
+			await mutate(async () => {
+				await jsonTransact("curator-state.json", (current) => {
+					const next = task(current?.primary ?? null);
+					if (next === null) {
+						if (current !== null) delete current.primary;
+						return current ?? {};
+					}
+					return {
+						...current ?? {},
+						primary: next
+					};
+				});
+			});
+		},
 		async listPending(status = "pending") {
 			return await mutate(async () => {
 				const map = await loadPendingMap();
@@ -2743,12 +2783,13 @@ function apply(ctx, rawConfig) {
 						...current ?? {}
 					};
 					const record = map[id] ?? null;
-					if (record === null || record.status !== "pending") return map;
+					if (record === null || !canClaimPending(record.status)) return map;
 					const now = Date.now();
 					const claimedAt = typeof record.claimedAt === "string" ? Date.parse(record.claimedAt) : 0;
-					if (record.claimedBy !== void 0 && Number.isFinite(claimedAt) && now - claimedAt < 10 * 6e4) return map;
+					if (record.claimedBy !== void 0 && Number.isFinite(claimedAt) && now - claimedAt < CLAIM_EXPIRY_MS) return map;
 					slot.claimed = {
 						...record,
+						status: "executing",
 						claimedBy: claimId,
 						claimedAt: new Date(now).toISOString()
 					};
@@ -2766,10 +2807,10 @@ function apply(ctx, rawConfig) {
 						...current ?? {}
 					};
 					const record = map[id];
-					if (record && record.status === "pending" && record.claimedBy === claimId) {
-						delete record.claimedBy;
-						delete record.claimedAt;
-					}
+					if (!record || record.claimedBy !== claimId) return map;
+					record.status = releasedStatus(record.status);
+					delete record.claimedBy;
+					delete record.claimedAt;
 					return map;
 				});
 			});
@@ -2786,7 +2827,7 @@ function apply(ctx, rawConfig) {
 						...current ?? {}
 					};
 					const record = map[id] ?? null;
-					if (record === null || record.status !== "pending") {
+					if (record === null || !canResolvePending(record.status)) {
 						result = {
 							record,
 							applied: false

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.16",
+  "version": "0.3.18",
   "publishConfig": {
     "access": "public"
   },
@@ -37,12 +37,12 @@
   "peerDependencies": {
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
     "@deepseek-ai/cordis": "^4.0.1",
-    "@lmzhen/dsh-evolution-io": "^0.3.16",
-    "@lmzhen/dsh-evolution-state-storage": "^0.3.16"
+    "@lmzhen/dsh-evolution-io": "^0.3.18",
+    "@lmzhen/dsh-evolution-state-storage": "^0.3.18"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
-    "@lmzhen/dsh-evolution-io": "^0.3.16",
-    "@lmzhen/dsh-evolution-state-storage": "^0.3.16"
+    "@lmzhen/dsh-evolution-io": "^0.3.18",
+    "@lmzhen/dsh-evolution-state-storage": "^0.3.18"
   }
 }