@janvitos/pi-plan-build 0.1.33 → 0.1.34

package/README.md

@@ -19,7 +19,7 @@ A global [Pi coding agent](https://github.com/badlogic/pi-mono) extension that a
   - **Switch to Build and implement here**
   - **Start fresh and implement**
   - **Stay in Plan mode**
-- **Experimental:** In fullscreen TUI, valid checklist plans also offer **Implement step by step**: a passive, non-overlapping docked right panel keeps the plan visible while natural-language prompts gate steps and return completed work for review. The panel is visual-only and never captures keyboard input. This feature is still under active development.
+- **Experimental:** In fullscreen TUI, valid checklist plans also offer **Implement step by step**: a passive, non-overlapping docked right panel keeps the plan visible while natural-language prompts gate steps and report completed work. The panel is visual-only and never captures keyboard input. This feature is still under active development.
 - Staying in Plan mode—or pressing Escape in the approval dialog—produces a durable acknowledgement and stops the run until the user responds.
 - Mode state survives reloads, resumes, and forks.
 - When Pi recreates the custom editor, the latest 100 user prompts from the active session branch are restored for Up/Down history navigation.
@@ -96,11 +96,10 @@ The passive 64-column right panel reserves terminal columns, so the transcript a
 - “Implement the next step” or “Start step 2.”
 - “Step 1 is complete,” “I verified that one,” or “I already handled this.”
 - “Change step 3 to …” or “Skip this step.”
-- “Accept this result” or “Correct it by …”
 - “Pause the plan,” “hide the plan,” or “show the plan.”
 - “Cancel this plan” at any point to end step-by-step execution immediately.
 
-The extension exposes these actions to the agent through `plan_step_control`; project mutations remain blocked until the user clearly approves a ready step or explicitly indicates that it is already complete. A ready step may be marked complete without implementation when the user says they already handled or verified it. A reviewed implementation may be accepted, while ambiguous feedback prompts clarification. The agent interprets intent contextually rather than requiring exact phrases, while the extension validates every resulting state transition. Step tool results identify the affected step, for example `Step 2: complete`, rather than presenting a plan-wide completion label. Cancelling removes the panel and execution guards immediately, restores the full-width layout, and preserves the saved plan file for reference. The agent implements only that step, calls `plan_step_complete`, and waits for the user's next prompt. Accepting a result makes the next step ready but never starts it automatically. Progress, revisions, summaries, and panel visibility survive reload/resume. If such a session is opened in regular mode, progress is retained but cannot advance until fullscreen mode is restored; no overlay fallback is used.
+The extension exposes these actions to the agent through `plan_step_control`; project mutations remain blocked until the user clearly approves a ready step or explicitly indicates that it is already complete. A ready step may be marked complete without implementation when the user says they already handled or verified it. An implemented step is marked completed immediately after verification, and the next step becomes ready without a review or acceptance phase. The agent interprets intent contextually rather than requiring exact phrases, while the extension validates every resulting state transition. Step tool results identify the affected step, for example `Step 2: complete`, rather than presenting a plan-wide completion label. When the final step is completed or skipped, the panel and execution guards are removed immediately and the main window receives a completion confirmation with a concise plan summary. Cancelling removes the panel and execution guards immediately, restores the full-width layout, and preserves the saved plan file for reference. The agent implements only that step, calls `plan_step_complete`, and waits for the user's next prompt. Progress, revisions, summaries, and panel visibility survive reload/resume. If such a session is opened in regular mode, progress is retained but cannot advance until fullscreen mode is restored; no overlay fallback is used.
 
 Enable fullscreen in `~/.pi/agent/settings.json` and restart Pi:
 

package/index.ts

@@ -15,17 +15,15 @@ import {
 	PLAN_TO_BUILD_REMINDER,
 } from "./prompts.ts";
 import {
-	acceptPlanStep,
 	activePlanStep,
 	completePlanStep,
 	createPlanExecution,
 	decodePlanExecution,
+	formatPlanCompletionSummary,
 	pausePlanExecution,
-	requestPlanStepCorrections,
 	revisePlanStep,
 	skipPlanStep,
 	startPlanStep,
-	submitPlanStepForReview,
 	updatePlanChecklistStep,
 	type PlanExecutionState,
 } from "./plan-execution.ts";
@@ -155,6 +153,19 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 		applyTools("build");
 	}
 
+	function applyExecutionTransition(next: PlanExecutionState): string | undefined {
+		if (next.status !== "completed") {
+			updateExecution(next);
+			return undefined;
+		}
+		const summary = formatPlanCompletionSummary(next);
+		execution = undefined;
+		removePanelLayout();
+		persist();
+		applyTools("build");
+		return summary;
+	}
+
 	function ensurePanelLayout(): boolean {
 		if (!execution || !fullscreenPanelCapable || !panelTui || !originalLayoutRoot || !currentContext) return false;
 		if (!panel) panel = new PlanPanel(execution, currentContext.ui.theme);
@@ -199,7 +210,7 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 				...base,
 				"question",
 				"plan_enter",
-				...(execution ? ["plan_step_control"] : []),
+				...(execution && execution.status !== "completed" ? ["plan_step_control"] : []),
 				...(activePlanStep(execution) ? ["plan_step_complete"] : []),
 			]));
 		}
@@ -379,13 +390,11 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 	pi.registerTool({
 		name: "plan_step_control",
 		label: "Control Plan Execution",
-		description: `Use this tool to translate the user's natural-language instructions into one step-by-step plan action. Available actions: start a ready step, complete a clearly finished ready or reviewed step, accept a reviewed step, request corrections, skip a ready step, revise an unimplemented instruction, pause/resume or cancel execution, or hide/show the visual plan panel. Interpret clear user intent semantically, including direct completion statements, but do not advance based on hypothetical, uncertain, or unrelated conversation.`,
+		description: `Use this tool to translate the user's natural-language instructions into one step-by-step plan action. Available actions: start a ready step, complete a clearly finished ready step, skip a ready step, revise an unimplemented instruction, pause/resume or cancel execution, or hide/show the visual plan panel. Interpret clear user intent semantically, including direct completion statements, but do not advance based on hypothetical, uncertain, or unrelated conversation.`,
 		parameters: Type.Object({
 			action: Type.Union([
 				Type.Literal("start"),
 				Type.Literal("complete"),
-				Type.Literal("accept"),
-				Type.Literal("correct"),
 				Type.Literal("skip"),
 				Type.Literal("revise"),
 				Type.Literal("pause"),
@@ -394,14 +403,14 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 				Type.Literal("hide"),
 				Type.Literal("show"),
 			]),
-			step: Type.Optional(Type.Number({ description: "One-based step number; defaults to the current ready/review step", minimum: 1 })),
+			step: Type.Optional(Type.Number({ description: "One-based step number; defaults to the current ready step", minimum: 1 })),
 			instruction: Type.Optional(Type.String({ description: "Replacement instruction required for revise" })),
 		}),
 		executionMode: "sequential",
 		async execute(_toolCallId, params) {
 			if (!execution) throw new Error("No step-by-step plan is active");
 			const target = params.step === undefined
-				? execution.steps.find((step) => step.status === "ready" || step.status === "review")
+				? execution.steps.find((step) => step.status === "ready")
 				: execution.steps[Math.floor(params.step) - 1];
 			const finish = (message: string) => ({
 				content: [{ type: "text" as const, text: message }],
@@ -418,7 +427,7 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 				if (params.action === "show") ensurePanelLayout();
 				return finish(`The visual plan panel is now ${params.action === "show" ? "visible" : "hidden"}. Progress is unchanged.`);
 			}
-			if (execution.status === "completed") throw new Error("The plan is complete; only hide or show actions remain available");
+			if (execution.status === "completed") throw new Error("The plan is already complete");
 			if (params.action === "pause" || params.action === "resume") {
 				if ((params.action === "pause") === (execution.status === "paused")) return finish(`Plan execution is already ${params.action === "pause" ? "paused" : "running"}.`);
 				updateExecution(pausePlanExecution(execution));
@@ -433,22 +442,12 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 				return finish("The requested step is approved. Its implementation is starting in a follow-up turn.");
 			}
 			if (params.action === "complete") {
-				updateExecution(completePlanStep(execution, target.id));
-				return finish(execution.status === "completed" ? "The step was marked complete and the plan is complete." : "The step was marked complete. The next step is ready and awaits user instruction.");
-			}
-			if (params.action === "accept") {
-				updateExecution(acceptPlanStep(execution, target.id));
-				return finish(execution.status === "completed" ? "The reviewed step was accepted and the plan is complete." : "The reviewed step was accepted. The next step is ready and awaits user instruction.");
-			}
-			if (params.action === "correct") {
-				updateExecution(requestPlanStepCorrections(execution, target.id));
-				applyTools("build");
-				pi.sendUserMessage(`Apply the corrections requested in the user's preceding message to plan step ${execution.steps.findIndex((step) => step.id === target.id) + 1}.`, { deliverAs: "followUp" });
-				return finish("The reviewed step was reopened. The requested corrections are starting in a follow-up turn.");
+				const completion = applyExecutionTransition(completePlanStep(execution, target.id));
+				return finish(completion ?? "The step was marked complete. The next step is ready and awaits user instruction.");
 			}
 			if (params.action === "skip") {
-				updateExecution(skipPlanStep(execution, target.id));
-				return finish(execution.status === "completed" ? "The step was skipped and the plan is complete." : "The step was skipped. The next step awaits user instruction.");
+				const completion = applyExecutionTransition(skipPlanStep(execution, target.id));
+				return finish(completion ?? "The step was skipped. The next step awaits user instruction.");
 			}
 			if (!params.instruction?.trim()) throw new Error("Revising a step requires a replacement instruction");
 			const plan = await fs.promises.readFile(planPath, "utf8");
@@ -460,7 +459,7 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 		renderCall(args, theme) {
 			const requestedStep = typeof args.step === "number" && Number.isFinite(args.step) ? Math.max(1, Math.floor(args.step)) : undefined;
 			const inferredStep = requestedStep ?? (execution
-				? execution.steps.findIndex((step) => step.status === "ready" || step.status === "review") + 1
+				? execution.steps.findIndex((step) => step.status === "ready") + 1
 				: 0);
 			const label = inferredStep > 0 ? `Step ${inferredStep}: ${args.action}` : `Plan: ${args.action}`;
 			return new Text(theme.fg("toolTitle", theme.bold(label)), 0, 0);
@@ -482,19 +481,19 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 		async execute(_toolCallId, params) {
 			const step = activePlanStep(execution);
 			if (!execution || !step) throw new Error("No plan step is currently active");
-			updateExecution(submitPlanStepForReview(execution, step.id, params.summary));
-			applyTools("build");
+			const completion = applyExecutionTransition(completePlanStep(execution, step.id, params.summary));
 			return {
-				content: [{ type: "text", text: "The active plan step is awaiting user review. Stop now and do not begin another step." }],
-				details: { stepId: step.id, review: true },
+				content: [{ type: "text", text: completion ?? "The step was completed. The next step is ready and awaits user instruction." }],
+				details: { stepId: step.id, completed: true },
 				terminate: true,
 			};
 		},
 		renderCall(_args, theme) {
-			return new Text(theme.fg("toolTitle", theme.bold("Submit plan step for review")), 0, 0);
+			return new Text(theme.fg("toolTitle", theme.bold("Complete plan step")), 0, 0);
 		},
-		renderResult(_result, _options, theme, context) {
-			return new Text(theme.fg(context.isError ? "error" : "success", context.isError ? "Plan step submission failed" : "Plan step ready for review"), 0, 0);
+		renderResult(result, _options, theme, context) {
+			const text = result.content.find((item) => item.type === "text")?.text ?? "Plan step completed";
+			return new Text(theme.fg(context.isError ? "error" : "success", text), 0, 0);
 		},
 	});
 
@@ -647,7 +646,7 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 		runMode = undefined;
 		applyTools(selectedMode);
 		updateModeIndicator(ctx);
-		if (execution) ensurePanelLayout();
+		if (execution && execution.status !== "completed") ensurePanelLayout();
 	});
 
 	pi.on("session_start", async (event, ctx) => {
@@ -826,7 +825,7 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 					originalLayoutRoot = (tui as TUI & { layoutRoot?: Component }).layoutRoot;
 					fullscreenPanelCapable = originalLayoutRoot !== undefined;
 				}
-				if (execution) ensurePanelLayout();
+				if (execution && execution.status !== "completed") ensurePanelLayout();
 				editor.onCycle = () => {
 					if (currentContext) void selectMode(nextMode(selectedMode), currentContext, "manual");
 				};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@janvitos/pi-plan-build",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "description": "Plan safely, approve explicitly, then implement here or in a clean session.",
   "type": "module",
   "license": "MIT",

package/plan-execution.ts

@@ -1,4 +1,4 @@
-export type PlanStepStatus = "pending" | "ready" | "active" | "review" | "completed" | "skipped";
+export type PlanStepStatus = "pending" | "ready" | "active" | "completed" | "skipped";
 
 export interface PlanStep {
 	id: string;
@@ -55,21 +55,36 @@ export function decodePlanExecution(value: unknown): PlanExecutionState | undefi
 	const candidate = value as Partial<PlanExecutionState>;
 	if (candidate.version !== 1 || !["running", "paused", "completed"].includes(candidate.status ?? "")) return undefined;
 	if (!Array.isArray(candidate.steps) || candidate.steps.length === 0 || typeof candidate.planMarkdown !== "string") return undefined;
-	const validStatuses = new Set<PlanStepStatus>(["pending", "ready", "active", "review", "completed", "skipped"]);
+	const validStatuses = new Set<PlanStepStatus>(["pending", "ready", "active", "completed", "skipped"]);
 	const steps: PlanStep[] = [];
+	let legacyReviewIndex = -1;
 	for (const raw of candidate.steps) {
 		if (!raw || typeof raw !== "object") return undefined;
-		const step = raw as Partial<PlanStep>;
-		if (typeof step.id !== "string" || typeof step.text !== "string" || !validStatuses.has(step.status as PlanStepStatus)) return undefined;
+		const step = raw as Partial<PlanStep> & { status?: string };
+		const status = step.status === "review" ? "completed" : step.status;
+		if (step.status === "review") legacyReviewIndex = steps.length;
+		if (typeof step.id !== "string" || typeof step.text !== "string" || !validStatuses.has(status as PlanStepStatus)) return undefined;
 		if (!Number.isInteger(step.sourceLine) || (step.sourceLine ?? -1) < 0) return undefined;
-		steps.push({ id: step.id, text: step.text, status: step.status as PlanStepStatus, sourceLine: step.sourceLine!, ...(typeof step.summary === "string" ? { summary: step.summary } : {}) });
+		steps.push({ id: step.id, text: step.text, status: status as PlanStepStatus, sourceLine: step.sourceLine!, ...(typeof step.summary === "string" ? { summary: step.summary } : {}) });
+	}
+	let selectedStepId = typeof candidate.selectedStepId === "string" ? candidate.selectedStepId : undefined;
+	let status = candidate.status!;
+	if (legacyReviewIndex >= 0) {
+		const next = steps.slice(legacyReviewIndex + 1).find((step) => step.status === "pending");
+		if (next) {
+			next.status = "ready";
+			selectedStepId = next.id;
+		} else if (steps.every((step) => step.status === "completed" || step.status === "skipped")) {
+			status = "completed";
+			selectedStepId = undefined;
+		}
 	}
 	return {
 		version: 1,
-		status: candidate.status!,
+		status,
 		steps,
 		planMarkdown: candidate.planMarkdown,
-		selectedStepId: typeof candidate.selectedStepId === "string" ? candidate.selectedStepId : undefined,
+		selectedStepId,
 		panelVisible: candidate.panelVisible !== false,
 	};
 }
@@ -98,6 +113,16 @@ function makeNextReady(state: PlanExecutionState, afterId: string): void {
 	}
 }
 
+export function formatPlanCompletionSummary(state: PlanExecutionState): string {
+	const lines = ["Plan complete.", "", "Summary:"];
+	for (const [index, step] of state.steps.entries()) {
+		const outcome = step.status === "skipped" ? "Skipped" : "Completed";
+		lines.push(`${index + 1}. ${outcome}: ${step.text}`);
+		if (step.summary?.trim()) lines.push(`   ${step.summary.trim()}`);
+	}
+	return lines.join("\n");
+}
+
 export function startPlanStep(state: PlanExecutionState, id: string): PlanExecutionState {
 	const next = clone(state);
 	if (next.status === "completed") throw new Error("The plan is already complete");
@@ -109,42 +134,18 @@ export function startPlanStep(state: PlanExecutionState, id: string): PlanExecut
 	return next;
 }
 
-export function submitPlanStepForReview(state: PlanExecutionState, id: string, summary: string): PlanExecutionState {
-	const next = clone(state);
-	const step = findStep(next, id);
-	if (step.status !== "active") throw new Error("Only the active step can be submitted for review");
-	step.status = "review";
-	step.summary = summary.trim();
-	next.selectedStepId = id;
-	return next;
-}
-
-export function completePlanStep(state: PlanExecutionState, id: string): PlanExecutionState {
+export function completePlanStep(state: PlanExecutionState, id: string, summary?: string): PlanExecutionState {
 	const next = clone(state);
 	const step = findStep(next, id);
-	if (step.status !== "ready" && step.status !== "review") {
-		throw new Error("Only a ready or reviewed step can be marked complete");
+	if (step.status !== "ready" && step.status !== "active") {
+		throw new Error("Only a ready or active step can be marked complete");
 	}
+	if (summary?.trim()) step.summary = summary.trim();
 	step.status = "completed";
 	makeNextReady(next, id);
 	return next;
 }
 
-export function acceptPlanStep(state: PlanExecutionState, id: string): PlanExecutionState {
-	const step = findStep(state, id);
-	if (step.status !== "review") throw new Error("Only a step awaiting review can be accepted");
-	return completePlanStep(state, id);
-}
-
-export function requestPlanStepCorrections(state: PlanExecutionState, id: string): PlanExecutionState {
-	const next = clone(state);
-	const step = findStep(next, id);
-	if (step.status !== "review") throw new Error("Only a step awaiting review can receive corrections");
-	step.status = "active";
-	next.selectedStepId = id;
-	return next;
-}
-
 export function skipPlanStep(state: PlanExecutionState, id: string): PlanExecutionState {
 	const next = clone(state);
 	const step = findStep(next, id);

package/plan-panel.ts

@@ -6,7 +6,6 @@ const GLYPHS = {
 	pending: "○",
 	ready: "▷",
 	active: "▶",
-	review: "◆",
 	completed: "✓",
 	skipped: "–",
 } as const;
@@ -46,7 +45,7 @@ export class PlanPanel implements Component {
 		];
 		for (let index = 0; index < this.state.steps.length; index++) {
 			const step = this.state.steps[index]!;
-			const glyphColor = step.status === "completed" ? "success" : step.status === "review" ? "warning" : step.status === "active" || step.status === "ready" ? "accent" : "muted";
+			const glyphColor = step.status === "completed" ? "success" : step.status === "active" || step.status === "ready" ? "accent" : "muted";
 			const prefix = `${this.theme.fg(glyphColor, GLYPHS[step.status])} ${index + 1}. `;
 			const text = step.status === "completed" || step.status === "skipped" ? this.theme.fg("muted", step.text) : step.text;
 			const wrapped = wrapTextWithAnsi(text, Math.max(1, contentWidth - visibleWidth(prefix)));
@@ -68,7 +67,6 @@ export class PlanPanel implements Component {
 		if (this.state.status === "completed") lines.push(pad(this.theme.fg("success", "Plan complete")));
 		else if (this.state.status === "paused") lines.push(pad("Tell the agent to resume, cancel, or hide the plan."));
 		else if (current?.status === "ready") lines.push(pad("Tell the agent to implement, complete, edit, skip, cancel, or hide this step."));
-		else if (current?.status === "review") lines.push(pad("Tell the agent to accept, correct, or cancel the plan."));
 		else lines.push(pad("Plan progress updates automatically from your prompts."));
 		lines.push(border(`╰${"─".repeat(inner)}╯`));
 		return lines.map((line) => truncateToWidth(line, safeWidth, ""));

package/prompts.ts

@@ -60,7 +60,7 @@ The approved plan is at ${planPath}. Implement only step ${stepNumber} of ${tota
 
 ${step}
 
-Do not begin any later plan step. Complete and verify this step, then call plan_step_complete with a concise result summary. If the user requests corrections, continue working only on this same step and submit it for review again.
+Do not begin any later plan step. Complete and verify this step, then call plan_step_complete with a concise result summary. The step will be marked completed immediately; do not ask the user to review or accept it.
 </system-reminder>`;
 }
 
@@ -71,11 +71,11 @@ Step-by-step execution is waiting for the user's natural-language instruction. N
 Current progress:
 ${progress}
 
-Interpret the user's intent contextually rather than requiring exact phrases. Clear statements, confirmations, and feedback may request a state transition even when phrased non-imperatively. For example, a statement that a ready step is finished can use the complete action, while a positive review of agent work can use accept. If multiple materially different actions are plausible, ask a brief clarification. Cancellation is always available when the user clearly wants to stop. Do not advance based on hypothetical, uncertain, or unrelated discussion. The sidebar is a passive visual aid and cannot receive input.
+Interpret the user's intent contextually rather than requiring exact phrases. Clear statements, confirmations, and feedback may request a state transition even when phrased non-imperatively. For example, a statement that a ready step is finished can use the complete action. If multiple materially different actions are plausible, ask a brief clarification. Cancellation is always available when the user clearly wants to stop. Do not advance based on hypothetical, uncertain, or unrelated discussion. The sidebar is a passive visual aid and cannot receive input.
 </system-reminder>`;
 }
 
-export const PLAN_STEP_COMPLETE_DESCRIPTION = `Call this tool after implementing and verifying the currently active plan step. It stops execution and returns control to the user for review. Do not call it before the active step is complete, and never begin the next step yourself.`;
+export const PLAN_STEP_COMPLETE_DESCRIPTION = `Call this tool after implementing and verifying the currently active plan step. It marks the step completed immediately and returns control to the user before any next step begins. Do not call it before the active step is complete, and never begin the next step yourself.`;
 
 export const PLAN_EXIT_DESCRIPTION = `Use this tool when you have completed the planning phase and are ready to exit plan agent.