@oh-my-pi/pi-coding-agent 6.7.670 → 6.8.0

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

@@ -3,6 +3,7 @@
  */
 
 import type { AgentTool, AgentToolContext, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
+import type { Static, TSchema } from "@sinclair/typebox";
 import type { HookRunner } from "./runner";
 import type { ToolCallEventResult, ToolResultEventResult } from "./types";
 
@@ -14,16 +15,18 @@ import type { ToolCallEventResult, ToolResultEventResult } from "./types";
  * - Emits tool_result event after execution (can modify result)
  * - Forwards onUpdate callback to wrapped tool for progress streaming
  */
-export class HookToolWrapper<T> implements AgentTool<any, T> {
+export class HookToolWrapper<TParameters extends TSchema = TSchema, TDetails = unknown>
+	implements AgentTool<TParameters, TDetails>
+{
 	name: string;
 	label: string;
 	description: string;
-	parameters: unknown;
-	renderCall?: AgentTool["renderCall"];
-	renderResult?: AgentTool["renderResult"];
+	parameters: TParameters;
+	renderCall?: AgentTool<TParameters, TDetails>["renderCall"];
+	renderResult?: AgentTool<TParameters, TDetails>["renderResult"];
 
 	constructor(
-		private tool: AgentTool<any, T>,
+		private tool: AgentTool<TParameters, TDetails>,
 		private hookRunner: HookRunner,
 	) {
 		this.name = tool.name;
@@ -36,9 +39,9 @@ export class HookToolWrapper<T> implements AgentTool<any, T> {
 
 	async execute(
 		toolCallId: string,
-		params: Record<string, unknown>,
+		params: Static<TParameters>,
 		signal?: AbortSignal,
-		onUpdate?: AgentToolUpdateCallback<T>,
+		onUpdate?: AgentToolUpdateCallback<TDetails, TParameters>,
 		context?: AgentToolContext,
 	) {
 		// Emit tool_call event - hooks can block execution
@@ -49,7 +52,7 @@ export class HookToolWrapper<T> implements AgentTool<any, T> {
 					type: "tool_call",
 					toolName: this.tool.name,
 					toolCallId,
-					input: params,
+					input: params as Record<string, unknown>,
 				})) as ToolCallEventResult | undefined;
 
 				if (callResult?.block) {
@@ -75,7 +78,7 @@ export class HookToolWrapper<T> implements AgentTool<any, T> {
 					type: "tool_result",
 					toolName: this.tool.name,
 					toolCallId,
-					input: params,
+					input: params as Record<string, unknown>,
 					content: result.content,
 					details: result.details,
 					isError: false,
@@ -85,7 +88,7 @@ export class HookToolWrapper<T> implements AgentTool<any, T> {
 				if (resultResult) {
 					return {
 						content: resultResult.content ?? result.content,
-						details: (resultResult.details ?? result.details) as T,
+						details: (resultResult.details ?? result.details) as TDetails,
 					};
 				}
 			}
@@ -98,7 +101,7 @@ export class HookToolWrapper<T> implements AgentTool<any, T> {
 					type: "tool_result",
 					toolName: this.tool.name,
 					toolCallId,
-					input: params,
+					input: params as Record<string, unknown>,
 					content: [{ type: "text", text: err instanceof Error ? err.message : String(err) }],
 					details: undefined,
 					isError: true,
@@ -108,18 +111,3 @@ export class HookToolWrapper<T> implements AgentTool<any, T> {
 		}
 	}
 }
-
-/**
- * Wrap all tools with hook callbacks.
- */
-export function wrapToolsWithHooks<T>(tools: AgentTool<any, T>[], hookRunner: HookRunner): AgentTool<any, T>[] {
-	return tools.map((tool) => new HookToolWrapper(tool, hookRunner));
-}
-
-/**
- * Backward compatibility alias - use HookToolWrapper directly.
- * @deprecated Use HookToolWrapper class instead
- */
-export function wrapToolWithHooks<T>(tool: AgentTool<any, T>, hookRunner: HookRunner): AgentTool<any, T> {
-	return new HookToolWrapper(tool, hookRunner);
-}

package/src/core/hooks/types.ts

@@ -11,7 +11,6 @@ import type { Component, TUI } from "@oh-my-pi/pi-tui";
 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 {
@@ -742,7 +741,7 @@ export interface HookAPI {
 	exec(command: string, args: string[], options?: ExecOptions): Promise<ExecResult>;
 
 	/** File logger for error/warning/debug messages */
-	logger: Logger;
+	logger: typeof import("@oh-my-pi/pi-utils").logger;
 	/** Injected @sinclair/typebox module */
 	typebox: typeof import("@sinclair/typebox");
 	/** Injected pi-coding-agent exports */

package/src/core/keybindings.ts

@@ -9,8 +9,8 @@ import {
 	matchesKey,
 	setEditorKeybindings,
 } from "@oh-my-pi/pi-tui";
+import { logger } from "@oh-my-pi/pi-utils";
 import { getAgentDir } from "../config";
-import { logger } from "./logger";
 
 /**
  * Application-level actions (coding agent specific).

package/src/core/mcp/client.ts

@@ -36,19 +36,19 @@ const CLIENT_INFO = {
 
 /** Wrap a promise with a timeout */
 function withTimeout<T>(promise: Promise<T>, ms: number, message: string): Promise<T> {
-	return new Promise((resolve, reject) => {
-		const timer = setTimeout(() => reject(new Error(message)), ms);
-		promise.then(
-			(value) => {
-				clearTimeout(timer);
-				resolve(value);
-			},
-			(error) => {
-				clearTimeout(timer);
-				reject(error);
-			},
-		);
-	});
+	const { promise: wrapped, resolve, reject } = Promise.withResolvers<T>();
+	const timer = setTimeout(() => reject(new Error(message)), ms);
+	promise.then(
+		(value) => {
+			clearTimeout(timer);
+			resolve(value);
+		},
+		(error) => {
+			clearTimeout(timer);
+			reject(error);
+		},
+	);
+	return wrapped;
 }
 
 /**

package/src/core/mcp/json-rpc.ts

@@ -5,7 +5,7 @@
  * without maintaining persistent connections.
  */
 
-import { logger } from "../logger";
+import { logger } from "@oh-my-pi/pi-utils";
 
 /** Parse SSE response format (lines starting with "data: ") */
 export function parseSSE(text: string): unknown {

package/src/core/mcp/loader.ts

@@ -4,9 +4,9 @@
  * Integrates MCP tool discovery with the custom tools system.
  */
 
+import { logger } from "@oh-my-pi/pi-utils";
 import { AgentStorage } from "../agent-storage";
 import type { LoadedCustomTool } from "../custom-tools/types";
-import { logger } from "../logger";
 import { type MCPLoadResult, MCPManager } from "./manager";
 import { parseMCPToolName } from "./tool-bridge";
 import { MCPToolCache } from "./tool-cache";

package/src/core/mcp/manager.ts

@@ -5,9 +5,9 @@
  * Handles tool loading and lifecycle.
  */
 
+import { logger } from "@oh-my-pi/pi-utils";
 import type { TSchema } from "@sinclair/typebox";
 import type { CustomTool } from "../custom-tools/types";
-import { logger } from "../logger";
 import { connectToServer, disconnectServer, listTools } from "./client";
 import { loadAllMCPConfigs, validateServerConfig } from "./config";
 import type { MCPToolDetails } from "./tool-bridge";
@@ -47,7 +47,7 @@ function trackPromise<T>(promise: Promise<T>): TrackedPromise<T> {
 }
 
 function delay(ms: number): Promise<void> {
-	return new Promise((resolve) => setTimeout(resolve, ms));
+	return Bun.sleep(ms);
 }
 
 /** Result of loading MCP tools */

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

@@ -4,8 +4,8 @@
  * Stores tool definitions per server in agent.db for fast startup.
  */
 
+import { logger } from "@oh-my-pi/pi-utils";
 import type { AgentStorage } from "../agent-storage";
-import { logger } from "../logger";
 import type { MCPServerConfig, MCPToolDefinition } from "./types";
 
 const CACHE_VERSION = 1;

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

@@ -12,19 +12,7 @@ function generateId(): string {
 	return Math.random().toString(36).slice(2) + Date.now().toString(36);
 }
 
-/** Parse SSE data line */
-function parseSSELine(line: string): { event?: string; data?: string; id?: string } | null {
-	if (line.startsWith("data:")) {
-		return { data: line.slice(5).trim() };
-	}
-	if (line.startsWith("event:")) {
-		return { event: line.slice(6).trim() };
-	}
-	if (line.startsWith("id:")) {
-		return { id: line.slice(3).trim() };
-	}
-	return null;
-}
+import { readSseEvents } from "@oh-my-pi/pi-utils";
 
 /**
  * HTTP transport for MCP servers.
@@ -95,30 +83,17 @@ export class HttpTransport implements MCPTransport {
 			}
 
 			// Read SSE stream
-			const reader = response.body.getReader();
-			const decoder = new TextDecoder();
-			let buffer = "";
-
-			while (this._connected) {
-				const { done, value } = await reader.read();
-				if (done) break;
-
-				buffer += decoder.decode(value, { stream: true });
-				const lines = buffer.split("\n");
-				buffer = lines.pop() ?? "";
-
-				for (const line of lines) {
-					const parsed = parseSSELine(line);
-					if (parsed?.data && parsed.data !== "[DONE]") {
-						try {
-							const message = JSON.parse(parsed.data);
-							if ("method" in message && !("id" in message)) {
-								this.onNotification?.(message.method, message.params);
-							}
-						} catch {
-							// Ignore parse errors
-						}
+			for await (const event of readSseEvents(response.body)) {
+				if (!this._connected) break;
+				const data = event.data?.trim();
+				if (!data || data === "[DONE]") continue;
+				try {
+					const message = JSON.parse(data);
+					if ("method" in message && !("id" in message)) {
+						this.onNotification?.(message.method, message.params);
 					}
+				} catch {
+					// Ignore parse errors
 				}
 			}
 		} catch (error) {
@@ -192,44 +167,31 @@ export class HttpTransport implements MCPTransport {
 			throw new Error("No response body");
 		}
 
-		const reader = response.body.getReader();
-		const decoder = new TextDecoder();
-		let buffer = "";
 		let result: T | undefined;
 
-		while (true) {
-			const { done, value } = await reader.read();
-			if (done) break;
-
-			buffer += decoder.decode(value, { stream: true });
-			const lines = buffer.split("\n");
-			buffer = lines.pop() ?? "";
-
-			for (const line of lines) {
-				const parsed = parseSSELine(line);
-				if (parsed?.data && parsed.data !== "[DONE]") {
-					try {
-						const message = JSON.parse(parsed.data) as JsonRpcResponse;
-
-						// Handle our response
-						if ("id" in message && message.id === expectedId) {
-							if (message.error) {
-								throw new Error(`MCP error ${message.error.code}: ${message.error.message}`);
-							}
-							result = message.result as T;
-						}
-						// Handle notifications
-						else if ("method" in message && !("id" in message)) {
-							const notification = message as { method: string; params?: unknown };
-							this.onNotification?.(notification.method, notification.params);
-						}
-					} catch (error) {
-						if (error instanceof Error && error.message.startsWith("MCP error")) {
-							throw error;
-						}
-						// Ignore other parse errors
+		for await (const event of readSseEvents(response.body)) {
+			const data = event.data?.trim();
+			if (!data || data === "[DONE]") continue;
+			try {
+				const message = JSON.parse(data) as JsonRpcResponse;
+
+				// Handle our response
+				if ("id" in message && message.id === expectedId) {
+					if (message.error) {
+						throw new Error(`MCP error ${message.error.code}: ${message.error.message}`);
 					}
+					result = message.result as T;
+				}
+				// Handle notifications
+				else if ("method" in message && !("id" in message)) {
+					const notification = message as { method: string; params?: unknown };
+					this.onNotification?.(notification.method, notification.params);
+				}
+			} catch (error) {
+				if (error instanceof Error && error.message.startsWith("MCP error")) {
+					throw error;
 				}
+				// Ignore other parse errors
 			}
 		}
 

package/src/core/model-registry.ts

@@ -11,10 +11,10 @@ import {
 	type Model,
 	normalizeDomain,
 } from "@oh-my-pi/pi-ai";
+import { logger } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import AjvModule from "ajv";
 import type { AuthStorage } from "./auth-storage";
-import { logger } from "./logger";
 
 const Ajv = (AjvModule as any).default || AjvModule;
 

package/src/core/plugins/installer.ts

@@ -38,8 +38,9 @@ export async function installPlugin(packageName: string): Promise<InstalledPlugi
 
 	// Initialize package.json if it doesn't exist
 	const pkgJsonPath = join(PLUGINS_DIR, "package.json");
-	if (!(await Bun.file(pkgJsonPath).exists())) {
-		await Bun.write(pkgJsonPath, JSON.stringify({ name: "omp-plugins", private: true, dependencies: {} }, null, 2));
+	const pkgJson = Bun.file(pkgJsonPath);
+	if (!(await pkgJson.exists())) {
+		await pkgJson.write(JSON.stringify({ name: "omp-plugins", private: true, dependencies: {} }, null, 2));
 	}
 
 	// Run npm install in plugins directory
@@ -98,24 +99,25 @@ export async function uninstallPlugin(name: string): Promise<void> {
 }
 
 export async function listPlugins(): Promise<InstalledPlugin[]> {
-	const pkgJsonPath = join(PLUGINS_DIR, "package.json");
-	if (!(await Bun.file(pkgJsonPath).exists())) {
+	const pkgJsonPath = Bun.file(join(PLUGINS_DIR, "package.json"));
+	if (!(await pkgJsonPath.exists())) {
 		return [];
 	}
 
-	const pkg = await Bun.file(pkgJsonPath).json();
+	const pkg = await pkgJsonPath.json();
 	const deps = pkg.dependencies || {};
 
 	const plugins: InstalledPlugin[] = [];
 	for (const [name, _version] of Object.entries(deps)) {
-		const pluginPkgPath = join(PLUGINS_DIR, "node_modules", name, "package.json");
-		if (await Bun.file(pluginPkgPath).exists()) {
-			const pluginPkg = await Bun.file(pluginPkgPath).json();
+		const path = join(PLUGINS_DIR, "node_modules", name);
+		const fpkg = Bun.file(join(path, "package.json"));
+		if (await fpkg.exists()) {
+			const pkg = await fpkg.json();
 			plugins.push({
 				name,
-				version: pluginPkg.version,
-				path: join(PLUGINS_DIR, "node_modules", name),
-				manifest: pluginPkg.omp || pluginPkg.pi || { version: pluginPkg.version },
+				version: pkg.version,
+				path,
+				manifest: pkg.omp || pkg.pi || { version: pkg.version },
 				enabledFeatures: null,
 				enabled: true,
 			});

package/src/core/prompt-templates.ts

@@ -1,8 +1,8 @@
 import { join, resolve } from "node:path";
+import { logger } from "@oh-my-pi/pi-utils";
 import Handlebars from "handlebars";
 import { CONFIG_DIR_NAME, getPromptsDir } from "../config";
 import { parseFrontmatter } from "./frontmatter";
-import { logger } from "./logger";
 
 /**
  * Represents a prompt template loaded from a markdown file
@@ -371,14 +371,6 @@ async function loadTemplatesFromDir(
 	subdir: string = "",
 ): Promise<PromptTemplate[]> {
 	const templates: PromptTemplate[] = [];
-
-	try {
-		const stat = await Bun.file(`${dir}/.`).exists();
-		if (!stat) return templates;
-	} catch {
-		return templates;
-	}
-
 	try {
 		const glob = new Bun.Glob("**/*");
 		const entries = [];
@@ -440,6 +432,9 @@ async function loadTemplatesFromDir(
 			}
 		}
 	} catch (error) {
+		if (!Bun.file(dir).exists()) {
+			return [];
+		}
 		logger.warn("Failed to scan prompt templates directory", { dir, error: String(error) });
 	}
 

package/src/core/python-executor.ts

@@ -1,4 +1,4 @@
-import { logger } from "./logger";
+import { logger, sanitizeText } from "@oh-my-pi/pi-utils";
 import {
 	checkPythonKernelAvailability,
 	type KernelDisplayOutput,
@@ -7,9 +7,7 @@ import {
 	type PreludeHelper,
 	PythonKernel,
 } from "./python-kernel";
-import { OutputSink, sanitizeText } from "./streaming-output";
-import { DEFAULT_MAX_BYTES } from "./tools/truncate";
-
+import { OutputSink } from "./streaming-output";
 export type PythonKernelMode = "session" | "per-call";
 
 export interface PythonExecutorOptions {
@@ -212,21 +210,30 @@ async function executeWithKernel(
 	code: string,
 	options: PythonExecutorOptions | undefined,
 ): Promise<PythonResult> {
-	const sink = new OutputSink(DEFAULT_MAX_BYTES, DEFAULT_MAX_BYTES * 2, options?.onChunk);
-	const writer = sink.getWriter();
+	const sink = new OutputSink({ onLine: options?.onChunk });
 	const displayOutputs: KernelDisplayOutput[] = [];
 
 	try {
-		const result = await kernel.execute(code, {
-			signal: options?.signal,
-			timeoutMs: options?.timeout,
-			onChunk: async (text) => {
-				await writer.write(sanitizeText(text));
-			},
-			onDisplay: async (output) => {
-				displayOutputs.push(output);
-			},
-		});
+		const writable = sink.createStringWritable();
+		const writer = writable.getWriter();
+		let result: KernelExecuteResult;
+		try {
+			result = await kernel.execute(code, {
+				signal: options?.signal,
+				timeoutMs: options?.timeout,
+				onChunk: (text) => {
+					writer.write(sanitizeText(text));
+				},
+				onDisplay: (output) => {
+					displayOutputs.push(output);
+				},
+			});
+		} catch (err) {
+			await writer.abort(err);
+			throw err;
+		} finally {
+			await writer.close().catch(() => {});
+		}
 
 		if (result.cancelled) {
 			const secs = options?.timeout ? Math.round(options.timeout / 1000) : undefined;
@@ -263,8 +270,6 @@ async function executeWithKernel(
 		const error = err instanceof Error ? err : new Error(String(err));
 		logger.error("Python execution failed", { error: error.message });
 		throw error;
-	} finally {
-		await writer.close();
 	}
 }
 

package/src/core/python-gateway-coordinator.ts

@@ -13,11 +13,11 @@ import {
 } from "node:fs";
 import { createServer } from "node:net";
 import { delimiter, join } from "node:path";
+import { logger } from "@oh-my-pi/pi-utils";
 import type { Subprocess } from "bun";
 import { getAgentDir } from "../config";
 import { getShellConfig, killProcessTree } from "../utils/shell";
 import { getOrCreateSnapshot } from "../utils/shell-snapshot";
-import { logger } from "./logger";
 
 const GATEWAY_DIR_NAME = "python-gateway";
 const GATEWAY_INFO_FILE = "gateway.json";
@@ -213,27 +213,28 @@ async function resolvePythonRuntime(cwd: string, baseEnv: Record<string, string
 }
 
 async function allocatePort(): Promise<number> {
-	return await new Promise((resolve, reject) => {
-		const server = createServer();
-		server.unref();
-		server.on("error", reject);
-		server.listen(0, "127.0.0.1", () => {
-			const address = server.address();
-			if (address && typeof address === "object") {
-				const port = address.port;
-				server.close((err: Error | null | undefined) => {
-					if (err) {
-						reject(err);
-					} else {
-						resolve(port);
-					}
-				});
-			} else {
-				server.close();
-				reject(new Error("Failed to allocate port"));
-			}
-		});
+	const { promise, resolve, reject } = Promise.withResolvers<number>();
+	const server = createServer();
+	server.unref();
+	server.on("error", reject);
+	server.listen(0, "127.0.0.1", () => {
+		const address = server.address();
+		if (address && typeof address === "object") {
+			const port = address.port;
+			server.close((err: Error | null | undefined) => {
+				if (err) {
+					reject(err);
+				} else {
+					resolve(port);
+				}
+			});
+		} else {
+			server.close();
+			reject(new Error("Failed to allocate port"));
+		}
 	});
+
+	return promise;
 }
 
 function getGatewayDir(): string {
@@ -587,7 +588,7 @@ async function startGatewayProcess(
 		await Bun.sleep(100);
 	}
 
-	killProcessTree(gatewayProcess.pid);
+	await killProcessTree(gatewayProcess.pid);
 	throw new Error("Gateway startup timeout");
 }
 
@@ -613,10 +614,10 @@ function scheduleIdleShutdown(): void {
 				}
 				logger.debug("Shutting down idle shared gateway", { pid: info.pid });
 				if (localGatewayProcess) {
-					shutdownLocalGateway();
+					await shutdownLocalGateway();
 				} else if (isPidRunning(info.pid)) {
 					try {
-						killProcessTree(info.pid);
+						await killProcessTree(info.pid);
 					} catch (err) {
 						logger.warn("Failed to kill idle shared gateway", {
 							error: err instanceof Error ? err.message : String(err),
@@ -644,10 +645,10 @@ function cancelIdleShutdown(): void {
 	}
 }
 
-function shutdownLocalGateway(): void {
+async function shutdownLocalGateway(): Promise<void> {
 	if (localGatewayProcess) {
 		try {
-			killProcessTree(localGatewayProcess.pid);
+			await killProcessTree(localGatewayProcess.pid);
 		} catch (err) {
 			logger.warn("Failed to kill shared gateway process", {
 				error: err instanceof Error ? err.message : String(err),
@@ -701,7 +702,7 @@ export async function acquireSharedGateway(cwd: string): Promise<AcquireResult |
 				logger.debug("Cleaning up stale gateway info", { pid: existingInfo.pid });
 				if (isPidRunning(existingInfo.pid)) {
 					try {
-						killProcessTree(existingInfo.pid);
+						await killProcessTree(existingInfo.pid);
 					} catch (err) {
 						logger.warn("Failed to kill stale shared gateway process", {
 							error: err instanceof Error ? err.message : String(err),
@@ -826,7 +827,7 @@ export async function shutdownSharedGateway(): Promise<void> {
 			error: err instanceof Error ? err.message : String(err),
 		});
 	} finally {
-		shutdownLocalGateway();
+		await shutdownLocalGateway();
 		isCoordinatorInitialized = false;
 	}
 }