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

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

@@ -4,19 +4,18 @@
  * Dependencies (@sinclair/typebox and pi-coding-agent) are injected via the CustomToolAPI
  * to avoid import resolution issues with custom tools loaded from user directories.
  */
-
 import * as path from "node:path";
-import { toolCapability } from "@oh-my-pi/pi-coding-agent/capability/tool";
-import { type CustomTool, loadCapability } from "@oh-my-pi/pi-coding-agent/discovery";
-import { expandPath } from "@oh-my-pi/pi-coding-agent/discovery/helpers";
-import type { ExecOptions } from "@oh-my-pi/pi-coding-agent/exec/exec";
-import { execCommand } from "@oh-my-pi/pi-coding-agent/exec/exec";
-import type { HookUIContext } from "@oh-my-pi/pi-coding-agent/extensibility/hooks/types";
-import { getAllPluginToolPaths } from "@oh-my-pi/pi-coding-agent/extensibility/plugins/loader";
-import * as piCodingAgent from "@oh-my-pi/pi-coding-agent/index";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
 import { logger } from "@oh-my-pi/pi-utils";
 import * as typebox from "@sinclair/typebox";
+import { toolCapability } from "../../capability/tool";
+import { type CustomTool, loadCapability } from "../../discovery";
+import { expandPath } from "../../discovery/helpers";
+import type { ExecOptions } from "../../exec/exec";
+import { execCommand } from "../../exec/exec";
+import type { HookUIContext } from "../../extensibility/hooks/types";
+import { getAllPluginToolPaths } from "../../extensibility/plugins/loader";
+import { theme } from "../../modes/theme/theme";
 import type { CustomToolAPI, CustomToolFactory, LoadedCustomTool, ToolLoadError } from "./types";
 
 /**
@@ -90,7 +89,7 @@ async function loadTool(
 		const toolResult = await factory(sharedApi);
 		const toolsArray = Array.isArray(toolResult) ? toolResult : [toolResult];
 
-		const loadedTools: LoadedCustomTool[] = toolsArray.map((tool) => ({
+		const loadedTools: LoadedCustomTool[] = toolsArray.map(tool => ({
 			path: toolPath,
 			resolvedPath,
 			tool,
@@ -223,7 +222,7 @@ export async function discoverAndLoadCustomTools(configuredPaths: string[], cwd:
 	}
 
 	// 2. Plugin tools: ~/.omp/plugins/node_modules/*/
-	for (const pluginPath of getAllPluginToolPaths(cwd)) {
+	for (const pluginPath of await getAllPluginToolPaths(cwd)) {
 		addPath(pluginPath, { provider: "plugin", providerName: "Plugin", level: "user" });
 	}
 

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

@@ -4,16 +4,15 @@
  * Custom tools are TypeScript modules that define additional tools for the agent.
  * They can provide custom rendering for tool calls and results in the TUI.
  */
-
 import type { AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { Model } from "@oh-my-pi/pi-ai";
-import type { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
-import type { ExecOptions, ExecResult } from "@oh-my-pi/pi-coding-agent/exec/exec";
-import type { HookUIContext } from "@oh-my-pi/pi-coding-agent/extensibility/hooks/types";
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import type { ReadonlySessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
 import type { Component } from "@oh-my-pi/pi-tui";
 import type { Static, TSchema } from "@sinclair/typebox";
+import type { ModelRegistry } from "../../config/model-registry";
+import type { ExecOptions, ExecResult } from "../../exec/exec";
+import type { HookUIContext } from "../../extensibility/hooks/types";
+import type { Theme } from "../../modes/theme/theme";
+import type { ReadonlySessionManager } from "../../session/session-manager";
 
 /** Alias for clarity */
 export type CustomToolUIContext = HookUIContext;
@@ -22,7 +21,7 @@ export type CustomToolUIContext = HookUIContext;
 export type { AgentToolResult, AgentToolUpdateCallback };
 
 // Re-export for backward compatibility
-export type { ExecOptions, ExecResult } from "@oh-my-pi/pi-coding-agent/exec/exec";
+export type { ExecOptions, ExecResult } from "../../exec/exec";
 
 /** API passed to custom tool factory (stable across session changes) */
 export interface CustomToolAPI {
@@ -39,7 +38,7 @@ export interface CustomToolAPI {
 	/** Injected @sinclair/typebox module */
 	typebox: typeof import("@sinclair/typebox");
 	/** Injected pi-coding-agent exports */
-	pi: typeof import("../../index");
+	pi: typeof import("../..");
 }
 
 /**

package/src/extensibility/custom-tools/wrapper.ts

@@ -1,11 +1,10 @@
 /**
  * CustomToolAdapter wraps CustomTool instances into AgentTool for use with the agent.
  */
-
 import type { AgentTool, AgentToolResult, AgentToolUpdateCallback, RenderResultOptions } from "@oh-my-pi/pi-agent-core";
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import type { Component } from "@oh-my-pi/pi-tui";
 import type { Static, TSchema } from "@sinclair/typebox";
+import type { Theme } from "../../modes/theme/theme";
 import type { CustomTool, CustomToolContext, LoadedCustomTool } from "./types";
 
 export class CustomToolAdapter<TParams extends TSchema = TSchema, TDetails = any, TTheme extends Theme = Theme>
@@ -64,6 +63,6 @@ export class CustomToolAdapter<TParams extends TSchema = TSchema, TDetails = any
 		loadedTools: LoadedCustomTool<TParams, TDetails>[],
 		getContext: () => CustomToolContext,
 	): AgentTool<TParams, TDetails, TTheme>[] {
-		return loadedTools.map((lt) => CustomToolAdapter.wrap(lt.tool, getContext));
+		return loadedTools.map(lt => CustomToolAdapter.wrap(lt.tool, getContext));
 	}
 }

package/src/extensibility/extensions/loader.ts

@@ -1,23 +1,23 @@
 /**
  * Extension loader - loads TypeScript extension modules using native Bun import.
  */
-
-import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
+import type * as fs1 from "node:fs";
+import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Model, TextContent } from "@oh-my-pi/pi-ai";
-import { type ExtensionModule, extensionModuleCapability } from "@oh-my-pi/pi-coding-agent/capability/extension-module";
-import { loadCapability } from "@oh-my-pi/pi-coding-agent/discovery";
-import { expandPath, getExtensionNameFromPath } from "@oh-my-pi/pi-coding-agent/discovery/helpers";
-import type { ExecOptions } from "@oh-my-pi/pi-coding-agent/exec/exec";
-import { execCommand } from "@oh-my-pi/pi-coding-agent/exec/exec";
-import * as piCodingAgent from "@oh-my-pi/pi-coding-agent/index";
-import type { CustomMessage } from "@oh-my-pi/pi-coding-agent/session/messages";
-import { EventBus } from "@oh-my-pi/pi-coding-agent/utils/event-bus";
+import * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
 import type { KeyId } from "@oh-my-pi/pi-tui";
-import { logger } from "@oh-my-pi/pi-utils";
+import { hasFsCode, isEacces, isEnoent, logger } from "@oh-my-pi/pi-utils";
 import type { TSchema } from "@sinclair/typebox";
 import * as TypeBox from "@sinclair/typebox";
+import { type ExtensionModule, extensionModuleCapability } from "../../capability/extension-module";
+import { loadCapability } from "../../discovery";
+import { expandPath, getExtensionNameFromPath } from "../../discovery/helpers";
+import type { ExecOptions } from "../../exec/exec";
+import { execCommand } from "../../exec/exec";
+import type { CustomMessage } from "../../session/messages";
+import { EventBus } from "../../utils/event-bus";
 import type {
 	Extension,
 	ExtensionAPI,
@@ -316,16 +316,18 @@ interface ExtensionManifest {
 	skills?: string[];
 }
 
-function readExtensionManifest(packageJsonPath: string): ExtensionManifest | null {
+async function readExtensionManifest(packageJsonPath: string): Promise<ExtensionManifest | null> {
 	try {
-		const content = readFileSync(packageJsonPath, "utf-8");
-		const pkg = JSON.parse(content) as { omp?: ExtensionManifest; pi?: ExtensionManifest };
+		const pkg = (await Bun.file(packageJsonPath).json()) as { omp?: ExtensionManifest; pi?: ExtensionManifest };
 		const manifest = pkg.omp ?? pkg.pi;
 		if (manifest && typeof manifest === "object") {
 			return manifest;
 		}
 		return null;
 	} catch (error) {
+		if (isEnoent(error) || isEacces(error) || hasFsCode(error, "EPERM")) {
+			return null;
+		}
 		logger.warn("Failed to read extension manifest", { path: packageJsonPath, error: String(error) });
 		return null;
 	}
@@ -338,31 +340,47 @@ function isExtensionFile(name: string): boolean {
 /**
  * Resolve extension entry points from a directory.
  */
-function resolveExtensionEntries(dir: string): string[] | null {
+async function resolveExtensionEntries(dir: string): Promise<string[] | null> {
 	const packageJsonPath = path.join(dir, "package.json");
-	if (existsSync(packageJsonPath)) {
-		const manifest = readExtensionManifest(packageJsonPath);
-		if (manifest?.extensions?.length) {
-			const entries: string[] = [];
-			for (const extPath of manifest.extensions) {
-				const resolvedExtPath = path.resolve(dir, extPath);
-				if (existsSync(resolvedExtPath)) {
-					entries.push(resolvedExtPath);
-				}
-			}
-			if (entries.length > 0) {
-				return entries;
+	const manifest = await readExtensionManifest(packageJsonPath);
+	if (manifest?.extensions?.length) {
+		const entries: string[] = [];
+		for (const extPath of manifest.extensions) {
+			const resolvedExtPath = path.resolve(dir, extPath);
+			try {
+				await fs.stat(resolvedExtPath);
+				entries.push(resolvedExtPath);
+			} catch (err) {
+				if (isEnoent(err) || isEacces(err) || hasFsCode(err, "EPERM")) continue;
+				throw err;
 			}
 		}
+		if (entries.length > 0) {
+			return entries;
+		}
 	}
 
 	const indexTs = path.join(dir, "index.ts");
 	const indexJs = path.join(dir, "index.js");
-	if (existsSync(indexTs)) {
+	try {
+		await fs.stat(indexTs);
 		return [indexTs];
+	} catch (err) {
+		if (isEnoent(err) || isEacces(err) || hasFsCode(err, "EPERM")) {
+			// Ignore
+		} else {
+			throw err;
+		}
 	}
-	if (existsSync(indexJs)) {
+	try {
+		await fs.stat(indexJs);
 		return [indexJs];
+	} catch (err) {
+		if (isEnoent(err) || isEacces(err) || hasFsCode(err, "EPERM")) {
+			// Ignore
+		} else {
+			throw err;
+		}
 	}
 
 	return null;
@@ -378,36 +396,32 @@ function resolveExtensionEntries(dir: string): string[] | null {
  *
  * No recursion beyond one level. Complex packages must use package.json manifest.
  */
-function discoverExtensionsInDir(dir: string): string[] {
-	if (!existsSync(dir)) {
-		return [];
-	}
-
+async function discoverExtensionsInDir(dir: string): Promise<string[]> {
 	const discovered: string[] = [];
 
+	let entries: fs1.Dirent[];
 	try {
-		const entries = readdirSync(dir, { withFileTypes: true });
+		entries = await fs.readdir(dir, { withFileTypes: true });
+	} catch (err) {
+		if (isEnoent(err)) return [];
+		logger.warn("Failed to discover extensions in directory", { path: dir, error: String(err) });
+		return [];
+	}
 
-		for (const entry of entries) {
-			const entryPath = path.join(dir, entry.name);
+	for (const entry of entries) {
+		const entryPath = path.join(dir, entry.name);
 
-			// 1. Direct files: *.ts or *.js
-			if ((entry.isFile() || entry.isSymbolicLink()) && isExtensionFile(entry.name)) {
-				discovered.push(entryPath);
-				continue;
-			}
+		if ((entry.isFile() || entry.isSymbolicLink()) && isExtensionFile(entry.name)) {
+			discovered.push(entryPath);
+			continue;
+		}
 
-			// 2 & 3. Subdirectories
-			if (entry.isDirectory() || entry.isSymbolicLink()) {
-				const entries = resolveExtensionEntries(entryPath);
-				if (entries) {
-					discovered.push(...entries);
-				}
+		if (entry.isDirectory() || entry.isSymbolicLink()) {
+			const resolved = await resolveExtensionEntries(entryPath);
+			if (resolved) {
+				discovered.push(...resolved);
 			}
 		}
-	} catch (error) {
-		logger.warn("Failed to discover extensions in directory", { path: dir, error: String(error) });
-		return [];
 	}
 
 	return discovered;
@@ -454,14 +468,22 @@ export async function discoverAndLoadExtensions(
 	// 2. Explicitly configured paths
 	for (const configuredPath of configuredPaths) {
 		const resolved = resolvePath(configuredPath, cwd);
-		if (existsSync(resolved) && statSync(resolved).isDirectory()) {
-			const entries = resolveExtensionEntries(resolved);
+
+		let stat: fs1.Stats | null = null;
+		try {
+			stat = await fs.stat(resolved);
+		} catch (err) {
+			if (!isEnoent(err)) throw err;
+		}
+
+		if (stat?.isDirectory()) {
+			const entries = await resolveExtensionEntries(resolved);
 			if (entries) {
 				addPaths(entries);
 				continue;
 			}
 
-			const discovered = discoverExtensionsInDir(resolved);
+			const discovered = await discoverExtensionsInDir(resolved);
 			if (discovered.length > 0) {
 				addPaths(discovered);
 			}

package/src/extensibility/extensions/runner.ts

@@ -1,14 +1,13 @@
 /**
  * Extension runner - executes extensions and manages their lifecycle.
  */
-
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Model } from "@oh-my-pi/pi-ai";
-import type { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
-import { type Theme, theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import type { SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
 import type { KeyId } from "@oh-my-pi/pi-tui";
 import { logger } from "@oh-my-pi/pi-utils";
+import type { ModelRegistry } from "../../config/model-registry";
+import { type Theme, theme } from "../../modes/theme/theme";
+import type { SessionManager } from "../../session/session-manager";
 import type {
 	BeforeAgentStartEvent,
 	BeforeAgentStartEventResult,
@@ -98,9 +97,9 @@ const noOpUIContext: ExtensionUIContext = {
 	get theme() {
 		return theme;
 	},
-	getAllThemes: () => [],
-	getTheme: () => undefined,
-	setTheme: (_theme: string | Theme) => ({ success: false, error: "UI not available" }),
+	getAllThemes: () => Promise.resolve([]),
+	getTheme: () => Promise.resolve(undefined),
+	setTheme: (_theme: string | Theme) => Promise.resolve({ success: false, error: "UI not available" }),
 };
 
 export class ExtensionRunner {
@@ -184,7 +183,7 @@ export class ExtensionRunner {
 	}
 
 	getExtensionPaths(): string[] {
-		return this.extensions.map((e) => e.path);
+		return this.extensions.map(e => e.path);
 	}
 
 	/** Get all registered tools from all extensions. */
@@ -313,7 +312,7 @@ export class ExtensionRunner {
 		return {
 			ui: this.uiContext,
 			getContextUsage: () => this.getContextUsageFn(),
-			compact: (instructionsOrOptions) => this.compactFn(instructionsOrOptions),
+			compact: instructionsOrOptions => this.compactFn(instructionsOrOptions),
 			hasUI: this.hasUI(),
 			cwd: this.cwd,
 			sessionManager: this.sessionManager,
@@ -341,10 +340,10 @@ export class ExtensionRunner {
 			...this.createContext(),
 			getContextUsage: () => this.getContextUsageFn(),
 			waitForIdle: () => this.waitForIdleFn(),
-			newSession: (options) => this.newSessionHandler(options),
-			branch: (entryId) => this.branchHandler(entryId),
+			newSession: options => this.newSessionHandler(options),
+			branch: entryId => this.branchHandler(entryId),
 			navigateTree: (targetId, options) => this.navigateTreeHandler(targetId, options),
-			compact: (instructionsOrOptions) => this.compactFn(instructionsOrOptions),
+			compact: instructionsOrOptions => this.compactFn(instructionsOrOptions),
 		};
 	}
 

package/src/extensibility/extensions/types.ts

@@ -7,39 +7,32 @@
  * - Register commands, keyboard shortcuts, and CLI flags
  * - Interact with the user via UI primitives
  */
-
 import type { AgentMessage, AgentToolResult, AgentToolUpdateCallback, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, Model, TextContent, ToolResultMessage } from "@oh-my-pi/pi-ai";
-import type { KeybindingsManager } from "@oh-my-pi/pi-coding-agent/config/keybindings";
-import type { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
-import type { BashResult } from "@oh-my-pi/pi-coding-agent/exec/bash-executor";
-import type { ExecOptions, ExecResult } from "@oh-my-pi/pi-coding-agent/exec/exec";
-import type * as piCodingAgent from "@oh-my-pi/pi-coding-agent/index";
-import type { PythonResult } from "@oh-my-pi/pi-coding-agent/ipy/executor";
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import type { EditToolDetails } from "@oh-my-pi/pi-coding-agent/patch";
-import type { CompactionPreparation, CompactionResult } from "@oh-my-pi/pi-coding-agent/session/compaction";
-import type { CustomMessage } from "@oh-my-pi/pi-coding-agent/session/messages";
+import type * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
+import type { AutocompleteItem, Component, EditorComponent, EditorTheme, KeyId, TUI } from "@oh-my-pi/pi-tui";
+import type { Static, TSchema } from "@sinclair/typebox";
+import type { KeybindingsManager } from "../../config/keybindings";
+import type { ModelRegistry } from "../../config/model-registry";
+import type { BashResult } from "../../exec/bash-executor";
+import type { ExecOptions, ExecResult } from "../../exec/exec";
+import type { PythonResult } from "../../ipy/executor";
+import type { Theme } from "../../modes/theme/theme";
+import type { EditToolDetails } from "../../patch";
+import type { CompactionPreparation, CompactionResult } from "../../session/compaction";
+import type { CustomMessage } from "../../session/messages";
 import type {
 	BranchSummaryEntry,
 	CompactionEntry,
 	ReadonlySessionManager,
 	SessionEntry,
 	SessionManager,
-} from "@oh-my-pi/pi-coding-agent/session/session-manager";
-import type {
-	BashToolDetails,
-	FindToolDetails,
-	GrepToolDetails,
-	LsToolDetails,
-	ReadToolDetails,
-} from "@oh-my-pi/pi-coding-agent/tools";
-import type { EventBus } from "@oh-my-pi/pi-coding-agent/utils/event-bus";
-import type { AutocompleteItem, Component, EditorComponent, EditorTheme, KeyId, TUI } from "@oh-my-pi/pi-tui";
-import type { Static, TSchema } from "@sinclair/typebox";
+} from "../../session/session-manager";
+import type { BashToolDetails, FindToolDetails, GrepToolDetails, LsToolDetails, ReadToolDetails } from "../../tools";
+import type { EventBus } from "../../utils/event-bus";
 
-export type { AppAction, KeybindingsManager } from "@oh-my-pi/pi-coding-agent/config/keybindings";
-export type { ExecOptions, ExecResult } from "@oh-my-pi/pi-coding-agent/exec/exec";
+export type { AppAction, KeybindingsManager } from "../../config/keybindings";
+export type { ExecOptions, ExecResult } from "../../exec/exec";
 export type { AgentToolResult, AgentToolUpdateCallback };
 
 // ============================================================================
@@ -118,13 +111,13 @@ export interface ExtensionUIContext {
 	readonly theme: Theme;
 
 	/** Get all available themes with names and paths. */
-	getAllThemes(): { name: string; path: string | undefined }[];
+	getAllThemes(): Promise<{ name: string; path: string | undefined }[]>;
 
 	/** Load a theme by name without switching to it. */
-	getTheme(name: string): Theme | undefined;
+	getTheme(name: string): Promise<Theme | undefined>;
 
 	/** Set the current theme by name or Theme object. */
-	setTheme(theme: string | Theme): { success: boolean; error?: string };
+	setTheme(theme: string | Theme): Promise<{ success: boolean; error?: string }>;
 }
 
 // ============================================================================

package/src/extensibility/extensions/wrapper.ts

@@ -1,11 +1,10 @@
 /**
  * Tool wrappers for extensions.
  */
-
 import type { AgentTool, AgentToolContext, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import type { Static, TSchema } from "@sinclair/typebox";
+import type { Theme } from "../../modes/theme/theme";
 import type { ExtensionRunner } from "./runner";
 import type { RegisteredTool, ToolCallEventResult, ToolResultEventResult } from "./types";
 
@@ -63,7 +62,7 @@ export function wrapRegisteredTool(registeredTool: RegisteredTool, runner: Exten
  * Wrap all registered tools into AgentTools.
  */
 export function wrapRegisteredTools(registeredTools: RegisteredTool[], runner: ExtensionRunner): AgentTool[] {
-	return registeredTools.map((rt) => wrapRegisteredTool(rt, runner));
+	return registeredTools.map(rt => wrapRegisteredTool(rt, runner));
 }
 
 /**
@@ -156,7 +155,7 @@ export class ExtensionToolWrapper<TParameters extends TSchema = TSchema, TDetail
 				if (resultResult.isError === true && !executionError) {
 					// Extension marks a successful result as error
 					const textBlocks = (modifiedContent ?? []).filter((c): c is TextContent => c.type === "text");
-					const errorText = textBlocks.map((t) => t.text).join("\n") || "Tool result marked as error by extension";
+					const errorText = textBlocks.map(t => t.text).join("\n") || "Tool result marked as error by extension";
 					throw new Error(errorText);
 				}
 				if (resultResult.isError === false && executionError) {

package/src/extensibility/hooks/index.ts

@@ -1,5 +1,5 @@
 // biome-ignore assist/source/organizeImports: biome is not smart
-export type { ReadonlySessionManager, UsageStatistics } from "@oh-my-pi/pi-coding-agent/session/session-manager";
+export type { ReadonlySessionManager, UsageStatistics } from "../../session/session-manager";
 export {
 	discoverAndLoadHooks,
 	loadHooks,

package/src/extensibility/hooks/loader.ts

@@ -1,17 +1,16 @@
 /**
  * Hook loader - loads TypeScript hook modules using native Bun import.
  */
-
 import * as path from "node:path";
-import { hookCapability } from "@oh-my-pi/pi-coding-agent/capability/hook";
-import type { Hook } from "@oh-my-pi/pi-coding-agent/discovery";
-import { loadCapability } from "@oh-my-pi/pi-coding-agent/discovery";
-import { expandPath } from "@oh-my-pi/pi-coding-agent/discovery/helpers";
-import * as piCodingAgent from "@oh-my-pi/pi-coding-agent/index";
-import type { HookMessage } from "@oh-my-pi/pi-coding-agent/session/messages";
-import type { SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
+import * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
 import { logger } from "@oh-my-pi/pi-utils";
 import * as typebox from "@sinclair/typebox";
+import { hookCapability } from "../../capability/hook";
+import type { Hook } from "../../discovery";
+import { loadCapability } from "../../discovery";
+import { expandPath } from "../../discovery/helpers";
+import type { HookMessage } from "../../session/messages";
+import type { SessionManager } from "../../session/session-manager";
 import { execCommand } from "./runner";
 import type { ExecOptions, HookAPI, HookFactory, HookMessageRenderer, RegisteredCommand } from "./types";
 
@@ -265,10 +264,10 @@ export async function discoverAndLoadHooks(configuredPaths: string[], cwd: strin
 
 	// 1. Discover hooks via capability API
 	const discovered = await loadCapability<Hook>(hookCapability.id, { cwd });
-	addPaths(discovered.items.map((hook) => hook.path));
+	addPaths(discovered.items.map(hook => hook.path));
 
 	// 2. Explicitly configured paths (can override/add)
-	addPaths(configuredPaths.map((p) => resolveHookPath(p, cwd)));
+	addPaths(configuredPaths.map(p => resolveHookPath(p, cwd)));
 
 	return loadHooks(allPaths, cwd);
 }

package/src/extensibility/hooks/runner.ts

@@ -1,12 +1,11 @@
 /**
  * Hook runner - executes hooks and manages their lifecycle.
  */
-
 import type { AgentMessage } from "@oh-my-pi/pi-agent-core";
 import type { Model } from "@oh-my-pi/pi-ai";
-import type { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import type { SessionManager } from "@oh-my-pi/pi-coding-agent/session/session-manager";
+import type { ModelRegistry } from "../../config/model-registry";
+import { theme } from "../../modes/theme/theme";
+import type { SessionManager } from "../../session/session-manager";
 import type {
 	AppendEntryHandler,
 	BranchHandler,
@@ -40,7 +39,7 @@ import type {
 export type HookErrorListener = (error: HookError) => void;
 
 // Re-export execCommand for backward compatibility
-export { execCommand } from "@oh-my-pi/pi-coding-agent/exec/exec";
+export { execCommand } from "../../exec/exec";
 
 /** No-op UI context used when no UI is available */
 const noOpUIContext: HookUIContext = {
@@ -159,7 +158,7 @@ export class HookRunner {
 	 * Get the paths of all loaded hooks.
 	 */
 	getHookPaths(): string[] {
-		return this.hooks.map((h) => h.path);
+		return this.hooks.map(h => h.path);
 	}
 
 	/**
@@ -262,8 +261,8 @@ export class HookRunner {
 		return {
 			...this.createContext(),
 			waitForIdle: () => this.waitForIdleFn(),
-			newSession: (options) => this.newSessionHandler(options),
-			branch: (entryId) => this.branchHandler(entryId),
+			newSession: options => this.newSessionHandler(options),
+			branch: entryId => this.branchHandler(entryId),
 			navigateTree: (targetId, options) => this.navigateTreeHandler(targetId, options),
 		};
 	}

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

@@ -1,7 +1,6 @@
 /**
  * Tool wrapper - wraps tools with hook callbacks for interception.
  */
-
 import type { AgentTool, AgentToolContext, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { Static, TSchema } from "@sinclair/typebox";
 import type { HookRunner } from "./runner";

package/src/extensibility/hooks/types.ts

@@ -4,33 +4,26 @@
  * Hooks are TypeScript modules that can subscribe to agent lifecycle events
  * and interact with the user via UI primitives.
  */
-
 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 { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
-import type { ExecOptions, ExecResult } from "@oh-my-pi/pi-coding-agent/exec/exec";
-import type { Theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import type { EditToolDetails } from "@oh-my-pi/pi-coding-agent/patch";
-import type { CompactionPreparation, CompactionResult } from "@oh-my-pi/pi-coding-agent/session/compaction/index";
-import type { HookMessage } from "@oh-my-pi/pi-coding-agent/session/messages";
+import type { Component, TUI } from "@oh-my-pi/pi-tui";
+import type { ModelRegistry } from "../../config/model-registry";
+import type { ExecOptions, ExecResult } from "../../exec/exec";
+import type { Theme } from "../../modes/theme/theme";
+import type { EditToolDetails } from "../../patch";
+import type { CompactionPreparation, CompactionResult } from "../../session/compaction";
+import type { HookMessage } from "../../session/messages";
 import type {
 	BranchSummaryEntry,
 	CompactionEntry,
 	ReadonlySessionManager,
 	SessionEntry,
 	SessionManager,
-} from "@oh-my-pi/pi-coding-agent/session/session-manager";
-import type {
-	BashToolDetails,
-	FindToolDetails,
-	GrepToolDetails,
-	LsToolDetails,
-	ReadToolDetails,
-} from "@oh-my-pi/pi-coding-agent/tools/index";
-import type { Component, TUI } from "@oh-my-pi/pi-tui";
+} from "../../session/session-manager";
+import type { BashToolDetails, FindToolDetails, GrepToolDetails, LsToolDetails, ReadToolDetails } from "../../tools";
 
 // Re-export for backward compatibility
-export type { ExecOptions, ExecResult } from "@oh-my-pi/pi-coding-agent/exec/exec";
+export type { ExecOptions, ExecResult } from "../../exec/exec";
 
 /**
  * UI context for hooks to request interactive UI from the harness.
@@ -752,7 +745,7 @@ export interface HookAPI {
 	/** Injected @sinclair/typebox module */
 	typebox: typeof import("@sinclair/typebox");
 	/** Injected pi-coding-agent exports */
-	pi: typeof import("../../index");
+	pi: typeof import("../..");
 }
 
 /**

package/src/extensibility/plugins/doctor.ts

@@ -1,4 +1,4 @@
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import { theme } from "../../modes/theme/theme";
 import type { DoctorCheck } from "./types";
 
 export async function runDoctorChecks(): Promise<DoctorCheck[]> {
@@ -57,8 +57,8 @@ export function formatDoctorResults(checks: DoctorCheck[]): string {
 		lines.push(`${icon} ${check.name}: ${check.message}`);
 	}
 
-	const errors = checks.filter((c) => c.status === "error").length;
-	const warnings = checks.filter((c) => c.status === "warning").length;
+	const errors = checks.filter(c => c.status === "error").length;
+	const warnings = checks.filter(c => c.status === "warning").length;
 
 	lines.push("");
 	lines.push(`Summary: ${checks.length - errors - warnings} ok, ${warnings} warnings, ${errors} errors`);