@lmzhen/dsh-evolution-core 0.3.45 → 0.3.46

package/README.md

@@ -22,15 +22,24 @@ Independent of request-prefix construction. This package does not alter the asse
 
 Skill-library mutations are read-modify-write on one file, so `SkillLibrary`
 serializes them in-process with a `makeSerialQueue` chain: `update`, `patch`,
-`restructure` and `writeSupportFile` run their whole read→validate→write under
-one serial task, so two concurrent mutators on one skill never interleave in
-this process. Single-file writes (`update`, `patch`, `writeSupportFile`)
+`restructure`, `writeSupportFile` and — since 0.3.46 — `consolidate`'s target
+read→merge→commit run their whole read→validate→write under one serial task,
+so two concurrent mutators on one skill never interleave in this process.
+Single-file writes (`update`, `patch`, `writeSupportFile`)
 additionally run the read and the write inside `transactIo` when a caller
 injects a `transact` into the constructor — that is the cross-process lock, so
 two processes sharing `DSH_HOME` cannot interleave their RMW on one file.
 `create` writes a new file and `archive`/`consolidate` already own a two-phase
 commit, so they deliberately stay outside the serial chain.
 
+**0.3.46 residual (documented, per G2.5 precedent):** the low-frequency
+single-file entry points `create`, `archive`, `removeSupportFile` and
+`setPinned` still perform an unlocked read→write (their per-file read is not
+inside the serial/transact task). The race needs a same-process concurrent
+mutator on the SAME skill file, which the serialized entry points above make
+unlikely; the exposure is acknowledged and not locked (收益不抵锁面扩大 —
+adding locks to four low-frequency entry points is not worth the surface).
+
 When the backend provides `transact` (nodeEvolutionIo and the io adapter do),
 the constructor binds it BY DEFAULT since 0.3.27 — the single-file entry points
 (`update`, `patch`, `writeSupportFile`, and each per-file piece of

package/lib/index.js

@@ -63,7 +63,7 @@ function evolutionIoAdapter(provider) {
 * sole gate for the self-pid recycle branch. Exported (read-only in practice)
 * so `io.spec.ts` can drive the self-heal path deterministically.
 */
-const pendingSelfCleanup = /* @__PURE__ */ new Set();
+const pendingSelfCleanup = /* @__PURE__ */ new Map();
 /**
 * Retry a rename that a peer is temporarily holding on Windows (EPERM/EBUSY):
 * a short 50ms backoff, at most 3 retries (~150ms budget), matching the
@@ -170,12 +170,11 @@ function nodeEvolutionIo() {
 					const holder = Number(holderContent.split(":")[0] ?? "");
 					const holderAlive = Number.isInteger(holder) && holder > 0 && isAlive(holder);
 					if (holder === process.pid && pendingSelfCleanup.has(lock)) {
-						if (await readFile(lock, "utf8").catch(() => "") === holderContent) {
-							try {
-								await rm(lock, { force: true });
-							} catch {}
+						const token = pendingSelfCleanup.get(lock);
+						if (await readFile(lock, "utf8").catch(() => "") === token) try {
+							await rm(lock, { force: true });
 							pendingSelfCleanup.delete(lock);
-						}
+						} catch {}
 						continue;
 					}
 					const staleDead = Number.isInteger(holder) && holder > 0 && Date.now() - st.mtimeMs > 1e3 && !holderAlive;
@@ -208,8 +207,9 @@ function nodeEvolutionIo() {
 			try {
 				return await task();
 			} finally {
-				if (await readFile(lock, "utf8").catch(() => null) === myClaim) await rm(lock, { force: true }).catch(() => {
-					pendingSelfCleanup.add(lock);
+				if (await readFile(lock, "utf8").catch(() => null) === myClaim) await rm(lock, { force: true }).catch(async () => {
+					const body = await readFile(lock, "utf8").catch(() => "");
+					pendingSelfCleanup.set(lock, body);
 				});
 			}
 		}
@@ -4148,94 +4148,65 @@ var SkillLibrary = class {
 			message: `Invalid skill name "${name}". Use lowercase letters, digits, and hyphens.`
 		};
 		const targetDir = this.dirOf(targetName);
-		const targetMd = await this.io.readText(join(targetDir, "SKILL.md"));
-		if (!targetMd) return {
-			ok: false,
-			message: `Skill "${targetName}" not found.`
-		};
 		const targetProtection = await this.writeProtection(targetName, origin);
 		if (targetProtection) return {
 			ok: false,
 			message: `Skill "${targetName}" is protected (${targetProtection}).`
 		};
-		const writes = [];
-		if (mode === "append") {
-			const parts = [];
-			for (const source of normalizedSources) {
-				const protection = await this.deleteProtection(source);
-				if (protection) return {
-					ok: false,
-					message: `Skill "${source}" is protected (${protection}).`
-				};
-				const sourceMd = await this.io.readText(join(this.dirOf(source), "SKILL.md"));
-				if (!sourceMd) return {
-					ok: false,
-					message: `Skill "${source}" not found.`
-				};
-				const parsed = parseFrontmatter(sourceMd);
-				if (!parsed) return {
-					ok: false,
-					message: `Skill "${source}" has no valid frontmatter; refusing to merge.`
-				};
-				if (await this.countSupportDirs(source) > 0) return {
-					ok: false,
-					message: `Consolidation rejected: source "${source}" carries support files — use mode:'reference' or archive the whole package instead.`
-				};
-				const refs = supportRefs(parsed.body);
-				if (refs.length > 0) return {
-					ok: false,
-					message: `Consolidation rejected: source "${source}" body references support files (${refs.join(", ")}) that would be left behind — use mode:'reference' or archive the whole package instead.`
-				};
-				parts.push(`\n<!-- consolidated from ${source} at ${(/* @__PURE__ */ new Date()).toISOString()} -->\n${parsed.body.trim()}`);
-			}
-			const merged = targetMd.trimEnd() + parts.join("\n") + "\n";
-			const validation = validateFrontmatter(merged, targetName, this.limits);
-			if (validation) return {
+		const referenceWrites = [];
+		const parts = [];
+		if (mode === "append") for (const source of normalizedSources) {
+			const protection = await this.deleteProtection(source);
+			if (protection) return {
 				ok: false,
-				message: `Consolidation rejected: ${validation}`
+				message: `Skill "${source}" is protected (${protection}).`
 			};
-			writes.push({
-				target: join(targetDir, "SKILL.md"),
-				content: merged
-			});
-		} else {
-			for (const source of normalizedSources) {
-				const protection = await this.deleteProtection(source);
-				if (protection) return {
-					ok: false,
-					message: `Skill "${source}" is protected (${protection}).`
-				};
-				const sourceMd = await this.io.readText(join(this.dirOf(source), "SKILL.md"));
-				if (!sourceMd) return {
-					ok: false,
-					message: `Skill "${source}" not found.`
-				};
-				const parsed = parseFrontmatter(sourceMd);
-				if (!parsed) return {
-					ok: false,
-					message: `Skill "${source}" has no valid frontmatter; refusing to demote.`
-				};
-				const refs = supportRefs(parsed.body);
-				if (refs.length > 0) return {
-					ok: false,
-					message: `Consolidation rejected: source "${source}" body references support files (${refs.join(", ")}) that would be left behind — archive the whole package instead.`
-				};
-				const target = join(targetDir, "references", `${source}.md`);
-				writes.push({
-					target,
-					content: `<!-- demoted from ${source} at ${(/* @__PURE__ */ new Date()).toISOString()} -->\n${parsed.body.trim()}\n`
-				});
-			}
-			const pointerLines = normalizedSources.map((source) => `\n${POINTER_LINE_PREFIX}${source}.md`).join("");
-			const extended = targetMd.trimEnd() + pointerLines + "\n";
-			const validation = validateFrontmatter(extended, targetName, this.limits);
-			if (validation) return {
+			const sourceMd = await this.io.readText(join(this.dirOf(source), "SKILL.md"));
+			if (!sourceMd) return {
 				ok: false,
-				message: `Consolidation rejected: ${validation}`
+				message: `Skill "${source}" not found.`
 			};
-			writes.push({
-				target: join(targetDir, "SKILL.md"),
-				content: extended
+			const parsed = parseFrontmatter(sourceMd);
+			if (!parsed) return {
+				ok: false,
+				message: `Skill "${source}" has no valid frontmatter; refusing to merge.`
+			};
+			if (await this.countSupportDirs(source) > 0) return {
+				ok: false,
+				message: `Consolidation rejected: source "${source}" carries support files — use mode:'reference' or archive the whole package instead.`
+			};
+			const refs = supportRefs(parsed.body);
+			if (refs.length > 0) return {
+				ok: false,
+				message: `Consolidation rejected: source "${source}" body references support files (${refs.join(", ")}) that would be left behind — use mode:'reference' or archive the whole package instead.`
+			};
+			parts.push(`\n<!-- consolidated from ${source} at ${(/* @__PURE__ */ new Date()).toISOString()} -->\n${parsed.body.trim()}`);
+		}
+		else for (const source of normalizedSources) {
+			const protection = await this.deleteProtection(source);
+			if (protection) return {
+				ok: false,
+				message: `Skill "${source}" is protected (${protection}).`
+			};
+			const sourceMd = await this.io.readText(join(this.dirOf(source), "SKILL.md"));
+			if (!sourceMd) return {
+				ok: false,
+				message: `Skill "${source}" not found.`
+			};
+			const parsed = parseFrontmatter(sourceMd);
+			if (!parsed) return {
+				ok: false,
+				message: `Skill "${source}" has no valid frontmatter; refusing to demote.`
+			};
+			const refs = supportRefs(parsed.body);
+			if (refs.length > 0) return {
+				ok: false,
+				message: `Consolidation rejected: source "${source}" body references support files (${refs.join(", ")}) that would be left behind — archive the whole package instead.`
+			};
+			const target = join(targetDir, "references", `${source}.md`);
+			referenceWrites.push({
+				target,
+				content: `<!-- demoted from ${source} at ${(/* @__PURE__ */ new Date()).toISOString()} -->\n${parsed.body.trim()}\n`
 			});
 		}
 		const archived = [];
@@ -4245,16 +4216,53 @@ var SkillLibrary = class {
 				if (!result.ok) throw new Error(result.message);
 				archived.push(source);
 			}
-			const result = await this.applyTreeChange({
-				name: targetName,
-				origin,
-				protection: "write",
-				writes,
-				auditAction: "consolidate",
-				auditSummary: `consolidated ${normalizedSources.join(", ")} (${mode}) into ${targetName}`,
-				eventAction: "consolidate"
+			const result = await this.serial(async () => {
+				const freshTargetMd = await this.io.readText(join(targetDir, "SKILL.md"));
+				if (!freshTargetMd) return {
+					ok: false,
+					message: `Skill "${targetName}" not found.`
+				};
+				const writes = [...referenceWrites];
+				if (mode === "append") {
+					const merged = freshTargetMd.trimEnd() + parts.join("\n") + "\n";
+					const validation = validateFrontmatter(merged, targetName, this.limits);
+					if (validation) return {
+						ok: false,
+						message: `Consolidation rejected: ${validation}`
+					};
+					writes.push({
+						target: join(targetDir, "SKILL.md"),
+						content: merged
+					});
+				} else {
+					const pointerLines = normalizedSources.map((source) => `\n${POINTER_LINE_PREFIX}${source}.md`).join("");
+					const extended = freshTargetMd.trimEnd() + pointerLines + "\n";
+					const validation = validateFrontmatter(extended, targetName, this.limits);
+					if (validation) return {
+						ok: false,
+						message: `Consolidation rejected: ${validation}`
+					};
+					writes.push({
+						target: join(targetDir, "SKILL.md"),
+						content: extended
+					});
+				}
+				return await this.applyTreeChange({
+					name: targetName,
+					origin,
+					protection: "write",
+					writes,
+					auditAction: "consolidate",
+					auditSummary: `consolidated ${normalizedSources.join(", ")} (${mode}) into ${targetName}`,
+					eventAction: "consolidate"
+				});
 			});
 			if (!result.ok) throw new Error(result.message);
+			return {
+				ok: true,
+				message: `Consolidated ${normalizedSources.join(", ")} into "${targetName}".`,
+				path: targetDir
+			};
 		} catch (error) {
 			const reason = error instanceof Error ? error.message : String(error);
 			const failedRestores = [];
@@ -4272,11 +4280,6 @@ var SkillLibrary = class {
 				message: `Consolidation failed and was rolled back: ${reason}`
 			};
 		}
-		return {
-			ok: true,
-			message: `Consolidated ${normalizedSources.join(", ")} into "${targetName}".`,
-			path: targetDir
-		};
 	}
 	/**
 	* Content-distribution repair (008 batch B, 009-R kernel): move body

package/lib/types/io.d.ts

@@ -64,7 +64,7 @@ export declare function evolutionIoAdapter(provider: () => EvolutionIoLike): Evo
  * sole gate for the self-pid recycle branch. Exported (read-only in practice)
  * so `io.spec.ts` can drive the self-heal path deterministically.
  */
-export declare const pendingSelfCleanup: Set<string>;
+export declare const pendingSelfCleanup: Map<string, string>;
 /**
  * Retry a rename that a peer is temporarily holding on Windows (EPERM/EBUSY):
  * a short 50ms backoff, at most 3 retries (~150ms budget), matching the

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.3.45",
+  "version": "0.3.46",
   "publishConfig": {
     "access": "public"
   },