@oh-my-pi/pi-coding-agent 8.0.16 → 8.1.0

package/src/config/settings-manager.ts

@@ -1,11 +1,14 @@
+import { existsSync, readFileSync } from "node:fs";
 import { rename } from "node:fs/promises";
 import { join } from "node:path";
 import { type Settings as SettingsItem, settingsCapability } from "@oh-my-pi/pi-coding-agent/capability/settings";
 import { getAgentDbPath, getAgentDir } from "@oh-my-pi/pi-coding-agent/config";
+import { withFileLock } from "@oh-my-pi/pi-coding-agent/config/file-lock";
 import { loadCapability } from "@oh-my-pi/pi-coding-agent/discovery";
 import type { SymbolPreset } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import { AgentStorage } from "@oh-my-pi/pi-coding-agent/session/agent-storage";
 import { logger } from "@oh-my-pi/pi-utils";
+import { YAML } from "bun";
 
 export interface CompactionSettings {
 	enabled?: boolean; // default: true
@@ -117,6 +120,15 @@ export interface PythonSettings {
 	sharedGateway?: boolean;
 }
 
+export interface CommitSettings {
+	mapReduceEnabled?: boolean;
+	mapReduceMinFiles?: number;
+	mapReduceMaxFileTokens?: number;
+	mapReduceTimeoutMs?: number;
+	mapReduceMaxConcurrency?: number;
+	changelogMaxDiffChars?: number;
+}
+
 export interface EditSettings {
 	fuzzyMatch?: boolean; // default: true (accept high-confidence fuzzy matches for whitespace/indentation)
 	fuzzyThreshold?: number; // default: 0.95 (similarity threshold for fuzzy matching)
@@ -214,6 +226,7 @@ export interface Settings {
 	mcp?: MCPSettings;
 	lsp?: LspSettings;
 	python?: PythonSettings;
+	commit?: CommitSettings;
 	edit?: EditSettings;
 	ttsr?: TtsrSettings;
 	todoCompletion?: TodoCompletionSettings;
@@ -424,8 +437,10 @@ function deepMergeSettings(base: Settings, overrides: Settings): Settings {
 }
 
 export class SettingsManager {
-	/** SQLite storage for persisted settings (null for in-memory mode) */
+	/** SQLite storage for auth/cache (null for in-memory mode) */
 	private storage: AgentStorage | null;
+	/** Path to config.yml (null for in-memory mode) */
+	private configPath: string | null;
 	private cwd: string | null;
 	private globalSettings: Settings;
 	private overrides: Settings;
@@ -434,7 +449,8 @@ export class SettingsManager {
 
 	/**
 	 * Private constructor - use static factory methods instead.
-	 * @param storage - SQLite storage instance for persistence, or null for in-memory mode
+	 * @param storage - SQLite storage instance for auth/cache, or null for in-memory mode
+	 * @param configPath - Path to config.yml for persistence, or null for in-memory mode
 	 * @param cwd - Current working directory for project settings discovery
 	 * @param initialSettings - Initial global settings to use
 	 * @param persist - Whether to persist settings changes to storage
@@ -442,12 +458,14 @@ export class SettingsManager {
 	 */
 	private constructor(
 		storage: AgentStorage | null,
+		configPath: string | null,
 		cwd: string | null,
 		initialSettings: Settings,
 		persist: boolean,
 		projectSettings: Settings,
 	) {
 		this.storage = storage;
+		this.configPath = configPath;
 		this.cwd = cwd;
 		this.persist = persist;
 		this.globalSettings = initialSettings;
@@ -479,14 +497,17 @@ export class SettingsManager {
 	}
 
 	/**
-	 * Create a SettingsManager that loads from persistent SQLite storage.
+	 * Create a SettingsManager that loads from persistent config.yml.
 	 * @param cwd - Current working directory for project settings discovery
-	 * @param agentDir - Agent directory containing agent.db
+	 * @param agentDir - Agent directory containing config.yml
 	 * @returns Configured SettingsManager with merged global and user settings
 	 */
 	static async create(cwd: string = process.cwd(), agentDir: string = getAgentDir()): Promise<SettingsManager> {
-		const storage = AgentStorage.open(getAgentDbPath(agentDir));
-		await SettingsManager.migrateLegacySettingsFile(storage, agentDir);
+		const configPath = join(agentDir, "config.yml");
+		const storage = await AgentStorage.open(getAgentDbPath(agentDir));
+
+		// Migrate from legacy storage if config.yml doesn't exist
+		await SettingsManager.migrateToYaml(storage, agentDir, configPath);
 
 		// Use capability API to load user-level settings from all providers
 		const result = await loadCapability(settingsCapability.id, { cwd });
@@ -499,14 +520,14 @@ export class SettingsManager {
 			}
 		}
 
-		// Load persisted settings from agent.db (legacy settings.json is migrated separately)
-		const storedSettings = SettingsManager.loadFromStorage(storage);
+		// Load persisted settings from config.yml
+		const storedSettings = SettingsManager.loadFromYaml(configPath);
 		globalSettings = deepMergeSettings(globalSettings, storedSettings);
 
 		// Load project settings before construction (constructor is sync)
 		const projectSettings = await SettingsManager.loadProjectSettingsStatic(cwd);
 
-		return new SettingsManager(storage, cwd, globalSettings, true, projectSettings);
+		return new SettingsManager(storage, configPath, cwd, globalSettings, true, projectSettings);
 	}
 
 	/**
@@ -515,7 +536,7 @@ export class SettingsManager {
 	 * @returns SettingsManager that won't persist changes to disk
 	 */
 	static inMemory(settings: Partial<Settings> = {}): SettingsManager {
-		return new SettingsManager(null, null, settings, false, {});
+		return new SettingsManager(null, null, null, settings, false, {});
 	}
 
 	/**
@@ -534,41 +555,82 @@ export class SettingsManager {
 	}
 
 	/**
-	 * Load settings from SQLite storage, applying any schema migrations.
-	 * @param storage - AgentStorage instance, or null for in-memory mode
-	 * @returns Parsed and migrated settings, or empty object if storage is null/empty
+	 * Load settings from config.yml, applying any schema migrations.
+	 * @param configPath - Path to config.yml, or null for in-memory mode
+	 * @returns Parsed and migrated settings, or empty object if file doesn't exist
 	 */
-	private static loadFromStorage(storage: AgentStorage | null): Settings {
-		if (!storage) {
+	private static loadFromYaml(configPath: string | null): Settings {
+		if (!configPath || !existsSync(configPath)) {
 			return {};
 		}
-		const settings = storage.getSettings();
-		if (!settings) {
+		try {
+			const content = readFileSync(configPath, "utf-8");
+			const parsed = YAML.parse(content);
+			if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
+				return {};
+			}
+			return SettingsManager.migrateSettings(parsed as Record<string, unknown>);
+		} catch (error) {
+			logger.warn("SettingsManager failed to load config.yml", { path: configPath, error: String(error) });
 			return {};
 		}
-		return SettingsManager.migrateSettings(settings as Record<string, unknown>);
 	}
 
-	private static async migrateLegacySettingsFile(storage: AgentStorage, agentDir: string): Promise<void> {
-		const settingsPath = join(agentDir, "settings.json");
-		const settingsFile = Bun.file(settingsPath);
-		if (!(await settingsFile.exists())) return;
-		if (storage.getSettings() !== null) return;
+	/**
+	 * Migrate settings from legacy sources to config.yml.
+	 * Migration order: settings.json -> agent.db -> config.yml
+	 * Only migrates if config.yml doesn't exist.
+	 */
+	private static async migrateToYaml(storage: AgentStorage, agentDir: string, configPath: string): Promise<void> {
+		// Skip if config.yml already exists
+		if (existsSync(configPath)) return;
+
+		let settings: Settings = {};
+		let migrated = false;
 
+		// 1. Try to migrate from settings.json (oldest legacy format)
+		const settingsJsonPath = join(agentDir, "settings.json");
 		try {
-			const parsed = JSON.parse(await settingsFile.text());
-			if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) {
-				return;
+			const settingsFile = Bun.file(settingsJsonPath);
+			if (await settingsFile.exists()) {
+				const parsed = JSON.parse(await settingsFile.text());
+				if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+					settings = deepMergeSettings(settings, SettingsManager.migrateSettings(parsed));
+					migrated = true;
+					// Backup settings.json
+					try {
+						await rename(settingsJsonPath, `${settingsJsonPath}.bak`);
+					} catch (error) {
+						logger.warn("SettingsManager failed to backup settings.json", { error: String(error) });
+					}
+				}
 			}
-			const migrated = SettingsManager.migrateSettings(parsed as Record<string, unknown>);
-			storage.saveSettings(migrated);
+		} catch (error) {
+			logger.warn("SettingsManager failed to read settings.json", { error: String(error) });
+		}
+
+		// 2. Migrate from agent.db settings table
+		try {
+			const dbSettings = storage.getSettings();
+			if (dbSettings) {
+				settings = deepMergeSettings(
+					settings,
+					SettingsManager.migrateSettings(dbSettings as Record<string, unknown>),
+				);
+				migrated = true;
+			}
+		} catch (error) {
+			logger.warn("SettingsManager failed to read agent.db settings", { error: String(error) });
+		}
+
+		// 3. Write merged settings to config.yml if we found any
+		if (migrated && Object.keys(settings).length > 0) {
 			try {
-				await rename(settingsPath, `${settingsPath}.bak`);
+				await Bun.write(configPath, YAML.stringify(settings, null, 2));
+				logger.debug("SettingsManager migrated settings to config.yml", { path: configPath });
 			} catch (error) {
-				logger.warn("SettingsManager failed to backup settings.json", { error: String(error) });
+				logger.warn("SettingsManager failed to write config.yml", { path: configPath, error: String(error) });
 			}
-		} catch (error) {
-			logger.warn("SettingsManager failed to migrate settings.json", { error: String(error) });
 		}
 	}
 
@@ -620,22 +682,24 @@ export class SettingsManager {
 	}
 
 	/**
-	 * Persist current global settings to SQLite storage and rebuild merged settings.
-	 * Merges with any concurrent changes in storage before saving.
+	 * Persist current global settings to config.yml and rebuild merged settings.
+	 * Uses file locking to prevent concurrent write races.
 	 */
 	private async save(): Promise<void> {
-		if (this.persist && this.storage) {
+		if (this.persist && this.configPath) {
+			const configPath = this.configPath;
 			try {
-				const currentSettings = this.storage.getSettings() ?? {};
-				const mergedSettings = deepMergeSettings(currentSettings, this.globalSettings);
-				this.globalSettings = mergedSettings;
-				this.storage.saveSettings(this.globalSettings);
+				await withFileLock(configPath, async () => {
+					const currentSettings = SettingsManager.loadFromYaml(configPath);
+					const mergedSettings = deepMergeSettings(currentSettings, this.globalSettings);
+					this.globalSettings = mergedSettings;
+					await Bun.write(configPath, YAML.stringify(this.globalSettings, null, 2));
+				});
 			} catch (error) {
 				logger.warn("SettingsManager save failed", { error: String(error) });
 			}
 		}
 
-		// Always re-merge to update active settings (needed for both file and inMemory modes)
 		const projectSettings = await this.loadProjectSettings();
 		this.rebuildSettings(projectSettings);
 	}
@@ -800,6 +864,17 @@ export class SettingsManager {
 		};
 	}
 
+	getCommitSettings(): Required<CommitSettings> {
+		return {
+			mapReduceEnabled: this.settings.commit?.mapReduceEnabled ?? true,
+			mapReduceMinFiles: this.settings.commit?.mapReduceMinFiles ?? 4,
+			mapReduceMaxFileTokens: this.settings.commit?.mapReduceMaxFileTokens ?? 50_000,
+			mapReduceTimeoutMs: this.settings.commit?.mapReduceTimeoutMs ?? 120_000,
+			mapReduceMaxConcurrency: this.settings.commit?.mapReduceMaxConcurrency ?? 5,
+			changelogMaxDiffChars: this.settings.commit?.changelogMaxDiffChars ?? 120_000,
+		};
+	}
+
 	getRetryMaxRetries(): number {
 		return this.settings.retry?.maxRetries ?? 3;
 	}

package/src/config.ts

@@ -69,16 +69,16 @@ export function getModelsPath(): string {
 	return join(getAgentDir(), "models.json");
 }
 
+/** Get path to models.yml (preferred over models.json) */
+export function getModelsYamlPath(): string {
+	return join(getAgentDir(), "models.yml");
+}
+
 /** Get path to auth.json */
 export function getAuthPath(): string {
 	return join(getAgentDir(), "auth.json");
 }
 
-/** Get path to settings.json */
-export function getSettingsPath(): string {
-	return join(getAgentDir(), "settings.json");
-}
-
 /**
  * Gets the path to agent.db (SQLite database for settings and auth storage).
  * @param agentDir - Base agent directory, defaults to ~/.omp/agent

package/src/discovery/agents-md.ts

@@ -7,9 +7,9 @@
  */
 
 import { dirname, join, sep } from "node:path";
+import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability";
 import { type ContextFile, contextFileCapability } from "@oh-my-pi/pi-coding-agent/capability/context-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 { LoadContext, LoadResult } from "@oh-my-pi/pi-coding-agent/capability/types";
 import { calculateDepth, createSourceMeta } from "./helpers";
 

package/src/discovery/builtin.ts

@@ -5,6 +5,7 @@
  * .pi is an alias for backwards compatibility.
  */
 
+import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability";
 import { type ContextFile, contextFileCapability } from "@oh-my-pi/pi-coding-agent/capability/context-file";
 import {
 	type Extension,
@@ -14,7 +15,6 @@ import {
 import { type ExtensionModule, extensionModuleCapability } from "@oh-my-pi/pi-coding-agent/capability/extension-module";
 import { readDirEntries, readFile } from "@oh-my-pi/pi-coding-agent/capability/fs";
 import { type Hook, hookCapability } from "@oh-my-pi/pi-coding-agent/capability/hook";
-import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability/index";
 import { type Instruction, instructionCapability } from "@oh-my-pi/pi-coding-agent/capability/instruction";
 import { type MCPServer, mcpCapability } from "@oh-my-pi/pi-coding-agent/capability/mcp";
 import { type Prompt, promptCapability } from "@oh-my-pi/pi-coding-agent/capability/prompt";

package/src/discovery/claude.ts

@@ -6,11 +6,11 @@
  */
 
 import { join, sep } from "node:path";
+import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability";
 import { type ContextFile, contextFileCapability } from "@oh-my-pi/pi-coding-agent/capability/context-file";
 import { type ExtensionModule, extensionModuleCapability } from "@oh-my-pi/pi-coding-agent/capability/extension-module";
 import { readFile } from "@oh-my-pi/pi-coding-agent/capability/fs";
 import { type Hook, hookCapability } from "@oh-my-pi/pi-coding-agent/capability/hook";
-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 Settings, settingsCapability } from "@oh-my-pi/pi-coding-agent/capability/settings";
 import { type Skill, skillCapability } from "@oh-my-pi/pi-coding-agent/capability/skill";

package/src/discovery/cline.ts

@@ -6,8 +6,8 @@
  */
 
 import { dirname, resolve } from "node:path";
+import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability";
 import { readDirEntries, readFile } from "@oh-my-pi/pi-coding-agent/capability/fs";
-import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability/index";
 import type { Rule } from "@oh-my-pi/pi-coding-agent/capability/rule";
 import { ruleCapability } from "@oh-my-pi/pi-coding-agent/capability/rule";
 import type { LoadContext, LoadResult } from "@oh-my-pi/pi-coding-agent/capability/types";

package/src/discovery/codex.ts

@@ -8,13 +8,13 @@
  */
 
 import { join } from "node:path";
+import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability";
 import type { ContextFile } from "@oh-my-pi/pi-coding-agent/capability/context-file";
 import { contextFileCapability } from "@oh-my-pi/pi-coding-agent/capability/context-file";
 import { type ExtensionModule, extensionModuleCapability } from "@oh-my-pi/pi-coding-agent/capability/extension-module";
 import { readFile } from "@oh-my-pi/pi-coding-agent/capability/fs";
 import type { Hook } from "@oh-my-pi/pi-coding-agent/capability/hook";
 import { hookCapability } from "@oh-my-pi/pi-coding-agent/capability/hook";
-import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability/index";
 import type { MCPServer } from "@oh-my-pi/pi-coding-agent/capability/mcp";
 import { mcpCapability } from "@oh-my-pi/pi-coding-agent/capability/mcp";
 import type { Prompt } from "@oh-my-pi/pi-coding-agent/capability/prompt";

package/src/discovery/cursor.ts

@@ -14,8 +14,8 @@
  * - settings: From settings.json if present
  */
 
+import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability";
 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 } from "@oh-my-pi/pi-coding-agent/capability/rule";
 import { ruleCapability } from "@oh-my-pi/pi-coding-agent/capability/rule";

package/src/discovery/gemini.ts

@@ -17,6 +17,7 @@
  */
 
 import { join, sep } from "node:path";
+import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability";
 import { type ContextFile, contextFileCapability } from "@oh-my-pi/pi-coding-agent/capability/context-file";
 import {
 	type Extension,
@@ -25,7 +26,6 @@ import {
 } from "@oh-my-pi/pi-coding-agent/capability/extension";
 import { type ExtensionModule, extensionModuleCapability } from "@oh-my-pi/pi-coding-agent/capability/extension-module";
 import { readDirEntries, 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 Settings, settingsCapability } from "@oh-my-pi/pi-coding-agent/capability/settings";
 import { type SystemPrompt, systemPromptCapability } from "@oh-my-pi/pi-coding-agent/capability/system-prompt";

package/src/discovery/github.ts

@@ -13,9 +13,9 @@
  */
 
 import { basename, dirname, sep } from "node:path";
+import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability";
 import { type ContextFile, contextFileCapability } from "@oh-my-pi/pi-coding-agent/capability/context-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 Instruction, instructionCapability } from "@oh-my-pi/pi-coding-agent/capability/instruction";
 import type { LoadContext, LoadResult, SourceMeta } from "@oh-my-pi/pi-coding-agent/capability/types";
 import { parseFrontmatter } from "@oh-my-pi/pi-coding-agent/utils/frontmatter";

package/src/discovery/index.ts

@@ -17,28 +17,24 @@ import "../capability/rule";
 import "../capability/settings";
 import "../capability/skill";
 import "../capability/slash-command";
-import "../capability/system-prompt";
 import "../capability/ssh";
+import "../capability/system-prompt";
 import "../capability/tool";
 
 // Import providers (each registers itself on import)
+import "./agents-md";
 import "./builtin";
 import "./claude";
+import "./cline";
 import "./codex";
-import "./gemini";
 import "./cursor";
-import "./windsurf";
-import "./cline";
+import "./gemini";
 import "./github";
-import "./vscode";
-import "./agents-md";
 import "./mcp-json";
 import "./ssh";
+import "./vscode";
+import "./windsurf";
 
-export type { ContextFile } from "@oh-my-pi/pi-coding-agent/capability/context-file";
-export type { Extension, ExtensionManifest } from "@oh-my-pi/pi-coding-agent/capability/extension";
-export type { ExtensionModule } from "@oh-my-pi/pi-coding-agent/capability/extension-module";
-export type { Hook } from "@oh-my-pi/pi-coding-agent/capability/hook";
 // Re-export the main API from capability registry
 export {
 	cacheStats,
@@ -62,7 +58,11 @@ export {
 	// Cache management
 	reset,
 	setDisabledProviders,
-} from "@oh-my-pi/pi-coding-agent/capability/index";
+} from "@oh-my-pi/pi-coding-agent/capability";
+export type { ContextFile } from "@oh-my-pi/pi-coding-agent/capability/context-file";
+export type { Extension, ExtensionManifest } from "@oh-my-pi/pi-coding-agent/capability/extension";
+export type { ExtensionModule } from "@oh-my-pi/pi-coding-agent/capability/extension-module";
+export type { Hook } from "@oh-my-pi/pi-coding-agent/capability/hook";
 export type { Instruction } from "@oh-my-pi/pi-coding-agent/capability/instruction";
 // Re-export capability item types
 export type { MCPServer } from "@oh-my-pi/pi-coding-agent/capability/mcp";

package/src/discovery/mcp-json.ts

@@ -8,8 +8,8 @@
  */
 
 import { join } from "node:path";
+import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability";
 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 { createSourceMeta, expandEnvVarsDeep, parseJSON } from "./helpers";

package/src/discovery/ssh.ts

@@ -6,8 +6,8 @@
  */
 
 import { join } from "node:path";
+import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability";
 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 { createSourceMeta, expandEnvVarsDeep, parseJSON } from "./helpers";

package/src/discovery/vscode.ts

@@ -5,8 +5,8 @@
  * Supports MCP server discovery from `mcp.json` with nested `mcp.servers` structure.
  */
 
+import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability";
 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 { createSourceMeta, expandEnvVarsDeep, getProjectPath, parseJSON } from "./helpers";

package/src/discovery/windsurf.ts

@@ -11,8 +11,8 @@
  * - Legacy .windsurfrules file
  */
 
+import { registerProvider } from "@oh-my-pi/pi-coding-agent/capability";
 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";

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

@@ -7,9 +7,9 @@
 
 import { type Dirent, existsSync, readdirSync } from "node:fs";
 import * as path from "node:path";
+import * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
 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 typebox from "@sinclair/typebox";
 import { ReviewCommand } from "./bundled/review";

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

@@ -23,7 +23,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("../..");
 }
 
 /**

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

@@ -6,6 +6,7 @@
  */
 
 import * as path from "node:path";
+import * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
 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";
@@ -13,7 +14,6 @@ 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 { logger } from "@oh-my-pi/pi-utils";
 import * as typebox from "@sinclair/typebox";

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

@@ -39,7 +39,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/extensions/loader.ts

@@ -6,12 +6,12 @@ import { existsSync, readdirSync, readFileSync, statSync } from "node:fs";
 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 * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
 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 type { KeyId } from "@oh-my-pi/pi-tui";

package/src/extensibility/extensions/types.ts

@@ -10,11 +10,11 @@
 
 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 * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
 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";

package/src/extensibility/hooks/loader.ts

@@ -3,11 +3,11 @@
  */
 
 import * as path from "node:path";
+import * as piCodingAgent from "@oh-my-pi/pi-coding-agent";
 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 { logger } from "@oh-my-pi/pi-utils";

package/src/extensibility/hooks/types.ts

@@ -11,7 +11,7 @@ import type { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-regis
 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 { CompactionPreparation, CompactionResult } from "@oh-my-pi/pi-coding-agent/session/compaction";
 import type { HookMessage } from "@oh-my-pi/pi-coding-agent/session/messages";
 import type {
 	BranchSummaryEntry,
@@ -26,7 +26,7 @@ import type {
 	GrepToolDetails,
 	LsToolDetails,
 	ReadToolDetails,
-} from "@oh-my-pi/pi-coding-agent/tools/index";
+} from "@oh-my-pi/pi-coding-agent/tools";
 import type { Component, TUI } from "@oh-my-pi/pi-tui";
 
 // Re-export for backward compatibility
@@ -752,7 +752,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("../..");
 }
 
 /**