@narumitw/pi-plan-mode 0.1.33 → 0.1.35

package/README.md

@@ -14,7 +14,7 @@ Pi core intentionally does not ship a built-in plan mode; this package provides
 - Disables extension and custom tools by default, with a `/plan tools` selector for explicit user-risk opt-in.
 - Blocks mutating built-in tools and bash commands such as `rm`, `git commit`, dependency installs, redirects, and editor launches.
 - Injects Codex-like Plan mode instructions: explore first, ask only non-discoverable questions, do not mutate files, and finish with `<proposed_plan>`.
-- Detects proposed plan blocks and prompts you to implement, revise, stay in Plan mode, or exit and discard the plan.
+- Detects proposed plan blocks and prompts you to implement, stay in Plan mode, or exit and discard the plan.
 - Shows Plan mode state in Pi's statusline as `📝 plan active` or `📝 plan ready`.
 - Persists Plan mode state in the Pi session so resume restores the mode.
 
@@ -72,12 +72,12 @@ A complete Plan mode answer should include exactly one block like this:
 </proposed_plan>
 ```
 
-After a proposed plan is detected, `/plan` lets you choose whether to implement the plan, revise it, stay in Plan mode, or exit Plan mode. Choosing implementation disables Plan mode, restores full tool access, and immediately starts an implementation turn with the proposed plan. Choosing exit/off disables Plan mode and discards the proposed plan so it is not carried into later non-plan turns.
+After a proposed plan is detected, `/plan` lets you choose whether to implement the plan, stay in Plan mode, or exit Plan mode. Choosing implementation disables Plan mode, restores full tool access, and immediately starts an implementation turn with the proposed plan. Choosing Stay keeps the plan ready while you decide what to do next; to revise the plan, choose Stay and type your revision feedback in the normal prompt. When that next Plan-mode turn starts, the previous plan is no longer treated as the latest implementable plan unless the agent produces an updated `<proposed_plan>`. Choosing exit/off disables Plan mode and discards the proposed plan so it is not carried into later non-plan turns.
 
 While Plan mode is enabled, the extension also publishes a compact status for Pi statuslines. With `@narumitw/pi-statusline`, this appears in the extension status area:
 
 - `📝 plan active`: Plan mode is enabled and still gathering context or drafting a plan.
-- `📝 plan ready`: A `<proposed_plan>` was detected and is waiting for your next `/plan` action.
+- `📝 plan ready`: A `<proposed_plan>` was detected and remains ready until you implement it, continue planning, or exit Plan mode.
 
 You can also exit directly. Direct exit discards the latest proposed plan instead of treating it as an implementation request:
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-plan-mode",
-	"version": "0.1.33",
+	"version": "0.1.35",
 	"description": "Pi extension that adds a Codex-like read-only /plan collaboration mode.",
 	"type": "module",
 	"license": "MIT",

package/src/plan-mode.ts

@@ -159,8 +159,13 @@ export default function planMode(pi: ExtensionAPI) {
 		};
 	});
 
-	pi.on("before_agent_start", () => {
+	pi.on("before_agent_start", (_event, ctx) => {
 		if (!state.enabled) return;
+		if (state.latestPlan || state.awaitingAction) {
+			state = { ...state, latestPlan: undefined, awaitingAction: false };
+			persistState();
+			updateUi(ctx);
+		}
 		applyPlanModeTools();
 		return {
 			message: {
@@ -186,17 +191,20 @@ export default function planMode(pi: ExtensionAPI) {
 		persistState();
 		updateUi(ctx);
 
-		if (ctx.hasUI) await showPlanReadyMenu(ctx);
-		if (!state.enabled || !state.latestPlan) return;
-
-		pi.sendMessage(
-			{
-				customType: PROPOSED_PLAN_MESSAGE_TYPE,
-				content: `**Proposed Plan**\n\n${proposedPlan}`,
-				display: true,
-			},
-			{ triggerTurn: false },
-		);
+		scheduleAfterCurrentAgentRun(async () => {
+			if (!state.enabled || state.latestPlan !== proposedPlan) return;
+			if (ctx.hasUI) await showPlanReadyMenu(ctx);
+			if (!state.enabled || state.latestPlan !== proposedPlan) return;
+
+			pi.sendMessage(
+				{
+					customType: PROPOSED_PLAN_MESSAGE_TYPE,
+					content: `**Proposed Plan**\n\n${proposedPlan}`,
+					display: true,
+				},
+				{ triggerTurn: false },
+			);
+		});
 	});
 
 	function enterPlanMode(ctx: ExtensionContext) {
@@ -229,6 +237,15 @@ export default function planMode(pi: ExtensionAPI) {
 		else pi.sendUserMessage(message, { deliverAs: "followUp" });
 	}
 
+	function scheduleAfterCurrentAgentRun(task: () => Promise<void> | void) {
+		setTimeout(() => {
+			void Promise.resolve(task()).catch((error: unknown) => {
+				const message = error instanceof Error ? error.message : String(error);
+				console.error(`Plan mode follow-up failed: ${message}`);
+			});
+		}, 0);
+	}
+
 	function startImplementation(ctx: ExtensionContext) {
 		const plan = state.latestPlan?.trim();
 		exitPlanMode(ctx);
@@ -283,8 +300,6 @@ export default function planMode(pi: ExtensionAPI) {
 	async function showPlanReadyMenu(ctx: ExtensionContext) {
 		const choice = await ctx.ui.select("Proposed plan ready. What next?", [
 			"Implement this plan",
-			"Revise plan",
-			"Configure Plan-mode tools",
 			"Stay in Plan mode",
 			"Exit Plan mode",
 		]);
@@ -292,15 +307,6 @@ export default function planMode(pi: ExtensionAPI) {
 			startImplementation(ctx);
 			return;
 		}
-		if (choice === "Configure Plan-mode tools") {
-			await showToolSelector(ctx);
-			return;
-		}
-		if (choice === "Revise plan") {
-			const refinement = await ctx.ui.editor("Revise the plan", "");
-			if (refinement?.trim()) sendPlanModeUserMessage(refinement.trim(), ctx);
-			return;
-		}
 		if (choice === "Exit Plan mode") {
 			exitPlanMode(ctx);
 			ctx.ui.notify("Plan mode disabled. Proposed plan discarded.", "info");
@@ -635,8 +641,7 @@ function messageContainsInactivePlanModeArtifact(message: unknown) {
 	const candidate = unwrapSessionMessage(message);
 	return (
 		candidate.customType === PLAN_CONTEXT_MESSAGE_TYPE ||
-		candidate.customType === PROPOSED_PLAN_MESSAGE_TYPE ||
-		contentText(candidate.content).includes(PLAN_CONTEXT_MARKER)
+		candidate.customType === PROPOSED_PLAN_MESSAGE_TYPE
 	);
 }