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

package/src/cli/list-models.ts

@@ -1,10 +1,9 @@
 /**
  * List available models with optional fuzzy search
  */
-
 import type { Api, Model } from "@oh-my-pi/pi-ai";
-import type { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
-import { fuzzyFilter } from "@oh-my-pi/pi-coding-agent/utils/fuzzy";
+import type { ModelRegistry } from "../config/model-registry";
+import { fuzzyFilter } from "../utils/fuzzy";
 
 /**
  * Format a number as human-readable (e.g., 200000 -> "200K", 1000000 -> "1M")
@@ -35,7 +34,7 @@ export async function listModels(modelRegistry: ModelRegistry, searchPattern?: s
 	// Apply fuzzy filter if search pattern provided
 	let filteredModels: Model<Api>[] = models;
 	if (searchPattern) {
-		filteredModels = fuzzyFilter(models, searchPattern, (m) => `${m.provider} ${m.id}`);
+		filteredModels = fuzzyFilter(models, searchPattern, m => `${m.provider} ${m.id}`);
 	}
 
 	if (filteredModels.length === 0) {
@@ -51,7 +50,7 @@ export async function listModels(modelRegistry: ModelRegistry, searchPattern?: s
 	});
 
 	// Calculate column widths
-	const rows = filteredModels.map((m) => ({
+	const rows = filteredModels.map(m => ({
 		provider: m.provider,
 		model: m.id,
 		context: formatTokenCount(m.contextWindow),
@@ -70,12 +69,12 @@ export async function listModels(modelRegistry: ModelRegistry, searchPattern?: s
 	};
 
 	const widths = {
-		provider: Math.max(headers.provider.length, ...rows.map((r) => r.provider.length)),
-		model: Math.max(headers.model.length, ...rows.map((r) => r.model.length)),
-		context: Math.max(headers.context.length, ...rows.map((r) => r.context.length)),
-		maxOut: Math.max(headers.maxOut.length, ...rows.map((r) => r.maxOut.length)),
-		thinking: Math.max(headers.thinking.length, ...rows.map((r) => r.thinking.length)),
-		images: Math.max(headers.images.length, ...rows.map((r) => r.images.length)),
+		provider: Math.max(headers.provider.length, ...rows.map(r => r.provider.length)),
+		model: Math.max(headers.model.length, ...rows.map(r => r.model.length)),
+		context: Math.max(headers.context.length, ...rows.map(r => r.context.length)),
+		maxOut: Math.max(headers.maxOut.length, ...rows.map(r => r.maxOut.length)),
+		thinking: Math.max(headers.thinking.length, ...rows.map(r => r.thinking.length)),
+		images: Math.max(headers.images.length, ...rows.map(r => r.images.length)),
 	};
 
 	// Print header

package/src/cli/plugin-cli.ts

@@ -3,11 +3,10 @@
  *
  * Handles `omp plugin <command>` subcommands for plugin lifecycle management.
  */
-
-import { APP_NAME } from "@oh-my-pi/pi-coding-agent/config";
-import { PluginManager, parseSettingValue, validateSetting } from "@oh-my-pi/pi-coding-agent/extensibility/plugins";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import chalk from "chalk";
+import { APP_NAME } from "../config";
+import { PluginManager, parseSettingValue, validateSetting } from "../extensibility/plugins";
+import { theme } from "../modes/theme/theme";
 
 // =============================================================================
 // Types
@@ -247,7 +246,7 @@ async function handleList(manager: PluginManager, flags: { json?: boolean }): Pr
 			if (availableFeatures.length > 0) {
 				const enabledSet = new Set(plugin.enabledFeatures ?? []);
 				const featureDisplay = availableFeatures
-					.map((f) => (enabledSet.has(f) ? chalk.green(f) : chalk.dim(f)))
+					.map(f => (enabledSet.has(f) ? chalk.green(f) : chalk.dim(f)))
 					.join(", ");
 				console.log(chalk.dim(`  Available: [${featureDisplay}]`));
 			}
@@ -298,10 +297,10 @@ async function handleDoctor(manager: PluginManager, flags: { json?: boolean; fix
 		}
 	}
 
-	const errors = checks.filter((c) => c.status === "error" && !c.fixed).length;
-	const warnings = checks.filter((c) => c.status === "warning" && !c.fixed).length;
-	const ok = checks.filter((c) => c.status === "ok").length;
-	const fixed = checks.filter((c) => c.fixed).length;
+	const errors = checks.filter(c => c.status === "error" && !c.fixed).length;
+	const warnings = checks.filter(c => c.status === "warning" && !c.fixed).length;
+	const ok = checks.filter(c => c.status === "ok").length;
+	const fixed = checks.filter(c => c.fixed).length;
 
 	console.log("");
 	console.log(`Summary: ${ok} ok, ${warnings} warnings, ${errors} errors${fixed > 0 ? `, ${fixed} fixed` : ""}`);
@@ -328,7 +327,7 @@ async function handleFeatures(
 
 	const pluginName = args[0];
 	const plugins = await manager.list();
-	const plugin = plugins.find((p) => p.name === pluginName);
+	const plugin = plugins.find(p => p.name === pluginName);
 
 	if (!plugin) {
 		console.error(chalk.red(`Plugin "${pluginName}" not found`));
@@ -337,21 +336,21 @@ async function handleFeatures(
 
 	// Handle modifications
 	if (flags.enable || flags.disable || flags.set) {
-		let currentFeatures = new Set(manager.getEnabledFeatures(pluginName) ?? []);
+		let currentFeatures = new Set((await manager.getEnabledFeatures(pluginName)) ?? []);
 
 		if (flags.set) {
 			// --set replaces all features
 			currentFeatures = new Set(
 				flags.set
 					.split(",")
-					.map((f) => f.trim())
+					.map(f => f.trim())
 					.filter(Boolean),
 			);
 		} else {
 			if (flags.enable) {
 				for (const f of flags.enable
 					.split(",")
-					.map((f) => f.trim())
+					.map(f => f.trim())
 					.filter(Boolean)) {
 					currentFeatures.add(f);
 				}
@@ -359,7 +358,7 @@ async function handleFeatures(
 			if (flags.disable) {
 				for (const f of flags.disable
 					.split(",")
-					.map((f) => f.trim())
+					.map(f => f.trim())
 					.filter(Boolean)) {
 					currentFeatures.delete(f);
 				}
@@ -371,7 +370,7 @@ async function handleFeatures(
 	}
 
 	// Display current state
-	const updatedFeatures = manager.getEnabledFeatures(pluginName);
+	const updatedFeatures = await manager.getEnabledFeatures(pluginName);
 
 	if (flags.json) {
 		console.log(
@@ -433,7 +432,7 @@ async function handleConfig(
 	}
 
 	const plugins = await manager.list();
-	const plugin = plugins.find((p) => p.name === pluginName);
+	const plugin = plugins.find(p => p.name === pluginName);
 
 	if (!plugin) {
 		console.error(chalk.red(`Plugin "${pluginName}" not found`));
@@ -442,7 +441,7 @@ async function handleConfig(
 
 	switch (subcommand) {
 		case "list": {
-			const settings = manager.getPluginSettings(pluginName);
+			const settings = await manager.getPluginSettings(pluginName);
 			const schema = plugin.manifest.settings || {};
 
 			if (flags.json) {
@@ -477,7 +476,7 @@ async function handleConfig(
 				process.exit(1);
 			}
 
-			const settings = manager.getPluginSettings(pluginName);
+			const settings = await manager.getPluginSettings(pluginName);
 			const schema = plugin.manifest.settings?.[key];
 			const value = settings[key] ?? schema?.default;
 
@@ -512,7 +511,7 @@ async function handleConfig(
 				}
 			}
 
-			manager.setPluginSetting(pluginName, key, value);
+			await manager.setPluginSetting(pluginName, key, value);
 			console.log(chalk.green(`${theme.status.success} Set ${key}`));
 			break;
 		}
@@ -523,7 +522,7 @@ async function handleConfig(
 				process.exit(1);
 			}
 
-			manager.deletePluginSetting(pluginName, key);
+			await manager.deletePluginSetting(pluginName, key);
 			console.log(chalk.green(`${theme.status.success} Deleted ${key}`));
 			break;
 		}
@@ -540,7 +539,7 @@ async function handleConfigValidate(manager: PluginManager, flags: { json?: bool
 	const results: Array<{ plugin: string; key: string; error: string }> = [];
 
 	for (const plugin of plugins) {
-		const settings = manager.getPluginSettings(plugin.name);
+		const settings = await manager.getPluginSettings(plugin.name);
 		const schema = plugin.manifest.settings || {};
 
 		for (const [key, s] of Object.entries(schema)) {

package/src/cli/session-picker.ts

@@ -1,10 +1,9 @@
 /**
  * TUI session selector for --resume flag
  */
-
-import { SessionSelectorComponent } from "@oh-my-pi/pi-coding-agent/modes/components/session-selector";
-import type { SessionInfo } from "@oh-my-pi/pi-coding-agent/session/session-manager";
 import { ProcessTerminal, TUI } from "@oh-my-pi/pi-tui";
+import { SessionSelectorComponent } from "../modes/components/session-selector";
+import type { SessionInfo } from "../session/session-manager";
 
 /** Show TUI session selector and return selected session path or null if cancelled */
 export async function selectSession(sessions: SessionInfo[]): Promise<string | null> {

package/src/cli/setup-cli.ts

@@ -3,11 +3,10 @@
  *
  * Handles `omp setup <component>` to install dependencies for optional features.
  */
-
-import { APP_NAME } from "@oh-my-pi/pi-coding-agent/config";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import { $ } from "bun";
 import chalk from "chalk";
+import { APP_NAME } from "../config";
+import { theme } from "../modes/theme/theme";
 
 export type SetupComponent = "python";
 

package/src/cli/stats-cli.ts

@@ -3,9 +3,8 @@
  *
  * Handles `omp stats` subcommand for viewing AI usage statistics.
  */
-
-import { APP_NAME } from "@oh-my-pi/pi-coding-agent/config";
 import chalk from "chalk";
+import { APP_NAME } from "../config";
 
 // =============================================================================
 // Types
@@ -106,7 +105,7 @@ export async function runStatsCommand(cmd: StatsCommandArgs): Promise<void> {
 	}
 
 	// Start the dashboard server
-	const { port } = startServer(cmd.port);
+	const { port } = await startServer(cmd.port);
 	console.log(chalk.green(`Dashboard available at: http://localhost:${port}`));
 	console.log("Press Ctrl+C to stop\n");
 

package/src/cli/update-cli.ts

@@ -4,15 +4,15 @@
  * Handles `omp update` to check for and install updates.
  * Uses bun if available, otherwise downloads binary from GitHub releases.
  */
-
 import { execSync, spawnSync } from "node:child_process";
-import { createWriteStream, existsSync, renameSync, unlinkSync } from "node:fs";
-import { dirname } from "node:path";
+import * as fs from "node:fs";
+import * as path from "node:path";
 import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
-import { APP_NAME, VERSION } from "@oh-my-pi/pi-coding-agent/config";
-import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import { isEnoent } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
+import { APP_NAME, VERSION } from "../config";
+import { theme } from "../modes/theme/theme";
 
 /**
  * Detect if we're running as a Bun compiled binary.
@@ -73,7 +73,7 @@ async function getLatestRelease(): Promise<ReleaseInfo> {
 	return {
 		tag: data.tag_name,
 		version: data.tag_name.replace(/^v/, ""),
-		assets: data.assets.map((a) => ({ name: a.name, url: a.browser_download_url })),
+		assets: data.assets.map(a => ({ name: a.name, url: a.browser_download_url })),
 	};
 }
 
@@ -154,14 +154,14 @@ async function updateViaBun(): Promise<void> {
  */
 async function updateViaBinary(release: ReleaseInfo): Promise<void> {
 	const binaryName = getBinaryName();
-	const asset = release.assets.find((a) => a.name === binaryName);
+	const asset = release.assets.find(a => a.name === binaryName);
 
 	if (!asset) {
 		throw new Error(`No binary found for ${binaryName}`);
 	}
 
 	const execPath = process.execPath;
-	const _execDir = dirname(execPath);
+	const _execDir = path.dirname(execPath);
 	const tempPath = `${execPath}.new`;
 	const backupPath = `${execPath}.bak`;
 
@@ -173,7 +173,7 @@ async function updateViaBinary(release: ReleaseInfo): Promise<void> {
 		throw new Error(`Download failed: ${response.statusText}`);
 	}
 
-	const fileStream = createWriteStream(tempPath, { mode: 0o755 });
+	const fileStream = fs.createWriteStream(tempPath, { mode: 0o755 });
 	const nodeStream = Readable.fromWeb(response.body as import("stream/web").ReadableStream);
 	await pipeline(nodeStream, fileStream);
 
@@ -181,27 +181,30 @@ async function updateViaBinary(release: ReleaseInfo): Promise<void> {
 	console.log(chalk.dim("Installing update..."));
 
 	try {
-		// Backup current binary
-		if (existsSync(backupPath)) {
-			unlinkSync(backupPath);
+		try {
+			await fs.promises.unlink(backupPath);
+		} catch (err) {
+			if (!isEnoent(err)) throw err;
 		}
-		renameSync(execPath, backupPath);
+		await fs.promises.rename(execPath, backupPath);
 
-		// Move new binary into place
-		renameSync(tempPath, execPath);
+		await fs.promises.rename(tempPath, execPath);
 
-		// Clean up backup
-		unlinkSync(backupPath);
+		await fs.promises.unlink(backupPath);
 
 		console.log(chalk.green(`\n${theme.status.success} Updated to ${release.version}`));
 		console.log(chalk.dim(`Restart ${APP_NAME} to use the new version`));
 	} catch (err) {
-		// Restore from backup if possible
-		if (existsSync(backupPath) && !existsSync(execPath)) {
-			renameSync(backupPath, execPath);
+		const [backupExists, execExists, tempExists] = await Promise.all([
+			Bun.file(backupPath).exists(),
+			Bun.file(execPath).exists(),
+			Bun.file(tempPath).exists(),
+		]);
+		if (backupExists && !execExists) {
+			await fs.promises.rename(backupPath, execPath);
 		}
-		if (existsSync(tempPath)) {
-			unlinkSync(tempPath);
+		if (tempExists) {
+			await fs.promises.unlink(tempPath);
 		}
 		throw err;
 	}

package/src/commit/agentic/agent.ts

@@ -1,21 +1,19 @@
 import type { Api, Model } from "@oh-my-pi/pi-ai";
-import agentUserPrompt from "@oh-my-pi/pi-coding-agent/commit/agentic/prompts/session-user.md" with { type: "text" };
-import agentSystemPrompt from "@oh-my-pi/pi-coding-agent/commit/agentic/prompts/system.md" with { type: "text" };
-import type { CommitAgentState } from "@oh-my-pi/pi-coding-agent/commit/agentic/state";
-import { createCommitTools } from "@oh-my-pi/pi-coding-agent/commit/agentic/tools";
-import type { ControlledGit } from "@oh-my-pi/pi-coding-agent/commit/git";
-import typesDescriptionPrompt from "@oh-my-pi/pi-coding-agent/commit/prompts/types-description.md" with {
-	type: "text",
-};
-import type { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import type { SettingsManager } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import { getMarkdownTheme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
-import { createAgentSession } from "@oh-my-pi/pi-coding-agent/sdk";
-import type { AgentSessionEvent } from "@oh-my-pi/pi-coding-agent/session/agent-session";
-import type { AuthStorage } from "@oh-my-pi/pi-coding-agent/session/auth-storage";
 import { Markdown } from "@oh-my-pi/pi-tui";
 import chalk from "chalk";
+import type { ControlledGit } from "../../commit/git";
+import typesDescriptionPrompt from "../../commit/prompts/types-description.md" with { type: "text" };
+import type { ModelRegistry } from "../../config/model-registry";
+import { renderPromptTemplate } from "../../config/prompt-templates";
+import type { SettingsManager } from "../../config/settings-manager";
+import { getMarkdownTheme } from "../../modes/theme/theme";
+import { createAgentSession } from "../../sdk";
+import type { AgentSessionEvent } from "../../session/agent-session";
+import type { AuthStorage } from "../../session/auth-storage";
+import agentUserPrompt from "./prompts/session-user.md" with { type: "text" };
+import agentSystemPrompt from "./prompts/system.md" with { type: "text" };
+import type { CommitAgentState } from "./state";
+import { createCommitTools } from "./tools";
 
 export interface CommitAgentInput {
 	cwd: string;
@@ -176,8 +174,8 @@ function writeStdout(message: string): void {
 
 function extractMessagePreview(content: Array<{ type: string; text?: string }>): string | null {
 	const textBlocks = content
-		.filter((block) => block.type === "text" && typeof block.text === "string")
-		.map((block) => block.text?.trim())
+		.filter(block => block.type === "text" && typeof block.text === "string")
+		.map(block => block.text?.trim())
 		.filter((value): value is string => Boolean(value));
 	if (textBlocks.length === 0) return null;
 	const combined = textBlocks.join(" ").replace(/\s+/g, " ").trim();
@@ -186,9 +184,9 @@ function extractMessagePreview(content: Array<{ type: string; text?: string }>):
 
 function extractMessageText(content: Array<{ type: string; text?: string }>): string | null {
 	const textBlocks = content
-		.filter((block) => block.type === "text" && typeof block.text === "string")
-		.map((block) => block.text ?? "")
-		.filter((value) => value.trim().length > 0);
+		.filter(block => block.type === "text" && typeof block.text === "string")
+		.map(block => block.text ?? "")
+		.filter(value => value.trim().length > 0);
 	if (textBlocks.length === 0) return null;
 	return textBlocks.join("\n").trim();
 }
@@ -196,7 +194,7 @@ function extractMessageText(content: Array<{ type: string; text?: string }>): st
 function writeAssistantMessage(message: string): void {
 	const lines = renderMarkdownLines(message);
 	if (lines.length === 0) return;
-	let firstContentIndex = lines.findIndex((line) => line.trim().length > 0);
+	let firstContentIndex = lines.findIndex(line => line.trim().length > 0);
 	if (firstContentIndex === -1) {
 		firstContentIndex = 0;
 	}
@@ -215,7 +213,7 @@ function renderMarkdownLines(message: string): string[] {
 function formatToolLabel(toolName: string): string {
 	const displayName = toolName
 		.split(/[_-]/)
-		.map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1))
+		.map(segment => segment.charAt(0).toUpperCase() + segment.slice(1))
 		.join("");
 	return displayName;
 }
@@ -227,7 +225,7 @@ function formatToolArgs(args?: Record<string, unknown>): string[] {
 		if (value === null || value === undefined) return;
 		if (Array.isArray(value)) {
 			if (value.length === 0) return;
-			const rendered = value.map((item) => renderPrimitive(item)).filter(Boolean);
+			const rendered = value.map(item => renderPrimitive(item)).filter(Boolean);
 			if (rendered.length > 0) {
 				lines.push(`${keyPath}: ${rendered.join(", ")}`);
 			}

package/src/commit/agentic/fallback.ts

@@ -1,6 +1,6 @@
-import { basename } from "node:path";
-import type { CommitProposal } from "@oh-my-pi/pi-coding-agent/commit/agentic/state";
-import type { CommitType, ConventionalAnalysis, NumstatEntry } from "@oh-my-pi/pi-coding-agent/commit/types";
+import * as path from "node:path";
+import type { CommitType, ConventionalAnalysis, NumstatEntry } from "../../commit/types";
+import type { CommitProposal } from "./state";
 
 const TEST_PATTERNS = ["/test/", "/tests/", "/__tests__/", "_test.", ".test.", ".spec.", "_spec."];
 const DOC_EXTENSIONS = new Set([".md", ".txt", ".rst", ".adoc"]);
@@ -20,7 +20,7 @@ function inferTypeFromFiles(numstat: NumstatEntry[]): CommitType {
 		const lowerPath = entry.path.toLowerCase();
 		const ext = getExtension(entry.path);
 
-		if (TEST_PATTERNS.some((pattern) => lowerPath.includes(pattern))) {
+		if (TEST_PATTERNS.some(pattern => lowerPath.includes(pattern))) {
 			hasTests = true;
 		} else if (DOC_EXTENSIONS.has(ext)) {
 			hasDocs = true;
@@ -40,16 +40,16 @@ function inferTypeFromFiles(numstat: NumstatEntry[]): CommitType {
 	return "refactor";
 }
 
-function getExtension(path: string): string {
-	const name = basename(path);
+function getExtension(filePath: string): string {
+	const name = path.basename(filePath);
 	const dotIndex = name.lastIndexOf(".");
 	return dotIndex >= 0 ? name.slice(dotIndex).toLowerCase() : "";
 }
 
 export function generateFallbackAnalysis(numstat: NumstatEntry[]): ConventionalAnalysis {
 	const type = inferTypeFromFiles(numstat);
-	const details = numstat.slice(0, 3).map((e) => ({
-		text: `Updated ${basename(e.path)}`,
+	const details = numstat.slice(0, 3).map(e => ({
+		text: `Updated ${path.basename(e.path)}`,
 		userVisible: false,
 	}));
 
@@ -76,7 +76,7 @@ export function generateFallbackSummary(type: CommitType, numstat: NumstatEntry[
 		revert: "reverted changes in",
 	};
 	const verb = verbMap[type] ?? "updated";
-	const file = basename(numstat[0]?.path ?? "files");
+	const file = path.basename(numstat[0]?.path ?? "files");
 
 	if (numstat.length === 1) {
 		return `${verb} ${file}`;

package/src/commit/agentic/index.ts

@@ -1,28 +1,21 @@
-import { relative } from "node:path";
+import * as path from "node:path";
 import { createInterface } from "node:readline/promises";
-import { type ExistingChangelogEntries, runCommitAgentSession } from "@oh-my-pi/pi-coding-agent/commit/agentic/agent";
-import { generateFallbackProposal } from "@oh-my-pi/pi-coding-agent/commit/agentic/fallback";
-import splitConfirmPrompt from "@oh-my-pi/pi-coding-agent/commit/agentic/prompts/split-confirm.md" with {
-	type: "text",
-};
-import type {
-	CommitAgentState,
-	CommitProposal,
-	HunkSelector,
-	SplitCommitPlan,
-} from "@oh-my-pi/pi-coding-agent/commit/agentic/state";
-import { computeDependencyOrder } from "@oh-my-pi/pi-coding-agent/commit/agentic/topo-sort";
-import { detectTrivialChange } from "@oh-my-pi/pi-coding-agent/commit/agentic/trivial";
-import { applyChangelogProposals } from "@oh-my-pi/pi-coding-agent/commit/changelog";
-import { detectChangelogBoundaries } from "@oh-my-pi/pi-coding-agent/commit/changelog/detect";
-import { parseUnreleasedSection } from "@oh-my-pi/pi-coding-agent/commit/changelog/parse";
-import { ControlledGit } from "@oh-my-pi/pi-coding-agent/commit/git";
-import { formatCommitMessage } from "@oh-my-pi/pi-coding-agent/commit/message";
-import { resolvePrimaryModel, resolveSmolModel } from "@oh-my-pi/pi-coding-agent/commit/model-selection";
-import type { CommitCommandArgs, ConventionalAnalysis } from "@oh-my-pi/pi-coding-agent/commit/types";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
-import { SettingsManager } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
-import { discoverAuthStorage, discoverContextFiles, discoverModels } from "@oh-my-pi/pi-coding-agent/sdk";
+import { applyChangelogProposals } from "../../commit/changelog";
+import { detectChangelogBoundaries } from "../../commit/changelog/detect";
+import { parseUnreleasedSection } from "../../commit/changelog/parse";
+import { ControlledGit } from "../../commit/git";
+import { formatCommitMessage } from "../../commit/message";
+import { resolvePrimaryModel, resolveSmolModel } from "../../commit/model-selection";
+import type { CommitCommandArgs, ConventionalAnalysis } from "../../commit/types";
+import { renderPromptTemplate } from "../../config/prompt-templates";
+import { SettingsManager } from "../../config/settings-manager";
+import { discoverAuthStorage, discoverContextFiles, discoverModels } from "../../sdk";
+import { type ExistingChangelogEntries, runCommitAgentSession } from "./agent";
+import { generateFallbackProposal } from "./fallback";
+import splitConfirmPrompt from "./prompts/split-confirm.md" with { type: "text" };
+import type { CommitAgentState, CommitProposal, HunkSelector, SplitCommitPlan } from "./state";
+import { computeDependencyOrder } from "./topo-sort";
+import { detectTrivialChange } from "./trivial";
 
 interface CommitExecutionContext {
 	git: ControlledGit;
@@ -34,9 +27,9 @@ export async function runAgenticCommit(args: CommitCommandArgs): Promise<void> {
 	const cwd = process.cwd();
 	const git = new ControlledGit(cwd);
 	const [settingsManager, authStorage] = await Promise.all([SettingsManager.create(cwd), discoverAuthStorage()]);
-	const modelRegistryPromise = discoverModels(authStorage);
 
 	writeStdout("● Resolving model...");
+	const modelRegistry = discoverModels(authStorage);
 	const stagedFilesPromise = (async () => {
 		let stagedFiles = await git.getStagedFiles();
 		if (stagedFiles.length === 0) {
@@ -47,7 +40,6 @@ export async function runAgenticCommit(args: CommitCommandArgs): Promise<void> {
 		return stagedFiles;
 	})();
 
-	const modelRegistry = await modelRegistryPromise;
 	const primaryModelPromise = resolvePrimaryModel(args.model, settingsManager, modelRegistry);
 	const [primaryModelResult, stagedFiles] = await Promise.all([primaryModelPromise, stagedFilesPromise]);
 	const { model: primaryModel, apiKey: primaryApiKey } = primaryModelResult;
@@ -69,7 +61,7 @@ export async function runAgenticCommit(args: CommitCommandArgs): Promise<void> {
 		git.getNumstat(true),
 		git.getDiff(true),
 	]);
-	const changelogTargets = changelogBoundaries.map((boundary) => boundary.changelogPath);
+	const changelogTargets = changelogBoundaries.map(boundary => boundary.changelogPath);
 	if (!args.noChangelog) {
 		if (changelogTargets.length > 0) {
 			for (const path of changelogTargets) {
@@ -81,7 +73,7 @@ export async function runAgenticCommit(args: CommitCommandArgs): Promise<void> {
 	}
 
 	writeStdout("● Discovering context files...");
-	const agentsMdFiles = contextFiles.filter((file) => file.path.endsWith("AGENTS.md"));
+	const agentsMdFiles = contextFiles.filter(file => file.path.endsWith("AGENTS.md"));
 	if (agentsMdFiles.length > 0) {
 		for (const file of agentsMdFiles) {
 			writeStdout(`  └─ ${file.path}`);
@@ -168,14 +160,14 @@ export async function runAgenticCommit(args: CommitCommandArgs): Promise<void> {
 			cwd,
 			proposals: commitState.changelogProposal.entries,
 			dryRun: args.dryRun,
-			onProgress: (message) => {
+			onProgress: message => {
 				writeStdout(`  ├─ ${message}`);
 			},
 		});
-		updatedChangelogFiles = updated.map((path) => relative(cwd, path));
+		updatedChangelogFiles = updated.map(filePath => path.relative(cwd, filePath));
 		if (updated.length > 0) {
-			for (const path of updated) {
-				writeStdout(`  └─ ${path}`);
+			for (const filePath of updated) {
+				writeStdout(`  └─ ${filePath}`);
 			}
 		} else {
 			writeStdout("  └─ (no changes)");
@@ -229,8 +221,8 @@ async function runSplitCommit(
 		appendFilesToLastCommit(plan, ctx.additionalFiles);
 	}
 	const stagedFiles = await ctx.git.getStagedFiles();
-	const plannedFiles = new Set(plan.commits.flatMap((commit) => commit.changes.map((change) => change.path)));
-	const missingFiles = stagedFiles.filter((file) => !plannedFiles.has(file));
+	const plannedFiles = new Set(plan.commits.flatMap(commit => commit.changes.map(change => change.path)));
+	const missingFiles = stagedFiles.filter(file => !plannedFiles.has(file));
 	if (missingFiles.length > 0) {
 		writeStderr(`Split commit plan missing staged files: ${missingFiles.join(", ")}`);
 		return;
@@ -248,7 +240,7 @@ async function runSplitCommit(
 			const message = formatCommitMessage(analysis, commit.summary);
 			writeStdout(`Commit ${index + 1}:\n${message}\n`);
 			const changeSummary = commit.changes
-				.map((change) => formatFileChangeSummary(change.path, change.hunks))
+				.map(change => formatFileChangeSummary(change.path, change.hunks))
 				.join(", ");
 			writeStdout(`Changes: ${changeSummary}\n`);
 		}
@@ -288,7 +280,7 @@ async function runSplitCommit(
 
 function appendFilesToLastCommit(plan: SplitCommitPlan, files: string[]): void {
 	if (plan.commits.length === 0) return;
-	const planned = new Set(plan.commits.flatMap((commit) => commit.changes.map((change) => change.path)));
+	const planned = new Set(plan.commits.flatMap(commit => commit.changes.map(change => change.path)));
 	const targetCommit = plan.commits[plan.commits.length - 1];
 	for (const file of files) {
 		if (planned.has(file)) continue;
@@ -312,7 +304,7 @@ async function confirmSplitCommitPlan(plan: SplitCommitPlan): Promise<boolean> {
 }
 
 function formatWarnings(warnings: string[]): string {
-	return `Warnings:\n${warnings.map((warning) => `- ${warning}`).join("\n")}`;
+	return `Warnings:\n${warnings.map(warning => `- ${warning}`).join("\n")}`;
 }
 
 function writeStdout(message: string): void {
@@ -335,7 +327,7 @@ function formatFileChangeSummary(path: string, hunks: HunkSelector): string {
 
 async function loadExistingChangelogEntries(paths: string[]): Promise<ExistingChangelogEntries[]> {
 	const entries = await Promise.all(
-		paths.map(async (path) => {
+		paths.map(async path => {
 			const file = Bun.file(path);
 			if (!(await file.exists())) {
 				return null;

package/src/commit/agentic/state.ts

@@ -1,9 +1,4 @@
-import type {
-	CommitType,
-	ConventionalAnalysis,
-	ConventionalDetail,
-	NumstatEntry,
-} from "@oh-my-pi/pi-coding-agent/commit/types";
+import type { CommitType, ConventionalAnalysis, ConventionalDetail, NumstatEntry } from "../../commit/types";
 
 export interface GitOverviewSnapshot {
 	files: string[];