@oh-my-pi/pi-coding-agent 8.0.20 → 8.2.0

package/src/discovery/mcp-json.ts

@@ -6,12 +6,11 @@
  *
  * Priority: 5 (low, as this is a fallback after tool-specific providers)
  */
-
-import { join } from "node:path";
-import { readFile } from "@oh-my-pi/pi-coding-agent/capability/fs";
-import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability/index";
-import { type MCPServer, mcpCapability } from "@oh-my-pi/pi-coding-agent/capability/mcp";
-import type { LoadContext, LoadResult, SourceMeta } from "@oh-my-pi/pi-coding-agent/capability/types";
+import * as path from "node:path";
+import { registerProvider } from "../capability";
+import { readFile } from "../capability/fs";
+import { type MCPServer, mcpCapability } from "../capability/mcp";
+import type { LoadContext, LoadResult, SourceMeta } from "../capability/types";
 import { createSourceMeta, expandEnvVarsDeep, parseJSON } from "./helpers";
 
 const PROVIDER_ID = "mcp-json";
@@ -102,11 +101,11 @@ async function loadMCPJsonFile(
 async function load(ctx: LoadContext): Promise<LoadResult<MCPServer>> {
 	const filenames = ["mcp.json", ".mcp.json"];
 	const results = await Promise.all(
-		filenames.map((filename) => loadMCPJsonFile(ctx, join(ctx.cwd, filename), "project")),
+		filenames.map(filename => loadMCPJsonFile(ctx, path.join(ctx.cwd, filename), "project")),
 	);
 
-	const allItems = results.flatMap((r) => r.items);
-	const allWarnings = results.flatMap((r) => r.warnings ?? []);
+	const allItems = results.flatMap(r => r.items);
+	const allWarnings = results.flatMap(r => r.warnings ?? []);
 
 	return {
 		items: allItems,

package/src/discovery/ssh.ts

@@ -4,12 +4,11 @@
  * Discovers SSH hosts from ssh.json or .ssh.json in the project root.
  * Priority: 5 (low, project-level only)
  */
-
-import { join } from "node:path";
-import { readFile } from "@oh-my-pi/pi-coding-agent/capability/fs";
-import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability/index";
-import { type SSHHost, sshCapability } from "@oh-my-pi/pi-coding-agent/capability/ssh";
-import type { LoadContext, LoadResult, SourceMeta } from "@oh-my-pi/pi-coding-agent/capability/types";
+import * as path from "node:path";
+import { registerProvider } from "../capability";
+import { readFile } from "../capability/fs";
+import { type SSHHost, sshCapability } from "../capability/ssh";
+import type { LoadContext, LoadResult, SourceMeta } from "../capability/types";
 import { createSourceMeta, expandEnvVarsDeep, parseJSON } from "./helpers";
 
 const PROVIDER_ID = "ssh-json";
@@ -134,10 +133,10 @@ async function loadSshJsonFile(_ctx: LoadContext, path: string): Promise<LoadRes
 
 async function load(ctx: LoadContext): Promise<LoadResult<SSHHost>> {
 	const filenames = ["ssh.json", ".ssh.json"];
-	const results = await Promise.all(filenames.map((filename) => loadSshJsonFile(ctx, join(ctx.cwd, filename))));
+	const results = await Promise.all(filenames.map(filename => loadSshJsonFile(ctx, path.join(ctx.cwd, filename))));
 
-	const allItems = results.flatMap((r) => r.items);
-	const allWarnings = results.flatMap((r) => r.warnings ?? []);
+	const allItems = results.flatMap(r => r.items);
+	const allWarnings = results.flatMap(r => r.warnings ?? []);
 
 	return {
 		items: allItems,

package/src/discovery/vscode.ts

@@ -4,11 +4,10 @@
  * Loads config from `.vscode` directory (project-only).
  * Supports MCP server discovery from `mcp.json` with nested `mcp.servers` structure.
  */
-
-import { readFile } from "@oh-my-pi/pi-coding-agent/capability/fs";
-import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability/index";
-import { type MCPServer, mcpCapability } from "@oh-my-pi/pi-coding-agent/capability/mcp";
-import type { LoadContext, LoadResult } from "@oh-my-pi/pi-coding-agent/capability/types";
+import { registerProvider } from "../capability";
+import { readFile } from "../capability/fs";
+import { type MCPServer, mcpCapability } from "../capability/mcp";
+import type { LoadContext, LoadResult } from "../capability/types";
 import { createSourceMeta, expandEnvVarsDeep, getProjectPath, parseJSON } from "./helpers";
 
 const PROVIDER_ID = "vscode";

package/src/discovery/windsurf.ts

@@ -10,13 +10,12 @@
  * - Rules from .windsurf/rules/*.md and ~/.codeium/windsurf/memories/global_rules.md
  * - Legacy .windsurfrules file
  */
-
-import { readFile } from "@oh-my-pi/pi-coding-agent/capability/fs";
-import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability/index";
-import { type MCPServer, mcpCapability } from "@oh-my-pi/pi-coding-agent/capability/mcp";
-import { type Rule, ruleCapability } from "@oh-my-pi/pi-coding-agent/capability/rule";
-import type { LoadContext, LoadResult } from "@oh-my-pi/pi-coding-agent/capability/types";
-import { parseFrontmatter } from "@oh-my-pi/pi-coding-agent/utils/frontmatter";
+import { registerProvider } from "../capability";
+import { readFile } from "../capability/fs";
+import { type MCPServer, mcpCapability } from "../capability/mcp";
+import { type Rule, ruleCapability } from "../capability/rule";
+import type { LoadContext, LoadResult } from "../capability/types";
+import { parseFrontmatter } from "../utils/frontmatter";
 import {
 	createSourceMeta,
 	expandEnvVarsDeep,

package/src/exa/company.ts

@@ -3,9 +3,8 @@
  *
  * Research companies using Exa's comprehensive data sources.
  */
-
-import type { CustomTool } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
 import { Type } from "@sinclair/typebox";
+import type { CustomTool } from "../extensibility/custom-tools/types";
 import { callExaTool, findApiKey, formatSearchResults, isSearchResponse } from "./mcp-client";
 import type { ExaRenderDetails } from "./types";
 

package/src/exa/index.ts

@@ -8,9 +8,8 @@
  * - 2 researcher tools (start, poll)
  * - 14 websets tools (CRUD, items, search, enrichment, monitor)
  */
-
-import type { ExaSettings } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import type { CustomTool } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
+import type { ExaSettings } from "../config/settings-manager";
+import type { CustomTool } from "../extensibility/custom-tools/types";
 import { companyTool } from "./company";
 import { linkedinTool } from "./linkedin";
 import { researcherTools } from "./researcher";

package/src/exa/linkedin.ts

@@ -3,9 +3,8 @@
  *
  * Search LinkedIn for people, companies, and professional content.
  */
-
-import type { CustomTool } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
 import { Type } from "@sinclair/typebox";
+import type { CustomTool } from "../extensibility/custom-tools/types";
 import { callExaTool, findApiKey, formatSearchResults, isSearchResponse } from "./mcp-client";
 import type { ExaRenderDetails } from "./types";
 

package/src/exa/mcp-client.ts

@@ -3,13 +3,11 @@
  *
  * Client for interacting with Exa MCP servers.
  */
-
-import { existsSync, readFileSync } from "node:fs";
-import { homedir } from "node:os";
-import type { CustomTool, CustomToolResult } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import { callMCP } from "@oh-my-pi/pi-coding-agent/mcp/json-rpc";
-import { logger } from "@oh-my-pi/pi-utils";
+import * as os from "node:os";
+import { isEnoent, logger } from "@oh-my-pi/pi-utils";
 import type { TSchema } from "@sinclair/typebox";
+import type { CustomTool, CustomToolResult } from "../extensibility/custom-tools/types";
+import { callMCP } from "../mcp/json-rpc";
 import type {
 	ExaRenderDetails,
 	ExaSearchResponse,
@@ -29,20 +27,20 @@ export async function findApiKey(): Promise<string | null> {
 
 	// Try loading from .env files in cwd and home
 	const cwd = process.cwd();
-	const home = homedir();
+	const home = os.homedir();
 
 	for (const dir of [cwd, home]) {
 		const envPath = `${dir}/.env`;
 		try {
-			if (existsSync(envPath)) {
-				const content = readFileSync(envPath, "utf-8");
-				const match = content.match(/^EXA_API_KEY=(.+)$/m);
-				if (match?.[1]) {
-					return match[1].trim().replace(/^["']|["']$/g, "");
-				}
+			const content = await Bun.file(envPath).text();
+			const match = content.match(/^EXA_API_KEY=(.+)$/m);
+			if (match?.[1]) {
+				return match[1].trim().replace(/^["']|["']$/g, "");
+			}
+		} catch (err) {
+			if (!isEnoent(err)) {
+				logger.debug("Error reading .env file", { path: envPath, error: String(err) });
 			}
-		} catch {
-			// Ignore read errors
 		}
 	}
 
@@ -231,7 +229,7 @@ export async function fetchMCPToolSchema(
 
 	try {
 		const tools = isWebsetsTool ? await fetchWebsetsTools(apiKey) : await fetchExaTools(apiKey, [mcpToolName]);
-		const tool = tools.find((t) => t.name === mcpToolName);
+		const tool = tools.find(t => t.name === mcpToolName);
 		if (tool) {
 			mcpSchemaCache.set(cacheKey, tool);
 			return tool;

package/src/exa/render.ts

@@ -3,9 +3,11 @@
  *
  * Tree-based rendering with collapsed/expanded states for Exa search results.
  */
-
-import type { RenderResultOptions } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import type { Component } from "@oh-my-pi/pi-tui";
+import { Text } from "@oh-my-pi/pi-tui";
+import { logger } from "@oh-my-pi/pi-utils";
+import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import type { Theme } from "../modes/theme/theme";
 import {
 	formatCount,
 	formatExpandHint,
@@ -16,10 +18,7 @@ import {
 	PREVIEW_LIMITS,
 	TRUNCATE_LENGTHS,
 	truncate,
-} from "@oh-my-pi/pi-coding-agent/tools/render-utils";
-import type { Component } from "@oh-my-pi/pi-tui";
-import { Text } from "@oh-my-pi/pi-tui";
-import { logger } from "@oh-my-pi/pi-utils";
+} from "../tools/render-utils";
 import type { ExaRenderDetails } from "./types";
 
 const COLLAPSED_PREVIEW_LINES = PREVIEW_LIMITS.COLLAPSED_LINES;
@@ -60,7 +59,7 @@ export function renderExaResult(
 	if (!response) {
 		if (details?.raw) {
 			const rawText = typeof details.raw === "string" ? details.raw : JSON.stringify(details.raw, null, 2);
-			const rawLines = rawText.split("\n").filter((l) => l.trim());
+			const rawLines = rawText.split("\n").filter(l => l.trim());
 			const maxLines = expanded ? rawLines.length : Math.min(rawLines.length, COLLAPSED_PREVIEW_LINES);
 			const displayLines = rawLines.slice(0, maxLines);
 			const remaining = rawLines.length - maxLines;
@@ -104,7 +103,7 @@ export function renderExaResult(
 	let hasMorePreview = false;
 	if (!expanded && resultCount > 0) {
 		const previewText = results[0].text ?? results[0].title ?? "";
-		const totalLines = previewText.split("\n").filter((l) => l.trim()).length;
+		const totalLines = previewText.split("\n").filter(l => l.trim()).length;
 		hasMorePreview = totalLines > COLLAPSED_PREVIEW_LINES || resultCount > 1;
 	}
 	const expandHint = formatExpandHint(uiTheme, expanded, hasMorePreview);
@@ -123,7 +122,7 @@ export function renderExaResult(
 			? getPreviewLines(previewText, COLLAPSED_PREVIEW_LINES, COLLAPSED_PREVIEW_LINE_LEN, uiTheme.format.ellipsis)
 			: [];
 		const safePreviewLines = previewLines.length > 0 ? previewLines : ["No preview text"];
-		const totalLines = previewText.split("\n").filter((l) => l.trim()).length;
+		const totalLines = previewText.split("\n").filter(l => l.trim()).length;
 		const remainingLines = Math.max(0, totalLines - previewLines.length);
 		const extraItems: string[] = [];
 		if (remainingLines > 0) {
@@ -189,7 +188,7 @@ export function renderExaResult(
 		}
 
 		if (res.text) {
-			const textLines = res.text.split("\n").filter((l) => l.trim());
+			const textLines = res.text.split("\n").filter(l => l.trim());
 			const displayLines = textLines.slice(0, EXPANDED_TEXT_LINES);
 			for (const line of displayLines) {
 				text += `\n ${uiTheme.fg("dim", cont)} ${uiTheme.fg("dim", uiTheme.tree.hook)} ${uiTheme.fg(

package/src/exa/researcher.ts

@@ -3,9 +3,8 @@
  *
  * Async research tasks with polling for completion.
  */
-
-import type { CustomTool } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
 import { Type } from "@sinclair/typebox";
+import type { CustomTool } from "../extensibility/custom-tools/types";
 import { callExaTool, findApiKey } from "./mcp-client";
 import type { ExaRenderDetails } from "./types";
 

package/src/exa/search.ts

@@ -3,10 +3,9 @@
  *
  * Basic neural/keyword search, deep research, code search, and URL crawling.
  */
-
 import { StringEnum } from "@oh-my-pi/pi-ai";
-import type { CustomTool } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
 import { Type } from "@sinclair/typebox";
+import type { CustomTool } from "../extensibility/custom-tools/types";
 import { callExaTool, findApiKey, formatSearchResults, isSearchResponse } from "./mcp-client";
 import type { ExaRenderDetails } from "./types";
 

package/src/exa/types.ts

@@ -3,7 +3,6 @@
  *
  * Types for the Exa MCP client and tool implementations.
  */
-
 import type { TSchema } from "@sinclair/typebox";
 
 /** MCP endpoint URLs */

package/src/exa/websets.ts

@@ -3,9 +3,8 @@
  *
  * CRUD operations for websets, items, searches, enrichments, and monitoring.
  */
-
-import type { CustomTool } from "@oh-my-pi/pi-coding-agent/extensibility/custom-tools/types";
 import { Type } from "@sinclair/typebox";
+import type { CustomTool } from "../extensibility/custom-tools/types";
 import { callWebsetsTool, findApiKey } from "./mcp-client";
 import type { ExaRenderDetails } from "./types";
 

package/src/exec/bash-executor.ts

@@ -3,11 +3,10 @@
  *
  * Provides unified bash execution for AgentSession.executeBash() and direct calls.
  */
-
-import { OutputSink } from "@oh-my-pi/pi-coding-agent/session/streaming-output";
-import { getShellConfig } from "@oh-my-pi/pi-coding-agent/utils/shell";
-import { getOrCreateSnapshot, getSnapshotSourceCommand } from "@oh-my-pi/pi-coding-agent/utils/shell-snapshot";
 import { cspawn, Exception, ptree } from "@oh-my-pi/pi-utils";
+import { OutputSink } from "../session/streaming-output";
+import { getShellConfig } from "../utils/shell";
+import { getOrCreateSnapshot, getSnapshotSourceCommand } from "../utils/shell-snapshot";
 
 export interface BashExecutorOptions {
 	cwd?: string;

package/src/exec/exec.ts

@@ -1,7 +1,6 @@
 /**
  * Shared command execution utilities for hooks and custom tools.
  */
-
 import { ptree } from "@oh-my-pi/pi-utils";
 
 /**

package/src/export/custom-share.ts

@@ -4,10 +4,9 @@
  * Allows users to define a custom share handler at ~/.omp/agent/share.ts
  * that will be used instead of the default GitHub Gist sharing.
  */
-
-import { existsSync } from "node:fs";
-import { join } from "node:path";
-import { getAgentDir } from "@oh-my-pi/pi-coding-agent/config";
+import * as fs from "node:fs";
+import * as path from "node:path";
+import { getAgentDir } from "../config";
 
 export interface CustomShareResult {
 	/** URL to display/open (optional - script may handle everything itself) */
@@ -32,8 +31,8 @@ export function getCustomSharePath(): string | null {
 	const agentDir = getAgentDir();
 
 	for (const candidate of SHARE_SCRIPT_CANDIDATES) {
-		const scriptPath = join(agentDir, candidate);
-		if (existsSync(scriptPath)) {
+		const scriptPath = path.join(agentDir, candidate);
+		if (fs.existsSync(scriptPath)) {
 			return scriptPath;
 		}
 	}

package/src/export/html/index.ts

@@ -1,10 +1,9 @@
-import { existsSync, writeFileSync } from "node:fs";
-import { basename } from "node:path";
+import * as path from "node:path";
 import type { AgentState } from "@oh-my-pi/pi-agent-core";
-import { APP_NAME } from "@oh-my-pi/pi-coding-agent/config";
-import { getResolvedThemeColors, getThemeExportColors } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import { SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
-
+import { isEnoent } from "@oh-my-pi/pi-utils";
+import { APP_NAME } from "../../config";
+import { getResolvedThemeColors, getThemeExportColors } from "../../modes/theme/theme";
+import { SessionManager } from "../../session/session-manager";
 // Pre-generated template (created by scripts/generate-template.ts at publish time)
 import { TEMPLATE } from "./template.generated";
 
@@ -74,14 +73,14 @@ function deriveExportColors(baseColor: string): { pageBg: string; cardBg: string
 }
 
 /** Generate CSS custom properties for theme. */
-function generateThemeVars(themeName?: string): string {
-	const colors = getResolvedThemeColors(themeName);
+async function generateThemeVars(themeName?: string): Promise<string> {
+	const colors = await getResolvedThemeColors(themeName);
 	const lines: string[] = [];
 	for (const [key, value] of Object.entries(colors)) {
 		lines.push(`--${key}: ${value};`);
 	}
 
-	const themeExport = getThemeExportColors(themeName);
+	const themeExport = await getThemeExportColors(themeName);
 	const userMessageBg = colors.userMessageBg || "#343541";
 	const derived = deriveExportColors(userMessageBg);
 
@@ -101,8 +100,8 @@ interface SessionData {
 }
 
 /** Generate HTML from bundled template with runtime substitutions. */
-function generateHtml(sessionData: SessionData, themeName?: string): string {
-	const themeVars = generateThemeVars(themeName);
+async function generateHtml(sessionData: SessionData, themeName?: string): Promise<string> {
+	const themeVars = await generateThemeVars(themeName);
 	const sessionDataBase64 = Buffer.from(JSON.stringify(sessionData)).toString("base64");
 
 	return TEMPLATE.replace("<theme-vars/>", `<style>:root { ${themeVars} }</style>`).replace(
@@ -121,20 +120,19 @@ export async function exportSessionToHtml(
 
 	const sessionFile = sm.getSessionFile();
 	if (!sessionFile) throw new Error("Cannot export in-memory session to HTML");
-	if (!existsSync(sessionFile)) throw new Error("Nothing to export yet - start a conversation first");
 
 	const sessionData: SessionData = {
 		header: sm.getHeader(),
 		entries: sm.getEntries(),
 		leafId: sm.getLeafId(),
 		systemPrompt: state?.systemPrompt,
-		tools: state?.tools?.map((t) => ({ name: t.name, description: t.description })),
+		tools: state?.tools?.map(t => ({ name: t.name, description: t.description })),
 	};
 
-	const html = generateHtml(sessionData, opts.themeName);
-	const outputPath = opts.outputPath || `${APP_NAME}-session-${basename(sessionFile, ".jsonl")}.html`;
+	const html = await generateHtml(sessionData, opts.themeName);
+	const outputPath = opts.outputPath || `${APP_NAME}-session-${path.basename(sessionFile, ".jsonl")}.html`;
 
-	writeFileSync(outputPath, html, "utf8");
+	await Bun.write(outputPath, html);
 	return outputPath;
 }
 
@@ -142,18 +140,23 @@ export async function exportSessionToHtml(
 export async function exportFromFile(inputPath: string, options?: ExportOptions | string): Promise<string> {
 	const opts: ExportOptions = typeof options === "string" ? { outputPath: options } : options || {};
 
-	if (!existsSync(inputPath)) throw new Error(`File not found: ${inputPath}`);
+	let sm: SessionManager;
+	try {
+		sm = await SessionManager.open(inputPath);
+	} catch (err) {
+		if (isEnoent(err)) throw new Error(`File not found: ${inputPath}`);
+		throw err;
+	}
 
-	const sm = await SessionManager.open(inputPath);
 	const sessionData: SessionData = {
 		header: sm.getHeader(),
 		entries: sm.getEntries(),
 		leafId: sm.getLeafId(),
 	};
 
-	const html = generateHtml(sessionData, opts.themeName);
-	const outputPath = opts.outputPath || `${APP_NAME}-session-${basename(inputPath, ".jsonl")}.html`;
+	const html = await generateHtml(sessionData, opts.themeName);
+	const outputPath = opts.outputPath || `${APP_NAME}-session-${path.basename(inputPath, ".jsonl")}.html`;
 
-	writeFileSync(outputPath, html, "utf8");
+	await Bun.write(outputPath, html);
 	return outputPath;
 }

package/src/export/ttsr.ts

@@ -5,10 +5,9 @@
  * the agent's output. When a match occurs, the stream is aborted, the rule is
  * injected as a system reminder, and the request is retried.
  */
-
-import type { Rule } from "@oh-my-pi/pi-coding-agent/capability/rule";
-import type { TtsrSettings } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
 import { logger } from "@oh-my-pi/pi-utils";
+import type { Rule } from "../capability/rule";
+import type { TtsrSettings } from "../config/settings-manager";
 
 interface TtsrEntry {
 	rule: Rule;

package/src/extensibility/custom-commands/bundled/review/index.ts

@@ -11,11 +11,10 @@
  * rich context for the orchestrating agent to distribute work across
  * multiple reviewer agents based on diff weight and locality.
  */
-
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import type { CustomCommand, CustomCommandAPI } from "@oh-my-pi/pi-coding-agent/extensibility/custom-commands/types";
-import type { HookCommandContext } from "@oh-my-pi/pi-coding-agent/extensibility/hooks/types";
-import reviewRequestTemplate from "@oh-my-pi/pi-coding-agent/prompts/review-request.md" with { type: "text" };
+import { renderPromptTemplate } from "../../../../config/prompt-templates";
+import type { CustomCommand, CustomCommandAPI } from "../../../../extensibility/custom-commands/types";
+import type { HookCommandContext } from "../../../../extensibility/hooks/types";
+import reviewRequestTemplate from "../../../../prompts/review-request.md" with { type: "text" };
 
 // ─────────────────────────────────────────────────────────────────────────────
 // Types
@@ -203,7 +202,7 @@ function buildReviewPrompt(mode: string, stats: DiffStats, rawDiff: string): str
 	const totalLines = stats.totalAdded + stats.totalRemoved;
 	const linesPerFile = skipDiff ? Math.max(5, Math.floor(100 / stats.files.length)) : 0;
 
-	const filesWithExt = stats.files.map((f) => ({
+	const filesWithExt = stats.files.map(f => ({
 		...f,
 		ext: getFileExt(f.path),
 		hunksPreview: skipDiff ? getDiffPreview(f.hunks, linesPerFile) : "",
@@ -393,7 +392,7 @@ async function getGitBranches(api: CustomCommandAPI): Promise<string[]> {
 		if (result.code !== 0) return [];
 		return result.stdout
 			.split("\n")
-			.map((b) => b.trim())
+			.map(b => b.trim())
 			.filter(Boolean);
 	} catch {
 		return [];
@@ -424,7 +423,7 @@ async function getRecentCommits(api: CustomCommandAPI, count: number): Promise<s
 		if (result.code !== 0) return [];
 		return result.stdout
 			.split("\n")
-			.map((c) => c.trim())
+			.map(c => c.trim())
 			.filter(Boolean);
 	} catch {
 		return [];

package/src/extensibility/custom-commands/loader.ts

@@ -4,14 +4,13 @@
  * Dependencies (@sinclair/typebox and pi-coding-agent) are injected via the CustomCommandAPI
  * to avoid import resolution issues with custom commands loaded from user directories.
  */
-
-import { type Dirent, existsSync, readdirSync } from "node:fs";
+import * as fs from "node:fs";
 import * as path from "node:path";
-import { getAgentDir, getConfigDirs } from "@oh-my-pi/pi-coding-agent/config";
-import { execCommand } from "@oh-my-pi/pi-coding-agent/exec/exec";
-import * as piCodingAgent from "@oh-my-pi/pi-coding-agent/index";
-import { logger } from "@oh-my-pi/pi-utils";
+import * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
+import { isEnoent, logger } from "@oh-my-pi/pi-utils";
 import * as typebox from "@sinclair/typebox";
+import { getAgentDir, getConfigDirs } from "../../config";
+import { execCommand } from "../../exec/exec";
 import { ReviewCommand } from "./bundled/review";
 import type {
 	CustomCommand,
@@ -77,7 +76,9 @@ export interface DiscoverCustomCommandsResult {
  * Discover custom command modules (TypeScript slash commands).
  * Markdown slash commands are handled by core/slash-commands.ts.
  */
-export function discoverCustomCommands(options: DiscoverCustomCommandsOptions = {}): DiscoverCustomCommandsResult {
+export async function discoverCustomCommands(
+	options: DiscoverCustomCommandsOptions = {},
+): Promise<DiscoverCustomCommandsResult> {
 	const cwd = options.cwd ?? process.cwd();
 	const agentDir = options.agentDir ?? getAgentDir();
 	const paths: Array<{ path: string; source: CustomCommandSource }> = [];
@@ -93,25 +94,27 @@ export function discoverCustomCommands(options: DiscoverCustomCommandsOptions =
 	const commandDirs: Array<{ path: string; source: CustomCommandSource }> = [];
 	if (agentDir) {
 		const userCommandsDir = path.join(agentDir, "commands");
-		if (existsSync(userCommandsDir)) {
+		if (fs.existsSync(userCommandsDir)) {
 			commandDirs.push({ path: userCommandsDir, source: "user" });
 		}
 	}
 
 	for (const entry of getConfigDirs("commands", { cwd, existingOnly: true })) {
 		const source = entry.level === "user" ? "user" : "project";
-		if (!commandDirs.some((d) => d.path === entry.path)) {
+		if (!commandDirs.some(d => d.path === entry.path)) {
 			commandDirs.push({ path: entry.path, source });
 		}
 	}
 
 	const indexCandidates = ["index.ts", "index.js", "index.mjs", "index.cjs"];
 	for (const { path: commandsDir, source } of commandDirs) {
-		let entries: Dirent[];
+		let entries: fs.Dirent[];
 		try {
-			entries = readdirSync(commandsDir, { withFileTypes: true });
+			entries = await fs.promises.readdir(commandsDir, { withFileTypes: true });
 		} catch (error) {
-			logger.warn("Failed to read custom commands directory", { path: commandsDir, error: String(error) });
+			if (!isEnoent(error)) {
+				logger.warn("Failed to read custom commands directory", { path: commandsDir, error: String(error) });
+			}
 			continue;
 		}
 		for (const entry of entries) {
@@ -120,7 +123,7 @@ export function discoverCustomCommands(options: DiscoverCustomCommandsOptions =
 
 			for (const filename of indexCandidates) {
 				const candidate = path.join(commandDir, filename);
-				if (existsSync(candidate)) {
+				if (fs.existsSync(candidate)) {
 					addPath(candidate, source);
 					break;
 				}
@@ -162,7 +165,7 @@ export async function loadCustomCommands(options: LoadCustomCommandsOptions = {}
 	const cwd = options.cwd ?? process.cwd();
 	const agentDir = options.agentDir ?? getAgentDir();
 
-	const { paths } = discoverCustomCommands({ cwd, agentDir });
+	const { paths } = await discoverCustomCommands({ cwd, agentDir });
 
 	const commands: LoadedCustomCommand[] = [];
 	const errors: Array<{ path: string; error: string }> = [];
@@ -195,7 +198,7 @@ export async function loadCustomCommands(options: LoadCustomCommandsOptions = {}
 		if (loadedCommands) {
 			for (const command of loadedCommands) {
 				// Allow overriding bundled commands, but not user/project conflicts
-				const existingIdx = commands.findIndex((c) => c.command.name === command.name);
+				const existingIdx = commands.findIndex(c => c.command.name === command.name);
 				if (existingIdx !== -1) {
 					const existing = commands[existingIdx];
 					if (existing.source === "bundled") {

package/src/extensibility/custom-commands/types.ts

@@ -5,8 +5,7 @@
  * Unlike markdown commands which expand to prompts, custom commands can execute
  * arbitrary logic with full access to the hook context.
  */
-
-import type { ExecOptions, ExecResult, HookCommandContext } from "@oh-my-pi/pi-coding-agent/extensibility/hooks/types";
+import type { ExecOptions, ExecResult, HookCommandContext } from "../../extensibility/hooks/types";
 
 // Re-export for custom commands to use
 export type { ExecOptions, ExecResult, HookCommandContext };
@@ -23,7 +22,7 @@ export interface CustomCommandAPI {
 	/** Injected @sinclair/typebox module */
 	typebox: typeof import("@sinclair/typebox");
 	/** Injected pi-coding-agent exports */
-	pi: typeof import("../../index");
+	pi: typeof import("../..");
 }
 
 /**