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

package/src/commit/changelog/index.ts

@@ -1,10 +1,10 @@
-import { relative, resolve } from "node:path";
+import * as path from "node:path";
 import type { Api, Model } from "@oh-my-pi/pi-ai";
-import { detectChangelogBoundaries } from "@oh-my-pi/pi-coding-agent/commit/changelog/detect";
-import { generateChangelogEntries } from "@oh-my-pi/pi-coding-agent/commit/changelog/generate";
-import { parseUnreleasedSection } from "@oh-my-pi/pi-coding-agent/commit/changelog/parse";
-import type { ControlledGit } from "@oh-my-pi/pi-coding-agent/commit/git";
 import { logger } from "@oh-my-pi/pi-utils";
+import type { ControlledGit } from "../../commit/git";
+import { detectChangelogBoundaries } from "./detect";
+import { generateChangelogEntries } from "./generate";
+import { parseUnreleasedSection } from "./parse";
 
 const CHANGELOG_SECTIONS = ["Breaking Changes", "Added", "Changed", "Deprecated", "Removed", "Fixed", "Security"];
 
@@ -67,7 +67,7 @@ export async function runChangelogFlow({
 			continue;
 		}
 		const existingEntries = formatExistingEntries(unreleased.entries);
-		const isPackageChangelog = resolve(boundary.changelogPath) !== resolve(cwd, "CHANGELOG.md");
+		const isPackageChangelog = path.resolve(boundary.changelogPath) !== path.resolve(cwd, "CHANGELOG.md");
 		const generated = await generateChangelogEntries({
 			model,
 			apiKey,
@@ -82,7 +82,7 @@ export async function runChangelogFlow({
 		const updatedContent = applyChangelogEntries(changelogContent, unreleased, generated.entries);
 		if (!dryRun) {
 			await Bun.write(boundary.changelogPath, updatedContent);
-			await git.stageFiles([relative(cwd, boundary.changelogPath)]);
+			await git.stageFiles([path.relative(cwd, boundary.changelogPath)]);
 		}
 		updated.push(boundary.changelogPath);
 	}
@@ -127,7 +127,7 @@ export async function applyChangelogProposals({
 		const updatedContent = applyChangelogEntries(changelogContent, unreleased, normalized, normalizedDeletions);
 		if (!dryRun) {
 			await Bun.write(proposal.path, updatedContent);
-			await git.stageFiles([relative(cwd, proposal.path)]);
+			await git.stageFiles([path.relative(cwd, proposal.path)]);
 		}
 		updated.push(proposal.path);
 	}
@@ -178,8 +178,8 @@ function applyDeletions(
 ): Record<string, string[]> {
 	const result: Record<string, string[]> = {};
 	for (const [section, items] of Object.entries(existing)) {
-		const toDelete = new Set((deletions[section] ?? []).map((d) => d.toLowerCase()));
-		const filtered = items.filter((item) => !toDelete.has(item.toLowerCase()));
+		const toDelete = new Set((deletions[section] ?? []).map(d => d.toLowerCase()));
+		const filtered = items.filter(item => !toDelete.has(item.toLowerCase()));
 		if (filtered.length > 0) {
 			result[section] = filtered;
 		}
@@ -194,7 +194,7 @@ function mergeEntries(
 	const merged: Record<string, string[]> = { ...existing };
 	for (const [section, items] of Object.entries(incoming)) {
 		const current = merged[section] ?? [];
-		const lower = new Set(current.map((item) => item.toLowerCase()));
+		const lower = new Set(current.map(item => item.toLowerCase()));
 		for (const item of items) {
 			if (!lower.has(item.toLowerCase())) {
 				current.push(item);
@@ -225,9 +225,9 @@ function renderUnreleasedSections(entries: Record<string, string[]>): string[] {
 function normalizeEntries(entries: Record<string, string[]>): Record<string, string[]> {
 	const result: Record<string, string[]> = {};
 	for (const [section, items] of Object.entries(entries)) {
-		const trimmed = items.map((item) => item.trim().replace(/\.$/, "")).filter((item) => item.length > 0);
+		const trimmed = items.map(item => item.trim().replace(/\.$/, "")).filter(item => item.length > 0);
 		if (trimmed.length === 0) continue;
-		result[section] = Array.from(new Set(trimmed.map((item) => item.trim())));
+		result[section] = Array.from(new Set(trimmed.map(item => item.trim())));
 	}
 	return result;
 }

package/src/commit/changelog/parse.ts

@@ -1,11 +1,11 @@
-import type { UnreleasedSection } from "@oh-my-pi/pi-coding-agent/commit/types";
+import type { UnreleasedSection } from "../../commit/types";
 
 const UNRELEASED_PATTERN = /^##\s+\[?Unreleased\]?/i;
 const SECTION_PATTERN = /^###\s+(.*)$/;
 
 export function parseUnreleasedSection(content: string): UnreleasedSection {
 	const lines = content.split("\n");
-	const startIndex = lines.findIndex((line) => UNRELEASED_PATTERN.test(line.trim()));
+	const startIndex = lines.findIndex(line => UNRELEASED_PATTERN.test(line.trim()));
 	if (startIndex === -1) {
 		throw new Error("No [Unreleased] section found in changelog");
 	}

package/src/commit/cli.ts

@@ -1,5 +1,5 @@
-import type { CommitCommandArgs } from "@oh-my-pi/pi-coding-agent/commit/types";
 import chalk from "chalk";
+import type { CommitCommandArgs } from "./types";
 
 const FLAG_ALIASES = new Map<string, string>([
 	["-c", "--context"],

package/src/commit/git/diff.ts

@@ -1,4 +1,4 @@
-import type { DiffHunk, FileDiff, FileHunks, NumstatEntry } from "@oh-my-pi/pi-coding-agent/commit/types";
+import type { DiffHunk, FileDiff, FileHunks, NumstatEntry } from "../../commit/types";
 
 export function parseNumstat(output: string): NumstatEntry[] {
 	const entries: NumstatEntry[] = [];
@@ -31,7 +31,7 @@ export function parseFileDiffs(diff: string): FileDiff[] {
 		if (!match) continue;
 		const filename = match[2];
 		const content = part;
-		const isBinary = lines.some((line) => line.startsWith("Binary files "));
+		const isBinary = lines.some(line => line.startsWith("Binary files "));
 		let additions = 0;
 		let deletions = 0;
 		for (const line of lines) {
@@ -52,7 +52,7 @@ export function parseFileDiffs(diff: string): FileDiff[] {
 
 export function parseDiffHunks(diff: string): FileHunks[] {
 	const files = parseFileDiffs(diff);
-	return files.map((file) => parseFileHunks(file));
+	return files.map(file => parseFileHunks(file));
 }
 
 export function parseFileHunks(fileDiff: FileDiff): FileHunks {

package/src/commit/git/index.ts

@@ -1,17 +1,12 @@
 import { randomUUID } from "node:crypto";
-import { rm } from "node:fs/promises";
-import { tmpdir } from "node:os";
-import { join } from "node:path";
-import {
-	parseDiffHunks,
-	parseFileDiffs,
-	parseFileHunks,
-	parseNumstat,
-} from "@oh-my-pi/pi-coding-agent/commit/git/diff";
-import { GitError } from "@oh-my-pi/pi-coding-agent/commit/git/errors";
-import { commit, push, resetStaging, runGitCommand, stageFiles } from "@oh-my-pi/pi-coding-agent/commit/git/operations";
-import type { FileDiff, FileHunks, NumstatEntry } from "@oh-my-pi/pi-coding-agent/commit/types";
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
 import { logger } from "@oh-my-pi/pi-utils";
+import type { FileDiff, FileHunks, NumstatEntry } from "../../commit/types";
+import { parseDiffHunks, parseFileDiffs, parseFileHunks, parseNumstat } from "./diff";
+import { GitError } from "./errors";
+import { commit, push, resetStaging, runGitCommand, stageFiles } from "./operations";
 
 export type HunkSelection = {
 	path: string;
@@ -41,7 +36,7 @@ export class ControlledGit {
 		this.ensureSuccess(result, "git diff --name-only");
 		return result.stdout
 			.split("\n")
-			.map((line) => line.trim())
+			.map(line => line.trim())
 			.filter(Boolean);
 	}
 
@@ -71,7 +66,7 @@ export class ControlledGit {
 		this.ensureSuccess(result, "git log");
 		return result.stdout
 			.split("\n")
-			.map((line) => line.trim())
+			.map(line => line.trim())
 			.filter(Boolean);
 	}
 
@@ -80,7 +75,7 @@ export class ControlledGit {
 		this.ensureSuccess(result, "git diff --cached --name-only");
 		return result.stdout
 			.split("\n")
-			.map((line) => line.trim())
+			.map(line => line.trim())
 			.filter(Boolean);
 	}
 
@@ -89,7 +84,7 @@ export class ControlledGit {
 		this.ensureSuccess(result, "git ls-files --others --exclude-standard");
 		return result.stdout
 			.split("\n")
-			.map((line) => line.trim())
+			.map(line => line.trim())
 			.filter(Boolean);
 	}
 
@@ -107,7 +102,7 @@ export class ControlledGit {
 		if (selections.length === 0) return;
 		const diff = await this.getDiff(false);
 		const fileDiffs = parseFileDiffs(diff);
-		const fileDiffMap = new Map(fileDiffs.map((entry) => [entry.filename, entry]));
+		const fileDiffMap = new Map(fileDiffs.map(entry => [entry.filename, entry]));
 		const patchParts: string[] = [];
 		for (const selection of selections) {
 			const fileDiff = fileDiffMap.get(selection.path);
@@ -133,19 +128,19 @@ export class ControlledGit {
 				throw new GitError("git apply --cached", `No hunks selected for ${selection.path}`);
 			}
 			const header = extractFileHeader(fileDiff.content);
-			const filePatch = [header, ...selectedHunks.map((hunk) => hunk.content)].join("\n");
+			const filePatch = [header, ...selectedHunks.map(hunk => hunk.content)].join("\n");
 			patchParts.push(filePatch);
 		}
 
 		const patch = joinPatch(patchParts);
 		if (!patch.trim()) return;
-		const tempPath = join(tmpdir(), `omp-hunks-${randomUUID()}.patch`);
+		const tempPath = path.join(os.tmpdir(), `omp-hunks-${randomUUID()}.patch`);
 		try {
 			await Bun.write(tempPath, patch);
 			const result = await runGitCommand(this.cwd, ["apply", "--cached", "--binary", tempPath]);
 			this.ensureSuccess(result, "git apply --cached");
 		} finally {
-			await rm(tempPath, { force: true });
+			await fs.rm(tempPath, { force: true });
 		}
 	}
 
@@ -197,7 +192,7 @@ function extractFileHeader(diff: string): string {
 
 function joinPatch(parts: string[]): string {
 	return parts
-		.map((part) => (part.endsWith("\n") ? part : `${part}\n`))
+		.map(part => (part.endsWith("\n") ? part : `${part}\n`))
 		.join("\n")
 		.trimEnd()
 		.concat("\n");
@@ -205,13 +200,13 @@ function joinPatch(parts: string[]): string {
 
 function selectHunks(file: FileHunks, selector: HunkSelection["hunks"]): FileHunks["hunks"] {
 	if (selector.type === "indices") {
-		const wanted = new Set(selector.indices.map((value) => Math.max(1, Math.floor(value))));
-		return file.hunks.filter((hunk) => wanted.has(hunk.index + 1));
+		const wanted = new Set(selector.indices.map(value => Math.max(1, Math.floor(value))));
+		return file.hunks.filter(hunk => wanted.has(hunk.index + 1));
 	}
 	if (selector.type === "lines") {
 		const start = Math.floor(selector.start);
 		const end = Math.floor(selector.end);
-		return file.hunks.filter((hunk) => hunk.newStart <= end && hunk.newStart + hunk.newLines - 1 >= start);
+		return file.hunks.filter(hunk => hunk.newStart <= end && hunk.newStart + hunk.newLines - 1 >= start);
 	}
 	return file.hunks;
 }

package/src/commit/index.ts

@@ -2,4 +2,4 @@
  * Entry points for the omp commit command.
  */
 
-export { runCommitCommand } from "@oh-my-pi/pi-coding-agent/commit/pipeline";
+export { runCommitCommand } from "./pipeline";

package/src/commit/map-reduce/index.ts

@@ -1,10 +1,10 @@
 import type { Api, Model } from "@oh-my-pi/pi-ai";
-import { parseFileDiffs } from "@oh-my-pi/pi-coding-agent/commit/git/diff";
-import { runMapPhase } from "@oh-my-pi/pi-coding-agent/commit/map-reduce/map-phase";
-import { runReducePhase } from "@oh-my-pi/pi-coding-agent/commit/map-reduce/reduce-phase";
-import { estimateTokens } from "@oh-my-pi/pi-coding-agent/commit/map-reduce/utils";
-import type { ConventionalAnalysis } from "@oh-my-pi/pi-coding-agent/commit/types";
-import { isExcludedFile } from "@oh-my-pi/pi-coding-agent/commit/utils/exclusions";
+import { parseFileDiffs } from "../../commit/git/diff";
+import type { ConventionalAnalysis } from "../../commit/types";
+import { isExcludedFile } from "../../commit/utils/exclusions";
+import { runMapPhase } from "./map-phase";
+import { runReducePhase } from "./reduce-phase";
+import { estimateTokens } from "./utils";
 
 const MIN_FILES_FOR_MAP_REDUCE = 4;
 const MAX_FILE_TOKENS = 50_000;
@@ -34,10 +34,10 @@ export function shouldUseMapReduce(diff: string, settings?: MapReduceSettings):
 	if (settings?.enabled === false) return false;
 	const minFiles = settings?.minFiles ?? MIN_FILES_FOR_MAP_REDUCE;
 	const maxFileTokens = settings?.maxFileTokens ?? MAX_FILE_TOKENS;
-	const files = parseFileDiffs(diff).filter((file) => !isExcludedFile(file.filename));
+	const files = parseFileDiffs(diff).filter(file => !isExcludedFile(file.filename));
 	const fileCount = files.length;
 	if (fileCount >= minFiles) return true;
-	return files.some((file) => estimateTokens(file.content) > maxFileTokens);
+	return files.some(file => estimateTokens(file.content) > maxFileTokens);
 }
 
 /**
@@ -45,7 +45,7 @@ export function shouldUseMapReduce(diff: string, settings?: MapReduceSettings):
  */
 
 export async function runMapReduceAnalysis(input: MapReduceInput): Promise<ConventionalAnalysis> {
-	const fileDiffs = parseFileDiffs(input.diff).filter((file) => !isExcludedFile(file.filename));
+	const fileDiffs = parseFileDiffs(input.diff).filter(file => !isExcludedFile(file.filename));
 	const observations = await runMapPhase({
 		model: input.smolModel,
 		apiKey: input.smolApiKey,

package/src/commit/map-reduce/map-phase.ts

@@ -1,15 +1,11 @@
-import type { Api, AssistantMessage, Model } from "@oh-my-pi/pi-ai";
+import type { Api, AssistantMessage, Message, Model } from "@oh-my-pi/pi-ai";
 import { completeSimple } from "@oh-my-pi/pi-ai";
-import { truncateToTokenLimit } from "@oh-my-pi/pi-coding-agent/commit/map-reduce/utils";
-import fileObserverSystemPrompt from "@oh-my-pi/pi-coding-agent/commit/prompts/file-observer-system.md" with {
-	type: "text",
-};
-import fileObserverUserPrompt from "@oh-my-pi/pi-coding-agent/commit/prompts/file-observer-user.md" with {
-	type: "text",
-};
-import type { FileDiff, FileObservation } from "@oh-my-pi/pi-coding-agent/commit/types";
-import { isExcludedFile } from "@oh-my-pi/pi-coding-agent/commit/utils/exclusions";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
+import fileObserverSystemPrompt from "../../commit/prompts/file-observer-system.md" with { type: "text" };
+import fileObserverUserPrompt from "../../commit/prompts/file-observer-user.md" with { type: "text" };
+import type { FileDiff, FileObservation } from "../../commit/types";
+import { isExcludedFile } from "../../commit/utils/exclusions";
+import { renderPromptTemplate } from "../../config/prompt-templates";
+import { truncateToTokenLimit } from "./utils";
 
 const MAX_FILE_TOKENS = 50_000;
 const MAX_CONTEXT_FILES = 20;
@@ -32,14 +28,14 @@ export interface MapPhaseInput {
 }
 
 export async function runMapPhase({ model, apiKey, files, config }: MapPhaseInput): Promise<FileObservation[]> {
-	const filtered = files.filter((file) => !isExcludedFile(file.filename));
+	const filtered = files.filter(file => !isExcludedFile(file.filename));
 	const systemPrompt = renderPromptTemplate(fileObserverSystemPrompt);
 	const maxFileTokens = config?.maxFileTokens ?? MAX_FILE_TOKENS;
 	const maxConcurrency = config?.maxConcurrency ?? MAX_CONCURRENCY;
 	const timeoutMs = config?.timeoutMs ?? MAP_PHASE_TIMEOUT_MS;
 	const maxRetries = config?.maxRetries ?? MAX_RETRIES;
 	const retryBackoffMs = config?.retryBackoffMs ?? RETRY_BACKOFF_MS;
-	return runWithConcurrency(filtered, maxConcurrency, async (file) => {
+	return runWithConcurrency(filtered, maxConcurrency, async file => {
 		if (file.isBinary) {
 			return {
 				file: file.filename,
@@ -56,24 +52,13 @@ export async function runMapPhase({ model, apiKey, files, config }: MapPhaseInpu
 			diff: truncated,
 			context_header: contextHeader,
 		});
+		const request = {
+			systemPrompt,
+			messages: [{ role: "user", content: prompt, timestamp: Date.now() }] as Message[],
+		};
 
 		const response = await withRetry(
-			async () => {
-				const controller = new AbortController();
-				const timeout = setTimeout(() => controller.abort(), timeoutMs);
-				try {
-					return await completeSimple(
-						model,
-						{
-							systemPrompt: systemPrompt,
-							messages: [{ role: "user", content: prompt, timestamp: Date.now() }],
-						},
-						{ apiKey, maxTokens: 400, signal: controller.signal },
-					);
-				} finally {
-					clearTimeout(timeout);
-				}
-			},
+			() => completeSimple(model, request, { apiKey, maxTokens: 400, signal: AbortSignal.timeout(timeoutMs) }),
 			maxRetries,
 			retryBackoffMs,
 		);
@@ -90,8 +75,8 @@ export async function runMapPhase({ model, apiKey, files, config }: MapPhaseInpu
 
 function parseObservations(message: AssistantMessage): string[] {
 	const text = message.content
-		.filter((content) => content.type === "text")
-		.map((content) => content.text)
+		.filter(content => content.type === "text")
+		.map(content => content.text)
 		.join("")
 		.trim();
 
@@ -99,9 +84,9 @@ function parseObservations(message: AssistantMessage): string[] {
 
 	const lines = text
 		.split("\n")
-		.map((line) => line.trim())
+		.map(line => line.trim())
 		.filter(Boolean)
-		.map((line) => line.replace(/^[-*]\s+/, ""))
+		.map(line => line.replace(/^[-*]\s+/, ""))
 		.filter(Boolean);
 
 	return lines.slice(0, 5);
@@ -112,7 +97,7 @@ function generateContextHeader(files: FileDiff[], currentFile: string): string {
 		return `(Large commit with ${files.length} total files)`;
 	}
 
-	const otherFiles = files.filter((file) => file.filename !== currentFile);
+	const otherFiles = files.filter(file => file.filename !== currentFile);
 	if (otherFiles.length === 0) return "";
 
 	const sorted = [...otherFiles].sort((a, b) => b.additions + b.deletions - (a.additions + a.deletions));

package/src/commit/map-reduce/reduce-phase.ts

@@ -1,10 +1,10 @@
 import type { Api, AssistantMessage, Model, ToolCall } from "@oh-my-pi/pi-ai";
 import { completeSimple, validateToolCall } from "@oh-my-pi/pi-ai";
-import reduceSystemPrompt from "@oh-my-pi/pi-coding-agent/commit/prompts/reduce-system.md" with { type: "text" };
-import reduceUserPrompt from "@oh-my-pi/pi-coding-agent/commit/prompts/reduce-user.md" with { type: "text" };
-import type { ChangelogCategory, ConventionalAnalysis, FileObservation } from "@oh-my-pi/pi-coding-agent/commit/types";
-import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
 import { Type } from "@sinclair/typebox";
+import reduceSystemPrompt from "../../commit/prompts/reduce-system.md" with { type: "text" };
+import reduceUserPrompt from "../../commit/prompts/reduce-user.md" with { type: "text" };
+import type { ChangelogCategory, ConventionalAnalysis, FileObservation } from "../../commit/types";
+import { renderPromptTemplate } from "../../config/prompt-templates";
 
 const ReduceTool = {
 	name: "create_conventional_analysis",
@@ -64,7 +64,7 @@ export async function runReducePhase({
 }: ReducePhaseInput): Promise<ConventionalAnalysis> {
 	const prompt = renderPromptTemplate(reduceUserPrompt, {
 		types_description: typesDescription,
-		observations: observations.flatMap((obs) => obs.observations.map((line) => `- ${obs.file}: ${line}`)).join("\n"),
+		observations: observations.flatMap(obs => obs.observations.map(line => `- ${obs.file}: ${line}`)).join("\n"),
 		stat,
 		scope_candidates: scopeCandidates,
 	});
@@ -123,7 +123,7 @@ function normalizeAnalysis(parsed: {
 	return {
 		type: parsed.type,
 		scope: parsed.scope?.trim() || null,
-		details: parsed.details.map((detail) => ({
+		details: parsed.details.map(detail => ({
 			text: detail.text.trim(),
 			changelogCategory: detail.user_visible ? detail.changelog_category : undefined,
 			userVisible: detail.user_visible ?? false,
@@ -133,15 +133,13 @@ function normalizeAnalysis(parsed: {
 }
 
 function extractToolCall(message: AssistantMessage, name: string): ToolCall | undefined {
-	return message.content.find((content) => content.type === "toolCall" && content.name === name) as
-		| ToolCall
-		| undefined;
+	return message.content.find(content => content.type === "toolCall" && content.name === name) as ToolCall | undefined;
 }
 
 function extractTextContent(message: AssistantMessage): string {
 	return message.content
-		.filter((content) => content.type === "text")
-		.map((content) => content.text)
+		.filter(content => content.type === "text")
+		.map(content => content.text)
 		.join("")
 		.trim();
 }

package/src/commit/message.ts

@@ -1,9 +1,9 @@
-import type { ConventionalAnalysis } from "@oh-my-pi/pi-coding-agent/commit/types";
+import type { ConventionalAnalysis } from "./types";
 
 export function formatCommitMessage(analysis: ConventionalAnalysis, summary: string): string {
 	const scopePart = analysis.scope ? `(${analysis.scope})` : "";
 	const header = `${analysis.type}${scopePart}: ${summary}`;
-	const bodyLines = analysis.details.map((detail) => `- ${detail.text.trim()}`);
+	const bodyLines = analysis.details.map(detail => `- ${detail.text.trim()}`);
 	if (bodyLines.length === 0) {
 		return header;
 	}

package/src/commit/model-selection.ts

@@ -1,10 +1,6 @@
 import type { Api, Model } from "@oh-my-pi/pi-ai";
-import {
-	parseModelPattern,
-	parseModelString,
-	SMOL_MODEL_PRIORITY,
-} from "@oh-my-pi/pi-coding-agent/config/model-resolver";
-import type { SettingsManager } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
+import { parseModelPattern, parseModelString, SMOL_MODEL_PRIORITY } from "../config/model-resolver";
+import type { SettingsManager } from "../config/settings-manager";
 
 export async function resolvePrimaryModel(
 	override: string | undefined,
@@ -69,7 +65,7 @@ function resolveModelFromSettings(settingsManager: SettingsManager, available: M
 function resolveModelFromString(value: string, available: Model<Api>[]): Model<Api> | undefined {
 	const parsed = parseModelString(value);
 	if (parsed) {
-		return available.find((model) => model.provider === parsed.provider && model.id === parsed.id);
+		return available.find(model => model.provider === parsed.provider && model.id === parsed.id);
 	}
 	return parseModelPattern(value, available).model;
 }

package/src/commit/pipeline.ts

@@ -1,28 +1,26 @@
-import { relative } from "node:path";
+import * as path from "node:path";
 import type { Api, Model } from "@oh-my-pi/pi-ai";
-import { runAgenticCommit } from "@oh-my-pi/pi-coding-agent/commit/agentic";
+import { logger } from "@oh-my-pi/pi-utils";
+import { renderPromptTemplate } from "../config/prompt-templates";
+import { SettingsManager } from "../config/settings-manager";
+import { discoverAuthStorage, discoverModels } from "../sdk";
+import { loadProjectContextFiles } from "../system-prompt";
+import { runAgenticCommit } from "./agentic";
 import {
 	extractScopeCandidates,
 	generateConventionalAnalysis,
 	generateSummary,
 	validateAnalysis,
 	validateSummary,
-} from "@oh-my-pi/pi-coding-agent/commit/analysis";
-import { runChangelogFlow } from "@oh-my-pi/pi-coding-agent/commit/changelog";
-import { ControlledGit } from "@oh-my-pi/pi-coding-agent/commit/git";
-import { runMapReduceAnalysis, shouldUseMapReduce } from "@oh-my-pi/pi-coding-agent/commit/map-reduce";
-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 summaryRetryPrompt from "@oh-my-pi/pi-coding-agent/commit/prompts/summary-retry.md" with { type: "text" };
-import typesDescriptionPrompt from "@oh-my-pi/pi-coding-agent/commit/prompts/types-description.md" with {
-	type: "text",
-};
-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, discoverModels } from "@oh-my-pi/pi-coding-agent/sdk";
-import { loadProjectContextFiles } from "@oh-my-pi/pi-coding-agent/system-prompt";
-import { logger } from "@oh-my-pi/pi-utils";
+} from "./analysis";
+import { runChangelogFlow } from "./changelog";
+import { ControlledGit } from "./git";
+import { runMapReduceAnalysis, shouldUseMapReduce } from "./map-reduce";
+import { formatCommitMessage } from "./message";
+import { resolvePrimaryModel, resolveSmolModel } from "./model-selection";
+import summaryRetryPrompt from "./prompts/summary-retry.md" with { type: "text" };
+import typesDescriptionPrompt from "./prompts/types-description.md" with { type: "text" };
+import type { CommitCommandArgs, ConventionalAnalysis } from "./types";
 
 const SUMMARY_MAX_CHARS = 72;
 const RECENT_COMMITS_COUNT = 8;
@@ -43,7 +41,7 @@ async function runLegacyCommitCommand(args: CommitCommandArgs): Promise<void> {
 	const settingsManager = await SettingsManager.create(cwd);
 	const commitSettings = settingsManager.getCommitSettings();
 	const authStorage = await discoverAuthStorage();
-	const modelRegistry = await discoverModels(authStorage);
+	const modelRegistry = discoverModels(authStorage);
 
 	const { model: primaryModel, apiKey: primaryApiKey } = await resolvePrimaryModel(
 		args.model,
@@ -87,8 +85,8 @@ async function runLegacyCommitCommand(args: CommitCommandArgs): Promise<void> {
 	const scopeCandidates = extractScopeCandidates(numstat).scopeCandidates;
 	const recentCommits = await git.getRecentCommits(RECENT_COMMITS_COUNT);
 	const contextFiles = await loadProjectContextFiles({ cwd });
-	const formattedContextFiles = contextFiles.map((file) => ({
-		path: relative(cwd, file.path),
+	const formattedContextFiles = contextFiles.map(file => ({
+		path: path.relative(cwd, file.path),
 		content: file.content,
 	}));
 
@@ -209,7 +207,7 @@ async function generateSummaryWithRetry(input: {
 			apiKey: input.apiKey,
 			commitType: input.analysis.type,
 			scope: input.analysis.scope,
-			details: input.analysis.details.map((detail) => detail.text),
+			details: input.analysis.details.map(detail => detail.text),
 			stat: input.stat,
 			maxChars: SUMMARY_MAX_CHARS,
 			userContext: context,

package/src/commit/utils/exclusions.ts

@@ -31,12 +31,12 @@ const EXCLUDED_SUFFIXES = [".lock.yml", ".lock.yaml", "-lock.yml", "-lock.yaml"]
 
 export function isExcludedFile(path: string): boolean {
 	const lower = path.toLowerCase();
-	if (EXCLUDED_FILES.some((name) => lower.endsWith(name.toLowerCase()))) {
+	if (EXCLUDED_FILES.some(name => lower.endsWith(name.toLowerCase()))) {
 		return true;
 	}
-	return EXCLUDED_SUFFIXES.some((suffix) => lower.endsWith(suffix));
+	return EXCLUDED_SUFFIXES.some(suffix => lower.endsWith(suffix));
 }
 
 export function filterExcludedFiles<T extends { filename: string }>(files: T[]): T[] {
-	return files.filter((file) => !isExcludedFile(file.filename));
+	return files.filter(file => !isExcludedFile(file.filename));
 }

package/src/config/file-lock.ts

@@ -1,5 +1,5 @@
-import { existsSync } from "node:fs";
-import { mkdir, readFile, rm } from "node:fs/promises";
+import * as fs from "node:fs/promises";
+import { isEnoent } from "@oh-my-pi/pi-utils";
 
 export interface FileLockOptions {
 	staleMs?: number;
@@ -29,7 +29,7 @@ async function writeLockInfo(lockPath: string): Promise<void> {
 
 async function readLockInfo(lockPath: string): Promise<LockInfo | null> {
 	try {
-		const content = await readFile(`${lockPath}/info`, "utf-8");
+		const content = await fs.readFile(`${lockPath}/info`, "utf-8");
 		return JSON.parse(content) as LockInfo;
 	} catch {
 		return null;
@@ -58,7 +58,7 @@ async function isLockStale(lockPath: string, staleMs: number): Promise<boolean>
 
 async function tryAcquireLock(lockPath: string): Promise<boolean> {
 	try {
-		await mkdir(lockPath);
+		await fs.mkdir(lockPath);
 		await writeLockInfo(lockPath);
 		return true;
 	} catch (error) {
@@ -71,12 +71,22 @@ async function tryAcquireLock(lockPath: string): Promise<boolean> {
 
 async function releaseLock(lockPath: string): Promise<void> {
 	try {
-		await rm(lockPath, { recursive: true });
+		await fs.rm(lockPath, { recursive: true });
 	} catch {
 		// Ignore errors on release
 	}
 }
 
+async function lockExists(lockPath: string): Promise<boolean> {
+	try {
+		await fs.stat(lockPath);
+		return true;
+	} catch (err) {
+		if (isEnoent(err)) return false;
+		throw err;
+	}
+}
+
 async function acquireLock(filePath: string, options: FileLockOptions = {}): Promise<() => Promise<void>> {
 	const opts = { ...DEFAULT_OPTIONS, ...options };
 	const lockPath = getLockPath(filePath);
@@ -86,12 +96,12 @@ async function acquireLock(filePath: string, options: FileLockOptions = {}): Pro
 			return () => releaseLock(lockPath);
 		}
 
-		if (existsSync(lockPath) && (await isLockStale(lockPath, opts.staleMs))) {
+		if ((await lockExists(lockPath)) && (await isLockStale(lockPath, opts.staleMs))) {
 			await releaseLock(lockPath);
 			continue;
 		}
 
-		await new Promise((resolve) => setTimeout(resolve, opts.retryDelayMs));
+		await new Promise(resolve => setTimeout(resolve, opts.retryDelayMs));
 	}
 
 	throw new Error(`Failed to acquire lock for ${filePath} after ${opts.retries} attempts`);