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

package/src/core/exec.ts

@@ -3,6 +3,7 @@
  */
 
 import type { Subprocess } from "bun";
+import { logger } from "./logger";
 
 /**
  * Options for executing shell commands.
@@ -86,38 +87,47 @@ export async function execCommand(
 				const stdoutReader = (proc.stdout as ReadableStream<Uint8Array>).getReader();
 				const stderrReader = (proc.stderr as ReadableStream<Uint8Array>).getReader();
 
-				const [stdoutResult, stderrResult] = await Promise.all([
+				// Read both streams and wait for process exit
+				const [stdoutResult, stderrResult, exitCode] = await Promise.all([
 					(async () => {
 						const chunks: Uint8Array[] = [];
-						while (true) {
-							const { done, value } = await stdoutReader.read();
-							if (done) break;
-							chunks.push(value);
+						try {
+							while (true) {
+								const { done, value } = await stdoutReader.read();
+								if (done) break;
+								chunks.push(value);
+							}
+						} finally {
+							stdoutReader.releaseLock();
 						}
 						return Buffer.concat(chunks).toString();
 					})(),
 					(async () => {
 						const chunks: Uint8Array[] = [];
-						while (true) {
-							const { done, value } = await stderrReader.read();
-							if (done) break;
-							chunks.push(value);
+						try {
+							while (true) {
+								const { done, value } = await stderrReader.read();
+								if (done) break;
+								chunks.push(value);
+							}
+						} finally {
+							stderrReader.releaseLock();
 						}
 						return Buffer.concat(chunks).toString();
 					})(),
+					proc.exited,
 				]);
 
 				stdout = stdoutResult;
 				stderr = stderrResult;
 
-				const exitCode = await proc.exited;
-
 				if (timeoutId) clearTimeout(timeoutId);
 				if (options?.signal) {
 					options.signal.removeEventListener("abort", killProcess);
 				}
 				resolve({ stdout, stderr, code: exitCode ?? 0, killed });
-			} catch (_err) {
+			} catch (err) {
+				logger.debug("Process stream error", { error: String(err) });
 				if (timeoutId) clearTimeout(timeoutId);
 				if (options?.signal) {
 					options.signal.removeEventListener("abort", killProcess);

package/src/core/export-html/index.ts

@@ -1,9 +1,9 @@
+import { existsSync, readFileSync, writeFileSync } from "node:fs";
+import { basename, join } from "node:path";
 import type { AgentState } from "@oh-my-pi/pi-agent-core";
-import { existsSync, readFileSync, writeFileSync } from "fs";
-import { basename, join } from "path";
-import { APP_NAME, getExportTemplateDir } from "../../config.js";
-import { getResolvedThemeColors, getThemeExportColors } from "../../modes/interactive/theme/theme.js";
-import { SessionManager } from "../session-manager.js";
+import { APP_NAME, getExportTemplateDir } from "../../config";
+import { getResolvedThemeColors, getThemeExportColors } from "../../modes/interactive/theme/theme";
+import { SessionManager } from "../session-manager";
 
 // Cached minified assets (populated on first use)
 let cachedTemplate: string | null = null;

package/src/core/file-mentions.ts

@@ -0,0 +1,54 @@
+/**
+ * Auto-read file mentions from user prompts.
+ *
+ * When users reference files with @path syntax (e.g., "@src/foo.ts"),
+ * we automatically inject the file contents as a FileMentionMessage
+ * so the agent doesn't need to read them manually.
+ */
+
+import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
+import type { FileMentionMessage } from "./messages";
+import { createReadTool } from "./tools/read";
+
+/** Regex to match @filepath patterns in text */
+const FILE_MENTION_REGEX = /@((?:[^\s@]+\/)*[^\s@]+\.[a-zA-Z0-9]+)/g;
+
+/** Extract all @filepath mentions from text */
+export function extractFileMentions(text: string): string[] {
+	const matches = [...text.matchAll(FILE_MENTION_REGEX)];
+	return [...new Set(matches.map((m) => m[1]))];
+}
+
+/**
+ * Generate a FileMentionMessage containing the contents of mentioned files.
+ * Returns empty array if no files could be read.
+ */
+export async function generateFileMentionMessages(filePaths: string[], cwd: string): Promise<AgentMessage[]> {
+	if (filePaths.length === 0) return [];
+
+	const readTool = createReadTool(cwd);
+	const files: FileMentionMessage["files"] = [];
+
+	for (const filePath of filePaths) {
+		try {
+			const result = await readTool.execute("auto-read", { path: filePath });
+			const textContent = result.content.find((c) => c.type === "text");
+			if (textContent && textContent.type === "text") {
+				const lineCount = textContent.text.split("\n").length;
+				files.push({ path: filePath, content: textContent.text, lineCount });
+			}
+		} catch {
+			// File doesn't exist or isn't readable - skip silently
+		}
+	}
+
+	if (files.length === 0) return [];
+
+	const message: FileMentionMessage = {
+		role: "fileMention",
+		files,
+		timestamp: Date.now(),
+	};
+
+	return [message];
+}

package/src/core/hooks/index.ts

@@ -9,8 +9,8 @@ export {
 	type NavigateTreeHandler,
 	type NewSessionHandler,
 	type SendMessageHandler,
-} from "./loader.js";
-export { execCommand, HookRunner, type HookErrorListener } from "./runner.js";
-export { wrapToolsWithHooks, wrapToolWithHooks } from "./tool-wrapper.js";
-export * from "./types.js";
-export type { ReadonlySessionManager } from "../session-manager.js";
+} from "./loader";
+export { execCommand, HookRunner, type HookErrorListener } from "./runner";
+export { wrapToolsWithHooks, wrapToolWithHooks } from "./tool-wrapper";
+export * from "./types";
+export type { ReadonlySessionManager } from "../session-manager";

package/src/core/hooks/loader.ts

@@ -6,13 +6,14 @@ import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
 import * as typebox from "@sinclair/typebox";
-import { getAgentDir } from "../../config.js";
-import * as piCodingAgent from "../../index.js";
-import type { HookMessage } from "../messages.js";
-import { getAllPluginHookPaths } from "../plugins/loader.js";
-import type { SessionManager } from "../session-manager.js";
-import { execCommand } from "./runner.js";
-import type { ExecOptions, HookAPI, HookFactory, HookMessageRenderer, RegisteredCommand } from "./types.js";
+import { getAgentDir } from "../../config";
+import * as piCodingAgent from "../../index";
+import { logger } from "../logger";
+import type { HookMessage } from "../messages";
+import { getAllPluginHookPaths } from "../plugins/loader";
+import type { SessionManager } from "../session-manager";
+import { execCommand } from "./runner";
+import type { ExecOptions, HookAPI, HookFactory, HookMessageRenderer, RegisteredCommand } from "./types";
 
 /**
  * Generic handler function type.
@@ -131,12 +132,8 @@ function createHookAPI(
 	setSendMessageHandler: (handler: SendMessageHandler) => void;
 	setAppendEntryHandler: (handler: AppendEntryHandler) => void;
 } {
-	let sendMessageHandler: SendMessageHandler = () => {
-		// Default no-op until mode sets the handler
-	};
-	let appendEntryHandler: AppendEntryHandler = () => {
-		// Default no-op until mode sets the handler
-	};
+	let sendMessageHandler: SendMessageHandler | null = null;
+	let appendEntryHandler: AppendEntryHandler | null = null;
 	const messageRenderers = new Map<string, HookMessageRenderer>();
 	const commands = new Map<string, RegisteredCommand>();
 
@@ -144,14 +141,21 @@ function createHookAPI(
 	// but the interface has specific overloads for type safety in hooks
 	const api = {
 		on(event: string, handler: HandlerFn): void {
-			const list = handlers.get(event) ?? [];
-			list.push(handler);
-			handlers.set(event, list);
+			if (!handlers.has(event)) {
+				handlers.set(event, []);
+			}
+			handlers.get(event)!.push(handler);
 		},
 		sendMessage<T = unknown>(message: HookMessage<T>, triggerTurn?: boolean): void {
+			if (!sendMessageHandler) {
+				throw new Error("sendMessage handler not initialized");
+			}
 			sendMessageHandler(message, triggerTurn);
 		},
 		appendEntry<T = unknown>(customType: string, data?: T): void {
+			if (!appendEntryHandler) {
+				throw new Error("appendEntry handler not initialized");
+			}
 			appendEntryHandler(customType, data);
 		},
 		registerMessageRenderer<T = unknown>(customType: string, renderer: HookMessageRenderer<T>): void {
@@ -163,6 +167,7 @@ function createHookAPI(
 		exec(command: string, args: string[], options?: ExecOptions) {
 			return execCommand(command, args, options?.cwd ?? cwd, options);
 		},
+		logger,
 		typebox,
 		pi: piCodingAgent,
 	} as HookAPI;

package/src/core/hooks/runner.ts

@@ -4,9 +4,9 @@
 
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { Model } from "@oh-my-pi/pi-ai";
-import { theme } from "../../modes/interactive/theme/theme.js";
-import type { ModelRegistry } from "../model-registry.js";
-import type { SessionManager } from "../session-manager.js";
+import { theme } from "../../modes/interactive/theme/theme";
+import type { ModelRegistry } from "../model-registry";
+import type { SessionManager } from "../session-manager";
 import type {
 	AppendEntryHandler,
 	BranchHandler,
@@ -14,7 +14,7 @@ import type {
 	NavigateTreeHandler,
 	NewSessionHandler,
 	SendMessageHandler,
-} from "./loader.js";
+} from "./loader";
 import type {
 	BeforeAgentStartEvent,
 	BeforeAgentStartEventResult,
@@ -32,7 +32,7 @@ import type {
 	ToolCallEvent,
 	ToolCallEventResult,
 	ToolResultEventResult,
-} from "./types.js";
+} from "./types";
 
 /**
  * Listener for hook errors.
@@ -40,7 +40,7 @@ import type {
 export type HookErrorListener = (error: HookError) => void;
 
 // Re-export execCommand for backward compatibility
-export { execCommand } from "../exec.js";
+export { execCommand } from "../exec";
 
 /** No-op UI context used when no UI is available */
 const noOpUIContext: HookUIContext = {

package/src/core/hooks/tool-wrapper.ts

@@ -3,8 +3,8 @@
  */
 
 import type { AgentTool, AgentToolContext, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import type { HookRunner } from "./runner.js";
-import type { ToolCallEventResult, ToolResultEventResult } from "./types.js";
+import type { HookRunner } from "./runner";
+import type { ToolCallEventResult, ToolResultEventResult } from "./types";
 
 /**
  * Wrap a tool with hook callbacks.

package/src/core/hooks/types.ts

@@ -8,30 +8,25 @@
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Message, Model, TextContent, ToolResultMessage } from "@oh-my-pi/pi-ai";
 import type { Component, TUI } from "@oh-my-pi/pi-tui";
-import type { Theme } from "../../modes/interactive/theme/theme.js";
-import type { CompactionPreparation, CompactionResult } from "../compaction/index.js";
-import type { ExecOptions, ExecResult } from "../exec.js";
-import type { HookMessage } from "../messages.js";
-import type { ModelRegistry } from "../model-registry.js";
+import type { Theme } from "../../modes/interactive/theme/theme";
+import type { CompactionPreparation, CompactionResult } from "../compaction/index";
+import type { ExecOptions, ExecResult } from "../exec";
+import type { Logger } from "../logger";
+import type { HookMessage } from "../messages";
+import type { ModelRegistry } from "../model-registry";
 import type {
 	BranchSummaryEntry,
 	CompactionEntry,
 	ReadonlySessionManager,
 	SessionEntry,
 	SessionManager,
-} from "../session-manager.js";
+} from "../session-manager";
 
-import type { EditToolDetails } from "../tools/edit.js";
-import type {
-	BashToolDetails,
-	FindToolDetails,
-	GrepToolDetails,
-	LsToolDetails,
-	ReadToolDetails,
-} from "../tools/index.js";
+import type { EditToolDetails } from "../tools/edit";
+import type { BashToolDetails, FindToolDetails, GrepToolDetails, LsToolDetails, ReadToolDetails } from "../tools/index";
 
 // Re-export for backward compatibility
-export type { ExecOptions, ExecResult } from "../exec.js";
+export type { ExecOptions, ExecResult } from "../exec";
 
 /**
  * UI context for hooks to request interactive UI from the harness.
@@ -747,6 +742,8 @@ export interface HookAPI {
 	 */
 	exec(command: string, args: string[], options?: ExecOptions): Promise<ExecResult>;
 
+	/** File logger for error/warning/debug messages */
+	logger: Logger;
 	/** Injected @sinclair/typebox module */
 	typebox: typeof import("@sinclair/typebox");
 	/** Injected pi-coding-agent exports */

package/src/core/index.ts

@@ -10,9 +10,9 @@ export {
 	type ModelCycleResult,
 	type PromptOptions,
 	type SessionStats,
-} from "./agent-session.js";
-export { type BashExecutorOptions, type BashResult, executeBash } from "./bash-executor.js";
-export type { CompactionResult } from "./compaction/index.js";
+} from "./agent-session";
+export { type BashExecutorOptions, type BashResult, executeBash } from "./bash-executor";
+export type { CompactionResult } from "./compaction/index";
 export {
 	type CustomTool,
 	type CustomToolAPI,
@@ -24,7 +24,7 @@ export {
 	type LoadedCustomTool,
 	loadCustomTools,
 	type RenderResultOptions,
-} from "./custom-tools/index.js";
+} from "./custom-tools/index";
 export {
 	type HookAPI,
 	type HookContext,
@@ -34,7 +34,7 @@ export {
 	HookRunner,
 	type HookUIContext,
 	loadHooks,
-} from "./hooks/index.js";
+} from "./hooks/index";
 export {
 	createMCPManager,
 	discoverAndLoadMCPTools,
@@ -49,4 +49,4 @@ export {
 	type MCPToolDetails,
 	type MCPToolsLoadResult,
 	type MCPTransport,
-} from "./mcp/index.js";
+} from "./mcp/index";

package/src/core/logger.ts

@@ -0,0 +1,112 @@
+/**
+ * Centralized file logger for pi.
+ *
+ * Logs to ~/.pi/logs/ with size-based rotation, supporting concurrent pi instances.
+ * Each log entry includes process.pid for traceability.
+ */
+
+import { existsSync, mkdirSync } from "node:fs";
+import { homedir } from "node:os";
+import { join } from "node:path";
+import winston from "winston";
+import DailyRotateFile from "winston-daily-rotate-file";
+import { CONFIG_DIR_NAME } from "../config";
+
+/** Get the logs directory (~/.pi/logs/) */
+function getLogsDir(): string {
+	return join(homedir(), CONFIG_DIR_NAME, "logs");
+}
+
+/** Ensure logs directory exists */
+function ensureLogsDir(): string {
+	const logsDir = getLogsDir();
+	if (!existsSync(logsDir)) {
+		mkdirSync(logsDir, { recursive: true });
+	}
+	return logsDir;
+}
+
+/** Custom format that includes pid and flattens metadata */
+const logFormat = winston.format.combine(
+	winston.format.timestamp({ format: "YYYY-MM-DDTHH:mm:ss.SSSZ" }),
+	winston.format.printf(({ timestamp, level, message, ...meta }) => {
+		const entry: Record<string, unknown> = {
+			timestamp,
+			level,
+			pid: process.pid,
+			message,
+		};
+		// Flatten metadata into entry
+		for (const [key, value] of Object.entries(meta)) {
+			if (key !== "level" && key !== "timestamp" && key !== "message") {
+				entry[key] = value;
+			}
+		}
+		return JSON.stringify(entry);
+	}),
+);
+
+/** Size-based rotating file transport */
+const fileTransport = new DailyRotateFile({
+	dirname: ensureLogsDir(),
+	filename: "pi.%DATE%.log",
+	datePattern: "YYYY-MM-DD",
+	maxSize: "10m",
+	maxFiles: 5,
+	zippedArchive: true,
+});
+
+/** The winston logger instance */
+const winstonLogger = winston.createLogger({
+	level: "debug",
+	format: logFormat,
+	transports: [fileTransport],
+	// Don't exit on error - logging failures shouldn't crash the app
+	exitOnError: false,
+});
+
+/** Logger type exposed to plugins and internal code */
+export interface Logger {
+	error(message: string, context?: Record<string, unknown>): void;
+	warn(message: string, context?: Record<string, unknown>): void;
+	debug(message: string, context?: Record<string, unknown>): void;
+}
+
+/**
+ * Centralized logger for pi.
+ *
+ * Logs to ~/.pi/logs/pi.YYYY-MM-DD.log with size-based rotation.
+ * Safe for concurrent access from multiple pi instances.
+ *
+ * @example
+ * ```typescript
+ * import { logger } from "../core/logger";
+ *
+ * logger.error("MCP request failed", { url, method });
+ * logger.warn("Theme file invalid, using fallback", { path });
+ * logger.debug("LSP fallback triggered", { reason });
+ * ```
+ */
+export const logger: Logger = {
+	error(message: string, context?: Record<string, unknown>): void {
+		try {
+			winstonLogger.error(message, context);
+		} catch {
+			// Silently ignore logging failures
+		}
+	},
+	warn(message: string, context?: Record<string, unknown>): void {
+		try {
+			winstonLogger.warn(message, context);
+		} catch {
+			// Silently ignore logging failures
+		}
+	},
+	debug(message: string, context?: Record<string, unknown>): void {
+		try {
+			winstonLogger.debug(message, context);
+		} catch {
+			// Silently ignore logging failures
+		}
+	},
+};

package/src/core/mcp/client.ts

@@ -4,8 +4,8 @@
  * Handles connection initialization, tool listing, and tool calling.
  */
 
-import { createHttpTransport } from "./transports/http.js";
-import { createStdioTransport } from "./transports/stdio.js";
+import { createHttpTransport } from "./transports/http";
+import { createStdioTransport } from "./transports/stdio";
 import type {
 	MCPHttpServerConfig,
 	MCPInitializeParams,
@@ -20,7 +20,7 @@ import type {
 	MCPToolDefinition,
 	MCPToolsListResult,
 	MCPTransport,
-} from "./types.js";
+} from "./types";
 
 /** MCP protocol version we support */
 const PROTOCOL_VERSION = "2025-03-26";

package/src/core/mcp/config.ts

@@ -8,7 +8,7 @@
 import { existsSync, readFileSync } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
-import type { MCPConfigFile, MCPServerConfig } from "./types.js";
+import type { MCPConfigFile, MCPServerConfig } from "./types";
 
 /** Environment variable expansion pattern: ${VAR} or ${VAR:-default} */
 const ENV_VAR_PATTERN = /\$\{([^}:]+)(?::-([^}]*))?\}/g;

package/src/core/mcp/index.ts

@@ -6,10 +6,10 @@
  */
 
 // Client
-export { callTool, connectToServer, disconnectServer, listTools, serverSupportsTools } from "./client.js";
+export { callTool, connectToServer, disconnectServer, listTools, serverSupportsTools } from "./client";
 
 // Config
-export type { ExaFilterResult, LoadMCPConfigsOptions, LoadMCPConfigsResult } from "./config.js";
+export type { ExaFilterResult, LoadMCPConfigsOptions, LoadMCPConfigsResult } from "./config";
 export {
 	expandEnvVars,
 	extractExaApiKey,
@@ -20,19 +20,19 @@ export {
 	loadMCPConfigFile,
 	mergeMCPConfigs,
 	validateServerConfig,
-} from "./config.js";
+} from "./config";
 // Loader (for SDK integration)
-export type { MCPToolsLoadOptions, MCPToolsLoadResult } from "./loader.js";
-export { discoverAndLoadMCPTools } from "./loader.js";
+export type { MCPToolsLoadOptions, MCPToolsLoadResult } from "./loader";
+export { discoverAndLoadMCPTools } from "./loader";
 // Manager
-export type { MCPDiscoverOptions, MCPLoadResult } from "./manager.js";
-export { createMCPManager, MCPManager } from "./manager.js";
+export type { MCPDiscoverOptions, MCPLoadResult } from "./manager";
+export { createMCPManager, MCPManager } from "./manager";
 // Tool bridge
-export type { MCPToolDetails } from "./tool-bridge.js";
-export { createMCPTool, createMCPToolName, createMCPTools, parseMCPToolName } from "./tool-bridge.js";
+export type { MCPToolDetails } from "./tool-bridge";
+export { createMCPTool, createMCPToolName, createMCPTools, parseMCPToolName } from "./tool-bridge";
 // Transports
-export { createHttpTransport, HttpTransport } from "./transports/http.js";
-export { createStdioTransport, StdioTransport } from "./transports/stdio.js";
+export { createHttpTransport, HttpTransport } from "./transports/http";
+export { createStdioTransport, StdioTransport } from "./transports/stdio";
 // Types
 export type {
 	MCPConfigFile,
@@ -46,4 +46,4 @@ export type {
 	MCPToolDefinition,
 	MCPToolWithServer,
 	MCPTransport,
-} from "./types.js";
+} from "./types";

package/src/core/mcp/loader.ts

@@ -4,8 +4,8 @@
  * Integrates MCP tool discovery with the custom tools system.
  */
 
-import type { LoadedCustomTool } from "../custom-tools/types.js";
-import { type MCPLoadResult, MCPManager } from "./manager.js";
+import type { LoadedCustomTool } from "../custom-tools/types";
+import { type MCPLoadResult, MCPManager } from "./manager";
 
 /** Result from loading MCP tools */
 export interface MCPToolsLoadResult {

package/src/core/mcp/manager.ts

@@ -6,12 +6,12 @@
  */
 
 import type { TSchema } from "@sinclair/typebox";
-import type { CustomTool } from "../custom-tools/types.js";
-import { connectToServer, disconnectServer, listTools } from "./client.js";
-import { type LoadMCPConfigsOptions, loadAllMCPConfigs, validateServerConfig } from "./config.js";
-import type { MCPToolDetails } from "./tool-bridge.js";
-import { createMCPTools } from "./tool-bridge.js";
-import type { MCPServerConfig, MCPServerConnection } from "./types.js";
+import type { CustomTool } from "../custom-tools/types";
+import { connectToServer, disconnectServer, listTools } from "./client";
+import { type LoadMCPConfigsOptions, loadAllMCPConfigs, validateServerConfig } from "./config";
+import type { MCPToolDetails } from "./tool-bridge";
+import { createMCPTools } from "./tool-bridge";
+import type { MCPServerConfig, MCPServerConnection } from "./types";
 
 /** Result of loading MCP tools */
 export interface MCPLoadResult {

package/src/core/mcp/tool-bridge.ts

@@ -5,9 +5,9 @@
  */
 
 import type { TSchema } from "@sinclair/typebox";
-import type { CustomTool, CustomToolResult } from "../custom-tools/types.js";
-import { callTool } from "./client.js";
-import type { MCPContent, MCPServerConnection, MCPToolDefinition } from "./types.js";
+import type { CustomTool, CustomToolResult } from "../custom-tools/types";
+import { callTool } from "./client";
+import type { MCPContent, MCPServerConnection, MCPToolDefinition } from "./types";
 
 /** Details included in MCP tool results for rendering */
 export interface MCPToolDetails {

package/src/core/mcp/transports/http.ts

@@ -5,7 +5,7 @@
  * Based on MCP spec 2025-03-26.
  */
 
-import type { JsonRpcResponse, MCPHttpServerConfig, MCPSseServerConfig, MCPTransport } from "../types.js";
+import type { JsonRpcResponse, MCPHttpServerConfig, MCPSseServerConfig, MCPTransport } from "../types";
 
 /** Generate unique request ID */
 function generateId(): string {

package/src/core/mcp/transports/index.ts

@@ -2,5 +2,5 @@
  * MCP transport exports.
  */
 
-export { createHttpTransport, HttpTransport } from "./http.js";
-export { createStdioTransport, StdioTransport } from "./stdio.js";
+export { createHttpTransport, HttpTransport } from "./http";
+export { createStdioTransport, StdioTransport } from "./stdio";

package/src/core/mcp/transports/stdio.ts

@@ -6,7 +6,7 @@
  */
 
 import { type Subprocess, spawn } from "bun";
-import type { JsonRpcResponse, MCPStdioServerConfig, MCPTransport } from "../types.js";
+import type { JsonRpcResponse, MCPStdioServerConfig, MCPTransport } from "../types";
 
 /** Generate unique request ID */
 function generateId(): string {