@lmzhen/dsh-evolution-state-json 0.3.32 → 0.3.34

package/lib/index.js

@@ -95,25 +95,35 @@ function apply(ctx, rawConfig) {
 	}
 	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-state-archive.json");
+			if (Array.isArray(rawArchive)) {
+				for (const entry of rawArchive) if (entry && typeof entry.id === "string") ids.add(entry.id);
+			}
+		} catch {}
+		archivedIdsCache = ids;
+		return ids;
+	}
+	function filterLegacy(legacy, current, archivedIds) {
+		const retired = {};
+		for (const [id, record] of Object.entries(legacy)) {
+			if (id in (current ?? {})) continue;
+			if (archivedIds.has(id)) continue;
+			retired[id] = record;
+		}
+		return retired;
+	}
 	async function retireLegacyOnce(legacy, current) {
 		if (legacyMigrated) return {};
 		try {
-			const archivedIds = /* @__PURE__ */ new Set();
-			try {
-				const rawArchive = await readJson("pending-state-archive.json");
-				if (Array.isArray(rawArchive)) {
-					for (const entry of rawArchive) if (entry && typeof entry.id === "string") archivedIds.add(entry.id);
-				}
-			} catch {}
-			const retired = {};
-			for (const [id, record] of Object.entries(legacy)) {
-				if (id in (current ?? {})) continue;
-				if (archivedIds.has(id)) continue;
-				retired[id] = record;
-			}
-			await jsonTransact(io, root, "pending-state.json", () => ({
+			const retired = filterLegacy(legacy, current, await readArchivedIds());
+			await jsonTransact(io, root, "pending-state.json", (fresh) => ({
 				...retired,
-				...current ?? {}
+				...fresh ?? {}
 			}));
 			await io().rename(pathOf("pending.json"), pathOf("pending.json.migrated"));
 			legacyMigrated = true;
@@ -130,6 +140,17 @@ function apply(ctx, rawConfig) {
 		};
 		return { ...current ?? {} };
 	}
+	/** V6-01 (0.3.34): single-sourced legacy merge for the four mutation paths —
+	* the SAME exclusion as the retirement read path, so a mutation that runs
+	* before any retirement cannot fixate a ghost pending twin in current
+	* (the archive id set is cached once; current-wins covers stale misses). */
+	async function mergedWithFilteredLegacy(legacy, current) {
+		if (legacy === null) return current;
+		return {
+			...filterLegacy(legacy, current, await readArchivedIds()),
+			...current
+		};
+	}
 	/** 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.
@@ -175,6 +196,13 @@ function apply(ctx, rawConfig) {
 					const parsed = JSON.parse(current);
 					if (Array.isArray(parsed)) archive = parsed;
 				} catch {}
+				const archiveKeys = /* @__PURE__ */ new Set();
+				archive = archive.filter((entry) => {
+					const key = pendingArchiveKey(entry);
+					if (archiveKeys.has(key)) return false;
+					archiveKeys.add(key);
+					return true;
+				});
 				const seen = new Set(archive.map(pendingArchiveKey));
 				const fresh = records.filter((record) => !seen.has(pendingArchiveKey(record)));
 				if (fresh.length === 0) return current;
@@ -237,8 +265,7 @@ function apply(ctx, rawConfig) {
 			await mutate(async () => {
 				await jsonTransact(io, root, "pending-state.json", async (current) => {
 					return {
-						...(legacyMigrated ? null : await readJson("pending.json")) ?? {},
-						...current ?? {},
+						...await mergedWithFilteredLegacy(legacyMigrated ? null : await readJson("pending.json"), current ?? {}),
 						[record.id]: record
 					};
 				});
@@ -248,10 +275,7 @@ function apply(ctx, rawConfig) {
 			return await mutate(async () => {
 				const slot = { claimed: null };
 				await jsonTransact(io, root, "pending-state.json", async (current) => {
-					const map = {
-						...(legacyMigrated ? null : await readJson("pending.json")) ?? {},
-						...current ?? {}
-					};
+					const map = { ...await mergedWithFilteredLegacy(legacyMigrated ? null : await readJson("pending.json"), current ?? {}) };
 					const record = map[id] ?? null;
 					if (record === null || !canClaimPending(record.status)) return map;
 					const now = Date.now();
@@ -270,10 +294,7 @@ function apply(ctx, rawConfig) {
 		async releasePendingClaim(id, claimId) {
 			await mutate(async () => {
 				await jsonTransact(io, root, "pending-state.json", async (current) => {
-					const map = {
-						...(legacyMigrated ? null : await readJson("pending.json")) ?? {},
-						...current ?? {}
-					};
+					const map = { ...await mergedWithFilteredLegacy(legacyMigrated ? null : await readJson("pending.json"), current ?? {}) };
 					const record = map[id];
 					if (!record || record.claimedBy !== claimId) return map;
 					record.status = releasedStatus(record.status);
@@ -291,10 +312,7 @@ function apply(ctx, rawConfig) {
 				};
 				let evicted = [];
 				await jsonTransact(io, root, "pending-state.json", async (current) => {
-					const map = {
-						...(legacyMigrated ? null : await readJson("pending.json")) ?? {},
-						...current ?? {}
-					};
+					const map = { ...await mergedWithFilteredLegacy(legacyMigrated ? null : await readJson("pending.json"), current ?? {}) };
 					const record = map[id] ?? null;
 					if (record === null || !canResolvePending(record.status)) {
 						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.32",
+  "version": "0.3.34",
   "publishConfig": {
     "access": "public"
   },
@@ -31,17 +31,17 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-core": "^0.3.32"
+    "@lmzhen/dsh-evolution-core": "^0.3.34"
   },
   "peerDependencies": {
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
     "@deepseek-ai/cordis": "^4.0.1",
-    "@lmzhen/dsh-evolution-io": "^0.3.32",
-    "@lmzhen/dsh-evolution-state-storage": "^0.3.32"
+    "@lmzhen/dsh-evolution-io": "^0.3.34",
+    "@lmzhen/dsh-evolution-state-storage": "^0.3.34"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-invariants": "^0.1.1-rc.2",
-    "@lmzhen/dsh-evolution-io": "^0.3.32",
-    "@lmzhen/dsh-evolution-state-storage": "^0.3.32"
+    "@lmzhen/dsh-evolution-io": "^0.3.34",
+    "@lmzhen/dsh-evolution-state-storage": "^0.3.34"
   }
 }