@lmzhen/dsh-evolution-core 0.3.66 → 0.3.67

package/lib/index.js

@@ -796,6 +796,14 @@ function parseSuppressed(raw) {
 	}
 }
 async function saveSuppressedNames(root, names, io = nodeEvolutionIo()) {
+	const current = await io.readText(suppressedFile(root)).catch(() => null);
+	if (current !== null) try {
+		const parsed = JSON.parse(current);
+		if (parsed !== null && typeof parsed.version === "number" && parsed.version > 1) {
+			console.warn(`suppression sidecar ${suppressedFile(root)} declares version ${String(parsed.version)} (newer than 1); not overwritten`);
+			return;
+		}
+	} catch {}
 	await io.writeText(suppressedFile(root), JSON.stringify({
 		version: 1,
 		names: [...names].sort()
@@ -809,10 +817,17 @@ 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;
+		if (current !== null) {
+			let parsed = null;
+			try {
+				parsed = JSON.parse(current);
+			} catch {
+				return current;
+			}
+			if (parsed !== null && typeof parsed.version === "number" && parsed.version > 1) {
+				console.warn(`suppression sidecar ${suppressedFile(root)} declares version ${String(parsed.version)} (newer than 1); not overwritten`);
+				return current;
+			}
 		}
 		const names = parseSuppressed(current);
 		await task(names);
@@ -5211,10 +5226,12 @@ var SkillLibrary = class {
 				};
 				const writes = [];
 				for (const reference of referenceWrites) {
-					const base = (await this.io.readText(reference.target).catch(() => null))?.trimEnd() ?? "";
+					const previous = await this.io.readText(reference.target).catch(() => null);
+					const base = previous?.trimEnd() ?? "";
 					writes.push({
 						target: reference.target,
-						content: base === "" ? reference.content : `${base}\n\n${reference.content}`
+						content: base === "" ? reference.content : `${base}\n\n${reference.content}`,
+						expected: previous
 					});
 				}
 				if (mode === "append") {
@@ -5226,7 +5243,8 @@ var SkillLibrary = class {
 					};
 					writes.push({
 						target: join(targetDir, "SKILL.md"),
-						content: merged
+						content: merged,
+						expected: freshTargetMd
 					});
 				} else {
 					const pointerLines = normalizedSources.map((source) => `\n${POINTER_LINE_PREFIX}${source}.md`).join("");
@@ -5238,7 +5256,8 @@ var SkillLibrary = class {
 					};
 					writes.push({
 						target: join(targetDir, "SKILL.md"),
-						content: extended
+						content: extended,
+						expected: freshTargetMd
 					});
 				}
 				return await this.applyTreeChange({
@@ -5306,6 +5325,11 @@ var SkillLibrary = class {
 			message: `Restructure exceeds 5 moves.`
 		};
 		for (const move of moves) {
+			const raw = move;
+			if (raw === null || typeof raw !== "object") return {
+				ok: false,
+				message: "Every restructure move must be an object with a heading."
+			};
 			if (typeof move.heading !== "string" || !move.heading.trim()) return {
 				ok: false,
 				message: "Every restructure move needs a non-empty heading."
@@ -5359,15 +5383,18 @@ var SkillLibrary = class {
 		const writes = [];
 		for (const entry of byRel.values()) {
 			const target = join(dir, ...entry.rel.split("/"));
-			const base = (await this.io.readText(target).catch(() => null))?.trimEnd() ?? "";
+			const previous = await this.io.readText(target).catch(() => null);
+			const base = previous?.trimEnd() ?? "";
 			writes.push({
 				target,
-				content: base === "" ? entry.texts.join("\n\n") : `${base}\n\n${entry.texts.join("\n\n")}`
+				content: base === "" ? entry.texts.join("\n\n") : `${base}\n\n${entry.texts.join("\n\n")}`,
+				expected: previous
 			});
 		}
 		writes.push({
 			target: join(dir, "SKILL.md"),
-			content: finalMd
+			content: finalMd,
+			expected: md
 		});
 		const result = await this.applyTreeChange({
 			name,
@@ -5433,7 +5460,8 @@ var SkillLibrary = class {
 			landing.push({
 				target: write.target,
 				content: write.content,
-				previous
+				previous,
+				expected: write.expected
 			});
 		}
 		const written = [];
@@ -5442,9 +5470,10 @@ var SkillLibrary = class {
 			for (const entry of landing) {
 				try {
 					if (this.transact) {
+						const baseline = entry.expected === void 0 ? entry.previous : entry.expected;
 						const drift = { seen: false };
 						await this.transact(this.io, entry.target, (current) => {
-							if (current !== entry.previous) {
+							if (current !== baseline) {
 								drift.seen = true;
 								return current;
 							}
@@ -5707,7 +5736,13 @@ var SkillLibrary = class {
 		while (await this.io.exists(dest)) dest = join(backupRoot, `skills-${stamp}-${Math.random().toString(36).slice(2, 8)}`);
 		try {
 			const names = await listNames(this.root, this.io);
-			const copyFailure = (await Promise.allSettled(names.map(async (name) => {
+			const skipped = [];
+			const copyable = [];
+			for (const name of names) if (await this.hasWriteLock(this.dirOf(name))) {
+				console.warn(`skill-store: snapshot skipped "${name}" — a byte-writer holds its write lock; the skill is recorded as skipped in the manifest`);
+				skipped.push(name);
+			} else copyable.push(name);
+			const copyFailure = (await Promise.allSettled(copyable.map(async (name) => {
 				await this.io.copy(this.dirOf(name), join(dest, name));
 			}))).find((result) => result.status === "rejected");
 			if (copyFailure) throw copyFailure.reason;
@@ -5732,7 +5767,8 @@ var SkillLibrary = class {
 			await this.io.writeText(join(dest, "manifest.json"), JSON.stringify({
 				reason,
 				createdAt: (/* @__PURE__ */ new Date()).toISOString(),
-				skills: names,
+				skills: copyable,
+				skipped,
 				sidecars,
 				hasArchive,
 				extras: extraNames
@@ -5745,6 +5781,24 @@ var SkillLibrary = class {
 		return dest;
 	}
 	/** Read and normalize a snapshot manifest; null when the file is missing or unparsable. */
+	/**
+	* V26-03 (v25/v26): sanitize the manifest's `skipped` list before it can
+	* reach a user-visible restore message. Entries must pass the same name
+	* gate as snapshot entries (a corrupted or hand-edited manifest cannot
+	* inject arbitrary text into the result), bounded to 50 entries of at most
+	* 64 chars each (the name-rule maximum — real skill names always fit).
+	*/
+	sanitizeSkippedNames(raw) {
+		if (!Array.isArray(raw)) return [];
+		const out = [];
+		for (const entry of raw) {
+			if (typeof entry !== "string") continue;
+			if (!this.safeSnapshotEntryName(entry)) continue;
+			out.push(entry.length > 64 ? entry.slice(0, 64) : entry);
+			if (out.length >= 50) break;
+		}
+		return out;
+	}
 	async readSnapshotManifest(path) {
 		const raw = await this.io.readText(join(path, "manifest.json"));
 		if (raw === null) return null;
@@ -5755,6 +5809,7 @@ var SkillLibrary = class {
 				reason: typeof manifest.reason === "string" ? manifest.reason : "",
 				createdAt: typeof manifest.createdAt === "string" ? manifest.createdAt : "",
 				skills: manifest.skills,
+				skipped: this.sanitizeSkippedNames(manifest.skipped),
 				sidecars: Array.isArray(manifest.sidecars) ? manifest.sidecars : [],
 				...typeof manifest.hasArchive === "boolean" ? { hasArchive: manifest.hasArchive } : {},
 				extras: Array.isArray(manifest.extras) ? manifest.extras : []
@@ -5831,8 +5886,9 @@ var SkillLibrary = class {
 			message: "No skill snapshot available."
 		};
 		const preRollbackPath = await this.snapshotAll("pre-rollback", extras);
+		let skipped = [];
 		try {
-			await this.restoreSnapshotIntoRoot(latest.path);
+			skipped = await this.restoreSnapshotIntoRoot(latest.path);
 		} catch (error) {
 			const reason = error instanceof Error ? error.message : String(error);
 			try {
@@ -5853,9 +5909,10 @@ var SkillLibrary = class {
 			action: "restore",
 			name: "snapshot"
 		});
+		const skippedNote = skipped.length === 0 ? "" : ` NOTE: ${skipped.length} skill(s) were skipped when this snapshot was taken (a live writer held their lock) and are NOT restored: ${skipped.join(", ")} — recover them from .backups if a copy exists.`;
 		return {
 			ok: true,
-			message: `Restored skill tree from ${latest.path}`,
+			message: `Restored skill tree from ${latest.path}.${skippedNote}`,
 			path: latest.path,
 			...snapshotExtras.length === 0 ? {} : { extras: snapshotExtras }
 		};
@@ -5920,6 +5977,7 @@ var SkillLibrary = class {
 			if (entry.startsWith(".")) continue;
 			await this.deleteStrandedLocks(join(this.root, entry));
 		}
+		return manifest.skipped;
 	}
 };
 //#endregion

package/lib/types/events.d.ts

@@ -21,6 +21,15 @@ export interface EvolutionReviewScheduledEvent {
     toolCalls: number;
     userChars: number;
     assistantChars: number;
+    /** V24-15 (v24): which delivery channel actually sent the review. The
+     * emission point was previously covered on only two of the four delivery
+     * paths (subagent success + completion inject), so a consumer on the
+     * default inject-mode deployment would have silently missed every cadence
+     * review. Every delivery path now emits with its channel:
+     * `'subagent'` (spawned review run), `'inject'` (prompt injected into the
+     * parent — direct, fallback, or deferred-drain), `'completion'`
+     * (completion-trigger prompt, direct or deferred-drain). */
+    channel?: 'subagent' | 'inject' | 'completion' | undefined;
 }
 export interface EvolutionPlanAppliedEvent {
     /** Owning session (payload v2): process events carry no session envelope. */

package/lib/types/skill-store.d.ts

@@ -77,6 +77,13 @@ export interface SnapshotManifest {
     createdAt: string;
     /** Active skill names at snapshot time. */
     skills: string[];
+    /** V25-05 (v25): skills that were SKIPPED by the write-lock probe at
+     * snapshot time (a live byte-writer held them) — they are NOT in the
+     * snapshot directory and are NOT restored by a whole-tree restore, which
+     * clears the live tree and copies back only `skills`. Consumers must
+     * surface this list; restore reports it in its result message. Absent
+     * (empty) on pre-0.3.67 manifests. */
+    skipped: string[];
     /** Co-copied sidecar file names (usage/suppression). */
     sidecars: string[];
     /** Whether `.archive/` was co-copied; absent on legacy manifests (do not touch archive on restore). */
@@ -493,6 +500,14 @@ export declare class SkillLibrary {
      */
     snapshotAll(reason?: string, extras?: SnapshotExtra[]): Promise<string>;
     /** Read and normalize a snapshot manifest; null when the file is missing or unparsable. */
+    /**
+     * V26-03 (v25/v26): sanitize the manifest's `skipped` list before it can
+     * reach a user-visible restore message. Entries must pass the same name
+     * gate as snapshot entries (a corrupted or hand-edited manifest cannot
+     * inject arbitrary text into the result), bounded to 50 entries of at most
+     * 64 chars each (the name-rule maximum — real skill names always fit).
+     */
+    private sanitizeSkippedNames;
     readSnapshotManifest(path: string): Promise<SnapshotManifest | null>;
     /** Keep only the newest N snapshots (Hermes keep=5 parity); older ones are removed outright. */
     private retainSnapshots;

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