@lmzhen/dsh-evolution-review 0.3.38 → 0.3.40

package/lib/index.js

@@ -23,6 +23,7 @@ const Config = z.object({
 	reviewMaxDepth: z.number().min(1).default(1),
 	reviewProvider: z.string(),
 	skillReviewTrigger: z.string().default(DEFAULT_SKILL_REVIEW_TRIGGER),
+	reviewWakeInject: z.boolean().default(true),
 	skillReviewCompletionMinToolCalls: z.number().min(1).default(DEFAULT_SKILL_REVIEW_COMPLETION_MIN_TOOL_CALLS)
 });
 let statelessReviewStateWarned = false;
@@ -114,45 +115,17 @@ function apply(ctx, rawConfig) {
 			skillInterval: snapshot?.reviewSkillInterval ?? config.skillInterval,
 			substantiveMinToolCalls: snapshot?.substantiveMinToolCalls ?? 3,
 			substantiveMinUserChars: snapshot?.substantiveMinUserChars ?? 200,
-			substantiveMinAgentChars: snapshot?.substantiveMinAgentChars ?? 500
+			substantiveMinAgentChars: snapshot?.substantiveMinAgentChars ?? 500,
+			resetOnFire: false
 		});
 		await stateService?.saveReviewState(session.id, state);
 		const cumulative = (cumulativeToolCalls.get(session.id) ?? 0) + signal.toolCalls;
 		cumulativeToolCalls.set(session.id, cumulative);
-		if (event.data.reason.kind === "completed") {
-			const pendingKind = pendingCadenceReviews.get(session.id);
-			if (pendingKind !== void 0) {
-				pendingCadenceReviews.delete(session.id);
-				try {
-					agent.inject(createUserMessage({
-						content: [{
-							type: "text",
-							text: reviewPrompt(pendingKind)
-						}],
-						source: {
-							kind: "plugin",
-							plugin: "dsh-evolution-review",
-							form: "notice",
-							summary: "auto-review"
-						}
-					}));
-				} catch (injectError) {
-					ctx.logger.warn(`dsh-evolution-review: deferred review inject failed: ${injectError instanceof Error ? injectError.message : String(injectError)}`);
-				}
-			}
-		}
-		if (kind) {
-			if (await trySubagentReview(session, agent, kind, signal)) ctx.emit("evolution/review-scheduled", {
-				sessionId: session.id,
-				kind,
-				toolCalls: signal.toolCalls,
-				userChars: signal.userChars,
-				assistantChars: signal.assistantChars
-			});
-			else if ((policy()?.reviewMode ?? config.reviewMode) === "inject") agent.inject(createUserMessage({
+		const deliverReview = (text) => {
+			const message = createUserMessage({
 				content: [{
 					type: "text",
-					text: reviewPrompt(kind)
+					text
 				}],
 				source: {
 					kind: "plugin",
@@ -160,13 +133,42 @@ function apply(ctx, rawConfig) {
 					form: "notice",
 					summary: "auto-review"
 				}
-			}));
-			else {
-				pendingCadenceReviews.set(session.id, kind);
-				if (!pendingCadenceWarned.has(session.id)) {
-					pendingCadenceWarned.add(session.id);
-					ctx.logger.warn(`dsh-evolution-review: ${kind} review could not run on a subagent this turn; deferred to the end of the conversation (no mid-task injection)`);
+			});
+			const followup = agent.followup;
+			if (config.reviewWakeInject && typeof followup === "function") followup(message);
+			else agent.inject(message);
+		};
+		if (event.data.reason.kind === "completed") {
+			const pendingKind = pendingCadenceReviews.get(session.id) ?? kind ?? void 0;
+			if (pendingKind !== void 0) {
+				pendingCadenceReviews.delete(session.id);
+				if ((policy()?.reviewMode ?? config.reviewMode) === "inject") try {
+					deliverReview(reviewPrompt(pendingKind));
+				} 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)) ctx.emit("evolution/review-scheduled", {
+					sessionId: session.id,
+					kind: pendingKind,
+					toolCalls: signal.toolCalls,
+					userChars: signal.userChars,
+					assistantChars: signal.assistantChars
+				});
+				else try {
+					deliverReview(reviewPrompt(pendingKind));
+				} 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;
+				await stateService?.saveReviewState(session.id, state);
+			}
+		}
+		if (kind && event.data.reason.kind !== "completed") {
+			pendingCadenceReviews.set(session.id, kind);
+			if (!pendingCadenceWarned.has(session.id)) {
+				pendingCadenceWarned.add(session.id);
+				ctx.logger.warn(`dsh-evolution-review: ${kind} review threshold reached; the review runs at the end of the conversation (no mid-task execution)`);
 			}
 			return;
 		}
@@ -265,7 +267,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.id);
+				const executed = await executePlan(validation.accepted, session);
 				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) {
@@ -343,7 +345,8 @@ function apply(ctx, rawConfig) {
 			reviewInFlight = false;
 		}
 	}
-	async function executePlan(plan, sessionId) {
+	async function executePlan(plan, session) {
+		const sessionId = session?.id;
 		const memory = ctx.get("memory");
 		const approval = ctx.get("evolutionApproval");
 		const origins = resolveOrigins(void 0, true);
@@ -359,7 +362,7 @@ function apply(ctx, rawConfig) {
 					facts: op.facts ?? op.content,
 					old_text: op.old_text
 				};
-				const result = approval ? await runApproved("memory", `memory ${normalized.target} ${normalized.action}`, normalized, normalized) : await memory?.applyBatch(normalized.target, [normalized]);
+				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 {
 					ok = false;
@@ -376,7 +379,7 @@ function apply(ctx, rawConfig) {
 					operation: args,
 					origin: origins.library
 				};
-				const result = approval ? await runApproved("skill", `skill ${op.action ?? "patch"} ${op.name}`, runnerArgs, runnerArgs) : await executeSkillDirect(args);
+				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 {
 					ok = false;
@@ -399,7 +402,7 @@ function apply(ctx, rawConfig) {
 				aborted: reason
 			};
 		}
-		async function runApproved(kind, summary, stored, runnerArgs) {
+		async function runApproved(kind, summary, stored, runnerArgs, approvalSession) {
 			if (!approval) return void 0;
 			if (approval.isEnabled === true && !approval.hasRunner(kind)) {
 				ctx.logger.warn(`dsh-evolution-review: approval enabled but no replay runner registered for kind "${kind}" - skipping write (${summary})`);
@@ -413,7 +416,8 @@ function apply(ctx, rawConfig) {
 				summary,
 				args: stored,
 				origin: origins.approval,
-				...sessionId ? { sessionId } : {}
+				...sessionId ? { sessionId } : {},
+				...approvalSession ? { session: approvalSession } : {}
 			});
 			if (decision.action === "staged") return {
 				ok: false,

package/lib/types/index.d.ts

@@ -32,6 +32,11 @@ export interface Config {
     skillReviewTrigger?: string;
     /** Cumulative session tool calls before a session counts as proven-long for the completion channel. */
     skillReviewCompletionMinToolCalls?: number;
+    /** 0.3.40: deliver the deferred review with a WAKING inject for a summary the
+     * model starts immediately (agent.followup — same send() queue, wakeup bit
+     * differs). Default true; false degrades to the non-waking inject (the
+     * summary then waits for the next driver wake). */
+    reviewWakeInject?: boolean;
 }
 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.38",
+  "version": "0.3.40",
   "publishConfig": {
     "access": "public"
   },
@@ -31,9 +31,9 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.1",
-    "@lmzhen/dsh-evolution-approval": "^0.3.38",
-    "@lmzhen/dsh-evolution-core": "^0.3.38",
-    "@lmzhen/dsh-evolution-plan-validator": "^0.3.38"
+    "@lmzhen/dsh-evolution-approval": "^0.3.40",
+    "@lmzhen/dsh-evolution-core": "^0.3.40",
+    "@lmzhen/dsh-evolution-plan-validator": "^0.3.40"
   },
   "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.38",
-    "@lmzhen/dsh-evolution-policy": "^0.3.38"
+    "@lmzhen/dsh-evolution-state": "^0.3.40",
+    "@lmzhen/dsh-evolution-policy": "^0.3.40"
   },
   "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.38",
-    "@lmzhen/dsh-evolution-core": "^0.3.38",
-    "@lmzhen/dsh-evolution-plan-validator": "^0.3.38",
-    "@lmzhen/dsh-evolution-state": "^0.3.38"
+    "@lmzhen/dsh-evolution-approval": "^0.3.40",
+    "@lmzhen/dsh-evolution-core": "^0.3.40",
+    "@lmzhen/dsh-evolution-plan-validator": "^0.3.40",
+    "@lmzhen/dsh-evolution-state": "^0.3.40"
   }
 }