@narumitw/pi-plan-mode 0.18.0 → 0.24.0

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@narumitw/pi-plan-mode",
-	"version": "0.18.0",
+	"version": "0.24.0",
 	"description": "Pi extension that adds a Codex-like read-only /plan collaboration mode.",
 	"type": "module",
 	"license": "MIT",
@@ -29,8 +29,8 @@
 	},
 	"devDependencies": {
 		"@biomejs/biome": "2.5.3",
-		"@earendil-works/pi-coding-agent": "0.80.6",
-		"typescript": "6.0.3"
+		"@earendil-works/pi-coding-agent": "0.80.10",
+		"typescript": "7.0.2"
 	},
 	"repository": {
 		"type": "git",

package/src/message-transform.ts

@@ -2,8 +2,12 @@ import { PLAN_MODE_COMPLETE_TOOL_NAME } from "./completion-tool.js";
 
 const PLAN_CONTEXT_MESSAGE_TYPE = "plan-mode-context";
 const PROPOSED_PLAN_MESSAGE_TYPE = "proposed-plan";
-const PROPOSED_PLAN_PATTERN = /^<proposed_plan>[\t ]*\r?\n([\s\S]*?)\r?\n<\/proposed_plan>[\t ]*$/gm;
-const PROPOSED_PLAN_BLOCK_PATTERN = /^<proposed_plan>[\t ]*\r?\n[\s\S]*?\r?\n<\/proposed_plan>[\t ]*$/gm;
+const PLAN_IMPLEMENTATION_HANDOFF_PREFIX =
+	"Plan mode is now disabled. Full tool access is restored. Implement this proposed plan now:";
+const PROPOSED_PLAN_PATTERN =
+	/^<proposed_plan>[\t ]*\r?\n([\s\S]*?)\r?\n<\/proposed_plan>[\t ]*$/gm;
+const PROPOSED_PLAN_BLOCK_PATTERN =
+	/^<proposed_plan>[\t ]*\r?\n[\s\S]*?\r?\n<\/proposed_plan>[\t ]*$/gm;
 
 export type ProposedPlanParseResult =
 	| { kind: "absent" }
@@ -65,6 +69,14 @@ export function messageContainsInactivePlanModeArtifact(message: unknown) {
 	);
 }
 
+export function messageContainsPlanModeImplementationHandoff(message: unknown) {
+	const candidate = unwrapSessionMessage(message);
+	return (
+		candidate.role === "user" &&
+		contentText(candidate.content).trimStart().startsWith(PLAN_IMPLEMENTATION_HANDOFF_PREFIX)
+	);
+}
+
 export function stripProposedPlanBlocksFromMessage<T>(message: T): T {
 	return replaceAssistantContent(message, stripProposedPlanBlocksFromContent);
 }
@@ -74,9 +86,7 @@ export function stripPlanModeCompletionCallsFromMessage<T>(message: T): T {
 		if (!Array.isArray(content)) return content;
 		const nextContent = content.filter((block) => {
 			const candidate = block as { type?: string; name?: string };
-			return !(
-				candidate.type === "toolCall" && candidate.name === PLAN_MODE_COMPLETE_TOOL_NAME
-			);
+			return !(candidate.type === "toolCall" && candidate.name === PLAN_MODE_COMPLETE_TOOL_NAME);
 		});
 		return nextContent.length === content.length ? content : nextContent;
 	});
@@ -91,10 +101,7 @@ export function isEmptyAssistantMessage(message: unknown) {
 	);
 }
 
-function replaceAssistantContent<T>(
-	message: T,
-	transform: (content: unknown) => unknown,
-): T {
+function replaceAssistantContent<T>(message: T, transform: (content: unknown) => unknown): T {
 	const candidate = unwrapSessionMessage(message);
 	if (candidate.role !== "assistant") return message;
 

package/src/plan-mode.ts

@@ -10,6 +10,7 @@ import {
 	latestAssistantText,
 	messageContainsInactivePlanModeArtifact,
 	messageContainsLegacyPlanModeContextArtifact,
+	messageContainsPlanModeImplementationHandoff,
 	parseProposedPlan,
 	stripPlanModeCompletionCallsFromMessage,
 	stripProposedPlanBlocksFromMessage,
@@ -26,6 +27,7 @@ import {
 import { showPersistentSelector } from "./selector-ui.js";
 import {
 	configuredThinkingLevel,
+	type PlanModeFixedThinkingLevel,
 	type PlanModeSettings,
 	readPlanModeSettings,
 } from "./settings.js";
@@ -47,6 +49,20 @@ const BLOCKED_BUILTIN_TOOLS = new Set(["edit", "write"]);
 const DEFAULT_TOOLS = ["read", "bash", "edit", "write"];
 const TOOL_SELECTOR_PAGE_SIZE = 10;
 
+type AgentSettledHandler = (event: unknown, ctx: ExtensionContext) => unknown;
+
+function onAgentSettled(pi: ExtensionAPI, handler: AgentSettledHandler) {
+	(
+		pi as unknown as {
+			on(event: "agent_settled", callback: AgentSettledHandler): void;
+		}
+	).on("agent_settled", handler);
+}
+
+function setPlanThinkingLevel(pi: ExtensionAPI, level: PlanModeFixedThinkingLevel) {
+	(pi.setThinkingLevel as unknown as (level: PlanModeFixedThinkingLevel) => void)(level);
+}
+
 interface CommandArgumentCompletion {
 	value: string;
 	label: string;
@@ -277,7 +293,13 @@ export default function planMode(pi: ExtensionAPI) {
 		const messagesWithoutLegacyPlanContext = event.messages.filter(
 			(message: unknown) => !messageContainsLegacyPlanModeContextArtifact(message),
 		);
-		if (state.enabled) return { messages: messagesWithoutLegacyPlanContext };
+		if (state.enabled) {
+			return {
+				messages: messagesWithoutLegacyPlanContext.filter(
+					(message: unknown) => !messageContainsPlanModeImplementationHandoff(message),
+				),
+			};
+		}
 		return {
 			messages: messagesWithoutLegacyPlanContext
 				.filter((message: unknown) => !messageContainsInactivePlanModeArtifact(message))
@@ -322,7 +344,7 @@ export default function planMode(pi: ExtensionAPI) {
 		acceptCompletedPlan(parsedPlan.plan, "legacy_proposed_plan", ctx);
 	});
 
-	pi.on("agent_settled", async (_event, ctx) => {
+	onAgentSettled(pi, async (_event, ctx) => {
 		const intent = readyPresentationIntent;
 		if (!intent || !readyPresentationIsCurrent(intent)) return;
 		if (!ctx.isIdle() || ctx.hasPendingMessages()) return;
@@ -749,7 +771,7 @@ export default function planMode(pi: ExtensionAPI) {
 	function applyPlanThinkingLevel() {
 		if (state.manualThinkingLevel) {
 			if (pi.getThinkingLevel() !== state.manualThinkingLevel) {
-				pi.setThinkingLevel(state.manualThinkingLevel);
+				setPlanThinkingLevel(pi, state.manualThinkingLevel);
 			}
 			return;
 		}
@@ -764,7 +786,7 @@ export default function planMode(pi: ExtensionAPI) {
 		}
 		const current = pi.getThinkingLevel();
 		if (!state.appliedThinkingLevel) state.previousThinkingLevel = current;
-		if (current !== configured) pi.setThinkingLevel(configured);
+		if (current !== configured) setPlanThinkingLevel(pi, configured);
 		state.appliedThinkingLevel = pi.getThinkingLevel();
 	}
 
@@ -788,7 +810,7 @@ export default function planMode(pi: ExtensionAPI) {
 			previousThinkingLevel &&
 			pi.getThinkingLevel() === appliedThinkingLevel
 		) {
-			pi.setThinkingLevel(previousThinkingLevel);
+			setPlanThinkingLevel(pi, previousThinkingLevel);
 		}
 		state = { ...state, appliedThinkingLevel: undefined, previousThinkingLevel: undefined };
 	}