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

package/src/commit/model-selection.ts

@@ -0,0 +1,80 @@
+import type { Api, Model } from "@oh-my-pi/pi-ai";
+import { parseModelPattern, parseModelString, SMOL_MODEL_PRIORITY } from "../config/model-resolver";
+import type { SettingsManager } from "../config/settings-manager";
+
+export async function resolvePrimaryModel(
+	override: string | undefined,
+	settingsManager: SettingsManager,
+	modelRegistry: {
+		getAvailable: () => Model<Api>[];
+		getApiKey: (model: Model<Api>) => Promise<string | undefined>;
+	},
+): Promise<{ model: Model<Api>; apiKey: string }> {
+	const available = modelRegistry.getAvailable();
+	const model = override
+		? resolveModelFromString(expandRoleAlias(override, settingsManager), available)
+		: resolveModelFromSettings(settingsManager, available);
+	if (!model) {
+		throw new Error("No model available for commit generation");
+	}
+	const apiKey = await modelRegistry.getApiKey(model);
+	if (!apiKey) {
+		throw new Error(`No API key available for model ${model.provider}/${model.id}`);
+	}
+	return { model, apiKey };
+}
+
+export async function resolveSmolModel(
+	settingsManager: SettingsManager,
+	modelRegistry: {
+		getAvailable: () => Model<Api>[];
+		getApiKey: (model: Model<Api>) => Promise<string | undefined>;
+	},
+	fallbackModel: Model<Api>,
+	fallbackApiKey: string,
+): Promise<{ model: Model<Api>; apiKey: string }> {
+	const available = modelRegistry.getAvailable();
+	const role = settingsManager.getModelRole("smol");
+	const roleModel = role ? resolveModelFromString(role, available) : undefined;
+	if (roleModel) {
+		const apiKey = await modelRegistry.getApiKey(roleModel);
+		if (apiKey) return { model: roleModel, apiKey };
+	}
+
+	for (const pattern of SMOL_MODEL_PRIORITY) {
+		const candidate = parseModelPattern(pattern, available).model;
+		if (!candidate) continue;
+		const apiKey = await modelRegistry.getApiKey(candidate);
+		if (apiKey) return { model: candidate, apiKey };
+	}
+
+	return { model: fallbackModel, apiKey: fallbackApiKey };
+}
+
+function resolveModelFromSettings(settingsManager: SettingsManager, available: Model<Api>[]): Model<Api> | undefined {
+	const roles = ["commit", "smol", "default"];
+	for (const role of roles) {
+		const configured = settingsManager.getModelRole(role);
+		if (!configured) continue;
+		const resolved = resolveModelFromString(expandRoleAlias(configured, settingsManager), available);
+		if (resolved) return resolved;
+	}
+	return available[0];
+}
+
+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 parseModelPattern(value, available).model;
+}
+
+function expandRoleAlias(value: string, settingsManager: SettingsManager): string {
+	const lower = value.toLowerCase();
+	if (lower.startsWith("pi/") || lower.startsWith("omp/")) {
+		const role = lower.startsWith("pi/") ? value.slice(3) : value.slice(4);
+		return settingsManager.getModelRole(role) ?? value;
+	}
+	return value;
+}

package/src/commit/pipeline.ts

@@ -0,0 +1,240 @@
+import * as path from "node:path";
+import type { Api, Model } from "@oh-my-pi/pi-ai";
+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 "./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;
+const TYPES_DESCRIPTION = renderPromptTemplate(typesDescriptionPrompt);
+
+/**
+ * Execute the omp commit pipeline for staged changes.
+ */
+export async function runCommitCommand(args: CommitCommandArgs): Promise<void> {
+	if (args.legacy) {
+		return runLegacyCommitCommand(args);
+	}
+	return runAgenticCommit(args);
+}
+
+async function runLegacyCommitCommand(args: CommitCommandArgs): Promise<void> {
+	const cwd = process.cwd();
+	const settingsManager = await SettingsManager.create(cwd);
+	const commitSettings = settingsManager.getCommitSettings();
+	const authStorage = await discoverAuthStorage();
+	const modelRegistry = discoverModels(authStorage);
+
+	const { model: primaryModel, apiKey: primaryApiKey } = await resolvePrimaryModel(
+		args.model,
+		settingsManager,
+		modelRegistry,
+	);
+	const { model: smolModel, apiKey: smolApiKey } = await resolveSmolModel(
+		settingsManager,
+		modelRegistry,
+		primaryModel,
+		primaryApiKey,
+	);
+
+	const git = new ControlledGit(cwd);
+	let stagedFiles = await git.getStagedFiles();
+	if (stagedFiles.length === 0) {
+		writeStdout("No staged changes detected, staging all changes...");
+		await git.stageAll();
+		stagedFiles = await git.getStagedFiles();
+	}
+	if (stagedFiles.length === 0) {
+		writeStderr("No changes to commit.");
+		return;
+	}
+
+	if (!args.noChangelog) {
+		await runChangelogFlow({
+			git,
+			cwd,
+			model: primaryModel,
+			apiKey: primaryApiKey,
+			stagedFiles,
+			dryRun: args.dryRun,
+			maxDiffChars: commitSettings.changelogMaxDiffChars,
+		});
+	}
+
+	const diff = await git.getDiff(true);
+	const stat = await git.getStat(true);
+	const numstat = await git.getNumstat(true);
+	const scopeCandidates = extractScopeCandidates(numstat).scopeCandidates;
+	const recentCommits = await git.getRecentCommits(RECENT_COMMITS_COUNT);
+	const contextFiles = await loadProjectContextFiles({ cwd });
+	const formattedContextFiles = contextFiles.map(file => ({
+		path: path.relative(cwd, file.path),
+		content: file.content,
+	}));
+
+	const analysis = await generateAnalysis({
+		diff,
+		stat,
+		scopeCandidates,
+		recentCommits,
+		contextFiles: formattedContextFiles,
+		userContext: args.context,
+		primaryModel,
+		primaryApiKey,
+		smolModel,
+		smolApiKey,
+		commitSettings,
+	});
+
+	const analysisValidation = validateAnalysis(analysis);
+	if (!analysisValidation.valid) {
+		logger.warn("commit analysis validation failed", { errors: analysisValidation.errors });
+	}
+
+	const summary = await generateSummaryWithRetry({
+		analysis,
+		stat,
+		model: primaryModel,
+		apiKey: primaryApiKey,
+		userContext: args.context,
+	});
+
+	const commitMessage = formatCommitMessage(analysis, summary.summary);
+
+	if (args.dryRun) {
+		writeStdout("\nGenerated commit message:\n");
+		writeStdout(commitMessage);
+		return;
+	}
+
+	await git.commit(commitMessage);
+	writeStdout("Commit created.");
+	if (args.push) {
+		await git.push();
+		writeStdout("Pushed to remote.");
+	}
+}
+
+async function generateAnalysis(input: {
+	diff: string;
+	stat: string;
+	scopeCandidates: string;
+	recentCommits: string[];
+	contextFiles: Array<{ path: string; content: string }>;
+	userContext?: string;
+	primaryModel: Model<Api>;
+	primaryApiKey: string;
+	smolModel: Model<Api>;
+	smolApiKey: string;
+	commitSettings: {
+		mapReduceEnabled: boolean;
+		mapReduceMinFiles: number;
+		mapReduceMaxFileTokens: number;
+		mapReduceTimeoutMs: number;
+		mapReduceMaxConcurrency: number;
+		changelogMaxDiffChars: number;
+	};
+}): Promise<ConventionalAnalysis> {
+	if (
+		shouldUseMapReduce(input.diff, {
+			enabled: input.commitSettings.mapReduceEnabled,
+			minFiles: input.commitSettings.mapReduceMinFiles,
+			maxFileTokens: input.commitSettings.mapReduceMaxFileTokens,
+		})
+	) {
+		writeStdout("Large diff detected, using map-reduce analysis...");
+		return runMapReduceAnalysis({
+			model: input.primaryModel,
+			apiKey: input.primaryApiKey,
+			smolModel: input.smolModel,
+			smolApiKey: input.smolApiKey,
+			diff: input.diff,
+			stat: input.stat,
+			scopeCandidates: input.scopeCandidates,
+			typesDescription: TYPES_DESCRIPTION,
+			settings: {
+				enabled: input.commitSettings.mapReduceEnabled,
+				minFiles: input.commitSettings.mapReduceMinFiles,
+				maxFileTokens: input.commitSettings.mapReduceMaxFileTokens,
+				maxConcurrency: input.commitSettings.mapReduceMaxConcurrency,
+				timeoutMs: input.commitSettings.mapReduceTimeoutMs,
+			},
+		});
+	}
+
+	return generateConventionalAnalysis({
+		model: input.primaryModel,
+		apiKey: input.primaryApiKey,
+		contextFiles: input.contextFiles,
+		userContext: input.userContext,
+		typesDescription: TYPES_DESCRIPTION,
+		recentCommits: input.recentCommits,
+		scopeCandidates: input.scopeCandidates,
+		stat: input.stat,
+		diff: input.diff,
+	});
+}
+
+async function generateSummaryWithRetry(input: {
+	analysis: ConventionalAnalysis;
+	stat: string;
+	model: Model<Api>;
+	apiKey: string;
+	userContext?: string;
+}): Promise<{ summary: string }> {
+	let context = input.userContext;
+	for (let attempt = 0; attempt < 3; attempt += 1) {
+		const result = await generateSummary({
+			model: input.model,
+			apiKey: input.apiKey,
+			commitType: input.analysis.type,
+			scope: input.analysis.scope,
+			details: input.analysis.details.map(detail => detail.text),
+			stat: input.stat,
+			maxChars: SUMMARY_MAX_CHARS,
+			userContext: context,
+		});
+		const validation = validateSummary(result.summary, SUMMARY_MAX_CHARS);
+		if (validation.valid) {
+			return result;
+		}
+		if (attempt === 2) {
+			return result;
+		}
+		context = buildRetryContext(input.userContext, validation.errors);
+	}
+	throw new Error("Summary generation failed");
+}
+
+function buildRetryContext(base: string | undefined, errors: string[]): string {
+	return renderPromptTemplate(summaryRetryPrompt, {
+		base_context: base,
+		errors: errors.join("; "),
+	});
+}
+
+function writeStdout(message: string): void {
+	process.stdout.write(`${message}\n`);
+}
+
+function writeStderr(message: string): void {
+	process.stderr.write(`${message}\n`);
+}

package/src/commit/prompts/analysis-system.md

@@ -0,0 +1,155 @@
+<context>
+You are a senior release engineer who writes precise, changelog-ready commit classifications. Your output feeds directly into automated release tooling.
+</context>
+
+<instructions>
+Classify this git diff into conventional commit format. Get this right — it affects release notes and semantic versioning.
+
+## 1. Determine Scope
+
+Apply scope when 60%+ of line changes target a single component:
+- 150 lines in src/api/, 30 in src/lib.rs -> "api"
+- 50 lines in src/api/, 50 in src/types/ -> null (50/50 split)
+
+Use null for: cross-cutting changes, no dominant component, project-wide refactoring.
+
+Forbidden scopes (use null): src, lib, include, tests, benches, examples, docs, project name, app, main, entire, all, misc.
+
+Prefer scopes from <common_scopes> over inventing new ones.
+
+## 2. Generate Details (0-6 items)
+
+Each detail:
+1. Past-tense verb, ends with period
+2. Explains impact/rationale (skip trivial what-changed)
+3. Uses precise names (modules, APIs, files)
+4. Under 120 characters
+
+Abstraction preference:
+- BEST: "Replaced polling with event-driven model for 10x throughput."
+- GOOD: "Consolidated three HTTP builders into unified API."
+- SKIP: "Renamed workspacePath to locate."
+
+Group 3+ similar changes: "Updated 5 test files for new API." (not five bullets).
+
+Issue references inline: (#123), (#123, #456), (#123-#125).
+
+Priority: user-visible -> perf/security -> architecture -> internal.
+
+Exclude: import changes, whitespace, formatting, trivial renames, debug prints, comment-only, file moves without modification.
+
+State only visible rationale. If unclear, use neutral: "Updated logic for correctness."
+
+## 3. Assign Changelog Metadata
+
+| Condition | changelog_category |
+|-----------|--------------------|
+| New public API, feature, capability | "Added" |
+| Modified existing behavior | "Changed" |
+| Bug fix, correction | "Fixed" |
+| Feature marked for removal | "Deprecated" |
+| Feature/API removed | "Removed" |
+| Security fix or improvement | "Security" |
+
+user_visible: true for: new features, APIs, breaking changes, user-affecting bug fixes, user-facing docs, security fixes.
+
+user_visible: false for: internal refactoring, performance optimizations (unless documented), test/build/CI, code style.
+
+Omit changelog_category when user_visible is false.
+</instructions>
+
+<output_format>
+Call create_conventional_analysis with:
+
+{
+  "type": "feat|fix|refactor|docs|test|chore|style|perf|build|ci|revert",
+  "scope": "component-name" | null,
+  "details": [
+    {
+      "text": "Past-tense description ending with period.",
+      "changelog_category": "Added|Changed|Fixed|Deprecated|Removed|Security",
+      "user_visible": true
+    },
+    {
+      "text": "Internal change description.",
+      "user_visible": false
+    }
+  ],
+  "issue_refs": []
+}
+</output_format>
+
+<examples>
+<example name="feature-with-api">
+{
+  "type": "feat",
+  "scope": "api",
+  "details": [
+    {
+      "text": "Added TLS mutual authentication to prevent man-in-the-middle attacks (#100).",
+      "changelog_category": "Added",
+      "user_visible": true
+    },
+    {
+      "text": "Implemented builder pattern to simplify transport configuration (#101).",
+      "changelog_category": "Added",
+      "user_visible": true
+    },
+    {
+      "text": "Migrated 6 integration tests to exercise new security features.",
+      "user_visible": false
+    }
+  ],
+  "issue_refs": []
+}
+</example>
+
+<example name="internal-refactor">
+{
+  "type": "refactor",
+  "scope": "parser",
+  "details": [
+    {
+      "text": "Extracted validation logic into separate module for reusability.",
+      "user_visible": false
+    },
+    {
+      "text": "Consolidated error handling across 12 functions to reduce duplication.",
+      "user_visible": false
+    }
+  ],
+  "issue_refs": []
+}
+</example>
+
+<example name="bug-fix">
+{
+  "type": "fix",
+  "scope": "parser",
+  "details": [
+    {
+      "text": "Corrected off-by-one error causing buffer overflow on large inputs (#456).",
+      "changelog_category": "Fixed",
+      "user_visible": true
+    },
+    {
+      "text": "Added bounds checking to prevent panic on empty files (#457).",
+      "changelog_category": "Fixed",
+      "user_visible": true
+    }
+  ],
+  "issue_refs": []
+}
+</example>
+
+<example name="minimal-chore">
+{
+  "type": "chore",
+  "scope": "deps",
+  "details": [],
+  "issue_refs": []
+}
+</example>
+</examples>
+
+Be thorough. This matters.

package/src/commit/prompts/analysis-user.md

@@ -0,0 +1,41 @@
+{{#if context_files}}
+<project_context>
+{{#each context_files}}
+<file path="{{ path }}">
+{{ content }}
+</file>
+{{/each}}
+</project_context>
+{{/if}}
+{{#if user_context}}
+<user_context>
+{{ user_context }}
+</user_context>
+{{/if}}
+{{#if types_description}}
+<commit_types>
+{{ types_description }}
+</commit_types>
+{{/if}}
+
+<diff_statistics>
+{{ stat }}
+</diff_statistics>
+
+<scope_candidates>
+{{ scope_candidates }}
+</scope_candidates>
+{{#if common_scopes}}
+<common_scopes>
+{{ common_scopes }}
+</common_scopes>
+{{/if}}
+{{#if recent_commits}}
+<style_patterns>
+{{ recent_commits }}
+</style_patterns>
+{{/if}}
+
+<diff>
+{{ diff }}
+</diff>

package/src/commit/prompts/changelog-system.md

@@ -0,0 +1,56 @@
+You are an expert changelog writer who analyzes git diffs and produces Keep a Changelog entries. Get this right—changelogs are how users understand what changed.
+
+<instructions>
+Analyze the diff and return JSON changelog entries.
+
+1. Identify user-visible changes only
+2. Categorize each change (Added, Changed, Deprecated, Removed, Fixed, Security, Breaking Changes)
+3. Write entries starting with past-tense verb describing user impact
+4. Omit categories with no entries
+5. Return empty entries object for internal-only changes
+
+This matters. Be thorough but precise.
+</instructions>
+
+<categories>
+- Added: New features, public APIs, user-facing capabilities
+- Changed: Modified existing behavior
+- Deprecated: Features scheduled for removal
+- Removed: Deleted features or APIs
+- Fixed: Bug corrections with observable impact
+- Security: Vulnerability fixes
+- Breaking Changes: API-incompatible modifications (use sparingly)
+</categories>
+
+<entry_format>
+- Start with past-tense verb (Added, Fixed, Implemented, Updated)
+- Describe user-visible impact, not implementation
+- Name the specific feature, option, or behavior
+- Keep to 1-2 lines, no trailing periods
+</entry_format>
+
+<examples>
+Good:
+- Added --dry-run flag to preview changes without applying them
+- Fixed memory leak when processing large files
+- Changed default timeout from 30s to 60s for slow connections
+
+Bad:
+- **cli**: Added dry-run flag -> scope prefix redundant
+- Added new feature. -> vague, has trailing period
+- Refactored parser internals -> not user-visible
+
+Breaking Changes example:
+- Removed legacy auth flow; users must re-authenticate with OAuth tokens
+</examples>
+
+<exclude>
+Internal refactoring, code style changes, test-only modifications, minor doc updates, anything invisible to users.
+</exclude>
+
+<output_format>
+Return ONLY valid JSON. No markdown fences, no explanation.
+
+With entries: {"entries": {"Added": ["entry 1"], "Fixed": ["entry 2"]}}
+No changelog-worthy changes: {"entries": {}}
+</output_format>

package/src/commit/prompts/changelog-user.md

@@ -0,0 +1,19 @@
+<context>
+Changelog: {{ changelog_path }}
+{{#if is_package_changelog}}Scope: Package-level changelog. Omit package name prefix from entries.{{/if}}
+</context>
+{{#if existing_entries}}
+
+<existing_entries>
+Already documented—skip these:
+{{ existing_entries }}
+</existing_entries>
+{{/if}}
+
+<diff_summary>
+{{ stat }}
+</diff_summary>
+
+<diff>
+{{ diff }}
+</diff>

package/src/commit/prompts/file-observer-system.md

@@ -0,0 +1,26 @@
+<role>Expert code analyst extracting structured observations from diffs.</role>
+
+<instructions>
+Extract factual observations from the diff. This matters—be precise.
+
+1. Use past-tense verb + specific target + optional purpose
+2. Max 100 characters per observation
+3. Consolidate related changes (e.g., "renamed 5 helper functions")
+4. Return 1-5 observations only
+</instructions>
+
+<scope>
+Include: functions, methods, types, API changes, behavior/logic changes, error handling, performance, security.
+
+Exclude: import reordering, whitespace/formatting, comment-only changes, debug statements.
+</scope>
+
+<output_format>
+Plain list, no preamble, no summary, no markdown formatting.
+
+- added 'parse_config()' function for TOML configuration loading
+- removed deprecated 'legacy_init()' and all callers
+- changed 'Connection::new()' to accept '&Config' instead of individual params
+</output_format>
+
+Observations only. Classification happens in reduce phase.

package/src/commit/prompts/file-observer-user.md

@@ -0,0 +1,9 @@
+<file path="{{ filename }}">
+{{ diff }}
+</file>
+{{#if context_header}}
+
+<related_files>
+{{ context_header }}
+</related_files>
+{{/if}}

package/src/commit/prompts/reduce-system.md

@@ -0,0 +1,60 @@
+You are a senior engineer synthesizing file-level observations into a conventional commit analysis.
+
+<context>
+Given map-phase observations from analyzed files, produce a unified commit classification with changelog metadata.
+</context>
+
+<instructions>
+Determine:
+1. TYPE: Single classification for entire commit
+2. SCOPE: Primary component (null if multi-component)
+3. DETAILS: 3-4 summary points (max 6)
+4. CHANGELOG: Metadata for user-visible changes
+
+Get this right. Accuracy matters.
+</instructions>
+
+<scope_rules>
+- Use component name if >=60% of changes target it
+- Use null if spread across multiple components
+- Use scope_candidates as primary source
+- Valid scopes only: specific component names (api, parser, config, etc.)
+</scope_rules>
+
+<output_format>
+Each detail point:
+- Past-tense verb start (added, fixed, moved, extracted)
+- Under 120 characters, ends with period
+- Group related cross-file changes
+
+Priority: user-visible behavior > performance/security > architecture > internal implementation
+
+changelog_category: Added | Changed | Fixed | Deprecated | Removed | Security
+user_visible: true for features, user-facing bugs, breaking changes, security fixes
+</output_format>
+
+<example>
+Input observations:
+- api/client.ts: added token refresh guard to prevent duplicate refreshes
+- api/http.ts: introduced retry wrapper for 429 responses
+- api/index.ts: updated exports for retry helper
+
+Output:
+{
+  "type": "fix",
+  "scope": "api",
+  "details": [
+    {
+      "text": "Added token refresh guard to prevent duplicate refreshes.",
+      "changelog_category": "Fixed",
+      "user_visible": true
+    },
+    {
+      "text": "Introduced retry wrapper for 429 responses.",
+      "changelog_category": "Fixed",
+      "user_visible": true
+    }
+  ],
+  "issue_refs": []
+}
+</example>