@lmzhen/dsh-evolution-review 0.3.41 → 0.3.43

package/README.md

@@ -34,3 +34,10 @@ Independent of request-prefix construction. This package does not alter the asse
 `reviewProvider` selects the LLM provider for review subagents. When omitted, the subagent inherits the deployment default route instead of a hardcoded provider name. Model selection stays on the policy (`memoryReviewModel` / `skillReviewModel`).
 
 `reviewTimeoutMs` bounds each review subagent run (an `AbortSignal.timeout`; `0` aborts immediately). `executionTimeoutMs` is a leftover declaration and is **not consumed** — it is kept only as a code comment and has no effect; configure `reviewTimeoutMs` instead.
+
+### Review delivery contract (0.3.38-0.3.42)
+
+- **Both channels execute at conversation end only** (a `turn/end` with `reason.kind === 'completed'`): a cadence threshold fire mid-task merely latches the kind — no subagent spawn, no inject. The flush runs BEFORE the latch block (the completing turn may itself be a threshold-firing turn). `reviewMode` (`'subagent'` default / `'inject'`) selects how the flush delivers; the explicit `'inject'` mode's historical "immediate on threshold" contract was superseded in 0.3.39 — both modes are end-of-conversation.
+- **`skillReviewTrigger`** (default `'cadence'`): `'cadence'` runs one end-of-conversation review from the cadence latch; `'completion'` uses the separate long-session completion gate (session-cumulative tool-call threshold); `'both'` enables both (note: with the deferred cadence execution the `'both'` combination would inject a second task-complete prompt at the same boundary — prefer `'cadence'`).
+- **`reviewWakeInject`** (default `true`): deliveries use `agent.followup` (next-turn + wake — the model starts processing immediately) instead of the non-waking `agent.inject` (which waits for the next driver wake). The host falls back to `inject` when it has no followup or the option is `false`. The woken turn's own cadence fire is suppressed once (an injected review prompt alone must not re-trigger a review under `interval=1`); a restart clears the queue, so the loop cannot survive it.
+- **Counting window = injection-to-injection**: the `turnsSinceMemory`/`turnsSinceSkill` counters are monotonic across threshold fires (`resetOnFire: false`) and are zeroed at the flush delivery — a continued conversation starts a fresh segment from the injection. A threshold fire on the completing turn is caught by the flush (`pendingKind = latch ?? kind`). All deliveries (review prompt AND result notices) share the same waking channel; a failed counter-reset persist warns once per session (a stateful reload may re-deliver).

package/lib/index.js

@@ -66,12 +66,13 @@ function apply(ctx, rawConfig) {
 	const pendingCadenceReviews = /* @__PURE__ */ new Map();
 	const pendingCadenceWarned = /* @__PURE__ */ new Set();
 	const skipNextCadenceFire = /* @__PURE__ */ new Map();
+	const cadenceResetWarned = /* @__PURE__ */ new Set();
 	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/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) {
+		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;
 			sweepDeadSessionEntries(turnStarts, isAlive);
 			sweepDeadSessionEntries(cumulativeToolCalls, isAlive);
@@ -79,6 +80,7 @@ function apply(ctx, rawConfig) {
 			sweepDeadSessionEntries(pendingCadenceReviews, isAlive);
 			sweepDeadSessionEntries(pendingCadenceWarned, isAlive);
 			sweepDeadSessionEntries(skipNextCadenceFire, isAlive);
+			sweepDeadSessionEntries(cadenceResetWarned, isAlive);
 		}
 		onTurnEnd(session, event);
 	});
@@ -126,31 +128,12 @@ function apply(ctx, rawConfig) {
 		await stateService?.saveReviewState(session.id, state);
 		const cumulative = (cumulativeToolCalls.get(session.id) ?? 0) + signal.toolCalls;
 		cumulativeToolCalls.set(session.id, cumulative);
-		const deliverReview = (text) => {
-			const message = createUserMessage({
-				content: [{
-					type: "text",
-					text
-				}],
-				source: {
-					kind: "plugin",
-					plugin: "dsh-evolution-review",
-					form: "notice",
-					summary: "auto-review"
-				}
-			});
-			const followup = agent.followup;
-			if (config.reviewWakeInject && typeof followup === "function") {
-				followup(message);
-				skipNextCadenceFire.set(session.id, true);
-			} 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));
+					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)}`);
 				}
@@ -162,13 +145,20 @@ function apply(ctx, rawConfig) {
 					assistantChars: signal.assistantChars
 				});
 				else try {
-					deliverReview(reviewPrompt(pendingKind));
+					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;
-				await stateService?.saveReviewState(session.id, state);
+				try {
+					await stateService?.saveReviewState(session.id, state);
+				} catch (resetError) {
+					if (!cadenceResetWarned.has(session.id)) {
+						cadenceResetWarned.add(session.id);
+						ctx.logger.warn(`dsh-evolution-review: cadence counter reset could not be persisted after a delivered review (${resetError instanceof Error ? resetError.message : String(resetError)}) — a stateful reload may re-deliver this review`);
+					}
+				}
 			}
 		}
 		if (kind && event.data.reason.kind !== "completed") {
@@ -210,6 +200,29 @@ function apply(ctx, rawConfig) {
 			assistantChars: signal.assistantChars
 		});
 	}
+	/** V7-03 (0.3.42): shared waking delivery — review prompts AND result
+	* notices go through the same followup-first channel (skip the woken turn's
+	* cadence fire once, degrade to inject when reviewWakeInject is off or the
+	* host lacks followup). */
+	const deliverMessage = (agent, text, summary) => {
+		const message = createUserMessage({
+			content: [{
+				type: "text",
+				text
+			}],
+			source: {
+				kind: "plugin",
+				plugin: "dsh-evolution-review",
+				form: "notice",
+				summary
+			}
+		});
+		const followup = agent.followup;
+		if (config.reviewWakeInject && typeof followup === "function") {
+			followup(message);
+			skipNextCadenceFire.set(agent.session.id, true);
+		} else agent.inject(message);
+	};
 	async function trySubagentReview(session, agent, kind, signal) {
 		if ((policy()?.reviewMode ?? config.reviewMode) === "inject") return false;
 		const subagents = ctx.get("subagents");
@@ -281,18 +294,7 @@ function apply(ctx, rawConfig) {
 					const applied = actions.join(" · ");
 					const note = executed.ok ? "" : "\n部分操作失败。以下操作已应用，请勿重复执行。";
 					try {
-						agent.inject(createUserMessage({
-							content: [{
-								type: "text",
-								text: `💾 Self-improvement review: ${applied}${note}`
-							}],
-							source: {
-								kind: "plugin",
-								plugin: "dsh-evolution-review",
-								form: "notice",
-								summary: "self-improvement review"
-							}
-						}));
+						deliverMessage(agent, `💾 Self-improvement review: ${applied}${note}`, "self-improvement review");
 					} catch (injectError) {
 						ctx.logger.warn(`dsh-evolution-review: result notice inject failed: ${injectError instanceof Error ? injectError.message : String(injectError)}`);
 					}
@@ -305,18 +307,7 @@ function apply(ctx, rawConfig) {
 					if (reasons.length === 0) reasons.push("the review plan contained nothing executable");
 					let text = `💾 Self-improvement review: 0 ops landed. ${reasons.join(" ")}`;
 					if (text.length > 500) text = `${text.slice(0, 497)}…`;
-					agent.inject(createUserMessage({
-						content: [{
-							type: "text",
-							text
-						}],
-						source: {
-							kind: "plugin",
-							plugin: "dsh-evolution-review",
-							form: "notice",
-							summary: "self-improvement review"
-						}
-					}));
+					deliverMessage(agent, text, "self-improvement review");
 				} catch (injectError) {
 					ctx.logger.warn(`dsh-evolution-review: zero-landing notice inject failed: ${injectError instanceof Error ? injectError.message : String(injectError)}`);
 				}

package/package.json

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