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

package/src/core/agent-session.ts

@@ -16,8 +16,8 @@
 import type { Agent, AgentEvent, AgentMessage, AgentState, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, ImageContent, Message, Model, TextContent } from "@oh-my-pi/pi-ai";
 import { isContextOverflow, modelsAreEqual, supportsXhigh } from "@oh-my-pi/pi-ai";
-import { getAuthPath } from "../config.js";
-import { type BashResult, executeBash as executeBashCommand } from "./bash-executor.js";
+import { getAuthPath } from "../config";
+import { type BashResult, executeBash as executeBashCommand } from "./bash-executor";
 import {
 	type CompactionResult,
 	calculateContextTokens,
@@ -26,9 +26,11 @@ import {
 	generateBranchSummary,
 	prepareCompaction,
 	shouldCompact,
-} from "./compaction/index.js";
-import type { CustomToolContext, CustomToolSessionEvent, LoadedCustomTool } from "./custom-tools/index.js";
-import { exportSessionToHtml } from "./export-html/index.js";
+} from "./compaction/index";
+import type { LoadedCustomCommand } from "./custom-commands/index";
+import type { CustomToolContext, CustomToolSessionEvent, LoadedCustomTool } from "./custom-tools/index";
+import { exportSessionToHtml } from "./export-html/index";
+import { extractFileMentions, generateFileMentionMessages } from "./file-mentions";
 import type {
 	HookRunner,
 	SessionBeforeBranchResult,
@@ -38,12 +40,13 @@ import type {
 	TreePreparation,
 	TurnEndEvent,
 	TurnStartEvent,
-} from "./hooks/index.js";
-import type { BashExecutionMessage, HookMessage } from "./messages.js";
-import type { ModelRegistry } from "./model-registry.js";
-import type { BranchSummaryEntry, CompactionEntry, NewSessionOptions, SessionManager } from "./session-manager.js";
-import type { SettingsManager, SkillsSettings } from "./settings-manager.js";
-import { expandSlashCommand, type FileSlashCommand } from "./slash-commands.js";
+} from "./hooks/index";
+import { logger } from "./logger";
+import type { BashExecutionMessage, HookMessage } from "./messages";
+import type { ModelRegistry } from "./model-registry";
+import type { BranchSummaryEntry, CompactionEntry, NewSessionOptions, SessionManager } from "./session-manager";
+import type { SettingsManager, SkillsSettings } from "./settings-manager";
+import { expandSlashCommand, type FileSlashCommand, parseCommandArgs } from "./slash-commands";
 
 /** Session-specific events that extend the core AgentEvent */
 export type AgentSessionEvent =
@@ -72,6 +75,8 @@ export interface AgentSessionConfig {
 	hookRunner?: HookRunner;
 	/** Custom tools for session lifecycle events */
 	customTools?: LoadedCustomTool[];
+	/** Custom commands (TypeScript slash commands) */
+	customCommands?: LoadedCustomCommand[];
 	skillsSettings?: Required<SkillsSettings>;
 	/** Model registry for API key resolution and model discovery */
 	modelRegistry: ModelRegistry;
@@ -166,6 +171,9 @@ export class AgentSession {
 	// Custom tools for session lifecycle
 	private _customTools: LoadedCustomTool[] = [];
 
+	// Custom commands (TypeScript slash commands)
+	private _customCommands: LoadedCustomCommand[] = [];
+
 	private _skillsSettings: Required<SkillsSettings> | undefined;
 
 	// Model registry for API key resolution
@@ -179,6 +187,7 @@ export class AgentSession {
 		this._fileCommands = config.fileCommands ?? [];
 		this._hookRunner = config.hookRunner;
 		this._customTools = config.customTools ?? [];
+		this._customCommands = config.customCommands ?? [];
 		this._skillsSettings = config.skillsSettings;
 		this._modelRegistry = config.modelRegistry;
 
@@ -198,7 +207,9 @@ export class AgentSession {
 
 	/** Emit an event to all listeners */
 	private _emit(event: AgentSessionEvent): void {
-		for (const l of this._eventListeners) {
+		// Copy array before iteration to avoid mutation during iteration
+		const listeners = [...this._eventListeners];
+		for (const l of listeners) {
 			l(event);
 		}
 	}
@@ -424,6 +435,11 @@ export class AgentSession {
 		return this.agent.getQueueMode();
 	}
 
+	/** Current interrupt mode */
+	get interruptMode(): "immediate" | "wait" {
+		return this.agent.getInterruptMode();
+	}
+
 	/** Current session file path, or undefined if sessions are disabled */
 	get sessionFile(): string | undefined {
 		return this.sessionManager.getSessionFile();
@@ -444,6 +460,11 @@ export class AgentSession {
 		return this._fileCommands;
 	}
 
+	/** Custom commands (TypeScript slash commands) */
+	get customCommands(): ReadonlyArray<LoadedCustomCommand> {
+		return this._customCommands;
+	}
+
 	// =========================================================================
 	// Prompting
 	// =========================================================================
@@ -468,6 +489,17 @@ export class AgentSession {
 				// Hook command executed, no prompt to send
 				return;
 			}
+
+			// Try custom commands (TypeScript slash commands)
+			const customResult = await this._tryExecuteCustomCommand(text);
+			if (customResult !== null) {
+				if (customResult === "") {
+					// Command handled, nothing to send
+					return;
+				}
+				// Command returned a prompt - use it instead of the original text
+				text = customResult;
+			}
 		}
 
 		// Validate model
@@ -511,6 +543,13 @@ export class AgentSession {
 			timestamp: Date.now(),
 		});
 
+		// Auto-read @filepath mentions
+		const fileMentions = extractFileMentions(expandedText);
+		if (fileMentions.length > 0) {
+			const fileMentionMessages = await generateFileMentionMessages(fileMentions, this.sessionManager.getCwd());
+			messages.push(...fileMentionMessages);
+		}
+
 		// Emit before_agent_start hook event
 		if (this._hookRunner) {
 			const result = await this._hookRunner.emitBeforeAgentStart(expandedText, options?.images);
@@ -561,6 +600,43 @@ export class AgentSession {
 		}
 	}
 
+	/**
+	 * Try to execute a custom command. Returns the prompt string if found, null otherwise.
+	 * If the command returns void, returns empty string to indicate it was handled.
+	 */
+	private async _tryExecuteCustomCommand(text: string): Promise<string | null> {
+		if (this._customCommands.length === 0) return null;
+		if (!this._hookRunner) return null; // Need hook runner for command context
+
+		// Parse command name and args
+		const spaceIndex = text.indexOf(" ");
+		const commandName = spaceIndex === -1 ? text.slice(1) : text.slice(1, spaceIndex);
+		const argsString = spaceIndex === -1 ? "" : text.slice(spaceIndex + 1);
+
+		// Find matching command
+		const loaded = this._customCommands.find((c) => c.command.name === commandName);
+		if (!loaded) return null;
+
+		// Get command context from hook runner (includes session control methods)
+		const ctx = this._hookRunner.createCommandContext();
+
+		try {
+			const args = parseCommandArgs(argsString);
+			const result = await loaded.command.execute(args, ctx);
+			// If result is a string, it's a prompt to send to LLM
+			// If void/undefined, command handled everything
+			return result ?? "";
+		} catch (err) {
+			// Emit error via hook runner
+			this._hookRunner.emitError({
+				hookPath: `custom-command:${commandName}`,
+				event: "command",
+				error: err instanceof Error ? err.message : String(err),
+			});
+			return ""; // Command was handled (with error)
+		}
+	}
+
 	/**
 	 * Queue a message to be sent after the current response completes.
 	 * Use when agent is currently streaming.
@@ -701,15 +777,15 @@ export class AgentSession {
 	 * Validates API key, saves to session and settings.
 	 * @throws Error if no API key available for the model
 	 */
-	async setModel(model: Model<any>): Promise<void> {
+	async setModel(model: Model<any>, role: string = "default"): Promise<void> {
 		const apiKey = await this._modelRegistry.getApiKey(model);
 		if (!apiKey) {
 			throw new Error(`No API key for ${model.provider}/${model.id}`);
 		}
 
 		this.agent.setModel(model);
-		this.sessionManager.appendModelChange(model.provider, model.id);
-		this.settingsManager.setDefaultModelAndProvider(model.provider, model.id);
+		this.sessionManager.appendModelChange(`${model.provider}/${model.id}`, role);
+		this.settingsManager.setModelRole(role, `${model.provider}/${model.id}`);
 
 		// Re-clamp thinking level for new model's capabilities
 		this.setThinkingLevel(this.thinkingLevel);
@@ -747,8 +823,8 @@ export class AgentSession {
 
 		// Apply model
 		this.agent.setModel(next.model);
-		this.sessionManager.appendModelChange(next.model.provider, next.model.id);
-		this.settingsManager.setDefaultModelAndProvider(next.model.provider, next.model.id);
+		this.sessionManager.appendModelChange(`${next.model.provider}/${next.model.id}`);
+		this.settingsManager.setModelRole("default", `${next.model.provider}/${next.model.id}`);
 
 		// Apply thinking level (setThinkingLevel clamps to model capabilities)
 		this.setThinkingLevel(next.thinkingLevel);
@@ -774,8 +850,8 @@ export class AgentSession {
 		}
 
 		this.agent.setModel(nextModel);
-		this.sessionManager.appendModelChange(nextModel.provider, nextModel.id);
-		this.settingsManager.setDefaultModelAndProvider(nextModel.provider, nextModel.id);
+		this.sessionManager.appendModelChange(`${nextModel.provider}/${nextModel.id}`);
+		this.settingsManager.setModelRole("default", `${nextModel.provider}/${nextModel.id}`);
 
 		// Re-clamp thinking level for new model's capabilities
 		this.setThinkingLevel(this.thinkingLevel);
@@ -861,6 +937,15 @@ export class AgentSession {
 		this.settingsManager.setQueueMode(mode);
 	}
 
+	/**
+	 * Set interrupt mode.
+	 * Saves to settings.
+	 */
+	setInterruptMode(mode: "immediate" | "wait"): void {
+		this.agent.setInterruptMode(mode);
+		this.settingsManager.setInterruptMode(mode);
+	}
+
 	// =========================================================================
 	// Compaction
 	// =========================================================================
@@ -1044,6 +1129,10 @@ export class AgentSession {
 		const settings = this.settingsManager.getCompactionSettings();
 
 		this._emit({ type: "auto_compaction_start", reason });
+		// Properly abort and null existing controller before replacing
+		if (this._autoCompactionAbortController) {
+			this._autoCompactionAbortController.abort();
+		}
 		this._autoCompactionAbortController = new AbortController();
 
 		try {
@@ -1217,7 +1306,8 @@ export class AgentSession {
 		this._retryAttempt++;
 
 		// Create retry promise on first attempt so waitForRetry() can await it
-		if (this._retryAttempt === 1 && !this._retryPromise) {
+		// Ensure only one promise exists (avoid orphaned promises from concurrent calls)
+		if (!this._retryPromise) {
 			this._retryPromise = new Promise((resolve) => {
 				this._retryResolve = resolve;
 			});
@@ -1253,6 +1343,10 @@ export class AgentSession {
 		}
 
 		// Wait with exponential backoff (abortable)
+		// Properly abort and null existing controller before replacing
+		if (this._retryAbortController) {
+			this._retryAbortController.abort();
+		}
 		this._retryAbortController = new AbortController();
 		try {
 			await this._sleep(delayMs, this._retryAbortController.signal);
@@ -1472,13 +1566,17 @@ export class AgentSession {
 		this.agent.replaceMessages(sessionContext.messages);
 
 		// Restore model if saved
-		if (sessionContext.model) {
-			const availableModels = await this._modelRegistry.getAvailable();
-			const match = availableModels.find(
-				(m) => m.provider === sessionContext.model!.provider && m.id === sessionContext.model!.modelId,
-			);
-			if (match) {
-				this.agent.setModel(match);
+		const defaultModelStr = sessionContext.models.default;
+		if (defaultModelStr) {
+			const slashIdx = defaultModelStr.indexOf("/");
+			if (slashIdx > 0) {
+				const provider = defaultModelStr.slice(0, slashIdx);
+				const modelId = defaultModelStr.slice(slashIdx + 1);
+				const availableModels = await this._modelRegistry.getAvailable();
+				const match = availableModels.find((m) => m.provider === provider && m.id === modelId);
+				if (match) {
+					this.agent.setModel(match);
+				}
 			}
 		}
 
@@ -1840,6 +1938,68 @@ export class AgentSession {
 		return text.trim() || undefined;
 	}
 
+	/**
+	 * Format the entire session as plain text for clipboard export.
+	 * Includes user messages, assistant text, thinking blocks, tool calls, and tool results.
+	 */
+	formatSessionAsText(): string {
+		const lines: string[] = [];
+
+		for (const msg of this.messages) {
+			if (msg.role === "user") {
+				lines.push("## User\n");
+				if (typeof msg.content === "string") {
+					lines.push(msg.content);
+				} else {
+					for (const c of msg.content) {
+						if (c.type === "text") {
+							lines.push(c.text);
+						} else if (c.type === "image") {
+							lines.push("[Image]");
+						}
+					}
+				}
+				lines.push("\n");
+			} else if (msg.role === "assistant") {
+				const assistantMsg = msg as AssistantMessage;
+				lines.push("## Assistant\n");
+
+				for (const c of assistantMsg.content) {
+					if (c.type === "text") {
+						lines.push(c.text);
+					} else if (c.type === "thinking") {
+						lines.push("<thinking>");
+						lines.push(c.thinking);
+						lines.push("</thinking>\n");
+					} else if (c.type === "toolCall") {
+						lines.push(`### Tool: ${c.name}`);
+						lines.push("```json");
+						lines.push(JSON.stringify(c.arguments, null, 2));
+						lines.push("```\n");
+					}
+				}
+				lines.push("");
+			} else if (msg.role === "toolResult") {
+				lines.push(`### Tool Result: ${msg.toolName}`);
+				if (msg.isError) {
+					lines.push("(error)");
+				}
+				for (const c of msg.content) {
+					if (c.type === "text") {
+						lines.push("```");
+						lines.push(c.text);
+						lines.push("```");
+					} else if (c.type === "image") {
+						lines.push("[Image output]");
+					}
+				}
+				lines.push("");
+			}
+		}
+
+		return lines.join("\n").trim();
+	}
+
 	// =========================================================================
 	// Hook System
 	// =========================================================================
@@ -1891,8 +2051,8 @@ export class AgentSession {
 			if (tool.onSession) {
 				try {
 					await tool.onSession(event, ctx);
-				} catch (_err) {
-					// Silently ignore tool errors during session events
+				} catch (err) {
+					logger.warn("Tool onSession error", { error: String(err) });
 				}
 			}
 		}

package/src/core/bash-executor.ts

@@ -11,14 +11,19 @@ import { tmpdir } from "node:os";
 import { join } from "node:path";
 import type { Subprocess } from "bun";
 import stripAnsi from "strip-ansi";
-import { getShellConfig, killProcessTree, sanitizeBinaryOutput } from "../utils/shell.js";
-import { DEFAULT_MAX_BYTES, truncateTail } from "./tools/truncate.js";
+import { getShellConfig, killProcessTree, sanitizeBinaryOutput } from "../utils/shell";
+import { getOrCreateSnapshot, getSnapshotSourceCommand } from "../utils/shell-snapshot";
+import { DEFAULT_MAX_BYTES, truncateTail } from "./tools/truncate";
 
 // ============================================================================
 // Types
 // ============================================================================
 
 export interface BashExecutorOptions {
+	/** Working directory for command execution */
+	cwd?: string;
+	/** Timeout in milliseconds */
+	timeout?: number;
 	/** Callback for streaming output chunks (already sanitized) */
 	onChunk?: (chunk: string) => void;
 	/** AbortSignal for cancellation */
@@ -56,13 +61,24 @@ export interface BashResult {
  * @param options - Optional streaming callback and abort signal
  * @returns Promise resolving to execution result
  */
-export function executeBash(command: string, options?: BashExecutorOptions): Promise<BashResult> {
+export async function executeBash(command: string, options?: BashExecutorOptions): Promise<BashResult> {
+	const { shell, args, env, prefix } = getShellConfig();
+
+	// Get or create shell snapshot (for aliases, functions, options)
+	const snapshotPath = await getOrCreateSnapshot(shell, env);
+	const snapshotPrefix = getSnapshotSourceCommand(snapshotPath);
+
+	// Build final command: snapshot + prefix + command
+	const prefixedCommand = prefix ? `${prefix} ${command}` : command;
+	const finalCommand = `${snapshotPrefix}${prefixedCommand}`;
+
 	return new Promise((resolve, reject) => {
-		const { shell, args } = getShellConfig();
-		const child: Subprocess = Bun.spawn([shell, ...args, command], {
+		const child: Subprocess = Bun.spawn([shell, ...args, finalCommand], {
+			cwd: options?.cwd,
 			stdin: "ignore",
 			stdout: "pipe",
 			stderr: "pipe",
+			env,
 		});
 
 		// Track sanitized output for truncation
@@ -74,16 +90,27 @@ export function executeBash(command: string, options?: BashExecutorOptions): Pro
 		let tempFilePath: string | undefined;
 		let tempFileStream: WriteStream | undefined;
 		let totalBytes = 0;
+		let timedOut = false;
 
-		// Handle abort signal
+		// Handle abort signal and timeout
 		const abortHandler = () => {
 			killProcessTree(child.pid);
 		};
 
+		// Set up timeout if specified
+		let timeoutHandle: Timer | undefined;
+		if (options?.timeout && options.timeout > 0) {
+			timeoutHandle = setTimeout(() => {
+				timedOut = true;
+				abortHandler();
+			}, options.timeout);
+		}
+
 		if (options?.signal) {
 			if (options.signal.aborted) {
 				// Already aborted, don't even start
 				child.kill();
+				if (timeoutHandle) clearTimeout(timeoutHandle);
 				resolve({
 					output: "",
 					exitCode: undefined,
@@ -156,11 +183,11 @@ export function executeBash(command: string, options?: BashExecutorOptions): Pro
 
 				const exitCode = await child.exited;
 
-				// Clean up abort listener
+				// Clean up
+				if (timeoutHandle) clearTimeout(timeoutHandle);
 				if (options?.signal) {
 					options.signal.removeEventListener("abort", abortHandler);
 				}
-
 				if (tempFileStream) {
 					tempFileStream.end();
 				}
@@ -169,6 +196,19 @@ export function executeBash(command: string, options?: BashExecutorOptions): Pro
 				const fullOutput = outputChunks.join("");
 				const truncationResult = truncateTail(fullOutput);
 
+				// Handle timeout
+				if (timedOut) {
+					const timeoutSecs = Math.round((options?.timeout || 0) / 1000);
+					resolve({
+						output: `${fullOutput}\n\nCommand timed out after ${timeoutSecs} seconds`,
+						exitCode: undefined,
+						cancelled: true,
+						truncated: truncationResult.truncated,
+						fullOutputPath: tempFilePath,
+					});
+					return;
+				}
+
 				// Non-zero exit codes or signal-killed processes are considered cancelled if killed via signal
 				const cancelled = exitCode === null || (exitCode !== 0 && (options?.signal?.aborted ?? false));
 
@@ -180,11 +220,11 @@ export function executeBash(command: string, options?: BashExecutorOptions): Pro
 					fullOutputPath: tempFilePath,
 				});
 			} catch (err) {
-				// Clean up abort listener
+				// Clean up
+				if (timeoutHandle) clearTimeout(timeoutHandle);
 				if (options?.signal) {
 					options.signal.removeEventListener("abort", abortHandler);
 				}
-
 				if (tempFileStream) {
 					tempFileStream.end();
 				}

package/src/core/compaction/branch-summarization.ts

@@ -13,9 +13,9 @@ import {
 	createBranchSummaryMessage,
 	createCompactionSummaryMessage,
 	createHookMessage,
-} from "../messages.js";
-import type { ReadonlySessionManager, SessionEntry } from "../session-manager.js";
-import { estimateTokens } from "./compaction.js";
+} from "../messages";
+import type { ReadonlySessionManager, SessionEntry } from "../session-manager";
+import { estimateTokens } from "./compaction";
 import {
 	computeFileLists,
 	createFileOps,
@@ -24,7 +24,7 @@ import {
 	formatFileOperations,
 	SUMMARIZATION_SYSTEM_PROMPT,
 	serializeConversation,
-} from "./utils.js";
+} from "./utils";
 
 // ============================================================================
 // Types
@@ -44,7 +44,7 @@ export interface BranchSummaryDetails {
 	modifiedFiles: string[];
 }
 
-export type { FileOperations } from "./utils.js";
+export type { FileOperations } from "./utils";
 
 export interface BranchPreparation {
 	/** Messages extracted for summarization, in chronological order */

package/src/core/compaction/compaction.ts

@@ -8,8 +8,8 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { AssistantMessage, Model, Usage } from "@oh-my-pi/pi-ai";
 import { complete, completeSimple } from "@oh-my-pi/pi-ai";
-import { convertToLlm, createBranchSummaryMessage, createHookMessage } from "../messages.js";
-import type { CompactionEntry, SessionEntry } from "../session-manager.js";
+import { convertToLlm, createBranchSummaryMessage, createHookMessage } from "../messages";
+import type { CompactionEntry, SessionEntry } from "../session-manager";
 import {
 	computeFileLists,
 	createFileOps,
@@ -18,7 +18,7 @@ import {
 	formatFileOperations,
 	SUMMARIZATION_SYSTEM_PROMPT,
 	serializeConversation,
-} from "./utils.js";
+} from "./utils";
 
 // ============================================================================
 // File Operation Tracking

package/src/core/compaction/index.ts

@@ -2,6 +2,6 @@
  * Compaction and summarization utilities.
  */
 
-export * from "./branch-summarization.js";
-export * from "./compaction.js";
-export * from "./utils.js";
+export * from "./branch-summarization";
+export * from "./compaction";
+export * from "./utils";