@oh-my-pi/pi-coding-agent 14.1.2 → 14.2.1

package/src/modes/components/settings-selector.ts

@@ -25,7 +25,7 @@ import { getCurrentThemeName, getSelectListTheme, getSettingsListTheme, theme }
 import { matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
 import { getTabBarTheme } from "../shared";
 import { DynamicBorder } from "./dynamic-border";
-import { PluginSettingsComponent } from "./plugin-settings";
+import { handleInputOrEscape, PluginSettingsComponent } from "./plugin-settings";
 import { getSettingsForTab, type SettingDef } from "./settings-defs";
 import { getPreset } from "./status-line/presets";
 
@@ -70,11 +70,7 @@ class TextInputSubmenu extends Container {
 	}
 
 	handleInput(data: string): void {
-		if (data === "\x1b" || data === "\x1b\x1b") {
-			this.onCancel();
-			return;
-		}
-		this.#input.handleInput(data);
+		handleInputOrEscape(data, this.#input, this.onCancel);
 	}
 }
 

package/src/modes/components/tool-execution.ts

@@ -14,7 +14,14 @@ import {
 	type TUI,
 } from "@oh-my-pi/pi-tui";
 import { getProjectDir, logger } from "@oh-my-pi/pi-utils";
-import { computeEditDiff, computeHashlineDiff, computePatchDiff, type DiffError, type DiffResult } from "../../edit";
+import {
+	computeEditDiff,
+	computeHashlineDiff,
+	computePatchDiff,
+	type DiffError,
+	type DiffResult,
+	expandApplyPatchToEntries,
+} from "../../edit";
 import type { Theme } from "../../modes/theme/theme";
 import { theme } from "../../modes/theme/theme";
 import { BASH_DEFAULT_PREVIEW_LINES } from "../../tools/bash";
@@ -54,6 +61,10 @@ function cloneToolArgs<T>(args: T): T {
 	}
 }
 
+function isEditLikeToolName(toolName: string): boolean {
+	return toolName === "edit" || toolName === "apply_patch";
+}
+
 export interface ToolExecutionOptions {
 	showImages?: boolean; // default: true (only used if terminal supports images)
 	editFuzzyThreshold?: number;
@@ -166,7 +177,7 @@ export class ToolExecutionComponent extends Container {
 
 	/**
 	 * Signal that args are complete (tool is about to execute).
-	 * This triggers diff computation for edit tool.
+	 * This triggers diff computation for edit-like tools.
 	 */
 	setArgsComplete(_toolCallId?: string): void {
 		this.#argsComplete = true;
@@ -179,10 +190,39 @@ export class ToolExecutionComponent extends Container {
 	 * This runs async and updates display when done.
 	 */
 	#maybeComputeEditDiff(): void {
-		if (this.#toolName !== "edit") return;
+		if (!isEditLikeToolName(this.#toolName)) return;
 
 		const edits = this.#args?.edits;
-		if (!Array.isArray(edits) || edits.length === 0) return;
+		if (!Array.isArray(edits) || edits.length === 0) {
+			if (this.#toolName !== "apply_patch" || typeof this.#args?.input !== "string") {
+				return;
+			}
+
+			const input = this.#args.input;
+			const argsKey = JSON.stringify({ input });
+			if (this.#editDiffArgsKey === argsKey) return;
+			this.#editDiffArgsKey = argsKey;
+
+			try {
+				const first = expandApplyPatchToEntries({ input })[0];
+				if (!first?.path) return;
+				computePatchDiff({ ...first, op: first.op ?? "update" }, this.#cwd, {
+					fuzzyThreshold: this.#editFuzzyThreshold,
+					allowFuzzy: this.#editAllowFuzzy,
+				}).then(result => {
+					if (this.#editDiffArgsKey === argsKey) {
+						this.#editDiffPreview = result;
+						this.#updateDisplay();
+						this.#ui.requestRender();
+					}
+				});
+			} catch (err) {
+				this.#editDiffPreview = { error: err instanceof Error ? err.message : String(err) };
+				this.#updateDisplay();
+				this.#ui.requestRender();
+			}
+			return;
+		}
 
 		const first = edits[0];
 		if (!first || typeof first !== "object") return;
@@ -197,13 +237,9 @@ export class ToolExecutionComponent extends Container {
 			if (this.#editDiffArgsKey === argsKey) return;
 			this.#editDiffArgsKey = argsKey;
 
-			computeEditDiff(path, oldText, newText, this.#cwd, true, all, this.#editFuzzyThreshold).then(result => {
-				if (this.#editDiffArgsKey === argsKey) {
-					this.#editDiffPreview = result;
-					this.#updateDisplay();
-					this.#ui.requestRender();
-				}
-			});
+			computeEditDiff(path, oldText, newText, this.#cwd, true, all, this.#editFuzzyThreshold).then(result =>
+				this.#applyEditDiffResult(argsKey, result),
+			);
 		} else if ("path" in first && ("diff" in first || ("op" in first && !("content" in first)))) {
 			// Patch mode (has diff or op without content — chunk edits always have content)
 			const { path, op, rename, diff } = first;
@@ -216,13 +252,7 @@ export class ToolExecutionComponent extends Container {
 			computePatchDiff({ path, op, rename, diff }, this.#cwd, {
 				fuzzyThreshold: this.#editFuzzyThreshold,
 				allowFuzzy: this.#editAllowFuzzy,
-			}).then(result => {
-				if (this.#editDiffArgsKey === argsKey) {
-					this.#editDiffPreview = result;
-					this.#updateDisplay();
-					this.#ui.requestRender();
-				}
-			});
+			}).then(result => this.#applyEditDiffResult(argsKey, result));
 		} else if ("loc" in first && "path" in first) {
 			// Hashline mode — group edits by path, preview first file
 			const path = first.path;
@@ -234,17 +264,20 @@ export class ToolExecutionComponent extends Container {
 			if (this.#editDiffArgsKey === argsKey) return;
 			this.#editDiffArgsKey = argsKey;
 
-			computeHashlineDiff({ path, edits: fileEdits, move }, this.#cwd).then(result => {
-				if (this.#editDiffArgsKey === argsKey) {
-					this.#editDiffPreview = result;
-					this.#updateDisplay();
-					this.#ui.requestRender();
-				}
-			});
+			computeHashlineDiff({ path, edits: fileEdits, move }, this.#cwd).then(result =>
+				this.#applyEditDiffResult(argsKey, result),
+			);
 		}
 		// Chunk mode edits don't have a pre-execution diff preview
 	}
 
+	#applyEditDiffResult(argsKey: string, result: DiffResult | DiffError): void {
+		if (this.#editDiffArgsKey !== argsKey) return;
+		this.#editDiffPreview = result;
+		this.#updateDisplay();
+		this.#ui.requestRender();
+	}
+
 	updateResult(
 		result: {
 			content: Array<{ type: string; text?: string; data?: string; mimeType?: string }>;
@@ -316,7 +349,7 @@ export class ToolExecutionComponent extends Container {
 	 */
 	#updateSpinnerAnimation(): void {
 		// Spinner for: task tool with partial result, or edit/write while args streaming
-		const isStreamingArgs = !this.#argsComplete && (this.#toolName === "edit" || this.#toolName === "write");
+		const isStreamingArgs = !this.#argsComplete && (isEditLikeToolName(this.#toolName) || this.#toolName === "write");
 		const isBackgroundAsyncTask =
 			this.#toolName === "task" &&
 			(this.#result?.details as { async?: { state?: string } } | undefined)?.async?.state === "running";
@@ -610,7 +643,7 @@ export class ToolExecutionComponent extends Container {
 	}
 
 	#getCallArgsForRender(): any {
-		if (this.#toolName !== "edit") {
+		if (!isEditLikeToolName(this.#toolName)) {
 			return this.#args;
 		}
 		if (!this.#editDiffPreview || !("diff" in this.#editDiffPreview) || !this.#editDiffPreview.diff) {
@@ -646,7 +679,7 @@ export class ToolExecutionComponent extends Container {
 			context.expanded = this.#expanded;
 			context.previewLines = PYTHON_DEFAULT_PREVIEW_LINES;
 			context.timeout = normalizeTimeoutSeconds(this.#args?.timeout, 600);
-		} else if (this.#toolName === "edit") {
+		} else if (isEditLikeToolName(this.#toolName)) {
 			// Edit needs diff preview and renderDiff function
 			context.editDiffPreview = this.#editDiffPreview;
 			context.renderDiff = renderDiff;

package/src/modes/controllers/event-controller.ts

@@ -66,7 +66,9 @@ export class EventController {
 	#getReadGroup(): ReadToolGroupComponent {
 		if (!this.#lastReadGroup) {
 			this.ctx.chatContainer.addChild(new Text("", 0, 0));
-			const group = new ReadToolGroupComponent();
+			const group = new ReadToolGroupComponent({
+				showContentPreview: this.ctx.settings.get("read.toolResultPreview"),
+			});
 			group.setExpanded(this.ctx.toolOutputExpanded);
 			this.ctx.chatContainer.addChild(group);
 			this.#lastReadGroup = group;

package/src/modes/controllers/extension-ui-controller.ts

@@ -3,6 +3,7 @@ import { Container, Spacer, Text } from "@oh-my-pi/pi-tui";
 import { logger } from "@oh-my-pi/pi-utils";
 import { KeybindingsManager } from "../../config/keybindings";
 import type {
+	CompactOptions,
 	ExtensionActions,
 	ExtensionCommandContextActions,
 	ExtensionContextActions,
@@ -12,6 +13,7 @@ import type {
 	ExtensionUiComponent,
 	ExtensionWidgetContent,
 	ExtensionWidgetOptions,
+	SendUserMessageHandler,
 	TerminalInputHandler,
 } from "../../extensibility/extensions";
 import { HookEditorComponent } from "../../modes/components/hook-editor";
@@ -82,26 +84,14 @@ export class ExtensionUiController {
 				const wasStreaming = this.ctx.session.isStreaming;
 				this.ctx.session
 					.sendCustomMessage(message, options)
-					.then(() => {
-						// For non-streaming cases with display=true, update UI
-						// (streaming cases update via message_end event)
-						if (!this.ctx.isBackgrounded && !wasStreaming && message.display) {
-							this.ctx.rebuildChatFromMessages();
-						}
-					})
+					.then(() => this.#applyCustomMessageDisplay(wasStreaming, message.display))
 					.catch((err: unknown) => {
 						this.ctx.showError(
 							`Extension sendMessage failed: ${err instanceof Error ? err.message : String(err)}`,
 						);
 					});
 			},
-			sendUserMessage: (content, options) => {
-				this.ctx.session.sendUserMessage(content, options).catch((err: unknown) => {
-					this.ctx.showError(
-						`Extension sendUserMessage failed: ${err instanceof Error ? err.message : String(err)}`,
-					);
-				});
-			},
+			sendUserMessage: this.#sendExtensionUserMessage,
 			appendEntry: (customType, data) => {
 				this.ctx.sessionManager.appendCustomEntry(customType, data);
 			},
@@ -121,14 +111,7 @@ export class ExtensionUiController {
 			setThinkingLevel: level => this.ctx.session.setThinkingLevel(level),
 			getCommands: () => [],
 			getSessionName: () => this.ctx.sessionManager.getSessionName(),
-			setSessionName: async name => {
-				await this.ctx.sessionManager.setSessionName(name, "user");
-				setSessionTerminalTitle(
-					this.ctx.sessionManager.getSessionName(),
-					this.ctx.sessionManager.getCwd(),
-					this.ctx.sessionManager.titleSource,
-				);
-			},
+			setSessionName: name => this.#updateSessionName(name),
 		};
 		const contextActions: ExtensionContextActions = {
 			getModel: () => this.ctx.session.model,
@@ -139,12 +122,7 @@ export class ExtensionUiController {
 				// Signal shutdown request (will be handled by main loop)
 			},
 			getContextUsage: () => this.ctx.session.getContextUsage(),
-			compact: async instructionsOrOptions => {
-				const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
-				const options =
-					instructionsOrOptions && typeof instructionsOrOptions === "object" ? instructionsOrOptions : undefined;
-				await this.ctx.session.compact(instructions, options);
-			},
+			compact: instructionsOrOptions => this.#compactSession(instructionsOrOptions),
 			getSystemPrompt: () => this.ctx.session.systemPrompt,
 		};
 		const commandActions: ExtensionCommandContextActions = {
@@ -238,16 +216,7 @@ export class ExtensionUiController {
 
 				return { cancelled: false };
 			},
-			compact: async instructionsOrOptions => {
-				const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
-				const options =
-					instructionsOrOptions && typeof instructionsOrOptions === "object" ? instructionsOrOptions : undefined;
-				if (this.ctx.isBackgrounded) {
-					await this.ctx.session.compact(instructions, options);
-					return;
-				}
-				await this.ctx.executeCompaction(instructionsOrOptions, false);
-			},
+			compact: async instructionsOrOptions => this.#handleInteractiveCompact(instructionsOrOptions),
 			switchSession: async sessionPath => {
 				this.clearHookWidgets();
 				const result = await this.ctx.session.switchSession(sessionPath);
@@ -357,13 +326,7 @@ export class ExtensionUiController {
 				const wasStreaming = this.ctx.session.isStreaming;
 				this.ctx.session
 					.sendCustomMessage(message, options)
-					.then(() => {
-						// For non-streaming cases with display=true, update UI
-						// (streaming cases update via message_end event)
-						if (!this.ctx.isBackgrounded && !wasStreaming && message.display) {
-							this.ctx.rebuildChatFromMessages();
-						}
-					})
+					.then(() => this.#applyCustomMessageDisplay(wasStreaming, message.display))
 					.catch((err: unknown) => {
 						const errorText = `Extension sendMessage failed: ${err instanceof Error ? err.message : String(err)}`;
 						if (this.ctx.isBackgrounded) {
@@ -373,13 +336,7 @@ export class ExtensionUiController {
 						this.ctx.showError(errorText);
 					});
 			},
-			sendUserMessage: (content, options) => {
-				this.ctx.session.sendUserMessage(content, options).catch((err: unknown) => {
-					this.ctx.showError(
-						`Extension sendUserMessage failed: ${err instanceof Error ? err.message : String(err)}`,
-					);
-				});
-			},
+			sendUserMessage: this.#sendExtensionUserMessage,
 			appendEntry: (customType, data) => {
 				this.ctx.sessionManager.appendCustomEntry(customType, data);
 			},
@@ -399,14 +356,7 @@ export class ExtensionUiController {
 			setThinkingLevel: (level, persist) => this.ctx.session.setThinkingLevel(level, persist),
 			getCommands: () => [],
 			getSessionName: () => this.ctx.sessionManager.getSessionName(),
-			setSessionName: async name => {
-				await this.ctx.sessionManager.setSessionName(name, "user");
-				setSessionTerminalTitle(
-					this.ctx.sessionManager.getSessionName(),
-					this.ctx.sessionManager.getCwd(),
-					this.ctx.sessionManager.titleSource,
-				);
-			},
+			setSessionName: name => this.#updateSessionName(name),
 		};
 		const contextActions: ExtensionContextActions = {
 			getModel: () => this.ctx.session.model,
@@ -417,12 +367,7 @@ export class ExtensionUiController {
 				// Signal shutdown request (will be handled by main loop)
 			},
 			getContextUsage: () => this.ctx.session.getContextUsage(),
-			compact: async instructionsOrOptions => {
-				const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
-				const options =
-					instructionsOrOptions && typeof instructionsOrOptions === "object" ? instructionsOrOptions : undefined;
-				await this.ctx.session.compact(instructions, options);
-			},
+			compact: instructionsOrOptions => this.#compactSession(instructionsOrOptions),
 			getSystemPrompt: () => this.ctx.session.systemPrompt,
 		};
 		const commandActions: ExtensionCommandContextActions = {
@@ -517,16 +462,7 @@ export class ExtensionUiController {
 
 				return { cancelled: false };
 			},
-			compact: async instructionsOrOptions => {
-				const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
-				const options =
-					instructionsOrOptions && typeof instructionsOrOptions === "object" ? instructionsOrOptions : undefined;
-				if (this.ctx.isBackgrounded) {
-					await this.ctx.session.compact(instructions, options);
-					return;
-				}
-				await this.ctx.executeCompaction(instructionsOrOptions, false);
-			},
+			compact: async instructionsOrOptions => this.#handleInteractiveCompact(instructionsOrOptions),
 			switchSession: async sessionPath => {
 				if (this.ctx.isBackgrounded) {
 					return { cancelled: true };
@@ -594,14 +530,7 @@ export class ExtensionUiController {
 					await registeredTool.definition.onSession(event, {
 						ui: uiContext,
 						getContextUsage: () => this.ctx.session.getContextUsage(),
-						compact: async instructionsOrOptions => {
-							const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
-							const options =
-								instructionsOrOptions && typeof instructionsOrOptions === "object"
-									? instructionsOrOptions
-									: undefined;
-							await this.ctx.session.compact(instructions, options);
-						},
+						compact: instructionsOrOptions => this.#compactSession(instructionsOrOptions),
 						hasUI: !this.ctx.isBackgrounded,
 						cwd: this.ctx.sessionManager.getCwd(),
 						sessionManager: this.ctx.session.sessionManager,
@@ -657,21 +586,10 @@ export class ExtensionUiController {
 		options: string[],
 		dialogOptions?: ExtensionUIDialogOptions,
 	): Promise<string | undefined> {
-		const { promise, resolve } = Promise.withResolvers<string | undefined>();
-		let settled = false;
-		const onAbort = () => {
-			this.hideHookSelector();
-			if (!settled) {
-				settled = true;
-				resolve(undefined);
-			}
-		};
-		const finish = (value: string | undefined) => {
-			if (settled) return;
-			settled = true;
-			dialogOptions?.signal?.removeEventListener("abort", onAbort);
-			resolve(value);
-		};
+		const { promise, finish, attachAbort } = this.#createHookDialogState(
+			() => this.hideHookSelector(),
+			dialogOptions?.signal,
+		);
 		const maxVisible = Math.max(4, Math.min(15, this.ctx.ui.terminal.rows - 12));
 		this.ctx.hookSelector = new HookSelectorComponent(
 			title,
@@ -713,13 +631,7 @@ export class ExtensionUiController {
 		this.ctx.editorContainer.addChild(this.ctx.hookSelector);
 		this.ctx.ui.setFocus(this.ctx.hookSelector);
 		this.ctx.ui.requestRender();
-		if (dialogOptions?.signal) {
-			if (dialogOptions.signal.aborted) {
-				onAbort();
-			} else {
-				dialogOptions.signal.addEventListener("abort", onAbort, { once: true });
-			}
-		}
+		attachAbort();
 		return promise;
 	}
 	/**
@@ -750,21 +662,10 @@ export class ExtensionUiController {
 		placeholder?: string,
 		dialogOptions?: ExtensionUIDialogOptions,
 	): Promise<string | undefined> {
-		const { promise, resolve } = Promise.withResolvers<string | undefined>();
-		let settled = false;
-		const onAbort = () => {
-			this.hideHookInput();
-			if (!settled) {
-				settled = true;
-				resolve(undefined);
-			}
-		};
-		const finish = (value: string | undefined) => {
-			if (settled) return;
-			settled = true;
-			dialogOptions?.signal?.removeEventListener("abort", onAbort);
-			resolve(value);
-		};
+		const { promise, finish, attachAbort } = this.#createHookDialogState(
+			() => this.hideHookInput(),
+			dialogOptions?.signal,
+		);
 		this.ctx.hookInput = new HookInputComponent(
 			title,
 			placeholder,
@@ -786,13 +687,7 @@ export class ExtensionUiController {
 		this.ctx.editorContainer.addChild(this.ctx.hookInput);
 		this.ctx.ui.setFocus(this.ctx.hookInput);
 		this.ctx.ui.requestRender();
-		if (dialogOptions?.signal) {
-			if (dialogOptions.signal.aborted) {
-				onAbort();
-			} else {
-				dialogOptions.signal.addEventListener("abort", onAbort, { once: true });
-			}
-		}
+		attachAbort();
 		return promise;
 	}
 
@@ -817,21 +712,10 @@ export class ExtensionUiController {
 		dialogOptions?: ExtensionUIDialogOptions,
 		editorOptions?: { promptStyle?: boolean },
 	): Promise<string | undefined> {
-		const { promise, resolve } = Promise.withResolvers<string | undefined>();
-		let settled = false;
-		const onAbort = () => {
-			this.hideHookEditor();
-			if (!settled) {
-				settled = true;
-				resolve(undefined);
-			}
-		};
-		const finish = (value: string | undefined) => {
-			if (settled) return;
-			settled = true;
-			dialogOptions?.signal?.removeEventListener("abort", onAbort);
-			resolve(value);
-		};
+		const { promise, finish, attachAbort } = this.#createHookDialogState(
+			() => this.hideHookEditor(),
+			dialogOptions?.signal,
+		);
 		this.ctx.hookEditor = new HookEditorComponent(
 			this.ctx.ui,
 			title,
@@ -851,13 +735,7 @@ export class ExtensionUiController {
 		this.ctx.editorContainer.addChild(this.ctx.hookEditor);
 		this.ctx.ui.setFocus(this.ctx.hookEditor);
 		this.ctx.ui.requestRender();
-		if (dialogOptions?.signal) {
-			if (dialogOptions.signal.aborted) {
-				onAbort();
-			} else {
-				dialogOptions.signal.addEventListener("abort", onAbort, { once: true });
-			}
-		}
+		attachAbort();
 		return promise;
 	}
 
@@ -980,4 +858,75 @@ export class ExtensionUiController {
 		this.ctx.chatContainer.addChild(errorText);
 		this.ctx.ui.requestRender();
 	}
+	async #handleInteractiveCompact(instructionsOrOptions: string | CompactOptions | undefined): Promise<void> {
+		if (this.ctx.isBackgrounded) {
+			await this.#compactSession(instructionsOrOptions);
+			return;
+		}
+		await this.ctx.executeCompaction(instructionsOrOptions, false);
+	}
+
+	async #compactSession(instructionsOrOptions: string | CompactOptions | undefined): Promise<void> {
+		const instructions = typeof instructionsOrOptions === "string" ? instructionsOrOptions : undefined;
+		const options =
+			instructionsOrOptions && typeof instructionsOrOptions === "object" ? instructionsOrOptions : undefined;
+		await this.ctx.session.compact(instructions, options);
+	}
+
+	async #updateSessionName(name: string): Promise<void> {
+		await this.ctx.sessionManager.setSessionName(name, "user");
+		setSessionTerminalTitle(
+			this.ctx.sessionManager.getSessionName(),
+			this.ctx.sessionManager.getCwd(),
+			this.ctx.sessionManager.titleSource,
+		);
+	}
+
+	#sendExtensionUserMessage: SendUserMessageHandler = (content, options) => {
+		this.ctx.session.sendUserMessage(content, options).catch((err: unknown) => {
+			this.ctx.showError(`Extension sendUserMessage failed: ${err instanceof Error ? err.message : String(err)}`);
+		});
+	};
+
+	#applyCustomMessageDisplay(wasStreaming: boolean, shouldDisplay: boolean | undefined): void {
+		// For non-streaming cases with display=true, update UI
+		// (streaming cases update via message_end event)
+		if (!this.ctx.isBackgrounded && !wasStreaming && shouldDisplay) {
+			this.ctx.rebuildChatFromMessages();
+		}
+	}
+
+	#createHookDialogState(
+		hide: () => void,
+		signal: AbortSignal | undefined,
+	): {
+		promise: Promise<string | undefined>;
+		finish: (value: string | undefined) => void;
+		attachAbort: () => void;
+	} {
+		const { promise, resolve } = Promise.withResolvers<string | undefined>();
+		let settled = false;
+		const onAbort = () => {
+			hide();
+			if (!settled) {
+				settled = true;
+				resolve(undefined);
+			}
+		};
+		const finish = (value: string | undefined) => {
+			if (settled) return;
+			settled = true;
+			signal?.removeEventListener("abort", onAbort);
+			resolve(value);
+		};
+		const attachAbort = () => {
+			if (!signal) return;
+			if (signal.aborted) {
+				onAbort();
+			} else {
+				signal.addEventListener("abort", onAbort, { once: true });
+			}
+		};
+		return { promise, finish, attachAbort };
+	}
 }

package/src/modes/controllers/selector-controller.ts

@@ -1,17 +1,14 @@
-import * as os from "node:os";
-import * as path from "node:path";
 import { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { getOAuthProviders, type OAuthProvider } from "@oh-my-pi/pi-ai";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Input, Loader, Spacer, Text } from "@oh-my-pi/pi-tui";
-import { getAgentDbPath, getConfigDirName, getProjectDir } from "@oh-my-pi/pi-utils";
-import { invalidate as invalidateFsCache } from "../../capability/fs";
+import { getAgentDbPath, getProjectDir } from "@oh-my-pi/pi-utils";
 import { getRoleInfo } from "../../config/model-registry";
 import { formatModelSelectorValue } from "../../config/model-resolver";
 import { settings } from "../../config/settings";
 import { DebugSelectorComponent } from "../../debug";
 import { disableProvider, enableProvider } from "../../discovery";
-import { clearClaudePluginRootsCache, resolveActiveProjectRegistryPath } from "../../discovery/helpers";
+import { clearPluginRootsAndCaches, resolveActiveProjectRegistryPath } from "../../discovery/helpers";
 import {
 	getInstalledPluginsRegistryPath,
 	getMarketplacesCacheDir,
@@ -443,13 +440,7 @@ export class SelectorController {
 			projectInstalledRegistryPath: (await resolveActiveProjectRegistryPath(getProjectDir())) ?? undefined,
 			marketplacesCacheDir: getMarketplacesCacheDir(),
 			pluginsCacheDir: getPluginsCacheDir(),
-			clearPluginRootsCache: (extraPaths?: readonly string[]) => {
-				const home = os.homedir();
-				invalidateFsCache(path.join(home, ".claude", "plugins", "installed_plugins.json"));
-				invalidateFsCache(path.join(home, getConfigDirName(), "plugins", "installed_plugins.json"));
-				for (const p of extraPaths ?? []) invalidateFsCache(p);
-				clearClaudePluginRootsCache();
-			},
+			clearPluginRootsCache: clearPluginRootsAndCaches,
 		});
 
 		const [marketplaces, installed] = await Promise.all([mgr.listMarketplaces(), mgr.listInstalledPlugins()]);

package/src/modes/interactive-mode.ts

@@ -37,6 +37,7 @@ import type { SessionContext, SessionManager } from "../session/session-manager"
 import { getRecentSessions } from "../session/session-manager";
 import { STTController, type SttState } from "../stt";
 import type { ExitPlanModeDetails, LspStartupServerInfo } from "../tools";
+import { normalizeLocalScheme } from "../tools/path-utils";
 import type { EventBus } from "../utils/event-bus";
 import { getEditorCommand, openInEditor } from "../utils/external-editor";
 import { getSessionAccentAnsi, getSessionAccentHexForTitle } from "../utils/session-color";
@@ -637,8 +638,9 @@ export class InteractiveMode implements InteractiveModeContext {
 	}
 
 	#resolvePlanFilePath(planFilePath: string): string {
-		if (planFilePath.startsWith("local://")) {
-			return resolveLocalUrlToPath(planFilePath, {
+		if (planFilePath.startsWith("local:")) {
+			const normalized = normalizeLocalScheme(planFilePath);
+			return resolveLocalUrlToPath(normalized, {
 				getArtifactsDir: () => this.sessionManager.getArtifactsDir(),
 				getSessionId: () => this.sessionManager.getSessionId(),
 			});