@linimin/pi-letscook 0.1.45 → 0.1.47

package/extensions/completion/index.ts

@@ -3,12 +3,81 @@ import * as fs from "node:fs";
 import { promises as fsp } from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import * as roleReporting from "./role-reporting.js";
 import { StringEnum } from "@mariozechner/pi-ai";
 import type { ExtensionAPI } from "@mariozechner/pi-coding-agent";
-import { DynamicBorder, parseFrontmatter } from "@mariozechner/pi-coding-agent";
-import { Container, matchesKey, type SelectItem, SelectList, Text } from "@mariozechner/pi-tui";
+import { DynamicBorder } from "@mariozechner/pi-coding-agent";
+import { Container, matchesKey, SelectList, Text } from "@mariozechner/pi-tui";
 import { Type } from "typebox";
+import {
+	autoContinueWorkflowIfNeeded,
+	completionContinuationFingerprint,
+	markQueuedDriverPromptInFlight,
+	registerCookCommand,
+} from "./driver";
+import {
+	assessMissionAnchor,
+	collectRecentDiscussionEntries,
+	deriveCookContextProposalFromRecentDiscussion,
+	finalizeContextProposalAnalysis,
+	isWeakMissionAnchor,
+	missionAnchorsLikelyEquivalent,
+	missionAnchorsStrictlyEquivalent,
+	normalizeMissionAnchorText,
+	resolveContextProposalConfirmationAction,
+	shouldTreatBareActiveWorkflowProposalAsClearRefocus,
+	stripCodeBlocks,
+} from "./proposal";
+import type {
+	ContextProposal,
+	ContextProposalAnalysis,
+	ContextProposalConfirmAction,
+	ContextProposalConfirmOptions,
+	ContextProposalConfirmationLayout,
+	ContextProposalDecision,
+} from "./proposal";
+import {
+	buildContextProposalConfirmationLayout as buildExtractedContextProposalConfirmationLayout,
+	buildContextProposalConfirmationSelectItems,
+	buildContextProposalContinuationReason as buildExtractedContextProposalContinuationReason,
+	buildEvaluationRoleContextLines as buildExtractedEvaluationRoleContextLines,
+	buildEvaluationRoleReminderText as buildExtractedEvaluationRoleReminderText,
+	buildResumeCapsule as buildExtractedResumeCapsule,
+	buildSystemReminder as buildExtractedSystemReminder,
+	maybeWriteContextProposalConfirmationSnapshot,
+	maybeWriteContextProposalSnapshot,
+} from "./prompt-surfaces";
+import { toolCallBlockReason } from "./policy-guards";
+import { analyzeContextProposalWithAgent, runCompletionRole } from "./role-runner";
+import {
+	applyLiveRoleEvent,
+	buildInlineRunningLines,
+	cloneLiveRoleActivity,
+	createLiveRoleActivity,
+	formatElapsed,
+	formatInlineRunningText,
+	nowMs,
+	refreshCompletionStatus,
+	truncateInline,
+} from "./status-surface";
+import {
+	asNumber,
+	asString,
+	asStringArray,
+	completionRootKey,
+	currentEvaluationProfile,
+	currentTaskType,
+	findCompletionRoot,
+	findRepoRoot,
+	isRecord,
+	loadCompletionDataForReminder,
+	loadCompletionSnapshot,
+	pathExists,
+	readText,
+	scaffoldCompletionFiles as scaffoldCompletionFilesOnDisk,
+} from "./state-store";
+import { parseFirstNumber, parseYesNo } from "./transcription";
+import type { TranscriptionResult } from "./transcription";
+import type { CompletionStateSnapshot, CompletionRole, JsonRecord, LiveRoleActivity } from "./types";
 
 const PROTOCOL_ID = "completion";
 const ROLE_NAMES = [
@@ -28,7 +97,6 @@ const PACKAGE_SKILL_PATH = PACKAGE_ROOT ? path.join(PACKAGE_ROOT, "skills", "com
 const PACKAGE_REFERENCE_PATH = PACKAGE_ROOT
 	? path.join(PACKAGE_ROOT, "skills", "completion-protocol", "references", "completion.md")
 	: undefined;
-const PACKAGE_AGENTS_DIR = PACKAGE_ROOT ? path.join(PACKAGE_ROOT, "agents") : undefined;
 const SKILL_PATH = PACKAGE_SKILL_PATH ?? path.join(AGENT_HOME, "skills", "completion-protocol", "SKILL.md");
 const REFERENCE_PATH = PACKAGE_REFERENCE_PATH ?? path.join(AGENT_HOME, "skills", "completion-protocol", "references", "completion.md");
 const DEFAULT_TASK_TYPE = "completion-workflow";
@@ -37,429 +105,23 @@ const RUBRIC_EVALUATION_ROLES = ["completion-reviewer", "completion-auditor", "c
 
 type RubricEvaluationRole = (typeof RUBRIC_EVALUATION_ROLES)[number];
 
-type CompletionRole = (typeof ROLE_NAMES)[number];
-type JsonRecord = Record<string, unknown>;
-
-type CompletionFiles = {
-	root: string;
-	agentDir: string;
-	tmpDir: string;
-	profilePath: string;
-	statePath: string;
-	planPath: string;
-	activePath: string;
-	sliceHistoryPath: string;
-	stopHistoryPath: string;
-	verificationEvidencePath: string;
-	compactionMarkerPath: string;
-};
-
-type CompletionStateSnapshot = {
-	files: CompletionFiles;
-	profile?: JsonRecord;
-	state?: JsonRecord;
-	plan?: JsonRecord;
-	active?: JsonRecord;
-	verificationEvidence?: JsonRecord;
-	activeSlice?: JsonRecord;
-};
-
-type AgentDefinition = {
-	name: string;
-	description?: string;
-	tools?: string[];
-	model?: string;
-	systemPrompt: string;
-	filePath: string;
-};
-
-type LiveRoleActivity = {
-	role: string;
-	status: "running" | "ok" | "error";
-	currentAction?: string;
-	toolActivity?: string;
-	toolRecentActivity: string[];
-	recentActivity: string[];
-	assistantSummary?: string;
-	lastAssistantText?: string;
-	progress?: string;
-	rationale?: string;
-	nextStep?: string;
-	verifying?: string;
-	stateDeltas: string[];
-	startedAt: number;
-	updatedAt: number;
-};
-
-type CompletionStatusSurface = {
-	snapshotPresent: boolean;
-	statusText?: string;
-	widgetLines: string[];
-	currentPhase?: string;
-	sliceId?: string;
-	nextMandatoryRole?: string;
-	remainingContractCount?: number;
-	releaseBlockerCount?: number;
-	highValueGapCount?: number;
-	remainingStopJudgeCount?: number;
-	activeRole?: string;
-	livePreview?: string;
-	liveState?: "active" | "waiting" | "stalled";
-	liveIdleMs?: number;
-	liveToolActivity?: string;
-	liveAssistantSummary?: string;
-	liveProgress?: string;
-	liveRationale?: string;
-	liveNextStep?: string;
-	liveVerifying?: string;
-	liveStateDeltas?: string[];
-	liveDetailsLines?: string[];
-};
-
-type ContextProposalAnalysis = {
-	taskType?: string;
-	evaluationProfile?: string;
-	critique: string[];
-	risks: string[];
-	possibleNoise: string[];
-};
-
-type ContextProposal = {
-	mission: string;
-	scope: string[];
-	constraints: string[];
-	acceptance: string[];
-	analysis: ContextProposalAnalysis;
-	goalText: string;
-	basisPreview: string;
-	source: "session" | "analyst";
-};
-
-type ContextProposalSection = "mission" | "scope" | "constraints" | "acceptance" | "critique" | "risks";
-
-type RecentDiscussionEntry = {
-	role: "user" | "assistant" | "custom" | "summary";
-	text: string;
-};
-
-type ContextProposalDecision = {
-	missionAnchor: string;
-	goalText: string;
-	analysis: ContextProposalAnalysis;
-};
-
-type ContextProposalConfirmAction = "start" | "cancel";
-
-type ContextProposalConfirmationActionItem = {
-	id: ContextProposalConfirmAction;
-	label: string;
-	description: string;
-};
-
-type ContextProposalConfirmationLayout = {
-	title: string;
-	intro: string;
-	proposalHeading: string;
-	proposalBody: string;
-	critiqueHeading?: string;
-	critiqueBody?: string;
-	routingHeading?: string;
-	routingBody?: string;
-	actionsHeading: string;
-	actions: ContextProposalConfirmationActionItem[];
-	footer: string;
-};
-
-type ContextProposalConfirmOptions = {
-	title: string;
-	nonInteractiveBehavior?: "accept" | "cancel";
-};
-
-class StartupAnalystOverlay extends Container {
-	private readonly border: DynamicBorder;
-	private readonly title: Text;
-	private readonly body: Text;
-	private readonly footer: Text;
-	private lines: string[] = [];
-	onAbort?: () => void;
-
-	constructor(private readonly theme: any) {
-		super();
-		this.border = new DynamicBorder((s: string) => this.theme.fg("accent", s));
-		this.title = new Text("", 1, 0);
-		this.body = new Text("", 1, 1);
-		this.footer = new Text("", 1, 0);
-		this.addChild(this.border);
-		this.addChild(this.title);
-		this.addChild(this.body);
-		this.addChild(this.footer);
-		this.updateDisplay();
-	}
-
-	setLines(lines: string[]): void {
-		this.lines = [...lines];
-		this.updateDisplay();
-		this.invalidate();
-	}
-
-	private updateDisplay(): void {
-		this.title.setText(this.theme.fg("accent", this.theme.bold("/cook proposal analyst")));
-		this.body.setText(formatInlineRunningText(this.theme, this.lines, { primaryAssistant: true }));
-		this.footer.setText(this.theme.fg("muted", "Esc/Ctrl+C cancel • This analysis runs before /cook writes canonical workflow state"));
-	}
-
-	override handleInput(data: string): void {
-		if (data === "\u001b" || data === "\u0003") {
-			this.onAbort?.();
-			return;
-		}
-		// Container does not implement handleInput; ignore all other keys.
-	}
-
-	override invalidate(): void {
-		super.invalidate();
-		this.updateDisplay();
-	}
-}
-
 const liveRoleActivityByRoot = new Map<string, LiveRoleActivity>();
 const activatedCompletionRoutingRoots = new Set<string>();
-const LIVE_ROLE_WAITING_MS = 15_000;
-const LIVE_ROLE_STALLED_MS = 45_000;
 const LIVE_ROLE_HEARTBEAT_MS = 5_000;
-const DRIVER_AUTO_CONTINUE_MAX_ATTEMPTS = 2;
-
-type DriverContinuationTracker = {
-	fingerprint: string;
-	attempts: number;
-	inFlight: boolean;
-	warned: boolean;
-};
-
-const driverContinuationByRoot = new Map<string, DriverContinuationTracker>();
-
-function isRecord(value: unknown): value is JsonRecord {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-
-function asString(value: unknown): string | undefined {
-	return typeof value === "string" && value.trim().length > 0 ? value.trim() : undefined;
-}
 
 function asBoolean(value: unknown): boolean | undefined {
 	return typeof value === "boolean" ? value : undefined;
 }
 
-function asNumber(value: unknown): number | undefined {
-	return typeof value === "number" && Number.isFinite(value) ? value : undefined;
-}
-
-function asStringArray(value: unknown): string[] {
-	return Array.isArray(value)
-		? value.filter((item): item is string => typeof item === "string" && item.trim().length > 0)
-		: [];
-}
-
 function roleFromEnv(): string | undefined {
 	return asString(process.env.PI_COMPLETION_ROLE);
 }
 
-function resolveFiles(root: string): CompletionFiles {
-	const agentDir = path.join(root, ".agent");
-	const tmpDir = path.join(agentDir, "tmp");
-	return {
-		root,
-		agentDir,
-		tmpDir,
-		profilePath: path.join(agentDir, "profile.json"),
-		statePath: path.join(agentDir, "state.json"),
-		planPath: path.join(agentDir, "plan.json"),
-		activePath: path.join(agentDir, "active-slice.json"),
-		sliceHistoryPath: path.join(agentDir, "slice-history.jsonl"),
-		stopHistoryPath: path.join(agentDir, "stop-check-history.jsonl"),
-		verificationEvidencePath: path.join(agentDir, "verification-evidence.json"),
-		compactionMarkerPath: path.join(tmpDir, "post-compaction-recovery.json"),
-	};
-}
-
-function walkUpForDir(startCwd: string, segments: string[]): string | undefined {
-	let current = path.resolve(startCwd);
-	while (true) {
-		const candidate = path.join(current, ...segments);
-		if (fs.existsSync(candidate)) return candidate;
-		const parent = path.dirname(current);
-		if (parent === current) return undefined;
-		current = parent;
-	}
-}
-
-function completionSearchRoots(startCwd: string): string[] {
-	return [...new Set([path.resolve(startCwd), path.resolve(process.cwd())])];
-}
-
-function findCompletionRoot(startCwd: string): string | undefined {
-	for (const candidateRoot of completionSearchRoots(startCwd)) {
-		const profilePath = walkUpForDir(candidateRoot, [".agent", "profile.json"]);
-		if (profilePath) return path.dirname(path.dirname(profilePath));
-	}
-	return undefined;
-}
-
-function findRepoRoot(startCwd: string): string | undefined {
-	for (const candidateRoot of completionSearchRoots(startCwd)) {
-		const gitPath = walkUpForDir(candidateRoot, [".git"]);
-		if (gitPath) return path.dirname(gitPath);
-	}
-	return undefined;
-}
-
-async function readJson(filePath: string): Promise<JsonRecord | undefined> {
-	try {
-		const raw = await fsp.readFile(filePath, "utf8");
-		const parsed = JSON.parse(raw);
-		return isRecord(parsed) ? parsed : undefined;
-	} catch {
-		return undefined;
-	}
-}
-
-async function readJsonl(filePath: string): Promise<JsonRecord[]> {
-	try {
-		const raw = await fsp.readFile(filePath, "utf8");
-		return raw
-			.split("\n")
-			.map((line) => line.trim())
-			.filter(Boolean)
-			.flatMap((line) => {
-				try {
-					const parsed = JSON.parse(line);
-					return isRecord(parsed) ? [parsed] : [];
-				} catch {
-					return [];
-				}
-			});
-	} catch {
-		return [];
-	}
-}
-
-async function writeJsonFile(filePath: string, value: JsonRecord): Promise<void> {
-	await fsp.writeFile(filePath, `${JSON.stringify(value, null, 2)}\n`, "utf8");
-}
-
 function candidateSlices(plan: JsonRecord | undefined): JsonRecord[] {
 	const slices = plan?.candidate_slices;
 	return Array.isArray(slices) ? slices.filter(isRecord) : [];
 }
 
-function findActiveSlice(plan: JsonRecord | undefined, active: JsonRecord | undefined): JsonRecord | undefined {
-	const sliceId = asString(active?.slice_id);
-	if (!sliceId) return undefined;
-	return candidateSlices(plan).find((slice) => asString(slice.slice_id) === sliceId);
-}
-
-async function loadCompletionSnapshot(startCwd: string): Promise<CompletionStateSnapshot | undefined> {
-	const root = findCompletionRoot(startCwd);
-	if (!root) return undefined;
-	const files = resolveFiles(root);
-	const profile = await readJson(files.profilePath);
-	if (asString(profile?.protocol_id) !== PROTOCOL_ID) return undefined;
-	const state = await readJson(files.statePath);
-	const plan = await readJson(files.planPath);
-	const active = await readJson(files.activePath);
-	const verificationEvidence = await readJson(files.verificationEvidencePath);
-	return {
-		files,
-		profile,
-		state,
-		plan,
-		active,
-		verificationEvidence,
-		activeSlice: findActiveSlice(plan, active),
-	};
-}
-
-async function loadCompletionDataForReminder(startCwd: string) {
-	const snapshot = await loadCompletionSnapshot(startCwd);
-	if (!snapshot) return undefined;
-	const sliceHistory = await readJsonl(snapshot.files.sliceHistoryPath);
-	const stopHistory = await readJsonl(snapshot.files.stopHistoryPath);
-	return { snapshot, sliceHistory, stopHistory };
-}
-
-async function pathExists(targetPath: string): Promise<boolean> {
-	try {
-		await fsp.access(targetPath);
-		return true;
-	} catch {
-		return false;
-	}
-}
-
-async function readText(filePath: string): Promise<string | undefined> {
-	try {
-		return await fsp.readFile(filePath, "utf8");
-	} catch {
-		return undefined;
-	}
-}
-
-async function detectDocsSurfaces(root: string): Promise<string[]> {
-	const candidates = ["README.md", "docs/", "docs", "CHANGELOG.md"];
-	const found: string[] = [];
-	for (const candidate of candidates) {
-		if (await pathExists(path.join(root, candidate))) found.push(candidate.endsWith("/") ? candidate : candidate.replace(/\/$/, ""));
-	}
-	return found.length > 0 ? found : ["README.md"];
-}
-
-async function detectVerifierCommand(root: string): Promise<string | undefined> {
-	const packageJsonPath = path.join(root, "package.json");
-	const packageJson = await readJson(packageJsonPath);
-	if (packageJson) {
-		const scripts = isRecord(packageJson.scripts) ? packageJson.scripts : undefined;
-		const packageManager = asString((packageJson as JsonRecord).packageManager) ?? "";
-		const runner = packageManager.startsWith("pnpm") ? "pnpm" : packageManager.startsWith("yarn") ? "yarn" : packageManager.startsWith("bun") ? "bun" : "npm";
-		if (scripts && asString(scripts.test)) return runner === "npm" ? "npm test" : `${runner} test`;
-		if (scripts && asString(scripts.check)) return runner === "npm" ? "npm run check" : `${runner} check`;
-		if (scripts && asString(scripts.lint)) return runner === "npm" ? "npm run lint" : `${runner} lint`;
-	}
-	if (await pathExists(path.join(root, "pnpm-lock.yaml"))) return "pnpm test";
-	if (await pathExists(path.join(root, "bun.lockb")) || await pathExists(path.join(root, "bun.lock"))) return "bun test";
-	if (await pathExists(path.join(root, "yarn.lock"))) return "yarn test";
-	if (await pathExists(path.join(root, "Cargo.toml"))) return "cargo test";
-	if (await pathExists(path.join(root, "pyproject.toml")) || await pathExists(path.join(root, "pytest.ini"))) return "pytest";
-	if (await pathExists(path.join(root, "go.mod"))) return "go test ./...";
-	if (await pathExists(path.join(root, "Makefile"))) return "make test";
-	return undefined;
-}
-
-function normalizeMissionAnchorText(value: string): string {
-	return value
-		.replace(/^\/(?:cook|complete)\s+/i, "")
-		.replace(/^["'“”‘’]+|["'“”‘’]+$/g, "")
-		.replace(/^\s*(please|pls|can you|could you|help me|i want to|we need to|let'?s|continue to|continue|resume)\s+/i, "")
-		.replace(/\s+/g, " ")
-		.replace(/[。！？.!?]+$/u, "")
-		.trim();
-}
-
-function isWeakMissionAnchor(value: string): boolean {
-	const normalized = value.trim().toLowerCase();
-	if (normalized.length < 8) return true;
-	if (["continue", "resume", "fix", "fix it", "work on this", "help", "do it", "try again"].includes(normalized)) return true;
-	if (/^(continue|resume|fix|help|work on)(\s+.*)?$/i.test(normalized) && normalized.split(/\s+/).length <= 3) return true;
-	return false;
-}
-
-type MissionAnchorAssessment = {
-	derived: string;
-};
-
-function assessMissionAnchor(rawGoal: string, projectName: string): MissionAnchorAssessment {
-	return { derived: deriveMissionAnchor(rawGoal, projectName) };
-}
-
 type ExistingWorkflowDecision =
 	| { action: "continue"; currentMissionAnchor: string }
 	| { action: "refocus"; currentMissionAnchor: string; missionAnchor: string };
@@ -483,6 +145,10 @@ function completionTestWorkflowActionOverride(): "continue" | "refocus" | "cance
 	return raw === "continue" || raw === "refocus" || raw === "cancel" ? raw : undefined;
 }
 
+function completionTestWorkflowMissionOverride(): string | undefined {
+	return asString(process.env.PI_COMPLETION_EXISTING_WORKFLOW_MISSION);
+}
+
 function shouldSkipDriverKickoffForTests(): boolean {
 	return process.env.PI_COMPLETION_SKIP_DRIVER_KICKOFF === "1";
 }
@@ -540,8 +206,10 @@ function maybeWriteTestSnapshot(targetPath: string | undefined, content: string)
 }
 
 const COOK_MAIN_CHAT_RERUN_GUIDANCE = "Discuss changes in the main chat and rerun /cook.";
+const COOK_BARE_ONLY_GUIDANCE =
+	"/cook only supports the bare /cook entrypoint. Move mission text into the main chat, then rerun /cook.";
 const COOK_STRUCTURED_DISCUSSION_FAILURE_DETAIL =
-	"/cook failed closed because recent discussion and any optional inline /cook hint did not produce a clear execution-ready Mission/Scope/Constraints/Acceptance proposal for concrete repo changes. Clarify the concrete repo changes in the main chat and rerun /cook.";
+	"/cook failed closed because recent discussion did not produce a clear execution-ready Mission/Scope/Constraints/Acceptance proposal for concrete repo changes. Clarify the concrete repo changes in the main chat and rerun /cook.";
 
 function buildCookCancellationMessage(prefix: string): string {
 	return `${prefix}. ${COOK_MAIN_CHAT_RERUN_GUIDANCE}`;
@@ -593,419 +261,6 @@ function buildDoneWorkflowBoundaryReminder(snapshot: CompletionStateSnapshot): s
 	].join(" ");
 }
 
-function extractTextFromMessageContent(content: unknown): string {
-	if (typeof content === "string") return content.trim();
-	if (!Array.isArray(content)) return "";
-	return content
-		.map((item) => {
-			if (!isRecord(item)) return "";
-			if (item.type !== "text") return "";
-			return asString(item.text) ?? "";
-		})
-		.filter((item) => item.length > 0)
-		.join("\n")
-		.trim();
-}
-
-function stripCodeBlocks(text: string): string {
-	return text.replace(/```[\s\S]*?```/g, " ");
-}
-
-function normalizeProposalLine(line: string): string {
-	return line
-		.replace(/^[-*+]\s+/, "")
-		.replace(/^\d+[.)]\s+/, "")
-		.replace(/^\[.?\]\s+/, "")
-		.replace(/^>\s*/, "")
-		.replace(/^[`*_~]+|[`*_~]+$/g, "")
-		.replace(/^\*\*(.+)\*\*$/u, "$1")
-		.replace(/^__([^_]+)__$/u, "$1")
-		.trim();
-}
-
-function detectProposalSection(line: string): ContextProposalSection | undefined {
-	const normalized = normalizeProposalLine(line)
-		.toLowerCase()
-		.replace(/[:：]$/, "")
-		.trim();
-	if (!normalized) return undefined;
-	if (["mission", "goal", "objective", "summary", "目標", "任務", "計劃", "计划", "方案"].includes(normalized)) return "mission";
-	if (["scope", "plan", "steps", "implementation", "範圍", "范围", "實作", "实现", "步驟", "步骤"].includes(normalized)) return "scope";
-	if (["constraints", "constraint", "guardrails", "non-goals", "限制", "約束", "约束", "非目標", "非目标"].includes(normalized)) return "constraints";
-	if (["acceptance", "acceptance criteria", "deliverables", "verification", "驗收", "验收", "交付", "驗證", "验证"].includes(normalized)) return "acceptance";
-	if (["critique", "critic", "concerns", "concern", "warnings", "warning", "notes", "note", "評論", "评论", "提醒"].includes(normalized)) return "critique";
-	if (["risk", "risks", "hazards", "hazard", "failure modes", "failure mode", "風險", "风险"].includes(normalized)) return "risks";
-	return undefined;
-}
-
-function matchInlineProposalSection(line: string): { section: ContextProposalSection; content: string } | undefined {
-	const normalized = normalizeProposalLine(line);
-	const match = normalized.match(/^([^:：]+)[:：]\s*(.+)$/u);
-	if (!match) return undefined;
-	const [, rawLabel, rawContent] = match;
-	const section = detectProposalSection(rawLabel);
-	const content = rawContent.trim();
-	if (!section || !content) return undefined;
-	return { section, content };
-}
-
-function bulletText(line: string): string | undefined {
-	if (!/^\s*(?:[-*+]\s+|\d+[.)]\s+)/.test(line)) return undefined;
-	const normalized = normalizeProposalLine(line);
-	return normalized.length > 0 ? normalized : undefined;
-}
-
-function looksLikeConstraint(text: string): boolean {
-	return /(do not|don't|must not|avoid|without|keep\b|preserve|retain|remain|不要|不可|不能|不應|不应|保持|保留|避免)/i.test(text);
-}
-
-function looksLikeAcceptance(text: string): boolean {
-	return /(test|tests|testing|verify|verification|validated|README|docs?|documentation|regression|observability|驗證|验证|測試|测试|文件|文檔|文档|回歸|回归)/i.test(text);
-}
-
-function uniqueProposalItems(items: string[]): string[] {
-	const seen = new Set<string>();
-	const result: string[] = [];
-	for (const item of items) {
-		const normalized = normalizeProposalLine(item).replace(/\s+/g, " ").trim();
-		if (!normalized) continue;
-		const key = normalized.toLowerCase();
-		if (seen.has(key)) continue;
-		seen.add(key);
-		result.push(normalized);
-	}
-	return result;
-}
-
-function normalizeContextProposalHint(value: unknown): string | undefined {
-	const normalized = asString(value)?.replace(/\s+/g, " ").trim();
-	return normalized || undefined;
-}
-
-function normalizeContextProposalTaskTypeHint(value: unknown): string | undefined {
-	const normalized = normalizeContextProposalHint(value);
-	if (!normalized) return undefined;
-	const canonical = normalized.toLowerCase().replace(/[\s/]+/g, "-");
-	return canonical === DEFAULT_TASK_TYPE ? DEFAULT_TASK_TYPE : normalized;
-}
-
-function normalizeContextProposalEvaluationProfileHint(value: unknown): string | undefined {
-	const normalized = normalizeContextProposalHint(value);
-	if (!normalized) return undefined;
-	const canonical = normalized.toLowerCase().replace(/[\s/]+/g, "-");
-	return canonical === DEFAULT_EVALUATION_PROFILE ? DEFAULT_EVALUATION_PROFILE : normalized;
-}
-
-function inferContextProposalTaskType(texts: string[]): string | undefined {
-	const corpus = texts
-		.map((text) => normalizeProposalLine(text).toLowerCase())
-		.filter(Boolean)
-		.join("\n");
-	if (!corpus) return undefined;
-	return /(completion|\/cook|\/complete|\.agent|slice|reground|reviewer|auditor|stop judge|stop-judge|workflow)/i.test(corpus)
-		? DEFAULT_TASK_TYPE
-		: undefined;
-}
-
-function inferContextProposalEvaluationProfile(texts: string[], taskType?: string): string | undefined {
-	const corpus = texts
-		.map((text) => normalizeProposalLine(text).toLowerCase())
-		.filter(Boolean)
-		.join("\n");
-	if (!corpus) return undefined;
-	if (
-		/(rubric|evaluation[_\s-]*profile|pass\|concern\|fail|contract coverage|correctness risk|verification evidence|docs\/state parity|reviewer|auditor|stop judge|stop-judge)/i.test(
-			corpus,
-		)
-	) {
-		return DEFAULT_EVALUATION_PROFILE;
-	}
-	return taskType === DEFAULT_TASK_TYPE && /(completion|\/cook|\/complete|slice|workflow|review|audit)/i.test(corpus)
-		? DEFAULT_EVALUATION_PROFILE
-		: undefined;
-}
-
-function buildContextProposalAnalysis(args: {
-	taskType?: unknown;
-	evaluationProfile?: unknown;
-	critique?: string[];
-	risks?: string[];
-	possibleNoise?: string[];
-	hintTexts?: string[];
-}): ContextProposalAnalysis {
-	const critique = uniqueProposalItems(args.critique ?? []);
-	const risks = uniqueProposalItems(args.risks ?? []);
-	const possibleNoise = uniqueProposalItems(args.possibleNoise ?? []);
-	const hintTexts = [...(args.hintTexts ?? []), ...critique, ...risks, ...possibleNoise];
-	const taskType = normalizeContextProposalTaskTypeHint(args.taskType) ?? inferContextProposalTaskType(hintTexts);
-	const evaluationProfile =
-		normalizeContextProposalEvaluationProfileHint(args.evaluationProfile) ??
-		inferContextProposalEvaluationProfile(hintTexts, taskType);
-	return {
-		taskType,
-		evaluationProfile,
-		critique,
-		risks,
-		possibleNoise,
-	};
-}
-
-function mergeContextProposalAnalysis(
-	sources: Array<ContextProposalAnalysis | undefined>,
-	hintTexts: string[] = [],
-): ContextProposalAnalysis {
-	const critique = uniqueProposalItems(sources.flatMap((source) => source?.critique ?? []));
-	const risks = uniqueProposalItems(sources.flatMap((source) => source?.risks ?? []));
-	const possibleNoise = uniqueProposalItems(sources.flatMap((source) => source?.possibleNoise ?? []));
-	const taskType =
-		sources.map((source) => source?.taskType).find((value): value is string => Boolean(value)) ??
-		inferContextProposalTaskType([...hintTexts, ...critique, ...risks, ...possibleNoise]);
-	const evaluationProfile =
-		sources.map((source) => source?.evaluationProfile).find((value): value is string => Boolean(value)) ??
-		inferContextProposalEvaluationProfile([...hintTexts, ...critique, ...risks, ...possibleNoise], taskType);
-	return {
-		taskType,
-		evaluationProfile,
-		critique,
-		risks,
-		possibleNoise,
-	};
-}
-
-function matchContextProposalRoutingHint(
-	line: string,
-): { field: "taskType" | "evaluationProfile"; value: string } | undefined {
-	const normalized = normalizeProposalLine(line);
-	const match = normalized.match(/^(task[\s_-]*type|evaluation[\s_-]*profile)[:：]\s*(.+)$/iu);
-	if (!match) return undefined;
-	const label = match[1].toLowerCase().replace(/[\s_-]+/g, "");
-	const value = match[2].trim();
-	if (!value) return undefined;
-	return label === "tasktype" ? { field: "taskType", value } : { field: "evaluationProfile", value };
-}
-
-const CONTEXT_PROPOSAL_GENERIC_PLANNING_MISSION_REGEX =
-	/(?:\b(?:start(?:ing)?|begin|continue|continu(?:e|ing)|resume|implement(?:ing)?|execute|execut(?:e|ing)|carry out|work on|ship|build(?:ing)?)\b.*\b(?:this|that|the|current|latest)\s+(?:plan|proposal|spec(?:ification)?|design(?: doc(?:ument)?)?|migration plan)\b|(?:開始|著手|繼續|继续|恢復|恢复)?(?:實作|实现|執行|执行|落地|完成)(?:這個|这个|此|該|该)?(?:方案|計畫|计划|提案|規劃|规划|設計|设计))/iu;
-const CONTEXT_PROPOSAL_PLANNING_ONLY_DELIVERABLE_REGEX =
-	/(?:\b(?:write|draft|prepare|create|produce|share|deliver|document|review)\b.*\b(?:plan|spec(?:ification)?|design(?: doc(?:ument)?)?|migration plan|proposal)\b|(?:撰寫|撰写|編寫|编写|起草|準備|准备|產出|产出|整理|分享|交付|審查|审查).*(?:計畫|计划|規格|规格|設計文件|设计文档|提案|方案))/iu;
-const CONTEXT_PROPOSAL_DOCS_ONLY_SIGNAL_REGEX = /(?:\b(?:docs? only|documentation only)\b|(?:只改文件|僅文件|仅文件))/iu;
-const CONTEXT_PROPOSAL_NO_IMPLEMENTATION_SIGNAL_REGEX =
-	/(?:\b(?:no code(?: changes?)?|without code(?: changes?)?|do not implement|don't implement|planning only|proposal only|spec only|design[- ]doc only|no runtime changes?)\b|(?:不改(?:動)?代碼|不改代码|不要實作|不要实现|只規劃|只规划|僅規劃|仅规划|不改(?:動)?執行|不改运行))/iu;
-const CONTEXT_PROPOSAL_IMPLEMENTATION_SOURCE_REGEX =
-	/(?:\b(?:normalize|fix|update|add|remove|restore|refactor|ship|support|wire|route|rewrite|replace|preserve|filter|separate|refresh|reroute|suppress|align|convert|reconcile|repair|correct|implement|build|land|block|allow|keep|edit(?:ing)?|document(?:ing)?|writ(?:e|ing))\b|(?:修正|修復|修复|更新|新增|移除|恢復|恢复|重構|重构|調整|调整|正規化|规范化|規範化|过滤|過濾|分離|分离|刷新|替換|替换|抑制|對齊|对齐|實作|实现|落地|修補|修补|阻止|允許|允许|轉換|转换|保留|保持))/iu;
-
-function contextProposalBodyTexts(proposal: Pick<ContextProposal, "scope" | "constraints" | "acceptance">): string[] {
-	return [...proposal.scope, ...proposal.constraints, ...proposal.acceptance];
-}
-
-function isGenericPlanningMissionAnchor(text: string): boolean {
-	const normalized = normalizeMissionAnchorText(text);
-	if (!normalized) return false;
-	return CONTEXT_PROPOSAL_GENERIC_PLANNING_MISSION_REGEX.test(normalized);
-}
-
-function hasExplicitPlanningOnlyDeliverable(texts: string[]): boolean {
-	return texts.some((text) => CONTEXT_PROPOSAL_PLANNING_ONLY_DELIVERABLE_REGEX.test(normalizeProposalLine(text)));
-}
-
-function normalizeImplementationMissionSourceText(text: string): string {
-	const normalized = normalizeProposalLine(text);
-	if (!normalized) return "";
-	return normalized
-		.replace(new RegExp(`${CONTEXT_PROPOSAL_DOCS_ONLY_SIGNAL_REGEX.source}[\\s:：;,/\\-]*`, "giu"), " ")
-		.replace(/\s+([,.;:!?])/g, "$1")
-		.replace(/\s+/g, " ")
-		.trim();
-}
-
-function hasClearNoImplementationSignal(texts: string[]): boolean {
-	return texts.some((text) => CONTEXT_PROPOSAL_NO_IMPLEMENTATION_SIGNAL_REGEX.test(normalizeProposalLine(text)));
-}
-
-function implementationMissionSourceCandidateText(text: string): string | undefined {
-	const normalized = normalizeImplementationMissionSourceText(text);
-	if (!normalized) return undefined;
-	if (hasExplicitPlanningOnlyDeliverable([normalized])) return undefined;
-	if (hasClearNoImplementationSignal([normalized])) return undefined;
-	if (!CONTEXT_PROPOSAL_IMPLEMENTATION_SOURCE_REGEX.test(normalized)) return undefined;
-	return normalized;
-}
-
-function pickImplementationMissionSource(proposal: Pick<ContextProposal, "scope" | "constraints" | "acceptance">): string | undefined {
-	for (const item of proposal.scope) {
-		const candidate = implementationMissionSourceCandidateText(item);
-		if (candidate) return candidate;
-	}
-	for (const item of proposal.acceptance) {
-		const candidate = implementationMissionSourceCandidateText(item);
-		if (candidate) return candidate;
-	}
-	return undefined;
-}
-
-function hasPlanningArtifactOnlyContext(
-	proposal: Pick<ContextProposal, "mission" | "scope" | "constraints" | "acceptance">,
-): boolean {
-	const texts = [proposal.mission, ...contextProposalBodyTexts(proposal)];
-	if (!hasExplicitPlanningOnlyDeliverable(texts)) return false;
-	return !pickImplementationMissionSource(proposal);
-}
-
-function finalizeContextProposal(proposal: ContextProposal, projectName: string): ContextProposal | undefined {
-	if (hasPlanningArtifactOnlyContext(proposal)) return undefined;
-	if (!isGenericPlanningMissionAnchor(proposal.mission)) return proposal;
-	const missionSource = pickImplementationMissionSource(proposal);
-	if (!missionSource) return undefined;
-	const nextMission = assessMissionAnchor(missionSource, projectName).derived;
-	const normalizedNextMission = normalizeMissionAnchorText(nextMission);
-	if (!normalizedNextMission || isWeakMissionAnchor(normalizedNextMission)) return undefined;
-	if (missionAnchorsStrictlyEquivalent(nextMission, proposal.mission)) return proposal;
-	return {
-		...proposal,
-		mission: nextMission,
-		goalText: buildContextProposalGoalText({
-			mission: nextMission,
-			scope: proposal.scope,
-			constraints: proposal.constraints,
-			acceptance: proposal.acceptance,
-		}),
-	};
-}
-
-const MISSION_SCOPE_FILTER_STOPWORDS = new Set([
-	"a",
-	"an",
-	"and",
-	"are",
-	"as",
-	"at",
-	"be",
-	"by",
-	"for",
-	"from",
-	"goal",
-	"goals",
-	"in",
-	"into",
-	"is",
-	"it",
-	"its",
-	"mission",
-	"of",
-	"on",
-	"or",
-	"scope",
-	"that",
-	"the",
-	"their",
-	"this",
-	"to",
-	"using",
-	"with",
-	"workflow",
-]);
-
-function missionScopeFilterTokens(text: string): string[] {
-	const normalized = normalizeProposalLine(text).toLowerCase();
-	const tokens = normalized.match(/[\p{L}\p{N}]+/gu) ?? [];
-	return tokens.filter((token) => {
-		if (/^[\p{Script=Han}]+$/u.test(token)) return token.length >= 2;
-		if (token.length < 2) return false;
-		return !MISSION_SCOPE_FILTER_STOPWORDS.has(token);
-	});
-}
-
-function isSessionScopeItemMissionRelevant(item: string, mission: string): boolean {
-	const normalizedItem = normalizeProposalLine(item).toLowerCase();
-	const normalizedMission = normalizeMissionAnchorText(mission).toLowerCase();
-	if (!normalizedItem || !normalizedMission) return true;
-	if (normalizedItem.includes(normalizedMission) || normalizedMission.includes(normalizedItem)) return true;
-	const itemTokens = [...new Set(missionScopeFilterTokens(normalizedItem))];
-	const missionTokens = new Set(missionScopeFilterTokens(normalizedMission));
-	if (itemTokens.length === 0 || missionTokens.size === 0) return true;
-	const overlap = itemTokens.filter((token) => missionTokens.has(token));
-	if (overlap.length >= 2) return true;
-	return overlap.some((token) => token.length >= 6 || /[\p{Script=Han}]/u.test(token));
-}
-
-function missionAnchorSemanticTokens(text: string): string[] {
-	return [...new Set(missionScopeFilterTokens(normalizeMissionAnchorText(text).toLowerCase()))];
-}
-
-function missionAnchorOrderedTokenOverlapRatio(leftTokens: string[], rightTokens: string[]): number {
-	if (leftTokens.length === 0 || rightTokens.length === 0) return 0;
-	const dp = new Array(rightTokens.length + 1).fill(0);
-	for (const leftToken of leftTokens) {
-		let previous = 0;
-		for (let index = 0; index < rightTokens.length; index += 1) {
-			const nextPrevious = dp[index + 1];
-			if (leftToken === rightTokens[index]) {
-				dp[index + 1] = previous + 1;
-			} else {
-				dp[index + 1] = Math.max(dp[index + 1], dp[index]);
-			}
-			previous = nextPrevious;
-		}
-	}
-	return dp[rightTokens.length] / Math.max(leftTokens.length, rightTokens.length);
-}
-
-function missionAnchorBigramOverlapRatio(leftTokens: string[], rightTokens: string[]): number {
-	if (leftTokens.length < 2 || rightTokens.length < 2) return 0;
-	const leftBigrams = new Set(leftTokens.slice(0, -1).map((token, index) => `${token} ${leftTokens[index + 1]}`));
-	const rightBigrams = new Set(rightTokens.slice(0, -1).map((token, index) => `${token} ${rightTokens[index + 1]}`));
-	if (leftBigrams.size === 0 || rightBigrams.size === 0) return 0;
-	let overlap = 0;
-	for (const bigram of leftBigrams) {
-		if (rightBigrams.has(bigram)) overlap += 1;
-	}
-	return overlap / Math.max(leftBigrams.size, rightBigrams.size);
-}
-
-function missionAnchorsStrictlyEquivalent(left: string, right: string): boolean {
-	return normalizeMissionAnchorText(left).toLowerCase() === normalizeMissionAnchorText(right).toLowerCase();
-}
-
-const MISSION_NEGATION_CUE_REGEX = /(?:^|[^\p{L}\p{N}_])(?:no|not|without|never|cannot|don['’]?t)(?=$|[^\p{L}\p{N}_])/u;
-
-function missionAnchorHasNegationCue(text: string): boolean {
-	return MISSION_NEGATION_CUE_REGEX.test(text);
-}
-
-function missionAnchorsLikelyEquivalent(left: string, right: string): boolean {
-	const normalizedLeft = normalizeMissionAnchorText(left).toLowerCase();
-	const normalizedRight = normalizeMissionAnchorText(right).toLowerCase();
-	if (!normalizedLeft || !normalizedRight) return false;
-	const leftHasNegationCue = missionAnchorHasNegationCue(normalizedLeft);
-	const rightHasNegationCue = missionAnchorHasNegationCue(normalizedRight);
-	if (leftHasNegationCue !== rightHasNegationCue) return false;
-	if (normalizedLeft === normalizedRight) return true;
-	if (!leftHasNegationCue && (normalizedLeft.includes(normalizedRight) || normalizedRight.includes(normalizedLeft))) return true;
-	const leftTokens = missionAnchorSemanticTokens(normalizedLeft);
-	const rightTokens = missionAnchorSemanticTokens(normalizedRight);
-	if (leftTokens.length === 0 || rightTokens.length === 0) return false;
-	const rightSet = new Set(rightTokens);
-	const overlap = leftTokens.filter((token) => rightSet.has(token));
-	if (overlap.length < 3) return false;
-	const maxLen = Math.max(leftTokens.length, rightTokens.length);
-	if (overlap.length / maxLen < 0.75) return false;
-	if (missionAnchorOrderedTokenOverlapRatio(leftTokens, rightTokens) < 0.75) return false;
-	if (Math.min(leftTokens.length, rightTokens.length) < 4) return true;
-	return missionAnchorBigramOverlapRatio(leftTokens, rightTokens) >= 0.5;
-}
-
-function shouldTreatBareActiveWorkflowProposalAsClearRefocus(proposal: ContextProposal): boolean {
-	if (proposal.source === "session") {
-		return proposal.scope.length > 0 && proposal.constraints.length > 0 && proposal.acceptance.length > 0;
-	}
-	return (
-		proposal.scope.length > 0 &&
-		proposal.constraints.length > 0 &&
-		proposal.acceptance.length > 0 &&
-		proposal.analysis.possibleNoise.length === 0
-	);
-}
-
 function maybeWriteActiveWorkflowRoutingSnapshot(assessment: ActiveWorkflowProposalAssessment): void {
 	const snapshotPath = completionTestActiveWorkflowRoutingSnapshotPath();
 	if (!snapshotPath) return;
@@ -1020,6 +275,9 @@ function maybeWriteActiveWorkflowRoutingSnapshot(assessment: ActiveWorkflowPropo
 				proposedMissionAnchor: assessment.proposal?.mission ?? null,
 				proposalSource: assessment.proposal?.source ?? null,
 				possibleNoise: assessment.proposal?.analysis.possibleNoise ?? [],
+				alternateMissions: assessment.proposal?.analysis.alternateMissions ?? [],
+				suppressedCompletedTopics: assessment.proposal?.analysis.suppressedCompletedTopics ?? [],
+				suppressedNegatedTopics: assessment.proposal?.analysis.suppressedNegatedTopics ?? [],
 				scope: assessment.proposal?.scope ?? [],
 				constraints: assessment.proposal?.constraints ?? [],
 				acceptance: assessment.proposal?.acceptance ?? [],
@@ -1030,459 +288,26 @@ function maybeWriteActiveWorkflowRoutingSnapshot(assessment: ActiveWorkflowPropo
 	);
 }
 
-const CONTEXT_PROPOSAL_ANALYST_SYSTEM_PROMPT = [
-	"You analyze recent /cook startup discussion and return a strict JSON object.",
-	"Do not emit markdown, code fences, or commentary.",
-	"Return exactly one JSON object with keys: mission, scope, constraints, acceptance, critique, risks, task_type, evaluation_profile, confidence, possible_noise.",
-	"mission must be a concise implementation mission anchor sentence.",
-	"scope must contain only work items that directly support the mission.",
-	"constraints must contain guardrails or non-goals explicitly stated or strongly implied by the discussion.",
-	"acceptance must contain verifiable outcomes explicitly stated or strongly implied by the discussion.",
-	"critique must contain operator-facing cautions, concerns, or reminders that should be shown separately from mission and scope later.",
-	"risks must contain concrete failure modes or regressions that the later workflow should keep in view.",
-	"task_type and evaluation_profile should be candidate routing hints only; reuse the existing completion vocabulary when it clearly fits instead of inventing new schema names.",
-	"possible_noise should list discussion points that look stale, weakly related, or unsafe to promote into scope.",
-	"When discussion is insufficient, prefer empty arrays and a low confidence value over invention.",
-].join(" ");
-
-function collectRecentDiscussionEntries(ctx: { sessionManager: any }, limit = 8): RecentDiscussionEntry[] {
-	let branch: any[] = [];
-	try {
-		branch = ctx.sessionManager?.getBranch?.() ?? [];
-	} catch (error) {
-		if (isStaleContextError(error)) return [];
-		throw error;
-	}
-	const entries: RecentDiscussionEntry[] = [];
-	for (let index = branch.length - 1; index >= 0; index -= 1) {
-		const entry = branch[index];
-		if (!isRecord(entry) || entry.type !== "message" || !isRecord(entry.message)) continue;
-		const message = entry.message as JsonRecord;
-		let text = "";
-		let role: RecentDiscussionEntry["role"] | undefined;
-		const messageRole = asString(message.role);
-		if (messageRole === "user" || messageRole === "custom") {
-			text = extractTextFromMessageContent(message.content);
-			role = messageRole;
-		}
-		if (!text || !role) continue;
-		const trimmed = text.trim();
-		if (!trimmed || /^\/(?:cook|complete)\b/i.test(trimmed)) continue;
-		entries.push({ role, text: trimmed });
-		if (entries.length >= limit) break;
-	}
-	return entries;
-}
-
-function serializeRecentDiscussionEntries(entries: RecentDiscussionEntry[]): string {
-	return entries
-		.slice()
-		.reverse()
-		.map((entry, index) => `[${index + 1}] ${entry.role.toUpperCase()}\n${entry.text}`)
-		.join("\n\n");
-}
-
-function extractJsonObjectFromText(text: string): string | undefined {
-	const trimmed = text.trim();
-	if (!trimmed) return undefined;
-	const unfenced = trimmed.replace(/^```(?:json)?\s*/i, "").replace(/\s*```$/i, "").trim();
-	if (unfenced.startsWith("{") && unfenced.endsWith("}")) return unfenced;
-	const start = unfenced.indexOf("{");
-	const end = unfenced.lastIndexOf("}");
-	if (start < 0 || end <= start) return undefined;
-	return unfenced.slice(start, end + 1);
-}
-
-function parseContextProposalAnalystOutput(raw: string, projectName: string): ContextProposal | undefined {
-	const jsonText = extractJsonObjectFromText(raw);
-	if (!jsonText) return undefined;
-	let parsed: unknown;
-	try {
-		parsed = JSON.parse(jsonText);
-	} catch {
-		return undefined;
-	}
-	if (!isRecord(parsed)) return undefined;
-	const missionSource = asString(parsed.mission);
-	if (!missionSource) return undefined;
-	const assessment = assessMissionAnchor(missionSource, projectName);
-	const normalizedMission = normalizeMissionAnchorText(missionSource);
-	if (!normalizedMission || isWeakMissionAnchor(normalizedMission)) return undefined;
-	const mission = assessment.derived;
-	const scope = uniqueProposalItems(asStringArray(parsed.scope));
-	const constraints = uniqueProposalItems(asStringArray(parsed.constraints));
-	const acceptance = uniqueProposalItems(asStringArray(parsed.acceptance));
-	const analysis = buildContextProposalAnalysis({
-		taskType: parsed.task_type ?? parsed.taskType,
-		evaluationProfile: parsed.evaluation_profile ?? parsed.evaluationProfile,
-		critique: asStringArray(parsed.critique),
-		risks: asStringArray(parsed.risks ?? parsed.risk),
-		possibleNoise: asStringArray(parsed.possible_noise ?? parsed.possibleNoise),
-		hintTexts: [raw, mission, ...scope, ...constraints, ...acceptance],
+function buildContextProposalContinuationReason(prefix: string, goalText: string, analysis: ContextProposalAnalysis): string {
+	return buildExtractedContextProposalContinuationReason(prefix, goalText, analysis, {
+		defaultTaskType: DEFAULT_TASK_TYPE,
+		defaultEvaluationProfile: DEFAULT_EVALUATION_PROFILE,
+		truncateInline,
 	});
-	const goalText = buildContextProposalGoalText({ mission, scope, constraints, acceptance });
-	return finalizeContextProposal(
-		{
-			mission,
-			scope,
-			constraints,
-			acceptance,
-			analysis,
-			goalText,
-			basisPreview: raw.replace(/\s+/g, " ").trim(),
-			source: "analyst",
-		},
-		projectName,
-	);
-}
-
-function contextProposalAnalystModelArg(model: unknown): string | undefined {
-	if (!isRecord(model)) return undefined;
-	const provider = asString(model.provider);
-	const id = asString(model.id);
-	return provider && id ? `${provider}/${id}` : undefined;
-}
-
-function buildContextProposalAnalystPrompt(projectName: string, recentEntries: RecentDiscussionEntry[], hintText?: string): string {
-	const discussion = serializeRecentDiscussionEntries(recentEntries);
-	const lines = [
-		`Project: ${projectName}`,
-		"Infer the current mission from the discussion.",
-		"If an inline /cook hint is present, treat it as a high-priority user hint that may focus the mission, but do not ignore conflicting discussion or skip missing details.",
-	];
-	if (hintText) {
-		lines.push("", "Inline /cook hint:", hintText);
-	}
-	lines.push("", "Recent discussion:", discussion || "(none)");
-	return lines.join("\n");
 }
 
-function contextProposalAnalystProgressLines(activity: LiveRoleActivity): string[] {
-	return [
-		...buildInlineRunningLines({
-			role: activity.role,
-			startedAt: activity.startedAt,
-			updatedAt: activity.updatedAt,
-			currentAction: activity.currentAction,
-			toolActivity: activity.toolActivity,
-			toolRecentActivity: activity.toolRecentActivity,
-			recentActivity: activity.recentActivity,
-			assistantSummary: activity.assistantSummary,
-			progress: activity.progress,
-			rationale: activity.rationale,
-			nextStep: activity.nextStep,
-			verifying: activity.verifying,
-			stateDeltas: activity.stateDeltas,
-		}),
-		"",
-		"This step only prepares a proposal for confirmation.",
-	];
-}
-
-async function runContextProposalAnalystSubprocess(
-	ctx: { cwd: string; hasUI: boolean; ui: any; model?: any },
-	projectName: string,
-	recentEntries: RecentDiscussionEntry[],
-	hintText?: string,
-): Promise<string | undefined> {
-	const modelArg = contextProposalAnalystModelArg(ctx.model);
-	if (!modelArg) return undefined;
-	const cwd = getCtxCwd(ctx);
-	const runCwd = findCompletionRoot(cwd) ?? findRepoRoot(cwd) ?? cwd;
-	const rootKey = completionRootKey(undefined, cwd);
-	const prompt = buildContextProposalAnalystPrompt(projectName, recentEntries, hintText);
-	const systemPromptTemp = await writeTempFile("pi-cook-proposal-analyst-", CONTEXT_PROPOSAL_ANALYST_SYSTEM_PROMPT);
-	const analystRole = "cook-proposal-analyst";
-	const args: string[] = ["--mode", "json", "-p", "--no-session", "--append-system-prompt", systemPromptTemp.filePath, "--model", modelArg, prompt];
-	const invocation = getPiInvocation(args);
-	const liveActivity = createLiveRoleActivity(analystRole);
-	liveActivity.progress = hintText ? "Analyzing recent discussion and inline hint" : "Analyzing recent discussion";
-	liveActivity.currentAction = hintText
-		? "Reading recent discussion plus the inline /cook hint and preparing a startup proposal"
-		: "Reading recent discussion and preparing a startup proposal";
-	liveActivity.assistantSummary = liveActivity.progress;
-	liveActivity.recentActivity = pushRecentActivity(liveActivity.recentActivity, `assistant: ${liveActivity.progress}`);
-	const messages: RoleMessage[] = [];
-	let stderr = "";
-	let overlay: StartupAnalystOverlay | undefined;
-	let finishOverlay: ((value: string | undefined) => void) | undefined;
-	let overlaySettled = false;
-	const settleOverlay = (value: string | undefined) => {
-		if (overlaySettled) return;
-		overlaySettled = true;
-		finishOverlay?.(value);
-	};
-	const updateActivity = (fresh = false) => {
-		if (fresh) liveActivity.updatedAt = nowMs();
-		liveRoleActivityByRoot.set(rootKey, cloneLiveRoleActivity(liveActivity, { status: "running" }));
-		void refreshStatus(ctx);
-		overlay?.setLines(contextProposalAnalystProgressLines(liveActivity));
-	};
-	const heartbeat = setInterval(() => updateActivity(false), LIVE_ROLE_HEARTBEAT_MS);
-	const run = async (): Promise<string | undefined> => {
-		try {
-			updateActivity(true);
-			const output = await new Promise<string | undefined>((resolve) => {
-				const proc = spawn(invocation.command, invocation.args, {
-					cwd: runCwd,
-					env: process.env,
-					stdio: ["ignore", "pipe", "pipe"],
-					shell: false,
-				});
-				let settled = false;
-				const resolveOnce = (value: string | undefined) => {
-					if (settled) return;
-					settled = true;
-					resolve(value);
-				};
-				const abort = () => {
-					proc.kill("SIGTERM");
-					resolveOnce(undefined);
-				};
-				const handleSigint = () => abort();
-				let buffer = "";
-				const processLine = (line: string) => {
-					if (!line.trim()) return;
-					try {
-						const event = JSON.parse(line) as JsonRecord;
-						if (applyLiveRoleEvent(liveActivity, event, messages)) updateActivity(true);
-					} catch {
-						// ignore malformed lines
-					}
-				};
-				proc.stdout.on("data", (chunk) => {
-					buffer += chunk.toString();
-					const lines = buffer.split("\n");
-					buffer = lines.pop() ?? "";
-					for (const line of lines) processLine(line);
-				});
-				proc.stderr.on("data", (chunk) => {
-					stderr += chunk.toString();
-				});
-				proc.on("close", (code) => {
-					process.off("SIGINT", handleSigint);
-					if (buffer.trim()) processLine(buffer);
-					resolveOnce(code === 0 ? liveActivity.lastAssistantText?.trim() || undefined : undefined);
-				});
-				proc.on("error", () => {
-					process.off("SIGINT", handleSigint);
-					resolveOnce(undefined);
-				});
-				process.once("SIGINT", handleSigint);
-				if (overlay) {
-					overlay.onAbort = () => {
-						process.off("SIGINT", handleSigint);
-						abort();
-					};
-				}
-			});
-			liveRoleActivityByRoot.set(rootKey, cloneLiveRoleActivity(liveActivity, { status: output ? "ok" : "error" }));
-			await refreshStatus(ctx);
-			return output;
-		} finally {
-			clearInterval(heartbeat);
-			setTimeout(() => {
-				const current = liveRoleActivityByRoot.get(rootKey);
-				if (current && current.role === analystRole && current.status !== "running") {
-					liveRoleActivityByRoot.delete(rootKey);
-					void refreshStatus(ctx);
-				}
-			}, 10_000);
-			await fsp.rm(systemPromptTemp.dir, { recursive: true, force: true });
-		}
-	};
-	if (getCtxHasUI(ctx)) {
-		const ui = getCtxUi(ctx);
-		if (ui) {
-			return await ui.custom<string | undefined>((_tui, theme, _kb, done) => {
-				finishOverlay = done;
-				overlay = new StartupAnalystOverlay(theme);
-				overlay.setLines(contextProposalAnalystProgressLines(liveActivity));
-				run().then(settleOverlay).catch(() => settleOverlay(undefined));
-				return overlay;
-			});
-		}
-	}
-	return await run();
-}
-
-async function analyzeContextProposalWithAgent(
-	ctx: { cwd: string; hasUI: boolean; ui: any; model?: any; modelRegistry?: any },
-	projectName: string,
-	recentEntries: RecentDiscussionEntry[],
-	hintText?: string,
-): Promise<ContextProposal | undefined> {
-	if (shouldDisableContextProposalAnalyst()) return undefined;
-	const testOutput = completionTestContextProposalAnalystOutput();
-	if (testOutput) {
-		return parseContextProposalAnalystOutput(testOutput, projectName);
-	}
-	if (recentEntries.length === 0 && !hintText?.trim()) return undefined;
-	try {
-		const raw = await runContextProposalAnalystSubprocess(ctx, projectName, recentEntries, hintText);
-		if (!raw) return undefined;
-		return parseContextProposalAnalystOutput(raw, projectName);
-	} catch (error) {
-		console.warn("[completion] context proposal analyst failed", error);
-		return undefined;
-	}
-}
-
-function buildContextProposalGoalText(proposal: {
-	mission: string;
-	scope: string[];
-	constraints: string[];
-	acceptance: string[];
-}): string {
-	const lines = [`Mission: ${proposal.mission}`];
-	if (proposal.scope.length > 0) {
-		lines.push("", "Scope:");
-		for (const item of proposal.scope) lines.push(`- ${item}`);
-	}
-	if (proposal.constraints.length > 0) {
-		lines.push("", "Constraints:");
-		for (const item of proposal.constraints) lines.push(`- ${item}`);
-	}
-	if (proposal.acceptance.length > 0) {
-		lines.push("", "Acceptance:");
-		for (const item of proposal.acceptance) lines.push(`- ${item}`);
-	}
-	return lines.join("\n");
-}
-
-function buildContextProposalDisplayText(proposal: ContextProposal): string {
-	const lines = ["Mission", proposal.mission];
-	if (proposal.scope.length > 0) {
-		lines.push("", "Scope");
-		for (const item of proposal.scope) lines.push(`- ${item}`);
-	}
-	if (proposal.constraints.length > 0) {
-		lines.push("", "Constraints");
-		for (const item of proposal.constraints) lines.push(`- ${item}`);
-	}
-	if (proposal.acceptance.length > 0) {
-		lines.push("", "Acceptance");
-		for (const item of proposal.acceptance) lines.push(`- ${item}`);
-	}
-	return lines.join("\n");
-}
-
-function finalizeContextProposalAnalysis(analysis: ContextProposalAnalysis | undefined, hintTexts: string[] = []): ContextProposalAnalysis {
-	const merged = mergeContextProposalAnalysis(analysis ? [analysis] : [], hintTexts);
-	return {
-		taskType: merged.taskType ?? DEFAULT_TASK_TYPE,
-		evaluationProfile: merged.evaluationProfile ?? DEFAULT_EVALUATION_PROFILE,
-		critique: merged.critique,
-		risks: merged.risks,
-		possibleNoise: merged.possibleNoise,
-	};
-}
-
-function buildContextProposalCritiqueText(analysis: ContextProposalAnalysis): string {
-	const lines: string[] = [];
-	if (analysis.critique.length > 0) {
-		lines.push("Critique");
-		for (const item of analysis.critique) lines.push(`- ${item}`);
-	}
-	if (analysis.risks.length > 0) {
-		if (lines.length > 0) lines.push("");
-		lines.push("Risks");
-		for (const item of analysis.risks) lines.push(`- ${item}`);
-	}
-	if (analysis.possibleNoise.length > 0) {
-		if (lines.length > 0) lines.push("");
-		lines.push("Possible noise");
-		for (const item of analysis.possibleNoise) lines.push(`- ${item}`);
-	}
-	if (lines.length === 0) {
-		return "No critique, risk, or possible-noise notes were derived for this startup proposal.";
-	}
-	return lines.join("\n");
-}
-
-function buildContextProposalRoutingText(analysis: ContextProposalAnalysis): string {
-	return [`- task_type: ${analysis.taskType ?? DEFAULT_TASK_TYPE}`, `- evaluation_profile: ${analysis.evaluationProfile ?? DEFAULT_EVALUATION_PROFILE}`].join(
-		"\n",
-	);
-}
-
-function summarizeContextProposalAnalysisItems(label: string, items: string[]): string | undefined {
-	if (items.length === 0) return undefined;
-	return `${label}=${truncateInline(items.join(" | "), 160)}`;
-}
-
-function buildContextProposalContinuationReason(prefix: string, goalText: string, analysis: ContextProposalAnalysis): string {
-	const critiqueParts = [
-		analysis.critique.length > 0 ? `accepted critique=${truncateInline(analysis.critique.join(" | "), 160)}` : "accepted critique=none",
-		summarizeContextProposalAnalysisItems("risks", analysis.risks),
-		summarizeContextProposalAnalysisItems("possible_noise", analysis.possibleNoise),
-	].filter((part): part is string => Boolean(part));
-	return `${prefix} ${truncateInline(goalText, 220)} | startup routing: task_type=${analysis.taskType ?? DEFAULT_TASK_TYPE}; evaluation_profile=${analysis.evaluationProfile ?? DEFAULT_EVALUATION_PROFILE}; critique outcome=${critiqueParts.join("; ")}`;
-}
-
-function buildContextProposalConfirmationActions(): ContextProposalConfirmationActionItem[] {
-	return [
-		{
-			id: "start",
-			label: "Start",
-			description: "Accept this proposal and let /cook write or refocus canonical workflow state.",
-		},
-		{
-			id: "cancel",
-			label: "Cancel",
-			description: `Stop here without changing canonical workflow state. ${COOK_MAIN_CHAT_RERUN_GUIDANCE}`,
-		},
-	];
-}
-
-function buildContextProposalConfirmationLayout(
-	title: string,
-	proposal: ContextProposal,
-): ContextProposalConfirmationLayout {
-	const analysis = finalizeContextProposalAnalysis(proposal.analysis, [proposal.goalText, proposal.mission]);
-	return {
-		title,
-		intro: "Review the proposed mission, scope, constraints, acceptance, critique, and routing details before /cook writes canonical workflow state. This gate is approval-only: either Start it as-is or Cancel, discuss changes in the main chat, and rerun /cook.",
-		proposalHeading: "Proposed workflow",
-		proposalBody: buildContextProposalDisplayText(proposal),
-		critiqueHeading: "Critique and risks",
-		critiqueBody: buildContextProposalCritiqueText(analysis),
-		routingHeading: "Routing recommendations",
-		routingBody: buildContextProposalRoutingText(analysis),
-		actionsHeading: "Actions",
-		actions: buildContextProposalConfirmationActions(),
-		footer: "↑↓ navigate • enter select • esc cancel",
-	};
-}
-
-function maybeWriteContextProposalConfirmationSnapshot(layout: ContextProposalConfirmationLayout): void {
-	const snapshotPath = completionTestContextProposalUiSnapshotPath();
-	if (!snapshotPath) return;
-	try {
-		fs.mkdirSync(path.dirname(snapshotPath), { recursive: true });
-		fs.writeFileSync(snapshotPath, `${JSON.stringify(layout, null, 2)}\n`, "utf8");
-	} catch {
-		// ignore malformed or unwritable test snapshot paths
-	}
-}
-
-function maybeWriteContextProposalSnapshot(proposal: ContextProposal): void {
-	const snapshotPath = completionTestContextProposalSnapshotPath();
-	if (!snapshotPath) return;
-	try {
-		fs.mkdirSync(path.dirname(snapshotPath), { recursive: true });
-		fs.writeFileSync(snapshotPath, `${JSON.stringify(proposal, null, 2)}\n`, "utf8");
-	} catch {
-		// ignore malformed or unwritable test snapshot paths
-	}
-}
-
-function buildContextProposalConfirmationSelectItems(layout: ContextProposalConfirmationLayout): SelectItem[] {
-	return layout.actions.map((action) => ({
-		value: action.id,
-		label: action.label,
-		description: action.description,
-	}));
+function buildContextProposalConfirmationLayout(
+	title: string,
+	proposal: ContextProposal,
+): ContextProposalConfirmationLayout {
+	return buildExtractedContextProposalConfirmationLayout({
+		title,
+		proposal,
+		analysis: finalizeContextProposalAnalysis(proposal.analysis, [proposal.goalText, proposal.mission]),
+		mainChatRerunGuidance: COOK_MAIN_CHAT_RERUN_GUIDANCE,
+		defaultTaskType: DEFAULT_TASK_TYPE,
+		defaultEvaluationProfile: DEFAULT_EVALUATION_PROFILE,
+	});
 }
 
 async function promptContextProposalConfirmationAction(
@@ -1538,258 +363,59 @@ async function promptContextProposalConfirmationAction(
 	});
 }
 
-async function resolveContextProposalConfirmationAction(
-	proposal: ContextProposal,
-	action: ContextProposalConfirmAction,
-): Promise<ContextProposalDecision | undefined> {
-	if (action === "cancel") return undefined;
-	return {
-		missionAnchor: proposal.mission,
-		goalText: proposal.goalText,
-		analysis: finalizeContextProposalAnalysis(proposal.analysis, [proposal.goalText, proposal.mission]),
-	};
-}
-
-function parseContextProposal(text: string, projectName: string): ContextProposal | undefined {
-	const cleaned = stripCodeBlocks(text).replace(/\r/g, "").trim();
-	if (!cleaned) return undefined;
-	const lines = cleaned
-		.split("\n")
-		.map((line) => line.trim())
-		.filter((line) => line.length > 0);
-	if (lines.length === 0) return undefined;
-
-	let section: ContextProposalSection | undefined;
-	let missionLine: string | undefined;
-	let taskTypeHint: string | undefined;
-	let evaluationProfileHint: string | undefined;
-	const scope: string[] = [];
-	const constraints: string[] = [];
-	const acceptance: string[] = [];
-	const critique: string[] = [];
-	const risks: string[] = [];
-	let structuredSignalCount = 0;
-
-	for (const rawLine of lines) {
-		const routingHint = matchContextProposalRoutingHint(rawLine);
-		if (routingHint) {
-			structuredSignalCount += 1;
-			if (routingHint.field === "taskType") taskTypeHint = routingHint.value;
-			else evaluationProfileHint = routingHint.value;
-			continue;
-		}
-		const inlineSection = matchInlineProposalSection(rawLine);
-		if (inlineSection) {
-			section = inlineSection.section;
-			structuredSignalCount += 1;
-			if (inlineSection.section === "mission" && !missionLine) {
-				missionLine = inlineSection.content;
-			} else if (inlineSection.section === "constraints") {
-				constraints.push(inlineSection.content);
-			} else if (inlineSection.section === "acceptance") {
-				acceptance.push(inlineSection.content);
-			} else if (inlineSection.section === "scope") {
-				scope.push(inlineSection.content);
-			} else if (inlineSection.section === "critique") {
-				critique.push(inlineSection.content);
-			} else if (inlineSection.section === "risks") {
-				risks.push(inlineSection.content);
-			}
-			continue;
-		}
-		const headerSection = detectProposalSection(rawLine);
-		if (headerSection) {
-			section = headerSection;
-			structuredSignalCount += 1;
-			continue;
-		}
-		const bullet = bulletText(rawLine);
-		if (bullet) {
-			structuredSignalCount += 1;
-			if (section === "mission" && !missionLine) {
-				missionLine = bullet;
-				continue;
-			}
-			if (section === "constraints") {
-				constraints.push(bullet);
-				continue;
-			}
-			if (section === "acceptance") {
-				acceptance.push(bullet);
-				continue;
-			}
-			if (section === "scope") {
-				scope.push(bullet);
-				continue;
-			}
-			if (section === "critique") {
-				critique.push(bullet);
-				continue;
-			}
-			if (section === "risks") {
-				risks.push(bullet);
-				continue;
-			}
-			if (!missionLine) {
-				missionLine = bullet;
-				continue;
-			}
-			if (looksLikeAcceptance(bullet)) acceptance.push(bullet);
-			else if (looksLikeConstraint(bullet)) constraints.push(bullet);
-			else scope.push(bullet);
-			continue;
-		}
-		const normalized = normalizeProposalLine(rawLine);
-		if (!normalized) continue;
-		if (!missionLine) {
-			missionLine = normalized;
-			continue;
-		}
-		if (section === "critique") {
-			critique.push(normalized);
-			continue;
-		}
-		if (section === "risks") {
-			risks.push(normalized);
-			continue;
-		}
-		if (section === "constraints" || looksLikeConstraint(normalized)) {
-			constraints.push(normalized);
-			continue;
-		}
-		if (section === "acceptance" || looksLikeAcceptance(normalized)) {
-			acceptance.push(normalized);
-			continue;
-		}
-		if (section === "scope") {
-			scope.push(normalized);
-		}
-	}
-
-	const basisPreview = cleaned.replace(/\s+/g, " ").trim();
-	const missionSource = missionLine ?? scope[0] ?? acceptance[0] ?? constraints[0] ?? basisPreview;
-	const assessment = assessMissionAnchor(missionSource, projectName);
-	const normalizedMission = normalizeMissionAnchorText(missionSource);
-	const itemCount = scope.length + constraints.length + acceptance.length + critique.length + risks.length;
-	const hasStrongStructure = structuredSignalCount >= 2 || itemCount >= 2;
-	if (!normalizedMission || isWeakMissionAnchor(normalizedMission)) return undefined;
-	if (!hasStrongStructure && basisPreview.length < 140) return undefined;
-	const mission = assessment.derived;
-	const analysis = buildContextProposalAnalysis({
-		taskType: taskTypeHint,
-		evaluationProfile: evaluationProfileHint,
-		critique,
-		risks,
-		hintTexts: [cleaned, mission, ...scope, ...constraints, ...acceptance, ...critique, ...risks],
-	});
-	const goalText = buildContextProposalGoalText({ mission, scope, constraints, acceptance });
-	return finalizeContextProposal(
-		{
-			mission,
-			scope,
-			constraints,
-			acceptance,
-			analysis,
-			goalText,
-			basisPreview,
-			source: "session",
-		},
-		projectName,
-	);
-}
-
-function hasStructuredContextProposalSignal(text: string): boolean {
-	const cleaned = stripCodeBlocks(text).replace(/\r/g, "").trim();
-	if (!cleaned) return false;
-	return /(^|\n)\s*(mission|goal|objective|summary|scope|plan|steps|implementation|constraints?|guardrails|non-goals|acceptance|acceptance criteria|deliverables|verification|critique|concerns?|warnings?|notes?|risks?|hazards?|task[\s_-]*type|evaluation[\s_-]*profile)\s*(?:[:：]\s*|$)/imu.test(
-		cleaned,
-	);
-}
-
-function parseStrictStructuredSessionProposal(text: string, projectName: string): ContextProposal | undefined {
-	const cleaned = stripCodeBlocks(text).replace(/\r/g, "").trim();
-	if (!cleaned) return undefined;
-	const lines = cleaned
-		.split("\n")
-		.map((line) => line.trim())
-		.filter((line) => line.length > 0);
-	if (lines.length === 0) return undefined;
-
-	let section: ContextProposalSection | undefined;
-	const sectionsPresent = new Set<ContextProposalSection>();
-	const missionCandidates: string[] = [];
-
-	for (const rawLine of lines) {
-		const inlineSection = matchInlineProposalSection(rawLine);
-		if (inlineSection) {
-			section = inlineSection.section;
-			sectionsPresent.add(section);
-			if (section === "mission") missionCandidates.push(inlineSection.content);
-			continue;
-		}
-		const headerSection = detectProposalSection(rawLine);
-		if (headerSection) {
-			section = headerSection;
-			sectionsPresent.add(section);
-			continue;
-		}
-		const normalized = bulletText(rawLine) ?? normalizeProposalLine(rawLine);
-		if (normalized && section === "mission") missionCandidates.push(normalized);
-	}
-
-	const requiredSections: ContextProposalSection[] = ["mission", "scope", "constraints", "acceptance"];
-	if (requiredSections.some((candidate) => !sectionsPresent.has(candidate))) return undefined;
-
-	const distinctMissionAnchors = Array.from(
-		new Set(
-			missionCandidates
-				.map((candidate) => normalizeMissionAnchorText(assessMissionAnchor(candidate, projectName).derived))
-				.filter((candidate): candidate is string => Boolean(candidate)),
-		),
-	);
-	if (distinctMissionAnchors.length !== 1) return undefined;
-
-	const proposal = parseContextProposal(cleaned, projectName);
-	if (!proposal) return undefined;
-	if (
-		normalizeMissionAnchorText(proposal.mission) !== distinctMissionAnchors[0] &&
-		!isGenericPlanningMissionAnchor(distinctMissionAnchors[0])
-	) {
-		return undefined;
-	}
-	if (proposal.scope.length === 0 || proposal.constraints.length === 0 || proposal.acceptance.length === 0) return undefined;
-	return { ...proposal, source: "session" };
-}
-
-function extractContextProposalFromStructuredSession(
-	recentEntries: RecentDiscussionEntry[],
-	projectName: string,
-): ContextProposal | undefined {
-	const structuredTexts = recentEntries
-		.slice()
-		.reverse()
-		.map((entry) => entry.text.trim())
-		.filter((text) => hasStructuredContextProposalSignal(text));
-	if (structuredTexts.length === 0) return undefined;
-	return parseStrictStructuredSessionProposal(structuredTexts.join("\n\n"), projectName);
-}
-
-async function extractContextProposalFromSession(
-	ctx: { cwd: string; hasUI: boolean; ui: any; sessionManager: any; model?: any; modelRegistry?: any },
-	projectName: string,
-	hintText?: string,
-): Promise<ContextProposal | undefined> {
-	const recentEntries = collectRecentDiscussionEntries(ctx);
-	return (await analyzeContextProposalWithAgent(ctx, projectName, recentEntries, hintText)) ??
-		extractContextProposalFromStructuredSession(recentEntries, projectName);
-}
-
 async function deriveCookContextProposal(
 	ctx: { cwd: string; hasUI: boolean; ui: any; sessionManager: any; model?: any; modelRegistry?: any },
 	projectName: string,
-	hintText?: string,
 ): Promise<ContextProposal | undefined> {
-	return await extractContextProposalFromSession(ctx, projectName, hintText);
+	const recentEntries = collectRecentDiscussionEntries(ctx, { isRecord, asString, isStaleContextError });
+	const snapshot = await loadCompletionSnapshot(getCtxCwd(ctx));
+	const workflowContextLines = snapshot
+		? [
+			`current mission anchor: ${asString(snapshot.state?.mission_anchor) ?? asString(snapshot.plan?.mission_anchor) ?? asString(snapshot.active?.mission_anchor) ?? "(none)"}`,
+			`continuation policy: ${asString(snapshot.state?.continuation_policy) ?? "(none)"}`,
+			`latest completed slice: ${asString(snapshot.state?.latest_completed_slice) ?? "(none)"}`,
+			`latest verified slice: ${asString(snapshot.state?.latest_verified_slice) ?? "(none)"}`,
+			`active slice goal: ${asString(snapshot.active?.goal) ?? "(none)"}`,
+			`active slice why_now: ${asString(snapshot.active?.why_now) ?? "(none)"}`,
+			`verification goal: ${asString(snapshot.verificationEvidence?.goal) ?? "(none)"}`,
+			`verification summary: ${asString(snapshot.verificationEvidence?.summary) ?? "(none)"}`,
+		]
+		: [];
+	return await deriveCookContextProposalFromRecentDiscussion(projectName, recentEntries, {
+		asString,
+		asStringArray,
+		workflowContext: snapshot
+			? {
+				currentMissionAnchor:
+					asString(snapshot.state?.mission_anchor) ?? asString(snapshot.plan?.mission_anchor) ?? asString(snapshot.active?.mission_anchor),
+				latestCompletedSlice: asString(snapshot.state?.latest_completed_slice),
+				latestVerifiedSlice: asString(snapshot.state?.latest_verified_slice),
+				activeSliceGoal: asString(snapshot.active?.goal),
+				activeSliceWhyNow: asString(snapshot.active?.why_now),
+				verificationGoal: asString(snapshot.verificationEvidence?.goal),
+				verificationSummary: asString(snapshot.verificationEvidence?.summary),
+				continuationPolicy: asString(snapshot.state?.continuation_policy),
+			}
+			: undefined,
+		analyzeContextProposal: async (entries) =>
+			await analyzeContextProposalWithAgent({
+				ctx,
+				projectName,
+				recentEntries: entries,
+				workflowContextLines,
+				liveRoleActivityByRoot,
+				completionStatusKey: COMPLETION_STATUS_KEY,
+				safeUiCall,
+				getCtxCwd,
+				getCtxHasUI,
+				getCtxUi,
+			}),
+		assessMissionAnchor,
+		isWeakMissionAnchor,
+		missionAnchorsStrictlyEquivalent,
+		normalizeMissionAnchorText,
+		stripCodeBlocks,
+	});
 }
 
 async function confirmContextProposal(
@@ -1797,917 +423,42 @@ async function confirmContextProposal(
 	proposal: ContextProposal,
 	options: ContextProposalConfirmOptions,
 ): Promise<ContextProposalDecision | undefined> {
-	maybeWriteContextProposalSnapshot(proposal);
+	maybeWriteContextProposalSnapshot(proposal, completionTestContextProposalSnapshotPath());
 	const actionOverride = completionTestContextProposalActionOverride();
 	if (actionOverride === "cancel") return undefined;
 	if (actionOverride === "accept") {
-		return await resolveContextProposalConfirmationAction(proposal, "start");
+		return resolveContextProposalConfirmationAction(proposal, "start");
 	}
 	const layout = buildContextProposalConfirmationLayout(options.title, proposal);
-	maybeWriteContextProposalConfirmationSnapshot(layout);
+	maybeWriteContextProposalConfirmationSnapshot(layout, completionTestContextProposalUiSnapshotPath());
 	const uiActionOverride = completionTestContextProposalUiActionOverride();
 	if (uiActionOverride) {
-		return await resolveContextProposalConfirmationAction(proposal, uiActionOverride);
+		return resolveContextProposalConfirmationAction(proposal, uiActionOverride);
 	}
 	if (!getCtxHasUI(ctx)) {
-		return options.nonInteractiveBehavior === "accept"
-			? await resolveContextProposalConfirmationAction(proposal, "start")
-			: undefined;
+		return options.nonInteractiveBehavior === "accept" ? resolveContextProposalConfirmationAction(proposal, "start") : undefined;
 	}
 	const ui = getCtxUi(ctx);
 	if (!ui) {
-		return options.nonInteractiveBehavior === "accept"
-			? await resolveContextProposalConfirmationAction(proposal, "start")
-			: undefined;
+		return options.nonInteractiveBehavior === "accept" ? resolveContextProposalConfirmationAction(proposal, "start") : undefined;
 	}
 	const choice = await promptContextProposalConfirmationAction(ui, layout);
 	if (!choice) return undefined;
-	return await resolveContextProposalConfirmationAction(proposal, choice);
-}
-
-function currentMissionAnchor(snapshot: CompletionStateSnapshot): string {
-	return (
-		asString(snapshot.state?.mission_anchor) ??
-		asString(snapshot.plan?.mission_anchor) ??
-		asString(snapshot.active?.mission_anchor) ??
-		path.basename(snapshot.files.root)
-	);
-}
-
-function currentTaskType(snapshot: CompletionStateSnapshot): string | undefined {
-	return (
-		asString(snapshot.active?.task_type) ??
-		asString(snapshot.state?.task_type) ??
-		asString(snapshot.plan?.task_type) ??
-		asString(snapshot.profile?.task_type)
-	);
-}
-
-function currentEvaluationProfile(snapshot: CompletionStateSnapshot): string | undefined {
-	return (
-		asString(snapshot.active?.evaluation_profile) ??
-		asString(snapshot.state?.evaluation_profile) ??
-		asString(snapshot.plan?.evaluation_profile) ??
-		asString(snapshot.profile?.evaluation_profile)
-	);
-}
-
-function completionContinuationFingerprint(snapshot: CompletionStateSnapshot): string | undefined {
-	if (asString(snapshot.state?.continuation_policy) !== "continue") return undefined;
-	const nextMandatoryRole = asString(snapshot.state?.next_mandatory_role);
-	if (!nextMandatoryRole) return undefined;
-	return JSON.stringify({
-		mission_anchor: asString(snapshot.state?.mission_anchor) ?? asString(snapshot.plan?.mission_anchor) ?? null,
-		task_type: currentTaskType(snapshot) ?? null,
-		evaluation_profile: currentEvaluationProfile(snapshot) ?? null,
-		current_phase: asString(snapshot.state?.current_phase) ?? null,
-		next_mandatory_role: nextMandatoryRole,
-		next_mandatory_action: asString(snapshot.state?.next_mandatory_action) ?? null,
-		active_status: asString(snapshot.active?.status) ?? null,
-		active_slice_id: asString(snapshot.active?.slice_id) ?? asString(snapshot.activeSlice?.slice_id) ?? null,
-		latest_completed_slice: asString(snapshot.state?.latest_completed_slice) ?? null,
-		latest_verified_slice: asString(snapshot.state?.latest_verified_slice) ?? null,
-	});
-}
-
-function noteQueuedDriverPrompt(rootKey: string, fingerprint: string): void {
-	const tracker = driverContinuationByRoot.get(rootKey);
-	if (tracker && tracker.fingerprint === fingerprint) {
-		tracker.attempts += 1;
-		tracker.inFlight = false;
-		tracker.warned = false;
-		return;
-	}
-	driverContinuationByRoot.set(rootKey, {
-		fingerprint,
-		attempts: 1,
-		inFlight: false,
-		warned: false,
-	});
-}
-
-function markQueuedDriverPromptInFlight(rootKey: string, fingerprint: string): void {
-	const tracker = driverContinuationByRoot.get(rootKey);
-	if (!tracker || tracker.fingerprint !== fingerprint) return;
-	tracker.inFlight = true;
-}
-
-function clearDriverContinuationTracker(rootKey: string): void {
-	driverContinuationByRoot.delete(rootKey);
-}
-
-function hasRunningCompletionRole(rootKey: string): boolean {
-	return liveRoleActivityByRoot.get(rootKey)?.status === "running";
-}
-
-function isWorkflowDriverActive(snapshot: CompletionStateSnapshot | undefined): boolean {
-	return Boolean(snapshot) && asString(snapshot?.state?.continuation_policy) === "continue";
-}
-
-function isDriverContinuationStateParked(rootKey: string, fingerprint: string): boolean {
-	const tracker = driverContinuationByRoot.get(rootKey);
-	if (!tracker || tracker.fingerprint !== fingerprint) return false;
-	return tracker.warned;
-}
-
-function rememberParkedDriverContinuation(rootKey: string, fingerprint: string): void {
-	const tracker = driverContinuationByRoot.get(rootKey);
-	if (!tracker || tracker.fingerprint !== fingerprint) return;
-	tracker.warned = true;
-	tracker.inFlight = false;
-}
-
-async function queueCompletionDriverPrompt(
-	pi: ExtensionAPI,
-	ctx: { cwd: string; hasUI: boolean; ui: any },
-	rootKey: string,
-	fingerprint: string,
-	prompt: string,
-	kind: "kickoff" | "resume" | "auto-resume",
-): Promise<boolean> {
-	const snapshotPath = kind === "auto-resume" ? completionTestAutoContinuePromptPath() : completionTestDriverPromptPath();
-	maybeWriteTestSnapshot(snapshotPath, `${prompt}\n`);
-	noteQueuedDriverPrompt(rootKey, fingerprint);
-	if (shouldSkipDriverKickoffForTests()) {
-		emitCommandText(ctx, `Skipped completion workflow ${kind} prompt (test mode)`, "info");
-		return false;
-	}
-	pi.sendUserMessage(prompt);
-	emitCommandText(ctx, `Queued completion workflow ${kind}`, "info");
-	return true;
-}
-
-async function autoContinueWorkflowIfNeeded(pi: ExtensionAPI, ctx: { cwd: string; hasUI: boolean; ui: any }): Promise<void> {
-	if (roleFromEnv()) return;
-	const snapshot = await loadCompletionSnapshot(getCtxCwd(ctx));
-	const rootKey = completionRootKey(snapshot, getCtxCwd(ctx));
-	if (!snapshot) {
-		clearDriverContinuationTracker(rootKey);
-		return;
-	}
-	if (!hasCompletionRoutingActivation(snapshot)) return;
-	const fingerprint = completionContinuationFingerprint(snapshot);
-	if (!fingerprint) {
-		clearDriverContinuationTracker(rootKey);
-		return;
-	}
-	if (!isWorkflowDriverActive(snapshot) || hasRunningCompletionRole(rootKey)) return;
-	const tracker = driverContinuationByRoot.get(rootKey);
-	if (tracker && tracker.fingerprint === fingerprint) {
-		if (tracker.inFlight) {
-			tracker.inFlight = false;
-			if (tracker.attempts >= DRIVER_AUTO_CONTINUE_MAX_ATTEMPTS) {
-				if (!isDriverContinuationStateParked(rootKey, fingerprint)) {
-					rememberParkedDriverContinuation(rootKey, fingerprint);
-					emitCommandText(
-						ctx,
-						`Completion workflow is parked before mandatory role dispatch: ${asString(snapshot.state?.next_mandatory_role) ?? "(unknown)"}. Rerun /cook to continue from canonical state.`,
-						"warning",
-					);
-				}
-				return;
-			}
-		} else {
-			return;
-		}
-	}
-	const resumePrompt = completionResumePrompt(currentTaskType(snapshot) ?? "(missing)", currentEvaluationProfile(snapshot) ?? "(missing)");
-	await queueCompletionDriverPrompt(pi, ctx, rootKey, fingerprint, resumePrompt, "auto-resume");
-}
-
-function isRubricEvaluationRole(role: string | undefined): role is RubricEvaluationRole {
-	return RUBRIC_EVALUATION_ROLES.includes(role as RubricEvaluationRole);
-}
-
-function activeSliceContext(snapshot: CompletionStateSnapshot) {
-	const active = snapshot.active;
-	const activeSlice = snapshot.activeSlice;
-	return {
-		sliceId: asString(active?.slice_id) ?? asString(activeSlice?.slice_id),
-		status: asString(active?.status) ?? asString(activeSlice?.status),
-		goal: asString(active?.goal) ?? asString(activeSlice?.goal),
-		contractIds:
-			asStringArray(active?.contract_ids).length > 0 ? asStringArray(active?.contract_ids) : asStringArray(activeSlice?.contract_ids),
-		acceptance:
-			asStringArray(active?.acceptance_criteria).length > 0
-				? asStringArray(active?.acceptance_criteria)
-				: asStringArray(activeSlice?.acceptance_criteria),
-		implementationSurfaces: asStringArray(active?.implementation_surfaces),
-		verificationCommands: asStringArray(active?.verification_commands),
-		lockedNotes: asStringArray(active?.locked_notes),
-		mustFixFindings: asStringArray(active?.must_fix_findings),
-		remainingBefore: asStringArray(active?.remaining_contract_ids_before),
-		basisCommit: asString(active?.basis_commit),
-		releaseBlockerCountBefore: asNumber(active?.release_blocker_count_before),
-		highValueGapCountBefore: asNumber(active?.high_value_gap_count_before),
-	};
-}
-
-function verificationEvidenceContext(snapshot: CompletionStateSnapshot) {
-	const evidence = snapshot.verificationEvidence;
-	return {
-		path: path.relative(snapshot.files.root, snapshot.files.verificationEvidencePath) || ".agent/verification-evidence.json",
-		status: evidence ? "present" : "missing",
-		subjectType: asString(evidence?.subject_type),
-		sliceId: asString(evidence?.slice_id),
-		goal: asString(evidence?.goal),
-		contractIds: asStringArray(evidence?.contract_ids),
-		basisCommit: asString(evidence?.basis_commit),
-		headSha: asString(evidence?.head_sha),
-		verificationCommands: asStringArray(evidence?.verification_commands),
-		outcome: asString(evidence?.outcome),
-		recordedAt: asString(evidence?.recorded_at),
-		summary:
-			asString(evidence?.summary) ??
-			(evidence ? "Canonical verification evidence is present but its summary is missing." : "Canonical verification evidence is missing."),
-	};
-}
-
-function buildEvaluationRoleContextLines(snapshot: CompletionStateSnapshot, role: RubricEvaluationRole): string[] {
-	const context = activeSliceContext(snapshot);
-	const evidence = verificationEvidenceContext(snapshot);
-	const lines = [
-		`Canonical evaluation handoff for ${role}:`,
-		`- task_type: ${currentTaskType(snapshot) ?? "(missing)"}`,
-		`- evaluation_profile: ${currentEvaluationProfile(snapshot) ?? "(missing)"}`,
-		`- latest_completed_slice: ${asString(snapshot.state?.latest_completed_slice) ?? "(none)"}`,
-		`- active_slice_id: ${context.sliceId ?? "(none)"}`,
-		`- active_slice_status: ${context.status ?? "(unknown)"}`,
-		`- active_slice_goal: ${context.goal ?? "(unknown)"}`,
-		`- contract_ids: ${context.contractIds.length > 0 ? context.contractIds.join(", ") : "(none)"}`,
-		`- acceptance_criteria: ${context.acceptance.length > 0 ? context.acceptance.join(" | ") : "(none)"}`,
-		`- implementation_surfaces: ${context.implementationSurfaces.length > 0 ? context.implementationSurfaces.join(" | ") : "(none)"}`,
-		`- verification_commands: ${context.verificationCommands.length > 0 ? context.verificationCommands.join(" | ") : "(none)"}`,
-		`- locked_notes: ${context.lockedNotes.length > 0 ? context.lockedNotes.join(" | ") : "(none)"}`,
-		`- must_fix_findings: ${context.mustFixFindings.length > 0 ? context.mustFixFindings.join(" | ") : "(none)"}`,
-		`- basis_commit: ${context.basisCommit ?? "(none)"}`,
-		`- remaining_contract_ids_before: ${context.remainingBefore.length > 0 ? context.remainingBefore.join(", ") : "(none)"}`,
-		`- release_blocker_count_before: ${context.releaseBlockerCountBefore ?? "(unknown)"}`,
-		`- high_value_gap_count_before: ${context.highValueGapCountBefore ?? "(unknown)"}`,
-		`- verification_evidence_path: ${evidence.path}`,
-		`- verification_evidence_status: ${evidence.status}`,
-		`- verification_evidence_subject_type: ${evidence.subjectType ?? "(missing)"}`,
-		`- verification_evidence_slice_id: ${evidence.sliceId ?? "(none)"}`,
-		`- verification_evidence_contract_ids: ${evidence.contractIds.length > 0 ? evidence.contractIds.join(", ") : "(none)"}`,
-		`- verification_evidence_outcome: ${evidence.outcome ?? "(missing)"}`,
-		`- verification_evidence_recorded_at: ${evidence.recordedAt ?? "(missing)"}`,
-		`- verification_evidence_head_sha: ${evidence.headSha ?? "(missing)"}`,
-		`- verification_evidence_basis_commit: ${evidence.basisCommit ?? "(missing)"}`,
-		`- verification_evidence_commands: ${evidence.verificationCommands.length > 0 ? evidence.verificationCommands.join(" | ") : "(none)"}`,
-		`- verification_evidence_summary: ${evidence.summary}`,
-	];
-	return lines;
-}
-
-function buildEvaluationRoleReminderText(snapshot: CompletionStateSnapshot, role: RubricEvaluationRole): string {
-	return buildEvaluationRoleContextLines(snapshot, role).join(" ");
-}
-
-async function assessActiveWorkflowProposalRouting(
-	ctx: { cwd: string; hasUI: boolean; ui: any; sessionManager: any; model?: any; modelRegistry?: any },
-	snapshot: CompletionStateSnapshot,
-	hintText?: string,
-): Promise<ActiveWorkflowProposalAssessment> {
-	const currentMission = currentMissionAnchor(snapshot);
-	const projectName = path.basename(snapshot.files.root);
-	const proposal = await deriveCookContextProposal(ctx, projectName, hintText);
-	if (!proposal) {
-		const assessment: ActiveWorkflowProposalAssessment = {
-			action: "unclear",
-			currentMissionAnchor: currentMission,
-			reason: "missing_proposal",
-		};
-		maybeWriteActiveWorkflowRoutingSnapshot(assessment);
-		return assessment;
-	}
-	if (missionAnchorsLikelyEquivalent(currentMission, proposal.mission)) {
-		const assessment: ActiveWorkflowProposalAssessment = {
-			action: "continue",
-			currentMissionAnchor: currentMission,
-			proposal,
-			reason: "matching_mission",
-		};
-		maybeWriteActiveWorkflowRoutingSnapshot(assessment);
-		return assessment;
-	}
-	if (shouldTreatBareActiveWorkflowProposalAsClearRefocus(proposal)) {
-		const assessment: ActiveWorkflowProposalAssessment = {
-			action: "refocus",
-			currentMissionAnchor: currentMission,
-			proposal,
-			reason: "clear_refocus",
-		};
-		maybeWriteActiveWorkflowRoutingSnapshot(assessment);
-		return assessment;
-	}
-	const assessment: ActiveWorkflowProposalAssessment = {
-		action: "unclear",
-		currentMissionAnchor: currentMission,
-		proposal,
-		reason: "ambiguous_discussion",
-	};
-	maybeWriteActiveWorkflowRoutingSnapshot(assessment);
-	return assessment;
-}
-
-async function resumeActiveWorkflowFromCanonicalState(
-	pi: any,
-	ctx: { cwd: string; hasUI: boolean; ui: any },
-	snapshot: CompletionStateSnapshot,
-): Promise<void> {
-	activateCompletionRoutingForRoot(snapshot.files.root);
-	const mission = currentMissionAnchor(snapshot);
-	pi.setSessionName(`completion: ${mission.slice(0, 60)}`);
-	const resumePrompt = completionResumePrompt(
-		currentTaskType(snapshot) ?? "(missing)",
-		currentEvaluationProfile(snapshot) ?? "(missing)",
-	);
-	const rootKey = completionRootKey(snapshot, getCtxCwd(ctx));
-	const fingerprint = completionContinuationFingerprint(snapshot) ?? JSON.stringify({
-		kind: "resume",
-		mission_anchor: mission,
-		current_phase: asString(snapshot.state?.current_phase) ?? null,
-		next_mandatory_role: asString(snapshot.state?.next_mandatory_role) ?? null,
-	});
-	const resumeKind = shouldTestAutoContinueOnSessionStart() && completionTestAutoContinuePromptPath() ? "auto-resume" : "resume";
-	await queueCompletionDriverPrompt(pi, ctx, rootKey, fingerprint, resumePrompt, resumeKind);
-}
-
-async function confirmExistingWorkflowProposal(
-	ctx: { hasUI: boolean; ui: any },
-	snapshot: CompletionStateSnapshot,
-	proposal: ContextProposal,
-	options: ExistingWorkflowChooserOptions = {},
-): Promise<ExistingWorkflowDecision | undefined> {
-	const currentMission = currentMissionAnchor(snapshot);
-	const comparison = options.comparison ?? "semantic";
-	const missionsMatch =
-		comparison === "strict"
-			? missionAnchorsStrictlyEquivalent(currentMission, proposal.mission)
-			: missionAnchorsLikelyEquivalent(currentMission, proposal.mission);
-	if (missionsMatch) {
-		return { action: "continue", currentMissionAnchor: currentMission };
-	}
-	const title = [
-		"Existing completion workflow found",
-		"",
-		options.intro ?? "A workflow is already in progress. Choose how /cook should proceed:",
-		"",
-		"Current mission",
-		currentMission,
-		"",
-		options.proposedMissionLabel ?? "New proposed mission",
-		proposal.mission,
-	].join("\n");
-	const continueChoice = "Continue current workflow\n\nKeep the current mission and treat the new goal as extra direction only.";
-	const refocusChoice =
-		options.refocusChoiceLabel ??
-		"Abandon current workflow and start this new one\n\nReview the proposed replacement in a final Start/Cancel confirmation before /cook rewrites canonical workflow state.";
-	const cancelChoice = `Cancel\n\nKeep the current workflow unchanged. ${COOK_MAIN_CHAT_RERUN_GUIDANCE}`;
-	maybeWriteTestSnapshot(
-		completionTestExistingWorkflowChooserSnapshotPath(),
-		`${JSON.stringify({ title, choices: [continueChoice, refocusChoice, cancelChoice] }, null, 2)}\n`,
-	);
-	const actionOverride = completionTestWorkflowActionOverride();
-	if (actionOverride === "continue") {
-		return { action: "continue", currentMissionAnchor: currentMission };
-	}
-	if (actionOverride === "refocus") {
-		return { action: "refocus", currentMissionAnchor: currentMission, missionAnchor: proposal.mission };
-	}
-	if (actionOverride === "cancel") return undefined;
-	if (!getCtxHasUI(ctx)) {
-		return { action: "continue", currentMissionAnchor: currentMission };
-	}
-	const ui = getCtxUi(ctx);
-	if (!ui) {
-		return { action: "continue", currentMissionAnchor: currentMission };
-	}
-	const choice = await ui.select(title, [continueChoice, refocusChoice, cancelChoice]);
-	if (!choice || choice === cancelChoice) return undefined;
-	if (choice === refocusChoice) {
-		return { action: "refocus", currentMissionAnchor: currentMission, missionAnchor: proposal.mission };
-	}
-	return { action: "continue", currentMissionAnchor: currentMission };
-}
-
-async function refocusCompletionMission(
-	snapshot: CompletionStateSnapshot,
-	missionAnchor: string,
-	rawGoal: string,
-	analysis?: ContextProposalAnalysis,
-): Promise<void> {
-	const requiredStopJudges = asNumber(snapshot.profile?.required_stop_judges) ?? 3;
-	const root = snapshot.files.root;
-	const routing = finalizeContextProposalAnalysis(analysis, [rawGoal, missionAnchor]);
-	const docsSurfaces = asStringArray(snapshot.profile?.docs_surfaces);
-	const nextProfile = buildProfileRecord({
-		projectName: asString(snapshot.profile?.project_name) ?? path.basename(root),
-		requiredStopJudges,
-		priorityPolicyId: asString(snapshot.profile?.priority_policy_id) ?? "completion-default",
-		docsSurfaces: docsSurfaces.length > 0 ? docsSurfaces : await detectDocsSurfaces(root),
-		taskType: routing.taskType,
-		evaluationProfile: routing.evaluationProfile,
-	});
-	const nextState = {
-		...defaultState(missionAnchor, {
-			taskType: routing.taskType,
-			evaluationProfile: routing.evaluationProfile,
-			continuationReason: buildContextProposalContinuationReason("User refocused workflow via /cook:", rawGoal, routing),
-		}),
-		remaining_stop_judges: requiredStopJudges,
-		next_mandatory_action: "Reconcile canonical state from current repo truth for the refocused mission",
-	};
-	const nextPlan = {
-		...defaultPlan(missionAnchor, { taskType: routing.taskType, evaluationProfile: routing.evaluationProfile }),
-		plan_basis: "user_refocus",
-	};
-	const nextActive = defaultActiveSlice(missionAnchor, { taskType: routing.taskType, evaluationProfile: routing.evaluationProfile });
-	await Promise.all([
-		fsp.writeFile(path.join(snapshot.files.agentDir, "mission.md"), buildMission(path.basename(root), missionAnchor), "utf8"),
-		writeJsonFile(snapshot.files.profilePath, nextProfile),
-		writeJsonFile(snapshot.files.statePath, nextState),
-		writeJsonFile(snapshot.files.planPath, nextPlan),
-		writeJsonFile(snapshot.files.activePath, nextActive),
-		writeJsonFile(snapshot.files.verificationEvidencePath, defaultVerificationEvidence()),
-	]);
-}
-
-function deriveMissionAnchor(rawGoal: string, projectName: string): string {
-	const normalized = normalizeMissionAnchorText(rawGoal);
-	if (!normalized || isWeakMissionAnchor(normalized)) {
-		return `Drive ${projectName} to truthful, verifiable completion.`;
-	}
-
-	let mission = normalized
-		.replace(/\b(end[- ]to[- ]end|for me|thanks|thank you)\b/gi, "")
-		.replace(/\s+/g, " ")
-		.trim();
-
-	mission = mission
-		.replace(/\bwith tests and docs\b/gi, "with tests and docs parity")
-		.replace(/\bwith tests and documentation\b/gi, "with tests and docs parity")
-		.replace(/\bwith docs\b/gi, "with docs parity")
-		.trim();
-
-	if (!/[.!?。！？]$/u.test(mission)) mission += ".";
-	return mission;
-}
-
-function buildProfileRecord(args: {
-	projectName: string;
-	requiredStopJudges: number;
-	priorityPolicyId?: string;
-	docsSurfaces: string[];
-	taskType?: string;
-	evaluationProfile?: string;
-}): JsonRecord {
-	return {
-		schema_version: 1,
-		protocol_id: PROTOCOL_ID,
-		project_name: args.projectName,
-		required_stop_judges: args.requiredStopJudges,
-		priority_policy_id: args.priorityPolicyId ?? "completion-default",
-		task_type: args.taskType ?? DEFAULT_TASK_TYPE,
-		evaluation_profile: args.evaluationProfile ?? DEFAULT_EVALUATION_PROFILE,
-		docs_surfaces: args.docsSurfaces,
-	};
-}
-
-function defaultState(
-	missionAnchor: string,
-	routing?: { taskType?: string; evaluationProfile?: string; continuationReason?: string },
-): JsonRecord {
-	return {
-		schema_version: 1,
-		mission_anchor: missionAnchor,
-		current_phase: "reground",
-		continuation_policy: "continue",
-		continuation_reason: routing?.continuationReason ?? "Fresh completion bootstrap requires canonical re-ground",
-		project_done: false,
-		task_type: routing?.taskType ?? DEFAULT_TASK_TYPE,
-		evaluation_profile: routing?.evaluationProfile ?? DEFAULT_EVALUATION_PROFILE,
-		requires_reground: true,
-		slices_since_last_reground: 0,
-		remaining_release_blockers: null,
-		remaining_high_value_gaps: null,
-		unsatisfied_contract_ids: [],
-		release_blocker_ids: [],
-		next_mandatory_action: "Reconcile canonical state from current repo truth",
-		next_mandatory_role: "completion-regrounder",
-		remaining_stop_judges: 3,
-		last_reground_at: null,
-		last_auditor_verdict: null,
-		contract_status: "unknown",
-		latest_completed_slice: null,
-		latest_verified_slice: null,
-	};
+	return resolveContextProposalConfirmationAction(proposal, choice);
 }
 
-function defaultPlan(
-	missionAnchor: string,
-	routing?: { taskType?: string; evaluationProfile?: string },
-): JsonRecord {
-	return {
-		schema_version: 1,
-		mission_anchor: missionAnchor,
-		task_type: routing?.taskType ?? DEFAULT_TASK_TYPE,
-		evaluation_profile: routing?.evaluationProfile ?? DEFAULT_EVALUATION_PROFILE,
-		last_reground_at: null,
-		plan_basis: "bootstrap",
-		candidate_slices: [],
-	};
-}
-
-function defaultActiveSlice(
-	missionAnchor: string,
-	routing?: { taskType?: string; evaluationProfile?: string },
-): JsonRecord {
-	return {
-		schema_version: 1,
-		mission_anchor: missionAnchor,
-		task_type: routing?.taskType ?? DEFAULT_TASK_TYPE,
-		evaluation_profile: routing?.evaluationProfile ?? DEFAULT_EVALUATION_PROFILE,
-		status: "idle",
-		slice_id: null,
-		goal: null,
-		contract_ids: [],
-		acceptance_criteria: [],
-		priority: null,
-		why_now: null,
-		blocked_on: [],
-		locked_notes: [],
-		must_fix_findings: [],
-		implementation_surfaces: [],
-		verification_commands: [],
-		basis_commit: null,
-		remaining_contract_ids_before: [],
-		release_blocker_count_before: null,
-		high_value_gap_count_before: null,
-	};
-}
 
-function defaultVerificationEvidence(): JsonRecord {
-	return {
-		schema_version: 1,
-		artifact_type: "completion-verification-evidence",
-		subject_type: "none",
-		slice_id: null,
-		goal: null,
-		contract_ids: [],
-		basis_commit: null,
-		head_sha: null,
-		verification_commands: [],
-		outcome: "not_recorded",
-		recorded_at: null,
-		summary: "No deterministic verification evidence is recorded yet because no selected slice or current-HEAD verification subject exists.",
-	};
-}
-
-function buildAgentReadme(projectName: string): string {
-	return `# Completion Control Plane\n\nThis repository uses the \`completion\` workflow for long-running coding tasks.\n\n## Canonical tracked contract files\n\n- \`.agent/README.md\`\n- \`.agent/mission.md\`\n- \`.agent/profile.json\`\n- \`.agent/verify_completion_stop.sh\`\n- \`.agent/verify_completion_control_plane.sh\`\n\n## Ignored canonical execution state\n\n- \`.agent/state.json\`\n- \`.agent/plan.json\`\n- \`.agent/active-slice.json\`\n- \`.agent/slice-history.jsonl\`\n- \`.agent/stop-check-history.jsonl\`\n- \`.agent/verification-evidence.json\`\n- \`.agent/*.log\`\n- \`.agent/tmp/\`\n\n\`.agent/verification-evidence.json\` is the durable canonical record of deterministic verification for the selected slice or current HEAD. Recovery, review, audit, and stop-check reminder surfaces consume it instead of temp-only artifacts or conversational summaries when it is populated.\n\nThe source of truth for long-running completion work is canonical \`.agent/**\` state plus current repo truth.\n\nProject: ${projectName}\n`;
-}
-
-function buildMission(projectName: string, missionAnchor: string): string {
-	return `# Mission\n\nProject: ${projectName}\n\nMission anchor:\n${missionAnchor}\n\nThis file is a tracked human-readable statement of the repo's completion mission. Re-grounders may refine this file when repo truth becomes clearer, but it must stay truthful to shipped behavior and the active completion objective.\n`;
-}
-
-function buildVerifyStopScript(verifierCommand?: string): string {
-	const repoCheck = verifierCommand
-		? `echo "[completion] running repo-level verification: ${verifierCommand}"\n${verifierCommand}`
-		: `echo "[completion] no repo-specific verifier auto-detected; control-plane verification only"`;
-	return `#!/usr/bin/env bash\nset -euo pipefail\n\nbash .agent/verify_completion_control_plane.sh\n${repoCheck}\n`;
-}
-
-function buildVerifyControlPlaneScript(): string {
-	return `#!/usr/bin/env bash
-set -euo pipefail
-
-for file in \
-  .agent/README.md \
-  .agent/mission.md \
-  .agent/profile.json \
-  .agent/verify_completion_stop.sh \
-  .agent/verify_completion_control_plane.sh \
-  .agent/state.json \
-  .agent/plan.json \
-  .agent/active-slice.json \
-  .agent/verification-evidence.json; do
-  [[ -e "$file" ]] || { echo "missing required file: $file"; exit 1; }
-done
-
-node <<'NODE'
-const childProcess = require('node:child_process');
-const fs = require('node:fs');
-
-const readJson = (file) => JSON.parse(fs.readFileSync(file, 'utf8'));
-const assert = (condition, message) => {
-  if (!condition) {
-    console.error(message);
-    process.exit(1);
-  }
-};
-const isObject = (value) => value !== null && typeof value === 'object' && !Array.isArray(value);
-const isString = (value) => typeof value === 'string';
-const isNonEmptyString = (value) => isString(value) && value.length > 0;
-const isStringArray = (value) => Array.isArray(value) && value.every((item) => typeof item === 'string');
-const hasOnlyKeys = (object, allowed, label) => {
-  const unknown = Object.keys(object).filter((key) => !allowed.includes(key));
-  assert(unknown.length === 0, label + ': unknown keys: ' + unknown.join(', '));
-};
-const requireKeys = (object, required, label) => {
-  for (const key of required) {
-    assert(Object.prototype.hasOwnProperty.call(object, key), label + ': missing required field: ' + key);
-  }
-};
-const hasOwn = (object, key) => Object.prototype.hasOwnProperty.call(object, key);
-const sameStringArrays = (left, right) => left.length === right.length && left.every((item, index) => item === right[index]);
-
-for (const file of ['.agent/profile.json', '.agent/state.json', '.agent/plan.json', '.agent/active-slice.json', '.agent/verification-evidence.json']) {
-  readJson(file);
-}
-
-const profile = readJson('.agent/profile.json');
-const state = readJson('.agent/state.json');
-const plan = readJson('.agent/plan.json');
-const active = readJson('.agent/active-slice.json');
-const evidence = readJson('.agent/verification-evidence.json');
-
-assert(isObject(profile), '.agent/profile.json must be an object');
-assert(isObject(state), '.agent/state.json must be an object');
-assert(isObject(plan), '.agent/plan.json must be an object');
-assert(isObject(active), '.agent/active-slice.json must be an object');
-assert(isObject(evidence), '.agent/verification-evidence.json must be an object');
-
-const requiredProfile = ['schema_version', 'protocol_id', 'project_name', 'required_stop_judges', 'priority_policy_id', 'task_type', 'evaluation_profile', 'docs_surfaces'];
-requireKeys(profile, requiredProfile, '.agent/profile.json');
-hasOnlyKeys(profile, requiredProfile, '.agent/profile.json');
-assert(profile.protocol_id === 'completion', '.agent/profile.json: protocol_id must be completion');
-assert(Array.isArray(profile.docs_surfaces), '.agent/profile.json: docs_surfaces must be an array');
-assert(isNonEmptyString(profile.task_type), '.agent/profile.json: task_type must be a non-empty string');
-assert(isNonEmptyString(profile.evaluation_profile), '.agent/profile.json: evaluation_profile must be a non-empty string');
-
-const requiredState = [
-  'schema_version','mission_anchor','task_type','evaluation_profile','current_phase','continuation_policy','continuation_reason','project_done',
-  'requires_reground','slices_since_last_reground','remaining_release_blockers','remaining_high_value_gaps',
-  'unsatisfied_contract_ids','release_blocker_ids','next_mandatory_action','next_mandatory_role',
-  'remaining_stop_judges','last_reground_at','last_auditor_verdict','contract_status','latest_completed_slice','latest_verified_slice'
-];
-const continuationPolicies = ['continue', 'await_user_input', 'blocked', 'paused', 'done'];
-const workflowRoles = ['completion-bootstrapper', 'completion-regrounder', 'completion-implementer', 'completion-reviewer', 'completion-auditor', 'completion-stop-judge', null];
-const workflowPhases = ['reground', 'implement', 'post_commit_review', 'post_commit_audit', 'post_commit_reconcile', 'stop_wave', 'awaiting_user', 'blocked', 'done'];
-requireKeys(state, requiredState, '.agent/state.json');
-hasOnlyKeys(state, requiredState, '.agent/state.json');
-assert(continuationPolicies.includes(state.continuation_policy), '.agent/state.json: invalid continuation_policy');
-assert(workflowRoles.includes(state.next_mandatory_role), '.agent/state.json: invalid next_mandatory_role');
-assert(workflowPhases.includes(state.current_phase), '.agent/state.json: invalid current_phase');
-assert(isNonEmptyString(state.task_type), '.agent/state.json: task_type must be a non-empty string');
-assert(isNonEmptyString(state.evaluation_profile), '.agent/state.json: evaluation_profile must be a non-empty string');
-assert(isStringArray(state.unsatisfied_contract_ids), '.agent/state.json: unsatisfied_contract_ids must be an array of strings');
-assert(isStringArray(state.release_blocker_ids), '.agent/state.json: release_blocker_ids must be an array of strings');
-
-const requiredPlan = ['schema_version', 'mission_anchor', 'task_type', 'evaluation_profile', 'last_reground_at', 'plan_basis', 'candidate_slices'];
-const requiredSlice = ['slice_id', 'goal', 'acceptance_criteria', 'contract_ids', 'priority', 'status', 'why_now', 'blocked_on', 'evidence'];
-const planMirrorFields = ['locked_notes', 'must_fix_findings', 'implementation_surfaces', 'verification_commands', 'basis_commit', 'remaining_contract_ids_before', 'release_blocker_count_before', 'high_value_gap_count_before'];
-const allowedSlice = [...requiredSlice, ...planMirrorFields];
-const sliceStatuses = ['planned', 'selected', 'in_progress', 'blocked', 'done', 'cancelled'];
-requireKeys(plan, requiredPlan, '.agent/plan.json');
-hasOnlyKeys(plan, requiredPlan, '.agent/plan.json');
-assert(isNonEmptyString(plan.task_type), '.agent/plan.json: task_type must be a non-empty string');
-assert(isNonEmptyString(plan.evaluation_profile), '.agent/plan.json: evaluation_profile must be a non-empty string');
-assert(Array.isArray(plan.candidate_slices), '.agent/plan.json: candidate_slices must be an array');
-for (const [index, slice] of plan.candidate_slices.entries()) {
-  const label = '.agent/plan.json candidate_slices[' + index + ']';
-  assert(isObject(slice), label + ' must be an object');
-  requireKeys(slice, requiredSlice, label);
-  hasOnlyKeys(slice, allowedSlice, label);
-  assert(isString(slice.slice_id) && slice.slice_id.length > 0, label + ': slice_id must be a non-empty string');
-  assert(isString(slice.goal) && slice.goal.length > 0, label + ': goal must be a non-empty string');
-  assert(Array.isArray(slice.acceptance_criteria) && slice.acceptance_criteria.length > 0 && slice.acceptance_criteria.every((item) => typeof item === 'string' && item.length > 0), label + ': acceptance_criteria must be a non-empty array of strings');
-  assert(isStringArray(slice.contract_ids), label + ': contract_ids must be an array of strings');
-  assert(typeof slice.priority === 'number' && Number.isFinite(slice.priority), label + ': priority must be a finite number');
-  assert(sliceStatuses.includes(slice.status), label + ': invalid status');
-  assert(isString(slice.why_now) && slice.why_now.length > 0, label + ': why_now must be a non-empty string');
-  assert(isStringArray(slice.blocked_on), label + ': blocked_on must be an array of strings');
-  assert(isStringArray(slice.evidence), label + ': evidence must be an array of strings');
-  if (hasOwn(slice, 'locked_notes')) assert(isStringArray(slice.locked_notes), label + ': locked_notes must be an array of strings when present');
-  if (hasOwn(slice, 'must_fix_findings')) assert(isStringArray(slice.must_fix_findings), label + ': must_fix_findings must be an array of strings when present');
-  if (hasOwn(slice, 'implementation_surfaces')) assert(isStringArray(slice.implementation_surfaces), label + ': implementation_surfaces must be an array of strings when present');
-  if (hasOwn(slice, 'verification_commands')) assert(isStringArray(slice.verification_commands), label + ': verification_commands must be an array of strings when present');
-  if (hasOwn(slice, 'basis_commit')) assert(isNonEmptyString(slice.basis_commit), label + ': basis_commit must be a non-empty string when present');
-  if (hasOwn(slice, 'remaining_contract_ids_before')) assert(isStringArray(slice.remaining_contract_ids_before), label + ': remaining_contract_ids_before must be an array of strings when present');
-  if (hasOwn(slice, 'release_blocker_count_before')) assert(typeof slice.release_blocker_count_before === 'number' && Number.isFinite(slice.release_blocker_count_before), label + ': release_blocker_count_before must be a finite number when present');
-  if (hasOwn(slice, 'high_value_gap_count_before')) assert(typeof slice.high_value_gap_count_before === 'number' && Number.isFinite(slice.high_value_gap_count_before), label + ': high_value_gap_count_before must be a finite number when present');
-}
-
-const isNonEmptyStringArray = (value) => Array.isArray(value) && value.length > 0 && value.every((item) => isNonEmptyString(item));
-const requiredActiveBase = ['schema_version', 'mission_anchor', 'task_type', 'evaluation_profile', 'status', 'slice_id', 'goal', 'contract_ids', 'acceptance_criteria', 'blocked_on', 'locked_notes', 'must_fix_findings', 'implementation_surfaces', 'verification_commands', 'basis_commit', 'remaining_contract_ids_before', 'release_blocker_count_before', 'high_value_gap_count_before'];
-const allowedActive = [...requiredActiveBase, 'priority', 'why_now'];
-const activeStatuses = ['idle', 'selected', 'in_progress', 'committed', 'done'];
-requireKeys(active, requiredActiveBase, '.agent/active-slice.json');
-hasOnlyKeys(active, allowedActive, '.agent/active-slice.json');
-assert(activeStatuses.includes(active.status), '.agent/active-slice.json: invalid status');
-assert(isNonEmptyString(active.task_type), '.agent/active-slice.json: task_type must be a non-empty string');
-assert(isNonEmptyString(active.evaluation_profile), '.agent/active-slice.json: evaluation_profile must be a non-empty string');
-assert(isStringArray(active.contract_ids), '.agent/active-slice.json: contract_ids must be an array of strings');
-assert(Array.isArray(active.acceptance_criteria), '.agent/active-slice.json: acceptance_criteria must be an array');
-assert(isStringArray(active.blocked_on), '.agent/active-slice.json: blocked_on must be an array of strings');
-assert(isStringArray(active.locked_notes), '.agent/active-slice.json: locked_notes must be an array of strings');
-assert(isStringArray(active.must_fix_findings), '.agent/active-slice.json: must_fix_findings must be an array of strings');
-assert(isStringArray(active.implementation_surfaces), '.agent/active-slice.json: implementation_surfaces must be an array of strings');
-assert(isStringArray(active.verification_commands), '.agent/active-slice.json: verification_commands must be an array of strings');
-assert(isStringArray(active.remaining_contract_ids_before), '.agent/active-slice.json: remaining_contract_ids_before must be an array of strings');
-
-const requiredEvidence = ['schema_version', 'artifact_type', 'subject_type', 'slice_id', 'goal', 'contract_ids', 'basis_commit', 'head_sha', 'verification_commands', 'outcome', 'recorded_at', 'summary'];
-const evidenceSubjectTypes = ['none', 'selected_slice', 'current_head'];
-const evidenceOutcomes = ['not_recorded', 'passed', 'failed'];
-requireKeys(evidence, requiredEvidence, '.agent/verification-evidence.json');
-hasOnlyKeys(evidence, requiredEvidence, '.agent/verification-evidence.json');
-assert(evidence.artifact_type === 'completion-verification-evidence', '.agent/verification-evidence.json: artifact_type must be completion-verification-evidence');
-assert(evidenceSubjectTypes.includes(evidence.subject_type), '.agent/verification-evidence.json: invalid subject_type');
-assert(evidence.slice_id === null || isNonEmptyString(evidence.slice_id), '.agent/verification-evidence.json: slice_id must be null or a non-empty string');
-assert(evidence.goal === null || isNonEmptyString(evidence.goal), '.agent/verification-evidence.json: goal must be null or a non-empty string');
-assert(isStringArray(evidence.contract_ids), '.agent/verification-evidence.json: contract_ids must be an array of strings');
-assert(evidence.basis_commit === null || isNonEmptyString(evidence.basis_commit), '.agent/verification-evidence.json: basis_commit must be null or a non-empty string');
-assert(evidence.head_sha === null || isNonEmptyString(evidence.head_sha), '.agent/verification-evidence.json: head_sha must be null or a non-empty string');
-assert(isStringArray(evidence.verification_commands), '.agent/verification-evidence.json: verification_commands must be an array of strings');
-assert(evidenceOutcomes.includes(evidence.outcome), '.agent/verification-evidence.json: invalid outcome');
-assert(evidence.recorded_at === null || (isNonEmptyString(evidence.recorded_at) && !Number.isNaN(Date.parse(evidence.recorded_at))), '.agent/verification-evidence.json: recorded_at must be null or an ISO-8601 string');
-assert(isNonEmptyString(evidence.summary), '.agent/verification-evidence.json: summary must be a non-empty string');
-
-assert(state.task_type === profile.task_type, '.agent/state.json: task_type must match .agent/profile.json');
-assert(plan.task_type === profile.task_type, '.agent/plan.json: task_type must match .agent/profile.json');
-assert(active.task_type === profile.task_type, '.agent/active-slice.json: task_type must match .agent/profile.json');
-assert(state.evaluation_profile === profile.evaluation_profile, '.agent/state.json: evaluation_profile must match .agent/profile.json');
-assert(plan.evaluation_profile === profile.evaluation_profile, '.agent/plan.json: evaluation_profile must match .agent/profile.json');
-assert(active.evaluation_profile === profile.evaluation_profile, '.agent/active-slice.json: evaluation_profile must match .agent/profile.json');
-
-const requiresExactHandoff = ['selected', 'in_progress', 'committed', 'done'].includes(active.status);
-if (requiresExactHandoff) {
-  assert(isNonEmptyStringArray(active.acceptance_criteria), '.agent/active-slice.json: acceptance_criteria must be a non-empty array of strings when status carries an exact handoff');
-  assert(typeof active.priority === 'number' && Number.isFinite(active.priority), '.agent/active-slice.json: priority must be a finite number when status carries an exact handoff');
-  assert(isString(active.why_now) && active.why_now.length > 0, '.agent/active-slice.json: why_now must be a non-empty string when status carries an exact handoff');
-  assert(isNonEmptyStringArray(active.implementation_surfaces), '.agent/active-slice.json: implementation_surfaces must be a non-empty array of strings when status carries an exact handoff');
-  assert(isNonEmptyStringArray(active.verification_commands), '.agent/active-slice.json: verification_commands must be a non-empty array of strings when status carries an exact handoff');
-  assert(isString(active.basis_commit) && active.basis_commit.length > 0, '.agent/active-slice.json: basis_commit must be a non-empty string when status carries an exact handoff');
-  assert(typeof active.release_blocker_count_before === 'number' && Number.isFinite(active.release_blocker_count_before), '.agent/active-slice.json: release_blocker_count_before must be a finite number when status carries an exact handoff');
-  assert(typeof active.high_value_gap_count_before === 'number' && Number.isFinite(active.high_value_gap_count_before), '.agent/active-slice.json: high_value_gap_count_before must be a finite number when status carries an exact handoff');
-
-  const planSlice = plan.candidate_slices.find((slice) => isObject(slice) && slice.slice_id === active.slice_id);
-  assert(isObject(planSlice), '.agent/active-slice.json: slice_id must match a slice in .agent/plan.json when status carries an exact handoff');
-  const drift = [];
-  if (planSlice.goal !== active.goal) drift.push('goal');
-  if (!sameStringArrays(planSlice.contract_ids, active.contract_ids)) drift.push('contract_ids');
-  if (!sameStringArrays(planSlice.acceptance_criteria, active.acceptance_criteria)) drift.push('acceptance_criteria');
-  if (!sameStringArrays(planSlice.blocked_on, active.blocked_on)) drift.push('blocked_on');
-  if (planSlice.priority !== active.priority) drift.push('priority');
-  if (planSlice.why_now !== active.why_now) drift.push('why_now');
-
-  const expectPlanArrayMirror = (field) => {
-    if (!hasOwn(planSlice, field) || !sameStringArrays(planSlice[field], active[field])) drift.push(field);
-  };
-  const expectPlanStringMirror = (field) => {
-    if (!hasOwn(planSlice, field) || planSlice[field] !== active[field]) drift.push(field);
-  };
-  const expectPlanNumberMirror = (field) => {
-    if (!hasOwn(planSlice, field) || planSlice[field] !== active[field]) drift.push(field);
-  };
-
-  expectPlanArrayMirror('implementation_surfaces');
-  expectPlanArrayMirror('verification_commands');
-  expectPlanArrayMirror('locked_notes');
-  expectPlanArrayMirror('must_fix_findings');
-  expectPlanStringMirror('basis_commit');
-  expectPlanArrayMirror('remaining_contract_ids_before');
-  expectPlanNumberMirror('release_blocker_count_before');
-  expectPlanNumberMirror('high_value_gap_count_before');
-  assert(drift.length === 0, '.agent/active-slice.json must match the selected .agent/plan.json slice across: ' + Array.from(new Set(drift)).join(', '));
-}
-
-const currentHead = (() => {
-  try {
-    return childProcess.execSync('git rev-parse HEAD', { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }).trim();
-  } catch {
-    return null;
-  }
-})();
-
-if (requiresExactHandoff) {
-  assert(evidence.subject_type === 'selected_slice', '.agent/verification-evidence.json: subject_type must be selected_slice when active slice exact handoff requires verification evidence');
-  assert(evidence.slice_id === active.slice_id, '.agent/verification-evidence.json: slice_id must match .agent/active-slice.json when active slice exact handoff requires verification evidence');
-  assert(evidence.goal === active.goal, '.agent/verification-evidence.json: goal must match .agent/active-slice.json when active slice exact handoff requires verification evidence');
-  assert(sameStringArrays(evidence.contract_ids, active.contract_ids), '.agent/verification-evidence.json: contract_ids must match .agent/active-slice.json when active slice exact handoff requires verification evidence');
-  assert(evidence.basis_commit === active.basis_commit, '.agent/verification-evidence.json: basis_commit must match .agent/active-slice.json when active slice exact handoff requires verification evidence');
-  assert(sameStringArrays(evidence.verification_commands, active.verification_commands), '.agent/verification-evidence.json: verification_commands must match .agent/active-slice.json when active slice exact handoff requires verification evidence');
-  assert(evidence.outcome === 'passed', '.agent/verification-evidence.json: outcome must be passed when active slice exact handoff requires verification evidence');
-  assert(isNonEmptyString(evidence.recorded_at) && !Number.isNaN(Date.parse(evidence.recorded_at)), '.agent/verification-evidence.json: recorded_at must be an ISO-8601 string when active slice exact handoff requires verification evidence');
-  if (currentHead) assert(evidence.head_sha === currentHead, '.agent/verification-evidence.json: head_sha must match current git HEAD when active slice exact handoff requires verification evidence');
-} else if (evidence.subject_type === 'none') {
-  assert(evidence.slice_id === null, '.agent/verification-evidence.json: slice_id must be null when subject_type is none');
-  assert(evidence.goal === null, '.agent/verification-evidence.json: goal must be null when subject_type is none');
-  assert(evidence.contract_ids.length === 0, '.agent/verification-evidence.json: contract_ids must be empty when subject_type is none');
-  assert(evidence.basis_commit === null, '.agent/verification-evidence.json: basis_commit must be null when subject_type is none');
-  assert(evidence.head_sha === null, '.agent/verification-evidence.json: head_sha must be null when subject_type is none');
-  assert(evidence.verification_commands.length === 0, '.agent/verification-evidence.json: verification_commands must be empty when subject_type is none');
-  assert(evidence.outcome === 'not_recorded', '.agent/verification-evidence.json: outcome must be not_recorded when subject_type is none');
-  assert(evidence.recorded_at === null, '.agent/verification-evidence.json: recorded_at must be null when subject_type is none');
-} else {
-  assert(evidence.outcome === 'passed', '.agent/verification-evidence.json: outcome must be passed when verification evidence is recorded');
-  assert(isNonEmptyStringArray(evidence.verification_commands), '.agent/verification-evidence.json: verification_commands must be a non-empty array when verification evidence is recorded');
-  assert(isNonEmptyString(evidence.recorded_at) && !Number.isNaN(Date.parse(evidence.recorded_at)), '.agent/verification-evidence.json: recorded_at must be an ISO-8601 string when verification evidence is recorded');
-  if (currentHead) assert(evidence.head_sha === currentHead, '.agent/verification-evidence.json: head_sha must match current git HEAD when verification evidence is recorded');
-  if (evidence.subject_type === 'selected_slice') {
-    assert(isNonEmptyString(evidence.slice_id), '.agent/verification-evidence.json: slice_id must be a non-empty string when subject_type is selected_slice');
-    assert(isNonEmptyString(evidence.goal), '.agent/verification-evidence.json: goal must be a non-empty string when subject_type is selected_slice');
-    assert(isNonEmptyString(evidence.basis_commit), '.agent/verification-evidence.json: basis_commit must be a non-empty string when subject_type is selected_slice');
-  } else {
-    assert(evidence.subject_type === 'current_head', '.agent/verification-evidence.json: only current_head or selected_slice may carry recorded verification evidence');
-  }
-}
-
-if (!requiresExactHandoff) {
-  assert(active.priority === null || active.priority === undefined || (typeof active.priority === 'number' && Number.isFinite(active.priority)), '.agent/active-slice.json: idle priority must be null/undefined or a finite number');
-  assert(active.why_now === null || active.why_now === undefined || typeof active.why_now === 'string', '.agent/active-slice.json: idle why_now must be null/undefined or a string');
-}
-NODE
-`;
-}
-
-async function ensureGitignore(root: string): Promise<boolean> {
-	const gitignorePath = path.join(root, ".gitignore");
-	const blockLines = [
-		"# completion protocol",
-		".agent/*",
-		"!.agent/README.md",
-		"!.agent/mission.md",
-		"!.agent/profile.json",
-		"!.agent/verify_completion_stop.sh",
-		"!.agent/verify_completion_control_plane.sh",
-		".agent/tmp/",
-	];
-	const block = blockLines.join("\n");
-	const existing = (await pathExists(gitignorePath)) ? await fsp.readFile(gitignorePath, "utf8") : "";
-	const filteredLines = existing
-		.split(/\r?\n/)
-		.filter((line) => !blockLines.includes(line.trim()));
-	while (filteredLines.length > 0 && filteredLines[filteredLines.length - 1]?.trim() === "") {
-		filteredLines.pop();
-	}
-	const base = filteredLines.join("\n").trimEnd();
-	const content = base.length > 0 ? `${base}\n\n${block}\n` : `${block}\n`;
-	if (content === existing) return false;
-	await fsp.writeFile(gitignorePath, content, "utf8");
-	return true;
-}
-
-type ScaffoldResult = {
-	root: string;
-	created: string[];
-	updated: string[];
-	missionAnchor: string;
-};
 
 async function scaffoldCompletionFiles(
 	root: string,
 	missionAnchor: string,
 	options?: { analysis?: ContextProposalAnalysis; continuationReason?: string },
-): Promise<ScaffoldResult> {
-	const files = resolveFiles(root);
-	const created: string[] = [];
-	const updated: string[] = [];
-	await fsp.mkdir(files.agentDir, { recursive: true });
-	await fsp.mkdir(path.join(files.agentDir, "tmp"), { recursive: true });
-	const projectName = path.basename(root);
+) {
 	const routing = finalizeContextProposalAnalysis(options?.analysis, [missionAnchor]);
-	const docsSurfaces = await detectDocsSurfaces(root);
-	const verifierCommand = await detectVerifierCommand(root);
-	const trackedFiles: Array<{ path: string; content: string; executable?: boolean }> = [
-		{ path: path.join(files.agentDir, "README.md"), content: buildAgentReadme(projectName) },
-		{ path: path.join(files.agentDir, "mission.md"), content: buildMission(projectName, missionAnchor) },
-		{
-			path: files.profilePath,
-			content: `${JSON.stringify(buildProfileRecord({ projectName, requiredStopJudges: 3, docsSurfaces, taskType: routing.taskType, evaluationProfile: routing.evaluationProfile }), null, 2)}\n`,
-		},
-		{ path: path.join(files.agentDir, "verify_completion_stop.sh"), content: buildVerifyStopScript(verifierCommand), executable: true },
-		{ path: path.join(files.agentDir, "verify_completion_control_plane.sh"), content: buildVerifyControlPlaneScript(), executable: true },
-		{
-			path: files.statePath,
-			content: `${JSON.stringify(defaultState(missionAnchor, { taskType: routing.taskType, evaluationProfile: routing.evaluationProfile, continuationReason: options?.continuationReason }), null, 2)}\n`,
-		},
-		{ path: files.planPath, content: `${JSON.stringify(defaultPlan(missionAnchor, { taskType: routing.taskType, evaluationProfile: routing.evaluationProfile }), null, 2)}\n` },
-		{ path: files.activePath, content: `${JSON.stringify(defaultActiveSlice(missionAnchor, { taskType: routing.taskType, evaluationProfile: routing.evaluationProfile }), null, 2)}\n` },
-		{ path: files.verificationEvidencePath, content: `${JSON.stringify(defaultVerificationEvidence(), null, 2)}\n` },
-		{ path: files.sliceHistoryPath, content: "" },
-		{ path: files.stopHistoryPath, content: "" },
-	];
-	for (const file of trackedFiles) {
-		if (await pathExists(file.path)) continue;
-		await fsp.writeFile(file.path, file.content, "utf8");
-		if (file.executable) await fsp.chmod(file.path, 0o755);
-		created.push(path.relative(root, file.path));
-	}
-	if (await ensureGitignore(root)) updated.push(".gitignore");
-	return { root, created, updated, missionAnchor };
+	return await scaffoldCompletionFilesOnDisk(root, missionAnchor, {
+		analysis: { taskType: routing.taskType, evaluationProfile: routing.evaluationProfile },
+		continuationReason: options?.continuationReason,
+	});
 }
 
 function remainingSliceCount(plan: JsonRecord | undefined): number {
@@ -2787,37 +538,109 @@ function activeSliceContractDriftSummary(snapshot: CompletionStateSnapshot): str
 	return drift && drift.length > 0 ? drift.join(", ") : "none";
 }
 
-function activeSliceMatchesPlan(snapshot: CompletionStateSnapshot): "yes" | "no" | "unknown" {
-	const activeId = asString(snapshot.active?.slice_id);
-	if (!activeId) return "unknown";
-	const drift = activeSliceContractDriftFields(snapshot);
-	if (!snapshot.activeSlice || drift === undefined) return "no";
-	return drift.length === 0 ? "yes" : "no";
+function activeSliceMatchesPlan(snapshot: CompletionStateSnapshot): "yes" | "no" | "unknown" {
+	const activeId = asString(snapshot.active?.slice_id);
+	if (!activeId) return "unknown";
+	const drift = activeSliceContractDriftFields(snapshot);
+	if (!snapshot.activeSlice || drift === undefined) return "no";
+	return drift.length === 0 ? "yes" : "no";
+}
+
+function handoffSnapshotState(active: JsonRecord | undefined): "present" | "missing_or_unclear" {
+	const exactArrays = [
+		asStringArray(active?.acceptance_criteria),
+		asStringArray(active?.implementation_surfaces),
+		asStringArray(active?.verification_commands),
+	];
+	const required = [
+		active?.priority,
+		active?.why_now,
+		active?.blocked_on,
+		active?.locked_notes,
+		active?.must_fix_findings,
+		active?.basis_commit,
+		active?.remaining_contract_ids_before,
+		active?.release_blocker_count_before,
+		active?.high_value_gap_count_before,
+	];
+	return activeCarriesExactHandoff(active) && exactArrays.every((items) => items.length > 0) && required.every((value) => value !== undefined && value !== null)
+		? "present"
+		: "missing_or_unclear";
+}
+
+function hasRunningCompletionRole(rootKey: string): boolean {
+	return liveRoleActivityByRoot.get(rootKey)?.status === "running";
+}
+
+function isRubricEvaluationRole(role: string | undefined): role is RubricEvaluationRole {
+	return RUBRIC_EVALUATION_ROLES.includes(role as RubricEvaluationRole);
+}
+
+function activeSliceContext(snapshot: CompletionStateSnapshot) {
+	const active = snapshot.active;
+	const activeSlice = snapshot.activeSlice;
+	return {
+		sliceId: asString(active?.slice_id) ?? asString(activeSlice?.slice_id),
+		status: asString(active?.status) ?? asString(activeSlice?.status),
+		goal: asString(active?.goal) ?? asString(activeSlice?.goal),
+		contractIds:
+			asStringArray(active?.contract_ids).length > 0 ? asStringArray(active?.contract_ids) : asStringArray(activeSlice?.contract_ids),
+		acceptance:
+			asStringArray(active?.acceptance_criteria).length > 0
+				? asStringArray(active?.acceptance_criteria)
+				: asStringArray(activeSlice?.acceptance_criteria),
+		implementationSurfaces: asStringArray(active?.implementation_surfaces),
+		verificationCommands: asStringArray(active?.verification_commands),
+		lockedNotes: asStringArray(active?.locked_notes),
+		mustFixFindings: asStringArray(active?.must_fix_findings),
+		remainingBefore: asStringArray(active?.remaining_contract_ids_before),
+		basisCommit: asString(active?.basis_commit),
+		releaseBlockerCountBefore: asNumber(active?.release_blocker_count_before),
+		highValueGapCountBefore: asNumber(active?.high_value_gap_count_before),
+	};
+}
+
+function verificationEvidenceContext(snapshot: CompletionStateSnapshot) {
+	const evidence = snapshot.verificationEvidence;
+	return {
+		path: path.relative(snapshot.files.root, snapshot.files.verificationEvidencePath) || ".agent/verification-evidence.json",
+		status: evidence ? "present" : "missing",
+		subjectType: asString(evidence?.subject_type),
+		sliceId: asString(evidence?.slice_id),
+		goal: asString(evidence?.goal),
+		contractIds: asStringArray(evidence?.contract_ids),
+		basisCommit: asString(evidence?.basis_commit),
+		headSha: asString(evidence?.head_sha),
+		verificationCommands: asStringArray(evidence?.verification_commands),
+		outcome: asString(evidence?.outcome),
+		recordedAt: asString(evidence?.recorded_at),
+		summary:
+			asString(evidence?.summary) ??
+			(evidence ? "Canonical verification evidence is present but its summary is missing." : "Canonical verification evidence is missing."),
+	};
+}
+
+function buildEvaluationRoleContextLines(snapshot: CompletionStateSnapshot, role: RubricEvaluationRole): string[] {
+	return buildExtractedEvaluationRoleContextLines(snapshot, role, {
+		asString,
+		currentTaskType,
+		currentEvaluationProfile,
+		activeSliceContext,
+		verificationEvidenceContext,
+	});
 }
 
-function handoffSnapshotState(active: JsonRecord | undefined): "present" | "missing_or_unclear" {
-	const exactArrays = [
-		asStringArray(active?.acceptance_criteria),
-		asStringArray(active?.implementation_surfaces),
-		asStringArray(active?.verification_commands),
-	];
-	const required = [
-		active?.priority,
-		active?.why_now,
-		active?.blocked_on,
-		active?.locked_notes,
-		active?.must_fix_findings,
-		active?.basis_commit,
-		active?.remaining_contract_ids_before,
-		active?.release_blocker_count_before,
-		active?.high_value_gap_count_before,
-	];
-	return activeCarriesExactHandoff(active) && exactArrays.every((items) => items.length > 0) && required.every((value) => value !== undefined && value !== null)
-		? "present"
-		: "missing_or_unclear";
+function buildEvaluationRoleReminderText(snapshot: CompletionStateSnapshot, role: RubricEvaluationRole): string {
+	return buildExtractedEvaluationRoleReminderText(snapshot, role, {
+		asString,
+		currentTaskType,
+		currentEvaluationProfile,
+		activeSliceContext,
+		verificationEvidenceContext,
+	});
 }
 
-function buildSystemReminder(snapshot: CompletionStateSnapshot, sliceHistory: JsonRecord[], stopHistory: JsonRecord[]): string {
+function composeSystemReminder(snapshot: CompletionStateSnapshot, sliceHistory: JsonRecord[], stopHistory: JsonRecord[]): string {
 	const history = historyCounts(sliceHistory, stopHistory);
 	const implementationSurfaces = asStringArray(snapshot.active?.implementation_surfaces);
 	const verificationCommands = asStringArray(snapshot.active?.verification_commands);
@@ -2827,42 +650,37 @@ function buildSystemReminder(snapshot: CompletionStateSnapshot, sliceHistory: Js
 	const exactActiveContract = activeCarriesExactHandoff(snapshot.active);
 	const activeContractDrift = activeSliceContractDriftSummary(snapshot);
 	const evidence = verificationEvidenceContext(snapshot);
-	const lines = [
-		"Completion workflow detected.",
-		"Canonical truth lives in .agent/state.json, .agent/plan.json, .agent/active-slice.json, .agent/slice-history.jsonl, .agent/stop-check-history.jsonl, and .agent/verification-evidence.json.",
-		`Mission anchor: ${asString(snapshot.state?.mission_anchor) ?? "(unknown)"}`,
-		`Task type: ${currentTaskType(snapshot) ?? "(missing)"}`,
-		`Evaluation profile: ${currentEvaluationProfile(snapshot) ?? "(missing)"}`,
-		`Current phase: ${asString(snapshot.state?.current_phase) ?? "unknown"}`,
-		`Continuation policy: ${asString(snapshot.state?.continuation_policy) ?? "unknown"}`,
-		`Continuation reason: ${asString(snapshot.state?.continuation_reason) ?? "(unknown)"}`,
-		`Next mandatory role: ${asString(snapshot.state?.next_mandatory_role) ?? "unknown"}`,
-		`Next mandatory action: ${asString(snapshot.state?.next_mandatory_action) ?? "unknown"}`,
-		`Remaining slice count: ${remainingSliceCount(snapshot.plan)}`,
-		`Remaining stop judges: ${asNumber(snapshot.state?.remaining_stop_judges) ?? "(unknown)"}`,
-		`History counts: reviewed=${history.reviewed}, audited=${history.audited}, accepted=${history.accepted}, reopened=${history.reopened}, judgments=${history.judgments}.`,
-		"Re-read canonical .agent state after compaction or recovery instead of relying on conversation memory.",
-		"If continuation_policy == continue, do not stop after a slice or ask whether to continue; dispatch the next mandatory role directly.",
-		"Only stop for the user when continuation_policy is await_user_input, blocked, paused, or done.",
-		"If canonical state is stale, invalid, ambiguous, or missing, route to completion-regrounder.",
-		"When recovering from compaction, prefer a deterministic restart from canonical files over conversational inference.",
-	];
-	if (exactActiveContract) {
-		lines.push("Selected/in-progress/committed/done .agent/active-slice.json is the canonical implementation contract.");
-		lines.push(`Active slice contract drift: ${activeContractDrift}`);
-	}
-	if (activePriority !== undefined) lines.push(`Active slice priority: ${activePriority}`);
-	if (activeWhyNow) lines.push(`Active slice why_now: ${activeWhyNow}`);
-	if (implementationSurfaces.length > 0) lines.push(`Active implementation surfaces: ${implementationSurfaces.join(", ")}`);
-	if (verificationCommands.length > 0) lines.push(`Active verification commands: ${verificationCommands.join(" | ")}`);
-	lines.push(`Verification evidence artifact: ${evidence.path} (${evidence.status})`);
-	if (evidence.subjectType) lines.push(`Verification evidence subject: ${evidence.subjectType}`);
-	if (evidence.outcome) lines.push(`Verification evidence outcome: ${evidence.outcome}`);
-	if (evidence.recordedAt) lines.push(`Verification evidence recorded_at: ${evidence.recordedAt}`);
-	if (evidence.verificationCommands.length > 0) lines.push(`Verification evidence commands: ${evidence.verificationCommands.join(" | ")}`);
-	lines.push(`Verification evidence summary: ${evidence.summary}`);
-	if (isRubricEvaluationRole(nextRole)) lines.push(buildEvaluationRoleReminderText(snapshot, nextRole));
-	return lines.join(" ");
+	const activePriorityLine = activePriority !== undefined ? `Active slice priority: ${activePriority}` : undefined;
+	const activeWhyNowLine = activeWhyNow ? `Active slice why_now: ${activeWhyNow}` : undefined;
+	const implementationSurfacesLine =
+		implementationSurfaces.length > 0 ? `Active implementation surfaces: ${implementationSurfaces.join(", ")}` : undefined;
+	const verificationCommandsLine =
+		verificationCommands.length > 0 ? `Active verification commands: ${verificationCommands.join(" | ")}` : undefined;
+	return buildExtractedSystemReminder({
+		missionAnchor: asString(snapshot.state?.mission_anchor),
+		taskType: currentTaskType(snapshot),
+		evaluationProfile: currentEvaluationProfile(snapshot),
+		currentPhase: asString(snapshot.state?.current_phase),
+		continuationPolicy: asString(snapshot.state?.continuation_policy),
+		continuationReason: asString(snapshot.state?.continuation_reason),
+		nextMandatoryRole: nextRole,
+		nextMandatoryAction: asString(snapshot.state?.next_mandatory_action),
+		remainingSliceCount: remainingSliceCount(snapshot.plan),
+		remainingStopJudges: asNumber(snapshot.state?.remaining_stop_judges) ?? "(unknown)",
+		history,
+		exactActiveContract,
+		activeContractDrift,
+		activePriority,
+		activeWhyNow,
+		implementationSurfaces,
+		verificationCommands,
+		activePriorityLine,
+		activeWhyNowLine,
+		implementationSurfacesLine,
+		verificationCommandsLine,
+		evidence,
+		evaluationRoleReminderText: isRubricEvaluationRole(nextRole) ? buildEvaluationRoleReminderText(snapshot, nextRole) : undefined,
+	});
 }
 
 function buildPostCompactionDriverInstructions(snapshot: CompletionStateSnapshot, marker: JsonRecord | undefined): string {
@@ -2978,7 +796,7 @@ function emitCommandText(ctx: { hasUI: boolean; ui: any }, text: string, level:
 	}
 }
 
-function buildResumeCapsule(snapshot: CompletionStateSnapshot, sliceHistory: JsonRecord[], stopHistory: JsonRecord[]): string {
+function composeResumeCapsule(snapshot: CompletionStateSnapshot, sliceHistory: JsonRecord[], stopHistory: JsonRecord[]): string {
 	const history = historyCounts(sliceHistory, stopHistory);
 	const acceptance = asStringArray(snapshot.active?.acceptance_criteria).length > 0
 		? asStringArray(snapshot.active?.acceptance_criteria)
@@ -2994,411 +812,51 @@ function buildResumeCapsule(snapshot: CompletionStateSnapshot, sliceHistory: Jso
 	const implementationSurfaces = asStringArray(snapshot.active?.implementation_surfaces);
 	const verificationCommands = asStringArray(snapshot.active?.verification_commands);
 	const remainingBefore = asStringArray(snapshot.active?.remaining_contract_ids_before);
-	const activeContractDrift = activeSliceContractDriftSummary(snapshot);
 	const evidence = verificationEvidenceContext(snapshot);
-	const lines = [
-		"Authoritative completion resume capsule:",
-		"",
-		"<completion-state>",
-		`mission_anchor: ${asString(snapshot.state?.mission_anchor) ?? "(unknown)"}`,
-		`task_type: ${currentTaskType(snapshot) ?? "(missing)"}`,
-		`evaluation_profile: ${currentEvaluationProfile(snapshot) ?? "(missing)"}`,
-		`current_phase: ${asString(snapshot.state?.current_phase) ?? "unknown"}`,
-		`continuation_policy: ${asString(snapshot.state?.continuation_policy) ?? "unknown"}`,
-		`continuation_reason: ${asString(snapshot.state?.continuation_reason) ?? "(unknown)"}`,
-		`requires_reground: ${asBoolean(snapshot.state?.requires_reground) ?? "unknown"}`,
-		`next_mandatory_role: ${asString(snapshot.state?.next_mandatory_role) ?? "unknown"}`,
-		`next_mandatory_action: ${asString(snapshot.state?.next_mandatory_action) ?? "unknown"}`,
-		`remaining_slice_count: ${remainingSliceCount(snapshot.plan)}`,
-		`remaining_stop_judges: ${asNumber(snapshot.state?.remaining_stop_judges) ?? "(unknown)"}`,
-		`active_slice_matches_plan: ${activeSliceMatchesPlan(snapshot)}`,
-		`active_slice_contract_drift_fields: ${activeContractDrift}`,
-		`implementer_handoff_snapshot: ${handoffSnapshotState(snapshot.active)}`,
-		`history_counts: reviewed=${history.reviewed}, audited=${history.audited}, accepted=${history.accepted}, reopened=${history.reopened}, judgments=${history.judgments}`,
-		"",
-		"verification_evidence:",
-		`- path: ${evidence.path}`,
-		`- status: ${evidence.status}`,
-		`- subject_type: ${evidence.subjectType ?? "(missing)"}`,
-		`- slice_id: ${evidence.sliceId ?? "(none)"}`,
-		`- contract_ids: ${evidence.contractIds.length > 0 ? evidence.contractIds.join(", ") : "(none)"}`,
-		`- outcome: ${evidence.outcome ?? "(missing)"}`,
-		`- recorded_at: ${evidence.recordedAt ?? "(missing)"}`,
-		`- head_sha: ${evidence.headSha ?? "(missing)"}`,
-		`- basis_commit: ${evidence.basisCommit ?? "(missing)"}`,
-		`- verification_commands: ${evidence.verificationCommands.length > 0 ? evidence.verificationCommands.join(" | ") : "(none)"}`,
-		`- summary: ${evidence.summary}`,
-		"",
-		"active_slice:",
-		`- slice_id: ${asString(snapshot.active?.slice_id) ?? asString(snapshot.activeSlice?.slice_id) ?? "(none)"}`,
-		`- status: ${asString(snapshot.active?.status) ?? asString(snapshot.activeSlice?.status) ?? "unknown"}`,
-		`- goal: ${asString(snapshot.active?.goal) ?? asString(snapshot.activeSlice?.goal) ?? "(unknown)"}`,
-		`- priority: ${asNumber(snapshot.active?.priority) ?? "(unknown)"}`,
-		`- why_now: ${asString(snapshot.active?.why_now) ?? "(unknown)"}`,
-		`- contract_ids: ${contractIds.length > 0 ? contractIds.join(", ") : "(none)"}`,
-	];
-	if (blockedOn.length > 0) lines.push(`- blocked_on: ${blockedOn.join(", ")}`);
-	if (lockedNotes.length > 0) lines.push(`- locked_notes: ${lockedNotes.join(" | ")}`);
-	if (mustFixFindings.length > 0) lines.push(`- must_fix_findings: ${mustFixFindings.join(" | ")}`);
-	if (implementationSurfaces.length > 0) lines.push(`- implementation_surfaces: ${implementationSurfaces.join(" | ")}`);
-	if (verificationCommands.length > 0) lines.push(`- verification_commands: ${verificationCommands.join(" | ")}`);
-	lines.push(`- basis_commit: ${asString(snapshot.active?.basis_commit) ?? "(none)"}`);
-	lines.push(`- remaining_contract_ids_before: ${remainingBefore.length > 0 ? remainingBefore.join(", ") : "(none)"}`);
-	lines.push(`- release_blocker_count_before: ${asNumber(snapshot.active?.release_blocker_count_before) ?? "(unknown)"}`);
-	lines.push(`- high_value_gap_count_before: ${asNumber(snapshot.active?.high_value_gap_count_before) ?? "(unknown)"}`);
-	lines.push("", "acceptance_criteria:");
-	if (acceptance.length === 0) lines.push("- (none)");
-	else lines.push(...acceptance.map((item) => `- ${item}`));
-	lines.push(
-		"",
-		"Rules:",
-		"- Treat this block as continuity support derived from canonical .agent state.",
-		"- For selected/in-progress/committed/done slices, .agent/active-slice.json is the canonical implementation contract and the selected plan slice must mirror it exactly.",
-		"- Preserve exact slice_id, goal, contract_ids, acceptance criteria, blocked_on, priority, why_now, implementation surfaces, verification commands, locked notes, must-fix findings, basis_commit, and before-slice counters where still true.",
-		"- When populated, .agent/verification-evidence.json is the durable canonical verification record for the selected slice or current HEAD and should be consumed instead of temp-only artifacts or conversational summaries.",
-		"- After compaction, re-read .agent/state.json, .agent/plan.json, .agent/active-slice.json, .agent/slice-history.jsonl, .agent/stop-check-history.jsonl, and .agent/verification-evidence.json before resuming long-running completion work.",
-		"- Invoke completion-regrounder before continuing when requires_reground is true or unknown.",
-		"- Invoke completion-regrounder before continuing when next_mandatory_role or next_mandatory_action is unknown or ambiguous.",
-		"- Invoke completion-regrounder before continuing when active_slice_matches_plan is no, active_slice_contract_drift_fields is not none, or implementer_handoff_snapshot is missing_or_unclear.",
-		"- If continuation_policy is continue, do not stop after a slice or ask whether to continue. Dispatch the next mandatory role directly.",
-		"- Only stop for the user when continuation_policy is await_user_input, blocked, paused, or done.",
-		"- If you are completion-implementer after compaction, resume from the canonical active-slice implementation contract instead of asking the user to resend the original caller payload.",
-		"- Do not replace canonical .agent state with summary inference.",
-		"</completion-state>",
-	);
-	return lines.join("\n");
-}
-
-function formatCount(count: number, singular: string, plural = `${singular}s`): string {
-	return `${count} ${count === 1 ? singular : plural}`;
-}
-
-function completionRemainingSummary(surface: {
-	remainingContractCount: number;
-	releaseBlockerCount: number;
-	highValueGapCount: number;
-	remainingStopJudgeCount: number;
-}): string {
-	return [
-		formatCount(surface.remainingContractCount, "contract"),
-		formatCount(surface.releaseBlockerCount, "blocker"),
-		formatCount(surface.highValueGapCount, "gap"),
-		formatCount(surface.remainingStopJudgeCount, "stop judge", "stop judges"),
-	].join(" · ");
-}
-
-function envNumber(name: string): number | undefined {
-	const raw = asString(process.env[name]);
-	if (!raw) return undefined;
-	const parsed = Number(raw);
-	return Number.isFinite(parsed) ? parsed : undefined;
-}
-
-function nowMs(): number {
-	return envNumber("PI_COMPLETION_TEST_NOW") ?? Date.now();
-}
-
-type LiveActivitySignal = {
-	state: "active" | "waiting" | "stalled";
-	idleMs: number;
-};
-
-function liveActivitySignal(activity: { status?: string; startedAt?: number; updatedAt?: number } | undefined): LiveActivitySignal | undefined {
-	if (!activity || activity.status !== "running") return undefined;
-	const anchor = activity.updatedAt ?? activity.startedAt;
-	if (anchor === undefined) return undefined;
-	const idleMs = Math.max(0, nowMs() - anchor);
-	return {
-		state: idleMs >= LIVE_ROLE_STALLED_MS ? "stalled" : idleMs >= LIVE_ROLE_WAITING_MS ? "waiting" : "active",
-		idleMs,
-	};
-}
-
-function formatLiveActivitySignal(signal: LiveActivitySignal | undefined): string | undefined {
-	if (!signal) return undefined;
-	if (signal.state === "active") return "activity: active";
-	return `activity: ${signal.state} (${formatElapsed(signal.idleMs)} since update)`;
-}
-
-function livePreviewForStatus(activity: LiveRoleActivity | undefined): string | undefined {
-	if (!activity || activity.status !== "running") return undefined;
-	return truncateInline(
-		activity.progress ?? activity.verifying ?? activity.toolActivity ?? activity.assistantSummary ?? activity.currentAction ?? activity.lastAssistantText ?? "",
-		120,
-	) || undefined;
-}
-
-function completionRootKey(snapshot: CompletionStateSnapshot | undefined, cwd: string): string {
-	return snapshot?.files.root ?? findCompletionRoot(cwd) ?? findRepoRoot(cwd) ?? path.resolve(cwd);
-}
-
-function cloneLiveRoleActivity(activity: LiveRoleActivity, overrides: Partial<LiveRoleActivity> = {}): LiveRoleActivity {
-	return {
-		...activity,
-		...overrides,
-		toolRecentActivity: [...(overrides.toolRecentActivity ?? activity.toolRecentActivity)],
-		recentActivity: [...(overrides.recentActivity ?? activity.recentActivity)],
-		stateDeltas: [...(overrides.stateDeltas ?? activity.stateDeltas)],
-	};
-}
-
-function createLiveRoleActivity(role: string, startedAt = nowMs()): LiveRoleActivity {
-	const currentAction = "Starting role subprocess";
-	return {
-		role,
-		status: "running",
-		currentAction,
-		toolActivity: currentAction,
-		toolRecentActivity: [currentAction],
-		recentActivity: [currentAction],
-		stateDeltas: [],
-		startedAt,
-		updatedAt: startedAt,
-	};
-}
-
-type RoleMessage = {
-	role: string;
-	content: Array<{ type: string; text?: string }>;
-};
-
-function activityTimestampMs(event: JsonRecord | undefined): number | undefined {
-	return asNumber(event?.updatedAt) ?? asNumber(event?.timestampMs) ?? asNumber(event?.timestamp) ?? asNumber(event?.at);
-}
-
-function asRoleMessage(value: unknown): RoleMessage | undefined {
-	if (!isRecord(value)) return undefined;
-	const role = asString(value.role);
-	const content = Array.isArray(value.content)
-		? value.content.flatMap((item) => {
-				if (!isRecord(item)) return [];
-				const type = asString(item.type);
-				if (!type) return [];
-				return [{ type, text: asString(item.text) }];
-		  })
-		: [];
-	if (!role) return undefined;
-	return { role, content };
-}
-
-function applyAssistantTextToLiveRoleActivity(activity: LiveRoleActivity, text: string, activityAt = nowMs()): boolean {
-	if (!text) return false;
-	activity.lastAssistantText = text;
-	const parsed = parseStructuredProgress(text);
-	if (parsed.progress) activity.progress = parsed.progress;
-	if (parsed.rationale) activity.rationale = parsed.rationale;
-	if (parsed.nextStep) activity.nextStep = parsed.nextStep;
-	if (parsed.verifying) activity.verifying = parsed.verifying;
-	if (parsed.stateDeltas.length > 0) activity.stateDeltas = parsed.stateDeltas;
-	const preview = truncateInline(text, 140);
-	activity.assistantSummary = activity.progress ?? activity.verifying ?? preview;
-	activity.currentAction = activity.assistantSummary;
-	if (activity.assistantSummary) activity.recentActivity = pushRecentActivity(activity.recentActivity, `assistant: ${activity.assistantSummary}`);
-	activity.updatedAt = activityAt;
-	return true;
-}
-
-function applyLiveRoleEvent(activity: LiveRoleActivity, event: JsonRecord, messages: RoleMessage[]): boolean {
-	const eventType = asString(event.type);
-	if (!eventType) return false;
-	const activityAt = activityTimestampMs(event) ?? nowMs();
-	if (eventType === "tool_execution_start") {
-		const toolName = asString(event.toolName) ?? "tool";
-		const toolArgs = isRecord(event.args) ? event.args : isRecord(event.input) ? event.input : {};
-		activity.toolActivity = formatToolActivity(toolName, toolArgs);
-		activity.currentAction = activity.toolActivity;
-		activity.toolRecentActivity = pushRecentActivity(activity.toolRecentActivity, activity.toolActivity, 6);
-		activity.recentActivity = pushRecentActivity(activity.recentActivity, activity.toolActivity);
-		activity.updatedAt = activityAt;
-		return true;
-	}
-	if (eventType === "tool_execution_end" || eventType === "tool_result_end") {
-		activity.updatedAt = activityAt;
-		return true;
-	}
-	if ((eventType === "message_update" || eventType === "message_end") && isRecord(event.message)) {
-		const message = asRoleMessage(event.message);
-		if (message && eventType === "message_end") messages.push(message);
-		const nextOutput = message ? lastAssistantText(eventType === "message_end" ? messages : [message]) : "";
-		if (nextOutput) return applyAssistantTextToLiveRoleActivity(activity, nextOutput, activityAt);
-		activity.updatedAt = activityAt;
-		return true;
-	}
-	return false;
-}
-
-function maybeInjectTestLiveRoleActivity(rootKey: string): void {
-	const raw = asString(process.env.PI_COMPLETION_TEST_LIVE_ROLE_ACTIVITY_JSON);
-	if (!raw) return;
-	try {
-		const parsed = JSON.parse(raw);
-		if (!isRecord(parsed)) return;
-		const currentAction = asString(parsed.currentAction);
-		const recentActivity = asStringArray(parsed.recentActivity).length > 0 ? asStringArray(parsed.recentActivity) : currentAction ? [currentAction] : [];
-		const toolActivity =
-			asString(parsed.toolActivity) ??
-			(currentAction && !currentAction.startsWith("assistant:") && !currentAction.startsWith("progress:") ? currentAction : undefined);
-		const assistantSummary =
-			asString(parsed.assistantSummary) ??
-			(currentAction?.startsWith("assistant:") ? currentAction.slice("assistant:".length).trim() : undefined);
-		liveRoleActivityByRoot.set(rootKey, {
-			role: asString(parsed.role) ?? "completion-implementer",
-			status: asString(parsed.status) === "ok" ? "ok" : asString(parsed.status) === "error" ? "error" : "running",
-			currentAction,
-			toolActivity,
-			toolRecentActivity: asStringArray(parsed.toolRecentActivity).length > 0 ? asStringArray(parsed.toolRecentActivity) : toolActivity ? [toolActivity] : [],
-			recentActivity,
-			assistantSummary,
-			lastAssistantText: asString(parsed.lastAssistantText),
-			progress: asString(parsed.progress),
-			rationale: asString(parsed.rationale),
-			nextStep: asString(parsed.nextStep),
-			verifying: asString(parsed.verifying),
-			stateDeltas: asStringArray(parsed.stateDeltas),
-			startedAt: asNumber(parsed.startedAt) ?? nowMs(),
-			updatedAt: asNumber(parsed.updatedAt) ?? nowMs(),
-		});
-	} catch {
-		// ignore malformed test override
-	}
-}
-
-function maybeReplayTestLiveRoleEvents(rootKey: string): void {
-	const raw = asString(process.env.PI_COMPLETION_TEST_ROLE_EVENT_STREAM_JSON);
-	if (!raw) return;
-	try {
-		const parsed = JSON.parse(raw);
-		let role = "completion-implementer";
-		let status: LiveRoleActivity["status"] = "running";
-		let startedAt = nowMs();
-		let events: JsonRecord[] = [];
-		if (Array.isArray(parsed)) {
-			events = parsed.filter(isRecord);
-		} else if (isRecord(parsed)) {
-			role = asString(parsed.role) ?? role;
-			status = asString(parsed.status) === "ok" ? "ok" : asString(parsed.status) === "error" ? "error" : "running";
-			startedAt = asNumber(parsed.startedAt) ?? asNumber(parsed.started_at) ?? startedAt;
-			events = Array.isArray(parsed.events) ? parsed.events.filter(isRecord) : [];
-		} else {
-			return;
-		}
-		const activity = createLiveRoleActivity(role, startedAt);
-		const messages: RoleMessage[] = [];
-		for (const event of events) applyLiveRoleEvent(activity, event, messages);
-		liveRoleActivityByRoot.set(rootKey, cloneLiveRoleActivity(activity, { status }));
-	} catch {
-		// ignore malformed event stream override
-	}
-}
-
-function buildCompletionStatusSurface(
-	snapshot: CompletionStateSnapshot | undefined,
-	liveActivity: LiveRoleActivity | undefined,
-): CompletionStatusSurface {
-	if (!snapshot) return { snapshotPresent: false, widgetLines: [] };
-	const currentPhase = asString(snapshot.state?.current_phase) ?? "unknown";
-	const sliceId = asString(snapshot.active?.slice_id) ?? asString(snapshot.activeSlice?.slice_id) ?? "(none)";
-	const sliceGoal = truncateInline(asString(snapshot.active?.goal) ?? asString(snapshot.activeSlice?.goal) ?? "(unknown)", 140);
-	const nextMandatoryRole = asString(snapshot.state?.next_mandatory_role) ?? "unknown";
-	const remainingContractCount = asStringArray(snapshot.state?.unsatisfied_contract_ids).length;
-	const releaseBlockerCount = asNumber(snapshot.state?.remaining_release_blockers) ?? 0;
-	const highValueGapCount = asNumber(snapshot.state?.remaining_high_value_gaps) ?? 0;
-	const remainingStopJudgeCount = asNumber(snapshot.state?.remaining_stop_judges) ?? 0;
-	const activeRole = liveActivity?.status === "running" ? liveActivity.role : undefined;
-	const liveSignal = liveActivitySignal(liveActivity);
-	const livePreview = livePreviewForStatus(liveActivity);
-	const liveDetailsLines = activeRole
-		? buildInlineRunningLines({
-				role: activeRole,
-				currentAction: liveActivity?.currentAction,
-				toolActivity: liveActivity?.toolActivity,
-				toolRecentActivity: liveActivity?.toolRecentActivity,
-				recentActivity: liveActivity?.recentActivity,
-				assistantSummary: liveActivity?.assistantSummary,
-				progress: liveActivity?.progress,
-				rationale: liveActivity?.rationale,
-				nextStep: liveActivity?.nextStep,
-				verifying: liveActivity?.verifying,
-				stateDeltas: liveActivity?.stateDeltas,
-				startedAt: liveActivity?.startedAt,
-				updatedAt: liveActivity?.updatedAt,
-		  })
-		: [];
-	const remainingSummary = completionRemainingSummary({
-		remainingContractCount,
-		releaseBlockerCount,
-		highValueGapCount,
-		remainingStopJudgeCount,
-	});
-	const widgetLines = activeRole
-		? []
-		: [
-				"completion workflow",
-				`phase: ${currentPhase}`,
-				`slice: ${sliceId}`,
-				`goal: ${sliceGoal}`,
-				`next: ${nextMandatoryRole}`,
-				`remaining: ${remainingSummary}`,
-			];
-	return {
-		snapshotPresent: true,
-		widgetLines,
-		currentPhase,
-		sliceId,
-		nextMandatoryRole,
-		remainingContractCount,
-		releaseBlockerCount,
-		highValueGapCount,
-		remainingStopJudgeCount,
-		activeRole,
-		livePreview,
-		liveState: liveSignal?.state,
-		liveIdleMs: liveSignal?.idleMs,
-		liveToolActivity: liveActivity?.toolActivity,
-		liveAssistantSummary: liveActivity?.assistantSummary,
-		liveProgress: liveActivity?.progress,
-		liveRationale: liveActivity?.rationale,
-		liveNextStep: liveActivity?.nextStep,
-		liveVerifying: liveActivity?.verifying,
-		liveStateDeltas: liveActivity?.stateDeltas ?? [],
-		liveDetailsLines,
-	};
-}
-
-async function writeCompletionStatusProbe(surface: CompletionStatusSurface): Promise<void> {
-	const outputPath = asString(process.env.PI_COMPLETION_STATUS_SNAPSHOT_FILE);
-	if (!outputPath) return;
-	await fsp.mkdir(path.dirname(outputPath), { recursive: true });
-	await fsp.writeFile(outputPath, `${JSON.stringify(surface, null, 2)}\n`, "utf8");
-}
-
-async function refreshStatus(ctx: { cwd: string; hasUI: boolean; ui: any }) {
-	const snapshot = await loadCompletionSnapshot(getCtxCwd(ctx));
-	const rootKey = completionRootKey(snapshot, getCtxCwd(ctx));
-	maybeInjectTestLiveRoleActivity(rootKey);
-	maybeReplayTestLiveRoleEvents(rootKey);
-	const surface = buildCompletionStatusSurface(snapshot, liveRoleActivityByRoot.get(rootKey));
-	await writeCompletionStatusProbe(surface);
-	if (!getCtxHasUI(ctx)) return;
-	const ui = getCtxUi(ctx);
-	if (!ui) return;
-	safeUiCall(() => {
-		ui.setWidget(COMPLETION_STATUS_KEY, surface.widgetLines.length > 0 ? surface.widgetLines : undefined);
+	const implementationSurfacesLine =
+		implementationSurfaces.length > 0 ? `- implementation_surfaces: ${implementationSurfaces.join(" | ")}` : undefined;
+	const verificationCommandsLine =
+		verificationCommands.length > 0 ? `- verification_commands: ${verificationCommands.join(" | ")}` : undefined;
+	return buildExtractedResumeCapsule({
+		missionAnchor: asString(snapshot.state?.mission_anchor),
+		taskType: currentTaskType(snapshot),
+		evaluationProfile: currentEvaluationProfile(snapshot),
+		currentPhase: asString(snapshot.state?.current_phase),
+		continuationPolicy: asString(snapshot.state?.continuation_policy),
+		continuationReason: asString(snapshot.state?.continuation_reason),
+		requiresReground: asBoolean(snapshot.state?.requires_reground) ?? "unknown",
+		nextMandatoryRole: asString(snapshot.state?.next_mandatory_role),
+		nextMandatoryAction: asString(snapshot.state?.next_mandatory_action),
+		remainingSliceCount: remainingSliceCount(snapshot.plan),
+		remainingStopJudges: asNumber(snapshot.state?.remaining_stop_judges) ?? "(unknown)",
+		history,
+		activeSliceMatchesPlan: activeSliceMatchesPlan(snapshot),
+		activeSliceContractDrift: activeSliceContractDriftSummary(snapshot),
+		implementerHandoffSnapshot: handoffSnapshotState(snapshot.active),
+		evidence,
+		activeSlice: {
+			sliceId: asString(snapshot.active?.slice_id) ?? asString(snapshot.activeSlice?.slice_id),
+			status: asString(snapshot.active?.status) ?? asString(snapshot.activeSlice?.status),
+			goal: asString(snapshot.active?.goal) ?? asString(snapshot.activeSlice?.goal),
+			priority: asNumber(snapshot.active?.priority),
+			whyNow: asString(snapshot.active?.why_now),
+			contractIds,
+			blockedOn,
+			lockedNotes,
+			mustFixFindings,
+			implementationSurfaces,
+			verificationCommands,
+			implementationSurfacesLine,
+			verificationCommandsLine,
+			basisCommit: asString(snapshot.active?.basis_commit),
+			remainingContractIdsBefore: remainingBefore,
+			releaseBlockerCountBefore: asNumber(snapshot.active?.release_blocker_count_before),
+			highValueGapCountBefore: asNumber(snapshot.active?.high_value_gap_count_before),
+			acceptanceCriteria: acceptance,
+		},
 	});
 }
 
-function parseReportFields(text: string): Record<string, string> {
-	return roleReporting.parseReportFields(text);
-}
-
-function parseYesNo(value: string | undefined): boolean | undefined {
-	return roleReporting.parseYesNo(value);
-}
-
-function parseFirstNumber(value: string | undefined): number | undefined {
-	return roleReporting.parseFirstNumber(value);
-}
-
 async function gitHeadSha(cwd: string): Promise<string | undefined> {
 	return await new Promise((resolve) => {
 		const proc = spawn("git", ["rev-parse", "HEAD"], { cwd, stdio: ["ignore", "pipe", "ignore"] });
@@ -3413,311 +871,6 @@ async function gitHeadSha(cwd: string): Promise<string | undefined> {
 	});
 }
 
-type TranscriptionResult = {
-	appended: string[];
-	skipped: string[];
-	errors: string[];
-};
-
-async function appendJsonlRecord(filePath: string, record: JsonRecord): Promise<void> {
-	await fsp.mkdir(path.dirname(filePath), { recursive: true });
-	await fsp.appendFile(filePath, `${JSON.stringify(record)}\n`, "utf8");
-}
-
-
-function formatElapsed(ms: number | undefined): string {
-	if (!ms || ms < 0) return "00:00";
-	const totalSeconds = Math.floor(ms / 1000);
-	const hours = Math.floor(totalSeconds / 3600);
-	const minutes = Math.floor((totalSeconds % 3600) / 60);
-	const seconds = totalSeconds % 60;
-	if (hours > 0) return `${String(hours).padStart(2, "0")}:${String(minutes).padStart(2, "0")}:${String(seconds).padStart(2, "0")}`;
-	return `${String(minutes).padStart(2, "0")}:${String(seconds).padStart(2, "0")}`;
-}
-
-function truncateInline(text: string, maxLength = 120): string {
-	const singleLine = text.replace(/\s+/g, " ").trim();
-	return singleLine.length > maxLength ? `${singleLine.slice(0, maxLength - 3)}...` : singleLine;
-}
-
-
-function formatToolActivity(toolName: string, args: JsonRecord): string {
-	if (toolName === "bash") return `$ ${truncateInline(asString(args.command) ?? "...")}`;
-	if (toolName === "read") return `read ${asString(args.filePath) ?? asString(args.path) ?? "..."}`;
-	if (toolName === "write") return `write ${asString(args.filePath) ?? asString(args.path) ?? "..."}`;
-	if (toolName === "edit") return `edit ${asString(args.filePath) ?? asString(args.path) ?? "..."}`;
-	if (toolName === "grep") return `grep ${asString(args.pattern) ?? "..."}`;
-	if (toolName === "find") return `find ${asString(args.pattern) ?? "..."}`;
-	if (toolName === "ls") return `ls ${asString(args.path) ?? "."}`;
-	return `${toolName} ${truncateInline(JSON.stringify(args))}`;
-}
-
-function pushRecentActivity(items: string[], line: string, maxItems = 8): string[] {
-	const normalized = truncateInline(line, 160);
-	if (!normalized) return items;
-	if (items[items.length - 1] === normalized) return items;
-	const next = [...items, normalized];
-	return next.slice(-maxItems);
-}
-
-function collapseRecentActivity(items: string[], maxItems = 4): string[] {
-	const collapsed: string[] = [];
-	for (const rawItem of items) {
-		const item = truncateInline(rawItem, 120);
-		if (!item || item.startsWith("done ") || item.startsWith("result ")) continue;
-		if (item.startsWith("assistant:")) continue;
-		if (collapsed[collapsed.length - 1] === item) continue;
-		collapsed.push(item);
-	}
-	return collapsed.slice(-maxItems);
-}
-
-function formatInlineRunningText(theme: any, lines: string[], options?: { primaryAssistant?: boolean }): string {
-	let text = "";
-	for (const [index, line] of lines.entries()) {
-		if (index > 0) text += "\n";
-		if (index === 0) {
-			const [prefix, ...rest] = line.split(" ");
-			text += theme.fg("warning", prefix);
-			if (rest.length > 0) text += ` ${theme.fg("accent", rest.join(" "))}`;
-			continue;
-		}
-		if (line.startsWith("tool:") || line.startsWith("progress:")) {
-			text += theme.fg("toolOutput", line);
-			continue;
-		}
-		if (line.startsWith("activity:")) {
-			text += line.includes("stalled") ? theme.fg("warning", line) : line;
-			continue;
-		}
-		if (line === "recent tools:") {
-			text += theme.fg("muted", line);
-			continue;
-		}
-		if (line.startsWith("- ")) {
-			text += `${theme.fg("muted", "- ")}${theme.fg("muted", line.slice(2))}`;
-			continue;
-		}
-		if (line.startsWith("elapsed:")) {
-			text += line;
-			continue;
-		}
-		if (line.startsWith("assistant:")) {
-			text += options?.primaryAssistant ? line : theme.fg("muted", line);
-			continue;
-		}
-		if (line.startsWith("next:") || line.startsWith("verifying:")) {
-			text += theme.fg("muted", line);
-			continue;
-		}
-		if (line.startsWith("rationale:") || line.startsWith("state-delta:")) {
-			text += line;
-			continue;
-		}
-		text += theme.fg("muted", line);
-	}
-	return text;
-}
-
-function buildInlineRunningLines(details: {
-	role?: string;
-	startedAt?: number;
-	updatedAt?: number;
-	currentAction?: string;
-	toolActivity?: string;
-	toolRecentActivity?: string[];
-	recentActivity?: string[];
-	assistantSummary?: string;
-	progress?: string;
-	rationale?: string;
-	nextStep?: string;
-	verifying?: string;
-	stateDeltas?: string[];
-}): string[] {
-	const lines: string[] = [];
-	let header = "running completion role";
-	if (details.role) header += ` ${details.role}`;
-	lines.push(header);
-	if (details.startedAt !== undefined) lines.push(`elapsed: ${formatElapsed(nowMs() - details.startedAt)}`);
-	const signalLine = formatLiveActivitySignal(
-		liveActivitySignal({ status: "running", startedAt: details.startedAt, updatedAt: details.updatedAt }),
-	);
-	if (signalLine) lines.push(signalLine);
-	const toolLine = details.toolActivity;
-	if (toolLine) lines.push(`tool: ${toolLine}`);
-	if (details.progress) lines.push(`progress: ${details.progress}`);
-	else if (details.assistantSummary) lines.push(`assistant: ${details.assistantSummary}`);
-	else if (details.currentAction && details.currentAction !== toolLine) {
-		lines.push(`assistant: ${details.currentAction.replace(/^assistant:\s*/, "")}`);
-	}
-	if (details.rationale) lines.push(`rationale: ${details.rationale}`);
-	if (details.nextStep) lines.push(`next: ${details.nextStep}`);
-	if (details.verifying) lines.push(`verifying: ${details.verifying}`);
-	for (const delta of (details.stateDeltas ?? []).slice(-4)) lines.push(`state-delta: ${delta}`);
-	const recentTools = collapseRecentActivity(details.toolRecentActivity ?? details.recentActivity ?? []);
-	const recentWithoutCurrent = recentTools.filter((item) => item !== toolLine);
-	if (recentWithoutCurrent.length > 0) {
-		lines.push("recent tools:");
-		for (const item of recentWithoutCurrent) lines.push(`- ${item}`);
-	}
-	return lines;
-}
-
-function parseStructuredProgress(text: string): {
-	progress?: string;
-	rationale?: string;
-	nextStep?: string;
-	verifying?: string;
-	stateDeltas: string[];
-} {
-	const result: { progress?: string; rationale?: string; nextStep?: string; verifying?: string; stateDeltas: string[] } = {
-		stateDeltas: [],
-	};
-	for (const rawLine of text.split("\n")) {
-		const line = rawLine.trim();
-		if (!line) continue;
-		const match = line.match(/^(PROGRESS|RATIONALE|NEXT|VERIFYING|STATE-DELTA):\s*(.+)$/i);
-		if (!match) continue;
-		const [, rawKey, rawValue] = match;
-		const key = rawKey.toUpperCase();
-		const value = rawValue.trim();
-		if (!value) continue;
-		if (key === "PROGRESS") result.progress = value;
-		else if (key === "RATIONALE") result.rationale = value;
-		else if (key === "NEXT") result.nextStep = value;
-		else if (key === "VERIFYING") result.verifying = value;
-		else if (key === "STATE-DELTA") result.stateDeltas.push(value);
-	}
-	if (result.stateDeltas.length > 6) result.stateDeltas = result.stateDeltas.slice(-6);
-	return result;
-}
-
-async function transcribeRoleOutput(role: CompletionRole, cwd: string, output: string, reportFields: Record<string, string>): Promise<TranscriptionResult> {
-	const snapshot = await loadCompletionSnapshot(cwd);
-	if (!snapshot) {
-		return { appended: [], skipped: ["No canonical completion snapshot found."], errors: [] };
-	}
-	const headSha = await gitHeadSha(snapshot.files.root);
-	if (!headSha) {
-		return { appended: [], skipped: [], errors: ["Could not resolve git HEAD for transcription."] };
-	}
-
-	const sliceId =
-		asString(snapshot.active?.slice_id) ??
-		asString(snapshot.activeSlice?.slice_id) ??
-		asString(snapshot.state?.latest_completed_slice);
-
-	return await roleReporting.transcribeCanonicalRoleReport({
-		role,
-		output,
-		reportFields,
-		snapshotFiles: snapshot.files,
-		headSha,
-		sliceId,
-	});
-}
-
-function isPathInside(root: string, candidatePath: string): boolean {
-	const resolvedRoot = path.resolve(root);
-	const resolvedCandidate = path.resolve(candidatePath);
-	return resolvedCandidate === resolvedRoot || resolvedCandidate.startsWith(`${resolvedRoot}${path.sep}`);
-}
-
-function resolveToolPath(cwd: string, rawPath: string): string {
-	return path.isAbsolute(rawPath) ? rawPath : path.resolve(cwd, rawPath);
-}
-
-function isAllowedControlPlanePath(root: string, rawPath: string): boolean {
-	const resolved = resolveToolPath(root, rawPath);
-	if (path.basename(resolved) === ".gitignore") return true;
-	return isPathInside(path.join(root, ".agent"), resolved);
-}
-
-function startsWithAny(value: string, prefixes: string[]): boolean {
-	return prefixes.some((prefix) => value.startsWith(prefix));
-}
-
-function normalizeCommand(command: string): string {
-	return command.trim().replace(/\s+/g, " ");
-}
-
-function isMutatingBash(command: string): boolean {
-	const normalized = normalizeCommand(command);
-	return startsWithAny(normalized, [
-		"git add",
-		"git commit",
-		"git push",
-		"rm ",
-		"mv ",
-		"cp ",
-		"mkdir ",
-		"touch ",
-		"chmod ",
-		"chown ",
-		"sed -i",
-		"perl -pi",
-		"python -c",
-		"python3 -c",
-		"node -e",
-		"bun -e",
-		"tee ",
-	]) || normalized.includes(">") || normalized.includes("| tee") || normalized.includes("apply_patch");
-}
-
-async function loadAgentDefinition(cwd: string, role: CompletionRole): Promise<AgentDefinition> {
-	const projectAgent = walkUpForDir(cwd, [".pi", "agents", `${role}.md`]);
-	const packageAgent = PACKAGE_AGENTS_DIR ? path.join(PACKAGE_AGENTS_DIR, `${role}.md`) : undefined;
-	const candidates = [projectAgent, packageAgent, path.join(AGENT_HOME, "agents", `${role}.md`)].filter(
-		(candidate): candidate is string => Boolean(candidate),
-	);
-	for (const candidate of candidates) {
-		if (!fs.existsSync(candidate)) continue;
-		const raw = await fsp.readFile(candidate, "utf8");
-		const { frontmatter, body } = parseFrontmatter<Record<string, string>>(raw);
-		return {
-			name: frontmatter.name ?? role,
-			description: frontmatter.description,
-			tools: frontmatter.tools?.split(",").map((tool) => tool.trim()).filter(Boolean),
-			model: frontmatter.model,
-			systemPrompt: body.trim(),
-			filePath: candidate,
-		};
-	}
-	throw new Error(`Missing completion agent definition for ${role}`);
-}
-
-async function writeTempFile(prefix: string, content: string): Promise<{ dir: string; filePath: string }> {
-	const dir = await fsp.mkdtemp(path.join(os.tmpdir(), prefix));
-	const filePath = path.join(dir, "prompt.md");
-	await fsp.writeFile(filePath, content, { encoding: "utf8", mode: 0o600 });
-	return { dir, filePath };
-}
-
-function getPiInvocation(args: string[]): { command: string; args: string[] } {
-	const currentScript = process.argv[1];
-	const isBunVirtualScript = currentScript?.startsWith("/$bunfs/root/");
-	if (currentScript && !isBunVirtualScript && fs.existsSync(currentScript)) {
-		return { command: process.execPath, args: [currentScript, ...args] };
-	}
-	const execName = path.basename(process.execPath).toLowerCase();
-	const isGenericRuntime = /^(node|bun)(\.exe)?$/.test(execName);
-	if (!isGenericRuntime) return { command: process.execPath, args };
-	return { command: "pi", args };
-}
-
-function lastAssistantText(messages: Array<{ role: string; content: Array<{ type: string; text?: string }> }>): string {
-	for (let i = messages.length - 1; i >= 0; i--) {
-		const message = messages[i];
-		if (message.role !== "assistant") continue;
-		const texts = message.content
-			.filter((part) => part.type === "text" && typeof part.text === "string")
-			.map((part) => part.text?.trim())
-			.filter((part): part is string => Boolean(part));
-		if (texts.length > 0) return texts.join("\n\n");
-	}
-	return "";
-}
-
 function completionKickoff(
 	goal: string,
 	taskType: string,
@@ -3739,15 +892,61 @@ function completionResumePrompt(taskType: string, evaluationProfile: string): st
 }
 
 export default function completionExtension(pi: ExtensionAPI) {
+	const statusSurfaceArgs = {
+		liveRoleActivityByRoot,
+		completionStatusKey: COMPLETION_STATUS_KEY,
+		safeUiCall,
+		getCtxCwd,
+		getCtxHasUI,
+		getCtxUi,
+	};
+	const driverDeps = {
+		bareOnlyGuidance: COOK_BARE_ONLY_GUIDANCE,
+		structuredDiscussionFailureDetail: COOK_STRUCTURED_DISCUSSION_FAILURE_DETAIL,
+		mainChatRerunGuidance: COOK_MAIN_CHAT_RERUN_GUIDANCE,
+		cookCommandSpec: {
+			description: "Bare /cook workflow: start, continue, refocus, or start the next round",
+		},
+		buildContextProposalContinuationReason,
+		completionKickoff,
+		completionResumePrompt,
+		completionRootKey,
+		completionTestAutoContinuePromptPath,
+		completionTestDriverPromptPath,
+		completionTestExistingWorkflowChooserSnapshotPath,
+		completionTestWorkflowActionOverride,
+		completionTestWorkflowMissionOverride,
+		confirmContextProposal,
+		deriveCookContextProposal,
+		emitCommandText,
+		finalizeContextProposalAnalysis,
+		getCtxCwd,
+		getCtxHasUI,
+		getCtxUi,
+		hasRunningCompletionRole,
+		maybeWriteActiveWorkflowRoutingSnapshot,
+		activateCompletionRoutingForRoot,
+		maybeWriteTestSnapshot,
+		missionAnchorsLikelyEquivalent,
+		missionAnchorsStrictlyEquivalent,
+		scaffoldCompletionFiles,
+		shouldSkipDriverKickoffForTests,
+		shouldTestAutoContinueOnSessionStart,
+		shouldTreatBareActiveWorkflowProposalAsClearRefocus,
+	};
+
 	pi.on("session_start", async (_event, ctx) => {
-		await refreshStatus(ctx);
+		await refreshCompletionStatus({ ctx, ...statusSurfaceArgs });
 		if (shouldTestAutoContinueOnSessionStart()) {
-			await autoContinueWorkflowIfNeeded(pi, ctx);
+			const snapshot = await loadCompletionSnapshot(getCtxCwd(ctx));
+			if (hasCompletionRoutingActivation(snapshot)) {
+				await autoContinueWorkflowIfNeeded(pi, ctx, driverDeps);
+			}
 		}
 	});
 
 	pi.on("turn_end", async (_event, ctx) => {
-		await refreshStatus(ctx);
+		await refreshCompletionStatus({ ctx, ...statusSurfaceArgs });
 	});
 
 	pi.on("agent_end", async (_event, ctx) => {
@@ -3755,8 +954,10 @@ export default function completionExtension(pi: ExtensionAPI) {
 		if (snapshot && (await pathExists(snapshot.files.compactionMarkerPath))) {
 			await fsp.rm(snapshot.files.compactionMarkerPath, { force: true });
 		}
-		await refreshStatus(ctx);
-		await autoContinueWorkflowIfNeeded(pi, ctx);
+		await refreshCompletionStatus({ ctx, ...statusSurfaceArgs });
+		if (hasCompletionRoutingActivation(snapshot)) {
+			await autoContinueWorkflowIfNeeded(pi, ctx, driverDeps);
+		}
 	});
 
 	pi.on("before_agent_start", async (_event, ctx) => {
@@ -3769,7 +970,7 @@ export default function completionExtension(pi: ExtensionAPI) {
 		if (!loaded || !shouldInjectCompletionWorkflowContext(loaded.snapshot)) return;
 		const additions = isWorkflowDone(loaded.snapshot)
 			? [buildDoneWorkflowBoundaryReminder(loaded.snapshot)]
-			: [buildSystemReminder(loaded.snapshot, loaded.sliceHistory, loaded.stopHistory)];
+			: [composeSystemReminder(loaded.snapshot, loaded.sliceHistory, loaded.stopHistory)];
 		if (!isWorkflowDone(loaded.snapshot)) {
 			const markerText = await readText(loaded.snapshot.files.compactionMarkerPath);
 			let marker: JsonRecord | undefined;
@@ -3795,7 +996,7 @@ export default function completionExtension(pi: ExtensionAPI) {
 		const loaded = await loadCompletionDataForReminder(getCtxCwd(ctx));
 		if (!loaded || isWorkflowDone(loaded.snapshot)) return;
 		const { preparation } = event;
-		const summary = buildResumeCapsule(loaded.snapshot, loaded.sliceHistory, loaded.stopHistory);
+		const summary = composeResumeCapsule(loaded.snapshot, loaded.sliceHistory, loaded.stopHistory);
 		await fsp.mkdir(loaded.snapshot.files.tmpDir, { recursive: true });
 		await fsp.writeFile(
 			loaded.snapshot.files.compactionMarkerPath,
@@ -3826,44 +1027,14 @@ export default function completionExtension(pi: ExtensionAPI) {
 		const snapshot = await loadCompletionSnapshot(cwd);
 		const completionActive = Boolean(snapshot) && asString(snapshot?.state?.continuation_policy) !== "done";
 		const root = snapshot?.files.root ?? findRepoRoot(cwd) ?? cwd;
-
-		if (event.toolName === "completion_role" && role) {
-			return { block: true, reason: `Nested completion role dispatch is forbidden for ${role}.` };
-		}
-
-		if (event.toolName === "edit" || event.toolName === "write") {
-			const rawPath = asString((event.input as JsonRecord).path);
-			if (!rawPath) return;
-
-			if (role === "completion-reviewer" || role === "completion-auditor" || role === "completion-stop-judge") {
-				return { block: true, reason: `${role} is read-only.` };
-			}
-
-			if ((role === "completion-bootstrapper" || role === "completion-regrounder") && !isAllowedControlPlanePath(root, rawPath)) {
-				return { block: true, reason: `${role} may only edit .agent/** or .gitignore.` };
-			}
-
-			if (!role && completionActive && !isAllowedControlPlanePath(root, rawPath)) {
-				return { block: true, reason: "The workflow driver may not edit tracked product files directly during completion." };
-			}
-		}
-
-		if (event.toolName !== "bash") return;
-		const command = asString((event.input as JsonRecord).command);
-		if (!command) return;
-		const normalized = normalizeCommand(command);
-
-		if (["completion-reviewer", "completion-auditor", "completion-stop-judge"].includes(role ?? "") && isMutatingBash(normalized)) {
-			return { block: true, reason: `${role} is read-only and cannot run mutating bash.` };
-		}
-
-		if ((role === "completion-bootstrapper" || role === "completion-regrounder") && startsWithAny(normalized, ["git add", "git commit"])) {
-			return { block: true, reason: `${role} may not create commits.` };
-		}
-
-		if (!role && completionActive && startsWithAny(normalized, ["git add", "git commit"])) {
-			return { block: true, reason: "The workflow driver may not create commits directly during completion." };
-		}
+		const reason = toolCallBlockReason({
+			toolName: event.toolName,
+			input: isRecord(event.input) ? event.input : undefined,
+			role,
+			completionActive,
+			root,
+		});
+		if (reason) return { block: true, reason };
 	});
 
 	pi.registerTool({
@@ -3885,8 +1056,6 @@ export default function completionExtension(pi: ExtensionAPI) {
 			const cwd = getCtxCwd(ctx);
 			const runCwd = findCompletionRoot(cwd) ?? findRepoRoot(cwd) ?? cwd;
 			const rootKey = runCwd;
-			const agent = await loadAgentDefinition(runCwd, role);
-			const loaded = await loadCompletionDataForReminder(runCwd);
 			type RunningDetails = {
 				role: string;
 				status: "running" | "ok" | "error";
@@ -3908,150 +1077,87 @@ export default function completionExtension(pi: ExtensionAPI) {
 				transcription?: TranscriptionResult;
 				exitCode?: number;
 			};
-			const systemPromptTemp = await writeTempFile("pi-completion-role-", agent.systemPrompt);
-			const taskLines = [
-				`Completion role: ${role}`,
-				"Before acting, read the completion protocol skill and reference:",
-				`- ${SKILL_PATH}`,
-				`- ${REFERENCE_PATH}`,
-				"Use canonical .agent/** state as the source of truth.",
-			];
-			if (loaded && isRubricEvaluationRole(role)) {
-				taskLines.push("", ...buildEvaluationRoleContextLines(loaded.snapshot, role));
-			}
-			if (params.task?.trim()) {
-				taskLines.push("", "Supplemental task context:", params.task.trim());
-			}
-			const prompt = taskLines.join("\n");
-			const args: string[] = ["--mode", "json", "-p", "--no-session", "--append-system-prompt", systemPromptTemp.filePath];
-			if (agent.model) args.push("--model", agent.model);
-			if (agent.tools && agent.tools.length > 0) args.push("--tools", agent.tools.join(","));
-			args.push(prompt);
-
-			const invocation = getPiInvocation(args);
-			let stderr = "";
-			const messages: RoleMessage[] = [];
-			const liveActivity = createLiveRoleActivity(role);
-			const emitRunningUpdate = (freshActivity = false) => {
-				if (freshActivity) liveActivity.updatedAt = nowMs();
+			const emitActivityUpdate = (activity: LiveRoleActivity) => {
 				const details: RunningDetails = {
 					role,
-					status: "running",
-					currentAction: liveActivity.currentAction,
-					toolActivity: liveActivity.toolActivity,
-					toolRecentActivity: liveActivity.toolRecentActivity,
-					recentActivity: liveActivity.recentActivity,
-					assistantSummary: liveActivity.assistantSummary,
-					lastAssistantText: liveActivity.lastAssistantText,
-					progress: liveActivity.progress,
-					rationale: liveActivity.rationale,
-					nextStep: liveActivity.nextStep,
-					verifying: liveActivity.verifying,
-					stateDeltas: liveActivity.stateDeltas,
-					startedAt: liveActivity.startedAt,
-					updatedAt: liveActivity.updatedAt,
+					status: activity.status,
+					currentAction: activity.currentAction,
+					toolActivity: activity.toolActivity,
+					toolRecentActivity: activity.toolRecentActivity,
+					recentActivity: activity.recentActivity,
+					assistantSummary: activity.assistantSummary,
+					lastAssistantText: activity.lastAssistantText,
+					progress: activity.progress,
+					rationale: activity.rationale,
+					nextStep: activity.nextStep,
+					verifying: activity.verifying,
+					stateDeltas: activity.stateDeltas,
+					startedAt: activity.startedAt,
+					updatedAt: activity.updatedAt,
 				};
-				liveRoleActivityByRoot.set(rootKey, cloneLiveRoleActivity(liveActivity, { status: "running" }));
-				void refreshStatus(ctx as { cwd: string; hasUI: boolean; ui: any });
+				liveRoleActivityByRoot.set(rootKey, cloneLiveRoleActivity(activity, { status: activity.status }));
+				void refreshCompletionStatus({ ctx: ctx as { cwd: string; hasUI: boolean; ui: any }, ...statusSurfaceArgs });
 				onUpdate?.({
-					content: [{ type: "text", text: liveActivity.lastAssistantText || liveActivity.currentAction || `Running ${role}...` }],
+					content: [{ type: "text", text: activity.lastAssistantText || activity.currentAction || `Running ${role}...` }],
 					details,
 				});
 			};
-			emitRunningUpdate(true);
-			const heartbeat = setInterval(() => emitRunningUpdate(false), LIVE_ROLE_HEARTBEAT_MS);
-
-			try {
-				const exitCode = await new Promise<number>((resolve) => {
-					const proc = spawn(invocation.command, invocation.args, {
-						cwd: runCwd,
-						env: { ...process.env, PI_COMPLETION_ROLE: role },
-						stdio: ["ignore", "pipe", "pipe"],
-						shell: false,
-					});
-					let buffer = "";
-
-					const processLine = (line: string) => {
-						if (!line.trim()) return;
-						try {
-							const event = JSON.parse(line) as JsonRecord;
-							if (applyLiveRoleEvent(liveActivity, event, messages)) emitRunningUpdate(true);
-						} catch {
-							// ignore malformed lines
-						}
-					};
-
-					proc.stdout.on("data", (chunk) => {
-						buffer += chunk.toString();
-						const lines = buffer.split("\n");
-						buffer = lines.pop() ?? "";
-						for (const line of lines) processLine(line);
-					});
-
-					proc.stderr.on("data", (chunk) => {
-						stderr += chunk.toString();
-					});
-
-					proc.on("close", (code) => {
-						if (buffer.trim()) processLine(buffer);
-						resolve(code ?? 0);
-					});
-
-					proc.on("error", () => resolve(1));
-
-					if (signal) {
-						const abort = () => proc.kill("SIGTERM");
-						if (signal.aborted) abort();
-						else signal.addEventListener("abort", abort, { once: true });
-					}
-				});
+			const loaded = await loadCompletionDataForReminder(runCwd);
+			const result = await runCompletionRole({
+				root: runCwd,
+				role,
+				task: params.task,
+				signal,
+				systemPromptPreamble: [
+					`Completion role: ${role}`,
+					"Before acting, read the completion protocol skill and reference:",
+					`- ${SKILL_PATH}`,
+					`- ${REFERENCE_PATH}`,
+					"Use canonical .agent/** state as the source of truth.",
+				],
+				evaluationContextLines: loaded && isRubricEvaluationRole(role) ? buildEvaluationRoleContextLines(loaded.snapshot, role) : undefined,
+				onUpdate: emitActivityUpdate,
+				onConsoleMessage: (level, message) => emitCommandText(ctx, message, level),
+				createLiveRoleActivity: (name) => createLiveRoleActivity(name),
+				cloneLiveRoleActivity,
+				applyLiveRoleEvent,
+				nowMs,
+				heartbeatMs: LIVE_ROLE_HEARTBEAT_MS,
+			});
 
-				const output = liveActivity.lastAssistantText || stderr.trim() || `${role} finished with no text output.`;
-				const reportFields = parseReportFields(output);
-				const transcription = exitCode === 0 ? await transcribeRoleOutput(role, runCwd, output, reportFields) : undefined;
-				if (transcription?.appended.length) {
-					emitCommandText(ctx, `Completion transcription appended: ${transcription.appended.join(", ")}`, "info");
-				}
-				if (transcription?.errors.length) {
-					emitCommandText(ctx, `Completion transcription warning: ${transcription.errors.join(" | ")}`, "warning");
+			liveRoleActivityByRoot.set(rootKey, cloneLiveRoleActivity(result.activity, { status: result.ok ? "ok" : "error" }));
+			await refreshCompletionStatus({ ctx: ctx as { cwd: string; hasUI: boolean; ui: any }, ...statusSurfaceArgs });
+			setTimeout(() => {
+				const current = liveRoleActivityByRoot.get(rootKey);
+				if (current && current.role === role && current.status !== "running") {
+					liveRoleActivityByRoot.delete(rootKey);
 				}
-				liveRoleActivityByRoot.set(rootKey, cloneLiveRoleActivity(liveActivity, { status: exitCode === 0 ? "ok" : "error" }));
-				await refreshStatus(ctx as { cwd: string; hasUI: boolean; ui: any });
-				return {
-					content: [{ type: "text", text: output }],
-					details: {
-						role,
-						status: exitCode === 0 ? "ok" : "error",
-						exitCode,
-						stderr: stderr.trim(),
-						reportFields,
-						transcription,
-						currentAction: liveActivity.currentAction,
-						toolActivity: liveActivity.toolActivity,
-						toolRecentActivity: liveActivity.toolRecentActivity,
-						recentActivity: liveActivity.recentActivity,
-						assistantSummary: liveActivity.assistantSummary,
-						lastAssistantText: liveActivity.lastAssistantText,
-						progress: liveActivity.progress,
-						rationale: liveActivity.rationale,
-						nextStep: liveActivity.nextStep,
-						verifying: liveActivity.verifying,
-						stateDeltas: liveActivity.stateDeltas,
-						startedAt: liveActivity.startedAt,
-						updatedAt: liveActivity.updatedAt,
-					},
-					isError: exitCode !== 0,
-				};
-			} finally {
-				clearInterval(heartbeat);
-				setTimeout(() => {
-					const current = liveRoleActivityByRoot.get(rootKey);
-					if (current && current.role === role && current.status !== "running") {
-						liveRoleActivityByRoot.delete(rootKey);
-					}
-				}, 10_000);
-				await fsp.rm(systemPromptTemp.dir, { recursive: true, force: true });
-			}
+			}, 10_000);
+			return {
+				content: [{ type: "text", text: result.output }],
+				details: {
+					role,
+					status: result.ok ? "ok" : "error",
+					exitCode: result.exitCode,
+					stderr: result.stderr,
+					reportFields: result.reportFields,
+					transcription: result.transcription,
+					currentAction: result.activity.currentAction,
+					toolActivity: result.activity.toolActivity,
+					toolRecentActivity: result.activity.toolRecentActivity,
+					recentActivity: result.activity.recentActivity,
+					assistantSummary: result.activity.assistantSummary,
+					lastAssistantText: result.activity.lastAssistantText,
+					progress: result.activity.progress,
+					rationale: result.activity.rationale,
+					nextStep: result.activity.nextStep,
+					verifying: result.activity.verifying,
+					stateDeltas: result.activity.stateDeltas,
+					startedAt: result.activity.startedAt,
+					updatedAt: result.activity.updatedAt,
+				},
+				isError: !result.ok,
+			};
 		},
 		renderCall(args, theme) {
 			const role = args.role || "completion-role";
@@ -4137,132 +1243,6 @@ export default function completionExtension(pi: ExtensionAPI) {
 		},
 	});
 
-	pi.registerCommand("cook", {
-		description: "Discussion-driven /cook workflow: start, continue, refocus, or start the next round",
-		handler: async (args, ctx) => {
-			const inlineHint = args.trim() || undefined;
-			let goal: string | undefined;
-			const cwd = getCtxCwd(ctx);
-			let snapshot = await loadCompletionSnapshot(cwd);
-			const workflowDone = isWorkflowDone(snapshot);
-			let kickoffIntent: "auto" | "continue" | "refocus" = "auto";
-			let kickoffMissionAnchor = snapshot ? currentMissionAnchor(snapshot) : undefined;
-			let kickoffAnalysis: ContextProposalAnalysis | undefined;
+	registerCookCommand(pi, driverDeps);
 
-			if (!snapshot) {
-				const root = findRepoRoot(cwd) ?? cwd;
-				const projectName = path.basename(root);
-				const proposal = await deriveCookContextProposal(ctx, projectName, inlineHint);
-				if (!proposal) {
-					emitCommandText(ctx, buildCookStructuredDiscussionFailureMessage(), "info");
-					return;
-				}
-				const decision = await confirmContextProposal(ctx, proposal, {
-					title: "Start a completion workflow from the recent discussion?",
-				});
-				if (!decision) {
-					emitCommandText(ctx, buildCookCancellationMessage("Cancelled recent-discussion workflow proposal"), "info");
-					return;
-				}
-				goal = decision.goalText;
-				kickoffMissionAnchor = decision.missionAnchor;
-				kickoffAnalysis = decision.analysis;
-				const startupRouting = finalizeContextProposalAnalysis(kickoffAnalysis, [goal ?? kickoffMissionAnchor ?? projectName]);
-				const created = await scaffoldCompletionFiles(root, kickoffMissionAnchor ?? projectName, {
-					analysis: startupRouting,
-					continuationReason: buildContextProposalContinuationReason(
-						"User started workflow via /cook:",
-						goal ?? kickoffMissionAnchor ?? projectName,
-						startupRouting,
-					),
-				});
-				emitCommandText(
-					ctx,
-					`Initialized completion control plane in ${created.root}${created.created.length > 0 ? ` (${created.created.length} files created)` : ""}`,
-					"info",
-				);
-				snapshot = await loadCompletionSnapshot(root);
-			}
-			if (!snapshot) {
-				emitCommandText(ctx, "Failed to load completion workflow state", "error");
-				return;
-			}
-			if (!goal) {
-				if (workflowDone) {
-					const projectName = path.basename(snapshot.files.root);
-					const proposal = await deriveCookContextProposal(ctx, projectName, inlineHint);
-					if (!proposal) {
-						emitCommandText(ctx, buildCookStructuredDiscussionFailureMessage("The previous completion workflow is already done."), "info");
-						return;
-					}
-					const decision = await confirmContextProposal(ctx, proposal, {
-						title: "The previous completion workflow is done. Start the next workflow round from the recent discussion?",
-					});
-					if (!decision) {
-						emitCommandText(ctx, buildCookCancellationMessage("Cancelled next workflow round proposal"), "info");
-						return;
-					}
-					goal = decision.goalText;
-					kickoffIntent = "refocus";
-					kickoffMissionAnchor = decision.missionAnchor;
-					await refocusCompletionMission(snapshot, decision.missionAnchor, decision.goalText, decision.analysis);
-					snapshot = (await loadCompletionSnapshot(snapshot.files.root)) ?? snapshot;
-					emitCommandText(ctx, `Started a new completion workflow round from recent discussion: ${decision.missionAnchor}`, "info");
-				} else {
-					const assessment = await assessActiveWorkflowProposalRouting(ctx, snapshot, inlineHint);
-					if (assessment.action !== "refocus" || !assessment.proposal) {
-						await resumeActiveWorkflowFromCanonicalState(pi, ctx, snapshot);
-						return;
-					}
-					const decision = await confirmExistingWorkflowProposal(ctx, snapshot, assessment.proposal, {
-						intro: "Recent non-command discussion suggests a different workflow. Choose how /cook should proceed:",
-						proposedMissionLabel: "Proposed mission from recent discussion",
-						refocusChoiceLabel:
-							"Start new workflow from recent discussion\n\nReview the proposed replacement in a final Start/Cancel confirmation before /cook rewrites canonical workflow state.",
-					});
-					if (!decision) {
-						emitCommandText(ctx, buildCookCancellationMessage("Cancelled existing workflow confirmation"), "info");
-						return;
-					}
-					if (decision.action === "continue") {
-						await resumeActiveWorkflowFromCanonicalState(pi, ctx, snapshot);
-						return;
-					}
-					const proposalDecision = await confirmContextProposal(ctx, assessment.proposal, {
-						title: "Start the replacement workflow from recent discussion?",
-					});
-					if (!proposalDecision) {
-						emitCommandText(ctx, buildCookCancellationMessage("Cancelled replacement workflow proposal"), "info");
-						return;
-					}
-					goal = proposalDecision.goalText;
-					kickoffIntent = "refocus";
-					kickoffMissionAnchor = proposalDecision.missionAnchor;
-					await refocusCompletionMission(snapshot, proposalDecision.missionAnchor, proposalDecision.goalText, proposalDecision.analysis);
-					snapshot = (await loadCompletionSnapshot(snapshot.files.root)) ?? snapshot;
-					emitCommandText(ctx, `Refocused completion mission from recent discussion to: ${proposalDecision.missionAnchor}`, "info");
-				}
-			}
-			kickoffMissionAnchor = kickoffMissionAnchor ?? currentMissionAnchor(snapshot);
-			activateCompletionRoutingForRoot(snapshot.files.root);
-			pi.setSessionName(`completion: ${kickoffMissionAnchor.slice(0, 60)}`);
-			const kickoffPrompt = completionKickoff(
-				goal,
-				currentTaskType(snapshot) ?? "(missing)",
-				currentEvaluationProfile(snapshot) ?? "(missing)",
-				kickoffIntent,
-				kickoffMissionAnchor,
-			);
-			const rootKey = completionRootKey(snapshot, getCtxCwd(ctx));
-			const fingerprint = completionContinuationFingerprint(snapshot) ?? JSON.stringify({
-				kind: "kickoff",
-				mission_anchor: kickoffMissionAnchor,
-				goal,
-				intent: kickoffIntent,
-				task_type: currentTaskType(snapshot) ?? "(missing)",
-				evaluation_profile: currentEvaluationProfile(snapshot) ?? "(missing)",
-			});
-			await queueCompletionDriverPrompt(pi, ctx, rootKey, fingerprint, kickoffPrompt, "kickoff");
-		},
-	});
 }