pi-plans 0.1.2 → 0.2.0

package/tests/plans.test.ts

@@ -22,15 +22,16 @@ describe("plans tool source", () => {
 
 		const params = source.slice(start, end);
 		assert.match(params, /artifactRootSource:\s*Type\.Optional/);
-		assert.match(params, /executionModelSelector:\s*Type\.Optional/);
-		assert.match(params, /executionModelSource:\s*Type\.Optional/);
+		assert.doesNotMatch(params, /executionModelSelector/);
+		assert.doesNotMatch(params, /executionModelSource/);
 	});
 
-	it("keeps the plans handler wired to artifact root and execution model actions", () => {
+	it("keeps the plans handler wired to artifact root and no separate model-selection action", () => {
 		const source = readPlansSource();
-		assert.match(source, /import \{[\s\S]*setArtifactRoot,[\s\S]*setExecutionModel,[\s\S]*\} from "\.\.\/src\/state\.ts";/);
+		assert.match(source, /import \{[\s\S]*setArtifactRoot,[\s\S]*\} from "\.\.\/src\/state\.ts";/);
 		assert.match(source, /case "set-artifact-root"/);
-		assert.match(source, /case "set-execution-model"/);
+		assert.doesNotMatch(source, /setExecutionModel/);
+		assert.doesNotMatch(source, /case "set-execution-model"/);
 		assert.match(source, /params\.artifactRootSource/);
 	});
 });

package/tests/query-hook.test.ts

@@ -0,0 +1,82 @@
+import * as assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import {
+	consumeOrdinaryQuery,
+	isOrdinaryExternalQuery,
+	QUERY_INTERVIEW_MESSAGE,
+	QUERY_INTERVIEW_MESSAGE_CUSTOM_TYPE,
+	recordOrdinaryQuery,
+	registerQueryInterviewHooks,
+	resetOrdinaryQueryState,
+} from "../src/query-hook.ts";
+
+function context(sessionManager: object): any {
+	return { cwd: process.cwd(), sessionManager };
+}
+
+function registeredHooks(): { pi: any; handlers: Map<string, Function[]> } {
+	const handlers = new Map<string, Function[]>();
+	const pi = {
+		on(name: string, handler: Function) {
+			handlers.set(name, [...(handlers.get(name) ?? []), handler]);
+		},
+	};
+	return { pi, handlers };
+}
+
+const ordinaryInput = { text: "implement the requested change", source: "interactive" as const };
+
+describe("query interview hook", () => {
+	it("accepts only idle external non-slash input", () => {
+		assert.equal(isOrdinaryExternalQuery(ordinaryInput), true);
+		assert.equal(isOrdinaryExternalQuery({ ...ordinaryInput, source: "rpc" }), true);
+		assert.equal(isOrdinaryExternalQuery({ ...ordinaryInput, source: "extension" }), false);
+		assert.equal(isOrdinaryExternalQuery({ ...ordinaryInput, streamingBehavior: "followUp" }), false);
+		assert.equal(isOrdinaryExternalQuery({ ...ordinaryInput, streamingBehavior: "steer" }), false);
+		assert.equal(isOrdinaryExternalQuery({ ...ordinaryInput, text: "   " }), false);
+		assert.equal(isOrdinaryExternalQuery({ ...ordinaryInput, text: "/planning clarify this" }), false);
+		assert.equal(isOrdinaryExternalQuery({ ...ordinaryInput, text: "/skill:plan-small implement this" }), false);
+		assert.equal(isOrdinaryExternalQuery({ ...ordinaryInput, text: "/unknown-command" }), false);
+	});
+
+	it("queues multiple queries, consumes one at a time, and isolates sessions", () => {
+		const first = context({});
+		const second = context({});
+		assert.equal(recordOrdinaryQuery(first, ordinaryInput), true);
+		assert.equal(recordOrdinaryQuery(first, { ...ordinaryInput, text: "verify the change" }), true);
+		assert.equal(consumeOrdinaryQuery(second), false);
+		assert.equal(consumeOrdinaryQuery(first), true);
+		assert.equal(consumeOrdinaryQuery(first), true);
+		assert.equal(consumeOrdinaryQuery(first), false);
+		resetOrdinaryQueryState(first);
+		assert.equal(consumeOrdinaryQuery(first), false);
+	});
+
+	it("registers one hidden message per ordinary query and consumes suppressed queries", async () => {
+		const { pi, handlers } = registeredHooks();
+		let suppressed = false;
+		registerQueryInterviewHooks(pi, () => suppressed);
+		const session = {};
+		const ctx = context(session);
+		const input = handlers.get("input")![0]!;
+		const beforeAgentStart = handlers.get("before_agent_start")![0]!;
+		const sessionStart = handlers.get("session_start")![0]!;
+
+		await input({ ...ordinaryInput }, ctx);
+		const first = await beforeAgentStart({ type: "before_agent_start", prompt: ordinaryInput.text }, ctx);
+		assert.equal(first?.message.customType, QUERY_INTERVIEW_MESSAGE_CUSTOM_TYPE);
+		assert.equal(first?.message.display, false);
+		assert.equal(first?.message.content, QUERY_INTERVIEW_MESSAGE);
+		assert.equal(await beforeAgentStart({ type: "before_agent_start", prompt: ordinaryInput.text }, ctx), undefined);
+
+		await input({ ...ordinaryInput, text: "a query inside the planning workflow" }, ctx);
+		suppressed = true;
+		assert.equal(await beforeAgentStart({ type: "before_agent_start", prompt: "expanded workflow prompt" }, ctx), undefined);
+		suppressed = false;
+		assert.equal(await beforeAgentStart({ type: "before_agent_start", prompt: "later ordinary prompt" }, ctx), undefined);
+
+		await input({ ...ordinaryInput, text: "stale input" }, ctx);
+		await sessionStart({ type: "session_start" }, ctx);
+		assert.equal(await beforeAgentStart({ type: "before_agent_start", prompt: "new session" }, ctx), undefined);
+	});
+});

package/tests/refine-ui.test.ts

@@ -0,0 +1,127 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { RefineOverlayComponent, chunkDetailForOverlay } from "../src/refine-ui.ts";
+import { applyRefineProgress, applyRefineResult, statusLabel, type RefineLaneState } from "../src/refine-ui-state.ts";
+
+
+function lane(): RefineLaneState {
+	return { id: "lane-1", label: "reviewer-1", status: "queued", phase: "queued", detail: "" };
+}
+
+describe("refine overlay state", () => {
+	it("tracks tool progress and bounds the displayed detail", () => {
+		const state = lane();
+		applyRefineProgress(state, {
+			type: "tool",
+			phase: "update",
+			toolCallId: "call-1",
+			toolName: "read",
+			detail: "x".repeat(500),
+		});
+
+		assert.equal(state.status, "running");
+		assert.equal(state.phase, "tool: read");
+		assert.ok(state.detail.length <= 180);
+		assert.match(state.detail, /\.\.\.$/);
+	});
+
+	it("keeps terminal lane states stable after completion", () => {
+		const state = lane();
+		applyRefineResult(state, { ok: true, output: "final conclusion", stderr: "", turns: 1 });
+		applyRefineProgress(state, { type: "turn", phase: "start" });
+
+		assert.deepEqual(state, {
+			id: "lane-1",
+			label: "reviewer-1",
+			status: "complete",
+			phase: "complete",
+			detail: "final conclusion",
+		});
+	});
+
+	it("distinguishes cancelled and timed out child results", () => {
+		const cancelled = lane();
+		applyRefineResult(cancelled, { ok: false, output: "", stderr: "", turns: 0, cancelled: true, errorMessage: "Esc" });
+		assert.equal(cancelled.status, "cancelled");
+		assert.equal(cancelled.phase, "cancelled");
+
+		const timedOut = lane();
+		applyRefineResult(timedOut, { ok: false, output: "", stderr: "", turns: 0, timedOut: true, errorMessage: "timeout" });
+		assert.equal(timedOut.status, "failed");
+		assert.equal(timedOut.phase, "timed out");
+		assert.equal(statusLabel(timedOut.status), "failed");
+	});
+});
+
+
+describe("refine overlay viewport", () => {
+	const fakeTheme = {
+		fg: (_color: string, text: string) => text,
+		bold: (text: string) => text,
+	} as never;
+
+	function makeLane(): RefineLaneState {
+		return { id: "lane-1", label: "reviewer-1", status: "running", phase: "responding", detail: "" };
+	}
+
+	function makeLanes(detail: string): RefineLaneState[] {
+		return [{ id: "lane-1", label: "reviewer-1", status: "running", phase: "responding", detail }];
+	}
+
+	it("clamps overlay width between min and max regardless of host width", () => {
+		const component = new RefineOverlayComponent(fakeTheme, "reviewer", makeLanes(""), () => {});
+		const narrow = component.render(20);
+		const wide = component.render(240);
+		assert.ok(narrow.some((line) => line.startsWith("┌")));
+		assert.ok(wide.some((line) => line.startsWith("┌")));
+		assert.ok(narrow.every((line) => line.length <= 20));
+	});
+
+	it("draws top and bottom borders with rounded corners and frame lines", () => {
+		const component = new RefineOverlayComponent(fakeTheme, "criticizer", makeLanes(""), () => {});
+		const lines = component.render(80);
+		const first = lines[0] ?? "";
+		const last = lines.at(-1) ?? "";
+		assert.match(first, /^┌─+┐$/);
+		assert.match(last, /^└─+┘$/);
+		assert.ok(lines.some((line) => line.startsWith("├") && line.endsWith("┤")));
+		assert.ok(lines.some((line) => line.startsWith("│") && line.endsWith("│")));
+	});
+
+	it("chunk sentence-sized detail lines so streaming fragments stay readable", () => {
+		const lines = chunkDetailForOverlay(
+			"Reading the file. Found three findings. The fourth line is unrelated.",
+			40,
+			6,
+		);
+		assert.ok(lines.length >= 3);
+		assert.ok(lines.every((line) => line.length <= 40));
+		assert.match(lines[0] ?? "", /Reading the file\./);
+	});
+
+	it("limits chunk length and refuses to overflow the maxLines budget", () => {
+		const text = Array.from({ length: 30 }, (_, i) => `Sentence number ${i + 1}.`).join(" ");
+		const lines = chunkDetailForOverlay(text, 60, 3);
+		assert.equal(lines.length, 3);
+	});
+});
+
+describe("refine overlay wiring", () => {
+	it("uses named public overlays, guards lifecycle edges, and does not depend on pi-btw", () => {
+		const source = fs.readFileSync(path.join(process.cwd(), "src", "refine-ui.ts"), "utf8");
+		assert.match(source, /custom<void>/);
+		assert.match(source, /overlay:\s*true/);
+		assert.match(source, /"Reviewer"/);
+		assert.match(source, /"Criticizer"/);
+		assert.match(source, /truncateToWidth/);
+		assert.match(source, /chunkDetailForOverlay/);
+		assert.match(source, /pickOverlayHeight|pickOverlayWidth/);
+		assert.match(source, /renderBorderLine|renderHorizontalRule|renderRow/);
+		assert.match(source, /if \(this\.closed\) return;/);
+		assert.match(source, /await this\.overlayPromise/);
+		assert.match(source, /if \(!ctx\.hasUI \|\| this\.overlayPromise\) return/);
+		assert.doesNotMatch(source, /pi-btw|createAgentSession|AgentSession/);
+	});
+});

package/tests/state.test.ts

@@ -13,7 +13,6 @@ import {
 	recordDecision,
 	setLanguage,
 	setArtifactRoot,
-	setExecutionModel,
 	setRole,
 	setRunStatus,
 	showConfig,
@@ -69,7 +68,7 @@ describe("init", () => {
 		assert.equal(config.reviewer.mode, "delegated-subagent");
 		assert.equal(config.reviewer.confirmed_at, null);
 		assert.equal(config.criticizer.confirmed_at, null);
-		assert.equal(config.execution.model_selector, null);
+		assert.equal("execution" in config, false);
 		assert.equal(config.artifact_root, "./docs/pi-plans");
 		assert.equal(config.artifact_root_source, "unset");
 		assert.equal(config.artifact_root_updated_at, null);
@@ -238,21 +237,19 @@ describe("runs", () => {
 	});
 });
 
-describe("execution model config", () => {
-	it("roundtrips the selector and clears on inherit", () => {
-		const workdir = mkWorkdir("exec-model");
+describe("legacy execution config", () => {
+	it("strips legacy execution config on load and rewrite", () => {
+		const workdir = mkWorkdir("legacy-exec");
 		git(workdir, "init", "-q");
 		initState(workdir);
-		assert.equal(readConfig(workdir).execution.model_selector, null);
-
-		setExecutionModel(workdir, { modelSelector: "zai/glm-5.3-flash:high", source: "user" });
-		assert.equal(readConfig(workdir).execution.model_selector, "zai/glm-5.3-flash:high");
-		assert.equal(readConfig(workdir).execution.source, "user");
-		assert.equal(showConfig(workdir).execution.model_selector, "zai/glm-5.3-flash:high");
-
-		setExecutionModel(workdir, { modelSelector: "inherit", source: "user" });
-		assert.equal(readConfig(workdir).execution.model_selector, null);
-		assert.equal(readConfig(workdir).execution.source, "user");
+		const configPath = path.join(commonDir(workdir), "pi_plans", "config.json");
+		const config = JSON.parse(fs.readFileSync(configPath, "utf8"));
+		config.execution = { model_selector: "zai/glm-5.3-flash:high", source: "user", updated_at: null };
+		fs.writeFileSync(configPath, `${JSON.stringify(config, null, "\t")}\n`, "utf8");
+		const shown = showConfig(workdir) as any;
+		assert.equal(shown.execution, undefined);
+		setLanguage(workdir, "zh-Hans", "user");
+		assert.equal(readConfig(workdir).execution, undefined);
 	});
 });
 

package/tests/subagent.test.ts

@@ -0,0 +1,114 @@
+import assert from "node:assert/strict";
+import { describe, it } from "node:test";
+import * as fs from "node:fs";
+import * as os from "node:os";
+import * as path from "node:path";
+import { normalizeSubagentEvent, runPiSubagent, type SubagentProgressEvent } from "../src/subagent.ts";
+
+async function withFakePi(
+	task: string,
+	options: { signal?: AbortSignal; timeoutMs?: number; onProgress?: (event: SubagentProgressEvent) => void } = {},
+) {
+	const dir = fs.mkdtempSync(path.join(os.tmpdir(), "pi-plans-fake-pi-"));
+	const script = path.join(dir, "fake-pi.mjs");
+	fs.writeFileSync(
+		script,
+		[
+			'const emit = (event) => process.stdout.write(JSON.stringify(event) + "\\n");',
+			'emit({ type: "turn_start" });',
+			'if (process.argv.includes("Task: slow")) await new Promise((resolve) => setTimeout(resolve, 5000));',
+			'else {',
+			'  emit({ type: "message_start", message: { role: "assistant", content: [] } });',
+			'  emit({ type: "message_update", assistantMessageEvent: { type: "text_delta", delta: "working" } });',
+			'  emit({ type: "tool_execution_start", toolCallId: "call-1", toolName: "read", args: { path: "PLAN_v1.md" } });',
+			'  emit({ type: "message_end", message: { role: "assistant", model: "fake/model", content: [{ type: "text", text: "final conclusion" }] } });',
+			'}',
+		].join("\n"),
+	);
+
+	const previousScript = process.argv[1];
+	process.argv[1] = script;
+	try {
+		return await runPiSubagent({
+			systemPrompt: "test system prompt",
+			task,
+			cwd: process.cwd(),
+			signal: options.signal,
+			timeoutMs: options.timeoutMs ?? 2000,
+			onProgress: options.onProgress,
+		});
+	} finally {
+		process.argv[1] = previousScript;
+		fs.rmSync(dir, { recursive: true, force: true });
+	}
+}
+
+
+describe("subagent runner lifecycle", () => {
+	it("waits for JSONL completion and forwards progress", async () => {
+		const progress: string[] = [];
+		const result = await withFakePi("normal", {
+			timeoutMs: 2000,
+			onProgress: (event) => progress.push(`${event.type}:${event.phase ?? ""}`),
+		});
+		assert.equal(result.ok, true);
+		assert.equal(result.output, "final conclusion");
+		assert.equal(result.model, "fake/model");
+		assert.ok(progress.includes("process:started"));
+		assert.ok(progress.includes("tool:start"));
+		assert.ok(progress.includes("process:exited"));
+		assert.equal(result.turns, 1);
+	});
+
+	it("returns a cancelled result after aborting the child", async () => {
+		const abort = new AbortController();
+		const promise = withFakePi("slow", { signal: abort.signal, timeoutMs: 2000 });
+		setTimeout(() => abort.abort(), 40);
+		const result = await promise;
+		assert.equal(result.ok, false);
+		assert.equal(result.cancelled, true);
+		assert.equal(result.timedOut, undefined);
+	});
+
+	it("returns a timed out result after terminating a slow child", async () => {
+		const result = await withFakePi("slow", { timeoutMs: 40 });
+		assert.equal(result.ok, false);
+		assert.equal(result.timedOut, true);
+		assert.equal(result.cancelled, undefined);
+	});
+});
+
+describe("subagent progress events", () => {
+	it("normalizes turn and message lifecycle events", () => {
+		assert.deepEqual(normalizeSubagentEvent({ type: "turn_start" }), { type: "turn", phase: "start" });
+		assert.deepEqual(
+			normalizeSubagentEvent({
+				type: "message_update",
+				assistantMessageEvent: { type: "text_delta", delta: "checking the plan" },
+			}),
+			{ type: "message", phase: "update", role: "assistant", text: "checking the plan" },
+		);
+	});
+
+	it("normalizes tool progress without exposing unbounded arguments", () => {
+		const event = normalizeSubagentEvent({
+			type: "tool_execution_start",
+			toolCallId: "call-1",
+			toolName: "read",
+			args: { path: "/tmp/plan.md" },
+		});
+		assert.deepEqual(event, {
+			type: "tool",
+			phase: "start",
+			toolCallId: "call-1",
+			toolName: "read",
+			detail: '{"path":"/tmp/plan.md"}',
+		});
+	});
+
+	it("ignores unknown or malformed events", () => {
+		assert.equal(normalizeSubagentEvent(undefined), undefined);
+		assert.equal(normalizeSubagentEvent({ type: "future_event" }), undefined);
+		assert.equal(normalizeSubagentEvent({ type: "message_end" }), undefined);
+	});
+});

package/tools/ask-choice.ts

@@ -14,6 +14,7 @@ import { StringEnum } from "@earendil-works/pi-ai";
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "typebox";
+import { disableAutoComplete, enableAutoComplete, isAutoCompleteEnabled, recordAskChoice } from "../src/autocomplete.ts";
 import { normalizeWorkdir, readActive, recordDecision } from "../src/state.ts";
 
 const Option = Type.Object({
@@ -85,14 +86,28 @@ export function registerAskChoiceTool(pi: ExtensionAPI): void {
 				source,
 			});
 
+			// Once enabled for this planning run, eligible questions answer with the
+			// recommendation without opening another UI prompt.
+			if (autoComplete && isAutoCompleteEnabled(ctx)) {
+				recordAskChoice(ctx, true);
+				record(recommended.label, "auto-complete");
+				return {
+					content: [{ type: "text", text: `Auto-complete selected the recommended option: ${recommended.label}` }],
+					details: details(recommended.label, "auto-complete"),
+				};
+			}
+
 			// No UI (print/json mode): planning questions may auto-complete;
 			// questions without Auto-complete must stop and wait for the user.
 			if (!ctx.hasUI) {
 				if (!autoComplete) {
+					disableAutoComplete(ctx, "non-interactive boundary");
 					throw new Error(
 						"No UI available and this question must not be auto-completed (execution handoff or external-state change). Stop and wait for the user.",
 					);
 				}
+				enableAutoComplete(ctx);
+				recordAskChoice(ctx, true);
 				record(recommended.label, "auto-complete");
 				return {
 					content: [
@@ -116,6 +131,7 @@ export function registerAskChoiceTool(pi: ExtensionAPI): void {
 
 			const selected = await ctx.ui.select(params.question, displayLabels);
 			if (selected === undefined) {
+				disableAutoComplete(ctx, "question cancelled");
 				return {
 					content: [
 						{
@@ -128,6 +144,8 @@ export function registerAskChoiceTool(pi: ExtensionAPI): void {
 			}
 
 			if (autoComplete && selected.startsWith("Auto-complete")) {
+				enableAutoComplete(ctx);
+				recordAskChoice(ctx, true);
 				record(recommended.label, "auto-complete");
 				return {
 					content: [
@@ -143,11 +161,13 @@ export function registerAskChoiceTool(pi: ExtensionAPI): void {
 			if (allowOther && selected.startsWith("Other…")) {
 				const typed = await ctx.ui.input(`${params.question} — your answer:`);
 				if (typed === undefined || !typed.trim()) {
+					disableAutoComplete(ctx, "free-form answer cancelled");
 					return {
 						content: [{ type: "text", text: "User cancelled the free-form answer. Ask again or stop." }],
 						details: details(null, "cancelled"),
 					};
 				}
+				recordAskChoice(ctx, false);
 				const answer = typed.trim();
 				record(answer, "user");
 				return {
@@ -159,11 +179,13 @@ export function registerAskChoiceTool(pi: ExtensionAPI): void {
 			const index = displayLabels.indexOf(selected);
 			const option = index >= 0 && index < options.length ? options[index] : undefined;
 			if (!option) {
+				recordAskChoice(ctx, false);
 				return {
 					content: [{ type: "text", text: `User selected: ${selected}` }],
 					details: details(selected, "user"),
 				};
 			}
+			recordAskChoice(ctx, false);
 			record(option.label, "user");
 			return {
 				content: [{ type: "text", text: `User selected: ${index + 1}. ${option.label}` }],

package/tools/execute-plan.ts

@@ -9,25 +9,12 @@ import { Type } from "typebox";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import {
-	chooseExecutionModelSelection,
-	snapshotCurrentModelSelector,
 	startExecution,
-	type ExecutionModelState,
 } from "../src/exec.ts";
-import { extractCoverage, latestPlanVersion, parseChecklist, parseImplItems } from "../src/plan.ts";
-import { loadConfig, normalizeWorkdir, readActive, resolveStateRootOrNull, setExecutionModel, type ExecutionConfig } from "../src/state.ts";
+import { disableAutoComplete } from "../src/autocomplete.ts";
+import { latestPlanVersion, parseChecklist, parseImplItems } from "../src/plan.ts";
+import { normalizeWorkdir, readActive } from "../src/state.ts";
 
-function loadExecutionModelConfig(workdir: string): ExecutionConfig {
-	const root = resolveStateRootOrNull(workdir);
-	if (!root) {
-		return { model_selector: null, source: "unset", updated_at: null };
-	}
-	try {
-		return loadConfig(root).execution;
-	} catch {
-		return { model_selector: null, source: "unset", updated_at: null };
-	}
-}
 
 const ExecutePlanParams = Type.Object({
 	planPath: Type.Optional(
@@ -82,6 +69,7 @@ export async function executeHandoff(
 	}
 	const implItems = parseImplItems(planText);
 
+	disableAutoComplete(ctx, "execution handoff");
 	if (!ctx.hasUI) {
 		return {
 			status: "error",
@@ -99,33 +87,13 @@ export async function executeHandoff(
 		return { status: "declined", message: "User declined execution. Stay in planning; ask how to proceed.", planPath };
 	}
 
-	const configuredExecution = loadExecutionModelConfig(workdir);
-	let modelState: ExecutionModelState | undefined;
-	const planningSelector = snapshotCurrentModelSelector(ctx);
-	const selection = await chooseExecutionModelSelection(
-		ctx,
-		"Execution model",
-		configuredExecution,
-		async (selector) => {
-			await setExecutionModel(workdir, { modelSelector: selector, source: "user" });
-		},
-	);
-	if (!selection) {
-		return { status: "error", message: "No usable execution model; execution cancelled." };
-	}
-	if (configuredExecution.source === "unset" || configuredExecution.model_selector !== null) {
-		modelState = { planningSelector, executionSelector: selection.selector };
-	}
-
-	await startExecution(getCurrentApi(), ctx, planPath, items, modelState, implItems);
-	const countedImpls = implItems.filter((impl) => items.some((item) => extractCoverage(item.text).includes(impl.id)));
-	const modelNote = modelState ? ` Execution model: ${modelState.executionSelector}.` : "";
-	const scopeNote = countedImpls.length ? ` Tracking ${countedImpls.length} implementation item(s).` : "";
+	await startExecution(getCurrentApi(), ctx, planPath, items, implItems);
+	const scopeNote = implItems.length ? ` Tracking ${implItems.length} implementation item(s).` : "";
 	return {
 		status: "executing",
 		planPath,
 		itemCount: items.length,
-		message: `Execution approved. ${items.length} verifier item(s) queued; implement in dependency order and mark verified items with [DONE:VC-xxx].${scopeNote}${modelNote}`,
+		message: `Execution approved. ${items.length} verifier item(s) queued; implement in dependency order and mark verified items with [DONE:VC-xxx].${scopeNote}`,
 	};
 }
 

package/tools/plans.ts

@@ -15,7 +15,6 @@ import {
 	recordSubagent,
 	resolveStateRootOrNull,
 	setArtifactRoot,
-	setExecutionModel,
 	setLanguage,
 	setRunStatus,
 	setRole,
@@ -32,7 +31,6 @@ const PlansParams = Type.Object({
 			"show",
 			"set-language",
 			"set-artifact-root",
-			"set-execution-model",
 			"set-role",
 			"start-run",
 			"set-status",
@@ -52,10 +50,6 @@ const PlansParams = Type.Object({
 	languageSource: Type.Optional(StringEnum(["user", "auto"] as const)),
 	artifactRoot: Type.Optional(Type.String({ description: "set-artifact-root: planning docs root, e.g. ./docs/pi-plans" })),
 	artifactRootSource: Type.Optional(StringEnum(["user", "auto"] as const)),
-	executionModelSelector: Type.Optional(
-		Type.String({ description: "set-execution-model: exact provider/model selector, or 'inherit' to clear" }),
-	),
-	executionModelSource: Type.Optional(StringEnum(["user", "auto"] as const)),
 	role: Type.Optional(StringEnum(["reviewer", "criticizer"] as const)),
 	mode: Type.Optional(StringEnum(["delegated-subagent", "current-session"] as const)),
 	modelSelector: Type.Optional(
@@ -120,7 +114,7 @@ export function registerPlansTool(pi: ExtensionAPI): void {
 		name: "plans",
 		label: "Plans",
 		description:
-			"Manage pi-plans planning state in the target workspace: init/show config, set language and planning docs root plus execution/reviewer/criticizer roles, start planning runs, record decisions/refs/subagents, and update run status. State lives in .git/pi_plans/ inside the resolved git common dir. Actions: init, show, set-language, set-artifact-root, set-execution-model, set-role, start-run, set-status, record-decision, record-ref, record-subagent.",
+			"Manage pi-plans planning state in the target workspace: init/show config, set language and planning docs root plus reviewer/criticizer roles, start planning runs, record decisions/refs/subagents, and update run status. State lives in .git/pi_plans/ inside the resolved git common dir. Actions: init, show, set-language, set-artifact-root, set-role, start-run, set-status, record-decision, record-ref, record-subagent.",
 		promptSnippet: "Manage pi-plans planning state, runs, and ledgers",
 		parameters: PlansParams,
 
@@ -156,17 +150,6 @@ export function registerPlansTool(pi: ExtensionAPI): void {
 						result = { config: updated.config, stateRoot: updated.stateRoot, notices: updated.notices };
 						break;
 					}
-					case "set-execution-model": {
-						if (!params.executionModelSelector || !params.executionModelSource) {
-							throw new StateError("set-execution-model requires executionModelSelector and executionModelSource");
-						}
-						const updated = setExecutionModel(workdir, {
-							modelSelector: params.executionModelSelector,
-							source: params.executionModelSource,
-						});
-						result = { config: updated.config, stateRoot: updated.stateRoot, notices: updated.notices };
-						break;
-					}
 					case "set-role": {
 						if (!params.role) throw new StateError("set-role requires role");
 						const updated = setRole(workdir, {