@lmzhen/dsh-evolution-review 0.3.67 → 0.3.68

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, 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_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
 /**
@@ -10,13 +10,6 @@ import { validateEvolutionPlan } from "@lmzhen/dsh-evolution-plan-validator";
 */
 const name = "evolution-review";
 const inject = ["agents"];
-/** Node's 32-bit timer-delay ceiling (`AbortSignal.timeout`/`setTimeout`):
-* a larger value throws RangeError. B-2 (v18): without a max, a misconfigured
-* `reviewTimeoutMs` made `AbortSignal.timeout` throw inside the subagent
-* start call; the outer catch logged it and silently degraded the review to
-* the inject path. The schema and the assembly clamp both reject it (same
-* bound as commands/maintenance). */
-const MAX_TIMER_DELAY_MS = 2147483647;
 const Config = z.object({
 	reviewEnabled: z.boolean().default(true),
 	reviewMode: z.union([z.const("subagent"), z.const("inject")]).default("subagent"),
@@ -81,8 +74,8 @@ function clampReviewConfig(rawConfig, ctx) {
 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);
+	assertSkillsRootAliasRetired(rawConfig);
 	const rootConfig = resolveRootConfig(rawConfig);
-	if (rootConfig.usedDeprecatedAlias) ctx.logger.warn("evolution-review: config \"skillsRoot\" is deprecated (E-7); use \"root\" — the alias is honoured until 0.3.65");
 	const turnStarts = /* @__PURE__ */ new Map();
 	let statelessReviewStateWarned = false;
 	const cumulativeToolCalls = /* @__PURE__ */ new Map();
@@ -160,9 +153,9 @@ function apply(ctx, rawConfig = {}) {
 			advanced.kind = advanceReview(state, event.data.turn, signal, {
 				memoryInterval: snapshot?.reviewMemoryInterval ?? config.memoryInterval,
 				skillInterval: snapshot?.reviewSkillInterval ?? config.skillInterval,
-				substantiveMinToolCalls: snapshot?.substantiveMinToolCalls ?? 3,
-				substantiveMinUserChars: snapshot?.substantiveMinUserChars ?? 200,
-				substantiveMinAgentChars: snapshot?.substantiveMinAgentChars ?? 500,
+				substantiveMinToolCalls: snapshot?.substantiveMinToolCalls ?? DEFAULT_SUBSTANTIVE_MIN_TOOL_CALLS,
+				substantiveMinUserChars: snapshot?.substantiveMinUserChars ?? DEFAULT_SUBSTANTIVE_MIN_USER_CHARS,
+				substantiveMinAgentChars: snapshot?.substantiveMinAgentChars ?? DEFAULT_SUBSTANTIVE_MIN_AGENT_CHARS,
 				resetOnFire: false
 			});
 			await stateService?.saveReviewState(session.id, state);
@@ -205,7 +198,10 @@ function apply(ctx, rawConfig = {}) {
 					} catch (emitError) {
 						ctx.logger.warn(`dsh-evolution-review: review-scheduled emit failed: ${emitError instanceof Error ? emitError.message : String(emitError)}`);
 					}
-					else if (reviewOutcome !== "deferred") try {
+					else if (reviewOutcome === "dropped") {
+						pendingCadenceReviews.set(session.id, pendingKind);
+						return;
+					} else if (reviewOutcome !== "deferred") try {
 						deliverMessage(agent, reviewPrompt(pendingKind), "auto-review");
 						try {
 							ctx.emit("evolution/review-scheduled", {
@@ -334,22 +330,25 @@ function apply(ctx, rawConfig = {}) {
 		const subagents = ctx.get("subagents");
 		if (!subagents) return false;
 		if (reviewInFlight) {
-			if (deferredFallbackReviews.length < DEFERRED_REVIEW_CAP) deferredFallbackReviews.push({
-				agent,
-				sessionId: session.id,
-				kind,
-				prompt: reviewPrompt(kind),
-				label: "auto-review",
-				channel: "inject",
-				counts: signal
-			});
-			else ctx.logger.warn(`dsh-evolution-review: deferred-review queue at cap (${DEFERRED_REVIEW_CAP}) — dropping one fallback review prompt`);
-			return "deferred";
+			if (deferredFallbackReviews.length < DEFERRED_REVIEW_CAP) {
+				deferredFallbackReviews.push({
+					agent,
+					sessionId: session.id,
+					kind,
+					prompt: reviewPrompt(kind),
+					label: "auto-review",
+					channel: "inject",
+					counts: signal
+				});
+				return "deferred";
+			}
+			ctx.logger.warn(`dsh-evolution-review: deferred-review queue at cap (${DEFERRED_REVIEW_CAP}) — dropping one fallback review prompt`);
+			return "dropped";
 		}
 		reviewInFlight = true;
 		try {
 			const snapshot = policy();
-			const model = kind === "memory" ? snapshot?.memoryReviewModel ?? "deepseek-v4-flash" : snapshot?.skillReviewModel ?? "deepseek-v4-pro";
+			const model = kind === "memory" ? snapshot?.memoryReviewModel ?? DEFAULT_MEMORY_REVIEW_MODEL : snapshot?.skillReviewModel ?? DEFAULT_SKILL_REVIEW_MODEL;
 			const reviewText = redactSecrets(buildReviewRequest(session, kind, signal, config.reviewContextMessages, config.reviewMessageChars));
 			const agentOptions = { model };
 			if (config.reviewProvider) agentOptions.provider = config.reviewProvider;
@@ -391,9 +390,38 @@ function apply(ctx, rawConfig = {}) {
 				});
 				const acceptedSkillOps = validation.accepted.skillOps ?? [];
 				const skippedUnread = filterUnreadSkillOps(acceptedSkillOps, new Set([...collectReadSkillNames(session), ...childReads]));
-				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);
+				const emitApplied = (report) => {
+					try {
+						ctx.emit("evolution/plan-applied", {
+							sessionId: session.id,
+							planId: randomUUID(),
+							policyFingerprint,
+							memoryApplied: report.actions.filter((action) => action.startsWith("Memory")).length,
+							skillApplied: report.actions.filter((action) => action.startsWith("Skill ")).length,
+							rejectedOps: validation.rejected.length,
+							...skippedUnread > 0 ? { skippedUnread } : {},
+							executionFailures: report.failedOps?.length ?? 0,
+							...report.executionError !== void 0 ? { executionError: report.executionError } : {},
+							evidenceQuotes,
+							estimatedInputChars: reviewText.length
+						});
+					} catch (emitError) {
+						ctx.logger.warn(`dsh-evolution-review: plan-applied emit failed: ${emitError instanceof Error ? emitError.message : String(emitError)}`);
+					}
+				};
+				const landed = [];
+				let executed;
+				try {
+					executed = await withTimeout(executePlan(validation.accepted, session, (action) => landed.push(action)), config.reviewTimeoutMs, "review plan execution");
+				} catch (error) {
+					emitApplied({
+						actions: landed,
+						executionError: `execution timed out after ${config.reviewTimeoutMs}ms`
+					});
+					throw error;
+				}
+				const actions = executed.actions;
 				if (actions.length > 0) {
 					const applied = actions.join(" · ");
 					const note = executed.ok ? "" : "\n部分操作失败。以下操作已应用，请勿重复执行。";
@@ -415,23 +443,11 @@ function apply(ctx, rawConfig = {}) {
 				} catch (injectError) {
 					ctx.logger.warn(`dsh-evolution-review: zero-landing notice inject failed: ${injectError instanceof Error ? injectError.message : String(injectError)}`);
 				}
-				try {
-					ctx.emit("evolution/plan-applied", {
-						sessionId: session.id,
-						planId: randomUUID(),
-						policyFingerprint,
-						memoryApplied: actions.filter((action) => action.startsWith("Memory")).length,
-						skillApplied: actions.filter((action) => action.startsWith("Skill ")).length,
-						rejectedOps: validation.rejected.length + skippedUnread,
-						executionFailures: executed.failedOps.length,
-						...executed.aborted !== void 0 ? { executionError: executed.aborted } : {},
-						...executed.failedOps[0] !== void 0 && executed.aborted === void 0 ? { executionError: executed.failedOps[0] } : {},
-						evidenceQuotes,
-						estimatedInputChars: reviewText.length
-					});
-				} catch (emitError) {
-					ctx.logger.warn(`dsh-evolution-review: plan-applied emit failed: ${emitError instanceof Error ? emitError.message : String(emitError)}`);
-				}
+				emitApplied({
+					actions,
+					failedOps: executed.failedOps,
+					...executed.aborted !== void 0 ? { executionError: executed.aborted } : executed.failedOps[0] !== void 0 ? { executionError: executed.failedOps[0] } : {}
+				});
 				return true;
 			} finally {
 				try {
@@ -470,7 +486,7 @@ function apply(ctx, rawConfig = {}) {
 			}
 		}
 	}
-	async function executePlan(plan, session) {
+	async function executePlan(plan, session, onLanded) {
 		const sessionId = session?.id;
 		const memory = ctx.get("memory");
 		const approval = ctx.get("evolutionApproval");
@@ -497,8 +513,10 @@ function apply(ctx, rawConfig = {}) {
 					old_text: op.old_text
 				};
 				const result = approval ? await runApproved("memory", `memory ${normalized.target} ${normalized.action}`, normalized, normalized, session) : await memory?.applyBatch(normalized.target, [normalized]);
-				if (result?.ok) actions.push("Memory updated");
-				else {
+				if (result?.ok) {
+					actions.push("Memory updated");
+					onLanded?.("Memory updated");
+				} else {
 					ok = false;
 					failedOps.push(`memory ${normalized.action} ${normalized.target}: ${result?.message ?? "service unavailable"}`);
 				}
@@ -522,8 +540,10 @@ function apply(ctx, rawConfig = {}) {
 					origin: origins.library
 				};
 				const result = approval ? await runApproved("skill", `skill ${op.action ?? "patch"} ${op.name}`, runnerArgs, runnerArgs, session) : await executeSkillDirect(args);
-				if (result?.ok) actions.push(`Skill ${op.name} ${op.action ?? "patch"}`);
-				else {
+				if (result?.ok) {
+					actions.push(`Skill ${op.name} ${op.action ?? "patch"}`);
+					onLanded?.(`Skill ${op.name} ${op.action ?? "patch"}`);
+				} else {
 					ok = false;
 					failedOps.push(`skill ${op.action ?? "patch"} ${op.name}: ${result?.message ?? "service unavailable"}`);
 				}

package/lib/types/index.d.ts

@@ -47,8 +47,9 @@ export interface Config {
      * skills in the SAME tree the catalog/tools read instead of writing a
      * parallel tree the rest of the family cannot see. E-7 (v18): canonical key. */
     root?: string;
-    /** Deprecated alias of `root` (E-7, v18); honoured only while `root` is
-     * empty, with a warning; removed after 0.3.65. */
+    /** V27 G2.4 (M-08): the retired `skillsRoot` alias, kept in the schema so a
+     * config that still sets it reaches {@link assertSkillsRootAliasRetired} and
+     * fails the load instead of being silently dropped. Never read. */
     skillsRoot?: string;
 }
 export declare const Config: z<Config>;

package/package.json

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