@lmzhen/dsh-evolution-state-json 0.3.28 → 0.3.29

package/lib/index.js

@@ -94,12 +94,41 @@ function apply(ctx, rawConfig) {
 		return parsed;
 	}
 	const mutate = makeSerialQueue();
+	let legacyMigrated = false;
+	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", () => ({
+				...retired,
+				...current ?? {}
+			}));
+			await io().rename(pathOf("pending.json"), pathOf("pending.json.migrated"));
+			legacyMigrated = true;
+			return retired;
+		} catch {
+			return legacy;
+		}
+	}
 	async function loadPendingMap() {
 		const [current, legacy] = await Promise.all([readJson("pending-state.json"), readJson("pending.json")]);
-		return {
-			...legacy ?? {},
+		if (legacy !== null) return {
+			...await retireLegacyOnce(legacy, current),
 			...current ?? {}
 		};
+		return { ...current ?? {} };
 	}
 	/** 0.3.22 (F-336): when the live pending map holds more than
 	* `PENDING_RESOLVED_CAP` resolved records, drop the oldest (by resolvedAt,
@@ -114,12 +143,15 @@ function apply(ctx, rawConfig) {
 			evicted: []
 		};
 		const overflow = resolved.length - PENDING_RESOLVED_CAP;
-		const oldest = resolved.sort((a, b) => {
-			return (a.resolvedAt ? Date.parse(a.resolvedAt) : Number.MAX_SAFE_INTEGER) - (b.resolvedAt ? Date.parse(b.resolvedAt) : Number.MAX_SAFE_INTEGER);
-		}).slice(0, overflow);
+		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 evictIds = new Set(oldest.map((record) => record.id));
 		const kept = {};
-		for (const [key, value] of Object.entries(map)) if (!evictIds.has(key)) kept[key] = value;
+		for (const [key, value] of Object.entries(map)) if (!evictIds.has(value.id)) kept[key] = value;
 		return {
 			map: kept,
 			evicted: oldest
@@ -148,8 +180,8 @@ function apply(ctx, rawConfig) {
 				if (fresh.length === 0) return current;
 				const next = [...archive, ...fresh];
 				if (next.length > ARCHIVE_RESOLVED_CAP) {
-					await io().writeText(pathOf("pending-state-archive.json.bak"), JSON.stringify(archive, null, 2)).catch(() => {});
-					return JSON.stringify(fresh, null, 2);
+					if (archive.length > 0) await io().writeText(pathOf("pending-state-archive.json.bak"), JSON.stringify(archive, null, 2)).catch(() => {});
+					return JSON.stringify(fresh.slice(-5e3), null, 2);
 				}
 				return JSON.stringify(next, null, 2);
 			});
@@ -205,7 +237,7 @@ function apply(ctx, rawConfig) {
 			await mutate(async () => {
 				await jsonTransact(io, root, "pending-state.json", async (current) => {
 					return {
-						...await readJson("pending.json") ?? {},
+						...(legacyMigrated ? null : await readJson("pending.json")) ?? {},
 						...current ?? {},
 						[record.id]: record
 					};
@@ -217,7 +249,7 @@ function apply(ctx, rawConfig) {
 				const slot = { claimed: null };
 				await jsonTransact(io, root, "pending-state.json", async (current) => {
 					const map = {
-						...await readJson("pending.json") ?? {},
+						...(legacyMigrated ? null : await readJson("pending.json")) ?? {},
 						...current ?? {}
 					};
 					const record = map[id] ?? null;
@@ -239,7 +271,7 @@ function apply(ctx, rawConfig) {
 			await mutate(async () => {
 				await jsonTransact(io, root, "pending-state.json", async (current) => {
 					const map = {
-						...await readJson("pending.json") ?? {},
+						...(legacyMigrated ? null : await readJson("pending.json")) ?? {},
 						...current ?? {}
 					};
 					const record = map[id];
@@ -260,7 +292,7 @@ function apply(ctx, rawConfig) {
 				let evicted = [];
 				await jsonTransact(io, root, "pending-state.json", async (current) => {
 					const map = {
-						...await readJson("pending.json") ?? {},
+						...(legacyMigrated ? null : await readJson("pending.json")) ?? {},
 						...current ?? {}
 					};
 					const record = map[id] ?? null;

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