@oh-my-pi/pi-coding-agent 1.340.0 → 2.0.1337

package/src/modes/interactive/interactive-mode.ts

@@ -23,39 +23,40 @@ import {
 	TUI,
 	visibleWidth,
 } from "@oh-my-pi/pi-tui";
-import { getAuthPath, getDebugLogPath } from "../../config.js";
-import type { AgentSession, AgentSessionEvent } from "../../core/agent-session.js";
-import type { CustomToolSessionEvent, LoadedCustomTool } from "../../core/custom-tools/index.js";
-import type { HookUIContext } from "../../core/hooks/index.js";
-import { createCompactionSummaryMessage } from "../../core/messages.js";
-import { type SessionContext, SessionManager } from "../../core/session-manager.js";
-import { loadSkills } from "../../core/skills.js";
-import { loadProjectContextFiles } from "../../core/system-prompt.js";
-import type { TruncationResult } from "../../core/tools/truncate.js";
-import { getChangelogPath, parseChangelog } from "../../utils/changelog.js";
-import { copyToClipboard, readImageFromClipboard } from "../../utils/clipboard.js";
-import { ArminComponent } from "./components/armin.js";
-import { AssistantMessageComponent } from "./components/assistant-message.js";
-import { BashExecutionComponent } from "./components/bash-execution.js";
-import { BorderedLoader } from "./components/bordered-loader.js";
-import { BranchSummaryMessageComponent } from "./components/branch-summary-message.js";
-import { CompactionSummaryMessageComponent } from "./components/compaction-summary-message.js";
-import { CustomEditor } from "./components/custom-editor.js";
-import { DynamicBorder } from "./components/dynamic-border.js";
-import { FooterComponent } from "./components/footer.js";
-import { HookEditorComponent } from "./components/hook-editor.js";
-import { HookInputComponent } from "./components/hook-input.js";
-import { HookMessageComponent } from "./components/hook-message.js";
-import { HookSelectorComponent } from "./components/hook-selector.js";
-import { ModelSelectorComponent } from "./components/model-selector.js";
-import { OAuthSelectorComponent } from "./components/oauth-selector.js";
-import { SessionSelectorComponent } from "./components/session-selector.js";
-import { SettingsSelectorComponent } from "./components/settings-selector.js";
-import { ToolExecutionComponent } from "./components/tool-execution.js";
-import { TreeSelectorComponent } from "./components/tree-selector.js";
-import { UserMessageComponent } from "./components/user-message.js";
-import { UserMessageSelectorComponent } from "./components/user-message-selector.js";
-import { WelcomeComponent } from "./components/welcome.js";
+import { getAuthPath, getDebugLogPath } from "../../config";
+import type { AgentSession, AgentSessionEvent } from "../../core/agent-session";
+import type { CustomToolSessionEvent, LoadedCustomTool } from "../../core/custom-tools/index";
+import type { HookUIContext } from "../../core/hooks/index";
+import { createCompactionSummaryMessage } from "../../core/messages";
+import { getRecentSessions, type SessionContext, SessionManager } from "../../core/session-manager";
+import { loadSkills } from "../../core/skills";
+import { loadProjectContextFiles } from "../../core/system-prompt";
+import { generateSessionTitle, setTerminalTitle } from "../../core/title-generator";
+import type { TruncationResult } from "../../core/tools/truncate";
+import { getChangelogPath, parseChangelog } from "../../utils/changelog";
+import { copyToClipboard, readImageFromClipboard } from "../../utils/clipboard";
+import { ArminComponent } from "./components/armin";
+import { AssistantMessageComponent } from "./components/assistant-message";
+import { BashExecutionComponent } from "./components/bash-execution";
+import { BorderedLoader } from "./components/bordered-loader";
+import { BranchSummaryMessageComponent } from "./components/branch-summary-message";
+import { CompactionSummaryMessageComponent } from "./components/compaction-summary-message";
+import { CustomEditor } from "./components/custom-editor";
+import { DynamicBorder } from "./components/dynamic-border";
+import { FooterComponent } from "./components/footer";
+import { HookEditorComponent } from "./components/hook-editor";
+import { HookInputComponent } from "./components/hook-input";
+import { HookMessageComponent } from "./components/hook-message";
+import { HookSelectorComponent } from "./components/hook-selector";
+import { ModelSelectorComponent } from "./components/model-selector";
+import { OAuthSelectorComponent } from "./components/oauth-selector";
+import { SessionSelectorComponent } from "./components/session-selector";
+import { SettingsSelectorComponent } from "./components/settings-selector";
+import { ToolExecutionComponent } from "./components/tool-execution";
+import { TreeSelectorComponent } from "./components/tree-selector";
+import { UserMessageComponent } from "./components/user-message";
+import { UserMessageSelectorComponent } from "./components/user-message-selector";
+import { WelcomeComponent } from "./components/welcome";
 import {
 	getAvailableThemes,
 	getEditorTheme,
@@ -64,7 +65,7 @@ import {
 	setTheme,
 	type Theme,
 	theme,
-} from "./theme/theme.js";
+} from "./theme/theme";
 
 /** Interface for components that can be expanded/collapsed */
 interface Expandable {
@@ -141,6 +142,9 @@ export class InteractiveMode {
 	// Custom tools for custom rendering
 	private customTools: Map<string, LoadedCustomTool>;
 
+	// Title generation state
+	private titleGenerationAttempted = false;
+
 	// Convenience accessors
 	private get agent() {
 		return this.session.agent;
@@ -158,6 +162,9 @@ export class InteractiveMode {
 		changelogMarkdown: string | undefined = undefined,
 		customTools: LoadedCustomTool[] = [],
 		private setToolUIContext: (uiContext: HookUIContext, hasUI: boolean) => void = () => {},
+		private lspServers:
+			| Array<{ name: string; status: "ready" | "error"; fileTypes: string[] }>
+			| undefined = undefined,
 		fdPath: string | undefined = undefined,
 	) {
 		this.session = session;
@@ -178,7 +185,7 @@ export class InteractiveMode {
 		const slashCommands: SlashCommand[] = [
 			{ name: "settings", description: "Open settings menu" },
 			{ name: "model", description: "Select model (opens selector UI)" },
-			{ name: "export", description: "Export session to HTML file" },
+			{ name: "export", description: "Export session to HTML file or clipboard (--copy)" },
 			{ name: "share", description: "Share session as a secret GitHub gist" },
 			{ name: "copy", description: "Copy last agent message to clipboard" },
 			{ name: "session", description: "Show session info and stats" },
@@ -209,9 +216,15 @@ export class InteractiveMode {
 			description: cmd.description ?? "(hook command)",
 		}));
 
+		// Convert custom commands (TypeScript) to SlashCommand format
+		const customCommands: SlashCommand[] = this.session.customCommands.map((loaded) => ({
+			name: loaded.command.name,
+			description: `${loaded.command.description} (${loaded.source})`,
+		}));
+
 		// Setup autocomplete
 		const autocompleteProvider = new CombinedAutocompleteProvider(
-			[...slashCommands, ...fileSlashCommands, ...hookCommands],
+			[...slashCommands, ...fileSlashCommands, ...hookCommands, ...customCommands],
 			process.cwd(),
 			fdPath,
 		);
@@ -225,8 +238,29 @@ export class InteractiveMode {
 		const modelName = this.session.model?.name ?? "Unknown";
 		const providerName = this.session.model?.provider ?? "Unknown";
 
+		// Get recent sessions
+		const recentSessions = getRecentSessions(this.sessionManager.getSessionDir()).map((s) => ({
+			name: s.name,
+			timeAgo: s.timeAgo,
+		}));
+
+		// Convert LSP servers to welcome format
+		const lspServerInfo =
+			this.lspServers?.map((s) => ({
+				name: s.name,
+				status: s.status as "ready" | "error" | "connecting",
+				fileTypes: s.fileTypes,
+			})) ?? [];
+
 		// Add welcome header
-		const welcome = new WelcomeComponent(this.version, modelName, providerName);
+		const welcome = new WelcomeComponent(this.version, modelName, providerName, recentSessions, lspServerInfo);
+
+		// Set terminal title if session already has one (resumed session)
+		const existingTitle = this.sessionManager.getSessionTitle();
+		if (existingTitle) {
+			setTerminalTitle(`pi: ${existingTitle}`);
+			this.titleGenerationAttempted = true; // Don't try to generate again
+		}
 
 		// Setup UI layout
 		this.ui.addChild(new Spacer(1));
@@ -717,7 +751,7 @@ export class InteractiveMode {
 				return;
 			}
 			if (text.startsWith("/export")) {
-				this.handleExportCommand(text);
+				await this.handleExportCommand(text);
 				this.editor.setText("");
 				return;
 			}
@@ -839,6 +873,19 @@ export class InteractiveMode {
 				}
 			}
 
+			// Custom commands (TypeScript slash commands) - route through session.prompt()
+			if (text.startsWith("/") && this.session.customCommands.length > 0) {
+				const spaceIndex = text.indexOf(" ");
+				const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
+				const hasCustomCommand = this.session.customCommands.some((c) => c.command.name === commandName);
+				if (hasCustomCommand) {
+					this.editor.addToHistory(text);
+					this.editor.setText("");
+					await this.session.prompt(text);
+					return;
+				}
+			}
+
 			// Queue regular messages if agent is streaming
 			if (this.session.isStreaming) {
 				await this.session.queueMessage(text);
@@ -1025,6 +1072,12 @@ export class InteractiveMode {
 				}
 				this.pendingTools.clear();
 				this.ui.requestRender();
+
+				// Generate session title after first turn (if not already titled)
+				if (!this.titleGenerationAttempted && !this.sessionManager.getSessionTitle()) {
+					this.titleGenerationAttempted = true;
+					this.maybeGenerateTitle();
+				}
 				break;
 
 			case "auto_compaction_start": {
@@ -1198,6 +1251,14 @@ export class InteractiveMode {
 				this.chatContainer.addChild(component);
 				break;
 			}
+			case "fileMention": {
+				// Render compact file mention display
+				for (const file of message.files) {
+					const text = `${theme.fg("dim", "⎿ ")}${theme.fg("muted", "Read")} ${theme.fg("accent", file.path)} ${theme.fg("dim", `(${file.lineCount} lines)`)}`;
+					this.chatContainer.addChild(new Text(text, 0, 0));
+				}
+				break;
+			}
 			case "user": {
 				const textContent = this.getUserMessageText(message);
 				if (textContent) {
@@ -1552,6 +1613,42 @@ export class InteractiveMode {
 		this.ui.requestRender();
 	}
 
+	/**
+	 * Generate a title for the session based on the first user message.
+	 * Runs in background, doesn't block UI.
+	 */
+	private maybeGenerateTitle(): void {
+		// Find the first user message
+		const messages = this.agent.state.messages;
+		const firstUserMessage = messages.find((m) => m.role === "user");
+		if (!firstUserMessage) return;
+
+		// Extract text content
+		let messageText = "";
+		for (const content of firstUserMessage.content) {
+			if (typeof content === "string") {
+				messageText += content;
+			} else if (content.type === "text") {
+				messageText += content.text;
+			}
+		}
+		if (!messageText.trim()) return;
+
+		// Generate title in background
+		const registry = this.session.modelRegistry;
+		const smolModel = this.settingsManager.getModelRole("smol");
+		generateSessionTitle(messageText, registry, smolModel)
+			.then((title) => {
+				if (title) {
+					this.sessionManager.setSessionTitle(title);
+					setTerminalTitle(`pi: ${title}`);
+				}
+			})
+			.catch(() => {
+				// Ignore title generation errors
+			});
+	}
+
 	private updatePendingMessagesDisplay(): void {
 		this.pendingMessagesContainer.clear();
 		const queuedMessages = this.session.getQueuedMessages();
@@ -1641,6 +1738,9 @@ export class InteractiveMode {
 			case "queueMode":
 				this.session.setQueueMode(value as "all" | "one-at-a-time");
 				break;
+			case "interruptMode":
+				this.session.setInterruptMode(value as "immediate" | "wait");
+				break;
 			case "thinkingLevel":
 				this.session.setThinkingLevel(value as ThinkingLevel);
 				this.footer.invalidate();
@@ -1687,17 +1787,21 @@ export class InteractiveMode {
 				this.settingsManager,
 				this.session.modelRegistry,
 				this.session.scopedModels,
-				async (model) => {
+				async (model, role) => {
 					try {
-						await this.session.setModel(model);
-						this.footer.invalidate();
-						this.updateEditorBorderColor();
-						done();
-						this.showStatus(`Model: ${model.id}`);
+						// Only update agent state for default role
+						if (role === "default") {
+							await this.session.setModel(model, role);
+							this.footer.invalidate();
+							this.updateEditorBorderColor();
+						}
+						// For other roles (small), just show status - settings already updated by selector
+						const roleLabel = role === "default" ? "Default" : role === "smol" ? "Smol" : role;
+						this.showStatus(`${roleLabel} model: ${model.id}`);
 					} catch (error) {
-						done();
 						this.showError(error instanceof Error ? error.message : String(error));
 					}
+					// Don't call done() - selector stays open
 				},
 				() => {
 					done();
@@ -2004,12 +2108,29 @@ export class InteractiveMode {
 	// Command handlers
 	// =========================================================================
 
-	private handleExportCommand(text: string): void {
+	private async handleExportCommand(text: string): Promise<void> {
 		const parts = text.split(/\s+/);
-		const outputPath = parts.length > 1 ? parts[1] : undefined;
+		const arg = parts.length > 1 ? parts[1] : undefined;
+
+		// Check for clipboard export
+		if (arg === "--copy" || arg === "clipboard" || arg === "copy") {
+			try {
+				const formatted = this.session.formatSessionAsText();
+				if (!formatted) {
+					this.showError("No messages to export yet.");
+					return;
+				}
+				await copyToClipboard(formatted);
+				this.showStatus("Session copied to clipboard");
+			} catch (error: unknown) {
+				this.showError(`Failed to copy session: ${error instanceof Error ? error.message : "Unknown error"}`);
+			}
+			return;
+		}
 
+		// HTML file export
 		try {
-			const filePath = this.session.exportToHtml(outputPath);
+			const filePath = this.session.exportToHtml(arg);
 			this.showStatus(`Session exported to: ${filePath}`);
 		} catch (error: unknown) {
 			this.showError(`Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`);

package/src/modes/interactive/theme/theme.ts

@@ -5,7 +5,8 @@ import { type Static, Type } from "@sinclair/typebox";
 import { TypeCompiler } from "@sinclair/typebox/compiler";
 import chalk from "chalk";
 import { highlight, supportsLanguage } from "cli-highlight";
-import { getCustomThemesDir, getThemesDir } from "../../../config.js";
+import { getCustomThemesDir, getThemesDir } from "../../../config";
+import { logger } from "../../../core/logger";
 
 // ============================================================================
 // Types & Schema
@@ -590,8 +591,8 @@ export function initTheme(themeName?: string, enableWatcher: boolean = false): v
 		if (enableWatcher) {
 			startThemeWatcher();
 		}
-	} catch (_error) {
-		// Theme is invalid - fall back to dark theme silently
+	} catch (err) {
+		logger.debug("Theme loading failed, falling back to dark theme", { error: String(err) });
 		currentThemeName = "dark";
 		theme = loadTheme("dark");
 		// Don't start watcher for fallback theme
@@ -654,8 +655,8 @@ function startThemeWatcher(): void {
 						if (onThemeChangeCallback) {
 							onThemeChangeCallback();
 						}
-					} catch (_error) {
-						// Ignore errors (file might be in invalid state while being edited)
+					} catch (err) {
+						logger.debug("Theme reload error during file change", { error: String(err) });
 					}
 				}, 100);
 			} else if (eventType === "rename") {
@@ -675,8 +676,8 @@ function startThemeWatcher(): void {
 				}, 100);
 			}
 		});
-	} catch (_error) {
-		// Ignore errors starting watcher
+	} catch (err) {
+		logger.debug("Failed to start theme watcher", { error: String(err) });
 	}
 }
 

package/src/modes/print-mode.ts

@@ -7,7 +7,8 @@
  */
 
 import type { AssistantMessage, ImageContent } from "@oh-my-pi/pi-ai";
-import type { AgentSession } from "../core/agent-session.js";
+import type { AgentSession } from "../core/agent-session";
+import { logger } from "../core/logger";
 
 /**
  * Run in print (single-shot) mode.
@@ -70,8 +71,8 @@ export async function runPrintMode(
 						},
 					},
 				);
-			} catch (_err) {
-				// Silently ignore tool errors
+			} catch (err) {
+				logger.warn("Tool onSession error", { error: String(err) });
 			}
 		}
 	}

package/src/modes/rpc/rpc-client.ts

@@ -7,10 +7,10 @@
 import type { AgentEvent, AgentMessage, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent } from "@oh-my-pi/pi-ai";
 import type { Subprocess } from "bun";
-import type { SessionStats } from "../../core/agent-session.js";
-import type { BashResult } from "../../core/bash-executor.js";
-import type { CompactionResult } from "../../core/compaction/index.js";
-import type { RpcCommand, RpcResponse, RpcSessionState } from "./rpc-types.js";
+import type { SessionStats } from "../../core/agent-session";
+import type { BashResult } from "../../core/bash-executor";
+import type { CompactionResult } from "../../core/compaction/index";
+import type { RpcCommand, RpcResponse, RpcSessionState } from "./rpc-types";
 
 // ============================================================================
 // Types

package/src/modes/rpc/rpc-mode.ts

@@ -11,13 +11,14 @@
  * - Hook UI: Hook UI requests are emitted, client responds with hook_ui_response
  */
 
-import type { AgentSession } from "../../core/agent-session.js";
-import type { HookUIContext } from "../../core/hooks/index.js";
-import { theme } from "../interactive/theme/theme.js";
-import type { RpcCommand, RpcHookUIRequest, RpcHookUIResponse, RpcResponse, RpcSessionState } from "./rpc-types.js";
+import type { AgentSession } from "../../core/agent-session";
+import type { HookUIContext } from "../../core/hooks/index";
+import { logger } from "../../core/logger";
+import { theme } from "../interactive/theme/theme";
+import type { RpcCommand, RpcHookUIRequest, RpcHookUIResponse, RpcResponse, RpcSessionState } from "./rpc-types";
 
 // Re-export types for consumers
-export type { RpcCommand, RpcHookUIRequest, RpcHookUIResponse, RpcResponse, RpcSessionState } from "./rpc-types.js";
+export type { RpcCommand, RpcHookUIRequest, RpcHookUIResponse, RpcResponse, RpcSessionState } from "./rpc-types";
 
 /**
  * Run in RPC mode.
@@ -220,8 +221,8 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 						},
 					},
 				);
-			} catch (_err) {
-				// Silently ignore tool errors
+			} catch (err) {
+				logger.warn("Tool onSession error", { error: String(err) });
 			}
 		}
 	}
@@ -231,6 +232,9 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 		output(event);
 	});
 
+	// Serialize prompt commands to prevent concurrent execution
+	let activePrompt: Promise<void> | null = null;
+
 	// Handle a single command
 	const handleCommand = async (command: RpcCommand): Promise<RpcResponse> => {
 		const id = command.id;
@@ -241,13 +245,18 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 			// =================================================================
 
 			case "prompt": {
-				// Don't await - events will stream
-				// Hook commands and file slash commands are handled in session.prompt()
-				session
+				// Serialize prompts to prevent concurrent execution
+				if (activePrompt) {
+					await activePrompt;
+				}
+				activePrompt = session
 					.prompt(command.message, {
 						images: command.images,
 					})
-					.catch((e) => output(error(id, "prompt", e.message)));
+					.catch((e) => output(error(id, "prompt", e.message)))
+					.finally(() => {
+						activePrompt = null;
+					});
 				return success(id, "prompt");
 			}
 
@@ -462,6 +471,7 @@ export async function runRpcMode(session: AgentSession): Promise<never> {
 					const response = parsed as RpcHookUIResponse;
 					const pending = pendingHookRequests.get(response.id);
 					if (pending) {
+						// Atomic delete: remove before resolve to prevent double-resolution
 						pendingHookRequests.delete(response.id);
 						pending.resolve(response);
 					}

package/src/modes/rpc/rpc-types.ts

@@ -7,9 +7,9 @@
 
 import type { AgentMessage, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Model } from "@oh-my-pi/pi-ai";
-import type { SessionStats } from "../../core/agent-session.js";
-import type { BashResult } from "../../core/bash-executor.js";
-import type { CompactionResult } from "../../core/compaction/index.js";
+import type { SessionStats } from "../../core/agent-session";
+import type { BashResult } from "../../core/bash-executor";
+import type { CompactionResult } from "../../core/compaction/index";
 
 // ============================================================================
 // RPC Commands (stdin)

package/src/utils/changelog.ts

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync } from "fs";
+import { existsSync, readFileSync } from "node:fs";
 
 export interface ChangelogEntry {
 	major: number;
@@ -96,4 +96,4 @@ export function getNewEntries(entries: ChangelogEntry[], lastVersion: string): C
 }
 
 // Re-export getChangelogPath from paths.ts for convenience
-export { getChangelogPath } from "../config.js";
+export { getChangelogPath } from "../config";

package/src/utils/clipboard.ts

@@ -1,4 +1,4 @@
-import { platform } from "os";
+import { platform } from "node:os";
 
 async function spawnWithTimeout(cmd: string[], input: string, timeoutMs: number): Promise<void> {
 	const proc = Bun.spawn(cmd, { stdin: "pipe" });