@lmzhen/dsh-evolution-review 0.3.68 → 0.3.69

package/lib/index.js

@@ -1,7 +1,7 @@
 import { createHash, randomUUID } from "node:crypto";
 import z from "@deepseek-ai/schemastery";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
-import { COMPLETION_SKILL_REVIEW_PROMPT, DEFAULT_MAX_OPS_PER_PLAN, DEFAULT_MEMORY_CHAR_LIMIT, DEFAULT_MEMORY_REVIEW_MODEL, DEFAULT_REVIEW_CONTEXT_MESSAGES, DEFAULT_REVIEW_MEMORY_INTERVAL, DEFAULT_REVIEW_MESSAGE_CHARS, DEFAULT_REVIEW_SKILL_INTERVAL, DEFAULT_REVIEW_TIMEOUT_MS, DEFAULT_SKILL_CONTENT_CHARS, DEFAULT_SKILL_REVIEW_COMPLETION_MIN_TOOL_CALLS, DEFAULT_SKILL_REVIEW_MODEL, DEFAULT_SKILL_REVIEW_TRIGGER, DEFAULT_SUBSTANTIVE_MIN_AGENT_CHARS, DEFAULT_SUBSTANTIVE_MIN_TOOL_CALLS, DEFAULT_SUBSTANTIVE_MIN_USER_CHARS, DEFAULT_USER_CHAR_LIMIT, MAX_TIMER_DELAY_MS, PROMPT_BUNDLE, SkillLibrary, advanceReview, assertSkillsRootAliasRetired, clampedNumber, contentHash, evolutionIoAdapter, foldTurn, redactSecrets, resolveOrigins, resolveRootConfig, resolveSkillsRoot, reviewPrompt, verifyPromptBundle } from "@lmzhen/dsh-evolution-core";
+import { COMPLETION_SKILL_REVIEW_PROMPT, DEFAULT_MAX_OPS_PER_PLAN, DEFAULT_MEMORY_CHAR_LIMIT, DEFAULT_MEMORY_REVIEW_MODEL, DEFAULT_REVIEW_CONTEXT_MESSAGES, DEFAULT_REVIEW_MEMORY_INTERVAL, DEFAULT_REVIEW_MESSAGE_CHARS, DEFAULT_REVIEW_SKILL_INTERVAL, DEFAULT_REVIEW_TIMEOUT_MS, DEFAULT_SKILL_CONTENT_CHARS, DEFAULT_SKILL_LIMITS, DEFAULT_SKILL_REVIEW_COMPLETION_MIN_TOOL_CALLS, DEFAULT_SKILL_REVIEW_MODEL, DEFAULT_SKILL_REVIEW_TRIGGER, DEFAULT_SUBSTANTIVE_MIN_AGENT_CHARS, DEFAULT_SUBSTANTIVE_MIN_TOOL_CALLS, DEFAULT_SUBSTANTIVE_MIN_USER_CHARS, DEFAULT_USER_CHAR_LIMIT, MAX_TIMER_DELAY_MS, PROMPT_BUNDLE, SkillLibrary, advanceReview, assertSkillsRootAliasRetired, clampedNumber, contentHash, evolutionIoAdapter, foldTurn, redactSecrets, resolveOrigins, resolveRootConfig, resolveSkillsRoot, reviewPrompt, verifyPromptBundle } from "@lmzhen/dsh-evolution-core";
 import { validateEvolutionPlan } from "@lmzhen/dsh-evolution-plan-validator";
 //#region lib/types/index.js
 /**
@@ -71,6 +71,12 @@ function clampReviewConfig(rawConfig, ctx) {
 	if (clamped.length > 0) ctx.logger.warn(`dsh-evolution-review: ${clamped.join(", ")} provided an invalid value; falling back to the default`);
 	return config;
 }
+/** v30 REV-04/REV-02: read the policy snapshot off the (optional) policy
+* service through an `unknown` boundary — the Context augmentation types the
+* getter non-optionally, but at runtime the row can be absent. */
+function policySnapshotOf(source) {
+	return source?.get?.();
+}
 function apply(ctx, rawConfig = {}) {
 	if (!verifyPromptBundle(PROMPT_BUNDLE)) throw new Error("dsh-evolution prompt bundle integrity check failed; refusing to schedule review work");
 	const config = clampReviewConfig(rawConfig, ctx);
@@ -325,6 +331,26 @@ function apply(ctx, rawConfig = {}) {
 	ctx.effect(() => () => {
 		deferredFallbackReviews.length = 0;
 	}, "dsh-evolution-review.deferred-drain");
+	/** v32 REV-06(b): content hash of every tree skill at REVIEW SCHEDULE time.
+	* The subagent's read-time hash is not plumbed through the plan, so this
+	* pre-run snapshot is what the execute-time staleness check can honestly
+	* compare against: a skill whose hash changed while the review ran was
+	* touched concurrently, and the plan (authored against the old state) is
+	* refused as stale. */
+	async function treeSkillHashes() {
+		const hashes = /* @__PURE__ */ new Map();
+		const io = ctx.get("evolutionIo");
+		if (!io) return hashes;
+		const library = new SkillLibrary(resolveSkillsRoot({ root: rootConfig.root }), evolutionIoAdapter(() => io.provider()));
+		for (const summary of await library.list().catch((error) => {
+			ctx.logger.warn(`dsh-evolution-review: skill tree scan failed (${error instanceof Error ? error.message : String(error)}) — pre-run staleness hashes are unavailable; full-content updates will not be drift-checked this review`);
+			return [];
+		})) {
+			const text = await library.read(summary.name).catch(() => null);
+			if (text !== null) hashes.set(summary.name, contentHash(text));
+		}
+		return hashes;
+	}
 	async function trySubagentReview(session, agent, kind, signal) {
 		if ((policy()?.reviewMode ?? config.reviewMode) === "inject") return false;
 		const subagents = ctx.get("subagents");
@@ -352,6 +378,7 @@ function apply(ctx, rawConfig = {}) {
 			const reviewText = redactSecrets(buildReviewRequest(session, kind, signal, config.reviewContextMessages, config.reviewMessageChars));
 			const agentOptions = { model };
 			if (config.reviewProvider) agentOptions.provider = config.reviewProvider;
+			const preRunHashes = await treeSkillHashes();
 			const run = await subagents.start("spawn", {
 				label: "dsh-evolution-review",
 				prompt: [{
@@ -413,7 +440,7 @@ function apply(ctx, rawConfig = {}) {
 				const landed = [];
 				let executed;
 				try {
-					executed = await withTimeout(executePlan(validation.accepted, session, (action) => landed.push(action)), config.reviewTimeoutMs, "review plan execution");
+					executed = await withTimeout(executePlan(validation.accepted, session, (action) => landed.push(action), preRunHashes), config.reviewTimeoutMs, "review plan execution");
 				} catch (error) {
 					emitApplied({
 						actions: landed,
@@ -424,7 +451,8 @@ function apply(ctx, rawConfig = {}) {
 				const actions = executed.actions;
 				if (actions.length > 0) {
 					const applied = actions.join(" · ");
-					const note = executed.ok ? "" : "\n部分操作失败。以下操作已应用，请勿重复执行。";
+					const failedNote = executed.failedOps.length > 0 ? ` 失败 ${executed.failedOps.length} 个：${executed.failedOps.join("；")}。` : "";
+					const note = executed.ok ? "" : `\n部分操作失败。${failedNote}以上操作已应用，请勿重复执行。`;
 					try {
 						deliverMessage(agent, `💾 Self-improvement review: ${applied}${note}`, "self-improvement review");
 					} catch (injectError) {
@@ -486,7 +514,7 @@ function apply(ctx, rawConfig = {}) {
 			}
 		}
 	}
-	async function executePlan(plan, session, onLanded) {
+	async function executePlan(plan, session, onLanded, preRunHashes) {
 		const sessionId = session?.id;
 		const memory = ctx.get("memory");
 		const approval = ctx.get("evolutionApproval");
@@ -535,6 +563,21 @@ function apply(ctx, rawConfig = {}) {
 					const stageCurrent = await hashLibrary.read(args.name).catch(() => null);
 					if (stageCurrent !== null) args.staged_from_sha256 = contentHash(stageCurrent);
 				}
+				if ((args.action === "write_file" || args.action === "remove_file") && hashLibrary && typeof args.name === "string" && args.name !== "" && typeof args.file_path === "string" && args.file_path !== "") {
+					const stageFile = await hashLibrary.readSupportFile(args.name, args.file_path).catch(() => void 0);
+					if (stageFile !== void 0) args.staged_from_sha256 = stageFile === null ? "absent" : contentHash(stageFile);
+				}
+				const opName = typeof args.name === "string" ? args.name : "";
+				const hashChecked = (args.action === "update" || args.action === "edit") && opName !== "" && preRunHashes?.has(opName) === true;
+				if (hashChecked) {
+					const live = await hashLibrary?.read(opName).catch(() => null) ?? null;
+					const preRun = preRunHashes.get(opName);
+					if (live === null || preRun !== void 0 && contentHash(live) !== preRun) {
+						ok = false;
+						failedOps.push(`skill ${args.action} ${args.name}: the skill changed while this review ran — update refused as stale; produce a fresh plan`);
+						continue;
+					}
+				}
 				const runnerArgs = {
 					operation: args,
 					origin: origins.library
@@ -543,6 +586,10 @@ function apply(ctx, rawConfig = {}) {
 				if (result?.ok) {
 					actions.push(`Skill ${op.name} ${op.action ?? "patch"}`);
 					onLanded?.(`Skill ${op.name} ${op.action ?? "patch"}`);
+					if (hashChecked) {
+						const landed = await hashLibrary?.read(opName).catch(() => null) ?? null;
+						if (landed !== null) preRunHashes.set(opName, contentHash(landed));
+					}
 				} else {
 					ok = false;
 					failedOps.push(`skill ${op.action ?? "patch"} ${op.name}: ${result?.message ?? "service unavailable"}`);
@@ -617,19 +664,55 @@ function apply(ctx, rawConfig = {}) {
 				ok: false,
 				message: "evolution-io service not mounted"
 			};
-			const library = new SkillLibrary(resolveSkillsRoot({ root: rootConfig.root }), evolutionIoAdapter(() => io.provider()), void 0, (event) => {
+			const policySnapshot = policySnapshotOf(ctx.get("evolutionPolicy"));
+			const library = new SkillLibrary(resolveSkillsRoot({ root: rootConfig.root }), evolutionIoAdapter(() => io.provider()), {
+				...DEFAULT_SKILL_LIMITS,
+				maxSkillContentChars: policySnapshot?.skillContentChars ?? DEFAULT_SKILL_LIMITS.maxSkillContentChars
+			}, (event) => {
 				ctx.emit("evolution/skill-mutated", event);
 			});
 			const op = skillArgs;
 			const name = op.name ?? "";
 			const origin = origins.library;
+			const protectedNames = policySnapshot?.protectedSkillNames;
+			if (origin !== "foreground" && protectedNames?.includes(name) && op.action !== "create") return {
+				ok: false,
+				message: `Skill "${name}" is protected by the current policy (protectedSkillNames); autonomous writes are refused.`
+			};
+			if (op.action === "write_file" || op.action === "remove_file") {
+				const expected = op.staged_from_sha256;
+				if (typeof expected === "string" && expected !== "") {
+					const current = await library.readSupportFile(name, op.file_path ?? "").catch(() => void 0);
+					const actual = current === void 0 || current === null ? "absent" : contentHash(current);
+					if (current === void 0 || actual !== expected) return {
+						ok: false,
+						message: `Support file "${op.file_path ?? ""}" of "${name}" changed since this plan was produced — the staged file operation was refused as stale. Re-read the skill tree and produce a fresh plan.`
+					};
+				}
+			}
 			if (op.action === "create") {
 				const created = await library.create(name, op.content ?? "", origin);
 				if (created.ok) await ctx.get("skillUsage")?.markAgentCreated?.(name);
 				return created;
 			}
-			if (op.action === "edit" || op.action === "update") return await library.update(name, op.content ?? "", origin);
-			if (op.action === "patch") return await library.patch(name, op.old_string ?? "", op.new_string ?? "", op.file_path ?? "", false, origin);
+			if (op.action === "edit" || op.action === "update") {
+				const expected = op.staged_from_sha256;
+				if (typeof expected === "string" && expected !== "") {
+					const current = await library.read(name).catch(() => null);
+					if (current !== null && contentHash(current) !== expected) return {
+						ok: false,
+						message: `Skill "${name}" changed since this plan was produced — the full-content update was refused as stale. Re-read the skill and produce a fresh plan.`
+					};
+				}
+				const updated = await library.update(name, op.content ?? "", origin);
+				if (updated.ok) await ctx.get("skillUsage")?.record?.(name, "patch").catch(() => {});
+				return updated;
+			}
+			if (op.action === "patch") {
+				const patched = await library.patch(name, op.old_string ?? "", op.new_string ?? "", op.file_path ?? "", false, origin);
+				if (patched.ok) await ctx.get("skillUsage")?.record?.(name, "patch").catch(() => {});
+				return patched;
+			}
 			if (op.action === "delete") {
 				const into = (op.absorbed_into ?? "").trim();
 				if (!into || !await library.read(into)) return {
@@ -640,8 +723,21 @@ function apply(ctx, rawConfig = {}) {
 				if (archived.ok) await ctx.get("skillUsage")?.markArchived?.(name);
 				return archived;
 			}
-			if (op.action === "write_file") return await library.writeSupportFile(name, op.file_path ?? "", op.file_content ?? "", origin);
-			if (op.action === "remove_file") return await library.removeSupportFile(name, op.file_path ?? "", origin);
+			if (op.action === "write_file" || op.action === "remove_file") {
+				const expected = op.staged_from_sha256;
+				if (typeof expected === "string" && expected !== "") {
+					const current = await library.readSupportFile(name, op.file_path ?? "").catch(() => void 0);
+					const actual = current === void 0 || current === null ? "absent" : contentHash(current);
+					if (current === void 0 || actual !== expected) return {
+						ok: false,
+						message: `Support file "${op.file_path ?? ""}" of "${name}" changed since this plan was produced — the staged file operation was refused as stale. Re-read the skill tree and produce a fresh plan.`
+					};
+				}
+				if (op.action === "write_file") return await library.writeSupportFile(name, op.file_path ?? "", op.file_content ?? "", origin);
+				const removedSupport = await library.removeSupportFile(name, op.file_path ?? "", origin);
+				if (removedSupport.ok) await ctx.get("skillUsage")?.record?.(name, "patch").catch(() => {});
+				return removedSupport;
+			}
 			if (op.action === "restructure") {
 				const moves = (op.restructure ?? []).filter((move) => move !== null).map((move) => ({
 					heading: move.heading ?? "",
@@ -676,9 +772,9 @@ function shouldCompletionReview(reason, sessionToolCalls, minToolCalls) {
 * per-skill read action (its `list`/`review` are whole-library), so a specific
 * skill read through it cannot be tracked — see README Known Limitations. */
 function collectReadSkillNames(session) {
-	const names = /* @__PURE__ */ new Set();
-	for (const event of session.events) {
-		if (event.type !== "tool/call") continue;
+	const callNames = /* @__PURE__ */ new Map();
+	const okCallIds = /* @__PURE__ */ new Set();
+	for (const event of session.events) if (event.type === "tool/call") {
 		if (event.data.name !== "skill") continue;
 		const raw = event.data.arguments;
 		let parsed = {};
@@ -687,11 +783,20 @@ function collectReadSkillNames(session) {
 		} catch {
 			continue;
 		}
-		else parsed = raw ?? {};
+		else parsed = raw;
 		const parsedObj = typeof parsed === "object" && parsed !== null ? parsed : {};
 		const name = typeof parsedObj.name === "string" ? parsedObj.name : typeof parsedObj.skill === "string" ? parsedObj.skill : "";
-		if (name) names.add(name);
+		if (name) callNames.set(event.data.callId, name);
+	} else if (event.type === "tool/result") {
+		const blocks = event.data?.message?.content;
+		if (!Array.isArray(blocks)) continue;
+		for (const block of blocks) {
+			const typed = block;
+			if (typed.type === "tool-result" && typed.isError !== true && typeof typed.toolCallId === "string") okCallIds.add(typed.toolCallId);
+		}
 	}
+	const names = /* @__PURE__ */ new Set();
+	for (const [callId, name] of callNames) if (okCallIds.has(callId)) names.add(name);
 	return names;
 }
 /** Map/set size that triggers a dead-session counter sweep (bounded, not a hard cap). */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-review",
   "description": "Background review orchestration (community build)",
-  "version": "0.3.68",
+  "version": "0.3.69",
   "publishConfig": {
     "access": "public"
   },
@@ -31,9 +31,9 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-approval": "^0.3.68",
-    "@lmzhen/dsh-evolution-core": "^0.3.68",
-    "@lmzhen/dsh-evolution-plan-validator": "^0.3.68"
+    "@lmzhen/dsh-evolution-approval": "^0.3.69",
+    "@lmzhen/dsh-evolution-core": "^0.3.69",
+    "@lmzhen/dsh-evolution-plan-validator": "^0.3.69"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
@@ -42,8 +42,8 @@
     "@deepseek-ai/dsh-llm": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-session": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-tools": "^0.1.1-rc.2",
-    "@lmzhen/dsh-evolution-state": "^0.3.68",
-    "@lmzhen/dsh-evolution-policy": "^0.3.68"
+    "@lmzhen/dsh-evolution-state": "^0.3.69",
+    "@lmzhen/dsh-evolution-policy": "^0.3.69"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-agent": "^0.1.1-rc.2",
@@ -54,9 +54,9 @@
     "@deepseek-ai/dsh-session-persistence": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-session-persistence-jsonl": "^0.1.1-rc.2",
     "@deepseek-ai/dsh-tools": "^0.1.1-rc.2",
-    "@lmzhen/dsh-evolution-approval": "^0.3.68",
-    "@lmzhen/dsh-evolution-core": "^0.3.68",
-    "@lmzhen/dsh-evolution-plan-validator": "^0.3.68",
-    "@lmzhen/dsh-evolution-state": "^0.3.68"
+    "@lmzhen/dsh-evolution-approval": "^0.3.69",
+    "@lmzhen/dsh-evolution-core": "^0.3.69",
+    "@lmzhen/dsh-evolution-plan-validator": "^0.3.69",
+    "@lmzhen/dsh-evolution-state": "^0.3.69"
   }
 }