@lmzhen/dsh-evolution-review 0.30.27 → 0.30.29

package/lib/index.js

@@ -1,9 +1,8 @@
-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, advanceReview, assertSkillsRootAliasRetired, authorityFrom, clampOnce, classifySessionEvent, clearReviewChannel, contentHash, createSubagentChannel, ensureSkillFrontmatter, evolutionIoAdapter, filterUnreadSkillOps, filterUnreadSkillOps as filterUnreadSkillOps$1, foldUntrustedLines, isPresent, isUnknown, liveBool, markReviewChannel, newSkillLibrary, paramRowId, payloadText, pickWithPolicy, policyStageLimits, readDispatchSignal, redactSecrets, resolveOrigins, resolveRootConfig, reviewPrompt, sessionAudited, sessionEvidenceIndex, sessionReadNames, sessionTurnSignals, sweepReviewChannelSessions, unwrapLive, userSetKeys, verifyPromptBundle } from "@lmzhen/dsh-evolution-core";
-import { createHash, randomUUID } from "node:crypto";
 import z from "@deepseek-ai/schemastery";
+import { randomUUID } from "node:crypto";
 import { createUserMessage } from "@deepseek-ai/dsh-llm";
-import { SessionId } from "@deepseek-ai/dsh-session";
-import { planContractPrompt, validateEvolutionPlan } from "@lmzhen/dsh-evolution-plan-validator";
+import { SessionId, SessionLogOffset } from "@deepseek-ai/dsh-session";
+import { COMPLETION_SKILL_REVIEW_PROMPT, DEFAULT_REVIEW_MEMORY_INTERVAL, DEFAULT_REVIEW_SKILL_INTERVAL, DEFAULT_REVIEW_TIMEOUT_MS, DEFAULT_SKILL_REVIEW_COMPLETION_MIN_TOOL_CALLS, DEFAULT_SKILL_REVIEW_TRIGGER, DEFAULT_SUBSTANTIVE_MIN_AGENT_CHARS, DEFAULT_SUBSTANTIVE_MIN_TOOL_CALLS, DEFAULT_SUBSTANTIVE_MIN_USER_CHARS, MAX_TIMER_DELAY_MS, PROMPT_BUNDLE, advanceReview, assertSkillsRootAliasRetired, clampOnce, classifySessionEvent, clearReviewChannel, filterUnreadSkillOps, liveBool, markReviewChannel, paramRowId, pickWithPolicy, readDispatchSignal, reviewPrompt, sessionAudited, sessionTurnSignals, sweepReviewChannelSessions, unwrapLive, userSetKeys, verifyPromptBundle } from "@lmzhen/dsh-evolution-core";
 /**
 * Whether a message is a notice this plugin delivered, judged only by durable source fields.
 *
@@ -149,17 +148,12 @@ function noticeAllowed(reviewPrompt, notice) {
 }
 const Config = z.object({
 	reviewEnabled: z.boolean().default(true).volatile(),
-	reviewMode: z.union([z.const("subagent"), z.const("inject")]).default("inject").volatile(),
+	reviewMode: z.union([z.const("inject"), z.const("branch")]).default("inject").volatile(),
 	reviewMemoryInterval: z.number().min(1).volatile(),
 	reviewSkillInterval: z.number().min(1).volatile(),
 	memoryInterval: z.number().min(1).default(DEFAULT_REVIEW_MEMORY_INTERVAL),
 	skillInterval: z.number().min(1).default(DEFAULT_REVIEW_SKILL_INTERVAL),
-	reviewToolAllow: z.array(z.string()).default(["skill"]),
 	reviewTimeoutMs: z.number().min(1).max(MAX_TIMER_DELAY_MS).default(DEFAULT_REVIEW_TIMEOUT_MS),
-	reviewContextMessages: z.number().min(1).default(DEFAULT_REVIEW_CONTEXT_MESSAGES),
-	reviewMessageChars: z.number().min(1).default(DEFAULT_REVIEW_MESSAGE_CHARS),
-	reviewMaxDepth: z.number().min(1).default(1),
-	reviewProvider: z.string(),
 	skillReviewTrigger: z.union([
 		z.const("cadence"),
 		z.const("completion"),
@@ -172,24 +166,6 @@ const Config = z.object({
 	root: z.string().default(""),
 	skillsRoot: z.string().default("")
 });
-/** V8-01 (0.3.45): the review subagent's structured-output contract. The
-* `subagents.start` outputSchema is RAW JSON Schema validated by
-* assertObjectJsonSchema (upstream dsh-tools json-schema.ts — SCHEMA_TYPES
-* has no 'json'; 'json' is a defineTool-author DSL-only value). The arrays
-* deliberately use `{ type: 'array' }` with NO items node — absent items
-* accepts any JSON item (upstream semantics, json-schema.ts "Item schema
-* (type: 'array' only); absent accepts any JSON item"), and plan-validator
-* owns the per-op structure proof. The whitelist contract test (review.spec
-* V8-01) forbids a DSL value slipping back in. */
-const REVIEW_OUTPUT_SCHEMA = {
-	type: "object",
-	additionalProperties: false,
-	properties: {
-		memoryOps: { type: "array" },
-		skillOps: { type: "array" },
-		summary: { type: "string" }
-	}
-};
 /**
 * v43 audit (P1-4 / FLOW1): the cadence summary MUST name the review kind — it
 * is what tells the three cadence deliveries apart (their prompts differ by
@@ -211,15 +187,7 @@ function clampReviewConfig(rawConfig, ctx) {
 		ctx.logger.warn("dsh-evolution-review: " + message);
 	};
 	const field = (name, value, fallback, min, max) => clampOnce(warned, warn, name, value, fallback, min, max);
-	return Object.assign({}, rawConfig, {
-		reviewTimeoutMs: field("reviewTimeoutMs", rawConfig.reviewTimeoutMs, DEFAULT_REVIEW_TIMEOUT_MS, 1, MAX_TIMER_DELAY_MS),
-		reviewContextMessages: field("reviewContextMessages", rawConfig.reviewContextMessages, DEFAULT_REVIEW_CONTEXT_MESSAGES, 1),
-		reviewMessageChars: field("reviewMessageChars", rawConfig.reviewMessageChars, DEFAULT_REVIEW_MESSAGE_CHARS, 1),
-		reviewMaxDepth: field("reviewMaxDepth", rawConfig.reviewMaxDepth, 1, 1)
-	});
-}
-function policySnapshotOf(source) {
-	return source?.get?.();
+	return Object.assign({}, rawConfig, { reviewTimeoutMs: field("reviewTimeoutMs", rawConfig.reviewTimeoutMs, DEFAULT_REVIEW_TIMEOUT_MS, 1, MAX_TIMER_DELAY_MS) });
 }
 /**
 * This row's review knobs as they stand RIGHT NOW (G1 §8.3) — the base layer of the
@@ -253,9 +221,7 @@ 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);
-	const reviewChannel = createSubagentChannel(ctx);
 	assertSkillsRootAliasRetired(rawConfig);
-	const rootConfig = resolveRootConfig(rawConfig);
 	const sessionState = new SessionScopedState();
 	const dispatchDigest = sessionState.add("dispatchDigest", /* @__PURE__ */ new Map());
 	let statelessReviewStateWarned = false;
@@ -267,9 +233,10 @@ function apply(ctx, rawConfig = {}) {
 	const pendingCadenceWarned = sessionState.add("pendingCadenceWarned", /* @__PURE__ */ new Set());
 	const pendingReviewNotices = sessionState.add("pendingReviewNotices", /* @__PURE__ */ new Map());
 	const cadenceResetWarned = sessionState.add("cadenceResetWarned", /* @__PURE__ */ new Set());
-	let reviewInFlight = false;
-	/** W5 G3-S3: capability-missing is warned once per plugin instance (the error signal is per trigger). */
-	let channelUnavailableWarned = false;
+	/** Branch mode runs at most one branch per parent session; a second trigger only sets rerun. */
+	const branchRunning = sessionState.add("branchRunning", /* @__PURE__ */ new Map());
+	/** Child Sessions this plugin owns; their turn/end must not start another review. */
+	const branchSessions = sessionState.add("branchSessions", /* @__PURE__ */ new Set());
 	const policy = () => ctx.get("evolutionPolicy")?.get();
 	/**
 	* This row's knobs as they stand right now (G1 §8.3): the live fields are resolved
@@ -435,6 +402,8 @@ function apply(ctx, rawConfig = {}) {
 	async function runOnTurnEnd(session, event) {
 		if (!params().reviewEnabled) return;
 		if (session.header.origin === "subagent") return;
+		if (branchSessions.has(session.id)) return;
+		if (session.header.visibility === "background") return;
 		const agent = ctx.agents.get(session.id);
 		if (!agent) return;
 		const signal = sessionTurnSignals(ctx, session);
@@ -480,7 +449,8 @@ function apply(ctx, rawConfig = {}) {
 			const pendingKind = kind ?? pendingCadenceReviews.get(session.id) ?? void 0;
 			if (pendingKind !== void 0) {
 				pendingCadenceReviews.delete(session.id);
-				if (params().reviewMode === "inject") {
+				if (params().reviewMode === "branch" && await tryBranchReview(session, agent, pendingKind, signal, "cadence")) return;
+				if (params().reviewMode === "inject" || params().reviewMode === "branch") {
 					if (!deliverMessage(agent, reviewPrompt(pendingKind), cadenceSummary(pendingKind), true)) {
 						pendingCadenceReviews.set(session.id, pendingKind);
 						return;
@@ -493,35 +463,6 @@ function apply(ctx, rawConfig = {}) {
 						assistantChars: signal.assistantChars,
 						channel: "inject"
 					});
-				} else {
-					const reviewOutcome = await trySubagentReview(session, agent, pendingKind, signal);
-					if (reviewOutcome === true) {
-						emitReviewScheduled(ctx, {
-							sessionId: session.id,
-							kind: pendingKind,
-							toolCalls: signal.toolCalls,
-							userChars: signal.userChars,
-							assistantChars: signal.assistantChars,
-							channel: "subagent"
-						});
-						await settleNotice(session.id, "subagent-flush");
-					} else if (reviewOutcome === "dropped") {
-						pendingCadenceReviews.set(session.id, pendingKind);
-						return;
-					} else if (reviewOutcome !== "deferred") {
-						if (!deliverMessage(agent, reviewPrompt(pendingKind), cadenceSummary(pendingKind), true)) {
-							pendingCadenceReviews.set(session.id, pendingKind);
-							return;
-						}
-						emitReviewScheduled(ctx, {
-							sessionId: session.id,
-							kind: pendingKind,
-							toolCalls: signal.toolCalls,
-							userChars: signal.userChars,
-							assistantChars: signal.assistantChars,
-							channel: "inject"
-						});
-					}
 				}
 				return;
 			}
@@ -540,22 +481,7 @@ function apply(ctx, rawConfig = {}) {
 		if (completionInjected.has(session.id)) return;
 		if (!shouldCompletionReview(event.data.reason, cumulative, params().skillReviewCompletionMinToolCalls)) return;
 		completionInjected.add(session.id);
-		if (reviewInFlight) {
-			if (deferredFallbackReviews.length < DEFERRED_REVIEW_CAP) deferredFallbackReviews.push({
-				agent,
-				sessionId: session.id,
-				kind: "skill",
-				prompt: COMPLETION_SKILL_REVIEW_PROMPT,
-				label: "completion review",
-				channel: "completion",
-				counts: signal
-			});
-			else {
-				completionInjected.delete(session.id);
-				ctx.logger.warn(`dsh-evolution-review: deferred-review queue at cap (${DEFERRED_REVIEW_CAP}) — dropped one deferred completion review prompt; the completion gate re-arms for the next completed turn`);
-			}
-			return;
-		}
+		if (params().reviewMode === "branch" && await tryBranchReview(session, agent, "skill", signal, "completion")) return;
 		if (!deliverMessage(agent, COMPLETION_SKILL_REVIEW_PROMPT, "completion review", true)) {
 			completionInjected.delete(session.id);
 			return;
@@ -679,527 +605,142 @@ function apply(ctx, rawConfig = {}) {
 			return false;
 		}
 	};
-	/**
-	* T3-09/A37: the ONE abort channel for this fiber's long work.
-	*
-	* The review's two legs (the review subagent, and the write leg that executes its plan) were
-	* bounded only by their own timeouts, so an unloaded or HMR-replaced fiber kept running — and the
-	* write leg kept WRITING — while the replacement instance knew nothing about it (its single-flight
-	* flag and min-idle window do not cover a run that no longer belongs to any live fiber). The
-	* disposer below aborts this controller; the subagent leg merges it with its own deadline through
-	* `AbortSignal.any` (the shape evolution-maintenance's scan already uses) and the write leg checks
-	* it at every op boundary — before the first op, so an aborted fiber lands nothing.
-	*/
-	const fiberAbort = new AbortController();
-	const withTimeout = (promise, ms, label) => new Promise((resolve, reject) => {
+	const BRANCH_MEMORY_PROMPT = "[Auto-review — Memory] Review the conversation above and save durable user preferences, corrections, or stable facts with the memory tool when appropriate. Do not create skills here. Return a short summary of what was saved, or say Nothing to save.";
+	async function tryBranchReview(session, agent, kind, signal, reason) {
+		const state = branchRunning.get(session.id);
+		if (state !== void 0) {
+			state.rerun = kind;
+			return true;
+		}
+		const branchState = {};
+		branchRunning.set(session.id, branchState);
+		const childId = SessionId("session-" + randomUUID());
+		const startedAt = Date.now();
+		const controller = new AbortController();
+		let timedOut = false;
 		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");
-	/** 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 = newSkillLibrary({
-			authority: authorityFrom({ origin: "foreground" }),
-			config: rootConfig,
-			io: evolutionIoAdapter(() => io.provider())
-		});
-		for (const summary of await library.list({ withContent: true }).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 [];
-		})) if (summary.content !== void 0) hashes.set(summary.name, contentHash(summary.content));
-		return hashes;
-	}
-	async function trySubagentReview(session, agent, kind, signal) {
-		if (params().reviewMode === "inject") return false;
-		const channelState = reviewChannel.state;
-		if (channelState.kind !== "available") {
-			if (!channelUnavailableWarned) {
-				channelUnavailableWarned = true;
-				ctx.logger.warn("dsh-evolution-review: subagent channel unavailable (" + channelState.code + ": " + channelState.reason + ") — reviews fall back to the inject path until the capability returns");
-			}
-			try {
-				ctx.emit("evolution/review-error", { sessionId: session.id });
-			} catch (emitError) {
-				ctx.logger.warn("dsh-evolution-review: review-error emit failed: " + (emitError instanceof Error ? emitError.message : String(emitError)));
+			timedOut = true;
+			controller.abort();
+		}, rawConfig.reviewTimeoutMs ?? DEFAULT_REVIEW_TIMEOUT_MS);
+		let handle;
+		try {
+			const presets = ctx.get("agentPresets");
+			let agentPreset;
+			let setup;
+			if (presets !== void 0) {
+				const resolved = await presets.resolve(session.header.agentPreset);
+				agentPreset = resolved.id;
+				setup = async (target, _child) => {
+					await presets.mount(target, resolved.id);
+				};
 			}
+			const seed = await ctx.get("sessionQuery")?.readEvents?.(session.id);
+			if (seed === void 0) throw new Error("session-query readEvents is unavailable");
+			const current = ctx.get("agentDefaultModel")?.currentSelection?.();
+			handle = await ctx.agents.create({
+				sessionId: childId,
+				parentAgent: agent,
+				seed,
+				inheritedEventCount: SessionLogOffset(seed.length),
+				meta: {
+					parentSession: session.id,
+					isSeeded: true,
+					...agentPreset === void 0 ? {} : { agentPreset }
+				},
+				...current === void 0 ? {} : { agentOptions: {
+					provider: current.provider,
+					model: current.model
+				} },
+				...setup === void 0 ? {} : { setup }
+			});
+		} catch (error) {
+			clearTimeout(timer);
+			branchRunning.delete(session.id);
+			ctx.logger.warn("dsh-evolution-review: branch Session did not start: " + (error instanceof Error ? error.message : String(error)));
 			return false;
 		}
-		if (reviewInFlight) {
-			const existing = deferredFallbackReviews.findIndex((entry) => entry.sessionId === session.id && entry.kind === kind);
-			if (existing >= 0 || deferredFallbackReviews.length < DEFERRED_REVIEW_CAP) {
-				const entry = {
-					agent,
-					sessionId: session.id,
-					kind,
-					prompt: reviewPrompt(kind),
-					label: cadenceSummary(kind),
-					channel: "inject",
-					counts: signal
+		branchSessions.add(childId);
+		const collected = {
+			finalText: "",
+			actions: [],
+			usage: void 0,
+			error: void 0
+		};
+		const onEvent = (owner, event) => {
+			if (owner.id !== childId) return;
+			if (event.type === "assistant/message") {
+				const text = event.data.message.content.filter((block) => block.type === "text").map((block) => block.text).join("");
+				if (text !== "") collected.finalText = text;
+				if (event.data.usage !== void 0) collected.usage = {
+					inputTokens: event.data.usage.inputTokens ?? 0,
+					outputTokens: event.data.usage.outputTokens ?? 0,
+					cacheReadTokens: event.data.usage.cacheReadTokens ?? 0,
+					cacheWriteTokens: event.data.usage.cacheWriteTokens ?? 0
 				};
-				if (existing >= 0) deferredFallbackReviews[existing] = entry;
-				else deferredFallbackReviews.push(entry);
-				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 ?? DEFAULT_MEMORY_REVIEW_MODEL : snapshot?.skillReviewModel ?? DEFAULT_SKILL_REVIEW_MODEL;
-			const reviewText = redactSecrets(buildReviewRequest(session, kind, signal, config.reviewContextMessages, config.reviewMessageChars, dispatchDigest.get(session.id) ?? []));
-			const agentOptions = { model };
-			if (config.reviewProvider) agentOptions.provider = config.reviewProvider;
-			const requestedReviewTools = config.reviewToolAllow ?? [];
-			const preRunHashes = await treeSkillHashes();
-			const sessionSeqAtPlanTime = session.seq - 1;
-			const substantiveEvidenceSeqs = sessionEvidenceIndex(ctx, session);
-			const outcome = await reviewChannel.run({
-				parent: agent,
-				label: "dsh-evolution-review",
-				promptText: reviewText + "\n\n" + reviewPrompt(kind, "plan"),
-				kind: "reviewer",
-				allow: requestedReviewTools,
-				outputSchema: REVIEW_OUTPUT_SCHEMA,
-				maxDepth: config.reviewMaxDepth,
-				agentOptions,
-				timeoutMs: config.reviewTimeoutMs,
-				signal: fiberAbort.signal,
-				afterResult: (child) => {
-					const childSession = child.session;
-					return childSession === void 0 ? /* @__PURE__ */ new Set() : new Set(sessionReadNames(ctx, childSession) ?? []);
-				}
-			});
-			if (outcome.kind === "aborted") {
-				try {
-					ctx.emit("evolution/review-error", { sessionId: session.id });
-				} catch (emitError) {
-					ctx.logger.warn("dsh-evolution-review: review-error emit failed: " + (emitError instanceof Error ? emitError.message : String(emitError)));
-				}
-				return false;
-			}
-			if (outcome.kind === "unavailable") {
-				if (!channelUnavailableWarned) {
-					channelUnavailableWarned = true;
-					ctx.logger.warn("dsh-evolution-review: subagent channel unavailable (" + outcome.code + ": " + outcome.reason + ") — reviews fall back to the inject path until the capability returns");
-				}
-				try {
-					ctx.emit("evolution/review-error", { sessionId: session.id });
-				} catch (emitError) {
-					ctx.logger.warn("dsh-evolution-review: review-error emit failed: " + (emitError instanceof Error ? emitError.message : String(emitError)));
-				}
-				return false;
-			}
-			if (outcome.kind === "no-structured") {
-				try {
-					ctx.emit("evolution/review-error", { sessionId: session.id });
-				} catch (emitError) {
-					ctx.logger.warn("dsh-evolution-review: review-error emit failed: " + (emitError instanceof Error ? emitError.message : String(emitError)));
-				}
-				const stopDetail = typeof outcome.stopReason === "string" ? outcome.stopReason : void 0;
-				const diagDetail = typeof outcome.diagnostic === "string" ? outcome.diagnostic : void 0;
-				ctx.logger.warn("dsh-evolution-review: review subagent returned no structured plan" + (stopDetail !== void 0 ? " (stopReason=" + stopDetail + (diagDetail !== void 0 ? "; " + diagDetail : "") + ")" : ""));
-				return false;
 			}
-			const childReads = outcome.evidence ?? /* @__PURE__ */ new Set();
-			const plan = outcome.structured;
-			const policyFingerprint = fingerprintPolicy(snapshot);
-			const validation = validateEvolutionPlan(plan, {
-				sessionSeq: sessionSeqAtPlanTime,
-				substantiveEvidenceSeqs,
-				maxOpsPerPlan: snapshot?.maxOpsPerPlan ?? DEFAULT_MAX_OPS_PER_PLAN,
-				protectedSkillNames: new Set(snapshot?.protectedSkillNames ?? []),
-				maxMemoryChars: snapshot?.memoryChars ?? DEFAULT_MEMORY_CHAR_LIMIT,
-				maxUserChars: snapshot?.userChars ?? DEFAULT_USER_CHAR_LIMIT,
-				maxSkillContentChars: snapshot?.skillContentChars ?? DEFAULT_SKILL_CONTENT_CHARS
-			});
-			if (validation.reports.length > 0) ctx.logger.warn(`dsh-evolution-review: ${validation.reports.length} op(s) cite only bookkeeping frames as evidence: ${validation.reports.map((report) => report.reason).join("; ")}`);
-			const acceptedSkillOps = validation.accepted.skillOps ?? [];
-			const skippedUnread = filterUnreadSkillOps$1(acceptedSkillOps, new Set([...sessionReadNames(ctx, session) ?? /* @__PURE__ */ new Set(), ...childReads]));
-			const evidenceQuotes = [...validation.accepted.memoryOps ?? [], ...acceptedSkillOps].reduce((total, op) => total + (Array.isArray(op.evidence) ? op.evidence.length : 0), 0);
-			const emitApplied = (report) => {
+		};
+		const offEvent = ctx.on("session/event", onEvent);
+		emitReviewScheduled(ctx, {
+			sessionId: session.id,
+			kind,
+			toolCalls: signal.toolCalls,
+			userChars: signal.userChars,
+			assistantChars: signal.assistantChars,
+			channel: "branch"
+		});
+		(async () => {
+			try {
+				const prompt = kind === "memory" ? BRANCH_MEMORY_PROMPT : COMPLETION_SKILL_REVIEW_PROMPT;
+				handle.agent.followup(createUserMessage({
+					content: [{
+						type: "text",
+						text: prompt
+					}],
+					source: { kind: "user" }
+				}));
+				await handle.agent.whenIdle();
+				offEvent();
+				if (collected.finalText.trim() !== "") deliverMessage(agent, collected.finalText, "branch review result", false);
 				try {
-					ctx.emit("evolution/plan-applied", {
+					ctx.emit("evolution/review-completed", {
+						version: 1,
+						reviewId: childId,
 						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 } : {},
-						...validation.reports.length > 0 ? { evidenceClassReports: validation.reports.length } : {},
-						executionFailures: report.failedOps?.length ?? 0,
-						...report.executionError !== void 0 ? { executionError: report.executionError } : {},
-						evidenceQuotes,
-						estimatedInputChars: reviewText.length
+						branchSessionId: childId,
+						kind,
+						status: collected.error !== void 0 ? "failed" : timedOut ? "timeout" : controller.signal.aborted ? "aborted" : "completed",
+						trigger: {
+							reason,
+							toolCalls: signal.toolCalls,
+							userChars: signal.userChars,
+							assistantChars: signal.assistantChars
+						},
+						finalText: collected.finalText,
+						actions: collected.actions,
+						...collected.usage === void 0 ? {} : { usage: collected.usage },
+						startedAt,
+						finishedAt: Date.now(),
+						...collected.error === void 0 ? {} : { error: collected.error }
 					});
 				} catch (emitError) {
-					ctx.logger.warn(`dsh-evolution-review: plan-applied emit failed: ${emitError instanceof Error ? emitError.message : String(emitError)}`);
+					ctx.logger.warn("dsh-evolution-review: review-completed emit failed: " + (emitError instanceof Error ? emitError.message : String(emitError)));
 				}
-			};
-			const landed = [];
-			let deadlineMissed = false;
-			const lateLandings = [];
-			const noteLanded = (action) => {
-				landed.push(action);
-				if (!deadlineMissed) return;
-				lateLandings.push(action);
-				const before = landed.length - lateLandings.length;
-				const earlier = before > 0 ? ` (${before} other op(s) had landed before the deadline)` : "";
-				deliverMessage(agent, `\u{1F4BE} Self-improvement review: ${action} ${lateLandings.length === 1 ? "landed AFTER the review timed out" : `landed after the timeout (${lateLandings.length} late so far)`}${earlier} \u2014 reconcile before re-requesting the same change.`, "self-improvement review late landing");
-			};
-			let executed;
-			try {
-				executed = await withTimeout(executePlan(validation.accepted, session, noteLanded, preRunHashes, fiberAbort.signal), config.reviewTimeoutMs, "review plan execution");
 			} catch (error) {
-				deadlineMissed = true;
-				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 failedNote = executed.failedOps.length > 0 ? ` 失败 ${executed.failedOps.length} 个：${executed.failedOps.join("；")}。` : "";
-				deliverMessage(agent, `💾 Self-improvement review: ${applied}${executed.ok ? "" : `\n部分操作失败。${failedNote}以上操作已应用，请勿重复执行。`}`, "self-improvement review");
-			} else {
-				const reasons = [];
-				if (validation.rejected.length > 0) reasons.push(`${validation.rejected.length} op(s) rejected by validation`);
-				if (skippedUnread > 0) reasons.push(`${skippedUnread} op(s) skipped (skill not read this session)`);
-				if (executed.failedOps.length > 0) reasons.push(`${executed.failedOps.length} op(s) failed at execution: ${executed.failedOps.join("; ")}`);
-				if (executed.aborted !== void 0) reasons.push(`execution aborted: ${executed.aborted}`);
-				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)}…`;
-				deliverMessage(agent, text, "self-improvement review");
-			}
-			emitApplied({
-				actions,
-				failedOps: executed.failedOps,
-				...executed.aborted !== void 0 ? { executionError: executed.aborted } : executed.failedOps[0] !== void 0 ? { executionError: executed.failedOps[0] } : {}
-			});
-			return true;
-		} catch (error) {
-			ctx.logger.warn(`dsh-evolution-review: subagent review failed: ${error instanceof Error ? error.message : String(error)}`);
-			return false;
-		} finally {
-			reviewInFlight = false;
-			const deferred = deferredFallbackReviews.splice(0);
-			for (const { agent: waitingAgent, sessionId: entrySession, kind: waitingKind, prompt, label, channel, counts: entryCounts } of deferred) {
-				if (!deliverMessage(waitingAgent, prompt, label, true)) {
-					if (channel === "completion") completionInjected.delete(entrySession);
-					else pendingCadenceReviews.set(entrySession, waitingKind);
-					continue;
-				}
-				emitReviewScheduled(ctx, {
-					sessionId: entrySession,
-					kind: waitingKind,
-					toolCalls: entryCounts.toolCalls,
-					userChars: entryCounts.userChars,
-					assistantChars: entryCounts.assistantChars,
-					channel
-				});
+				offEvent();
+				collected.error = error instanceof Error ? error.message : String(error);
+				ctx.logger.warn("dsh-evolution-review: branch review failed: " + collected.error);
+			} finally {
+				clearTimeout(timer);
+				branchSessions.delete(childId);
+				await handle.dispose().catch(() => {});
+				const rerun = branchState.rerun;
+				branchRunning.delete(session.id);
+				if (rerun !== void 0) tryBranchReview(session, agent, rerun, signal, reason);
 			}
-		}
-	}
-	async function executePlan(plan, session, onLanded, preRunHashes, signal) {
-		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 newSkillLibrary({
-				authority: authorityFrom({ origin: "foreground" }),
-				config: rootConfig,
-				io: evolutionIoAdapter(() => io.provider())
-			});
 		})();
-		const origins = resolveOrigins(void 0, true);
-		const actions = [];
-		const failedOps = [];
-		let ok = true;
-		try {
-			for (const op of plan.memoryOps ?? []) {
-				if (ctx.fiber.uid === null || signal?.aborted === true) {
-					const reason = "the review was unloaded mid-plan";
-					ctx.logger.warn(`dsh-evolution-review: executePlan stopped at an op boundary after ${actions.length} op(s): ${reason}`);
-					return {
-						actions,
-						ok: false,
-						failedOps,
-						aborted: reason
-					};
-				}
-				if (!Array.isArray(op.evidence) || op.evidence.length === 0) {
-					ok = false;
-					failedOps.push(`memory ${op.action ?? "add"} ${op.target}: missing evidence (defense-in-depth rejection)`);
-					continue;
-				}
-				const normalized = {
-					target: op.target === "user" ? "user" : "memory",
-					action: op.action ?? "add",
-					facts: payloadText(op),
-					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");
-					onLanded?.("Memory updated");
-				} else {
-					ok = false;
-					failedOps.push(`memory ${normalized.action} ${normalized.target}: ${result?.message ?? "service unavailable"}`);
-				}
-			}
-			for (const op of plan.skillOps ?? []) {
-				if (ctx.fiber.uid === null || signal?.aborted === true) {
-					const reason = "the review was unloaded mid-plan";
-					ctx.logger.warn(`dsh-evolution-review: executePlan stopped at an op boundary after ${actions.length} op(s): ${reason}`);
-					return {
-						actions,
-						ok: false,
-						failedOps,
-						aborted: reason
-					};
-				}
-				if (!Array.isArray(op.evidence) || op.evidence.length === 0 || !op.name) {
-					ok = false;
-					failedOps.push(`skill ${op.action ?? "patch"} ${op.name ?? "<unnamed>"}: missing evidence or name (defense-in-depth rejection)`);
-					continue;
-				}
-				const args = {
-					...op,
-					evidence: op.evidence
-				};
-				if ((args.action === "create" || args.action === "edit" || args.action === "update") && typeof args.content === "string" && typeof args.name === "string") {
-					const repaired = ensureSkillFrontmatter(args.content, args.name, args.description);
-					if (repaired.repaired) {
-						args.content = repaired.content;
-						ctx.logger.warn(`dsh-evolution-review: synthesized missing SKILL.md frontmatter for ${args.name}`);
-					}
-				}
-				let stagedBytes;
-				if ((args.action === "update" || args.action === "edit") && hashLibrary && typeof args.name === "string" && args.name !== "") {
-					const probe = await hashLibrary.readSkillProbe(args.name);
-					if (isUnknown(probe)) {
-						ok = false;
-						failedOps.push(`skill ${args.action} ${args.name}: target is unreadable (${probe.reason}); refusing to stage an unverifiable anchor`);
-						continue;
-					}
-					stagedBytes = isPresent(probe) ? probe.value : null;
-				}
-				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 supportProbe = await hashLibrary.readSupportFileProbe(args.name, args.file_path);
-					if (isUnknown(supportProbe)) {
-						ok = false;
-						failedOps.push(`file ${args.action} ${args.name}/${args.file_path}: target is unreadable (${supportProbe.reason}); refusing to stage an unverifiable anchor`);
-						continue;
-					}
-					const stageFile = isPresent(supportProbe) ? supportProbe.value : null;
-					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" || args.action === "patch") && opName !== "" && preRunHashes?.has(opName) === true;
-				const anchored = hashChecked && typeof stagedBytes === "string" ? stagedBytes : null;
-				let gateVerifiedBytes = null;
-				if (hashChecked) {
-					const live = anchored !== null ? anchored : await (async () => {
-						if (hashLibrary === null) return null;
-						const probed = await hashLibrary.readSkillProbe(opName);
-						return isPresent(probed) ? probed.value : 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 — ${args.action === "patch" ? "patch" : "update"} refused as stale; produce a fresh plan`);
-						continue;
-					}
-					if (anchored === null) gateVerifiedBytes = live;
-				}
-				const anchorBytes = anchored ?? gateVerifiedBytes ?? stagedBytes;
-				if ((args.action === "update" || args.action === "edit") && anchorBytes !== void 0) args.staged_from_sha256 = anchorBytes === null ? "absent" : contentHash(anchorBytes);
-				const runnerArgs = {
-					operation: args,
-					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"}`);
-					onLanded?.(`Skill ${op.name} ${op.action ?? "patch"}`);
-					if (hashChecked) {
-						const landedProbe = hashLibrary === null ? void 0 : await hashLibrary.readSkillProbe(opName);
-						const landed = landedProbe !== void 0 && isPresent(landedProbe) ? landedProbe.value : null;
-						if (landed !== null) preRunHashes.set(opName, contentHash(landed));
-					}
-				} else {
-					ok = false;
-					failedOps.push(`skill ${op.action ?? "patch"} ${op.name}: ${result?.message ?? "service unavailable"}`);
-				}
-			}
-			if (failedOps.length > 0) ctx.logger.warn(`dsh-evolution-review: executePlan ${actions.length === 0 ? "no op landed" : `${actions.length} op(s) landed, ${failedOps.length} failed`}: ${failedOps.join("; ")}`);
-			return {
-				actions,
-				ok,
-				failedOps
-			};
-		} catch (error) {
-			const reason = error instanceof Error ? error.message : String(error);
-			ctx.logger.warn(`dsh-evolution-review: executePlan aborted mid-way after ${actions.length} ops landed: ${reason}`);
-			return {
-				actions,
-				ok: false,
-				failedOps,
-				aborted: reason
-			};
-		}
-		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})`);
-				return {
-					ok: false,
-					message: `已启用批准，但没有为类型「${kind}」注册回放运行器；已跳过写入（请挂载提供该能力的工具，或禁用批准）。`
-				};
-			}
-			const decision = await approval.request({
-				kind,
-				summary,
-				args: stored,
-				origin: origins.approval,
-				...sessionId ? { sessionId } : {},
-				...approvalSession ? { session: approvalSession } : {}
-			});
-			if (decision.action === "staged") return {
-				ok: false,
-				message: decision.message
-			};
-			if (approval.isEnabled === false) return await runnerDirect(kind, runnerArgs);
-			return await approval.run(kind, runnerArgs, { interface: "background_review" });
-		}
-		/** Direct execution for the approval-disabled case (parallel to executeSkillDirect). */
-		async function runnerDirect(kind, args) {
-			if (kind === "memory") {
-				const memory = ctx.get("memory");
-				const op = args;
-				if (!memory?.applyBatch) return void 0;
-				return await memory.applyBatch(op.target === "user" ? "user" : "memory", [{
-					action: op.action ?? "add",
-					facts: payloadText(op),
-					old_text: op.old_text
-				}]);
-			}
-			const wrapped = args ?? {};
-			if (!wrapped.operation) return void 0;
-			return await executeSkillDirect(wrapped.operation);
-		}
-		/**
-		* Approval-disabled path: execute the skill op through SkillLibrary with an
-		* EXPLICIT background_review origin. Going through ctx.tools.execute would
-		* make tool-skill-manage infer origin from the parent agent's header
-		* (not 'subagent'), silently escaping the .hermes-managed marker and the
-		* pinned write guard.
-		*/
-		async function executeSkillDirect(skillArgs) {
-			const io = ctx.get("evolutionIo");
-			if (!io) return {
-				ok: false,
-				message: "evolution-io 服务未挂载"
-			};
-			const policySnapshot = policySnapshotOf(ctx.get("evolutionPolicy"));
-			const library = newSkillLibrary({
-				authority: authorityFrom({ origin: resolveOrigins(void 0, true).library }),
-				config: rootConfig,
-				io: evolutionIoAdapter(() => io.provider()),
-				limits: {
-					...DEFAULT_SKILL_LIMITS,
-					...policyStageLimits(policySnapshot),
-					maxSkillContentChars: policySnapshot?.skillContentChars ?? DEFAULT_SKILL_LIMITS.maxSkillContentChars
-				},
-				ctx
-			});
-			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: `技能「${name}」受当前策略保护（protectedSkillNames）：拒绝自主写入。`
-			};
-			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") {
-				const updated = await library.update(name, op.content ?? "", origin, anchorOf(op));
-				if (updated.stale === true) return staleRefusal(updated, name, op.file_path);
-				if (updated.ok && updated.noop !== true) 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 ?? "", op.replace_all === true, origin);
-				if (patched.ok && patched.noop !== true) 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 {
-					ok: false,
-					message: "删除需要一个已存在的 absorbed_into 目标"
-				};
-				const archived = await library.archive(name, { absorbedInto: into });
-				if (archived.ok) await ctx.get("skillUsage")?.markArchived?.(name);
-				return archived;
-			}
-			if (op.action === "write_file" || op.action === "remove_file") {
-				const anchor = anchorOf(op);
-				if (op.action === "write_file") {
-					const written = await library.writeSupportFile(name, op.file_path ?? "", op.file_content ?? "", origin, anchor);
-					if (written.stale === true) return staleRefusal(written, name, op.file_path);
-					return written;
-				}
-				const removedSupport = await library.removeSupportFile(name, op.file_path ?? "", origin, anchor);
-				if (removedSupport.stale === true) return staleRefusal(removedSupport, name, op.file_path);
-				if (removedSupport.ok && removedSupport.noop !== true) 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 ?? "",
-					toFile: move.to_file ?? ""
-				}));
-				return await library.restructure(name, moves, origin);
-			}
-			return {
-				ok: false,
-				message: `未知的技能动作「${op.action ?? ""}」`
-			};
-		}
+		return true;
 	}
 	ctx.effect(() => () => {
-		fiberAbort.abort();
 		sessionState.dispose();
 	}, "dsh-evolution-review.cleanup");
 }
@@ -1222,11 +763,6 @@ function shouldCompletionReview(reason, sessionToolCalls, minToolCalls) {
 * @param op - one accepted plan op.
 * @returns the anchor, or `undefined` when the op carries none.
 */
-function anchorOf(op) {
-	const expected = op.staged_from_sha256;
-	if (typeof expected !== "string" || expected === "") return void 0;
-	return expected === "absent" ? { absent: true } : { sha256: expected };
-}
 /**
 * Translate the library's anchor refusal into this channel's staging wording.
 * The library reports WHICH drift it saw (drift / missing / unverifiable); the
@@ -1239,16 +775,6 @@ function anchorOf(op) {
 * @param filePath - the support-file path for file ops; omitted for body ops.
 * @returns the refusal to return from the direct path.
 */
-function staleRefusal(result, name, filePath) {
-	if (filePath === void 0 && result.anchor === "missing") return {
-		ok: false,
-		message: `技能「${name}」不存在。`
-	};
-	return {
-		ok: false,
-		message: filePath === void 0 ? `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.` : `Support file "${filePath}" 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.`
-	};
-}
 /** Map/set size that triggers a dead-session counter sweep (bounded, not a hard cap). */
 const COUNTER_SWEEP_THRESHOLD = 128;
 /**
@@ -1295,13 +821,6 @@ function sweepDeadSessionEntries(entries, isAlive) {
 	}
 	return removed;
 }
-function fingerprintPolicy(snapshot) {
-	try {
-		return createHash("sha256").update(JSON.stringify(snapshot)).digest("hex").slice(0, 12);
-	} catch {
-		return;
-	}
-}
 /**
 * The call one log event ANSWERS, in either platform vocabulary.
 *
@@ -1321,128 +840,5 @@ function resultCallIdOf(event) {
 	if (typeof data.subCallId === "string" && typeof data.isError === "boolean") return data.subCallId;
 	return null;
 }
-/**
-* V10-10 (P2-11) / A1 (audit P1-1): render one `[result]` evidence line from
-* a tool-result event payload. The former read (`data.output`) targeted a
-* field that does not exist on the rc.2 payload; the current contract covers
-* BOTH rc.2 result shapes:
-*   - native `tool/result`: the outcome lives in `message.content`
-*     tool-result blocks (inner text blocks joined); a failure is marked by
-*     the payload-level `error` OR a block-level `isError`;
-*   - PTC `tool/ptc-dispatch` settle: the outcome lives at the TOP level —
-*     `content` is the logged ContentBlock list and `isError` the flag; there
-*     is no `message` wrapper. (Before A1 this shape rendered an empty line,
-*     so every PTC session's evidence block starved while its plan prompt
-*     still demanded evidence.)
-* The legacy pre-rc.2 shape (neither `message` nor a PTC settle marker) is
-* tolerated as an empty payload — it never throws. `identity`, when given, is
-* the dispatched tool's name + raw arguments, prepended so a settled dispatch
-* keeps the call identity its `[call]` line would have had. Budget: 500 chars
-* per line (the 12-line cap lives in buildReviewRequest and is unchanged).
-*/
-function renderToolResultLine(data, identity, seq) {
-	const shape = data;
-	const nativeContent = shape?.message?.content;
-	const resultBlocks = Array.isArray(nativeContent) ? nativeContent.filter((block) => block.type === "tool-result") : [];
-	let output;
-	let failed;
-	if (shape?.message !== void 0) {
-		output = resultBlocks.map((block) => Array.isArray(block.content) ? block.content.map((inner) => inner.type === "text" && typeof inner.text === "string" ? inner.text : "").join(" ") : typeof block.text === "string" ? block.text : "").join(" ").trim();
-		failed = Boolean(shape.error) || resultBlocks.some((block) => block.isError === true);
-	} else if (typeof shape?.subCallId === "string" && typeof shape.isError === "boolean") {
-		output = textOfLoggedContent(shape.content);
-		failed = shape.isError;
-	} else {
-		output = "";
-		failed = false;
-	}
-	const head = identity === void 0 ? "" : `${foldUntrustedLines(identity.name, 0)} ${foldUntrustedLines(identity.argsRaw, 200)} → `;
-	const failure = failed ? " [ERROR]" : "";
-	return (seq === void 0 ? "" : "seq=" + String(seq) + " ") + "[result]" + failure + " " + head + foldUntrustedLines(output, 500);
-}
-/** Text of a PTC settle `content` payload (the logged ContentBlock list):
-* text blocks and plain strings joined, anything else skipped. */
-function textOfLoggedContent(content) {
-	if (typeof content === "string") return content.trim();
-	if (!Array.isArray(content)) return "";
-	return content.map((block) => {
-		if (typeof block === "string") return block;
-		if (block !== null && typeof block === "object") {
-			const candidate = block;
-			if (candidate.type === "text" && typeof candidate.text === "string") return candidate.text;
-		}
-		return "";
-	}).join(" ").trim();
-}
-/**
-* PLAN S4.1 (2026-09-16, audit P2-12): text of one persisted content block,
-* or `''` for any other shape. Content blocks cross the durable session-log
-* boundary, so their runtime shape is `unknown` even where the static type
-* promises `{ type, text }` — a persisted `content: [null]` (the A2-7 shape)
-* used to TypeError in buildReviewRequest and the caller's catch dropped the
-* whole subagent review leg. This mirrors evolution-core signals.ts's private
-* `textOfBlock` (same guard, same rationale); it is not imported because core
-* keeps that helper module-private, and this file's other block renderer
-* (renderToolResultLine) guards its own inner-block shapes inline.
-*/
-function textOfPersistedBlock(block) {
-	if (block === null || typeof block !== "object") return "";
-	const candidate = block;
-	return candidate.type === "text" && typeof candidate.text === "string" ? candidate.text : "";
-}
-function buildReviewRequest(session, kind, signal, maxMessages, maxMessageChars, dispatchTail = []) {
-	const messages = [];
-	const eligible = session.deriveMessages().filter((message) => message.role === "user" || message.role === "assistant").slice(-maxMessages);
-	for (const message of eligible) {
-		const text = message.content.map(textOfPersistedBlock).join(" ").trim();
-		if (text) messages.push(`${message.role.toUpperCase()}: ${foldUntrustedLines(text, maxMessageChars)}`);
-	}
-	const toolLines = [];
-	const events = dispatchTail;
-	const callIdentity = /* @__PURE__ */ new Map();
-	for (let index = events.length - 1; index >= 0; index -= 1) {
-		const event = events[index];
-		const opened = readDispatchSignal(event);
-		if (opened === null || callIdentity.has(opened.callId)) continue;
-		callIdentity.set(opened.callId, {
-			name: opened.name,
-			argsRaw: typeof opened.arguments === "string" ? opened.arguments : JSON.stringify(opened.arguments ?? {})
-		});
-	}
-	const openedCallIds = /* @__PURE__ */ new Set();
-	for (let index = events.length - 1; index >= 0 && toolLines.length < 12; index -= 1) {
-		const event = events[index];
-		const answeredCallId = resultCallIdOf(event);
-		if (answeredCallId !== null) {
-			if (openedCallIds.has(answeredCallId)) continue;
-			openedCallIds.add(answeredCallId);
-			const rawSettle = event?.data;
-			const settleData = rawSettle !== null && typeof rawSettle === "object" ? rawSettle : void 0;
-			const identity = settleData !== void 0 && typeof settleData.name === "string" && settleData.name !== "" ? {
-				name: settleData.name,
-				argsRaw: typeof settleData.arguments === "string" ? settleData.arguments : JSON.stringify(settleData.arguments ?? {})
-			} : callIdentity.get(answeredCallId);
-			toolLines.push(renderToolResultLine(event?.data, identity, event?.seq));
-			continue;
-		}
-		const opened = readDispatchSignal(event);
-		if (opened === null || openedCallIds.has(opened.callId)) continue;
-		openedCallIds.add(opened.callId);
-		const argsRaw = typeof opened.arguments === "string" ? opened.arguments : JSON.stringify(opened.arguments ?? {});
-		const seq = typeof event?.seq === "number" ? "seq=" + String(event.seq) + " " : "";
-		toolLines.push(seq + "[call] " + foldUntrustedLines(opened.name, 0) + " " + foldUntrustedLines(argsRaw, 500));
-	}
-	toolLines.reverse();
-	return [
-		`Review kind: ${kind}`,
-		`Signals: ${signal.toolCalls} tool calls, ${signal.userChars} user chars, ${signal.assistantChars} assistant chars.`,
-		`Recent tool activity (${toolLines.length}):`,
-		...toolLines,
-		"Return ONLY the structured JSON plan. Evidence is mandatory for every op.",
-		planContractPrompt(),
-		"",
-		...messages
-	].join("\n");
-}
 //#endregion
-export { Config, REVIEW_OUTPUT_SCHEMA, apply, buildReviewRequest, clampReviewConfig, filterUnreadSkillOps, inject, name, noticeAllowed, renderToolResultLine, resolveReviewRowSettings, shouldCompletionReview, sweepDeadSessionEntries };
+export { Config, apply, clampReviewConfig, filterUnreadSkillOps, inject, name, noticeAllowed, resolveReviewRowSettings, shouldCompletionReview, sweepDeadSessionEntries };

package/lib/types/index.d.ts

@@ -12,8 +12,6 @@ declare module '@deepseek-ai/dsh-llm' {
         } & ContextFormed;
     }
 }
-import type { Session } from '@deepseek-ai/dsh-session';
-import { type ReviewKind } from '@lmzhen/dsh-evolution-core';
 export { filterUnreadSkillOps } from '@lmzhen/dsh-evolution-core';
 /** S2-6 (FLOW1-1): the settle-grace margin a subagent handle gets beyond its
  * own deadline before the review abandons it. As the dispose watchdog's WHOLE
@@ -41,7 +39,7 @@ export interface Config {
      * at full price. Deployments that prefer the clean-context split switch the
      * POLICY row (`evolution-policy`): the mounted policy snapshot shadows this
      * row's value, which the plugin reports once at load (v37 P2-24). */
-    reviewMode?: Volatile<'subagent' | 'inject'>;
+    reviewMode?: Volatile<'inject' | 'branch'>;
     /** Review cadence in TOOL CALLS — the CANONICAL registry id (G1, signals.ts:
      * a turn advances by its tool-call count, minimum 1, or by 1 when the turn
      * itself carried the memory signal). Shadowed by the policy snapshot in every
@@ -57,22 +55,7 @@ export interface Config {
     /** Deprecated alias of `reviewSkillInterval` (G0/S0.3): still readable,
      * refused by writes; removal was planned for 0.7.0 and is deferred (the alias still ships — see the package README). */
     skillInterval?: number;
-    /**
-     * Tools the one-shot review subagent may use. Only actually-existing tools
-     * may be listed (the DSH tool catalog has `skill`; the `skill_search` /
-     * `skill_load` discovery pair does not exist on this platform).
-     */
-    reviewToolAllow?: string[];
     reviewTimeoutMs?: number;
-    reviewContextMessages?: number;
-    reviewMessageChars?: number;
-    /** ABSOLUTE cap of the review subagent's own delegation depth (platform
-     * resolveChildDepth: childDepth = parentDepth+1 must be <= maxDepth).
-     * 1 permits the subagent itself and denies nesting (2 > 1); 0 rejects the
-     * spawn outright (SubagentDepthError on any real run — the 0.3.1 defect). */
-    reviewMaxDepth?: number;
-    /** LLM provider for review subagents. Omit to inherit the deployment default route. */
-    reviewProvider?: string;
     /** E3/P1-8 (v11) — TRUE semantics: this flag gates ONLY the completion
      * channel. The cadence latch stays active regardless of the value (a
      * completion-gated deployment still fires at the policy cadence), so
@@ -112,17 +95,12 @@ export interface Config {
 }
 export declare const Config: z<Schemastery.ObjectS<NoInfer<{
     reviewEnabled: z<boolean, boolean, "volatile-defined">;
-    reviewMode: z<"subagent" | "inject", "subagent" | "inject", "volatile-defined">;
+    reviewMode: z<"inject" | "branch", "inject" | "branch", "volatile-defined">;
     reviewMemoryInterval: z<number, number, "volatile">;
     reviewSkillInterval: z<number, number, "volatile">;
     memoryInterval: z<number, number, "defined">;
     skillInterval: z<number, number, "defined">;
-    reviewToolAllow: z<string[], string[], "defined">;
     reviewTimeoutMs: z<number, number, "defined">;
-    reviewContextMessages: z<number, number, "defined">;
-    reviewMessageChars: z<number, number, "defined">;
-    reviewMaxDepth: z<number, number, "defined">;
-    reviewProvider: z<string, string, "plain">;
     skillReviewTrigger: z<"cadence" | "completion" | "both", "cadence" | "completion" | "both", "volatile-defined">;
     reviewWakeInject: z<boolean, boolean, "volatile-defined">;
     reviewNotice: z<boolean, boolean, "volatile-defined">;
@@ -132,17 +110,12 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
     skillsRoot: z<string, string, "defined">;
 }>>, Schemastery.ObjectT<NoInfer<{
     reviewEnabled: z<boolean, boolean, "volatile-defined">;
-    reviewMode: z<"subagent" | "inject", "subagent" | "inject", "volatile-defined">;
+    reviewMode: z<"inject" | "branch", "inject" | "branch", "volatile-defined">;
     reviewMemoryInterval: z<number, number, "volatile">;
     reviewSkillInterval: z<number, number, "volatile">;
     memoryInterval: z<number, number, "defined">;
     skillInterval: z<number, number, "defined">;
-    reviewToolAllow: z<string[], string[], "defined">;
     reviewTimeoutMs: z<number, number, "defined">;
-    reviewContextMessages: z<number, number, "defined">;
-    reviewMessageChars: z<number, number, "defined">;
-    reviewMaxDepth: z<number, number, "defined">;
-    reviewProvider: z<string, string, "plain">;
     skillReviewTrigger: z<"cadence" | "completion" | "both", "cadence" | "completion" | "both", "volatile-defined">;
     reviewWakeInject: z<boolean, boolean, "volatile-defined">;
     reviewNotice: z<boolean, boolean, "volatile-defined">;
@@ -151,30 +124,6 @@ export declare const Config: z<Schemastery.ObjectS<NoInfer<{
     root: z<string, string, "defined">;
     skillsRoot: z<string, string, "defined">;
 }>>, "plain">;
-/** V8-01 (0.3.45): the review subagent's structured-output contract. The
- * `subagents.start` outputSchema is RAW JSON Schema validated by
- * assertObjectJsonSchema (upstream dsh-tools json-schema.ts — SCHEMA_TYPES
- * has no 'json'; 'json' is a defineTool-author DSL-only value). The arrays
- * deliberately use `{ type: 'array' }` with NO items node — absent items
- * accepts any JSON item (upstream semantics, json-schema.ts "Item schema
- * (type: 'array' only); absent accepts any JSON item"), and plan-validator
- * owns the per-op structure proof. The whitelist contract test (review.spec
- * V8-01) forbids a DSL value slipping back in. */
-export declare const REVIEW_OUTPUT_SCHEMA: {
-    readonly type: "object";
-    readonly additionalProperties: false;
-    readonly properties: {
-        readonly memoryOps: {
-            readonly type: "array";
-        };
-        readonly skillOps: {
-            readonly type: "array";
-        };
-        readonly summary: {
-            readonly type: "string";
-        };
-    };
-};
 /** F5 (P2-16, v11): the clamp sets exactly these four numeric fields — the
  * old `as Required<Config>` lied about `reviewToolAllow` etc. being populated
  * (`[...undefined]` TypeErrors under a direct `apply(ctx, {})`).
@@ -182,9 +131,6 @@ export declare const REVIEW_OUTPUT_SCHEMA: {
  * {@link resolveReviewRowSettings}, which clamps its own numerics. */
 type ClampedReviewConfig = Config & {
     reviewTimeoutMs: number;
-    reviewContextMessages: number;
-    reviewMessageChars: number;
-    reviewMaxDepth: number;
 };
 /**
  * The DEPLOYMENT layer of this row, clamped once at assembly: the restart-only
@@ -213,7 +159,7 @@ export interface ReviewSettings {
     /** Master switch for the review plugin. */
     reviewEnabled: boolean;
     /** Run the review in the parent session (inject) or on a subagent. */
-    reviewMode: 'subagent' | 'inject';
+    reviewMode: 'inject' | 'branch';
     /** Deliver the deferred review as a waking follow-up message. */
     reviewWakeInject: boolean;
     /** Deliver result notices (not review prompts). */
@@ -235,13 +181,6 @@ export declare function apply(ctx: Context, rawConfig?: Config): void;
 export declare function shouldCompletionReview(reason: {
     kind?: string;
 } | undefined, sessionToolCalls: number, minToolCalls: number): boolean;
-/** One dispatch frame the review digest can render (a native call/result or a PTC sub-dispatch). */
-interface ReviewDispatchFrame {
-    readonly type: string;
-    /** Session seq of the frame, so a plan can cite a real `event_seq`. */
-    readonly seq?: number;
-    readonly data?: unknown;
-}
 /**
  * Remove every entry whose session is no longer live (rc.42 audit P1-10):
  * `cumulativeToolCalls` / `completionInjected` / `pendingCadenceReviews` are keyed by
@@ -250,32 +189,4 @@ interface ReviewDispatchFrame {
  * number of removed entries.
  */
 export declare function sweepDeadSessionEntries<K>(entries: Map<K, unknown> | Set<K>, isAlive: (id: K) => boolean): number;
-/**
- * V10-10 (P2-11) / A1 (audit P1-1): render one `[result]` evidence line from
- * a tool-result event payload. The former read (`data.output`) targeted a
- * field that does not exist on the rc.2 payload; the current contract covers
- * BOTH rc.2 result shapes:
- *   - native `tool/result`: the outcome lives in `message.content`
- *     tool-result blocks (inner text blocks joined); a failure is marked by
- *     the payload-level `error` OR a block-level `isError`;
- *   - PTC `tool/ptc-dispatch` settle: the outcome lives at the TOP level —
- *     `content` is the logged ContentBlock list and `isError` the flag; there
- *     is no `message` wrapper. (Before A1 this shape rendered an empty line,
- *     so every PTC session's evidence block starved while its plan prompt
- *     still demanded evidence.)
- * The legacy pre-rc.2 shape (neither `message` nor a PTC settle marker) is
- * tolerated as an empty payload — it never throws. `identity`, when given, is
- * the dispatched tool's name + raw arguments, prepended so a settled dispatch
- * keeps the call identity its `[call]` line would have had. Budget: 500 chars
- * per line (the 12-line cap lives in buildReviewRequest and is unchanged).
- */
-export declare function renderToolResultLine(data: unknown, identity?: {
-    name: string;
-    argsRaw: string;
-}, seq?: number): string;
-export declare function buildReviewRequest(session: Session, kind: ReviewKind, signal: {
-    toolCalls: number;
-    userChars: number;
-    assistantChars: number;
-}, maxMessages: number, maxMessageChars: number, dispatchTail?: readonly ReviewDispatchFrame[]): string;
 //# sourceMappingURL=index.d.ts.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lmzhen/dsh-evolution-review",
   "description": "Background review orchestration (community build)",
-  "version": "0.30.27",
+  "version": "0.30.29",
   "publishConfig": {
     "access": "public"
   },
@@ -27,9 +27,7 @@
   "license": "MIT",
   "dependencies": {
     "@deepseek-ai/schemastery": "^3.18.5",
-    "@lmzhen/dsh-evolution-approval": "^0.30.27",
-    "@lmzhen/dsh-evolution-core": "^0.30.27",
-    "@lmzhen/dsh-evolution-plan-validator": "^0.30.27"
+    "@lmzhen/dsh-evolution-core": "^0.30.29"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.5",
@@ -37,22 +35,17 @@
     "@deepseek-ai/dsh-llm": "^0.2.1-rc.2",
     "@deepseek-ai/dsh-session": "^0.2.1-rc.2",
     "@deepseek-ai/dsh-tools": "^0.2.1-rc.2",
-    "@lmzhen/dsh-evolution-policy": "^0.30.27",
-    "@lmzhen/dsh-evolution-state": "^0.30.27"
+    "@lmzhen/dsh-evolution-policy": "^0.30.29",
+    "@lmzhen/dsh-evolution-state": "^0.30.29"
   },
   "devDependencies": {
     "@deepseek-ai/dsh-agent": "^0.2.1-rc.2",
     "@deepseek-ai/dsh-agent-loop-testkit": "^0.2.1-rc.2",
     "@deepseek-ai/dsh-llm": "^0.2.1-rc.2",
     "@deepseek-ai/dsh-session": "^0.2.1-rc.2",
-    "@deepseek-ai/dsh-session-persistence": "^0.2.1-rc.2",
-    "@deepseek-ai/dsh-session-persistence-jsonl": "^0.2.1-rc.2",
     "@deepseek-ai/dsh-tools": "^0.2.1-rc.2",
-    "@lmzhen/dsh-evolution-approval": "^0.30.27",
-    "@lmzhen/dsh-evolution-core": "^0.30.27",
-    "@lmzhen/dsh-evolution-curator": "^0.30.27",
-    "@lmzhen/dsh-evolution-plan-validator": "^0.30.27",
-    "@lmzhen/dsh-evolution-state": "^0.30.27"
+    "@lmzhen/dsh-evolution-core": "^0.30.29",
+    "@lmzhen/dsh-evolution-state": "^0.30.29"
   },
   "engines": {
     "dsh": ">=0.2.1-rc.2 <0.2.2-0"