@narumitw/pi-plan-mode 0.1.27 → 0.1.29

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, or stay in Plan mode.
+- Detects proposed plan blocks and prompts you to implement, revise, 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,14 +72,14 @@ 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.
+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.
 
 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.
 
-You can also exit directly:
+You can also exit directly. Direct exit discards the latest proposed plan instead of treating it as an implementation request:
 
 ```text
 /plan exit
@@ -92,7 +92,7 @@ This extension maps Codex's `ModeKind::Plan` behavior onto Pi's extension API:
 - Plan mode is a conversational collaboration mode, not TODO/progress tracking.
 - `/plan <prompt>` follows Codex behavior by switching to Plan mode before submitting the inline prompt.
 - `update_plan`-style checklist use is discouraged while Plan mode is active.
-- The implementation boundary is explicit: Plan mode restores tools before starting implementation, and choosing implementation immediately triggers a normal agent turn with full tool access.
+- The implementation boundary is explicit: Plan mode restores tools before starting implementation, choosing implementation immediately triggers a normal agent turn with full tool access, and plain exit/off discards the proposed plan.
 - Pi extension safety is approximated with built-in tool restriction plus bash filtering; non-built-in tools are user-selected at user risk because Plan mode does not classify extension/custom tool behavior.
 
 ## 🗂️ Package layout

package/package.json

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

package/src/plan-mode.ts

@@ -3,12 +3,16 @@ import type { ExtensionAPI, ExtensionContext, ToolInfo } from "@mariozechner/pi-
 const STATE_ENTRY_TYPE = "plan-mode-state";
 const STATUS_KEY = "plan-mode";
 const PLAN_WIDGET_KEY = "plan-mode-plan";
+const PLAN_CONTEXT_MESSAGE_TYPE = "plan-mode-context";
+const PROPOSED_PLAN_MESSAGE_TYPE = "proposed-plan";
+const PLAN_IMPLEMENTATION_MESSAGE_TYPE = "plan-mode-implementation";
 const PLAN_CONTEXT_MARKER = "[CODEX-LIKE PLAN MODE ACTIVE]";
 const SAFE_BUILTIN_PLAN_TOOLS = new Set(["read", "bash", "grep", "find", "ls"]);
 const BLOCKED_BUILTIN_TOOLS = new Set(["edit", "write"]);
 const DEFAULT_TOOLS = ["read", "bash", "edit", "write"];
 const TOOL_SELECTOR_PAGE_SIZE = 10;
 const PROPOSED_PLAN_PATTERN = /<proposed_plan>\s*([\s\S]*?)\s*<\/proposed_plan>/i;
+const PROPOSED_PLAN_BLOCK_PATTERN = /<proposed_plan>\s*[\s\S]*?\s*<\/proposed_plan>/gi;
 
 interface PlanModeState {
 	enabled: boolean;
@@ -95,7 +99,7 @@ export default function planMode(pi: ExtensionAPI) {
 			const command = prompt.toLowerCase();
 			if (command === "exit" || command === "off") {
 				exitPlanMode(ctx);
-				ctx.ui.notify("Plan mode disabled. Full tool access restored.", "info");
+				ctx.ui.notify("Plan mode disabled. Proposed plan discarded.", "info");
 				return;
 			}
 			if (command === "tools") {
@@ -150,7 +154,9 @@ export default function planMode(pi: ExtensionAPI) {
 	pi.on("context", async (event) => {
 		if (state.enabled) return;
 		return {
-			messages: event.messages.filter((message: unknown) => !messageContainsPlanModeContext(message)),
+			messages: event.messages
+				.filter((message: unknown) => !messageContainsInactivePlanModeArtifact(message))
+				.map(stripProposedPlanBlocksFromMessage),
 		};
 	});
 
@@ -159,7 +165,7 @@ export default function planMode(pi: ExtensionAPI) {
 		applyPlanModeTools();
 		return {
 			message: {
-				customType: "plan-mode-context",
+				customType: PLAN_CONTEXT_MESSAGE_TYPE,
 				content: buildPlanModePrompt(),
 				display: false,
 			},
@@ -180,16 +186,18 @@ export default function planMode(pi: ExtensionAPI) {
 		state = { ...state, latestPlan: proposedPlan, awaitingAction: true };
 		persistState();
 		updateUi(ctx);
+
+		if (ctx.hasUI) await showPlanReadyMenu(ctx);
+		if (!state.enabled || !state.latestPlan) return;
+
 		pi.sendMessage(
 			{
-				customType: "proposed-plan",
+				customType: PROPOSED_PLAN_MESSAGE_TYPE,
 				content: `**Proposed Plan**\n\n${proposedPlan}`,
 				display: true,
 			},
 			{ triggerTurn: false },
 		);
-
-		if (ctx.hasUI) await showPlanReadyMenu(ctx);
 	});
 
 	function enterPlanMode(ctx: ExtensionContext) {
@@ -211,8 +219,9 @@ export default function planMode(pi: ExtensionAPI) {
 	}
 
 	function exitPlanMode(ctx: ExtensionContext) {
-		state = { ...state, enabled: false, awaitingAction: false };
-		restoreTools();
+		const wasEnabled = state.enabled;
+		state = { ...state, enabled: false, latestPlan: undefined, awaitingAction: false };
+		if (wasEnabled) restoreTools();
 		persistState();
 		updateUi(ctx);
 	}
@@ -228,7 +237,7 @@ export default function planMode(pi: ExtensionAPI) {
 
 		pi.sendMessage(
 			{
-				customType: "plan-mode-implementation",
+				customType: PLAN_IMPLEMENTATION_MESSAGE_TYPE,
 				content: `Plan mode is now disabled. Full tool access is restored. Implement this proposed plan now:\n\n${plan}`,
 				display: true,
 			},
@@ -266,7 +275,7 @@ export default function planMode(pi: ExtensionAPI) {
 		}
 		if (choice === "Exit Plan mode") {
 			exitPlanMode(ctx);
-			ctx.ui.notify("Plan mode disabled. Full tool access restored.", "info");
+			ctx.ui.notify("Plan mode disabled. Proposed plan discarded.", "info");
 			return;
 		}
 		updateUi(ctx);
@@ -278,6 +287,7 @@ export default function planMode(pi: ExtensionAPI) {
 			"Revise plan",
 			"Configure Plan-mode tools",
 			"Stay in Plan mode",
+			"Exit Plan mode",
 		]);
 		if (choice === "Implement this plan") {
 			startImplementation(ctx);
@@ -290,6 +300,11 @@ export default function planMode(pi: ExtensionAPI) {
 		if (choice === "Revise plan") {
 			const refinement = await ctx.ui.editor("Revise the plan", "");
 			if (refinement?.trim()) pi.sendUserMessage(refinement.trim());
+			return;
+		}
+		if (choice === "Exit Plan mode") {
+			exitPlanMode(ctx);
+			ctx.ui.notify("Plan mode disabled. Proposed plan discarded.", "info");
 		}
 	}
 
@@ -446,10 +461,11 @@ export default function planMode(pi: ExtensionAPI) {
 			.filter((candidate) => candidate.type === "custom" && candidate.customType === STATE_ENTRY_TYPE)
 			.pop();
 		if (!entry?.data) return;
+		const enabled = entry.data.enabled ?? false;
 		state = {
-			enabled: entry.data.enabled ?? false,
-			latestPlan: entry.data.latestPlan,
-			awaitingAction: entry.data.awaitingAction ?? false,
+			enabled,
+			latestPlan: enabled ? entry.data.latestPlan : undefined,
+			awaitingAction: enabled ? (entry.data.awaitingAction ?? false) : false,
 			selectedToolNames: entry.data.selectedToolNames,
 			selectedToolKeys: entry.data.selectedToolKeys,
 		};
@@ -616,10 +632,57 @@ function latestAssistantText(messages: unknown) {
 	return "";
 }
 
-function messageContainsPlanModeContext(message: unknown) {
-	const candidate = message as { customType?: string; content?: unknown };
-	if (candidate.customType === "plan-mode-context") return true;
-	return contentText(candidate.content).includes(PLAN_CONTEXT_MARKER);
+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)
+	);
+}
+
+function stripProposedPlanBlocksFromMessage<T>(message: T): T {
+	const candidate = unwrapSessionMessage(message);
+	if (candidate.role !== "assistant") return message;
+
+	const content = stripProposedPlanBlocksFromContent(candidate.content);
+	if (content === candidate.content) return message;
+
+	if (isSessionMessageEntry(message)) {
+		return { ...message, message: { ...candidate, content } };
+	}
+	return { ...candidate, content } as T;
+}
+
+function unwrapSessionMessage(message: unknown) {
+	const entry = message as { message?: unknown };
+	return (entry.message ?? message) as { role?: string; customType?: string; content?: unknown };
+}
+
+function isSessionMessageEntry<T>(message: T): message is T & { message: SessionMessage } {
+	return typeof message === "object" && message !== null && "message" in message;
+}
+
+function stripProposedPlanBlocksFromContent(content: unknown) {
+	if (typeof content === "string") return stripProposedPlanBlocks(content);
+	if (!Array.isArray(content)) return content;
+
+	let changed = false;
+	const nextContent = content.map((block) => {
+		const textBlock = block as TextBlock;
+		if (textBlock.type !== "text" || typeof textBlock.text !== "string") return block;
+
+		const text = stripProposedPlanBlocks(textBlock.text);
+		if (text === textBlock.text) return block;
+
+		changed = true;
+		return { ...textBlock, text };
+	});
+	return changed ? nextContent : content;
+}
+
+function stripProposedPlanBlocks(text: string) {
+	return text.replace(PROPOSED_PLAN_BLOCK_PATTERN, "");
 }
 
 function messageText(message: SessionMessage) {