@oh-my-pi/pi-coding-agent 5.4.2 → 5.6.7

package/src/main.ts

@@ -7,6 +7,7 @@
 
 import { homedir, tmpdir } from "node:os";
 import { join, resolve } from "node:path";
+import { createInterface } from "node:readline/promises";
 import { type ImageContent, supportsXhigh } from "@oh-my-pi/pi-ai";
 import chalk from "chalk";
 import { type Args, parseArgs, printHelp } from "./cli/args";
@@ -15,19 +16,22 @@ import { processFileArguments } from "./cli/file-processor";
 import { listModels } from "./cli/list-models";
 import { parsePluginArgs, printPluginHelp, runPluginCommand } from "./cli/plugin-cli";
 import { selectSession } from "./cli/session-picker";
+import { parseSetupArgs, printSetupHelp, runSetupCommand } from "./cli/setup-cli";
 import { parseUpdateArgs, printUpdateHelp, runUpdateCommand } from "./cli/update-cli";
 import { findConfigFile, getModelsPath, VERSION } from "./config";
 import type { AgentSession } from "./core/agent-session";
 import { exportFromFile } from "./core/export-html/index";
 import type { ExtensionUIContext } from "./core/index";
 import type { ModelRegistry } from "./core/model-registry";
-import { parseModelPattern, resolveModelScope, type ScopedModel } from "./core/model-resolver";
+import { parseModelPattern, parseModelString, resolveModelScope, type ScopedModel } from "./core/model-resolver";
 import { type CreateAgentSessionOptions, createAgentSession, discoverAuthStorage, discoverModels } from "./core/sdk";
-import { SessionManager } from "./core/session-manager";
+import { type SessionInfo, SessionManager } from "./core/session-manager";
 import { SettingsManager } from "./core/settings-manager";
 import { resolvePromptInput } from "./core/system-prompt";
 import { printTimings, time } from "./core/timings";
+import { initializeWithSettings } from "./discovery";
 import { runMigrations, showDeprecationWarnings } from "./migrations";
+import { runAsyncCleanup } from "./modes/cleanup";
 import { InteractiveMode, installTerminalCrashHandlers, runPrintMode, runRpcMode } from "./modes/index";
 import { initTheme, stopThemeWatcher } from "./modes/interactive/theme/theme";
 import { getChangelogPath, getNewEntries, parseChangelog } from "./utils/changelog";
@@ -50,6 +54,25 @@ async function checkForNewVersion(currentVersion: string): Promise<string | unde
 	}
 }
 
+const writeStdout = (message: string): void => {
+	process.stdout.write(`${message}\n`);
+};
+
+const writeStderr = (message: string): void => {
+	process.stderr.write(`${message}\n`);
+};
+
+async function readPipedInput(): Promise<string | undefined> {
+	if (process.stdin.isTTY !== false) return undefined;
+	try {
+		const text = await Bun.stdin.text();
+		if (text.trim().length === 0) return undefined;
+		return text;
+	} catch {
+		return undefined;
+	}
+}
+
 async function runInteractiveMode(
 	session: AgentSession,
 	version: string,
@@ -61,10 +84,11 @@ async function runInteractiveMode(
 	initialMessages: string[],
 	setExtensionUIContext: (uiContext: ExtensionUIContext, hasUI: boolean) => void,
 	lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }> | undefined,
+	mcpManager: import("./core/mcp/index").MCPManager | undefined,
 	initialMessage?: string,
 	initialImages?: ImageContent[],
 ): Promise<void> {
-	const mode = new InteractiveMode(session, version, changelogMarkdown, setExtensionUIContext, lspServers);
+	const mode = new InteractiveMode(session, version, changelogMarkdown, setExtensionUIContext, lspServers, mcpManager);
 
 	await mode.init();
 
@@ -145,25 +169,32 @@ async function prepareInitialMessage(
 }
 
 /**
- * Resolve a session argument to a file path.
- * If it looks like a path, use as-is. Otherwise try to match as session ID prefix.
+ * Resolve a session argument to a local or global session match.
  */
-function resolveSessionPath(sessionArg: string, cwd: string, sessionDir?: string): string {
-	// If it looks like a file path, use as-is
-	if (sessionArg.includes("/") || sessionArg.includes("\\") || sessionArg.endsWith(".jsonl")) {
-		return sessionArg;
-	}
-
-	// Try to match as session ID (full or partial UUID)
+function resolveSessionMatch(sessionArg: string, cwd: string, sessionDir?: string): SessionInfo | undefined {
 	const sessions = SessionManager.list(cwd, sessionDir);
-	const matches = sessions.filter((session) => session.id.startsWith(sessionArg));
+	let matches = sessions.filter((session) => session.id.startsWith(sessionArg));
 
-	if (matches.length >= 1) {
-		return matches[0].path; // Already sorted by modified time (most recent first)
+	if (matches.length === 0 && !sessionDir) {
+		const globalSessions = SessionManager.listAll();
+		matches = globalSessions.filter((session) => session.id.startsWith(sessionArg));
 	}
 
-	// No match - return original (will create new session)
-	return sessionArg;
+	return matches[0];
+}
+
+async function promptForkSession(session: SessionInfo): Promise<boolean> {
+	if (!process.stdin.isTTY) {
+		return false;
+	}
+	const message = `Session found in different project: ${session.cwd}. Fork into current directory? [y/N] `;
+	const rl = createInterface({ input: process.stdin, output: process.stdout });
+	try {
+		const answer = (await rl.question(message)).trim().toLowerCase();
+		return answer === "y" || answer === "yes";
+	} finally {
+		rl.close();
+	}
 }
 
 function getChangelogForDisplay(parsed: Args, settingsManager: SettingsManager): string | undefined {
@@ -196,8 +227,24 @@ async function createSessionManager(parsed: Args, cwd: string): Promise<SessionM
 		return SessionManager.inMemory();
 	}
 	if (parsed.session) {
-		const resolvedPath = resolveSessionPath(parsed.session, cwd, parsed.sessionDir);
-		return await SessionManager.open(resolvedPath, parsed.sessionDir);
+		const sessionArg = parsed.session;
+		if (sessionArg.includes("/") || sessionArg.includes("\\") || sessionArg.endsWith(".jsonl")) {
+			return await SessionManager.open(sessionArg, parsed.sessionDir);
+		}
+		const match = resolveSessionMatch(sessionArg, cwd, parsed.sessionDir);
+		if (!match) {
+			throw new Error(`Session "${sessionArg}" not found.`);
+		}
+		const normalizedCwd = resolve(cwd);
+		const normalizedMatchCwd = resolve(match.cwd || cwd);
+		if (normalizedCwd !== normalizedMatchCwd) {
+			const shouldFork = await promptForkSession(match);
+			if (!shouldFork) {
+				throw new Error(`Session "${sessionArg}" is in another project (${match.cwd}).`);
+			}
+			return await SessionManager.forkFrom(match.path, cwd, parsed.sessionDir);
+		}
+		return await SessionManager.open(match.path, parsed.sessionDir);
 	}
 	if (parsed.continue) {
 		return await SessionManager.continueRecent(cwd, parsed.sessionDir);
@@ -279,6 +326,19 @@ function discoverSystemPromptFile(): string | undefined {
 	return undefined;
 }
 
+/** Discover APPEND_SYSTEM.md file if no CLI append system prompt was provided */
+function discoverAppendSystemPromptFile(): string | undefined {
+	const projectPath = findConfigFile("APPEND_SYSTEM.md", { user: false });
+	if (projectPath) {
+		return projectPath;
+	}
+	const globalPath = findConfigFile("APPEND_SYSTEM.md", { user: true });
+	if (globalPath) {
+		return globalPath;
+	}
+	return undefined;
+}
+
 async function buildSessionOptions(
 	parsed: Args,
 	scopedModels: ScopedModel[],
@@ -293,7 +353,8 @@ async function buildSessionOptions(
 	// Auto-discover SYSTEM.md if no CLI system prompt provided
 	const systemPromptSource = parsed.systemPrompt ?? discoverSystemPromptFile();
 	const resolvedSystemPrompt = resolvePromptInput(systemPromptSource, "system prompt");
-	const resolvedAppendPrompt = resolvePromptInput(parsed.appendSystemPrompt, "append system prompt");
+	const appendPromptSource = parsed.appendSystemPrompt ?? discoverAppendSystemPromptFile();
+	const resolvedAppendPrompt = resolvePromptInput(appendPromptSource, "append system prompt");
 
 	if (sessionManager) {
 		options.sessionManager = sessionManager;
@@ -304,10 +365,10 @@ async function buildSessionOptions(
 		const available = modelRegistry.getAvailable();
 		const { model, warning } = parseModelPattern(parsed.model, available);
 		if (warning) {
-			console.warn(chalk.yellow(`Warning: ${warning}`));
+			writeStderr(chalk.yellow(`Warning: ${warning}`));
 		}
 		if (!model) {
-			console.error(chalk.red(`Model "${parsed.model}" not found`));
+			writeStderr(chalk.red(`Model "${parsed.model}" not found`));
 			process.exit(1);
 		}
 		options.model = model;
@@ -315,7 +376,22 @@ async function buildSessionOptions(
 			modelRoles: { default: `${model.provider}/${model.id}` },
 		});
 	} else if (scopedModels.length > 0 && !parsed.continue && !parsed.resume) {
-		options.model = scopedModels[0].model;
+		const remembered = settingsManager.getModelRole("default");
+		if (remembered) {
+			const parsedModel = parseModelString(remembered);
+			const rememberedModel = parsedModel
+				? scopedModels.find(
+						(scopedModel) =>
+							scopedModel.model.provider === parsedModel.provider && scopedModel.model.id === parsedModel.id,
+					)
+				: scopedModels.find((scopedModel) => scopedModel.model.id.toLowerCase() === remembered.toLowerCase());
+			if (rememberedModel) {
+				options.model = rememberedModel.model;
+			}
+		}
+		if (!options.model) {
+			options.model = scopedModels[0].model;
+		}
 	}
 
 	// Thinking level
@@ -378,13 +454,14 @@ async function buildSessionOptions(
 	}
 
 	// Additional extension paths from CLI
-	const cliExtensionPaths = [...(parsed.extensions ?? []), ...(parsed.hooks ?? [])];
+	const cliExtensionPaths = parsed.noExtensions ? [] : [...(parsed.extensions ?? []), ...(parsed.hooks ?? [])];
 	if (cliExtensionPaths.length > 0) {
 		options.additionalExtensionPaths = cliExtensionPaths;
 	}
 
 	if (parsed.noExtensions) {
 		options.disableExtensionDiscovery = true;
+		options.additionalExtensionPaths = [];
 	}
 
 	return options;
@@ -430,6 +507,17 @@ export async function main(args: string[]) {
 		return;
 	}
 
+	// Handle setup subcommand
+	const setupCmd = parseSetupArgs(args);
+	if (setupCmd) {
+		if (args.includes("--help") || args.includes("-h")) {
+			printSetupHelp();
+			return;
+		}
+		await runSetupCommand(setupCmd);
+		return;
+	}
+
 	const parsed = parseArgs(args);
 	time("parseArgs");
 	await maybeAutoChdir(parsed);
@@ -443,7 +531,7 @@ export async function main(args: string[]) {
 	time("discoverModels");
 
 	if (parsed.version) {
-		console.log(VERSION);
+		writeStdout(VERSION);
 		return;
 	}
 
@@ -462,17 +550,17 @@ export async function main(args: string[]) {
 		try {
 			const outputPath = parsed.messages.length > 0 ? parsed.messages[0] : undefined;
 			const result = await exportFromFile(parsed.export, outputPath);
-			console.log(`Exported to: ${result}`);
+			writeStdout(`Exported to: ${result}`);
 			return;
 		} catch (error: unknown) {
 			const message = error instanceof Error ? error.message : "Failed to export session";
-			console.error(chalk.red(`Error: ${message}`));
+			writeStderr(chalk.red(`Error: ${message}`));
 			process.exit(1);
 		}
 	}
 
 	if (parsed.mode === "rpc" && parsed.fileArgs.length > 0) {
-		console.error(chalk.red("Error: @file arguments are not supported in RPC mode"));
+		writeStderr(chalk.red("Error: @file arguments are not supported in RPC mode"));
 		process.exit(1);
 	}
 
@@ -480,13 +568,17 @@ export async function main(args: string[]) {
 	const settingsManager = await SettingsManager.create(cwd);
 	settingsManager.applyEnvironmentVariables();
 	time("SettingsManager.create");
-	const { initialMessage, initialImages } = await prepareInitialMessage(parsed, settingsManager.getImageAutoResize());
+	const pipedInput = await readPipedInput();
+	let { initialMessage, initialImages } = await prepareInitialMessage(parsed, settingsManager.getImageAutoResize());
+	if (pipedInput) {
+		initialMessage = initialMessage ? `${initialMessage}\n${pipedInput}` : pipedInput;
+	}
 	time("prepareInitialMessage");
-	const isInteractive = !parsed.print && parsed.mode === undefined;
+	const autoPrint = pipedInput !== undefined && !parsed.print && parsed.mode === undefined;
+	const isInteractive = !parsed.print && !autoPrint && parsed.mode === undefined;
 	const mode = parsed.mode || "text";
 
 	// Initialize discovery system with settings for provider persistence
-	const { initializeWithSettings } = await import("./discovery");
 	initializeWithSettings(settingsManager);
 	time("initializeWithSettings");
 
@@ -524,13 +616,13 @@ export async function main(args: string[]) {
 		const sessions = SessionManager.list(cwd, parsed.sessionDir);
 		time("SessionManager.list");
 		if (sessions.length === 0) {
-			console.log(chalk.dim("No sessions found"));
+			writeStdout(chalk.dim("No sessions found"));
 			return;
 		}
 		const selectedPath = await selectSession(sessions);
 		time("selectSession");
 		if (!selectedPath) {
-			console.log(chalk.dim("No session selected"));
+			writeStdout(chalk.dim("No session selected"));
 			return;
 		}
 		sessionManager = await SessionManager.open(selectedPath);
@@ -551,14 +643,15 @@ export async function main(args: string[]) {
 	// Handle CLI --api-key as runtime override (not persisted)
 	if (parsed.apiKey) {
 		if (!sessionOptions.model) {
-			console.error(chalk.red("--api-key requires a model to be specified via --provider/--model or -m/--models"));
+			writeStderr(chalk.red("--api-key requires a model to be specified via --provider/--model or -m/--models"));
 			process.exit(1);
 		}
 		authStorage.setRuntimeApiKey(sessionOptions.model.provider, parsed.apiKey);
 	}
 
 	time("buildSessionOptions");
-	const { session, setToolUIContext, modelFallbackMessage, lspServers } = await createAgentSession(sessionOptions);
+	const { session, setToolUIContext, modelFallbackMessage, lspServers, mcpManager } =
+		await createAgentSession(sessionOptions);
 	time("createAgentSession");
 
 	// Re-parse CLI args with extension flags and apply values
@@ -578,10 +671,10 @@ export async function main(args: string[]) {
 	time("applyExtensionFlags");
 
 	if (!isInteractive && !session.model) {
-		console.error(chalk.red("No models available."));
-		console.error(chalk.yellow("\nSet an API key environment variable:"));
-		console.error("  ANTHROPIC_API_KEY, OPENAI_API_KEY, GEMINI_API_KEY, etc.");
-		console.error(chalk.yellow(`\nOr create ${getModelsPath()}`));
+		writeStderr(chalk.red("No models available."));
+		writeStderr(chalk.yellow("\nSet an API key environment variable:"));
+		writeStderr("  ANTHROPIC_API_KEY, OPENAI_API_KEY, GEMINI_API_KEY, etc.");
+		writeStderr(chalk.yellow(`\nOr create ${getModelsPath()}`));
 		process.exit(1);
 	}
 
@@ -612,7 +705,7 @@ export async function main(args: string[]) {
 					return `${scopedModel.model.id}${thinkingStr}`;
 				})
 				.join(", ");
-			console.log(chalk.dim(`Model scope: ${modelList} ${chalk.gray("(Ctrl+P to cycle)")}`));
+			writeStdout(chalk.dim(`Model scope: ${modelList} ${chalk.gray("(Ctrl+P to cycle)")}`));
 		}
 
 		installTerminalCrashHandlers();
@@ -628,6 +721,7 @@ export async function main(args: string[]) {
 			parsed.messages,
 			setToolUIContext,
 			lspServers,
+			mcpManager,
 			initialMessage,
 			initialImages,
 		);
@@ -638,7 +732,9 @@ export async function main(args: string[]) {
 			initialMessage,
 			initialImages,
 		});
+		await session.dispose();
 		stopThemeWatcher();
+		await runAsyncCleanup();
 		if (process.stdout.writableLength > 0) {
 			await new Promise<void>((resolve) => process.stdout.once("drain", resolve));
 		}

package/src/modes/interactive/components/custom-editor.ts

@@ -1,21 +1,4 @@
-import {
-	Editor,
-	isCapsLock,
-	isCtrlC,
-	isCtrlD,
-	isCtrlG,
-	isCtrlL,
-	isCtrlO,
-	isCtrlP,
-	isCtrlT,
-	isCtrlV,
-	isCtrlZ,
-	isEscape,
-	isShiftCtrlP,
-	isShiftTab,
-	type KeyId,
-	matchesKey,
-} from "@oh-my-pi/pi-tui";
+import { Editor, type KeyId, matchesKey, parseKittySequence } from "@oh-my-pi/pi-tui";
 
 /**
  * Custom editor that handles Escape and Ctrl+C keys for coding-agent
@@ -66,19 +49,21 @@ export class CustomEditor extends Editor {
 	}
 
 	handleInput(data: string): void {
-		if (isCapsLock(data) && this.onCapsLock) {
+		const parsed = parseKittySequence(data);
+		if (parsed && (parsed.modifier & 64) !== 0 && this.onCapsLock) {
+			// Caps Lock is modifier bit 64
 			this.onCapsLock();
 			return;
 		}
 
 		// Intercept Ctrl+V for image paste (async - fires and handles result)
-		if (isCtrlV(data) && this.onCtrlV) {
+		if (matchesKey(data, "ctrl+v") && this.onCtrlV) {
 			void this.onCtrlV();
 			return;
 		}
 
 		// Intercept Ctrl+G for external editor
-		if (isCtrlG(data) && this.onCtrlG) {
+		if (matchesKey(data, "ctrl+g") && this.onCtrlG) {
 			this.onCtrlG();
 			return;
 		}
@@ -90,19 +75,19 @@ export class CustomEditor extends Editor {
 		}
 
 		// Intercept Ctrl+Z for suspend
-		if (isCtrlZ(data) && this.onCtrlZ) {
+		if (matchesKey(data, "ctrl+z") && this.onCtrlZ) {
 			this.onCtrlZ();
 			return;
 		}
 
 		// Intercept Ctrl+T for thinking block visibility toggle
-		if (isCtrlT(data) && this.onCtrlT) {
+		if (matchesKey(data, "ctrl+t") && this.onCtrlT) {
 			this.onCtrlT();
 			return;
 		}
 
 		// Intercept Ctrl+L for model selector
-		if (isCtrlL(data) && this.onCtrlL) {
+		if (matchesKey(data, "ctrl+l") && this.onCtrlL) {
 			this.onCtrlL();
 			return;
 		}
@@ -114,44 +99,44 @@ export class CustomEditor extends Editor {
 		}
 
 		// Intercept Ctrl+O for tool output expansion
-		if (isCtrlO(data) && this.onCtrlO) {
+		if (matchesKey(data, "ctrl+o") && this.onCtrlO) {
 			this.onCtrlO();
 			return;
 		}
 
 		// Intercept Shift+Ctrl+P for backward model cycling (check before Ctrl+P)
-		if (isShiftCtrlP(data) && this.onShiftCtrlP) {
+		if ((matchesKey(data, "shift+ctrl+p") || matchesKey(data, "ctrl+shift+p")) && this.onShiftCtrlP) {
 			this.onShiftCtrlP();
 			return;
 		}
 
 		// Intercept Ctrl+P for model cycling
-		if (isCtrlP(data) && this.onCtrlP) {
+		if (matchesKey(data, "ctrl+p") && this.onCtrlP) {
 			this.onCtrlP();
 			return;
 		}
 
 		// Intercept Shift+Tab for thinking level cycling
-		if (isShiftTab(data) && this.onShiftTab) {
+		if (matchesKey(data, "shift+tab") && this.onShiftTab) {
 			this.onShiftTab();
 			return;
 		}
 
 		// Intercept Escape key - but only if autocomplete is NOT active
 		// (let parent handle escape for autocomplete cancellation)
-		if (isEscape(data) && this.onEscape && !this.isShowingAutocomplete()) {
+		if ((matchesKey(data, "escape") || matchesKey(data, "esc")) && this.onEscape && !this.isShowingAutocomplete()) {
 			this.onEscape();
 			return;
 		}
 
 		// Intercept Ctrl+C
-		if (isCtrlC(data) && this.onCtrlC) {
+		if (matchesKey(data, "ctrl+c") && this.onCtrlC) {
 			this.onCtrlC();
 			return;
 		}
 
 		// Intercept Ctrl+D (only when editor is empty)
-		if (isCtrlD(data)) {
+		if (matchesKey(data, "ctrl+d")) {
 			if (this.getText().length === 0 && this.onCtrlD) {
 				this.onCtrlD();
 			}

package/src/modes/interactive/components/extensions/extension-dashboard.ts

@@ -12,18 +12,7 @@
  * - Esc: Close dashboard (clears search first if active)
  */
 
-import {
-	type Component,
-	Container,
-	isCtrlC,
-	isEscape,
-	isShiftTab,
-	isTab,
-	Spacer,
-	Text,
-	truncateToWidth,
-	visibleWidth,
-} from "@oh-my-pi/pi-tui";
+import { type Component, Container, matchesKey, Spacer, Text, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
 import type { SettingsManager } from "../../../../core/settings-manager";
 import { theme } from "../../theme/theme";
 import { DynamicBorder } from "../dynamic-border";
@@ -239,13 +228,13 @@ export class ExtensionDashboard extends Container {
 
 	handleInput(data: string): void {
 		// Ctrl+C - close immediately
-		if (isCtrlC(data)) {
+		if (matchesKey(data, "ctrl+c")) {
 			this.onClose?.();
 			return;
 		}
 
 		// Escape - clear search first, then close
-		if (isEscape(data)) {
+		if (matchesKey(data, "escape") || matchesKey(data, "esc")) {
 			if (this.state.searchQuery.length > 0) {
 				this.state.searchQuery = "";
 				this.state.searchFiltered = this.state.tabFiltered;
@@ -259,11 +248,11 @@ export class ExtensionDashboard extends Container {
 		}
 
 		// Tab/Shift+Tab: Cycle through tabs
-		if (isTab(data)) {
+		if (matchesKey(data, "tab")) {
 			this.switchTab(1);
 			return;
 		}
-		if (isShiftTab(data)) {
+		if (matchesKey(data, "shift+tab")) {
 			this.switchTab(-1);
 			return;
 		}

package/src/modes/interactive/components/extensions/extension-list.ts

@@ -6,15 +6,7 @@
  * master switch is off.
  */
 
-import {
-	type Component,
-	isArrowDown,
-	isArrowUp,
-	isBackspace,
-	isEnter,
-	truncateToWidth,
-	visibleWidth,
-} from "@oh-my-pi/pi-tui";
+import { type Component, matchesKey, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
 import { isProviderEnabled } from "../../../../discovery";
 import { theme } from "../../theme/theme";
 import { applyFilter } from "./state-manager";
@@ -404,12 +396,12 @@ export class ExtensionList implements Component {
 		const charCode = data.length === 1 ? data.charCodeAt(0) : -1;
 
 		// Navigation
-		if (isArrowUp(data) || data === "k") {
+		if (matchesKey(data, "up") || data === "k") {
 			this.moveSelectionUp();
 			return;
 		}
 
-		if (isArrowDown(data) || data === "j") {
+		if (matchesKey(data, "down") || data === "j") {
 			this.moveSelectionDown();
 			return;
 		}
@@ -431,7 +423,7 @@ export class ExtensionList implements Component {
 		}
 
 		// Enter: Same as space - toggle selected item
-		if (isEnter(data)) {
+		if (matchesKey(data, "enter") || matchesKey(data, "return") || data === "\n") {
 			const item = this.listItems[this.selectedIndex];
 			if (item?.type === "master") {
 				this.callbacks.onMasterToggle?.(item.providerId);
@@ -446,7 +438,7 @@ export class ExtensionList implements Component {
 		}
 
 		// Backspace: Delete from search query
-		if (isBackspace(data)) {
+		if (matchesKey(data, "backspace")) {
 			if (this.searchQuery.length > 0) {
 				this.setSearchQuery(this.searchQuery.slice(0, -1));
 			}

package/src/modes/interactive/components/history-search.ts

@@ -2,10 +2,7 @@ import {
 	type Component,
 	Container,
 	Input,
-	isArrowDown,
-	isArrowUp,
-	isEnter,
-	isEscape,
+	matchesKey,
 	Spacer,
 	Text,
 	truncateToWidth,
@@ -116,21 +113,21 @@ export class HistorySearchComponent extends Container {
 	}
 
 	handleInput(keyData: string): void {
-		if (isArrowUp(keyData)) {
+		if (matchesKey(keyData, "up")) {
 			if (this.results.length === 0) return;
 			this.selectedIndex = Math.max(0, this.selectedIndex - 1);
 			this.resultsList.setSelectedIndex(this.selectedIndex);
 			return;
 		}
 
-		if (isArrowDown(keyData)) {
+		if (matchesKey(keyData, "down")) {
 			if (this.results.length === 0) return;
 			this.selectedIndex = Math.min(this.results.length - 1, this.selectedIndex + 1);
 			this.resultsList.setSelectedIndex(this.selectedIndex);
 			return;
 		}
 
-		if (isEnter(keyData)) {
+		if (matchesKey(keyData, "enter") || matchesKey(keyData, "return") || keyData === "\n") {
 			const selected = this.results[this.selectedIndex];
 			if (selected) {
 				this.onSelect(selected.prompt);
@@ -138,7 +135,7 @@ export class HistorySearchComponent extends Container {
 			return;
 		}
 
-		if (isEscape(keyData)) {
+		if (matchesKey(keyData, "escape") || matchesKey(keyData, "esc")) {
 			this.onCancel();
 			return;
 		}

package/src/modes/interactive/components/hook-editor.ts

@@ -6,7 +6,7 @@
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
-import { Container, Editor, isCtrlG, isEscape, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
+import { Container, Editor, matchesKey, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
 import { nanoid } from "nanoid";
 import { getEditorTheme, theme } from "../theme/theme";
 import { DynamicBorder } from "./dynamic-border";
@@ -40,7 +40,6 @@ export class HookEditorComponent extends Container {
 
 		// Create editor
 		this.editor = new Editor(getEditorTheme());
-		this.editor.setUseTerminalCursor(true);
 		if (prefill) {
 			this.editor.setText(prefill);
 		}
@@ -69,13 +68,13 @@ export class HookEditorComponent extends Container {
 		}
 
 		// Escape to cancel
-		if (isEscape(keyData)) {
+		if (matchesKey(keyData, "escape") || matchesKey(keyData, "esc")) {
 			this.onCancelCallback();
 			return;
 		}
 
 		// Ctrl+G for external editor
-		if (isCtrlG(keyData)) {
+		if (matchesKey(keyData, "ctrl+g")) {
 			this.openExternalEditor();
 			return;
 		}