@janvitos/pi-plan-build 0.1.26 → 0.1.28

package/README.md

@@ -25,7 +25,7 @@ A global [Pi coding agent](https://github.com/badlogic/pi-mono) extension that a
 
 ## Requirements
 
-- Pi `0.84.1` or newer
+- Pi `0.84.2` or newer
 - Node.js `22.6` or newer for the test command
 - TUI or RPC UI support for interactive questions and approval dialogs
 
@@ -62,7 +62,7 @@ Do not install more than one npm, Git, or local copy at the same time; duplicate
 | `/plan` | Select Plan mode |
 | `/build` | Select Build mode |
 | `pi --plan` | Start a new session in Plan mode |
-| `/build-fresh` | Confirm a pending clean-session implementation |
+| `/build-fresh` | Start a pending clean-session implementation manually |
 
 The agent may also enter Plan mode with `plan_enter` when planning or investigation is safer than immediate execution.
 
@@ -71,10 +71,10 @@ The agent may also enter Plan mode with `plan_enter` when planning or investigat
 When planning is complete, `plan_exit` displays the entire persisted plan and asks whether to:
 
 1. implement in the current session;
-2. prepare a clean linked implementation session; or
+2. start a clean linked implementation session; or
 3. stay in Plan mode.
 
-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 **Start fresh and implement** stops the current run and automatically dispatches `/build-fresh`. Pi 0.84.2 or newer is required for extension command dispatch from an injected user message. The command creates a linked child session, copies the approved plan to its canonical plan file, preserves the model and thinking level selected for the action, switches it to Build, and starts implementation without transferring the planning conversation.
 
 Selecting **Stay in Plan mode**, or pressing Escape while the approval dialog is open, displays:
 
@@ -111,7 +111,7 @@ npm test
 npm pack --dry-run
 ```
 
-The tests cover state decoding, safe plan paths, mutation restrictions, deferred transitions, mode and provider rendering, session-based prompt history restoration, complete plan rendering, approval decisions, stop behavior, fresh-session handoff content, and question formatting.
+The tests cover state decoding, safe plan paths, mutation restrictions, deferred transitions, mode and provider rendering, session-based prompt history restoration, complete plan rendering, approval decisions, stop behavior, fresh-session settings and handoff content, and question formatting.
 
 ### Publishing
 

package/index.ts

@@ -14,10 +14,12 @@ import {
 import {
 	applyManualSelection,
 	buildFreshImplementationHandoff,
+	buildFreshImplementationRequest,
 	buildPlanExitFreshResult,
 	buildPlanExitStayResult,
 	buildPlanReviewMessage,
 	classifyPlanExitChoice,
+	type FreshImplementationRequest,
 	decodeModeState,
 	extractPromptHistory,
 	formatFooterCwd,
@@ -73,7 +75,7 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 	let toolsBeforeModes: string[] = [];
 	let currentContext: ExtensionContext | undefined;
 	let requestEditorRender: (() => void) | undefined;
-	let freshImplementationPlan: string | undefined;
+	let freshImplementationRequest: FreshImplementationRequest | undefined;
 
 	pi.registerFlag("plan", {
 		description: "Start in Plan mode",
@@ -160,28 +162,47 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 	pi.registerCommand("build-fresh", {
 		description: "Start a clean linked session and implement the plan selected in plan_exit",
 		handler: async (_args, ctx) => {
-			const plan = freshImplementationPlan;
-			if (!plan) {
+			const request = freshImplementationRequest;
+			if (!request) {
 				ctx.ui.notify("No fresh implementation is pending. Choose ‘Start fresh and implement’ from plan_exit first.", "warning");
 				return;
 			}
 			if (selectedMode !== "plan") {
-				freshImplementationPlan = undefined;
+				freshImplementationRequest = undefined;
 				ctx.ui.notify("Fresh implementation is no longer available because Plan mode is not active.", "warning");
 				return;
 			}
 			if (ctx.mode === "print" || ctx.mode === "json") {
 				throw new Error("Fresh implementation requires TUI or RPC mode");
 			}
-			if (!ctx.model) {
+			if (!request.model) {
 				ctx.ui.notify("Cannot start implementation because no model is selected.", "warning");
 				return;
 			}
+			const currentModel = ctx.model;
+			const implementationModel = ctx.modelRegistry.find(request.model.provider, request.model.id)
+				?? (currentModel?.provider === request.model.provider && currentModel.id === request.model.id ? currentModel : undefined);
+			if (!implementationModel) {
+				ctx.ui.notify(`Cannot start implementation because ${request.model.provider}/${request.model.id} is unavailable.`, "warning");
+				return;
+			}
+			try {
+				const modelSelected = await pi.setModel(implementationModel);
+				if (modelSelected === false) {
+					ctx.ui.notify(`Cannot start implementation because no API key is available for ${request.model.provider}/${request.model.id}.`, "warning");
+					return;
+				}
+				pi.setThinkingLevel(request.thinkingLevel);
+			} catch (error: unknown) {
+				const detail = error instanceof Error ? error.message : String(error);
+				ctx.ui.notify(`Cannot start implementation with ${request.model.provider}/${request.model.id}: ${detail}`, "warning");
+				return;
+			}
 
-			freshImplementationPlan = undefined;
+			freshImplementationRequest = undefined;
 			const parentSession = ctx.sessionManager.getSessionFile();
 			const sourceTools = [...toolsBeforeModes];
-			const handoff = buildFreshImplementationHandoff(plan);
+			const handoff = buildFreshImplementationHandoff(request.plan);
 			let destinationPlanPath = "";
 			let setupError: string | undefined;
 			let kickoffError: string | undefined;
@@ -195,7 +216,9 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 								sessionManager.getSessionId(),
 							);
 							await fs.promises.mkdir(path.dirname(destinationPlanPath), { recursive: true });
-							await fs.promises.writeFile(destinationPlanPath, plan, "utf8");
+							await fs.promises.writeFile(destinationPlanPath, request.plan, "utf8");
+							sessionManager.appendModelChange(request.model.provider, request.model.id);
+							sessionManager.appendThinkingLevelChange(request.thinkingLevel);
 							sessionManager.appendCustomEntry(STATE_TYPE, {
 								version: 1,
 								selectedMode: "build",
@@ -232,11 +255,11 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 					},
 				});
 				if (result.cancelled) {
-					freshImplementationPlan = plan;
+					freshImplementationRequest = request;
 					ctx.ui.notify("Fresh implementation cancelled; the source plan remains available.", "info");
 				}
 			} catch (error: unknown) {
-				freshImplementationPlan = plan;
+				freshImplementationRequest = request;
 				const detail = error instanceof Error ? error.message : String(error);
 				try {
 					ctx.ui.notify(`Unable to start a fresh implementation session: ${detail}`, "error");
@@ -296,16 +319,23 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 			));
 			const decision = classifyPlanExitChoice(selection.choice);
 			if (decision === "stay") {
-				freshImplementationPlan = undefined;
+				freshImplementationRequest = undefined;
 				pi.appendEntry(MODE_NOTICE_ENTRY_TYPE, { message: PLAN_EXIT_STAY_ACKNOWLEDGEMENT });
 				return buildPlanExitStayResult(planPath, selection.cancelled);
 			}
 			if (decision === "implement-fresh") {
-				freshImplementationPlan = plan;
-				ctx.ui.setEditorText("/build-fresh");
+				freshImplementationRequest = buildFreshImplementationRequest(
+					plan,
+					ctx.model ? { provider: ctx.model.provider, id: ctx.model.id } : undefined,
+					pi.getThinkingLevel(),
+				);
+				pi.sendUserMessage("/build-fresh", {
+					deliverAs: "followUp",
+					expandPromptTemplates: true,
+				});
 				return buildPlanExitFreshResult(planPath);
 			}
-			freshImplementationPlan = undefined;
+			freshImplementationRequest = undefined;
 			await selectMode("build", ctx, "tool");
 			return {
 				content: [
@@ -324,7 +354,7 @@ export default function planBuildModes(pi: ExtensionAPI): void {
 			const details = result.details as { approved?: boolean; action?: string } | undefined;
 			if (details?.action === "implement-fresh" && !context.isError) {
 				return new Text(
-					theme.fg("success", "Clean-session implementation selected — press Enter to run /build-fresh."),
+					theme.fg("success", "Clean-session implementation selected — starting automatically."),
 					0,
 					0,
 				);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@janvitos/pi-plan-build",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "Plan safely, approve explicitly, then implement here or in a clean session.",
   "type": "module",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "prepublishOnly": "npm test"
   },
   "peerDependencies": {
-    "@earendil-works/pi-coding-agent": "*",
+    "@earendil-works/pi-coding-agent": ">=0.84.2",
     "@earendil-works/pi-tui": "*",
     "typebox": "*"
   },

package/utils.ts

@@ -166,7 +166,7 @@ export function buildPlanExitFreshResult(planPath: string) {
 		content: [
 			{
 				type: "text" as const,
-				text: "The user selected clean-session implementation. Stop now; the /build-fresh command has been prepared for the user to submit.",
+				text: "The user selected clean-session implementation. Stop now; /build-fresh is starting automatically.",
 			},
 		],
 		details: { approved: true, action: "implement-fresh" as const, mode: "plan" as const, planPath },
@@ -174,6 +174,20 @@ export function buildPlanExitFreshResult(planPath: string) {
 	};
 }
 
+export interface FreshImplementationRequest {
+	plan: string;
+	model?: { provider: string; id: string };
+	thinkingLevel: string;
+}
+
+export function buildFreshImplementationRequest(
+	plan: string,
+	model: { provider: string; id: string } | undefined,
+	thinkingLevel: string,
+): FreshImplementationRequest {
+	return { plan, model, thinkingLevel };
+}
+
 export function buildFreshImplementationHandoff(plan: string): string {
 	return `Plan mode is now disabled. Full tool access is restored. Implement this approved plan now:\n\n${plan}`;
 }