@janvitos/pi-plan-build 0.1.24 → 0.1.26

package/README.md

@@ -8,7 +8,7 @@ A global [Pi coding agent](https://github.com/badlogic/pi-mono) extension that a
 
 - New sessions start in **Build** mode.
 - Bare `Tab` cycles **Build → Plan → Build**, while active autocomplete dropdowns retain Pi's normal Tab completion.
-- The composer uses OpenCode prompt-inspired blue/orange mode colors on the rounded top-left border and left rail, complemented by Pi's border color on the right rail and rounded bottom-right border; dim rounded corners with color-matched horizontal `╌` segments bridge the borders at both junctions, paired with a light vertical `┆` at the top right and a mode-specific bottom-left transition: thin `┆` in Plan and heavy `┇` in Build. It also includes a mode/model/thinking metadata row; cycling the thinking level updates this row without adding a duplicate status above the composer. The model is shown as `model-id [provider]` (for example, `gpt-5.6-luna [openai]`), with the model ID inheriting the terminal foreground like unselected entries in `/model` and the provider using the footer's dim text color. The footer keeps the remaining path and usage stats without duplicating model metadata.
+- The composer uses OpenCode prompt-inspired blue/orange mode colors on the rounded top-left border and left rail, complemented by Pi's border color on the right rail and rounded bottom-right border; rounded corners inherit their vertical rail colors while horizontal `╌` segments bridge the borders at both junctions, paired with a light vertical `┆` at the top right and a mode-specific bottom-left transition: thin `┆` in Plan and heavy `┇` in Build. It also includes a mode/model/thinking metadata row; cycling the thinking level updates this row without adding a duplicate status above the composer. The model is shown as `model-id [provider]` (for example, `gpt-5.6-luna [openai]`), with the model ID inheriting the terminal foreground like unselected entries in `/model` and the provider using the footer's dim text color. The footer keeps the remaining path and usage stats without duplicating model metadata.
 - `/plan`, `/build`, and the `--plan` startup flag.
 - Per-session plans at `~/.pi/agent/plans/<session-id>.md`.
 - In Plan mode, built-in `edit` and `write` are restricted to the exact plan file.
@@ -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**
-- Staying in Plan mode produces a durable acknowledgement and stops the run until the user responds.
+- 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.
 
@@ -76,11 +76,11 @@ When planning is complete, `plan_exit` displays the entire persisted plan and as
 
 Selecting **Start fresh and implement** stops the current run and pre-fills `/build-fresh`. Press Enter to confirm. Pi only exposes session creation to user-invoked command contexts, so this confirmation is required. The command creates a linked child session, copies the approved plan to its canonical plan file, switches it to Build, and starts implementation without transferring the planning conversation.
 
-Selecting **Stay in Plan mode** displays:
+Selecting **Stay in Plan mode**, or pressing Escape while the approval dialog is open, displays:
 
 > Staying in Plan mode. Let me know when you’re ready to revise or implement the plan.
 
-The agent then stops and waits for the next user message.
+Both actions leave Plan mode active, stop the agent, and wait for the next user message.
 
 ## Plan-mode permissions
 

package/index.ts

@@ -29,6 +29,7 @@ import {
 	makePlanPath,
 	nextMode,
 	nextThinkingLevel,
+	normalizePlanExitChoice,
 	PLAN_EXIT_APPROVE_CHOICE,
 	PLAN_EXIT_FRESH_CHOICE,
 	PLAN_EXIT_STAY_ACKNOWLEDGEMENT,
@@ -289,15 +290,15 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 			if (!plan.trim()) throw new Error("Cannot request plan approval because the plan file is empty");
 			pi.appendEntry(PLAN_REVIEW_ENTRY_TYPE, { plan, planPath });
 			const displayPath = shorten(planPath, ctx.cwd);
-			const choice = await ctx.ui.select(
+			const selection = normalizePlanExitChoice(await ctx.ui.select(
 				`Build Agent: Plan at ${displayPath} is complete. What would you like to do?`,
 				[PLAN_EXIT_APPROVE_CHOICE, PLAN_EXIT_FRESH_CHOICE, PLAN_EXIT_STAY_CHOICE],
-			);
-			const decision = classifyPlanExitChoice(choice);
+			));
+			const decision = classifyPlanExitChoice(selection.choice);
 			if (decision === "stay") {
 				freshImplementationPlan = undefined;
 				pi.appendEntry(MODE_NOTICE_ENTRY_TYPE, { message: PLAN_EXIT_STAY_ACKNOWLEDGEMENT });
-				return buildPlanExitStayResult(planPath, choice === undefined);
+				return buildPlanExitStayResult(planPath, selection.cancelled);
 			}
 			if (decision === "implement-fresh") {
 				freshImplementationPlan = plan;
@@ -506,7 +507,7 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 						width - 1,
 						"",
 					);
-					const topBorder = formatModeTopBorder(selectedMode, width, ctx.ui.theme.fg("dim", "╮"));
+					const topBorder = formatModeTopBorder(selectedMode, width, this.borderColor("╮"));
 					return renderModeComposer(
 						lines,
 						topBorder,
@@ -514,7 +515,7 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 						rightRail,
 						topRightVerticalTransition,
 						metadata,
-						ctx.ui.theme.fg("dim", "╰"),
+						formatModeRail(selectedMode, "╰"),
 						railWidth,
 						width,
 						{

package/package.json

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

package/utils.ts

@@ -139,7 +139,19 @@ export const PLAN_EXIT_STAY_ACKNOWLEDGEMENT =
 
 export type PlanExitDecision = "implement-here" | "implement-fresh" | "stay";
 
-export function classifyPlanExitChoice(choice: string | undefined): PlanExitDecision {
+export interface NormalizedPlanExitChoice {
+	choice: string;
+	cancelled: boolean;
+}
+
+export function normalizePlanExitChoice(choice: string | undefined): NormalizedPlanExitChoice {
+	return {
+		choice: choice ?? PLAN_EXIT_STAY_CHOICE,
+		cancelled: choice === undefined,
+	};
+}
+
+export function classifyPlanExitChoice(choice: string): PlanExitDecision {
 	if (choice === PLAN_EXIT_APPROVE_CHOICE) return "implement-here";
 	if (choice === PLAN_EXIT_FRESH_CHOICE) return "implement-fresh";
 	return "stay";