@oh-my-pi/pi-coding-agent 3.37.0 → 4.0.0

package/src/index.ts

@@ -60,11 +60,40 @@ export type {
 	RenderResultOptions,
 } from "./core/custom-tools/index";
 export { discoverAndLoadCustomTools, loadCustomTools } from "./core/custom-tools/index";
-// Extension types
-export type { ExtensionAPI, ExtensionContext, ExtensionFactory } from "./core/extensions/types";
-export type * from "./core/hooks/index";
-// Hook system types and type guards
+// Extension types and utilities
+export type {
+	AppAction,
+	Extension,
+	ExtensionActions,
+	ExtensionAPI,
+	ExtensionCommandContext,
+	ExtensionCommandContextActions,
+	ExtensionContext,
+	ExtensionContextActions,
+	ExtensionError,
+	ExtensionEvent,
+	ExtensionFactory,
+	ExtensionFlag,
+	ExtensionHandler,
+	ExtensionRuntime,
+	ExtensionShortcut,
+	ExtensionUIContext,
+	ExtensionUIDialogOptions,
+	KeybindingsManager,
+	LoadExtensionsResult,
+	MessageRenderer,
+	MessageRenderOptions,
+	RegisteredCommand,
+	ToolResultEvent,
+	TurnEndEvent,
+	TurnStartEvent,
+	UserBashEvent,
+	UserBashEventResult,
+} from "./core/extensions/index";
 export {
+	createExtensionRuntime,
+	discoverAndLoadExtensions,
+	ExtensionRunner,
 	isBashToolResult,
 	isEditToolResult,
 	isFindToolResult,
@@ -72,7 +101,9 @@ export {
 	isLsToolResult,
 	isReadToolResult,
 	isWriteToolResult,
-} from "./core/hooks/index";
+} from "./core/extensions/index";
+// Hook system types (legacy re-export)
+export type * from "./core/hooks/index";
 // Logging
 export { type Logger, logger } from "./core/logger";
 export { convertToLlm } from "./core/messages";
@@ -153,25 +184,86 @@ export {
 } from "./core/skills";
 // Slash commands
 export { type FileSlashCommand, loadSlashCommands as discoverSlashCommands } from "./core/slash-commands";
-// Tools (detail types only - factories exported from sdk)
+// Tools (detail types and utilities)
 export {
+	type BashOperations,
 	type BashToolDetails,
+	DEFAULT_MAX_BYTES,
+	DEFAULT_MAX_LINES,
+	type FindOperations,
 	type FindToolDetails,
+	type FindToolOptions,
+	formatSize,
 	type GitToolDetails,
+	type GrepOperations,
 	type GrepToolDetails,
+	type GrepToolOptions,
 	gitTool,
+	type LsOperations,
 	type LsToolDetails,
+	type LsToolOptions,
 	type ReadToolDetails,
+	type TruncationOptions,
 	type TruncationResult,
+	truncateHead,
+	truncateLine,
+	truncateTail,
 	type WriteToolDetails,
 } from "./core/tools/index";
 export type { FileDiagnosticsResult } from "./core/tools/lsp/index";
 // Main entry point
 export { main } from "./main";
-// UI components for hooks and custom tools
-export { BorderedLoader } from "./modes/interactive/components/bordered-loader";
+// Run modes for programmatic SDK usage
+export {
+	InteractiveMode,
+	type InteractiveModeOptions,
+	type PrintModeOptions,
+	runPrintMode,
+	runRpcMode,
+} from "./modes/index";
+// UI components for extensions
+export {
+	ArminComponent,
+	AssistantMessageComponent,
+	BashExecutionComponent,
+	BorderedLoader,
+	BranchSummaryMessageComponent,
+	CompactionSummaryMessageComponent,
+	CustomEditor,
+	CustomMessageComponent,
+	DynamicBorder,
+	FooterComponent,
+	HookEditorComponent as ExtensionEditorComponent,
+	HookInputComponent as ExtensionInputComponent,
+	HookSelectorComponent as ExtensionSelectorComponent,
+	LoginDialogComponent,
+	ModelSelectorComponent,
+	OAuthSelectorComponent,
+	type RenderDiffOptions,
+	renderDiff,
+	SessionSelectorComponent,
+	type SettingsCallbacks,
+	SettingsSelectorComponent,
+	ShowImagesSelectorComponent,
+	ThemeSelectorComponent,
+	ThinkingSelectorComponent,
+	ToolExecutionComponent,
+	type ToolExecutionOptions,
+	TreeSelectorComponent,
+	truncateToVisualLines,
+	UserMessageComponent,
+	UserMessageSelectorComponent,
+	type VisualTruncateResult,
+} from "./modes/interactive/components/index";
 // Theme utilities for custom tools
-export { getMarkdownTheme, getSettingsListTheme, type Theme } from "./modes/interactive/theme/theme";
+export {
+	getMarkdownTheme,
+	getSelectListTheme,
+	getSettingsListTheme,
+	initTheme,
+	Theme,
+	type ThemeColor,
+} from "./modes/interactive/theme/theme";
 
 // TypeBox helper for string enums (convenience for custom tools)
 import { type TSchema, Type } from "@sinclair/typebox";

package/src/main.ts

@@ -30,7 +30,6 @@ import { runMigrations, showDeprecationWarnings } from "./migrations";
 import { InteractiveMode, installTerminalCrashHandlers, runPrintMode, runRpcMode } from "./modes/index";
 import { initTheme, stopThemeWatcher } from "./modes/interactive/theme/theme";
 import { getChangelogPath, getNewEntries, parseChangelog } from "./utils/changelog";
-import { ensureTool } from "./utils/tools-manager";
 
 async function checkForNewVersion(currentVersion: string): Promise<string | undefined> {
 	try {
@@ -63,9 +62,8 @@ async function runInteractiveMode(
 	lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }> | undefined,
 	initialMessage?: string,
 	initialImages?: ImageContent[],
-	fdPath: string | undefined = undefined,
 ): Promise<void> {
-	const mode = new InteractiveMode(session, version, changelogMarkdown, setExtensionUIContext, lspServers, fdPath);
+	const mode = new InteractiveMode(session, version, changelogMarkdown, setExtensionUIContext, lspServers);
 
 	await mode.init();
 
@@ -145,6 +143,28 @@ 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.
+ */
+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)
+	const sessions = SessionManager.list(cwd, sessionDir);
+	const matches = sessions.filter((session) => session.id.startsWith(sessionArg));
+
+	if (matches.length >= 1) {
+		return matches[0].path; // Already sorted by modified time (most recent first)
+	}
+
+	// No match - return original (will create new session)
+	return sessionArg;
+}
+
 function getChangelogForDisplay(parsed: Args, settingsManager: SettingsManager): string | undefined {
 	if (parsed.continue || parsed.resume) {
 		return undefined;
@@ -175,7 +195,8 @@ async function createSessionManager(parsed: Args, cwd: string): Promise<SessionM
 		return SessionManager.inMemory();
 	}
 	if (parsed.session) {
-		return await SessionManager.open(parsed.session, parsed.sessionDir);
+		const resolvedPath = resolveSessionPath(parsed.session, cwd, parsed.sessionDir);
+		return await SessionManager.open(resolvedPath, parsed.sessionDir);
 	}
 	if (parsed.continue) {
 		return await SessionManager.continueRecent(cwd, parsed.sessionDir);
@@ -299,13 +320,24 @@ async function buildSessionOptions(
 	// Thinking level
 	if (parsed.thinking) {
 		options.thinkingLevel = parsed.thinking;
-	} else if (scopedModels.length > 0 && !parsed.continue && !parsed.resume) {
+	} else if (
+		scopedModels.length > 0 &&
+		scopedModels[0].explicitThinkingLevel === true &&
+		!parsed.continue &&
+		!parsed.resume
+	) {
 		options.thinkingLevel = scopedModels[0].thinkingLevel;
 	}
 
-	// Scoped models for Ctrl+P cycling
+	// Scoped models for Ctrl+P cycling - fill in default thinking levels when not explicit
 	if (scopedModels.length > 0) {
-		options.scopedModels = scopedModels;
+		const defaultThinkingLevel = settingsManager.getDefaultThinkingLevel() ?? "off";
+		options.scopedModels = scopedModels.map((scopedModel) => ({
+			model: scopedModel.model,
+			thinkingLevel: scopedModel.explicitThinkingLevel
+				? (scopedModel.thinkingLevel ?? defaultThinkingLevel)
+				: defaultThinkingLevel,
+		}));
 	}
 
 	// API key from CLI - set in authStorage
@@ -321,7 +353,9 @@ async function buildSessionOptions(
 	}
 
 	// Tools
-	if (parsed.tools) {
+	if (parsed.noTools) {
+		options.toolNames = parsed.tools && parsed.tools.length > 0 ? parsed.tools : [];
+	} else if (parsed.tools) {
 		options.toolNames = parsed.tools;
 	}
 
@@ -344,6 +378,10 @@ async function buildSessionOptions(
 		options.additionalExtensionPaths = cliExtensionPaths;
 	}
 
+	if (parsed.noExtensions) {
+		options.disableExtensionDiscovery = true;
+	}
+
 	return options;
 }
 
@@ -504,7 +542,7 @@ export async function main(args: string[]) {
 	}
 
 	time("buildSessionOptions");
-	const { session, extensionsResult, modelFallbackMessage, lspServers } = await createAgentSession(sessionOptions);
+	const { session, setToolUIContext, modelFallbackMessage, lspServers } = await createAgentSession(sessionOptions);
 	time("createAgentSession");
 
 	// Re-parse CLI args with extension flags and apply values
@@ -550,19 +588,17 @@ export async function main(args: string[]) {
 		const versionCheckPromise = checkForNewVersion(VERSION).catch(() => undefined);
 		const changelogMarkdown = getChangelogForDisplay(parsed, settingsManager);
 
-		if (scopedModels.length > 0) {
-			const modelList = scopedModels
-				.map((sm) => {
-					const thinkingStr = sm.thinkingLevel !== "off" ? `:${sm.thinkingLevel}` : "";
-					return `${sm.model.id}${thinkingStr}`;
+		const scopedModelsForDisplay = sessionOptions.scopedModels ?? scopedModels;
+		if (scopedModelsForDisplay.length > 0) {
+			const modelList = scopedModelsForDisplay
+				.map((scopedModel) => {
+					const thinkingStr = scopedModel.thinkingLevel !== "off" ? `:${scopedModel.thinkingLevel}` : "";
+					return `${scopedModel.model.id}${thinkingStr}`;
 				})
 				.join(", ");
 			console.log(chalk.dim(`Model scope: ${modelList} ${chalk.gray("(Ctrl+P to cycle)")}`));
 		}
 
-		const fdPath = await ensureTool("fd");
-		time("ensureTool(fd)");
-
 		installTerminalCrashHandlers();
 		printTimings();
 		await runInteractiveMode(
@@ -574,14 +610,18 @@ export async function main(args: string[]) {
 			migratedProviders,
 			versionCheckPromise,
 			parsed.messages,
-			extensionsResult.setUIContext,
+			setToolUIContext,
 			lspServers,
 			initialMessage,
 			initialImages,
-			fdPath,
 		);
 	} else {
-		await runPrintMode(session, mode, parsed.messages, initialMessage, initialImages);
+		await runPrintMode(session, {
+			mode,
+			messages: parsed.messages,
+			initialMessage,
+			initialImages,
+		});
 		stopThemeWatcher();
 		if (process.stdout.writableLength > 0) {
 			await new Promise<void>((resolve) => process.stdout.once("drain", resolve));

package/src/migrations.ts

@@ -2,10 +2,10 @@
  * One-time migrations that run on startup.
  */
 
-import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import chalk from "chalk";
-import { getAgentDir } from "./config";
+import { getAgentDir, getBinDir } from "./config";
 
 /**
  * Migrate PI_* environment variables to OMP_* equivalents.
@@ -143,6 +143,50 @@ export function migrateSessionsFromAgentRoot(): void {
 	}
 }
 
+/**
+ * Move fd/rg binaries from tools/ to bin/ if they exist.
+ */
+function migrateToolsToBin(): void {
+	const agentDir = getAgentDir();
+	const toolsDir = join(agentDir, "tools");
+	const binDir = getBinDir();
+
+	if (!existsSync(toolsDir)) return;
+
+	const binaries = ["fd", "rg", "fd.exe", "rg.exe"];
+	let movedAny = false;
+
+	for (const bin of binaries) {
+		const oldPath = join(toolsDir, bin);
+		const newPath = join(binDir, bin);
+
+		if (existsSync(oldPath)) {
+			if (!existsSync(binDir)) {
+				mkdirSync(binDir, { recursive: true });
+			}
+			if (!existsSync(newPath)) {
+				try {
+					renameSync(oldPath, newPath);
+					movedAny = true;
+				} catch {
+					// Ignore errors
+				}
+			} else {
+				// Target exists, just delete the old one
+				try {
+					rmSync(oldPath, { force: true });
+				} catch {
+					// Ignore
+				}
+			}
+		}
+	}
+
+	if (movedAny) {
+		console.log(chalk.green(`Migrated managed binaries tools/ → bin/`));
+	}
+}
+
 /**
  * Run all migrations. Called once on startup.
  *
@@ -159,6 +203,7 @@ export async function runMigrations(_cwd: string): Promise<{
 	// Then: run data migrations
 	const migratedAuthProviders = migrateAuthToAuthJson();
 	migrateSessionsFromAgentRoot();
+	migrateToolsToBin();
 
 	// Collect deprecation warnings
 	const deprecationWarnings: string[] = [];

package/src/modes/index.ts

@@ -41,8 +41,8 @@ export function installTerminalCrashHandlers(): void {
 	});
 }
 
-export { InteractiveMode } from "./interactive/interactive-mode";
-export { runPrintMode } from "./print-mode";
+export { InteractiveMode, type InteractiveModeOptions } from "./interactive/interactive-mode";
+export { type PrintModeOptions, runPrintMode } from "./print-mode";
 export { type ModelInfo, RpcClient, type RpcClientOptions, type RpcEventListener } from "./rpc/rpc-client";
 export { runRpcMode } from "./rpc/rpc-mode";
 export type { RpcCommand, RpcResponse, RpcSessionState } from "./rpc/rpc-types";

package/src/modes/interactive/components/assistant-message.ts

@@ -8,6 +8,7 @@ import { getMarkdownTheme, theme } from "../theme/theme";
 export class AssistantMessageComponent extends Container {
 	private contentContainer: Container;
 	private hideThinkingBlock: boolean;
+	private lastMessage?: AssistantMessage;
 
 	constructor(message?: AssistantMessage, hideThinkingBlock = false) {
 		super();
@@ -23,20 +24,28 @@ export class AssistantMessageComponent extends Container {
 		}
 	}
 
+	override invalidate(): void {
+		super.invalidate();
+		if (this.lastMessage) {
+			this.updateContent(this.lastMessage);
+		}
+	}
+
 	setHideThinkingBlock(hide: boolean): void {
 		this.hideThinkingBlock = hide;
 	}
 
 	updateContent(message: AssistantMessage): void {
+		this.lastMessage = message;
+
 		// Clear content container
 		this.contentContainer.clear();
 
-		if (
-			message.content.length > 0 &&
-			message.content.some(
-				(c) => (c.type === "text" && c.text.trim()) || (c.type === "thinking" && c.thinking.trim()),
-			)
-		) {
+		const hasVisibleContent = message.content.some(
+			(c) => (c.type === "text" && c.text.trim()) || (c.type === "thinking" && c.thinking.trim()),
+		);
+
+		if (hasVisibleContent) {
 			this.contentContainer.addChild(new Spacer(1));
 		}
 
@@ -75,7 +84,16 @@ export class AssistantMessageComponent extends Container {
 		const hasToolCalls = message.content.some((c) => c.type === "toolCall");
 		if (!hasToolCalls) {
 			if (message.stopReason === "aborted") {
-				this.contentContainer.addChild(new Text(theme.fg("error", "\nAborted"), 1, 0));
+				const abortMessage =
+					message.errorMessage && message.errorMessage !== "Request was aborted"
+						? message.errorMessage
+						: "Operation aborted";
+				if (hasVisibleContent) {
+					this.contentContainer.addChild(new Spacer(1));
+				} else {
+					this.contentContainer.addChild(new Spacer(1));
+				}
+				this.contentContainer.addChild(new Text(theme.fg("error", abortMessage), 1, 0));
 			} else if (message.stopReason === "error") {
 				const errorMsg = message.errorMessage || "Unknown error";
 				this.contentContainer.addChild(new Spacer(1));

package/src/modes/interactive/components/bash-execution.ts

@@ -72,6 +72,11 @@ export class BashExecutionComponent extends Container {
 		this.updateDisplay();
 	}
 
+	override invalidate(): void {
+		super.invalidate();
+		this.updateDisplay();
+	}
+
 	appendOutput(chunk: string): void {
 		// Strip ANSI codes and normalize line endings
 		// Note: binary data is already sanitized in tui-renderer.ts executeBashCommand

package/src/modes/interactive/components/branch-summary-message.ts

@@ -21,6 +21,11 @@ export class BranchSummaryMessageComponent extends Box {
 		this.updateDisplay();
 	}
 
+	override invalidate(): void {
+		super.invalidate();
+		this.updateDisplay();
+	}
+
 	private updateDisplay(): void {
 		this.clear();
 

package/src/modes/interactive/components/compaction-summary-message.ts

@@ -21,6 +21,11 @@ export class CompactionSummaryMessageComponent extends Box {
 		this.updateDisplay();
 	}
 
+	override invalidate(): void {
+		super.invalidate();
+		this.updateDisplay();
+	}
+
 	private updateDisplay(): void {
 		this.clear();
 

package/src/modes/interactive/components/countdown-timer.ts

@@ -0,0 +1,38 @@
+/**
+ * Reusable countdown timer for dialog components.
+ */
+
+import type { TUI } from "@oh-my-pi/pi-tui";
+
+export class CountdownTimer {
+	private intervalId: ReturnType<typeof setInterval> | undefined;
+	private remainingSeconds: number;
+
+	constructor(
+		timeoutMs: number,
+		private tui: TUI | undefined,
+		private onTick: (seconds: number) => void,
+		private onExpire: () => void,
+	) {
+		this.remainingSeconds = Math.ceil(timeoutMs / 1000);
+		this.onTick(this.remainingSeconds);
+
+		this.intervalId = setInterval(() => {
+			this.remainingSeconds--;
+			this.onTick(this.remainingSeconds);
+			this.tui?.requestRender();
+
+			if (this.remainingSeconds <= 0) {
+				this.dispose();
+				this.onExpire();
+			}
+		}, 1000);
+	}
+
+	dispose(): void {
+		if (this.intervalId) {
+			clearInterval(this.intervalId);
+			this.intervalId = undefined;
+		}
+	}
+}

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

@@ -38,6 +38,8 @@ export class CustomEditor extends Editor {
 	public onCtrlY?: () => void;
 	/** Called when Ctrl+V is pressed. Returns true if handled (image found), false to fall through to text paste. */
 	public onCtrlV?: () => Promise<boolean>;
+	/** Called when Alt+Up is pressed (dequeue keybinding). */
+	public onAltUp?: () => void;
 
 	/** Custom key handlers from extensions */
 	private customKeyHandlers = new Map<KeyId, () => void>();
@@ -157,6 +159,12 @@ export class CustomEditor extends Editor {
 			return;
 		}
 
+		// Intercept Alt+Up for dequeue (restore queued message to editor)
+		if (matchesKey(data, "alt+up") && this.onAltUp) {
+			this.onAltUp();
+			return;
+		}
+
 		// Intercept ? when editor is empty to show hotkeys
 		if (data === "?" && this.getText().length === 0 && this.onQuestionMark) {
 			this.onQuestionMark();

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

@@ -36,6 +36,11 @@ export class CustomMessageComponent extends Container {
 		}
 	}
 
+	override invalidate(): void {
+		super.invalidate();
+		this.rebuild();
+	}
+
 	private rebuild(): void {
 		// Remove previous content component
 		if (this.customComponent) {

package/src/modes/interactive/components/footer.ts

@@ -3,6 +3,7 @@ import type { AssistantMessage } from "@oh-my-pi/pi-ai";
 import { type Component, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
 import { dirname, join } from "path";
 import type { AgentSession } from "../../../core/agent-session";
+import { shortenPath } from "../../../core/tools/render-utils";
 import { theme } from "../theme/theme";
 
 /**
@@ -199,11 +200,7 @@ export class FooterComponent implements Component {
 		};
 
 		// Replace home directory with ~
-		let pwd = process.cwd();
-		const home = process.env.HOME || process.env.USERPROFILE;
-		if (home && pwd.startsWith(home)) {
-			pwd = `~${pwd.slice(home.length)}`;
-		}
+		let pwd = shortenPath(process.cwd());
 
 		// Add git branch if available
 		const branch = this.getCurrentBranch();

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

@@ -2,63 +2,72 @@
  * Simple text input component for hooks.
  */
 
-import { Container, Input, isEnter, isEscape, Spacer, Text } from "@oh-my-pi/pi-tui";
+import { Container, Input, isEnter, isEscape, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
 import { theme } from "../theme/theme";
+import { CountdownTimer } from "./countdown-timer";
 import { DynamicBorder } from "./dynamic-border";
 
+export interface HookInputOptions {
+	tui?: TUI;
+	timeout?: number;
+}
+
 export class HookInputComponent extends Container {
 	private input: Input;
 	private onSubmitCallback: (value: string) => void;
 	private onCancelCallback: () => void;
+	private titleText: Text;
+	private baseTitle: string;
+	private countdown: CountdownTimer | undefined;
 
 	constructor(
 		title: string,
 		_placeholder: string | undefined,
 		onSubmit: (value: string) => void,
 		onCancel: () => void,
+		opts?: HookInputOptions,
 	) {
 		super();
 
 		this.onSubmitCallback = onSubmit;
 		this.onCancelCallback = onCancel;
+		this.baseTitle = title;
 
-		// Add top border
 		this.addChild(new DynamicBorder());
 		this.addChild(new Spacer(1));
 
-		// Add title
-		this.addChild(new Text(theme.fg("accent", title), 1, 0));
+		this.titleText = new Text(theme.fg("accent", title), 1, 0);
+		this.addChild(this.titleText);
 		this.addChild(new Spacer(1));
 
-		// Create input
+		if (opts?.timeout && opts.timeout > 0 && opts.tui) {
+			this.countdown = new CountdownTimer(
+				opts.timeout,
+				opts.tui,
+				(s) => this.titleText.setText(theme.fg("accent", `${this.baseTitle} (${s}s)`)),
+				() => this.onCancelCallback(),
+			);
+		}
+
 		this.input = new Input();
 		this.addChild(this.input);
-
 		this.addChild(new Spacer(1));
-
-		// Add hint
 		this.addChild(new Text(theme.fg("dim", "enter submit  esc cancel"), 1, 0));
-
 		this.addChild(new Spacer(1));
-
-		// Add bottom border
 		this.addChild(new DynamicBorder());
 	}
 
 	handleInput(keyData: string): void {
-		// Enter
 		if (isEnter(keyData) || keyData === "\n") {
 			this.onSubmitCallback(this.input.getValue());
-			return;
-		}
-
-		// Escape to cancel
-		if (isEscape(keyData)) {
+		} else if (isEscape(keyData)) {
 			this.onCancelCallback();
-			return;
+		} else {
+			this.input.handleInput(keyData);
 		}
+	}
 
-		// Forward to input
-		this.input.handleInput(keyData);
+	dispose(): void {
+		this.countdown?.dispose();
 	}
 }