@lmzhen/dsh-evolution-core 0.1.0-rc.64 → 0.1.0-rc.66

package/lib/index.js

@@ -52,12 +52,22 @@ function nodeEvolutionIo() {
 		const code = error?.code;
 		return code === "ENOENT" || code === "ENOTDIR";
 	};
+	/** True when the pid is alive (EPERM = alive but unowned; ESRCH = gone). */
+	const isAlive = (pid) => {
+		try {
+			process.kill(pid, 0);
+			return true;
+		} catch (error) {
+			return error?.code === "EPERM";
+		}
+	};
 	/**
 	* Cross-process write lock (claw `withFileLock` parity): an O_EXCL lock file
-	* guards the atomic write; a >5s-old lock is treated as stale and taken
-	* over. After the retry budget the write proceeds unlocked — the lock is a
-	* best-effort accommodation for multi-process deployments, never a read of
-	* availability.
+	* guards the atomic write. A >5s-old lock is taken over ONLY after probing
+	* the holder pid it carries (rc.66): a LIVE holder is never stolen, so a
+	* slow writer no longer loses its lock to a peer at the 5s mark (the
+	* takeover is the only best-effort surface; the retry budget fails loud —
+	* rc.65 — instead of ever proceeding unlocked).
 	*/
 	const withWriteLock = async (path, task) => {
 		const lock = `${path}.lock`;
@@ -73,17 +83,20 @@ function nodeEvolutionIo() {
 			try {
 				const st = await stat(lock);
 				if (Date.now() - st.mtimeMs > 5e3) {
-					try {
-						await rm(lock, { force: true });
-					} catch {}
-					continue;
+					const holder = Number(await readFile(lock, "utf8").catch(() => ""));
+					if (!(Number.isInteger(holder) && holder > 0 && isAlive(holder))) {
+						try {
+							await rm(lock, { force: true });
+						} catch {}
+						continue;
+					}
 				}
 			} catch {
 				continue;
 			}
 			await new Promise((resolve) => setTimeout(resolve, 50));
 		}
-		return await task();
+		throw new Error(`could not acquire write lock for ${path} after 10 attempts`);
 	};
 	return {
 		async readText(path) {
@@ -257,6 +270,11 @@ async function loadUsage(root, io = nodeEvolutionIo()) {
 */
 async function mutateUsage(root, io, task) {
 	await transactIo(io, usageFile(root), async (current) => {
+		if (current !== null) try {
+			JSON.parse(current);
+		} catch {
+			return current;
+		}
 		const map = parseUsage(current);
 		await task(map);
 		return JSON.stringify(Object.fromEntries(map.entries()), null, 2);
@@ -338,6 +356,11 @@ async function saveSuppressedNames(root, names, io = nodeEvolutionIo()) {
 */
 async function updateSuppressedNames(root, io, task) {
 	await transactIo(io, suppressedFile(root), async (current) => {
+		if (current !== null) try {
+			JSON.parse(current);
+		} catch {
+			return current;
+		}
 		const names = parseSuppressed(current);
 		await task(names);
 		return JSON.stringify({
@@ -1703,7 +1726,12 @@ async function loadMutations(root, io = nodeEvolutionIo()) {
 }
 /** Append one record, trim to `cap`, and write atomically (versioned shape). */
 async function recordMutation(root, io, record, cap = 500) {
-	await transactIo(io, mutationsFile(root), (current) => {
+	await transactIo(io, mutationsFile(root), async (current) => {
+		if (current !== null) try {
+			JSON.parse(current);
+		} catch {
+			return current;
+		}
 		const existing = parseMutationRecords(current);
 		existing.push(record);
 		const trimmed = existing.length > cap ? existing.slice(existing.length - cap) : existing;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-core",
   "description": "Shared stores, prompts, signals and lifecycle logic for the dsh-evolution plugin family (community build)",
-  "version": "0.1.0-rc.64",
+  "version": "0.1.0-rc.66",
   "publishConfig": {
     "access": "public"
   },