@lmzhen/dsh-evolution-review 0.3.65 → 0.3.66

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_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_TRIGGER, DEFAULT_USER_CHAR_LIMIT, PROMPT_BUNDLE, SkillLibrary, advanceReview, clampedNumber, 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_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_TRIGGER, DEFAULT_USER_CHAR_LIMIT, PROMPT_BUNDLE, SkillLibrary, advanceReview, 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
 /**
@@ -94,7 +94,7 @@ function apply(ctx, rawConfig = {}) {
 	let reviewInFlight = false;
 	const policy = () => ctx.get("evolutionPolicy")?.get();
 	ctx.on("session/event", (session, event) => {
-		if (event.type === "turn/start") turnStarts.set(session.id, session.seq - 1);
+		if (event.type === "turn/start" && session.header.origin !== "subagent") turnStarts.set(session.id, session.seq - 1);
 		if (event.type !== "turn/end") return;
 		if (turnStarts.size >= COUNTER_SWEEP_THRESHOLD || cumulativeToolCalls.size >= COUNTER_SWEEP_THRESHOLD || completionInjected.size >= COUNTER_SWEEP_THRESHOLD || pendingCadenceReviews.size >= COUNTER_SWEEP_THRESHOLD || skipNextCadenceFire.size >= COUNTER_SWEEP_THRESHOLD || cadenceResetWarned.size >= COUNTER_SWEEP_THRESHOLD) {
 			const isAlive = (id) => ctx.agents.get(id) !== void 0;
@@ -161,21 +161,24 @@ function apply(ctx, rawConfig = {}) {
 				} catch (injectError) {
 					ctx.logger.warn(`dsh-evolution-review: deferred review inject failed: ${injectError instanceof Error ? injectError.message : String(injectError)}`);
 				}
-				else if (await trySubagentReview(session, agent, pendingKind, signal)) try {
-					ctx.emit("evolution/review-scheduled", {
-						sessionId: session.id,
-						kind: pendingKind,
-						toolCalls: signal.toolCalls,
-						userChars: signal.userChars,
-						assistantChars: signal.assistantChars
-					});
-				} catch (emitError) {
-					ctx.logger.warn(`dsh-evolution-review: review-scheduled emit failed: ${emitError instanceof Error ? emitError.message : String(emitError)}`);
-				}
-				else try {
-					deliverMessage(agent, reviewPrompt(pendingKind), "auto-review");
-				} catch (injectError) {
-					ctx.logger.warn(`dsh-evolution-review: deferred review inject failed: ${injectError instanceof Error ? injectError.message : String(injectError)}`);
+				else {
+					const reviewOutcome = await trySubagentReview(session, agent, pendingKind, signal);
+					if (reviewOutcome === true) try {
+						ctx.emit("evolution/review-scheduled", {
+							sessionId: session.id,
+							kind: pendingKind,
+							toolCalls: signal.toolCalls,
+							userChars: signal.userChars,
+							assistantChars: signal.assistantChars
+						});
+					} catch (emitError) {
+						ctx.logger.warn(`dsh-evolution-review: review-scheduled emit failed: ${emitError instanceof Error ? emitError.message : String(emitError)}`);
+					}
+					else if (reviewOutcome !== "deferred") try {
+						deliverMessage(agent, reviewPrompt(pendingKind), "auto-review");
+					} catch (injectError) {
+						ctx.logger.warn(`dsh-evolution-review: deferred review inject failed: ${injectError instanceof Error ? injectError.message : String(injectError)}`);
+					}
 				}
 				state.turnsSinceMemory = 0;
 				state.turnsSinceSkill = 0;
@@ -246,11 +249,35 @@ function apply(ctx, rawConfig = {}) {
 			skipNextCadenceFire.set(agent.session.id, true);
 		} else agent.inject(message);
 	};
+	const withTimeout = (promise, ms, label) => new Promise((resolve, reject) => {
+		const timer = setTimeout(() => {
+			reject(/* @__PURE__ */ new Error(`dsh-evolution-review: ${label} timed out after ${ms}ms`));
+		}, ms);
+		promise.then((value) => {
+			clearTimeout(timer);
+			resolve(value);
+		}, (error) => {
+			clearTimeout(timer);
+			reject(error instanceof Error ? error : new Error(String(error)));
+		});
+	});
+	const deferredFallbackReviews = [];
+	const DEFERRED_REVIEW_CAP = 16;
+	ctx.effect(() => () => {
+		deferredFallbackReviews.length = 0;
+	}, "dsh-evolution-review.deferred-drain");
 	async function trySubagentReview(session, agent, kind, signal) {
 		if ((policy()?.reviewMode ?? config.reviewMode) === "inject") return false;
 		const subagents = ctx.get("subagents");
 		if (!subagents) return false;
-		if (reviewInFlight) return false;
+		if (reviewInFlight) {
+			if (deferredFallbackReviews.length < DEFERRED_REVIEW_CAP) deferredFallbackReviews.push({
+				agent,
+				kind
+			});
+			else ctx.logger.warn(`dsh-evolution-review: deferred-review queue at cap (${DEFERRED_REVIEW_CAP}) — dropping one fallback review prompt`);
+			return "deferred";
+		}
 		reviewInFlight = true;
 		try {
 			const snapshot = policy();
@@ -296,7 +323,7 @@ function apply(ctx, rawConfig = {}) {
 				});
 				const acceptedSkillOps = validation.accepted.skillOps ?? [];
 				const skippedUnread = filterUnreadSkillOps(acceptedSkillOps, new Set([...collectReadSkillNames(session), ...childReads]));
-				const executed = await executePlan(validation.accepted, session);
+				const executed = await withTimeout(executePlan(validation.accepted, session), config.reviewTimeoutMs, "review plan execution");
 				const actions = executed.actions;
 				const evidenceQuotes = [...validation.accepted.memoryOps ?? [], ...acceptedSkillOps].reduce((total, op) => total + (Array.isArray(op.evidence) ? op.evidence.length : 0), 0);
 				if (actions.length > 0) {
@@ -347,15 +374,27 @@ function apply(ctx, rawConfig = {}) {
 			}
 		} catch (error) {
 			ctx.logger.warn(`dsh-evolution-review: subagent review failed: ${error instanceof Error ? error.message : String(error)}`);
+			if (error instanceof Error && error.message.includes("plan execution timed out")) ctx.logger.warn("dsh-evolution-review: plan execution abandoned on timeout — any late write it lands has NO plan-applied record and races the fallback inject; inspect the skill tree and usage sidecar");
 			return false;
 		} finally {
 			reviewInFlight = false;
+			const deferred = deferredFallbackReviews.splice(0);
+			for (const { agent: waitingAgent, kind: waitingKind } of deferred) try {
+				deliverMessage(waitingAgent, reviewPrompt(waitingKind), "auto-review");
+			} catch (injectError) {
+				ctx.logger.warn(`dsh-evolution-review: deferred review inject failed: ${injectError instanceof Error ? injectError.message : String(injectError)}`);
+			}
 		}
 	}
 	async function executePlan(plan, session) {
 		const sessionId = session?.id;
 		const memory = ctx.get("memory");
 		const approval = ctx.get("evolutionApproval");
+		const hashLibrary = (() => {
+			const io = ctx.get("evolutionIo");
+			if (!io) return null;
+			return new SkillLibrary(resolveSkillsRoot({ root: rootConfig.root }), evolutionIoAdapter(() => io.provider()));
+		})();
 		const origins = resolveOrigins(void 0, true);
 		const actions = [];
 		const failedOps = [];
@@ -390,6 +429,10 @@ function apply(ctx, rawConfig = {}) {
 					...op,
 					evidence: op.evidence
 				};
+				if ((args.action === "update" || args.action === "edit") && hashLibrary && typeof args.name === "string" && args.name !== "") {
+					const stageCurrent = await hashLibrary.read(args.name).catch(() => null);
+					if (stageCurrent !== null) args.staged_from_sha256 = contentHash(stageCurrent);
+				}
 				const runnerArgs = {
 					operation: args,
 					origin: origins.library

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-review",
   "description": "Background review orchestration (community build)",
-  "version": "0.3.65",
+  "version": "0.3.66",
   "publishConfig": {
     "access": "public"
   },
@@ -31,9 +31,9 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-approval": "^0.3.65",
-    "@lmzhen/dsh-evolution-core": "^0.3.65",
-    "@lmzhen/dsh-evolution-plan-validator": "^0.3.65"
+    "@lmzhen/dsh-evolution-approval": "^0.3.66",
+    "@lmzhen/dsh-evolution-core": "^0.3.66",
+    "@lmzhen/dsh-evolution-plan-validator": "^0.3.66"
   },
   "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.65",
-    "@lmzhen/dsh-evolution-policy": "^0.3.65"
+    "@lmzhen/dsh-evolution-state": "^0.3.66",
+    "@lmzhen/dsh-evolution-policy": "^0.3.66"
   },
   "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.65",
-    "@lmzhen/dsh-evolution-core": "^0.3.65",
-    "@lmzhen/dsh-evolution-plan-validator": "^0.3.65",
-    "@lmzhen/dsh-evolution-state": "^0.3.65"
+    "@lmzhen/dsh-evolution-approval": "^0.3.66",
+    "@lmzhen/dsh-evolution-core": "^0.3.66",
+    "@lmzhen/dsh-evolution-plan-validator": "^0.3.66",
+    "@lmzhen/dsh-evolution-state": "^0.3.66"
   }
 }