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

package/src/commit/agentic/fallback.ts

@@ -0,0 +1,96 @@
+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";
+
+const TEST_PATTERNS = ["/test/", "/tests/", "/__tests__/", "_test.", ".test.", ".spec.", "_spec."];
+const DOC_EXTENSIONS = new Set([".md", ".txt", ".rst", ".adoc"]);
+const CONFIG_EXTENSIONS = new Set([".json", ".yaml", ".yml", ".toml", ".xml", ".ini", ".cfg"]);
+const STYLE_EXTENSIONS = new Set([".css", ".scss", ".less", ".sass"]);
+
+function inferTypeFromFiles(numstat: NumstatEntry[]): CommitType {
+	if (numstat.length === 0) return "chore";
+
+	let hasTests = false;
+	let hasDocs = false;
+	let hasConfig = false;
+	let hasStyle = false;
+	let hasSource = false;
+
+	for (const entry of numstat) {
+		const lowerPath = entry.path.toLowerCase();
+		const ext = getExtension(entry.path);
+
+		if (TEST_PATTERNS.some((pattern) => lowerPath.includes(pattern))) {
+			hasTests = true;
+		} else if (DOC_EXTENSIONS.has(ext)) {
+			hasDocs = true;
+		} else if (CONFIG_EXTENSIONS.has(ext)) {
+			hasConfig = true;
+		} else if (STYLE_EXTENSIONS.has(ext)) {
+			hasStyle = true;
+		} else {
+			hasSource = true;
+		}
+	}
+
+	if (hasTests && !hasSource && !hasDocs) return "test";
+	if (hasDocs && !hasSource && !hasTests) return "docs";
+	if (hasStyle && !hasSource && !hasTests) return "style";
+	if (hasConfig && !hasSource && !hasTests && !hasDocs) return "chore";
+	return "refactor";
+}
+
+function getExtension(path: string): string {
+	const name = basename(path);
+	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)}`,
+		userVisible: false,
+	}));
+
+	return {
+		type,
+		scope: null,
+		details,
+		issueRefs: [],
+	};
+}
+
+export function generateFallbackSummary(type: CommitType, numstat: NumstatEntry[]): string {
+	const verbMap: Record<string, string> = {
+		test: "updated tests for",
+		docs: "updated documentation for",
+		refactor: "refactored",
+		style: "formatted",
+		chore: "updated",
+		feat: "updated",
+		fix: "updated",
+		perf: "updated",
+		build: "updated",
+		ci: "updated",
+		revert: "reverted changes in",
+	};
+	const verb = verbMap[type] ?? "updated";
+	const file = basename(numstat[0]?.path ?? "files");
+
+	if (numstat.length === 1) {
+		return `${verb} ${file}`;
+	}
+	return `${verb} ${file} and ${numstat.length - 1} other${numstat.length === 2 ? "" : "s"}`;
+}
+
+export function generateFallbackProposal(numstat: NumstatEntry[]): CommitProposal {
+	const analysis = generateFallbackAnalysis(numstat);
+	const summary = generateFallbackSummary(analysis.type, numstat);
+
+	return {
+		analysis,
+		summary,
+		warnings: ["Commit generated using fallback due to agent failure"],
+	};
+}

package/src/commit/agentic/index.ts

@@ -0,0 +1,359 @@
+import { relative } 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";
+
+interface CommitExecutionContext {
+	git: ControlledGit;
+	dryRun: boolean;
+	push: boolean;
+}
+
+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 stagedFilesPromise = (async () => {
+		let stagedFiles = await git.getStagedFiles();
+		if (stagedFiles.length === 0) {
+			writeStdout("No staged changes detected, staging all changes...");
+			await git.stageAll();
+			stagedFiles = await git.getStagedFiles();
+		}
+		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;
+	writeStdout(`  └─ ${primaryModel.name}`);
+
+	const { model: agentModel } = await resolveSmolModel(settingsManager, modelRegistry, primaryModel, primaryApiKey);
+
+	if (stagedFiles.length === 0) {
+		writeStderr("No changes to commit.");
+		return;
+	}
+
+	if (!args.noChangelog) {
+		writeStdout("● Detecting changelog targets...");
+	}
+	const [changelogBoundaries, contextFiles, numstat, diff] = await Promise.all([
+		args.noChangelog ? [] : detectChangelogBoundaries(cwd, stagedFiles),
+		discoverContextFiles(cwd),
+		git.getNumstat(true),
+		git.getDiff(true),
+	]);
+	const changelogTargets = changelogBoundaries.map((boundary) => boundary.changelogPath);
+	if (!args.noChangelog) {
+		if (changelogTargets.length > 0) {
+			for (const path of changelogTargets) {
+				writeStdout(`  └─ ${path}`);
+			}
+		} else {
+			writeStdout("  └─ (none found)");
+		}
+	}
+
+	writeStdout("● Discovering context files...");
+	const agentsMdFiles = contextFiles.filter((file) => file.path.endsWith("AGENTS.md"));
+	if (agentsMdFiles.length > 0) {
+		for (const file of agentsMdFiles) {
+			writeStdout(`  └─ ${file.path}`);
+		}
+	} else {
+		writeStdout("  └─ (none found)");
+	}
+	const forceFallback = process.env.OMP_COMMIT_TEST_FALLBACK?.toLowerCase() === "true";
+	if (forceFallback) {
+		writeStdout("● Forcing fallback commit generation...");
+		const fallbackProposal = generateFallbackProposal(numstat);
+		await runSingleCommit(fallbackProposal, { git, dryRun: args.dryRun, push: args.push });
+		return;
+	}
+
+	const trivialChange = detectTrivialChange(diff);
+	if (trivialChange) {
+		writeStdout(`● Detected trivial change: ${trivialChange.summary}`);
+		const trivialProposal: CommitProposal = {
+			analysis: {
+				type: trivialChange.type,
+				scope: null,
+				details: [],
+				issueRefs: [],
+			},
+			summary: trivialChange.summary,
+			warnings: [],
+		};
+		await runSingleCommit(trivialProposal, { git, dryRun: args.dryRun, push: args.push });
+		return;
+	}
+
+	let existingChangelogEntries: ExistingChangelogEntries[] | undefined;
+	if (!args.noChangelog && changelogTargets.length > 0) {
+		existingChangelogEntries = await loadExistingChangelogEntries(changelogTargets);
+		if (existingChangelogEntries.length === 0) {
+			existingChangelogEntries = undefined;
+		}
+	}
+
+	writeStdout("● Starting commit agent...");
+	let commitState: CommitAgentState;
+	let usedFallback = false;
+
+	try {
+		commitState = await runCommitAgentSession({
+			cwd,
+			git,
+			model: agentModel,
+			settingsManager,
+			modelRegistry,
+			authStorage,
+			userContext: args.context,
+			contextFiles,
+			changelogTargets,
+			requireChangelog: !args.noChangelog && changelogTargets.length > 0,
+			diffText: diff,
+			existingChangelogEntries,
+		});
+	} catch (error) {
+		writeStderr(`Agent error: ${error instanceof Error ? error.message : String(error)}`);
+		writeStdout("● Using fallback commit generation...");
+		commitState = { proposal: generateFallbackProposal(numstat) };
+		usedFallback = true;
+	}
+
+	if (!usedFallback && !commitState.proposal && !commitState.splitProposal) {
+		if (process.env.OMP_COMMIT_NO_FALLBACK?.toLowerCase() !== "true") {
+			writeStdout("● Agent did not provide proposal, using fallback...");
+			commitState.proposal = generateFallbackProposal(numstat);
+			usedFallback = true;
+		}
+	}
+
+	let updatedChangelogFiles: string[] = [];
+	if (!args.noChangelog && changelogTargets.length > 0 && !usedFallback) {
+		if (!commitState.changelogProposal) {
+			writeStderr("Commit agent did not provide changelog entries.");
+			return;
+		}
+		writeStdout("● Applying changelog entries...");
+		const updated = await applyChangelogProposals({
+			git,
+			cwd,
+			proposals: commitState.changelogProposal.entries,
+			dryRun: args.dryRun,
+			onProgress: (message) => {
+				writeStdout(`  ├─ ${message}`);
+			},
+		});
+		updatedChangelogFiles = updated.map((path) => relative(cwd, path));
+		if (updated.length > 0) {
+			for (const path of updated) {
+				writeStdout(`  └─ ${path}`);
+			}
+		} else {
+			writeStdout("  └─ (no changes)");
+		}
+	}
+
+	if (commitState.proposal) {
+		await runSingleCommit(commitState.proposal, { git, dryRun: args.dryRun, push: args.push });
+		return;
+	}
+
+	if (commitState.splitProposal) {
+		await runSplitCommit(commitState.splitProposal, {
+			git,
+			dryRun: args.dryRun,
+			push: args.push,
+			additionalFiles: updatedChangelogFiles,
+		});
+		return;
+	}
+
+	writeStderr("Commit agent did not provide a proposal.");
+}
+
+async function runSingleCommit(proposal: CommitProposal, ctx: CommitExecutionContext): Promise<void> {
+	if (proposal.warnings.length > 0) {
+		writeStdout(formatWarnings(proposal.warnings));
+	}
+	const commitMessage = formatCommitMessage(proposal.analysis, proposal.summary);
+	if (ctx.dryRun) {
+		writeStdout("\nGenerated commit message:\n");
+		writeStdout(commitMessage);
+		return;
+	}
+	await ctx.git.commit(commitMessage);
+	writeStdout("Commit created.");
+	if (ctx.push) {
+		await ctx.git.push();
+		writeStdout("Pushed to remote.");
+	}
+}
+
+async function runSplitCommit(
+	plan: SplitCommitPlan,
+	ctx: CommitExecutionContext & { additionalFiles?: string[] },
+): Promise<void> {
+	if (plan.warnings.length > 0) {
+		writeStdout(formatWarnings(plan.warnings));
+	}
+	if (ctx.additionalFiles && ctx.additionalFiles.length > 0) {
+		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));
+	if (missingFiles.length > 0) {
+		writeStderr(`Split commit plan missing staged files: ${missingFiles.join(", ")}`);
+		return;
+	}
+
+	if (ctx.dryRun) {
+		writeStdout("\nSplit commit plan (dry run):\n");
+		for (const [index, commit] of plan.commits.entries()) {
+			const analysis: ConventionalAnalysis = {
+				type: commit.type,
+				scope: commit.scope,
+				details: commit.details,
+				issueRefs: commit.issueRefs,
+			};
+			const message = formatCommitMessage(analysis, commit.summary);
+			writeStdout(`Commit ${index + 1}:\n${message}\n`);
+			const changeSummary = commit.changes
+				.map((change) => formatFileChangeSummary(change.path, change.hunks))
+				.join(", ");
+			writeStdout(`Changes: ${changeSummary}\n`);
+		}
+		return;
+	}
+
+	if (!(await confirmSplitCommitPlan(plan))) {
+		writeStdout("Split commit aborted by user.");
+		return;
+	}
+
+	const order = computeDependencyOrder(plan.commits);
+	if ("error" in order) {
+		throw new Error(order.error);
+	}
+
+	await ctx.git.resetStaging();
+	for (const commitIndex of order) {
+		const commit = plan.commits[commitIndex];
+		await ctx.git.stageHunks(commit.changes);
+		const analysis: ConventionalAnalysis = {
+			type: commit.type,
+			scope: commit.scope,
+			details: commit.details,
+			issueRefs: commit.issueRefs,
+		};
+		const message = formatCommitMessage(analysis, commit.summary);
+		await ctx.git.commit(message);
+		await ctx.git.resetStaging();
+	}
+	writeStdout("Split commits created.");
+	if (ctx.push) {
+		await ctx.git.push();
+		writeStdout("Pushed to remote.");
+	}
+}
+
+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 targetCommit = plan.commits[plan.commits.length - 1];
+	for (const file of files) {
+		if (planned.has(file)) continue;
+		targetCommit.changes.push({ path: file, hunks: { type: "all" } });
+		planned.add(file);
+	}
+}
+
+async function confirmSplitCommitPlan(plan: SplitCommitPlan): Promise<boolean> {
+	if (!process.stdin.isTTY || !process.stdout.isTTY) {
+		return true;
+	}
+	const rl = createInterface({ input: process.stdin, output: process.stdout });
+	try {
+		const prompt = renderPromptTemplate(splitConfirmPrompt, { count: plan.commits.length });
+		const answer = await rl.question(prompt);
+		return ["y", "yes"].includes(answer.trim().toLowerCase());
+	} finally {
+		rl.close();
+	}
+}
+
+function formatWarnings(warnings: string[]): string {
+	return `Warnings:\n${warnings.map((warning) => `- ${warning}`).join("\n")}`;
+}
+
+function writeStdout(message: string): void {
+	process.stdout.write(`${message}\n`);
+}
+
+function writeStderr(message: string): void {
+	process.stderr.write(`${message}\n`);
+}
+
+function formatFileChangeSummary(path: string, hunks: HunkSelector): string {
+	if (hunks.type === "all") {
+		return `${path} (all)`;
+	}
+	if (hunks.type === "indices") {
+		return `${path} (hunks ${hunks.indices.join(", ")})`;
+	}
+	return `${path} (lines ${hunks.start}-${hunks.end})`;
+}
+
+async function loadExistingChangelogEntries(paths: string[]): Promise<ExistingChangelogEntries[]> {
+	const entries = await Promise.all(
+		paths.map(async (path) => {
+			const file = Bun.file(path);
+			if (!(await file.exists())) {
+				return null;
+			}
+			const content = await file.text();
+			try {
+				const unreleased = parseUnreleasedSection(content);
+				const sections = Object.entries(unreleased.entries)
+					.filter(([, items]) => items.length > 0)
+					.map(([name, items]) => ({ name, items }));
+				if (sections.length > 0) {
+					return { path, sections };
+				}
+			} catch {
+				return null;
+			}
+			return null;
+		}),
+	);
+	return entries.filter((entry): entry is ExistingChangelogEntries => entry !== null);
+}

package/src/commit/agentic/prompts/analyze-file.md

@@ -0,0 +1,22 @@
+Analyze the file at {{file}}.
+
+Goal:
+{{#if goal}}
+{{goal}}
+{{else}}
+Summarize its purpose and the commit-relevant changes.
+{{/if}}
+
+Return a concise JSON object with:
+- summary: one-sentence description of the file's role
+- highlights: 2-5 bullet points about notable behaviors or changes
+- risks: any edge cases or risks worth noting (empty array if none)
+
+{{#if related_files}}
+## Other Files in This Change
+{{related_files}}
+
+Consider how this file's changes relate to the above files.
+{{/if}}
+
+Call the complete tool with the JSON payload.

package/src/commit/agentic/prompts/session-user.md

@@ -0,0 +1,26 @@
+Generate a conventional commit proposal for the current staged changes.
+
+{{#if user_context}}
+User context:
+{{user_context}}
+{{/if}}
+
+{{#if changelog_targets}}
+Changelog targets (you must call propose_changelog for these files):
+{{changelog_targets}}
+{{/if}}
+
+{{#if existing_changelog_entries}}
+## Existing Unreleased Changelog Entries
+You may include entries from this list in the propose_changelog `deletions` field if they should be removed.
+{{#each existing_changelog_entries}}
+### {{path}}
+{{#each sections}}
+{{name}}:
+{{#list items prefix="- " join="\n"}}{{this}}{{/list}}
+{{/each}}
+
+{{/each}}
+{{/if}}
+
+Use the git_* tools to inspect changes. Call analyze_files to spawn parallel file analysis if you need deeper per-file summaries. Finish by calling propose_commit or split_commit.

package/src/commit/agentic/prompts/split-confirm.md

@@ -0,0 +1 @@
+Split commit plan has {{count}} commits. Proceed? (y/N): 

package/src/commit/agentic/prompts/system.md

@@ -0,0 +1,40 @@
+You are a conventional commit expert for the omp commit workflow.
+
+Your job: decide what git information you need, gather it with tools, and finish by calling exactly one of:
+- propose_commit (single commit)
+- split_commit (multiple commits when changes are unrelated)
+
+Workflow rules:
+1. Always call git_overview first.
+2. Keep tool calls minimal: prefer 1-2 git_file_diff calls covering key files (hard limit: 2).
+3. Use git_hunk only for very large diffs.
+4. Use recent_commits only if you need style context.
+5. Use analyze_files only when diffs are too large or unclear.
+6. Do not use read.
+7. When confident, submit the final proposal with propose_commit or split_commit.
+
+Commit requirements:
+- Summary line must start with a past-tense verb, be <= 72 chars, and not end with a period.
+- Avoid filler words: comprehensive, various, several, improved, enhanced, better.
+- Avoid meta phrases: "this commit", "this change", "updated code", "modified files".
+- Scope is lowercase, max two segments, and uses only letters, digits, hyphens, or underscores.
+- Detail lines are optional (0-6). Each must be a sentence ending in a period and <= 120 chars.
+- Use the conventional commit type guidance below.
+
+Conventional commit types:
+{{types_description}}
+
+Tool guidance:
+- git_overview: staged file list, stat summary, numstat, scope candidates
+- git_file_diff: diff for specific files
+- git_hunk: pull specific hunks for large diffs
+- recent_commits: recent commit subjects + style stats
+- analyze_files: spawn quick_task subagents in parallel to analyze files
+- propose_changelog: provide changelog entries for each changelog target
+- propose_commit: submit final commit proposal and run validation
+- split_commit: propose multiple commit groups (no overlapping files, all staged files covered)
+
+## Changelog Requirements
+
+If changelog targets are provided, you MUST call `propose_changelog` before finishing.
+If you propose a split commit plan, include changelog target files in the relevant commit changes.

package/src/commit/agentic/state.ts

@@ -0,0 +1,74 @@
+import type {
+	CommitType,
+	ConventionalAnalysis,
+	ConventionalDetail,
+	NumstatEntry,
+} from "@oh-my-pi/pi-coding-agent/commit/types";
+
+export interface GitOverviewSnapshot {
+	files: string[];
+	stat: string;
+	numstat: NumstatEntry[];
+	scopeCandidates: string;
+	isWideScope: boolean;
+	untrackedFiles?: string[];
+	excludedFiles?: string[];
+}
+
+export interface CommitProposal {
+	analysis: ConventionalAnalysis;
+	summary: string;
+	warnings: string[];
+}
+
+export interface FileObservation {
+	file: string;
+	summary: string;
+	highlights: string[];
+	risks: string[];
+	additions: number;
+	deletions: number;
+}
+
+export type HunkSelector =
+	| { type: "all" }
+	| { type: "indices"; indices: number[] }
+	| { type: "lines"; start: number; end: number };
+
+export interface FileChange {
+	path: string;
+	hunks: HunkSelector;
+}
+
+export interface SplitCommitGroup {
+	changes: FileChange[];
+	type: CommitType;
+	scope: string | null;
+	summary: string;
+	details: ConventionalDetail[];
+	issueRefs: string[];
+	rationale?: string;
+	dependencies: number[];
+}
+
+export interface SplitCommitPlan {
+	commits: SplitCommitGroup[];
+	warnings: string[];
+}
+
+export interface ChangelogProposal {
+	entries: Array<{
+		path: string;
+		entries: Record<string, string[]>;
+		deletions?: Record<string, string[]>;
+	}>;
+}
+
+export interface CommitAgentState {
+	overview?: GitOverviewSnapshot;
+	proposal?: CommitProposal;
+	splitProposal?: SplitCommitPlan;
+	changelogProposal?: ChangelogProposal;
+	diffCache?: Map<string, string>;
+	diffText?: string;
+}