@oh-my-pi/pi-coding-agent 13.19.0 → 14.0.3

package/src/cli/read-cli.ts

@@ -0,0 +1,67 @@
+/**
+ * Read CLI command handler.
+ *
+ * Handles `omp read` subcommand — emits chunk-mode read output for files,
+ * and delegates URL reads through the read tool pipeline.
+ */
+import * as path from "node:path";
+import chalk from "chalk";
+import { Settings } from "../config/settings";
+import { formatChunkedRead, resolveAnchorStyle } from "../edit/modes/chunk";
+import { getLanguageFromPath } from "../modes/theme/theme";
+import type { ToolSession } from "../tools";
+import { parseReadUrlTarget } from "../tools/fetch";
+import { ReadTool } from "../tools/read";
+
+export interface ReadCommandArgs {
+	path: string;
+	sel?: string;
+}
+
+function createCliReadSession(cwd: string, settings: Settings): ToolSession {
+	return {
+		cwd,
+		hasUI: false,
+		hasEditTool: true,
+		getSessionFile: () => null,
+		getSessionSpawns: () => null,
+		settings,
+	};
+}
+
+export async function runReadCommand(cmd: ReadCommandArgs): Promise<void> {
+	const cwd = process.cwd();
+	const parsedUrlTarget = parseReadUrlTarget(cmd.path, cmd.sel);
+	if (parsedUrlTarget) {
+		const settings = await Settings.init({ cwd });
+		const tool = new ReadTool(createCliReadSession(cwd, settings));
+		const result = await tool.execute("cli-read", { path: cmd.path, sel: cmd.sel });
+		const text = result.content.find((content): content is { type: "text"; text: string } => content.type === "text");
+		console.log(text?.text ?? "");
+		return;
+	}
+
+	const filePath = path.resolve(cmd.path);
+	const file = Bun.file(filePath);
+	if (!(await file.exists())) {
+		console.error(chalk.red(`Error: File not found: ${cmd.path}`));
+		process.exit(1);
+	}
+
+	const readPath = cmd.sel ? `${filePath}:${cmd.sel}` : filePath;
+	const language = getLanguageFromPath(filePath);
+
+	try {
+		const result = await formatChunkedRead({
+			filePath,
+			readPath,
+			cwd,
+			language,
+			anchorStyle: resolveAnchorStyle(),
+		});
+		console.log(result.text);
+	} catch (err) {
+		console.error(chalk.red(`Error: ${err instanceof Error ? err.message : String(err)}`));
+		process.exit(1);
+	}
+}

package/src/cli/setup-cli.ts

@@ -4,7 +4,7 @@
  * Handles `omp setup <component>` to install dependencies for optional features.
  */
 import * as path from "node:path";
-import { APP_NAME, getPythonEnvDir } from "@oh-my-pi/pi-utils";
+import { $which, APP_NAME, getPythonEnvDir } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import chalk from "chalk";
 import { theme } from "../modes/theme/theme";
@@ -90,12 +90,12 @@ async function checkPythonSetup(): Promise<PythonCheckResult> {
 		managedEnvPath: MANAGED_PYTHON_ENV,
 	};
 
-	const systemPythonPath = Bun.which("python") ?? Bun.which("python3");
+	const systemPythonPath = $which("python") ?? $which("python3");
 	const managedPath = managedPythonPath();
 	const hasManagedEnv = await Bun.file(managedPath).exists();
 
-	result.uvPath = Bun.which("uv") ?? undefined;
-	result.pipPath = Bun.which("pip3") ?? Bun.which("pip") ?? undefined;
+	result.uvPath = $which("uv") ?? undefined;
+	result.pipPath = $which("pip3") ?? $which("pip") ?? undefined;
 
 	const candidates = [systemPythonPath, hasManagedEnv ? managedPath : undefined].filter(
 		(candidate): candidate is string => !!candidate,

package/src/cli/update-cli.ts

@@ -7,7 +7,7 @@
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { pipeline } from "node:stream/promises";
-import { APP_NAME, isEnoent, VERSION } from "@oh-my-pi/pi-utils";
+import { $which, APP_NAME, isEnoent, VERSION } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import chalk from "chalk";
 import { theme } from "../modes/theme/theme";
@@ -36,7 +36,7 @@ export function parseUpdateArgs(args: string[]): { force: boolean; check: boolea
 }
 
 async function getBunGlobalBinDir(): Promise<string | undefined> {
-	if (!Bun.which("bun")) return undefined;
+	if (!$which("bun")) return undefined;
 	try {
 		const result = await $`bun pm bin -g`.quiet().nothrow();
 		if (result.exitCode !== 0) return undefined;
@@ -167,7 +167,7 @@ function getBinaryName(): string {
  * Resolve the path that `omp` maps to in the user's PATH.
  */
 function resolveOmpPath(): string | undefined {
-	return Bun.which(APP_NAME) ?? undefined;
+	return $which(APP_NAME) ?? undefined;
 }
 
 /**

package/src/cli.ts

@@ -48,6 +48,8 @@ const commands: CommandEntry[] = [
 	{ name: "commit", load: () => import("./commands/commit").then(m => m.default) },
 	{ name: "config", load: () => import("./commands/config").then(m => m.default) },
 	{ name: "grep", load: () => import("./commands/grep").then(m => m.default) },
+	{ name: "grievances", load: () => import("./commands/grievances").then(m => m.default) },
+	{ name: "read", load: () => import("./commands/read").then(m => m.default) },
 	{ name: "jupyter", load: () => import("./commands/jupyter").then(m => m.default) },
 	{ name: "plugin", load: () => import("./commands/plugin").then(m => m.default) },
 	{ name: "setup", load: () => import("./commands/setup").then(m => m.default) },

package/src/commands/grep.ts

@@ -1,6 +1,7 @@
 /**
  * Test grep tool.
  */
+import { GrepOutputMode } from "@oh-my-pi/pi-natives";
 import { Args, Command, Flags } from "@oh-my-pi/pi-utils/cli";
 import { type GrepCommandArgs, runGrepCommand } from "../cli/grep-cli";
 import { initTheme } from "../modes/theme/theme";
@@ -25,7 +26,11 @@ export default class Grep extends Command {
 	async run(): Promise<void> {
 		const { args, flags } = await this.parse(Grep);
 
-		const mode: GrepCommandArgs["mode"] = flags.count ? "count" : flags.files ? "filesWithMatches" : "content";
+		const mode: GrepCommandArgs["mode"] = flags.count
+			? GrepOutputMode.Count
+			: flags.files
+				? GrepOutputMode.FilesWithMatches
+				: GrepOutputMode.Content;
 
 		const cmd: GrepCommandArgs = {
 			pattern: args.pattern ?? "",

package/src/commands/grievances.ts

@@ -0,0 +1,20 @@
+/**
+ * View recently reported tool issues from automated QA.
+ */
+import { Command, Flags } from "@oh-my-pi/pi-utils/cli";
+import { listGrievances } from "../cli/grievances-cli";
+
+export default class Grievances extends Command {
+	static description = "View reported tool issues (auto-QA grievances)";
+
+	static flags = {
+		limit: Flags.integer({ char: "n", description: "Number of recent issues to show", default: 20 }),
+		tool: Flags.string({ char: "t", description: "Filter by tool name" }),
+		json: Flags.boolean({ char: "j", description: "Output as JSON", default: false }),
+	};
+
+	async run(): Promise<void> {
+		const { flags } = await this.parse(Grievances);
+		await listGrievances({ limit: flags.limit, tool: flags.tool, json: flags.json });
+	}
+}

package/src/commands/read.ts

@@ -0,0 +1,33 @@
+/**
+ * Chunk-mode read tool.
+ */
+import { Args, Command, Flags } from "@oh-my-pi/pi-utils/cli";
+import { type ReadCommandArgs, runReadCommand } from "../cli/read-cli";
+import { initTheme } from "../modes/theme/theme";
+
+export default class Read extends Command {
+	static description = "Read a file as a chunk tree";
+
+	static args = {
+		path: Args.string({ description: "File path to read", required: true }),
+	};
+
+	static flags = {
+		sel: Flags.string({
+			char: "s",
+			description: "Chunk selector or line range (e.g. class_Foo.fn_bar, L10-L20)",
+		}),
+	};
+
+	async run(): Promise<void> {
+		const { args, flags } = await this.parse(Read);
+
+		const cmd: ReadCommandArgs = {
+			path: args.path ?? "",
+			sel: flags.sel,
+		};
+
+		await initTheme();
+		await runReadCommand(cmd);
+	}
+}

package/src/commit/agentic/agent.ts

@@ -1,10 +1,10 @@
 import { INTENT_FIELD, type ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Api, Model } from "@oh-my-pi/pi-ai";
 import { Markdown } from "@oh-my-pi/pi-tui";
+import { prompt } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
 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 { Settings } from "../../config/settings";
 import { getMarkdownTheme } from "../../modes/theme/theme";
 import { createAgentSession } from "../../sdk";
@@ -36,8 +36,8 @@ export interface ExistingChangelogEntries {
 }
 
 export async function runCommitAgentSession(input: CommitAgentInput): Promise<CommitAgentState> {
-	const typesDescription = renderPromptTemplate(typesDescriptionPrompt);
-	const systemPrompt = renderPromptTemplate(agentSystemPrompt, {
+	const typesDescription = prompt.render(typesDescriptionPrompt);
+	const systemPrompt = prompt.render(agentSystemPrompt, {
 		types_description: typesDescription,
 	});
 	const state: CommitAgentState = { diffText: input.diffText };
@@ -149,7 +149,7 @@ export async function runCommitAgentSession(input: CommitAgentInput): Promise<Co
 	});
 
 	try {
-		const prompt = renderPromptTemplate(agentUserPrompt, {
+		const agentUserMessage = prompt.render(agentUserPrompt, {
 			user_context: input.userContext,
 			changelog_targets: input.changelogTargets.length > 0 ? input.changelogTargets.join("\n") : undefined,
 			existing_changelog_entries: input.existingChangelogEntries,
@@ -158,7 +158,7 @@ export async function runCommitAgentSession(input: CommitAgentInput): Promise<Co
 		let retryCount = 0;
 		const needsChangelog = input.requireChangelog && input.changelogTargets.length > 0;
 
-		await session.prompt(prompt, {
+		await session.prompt(agentUserMessage, {
 			attribution: "agent",
 			expandPromptTemplates: false,
 		});

package/src/commit/agentic/index.ts

@@ -1,6 +1,6 @@
 import * as path from "node:path";
 import { createInterface } from "node:readline/promises";
-import { $env, getProjectDir, isEnoent } from "@oh-my-pi/pi-utils";
+import { $env, getProjectDir, isEnoent, prompt } from "@oh-my-pi/pi-utils";
 import { applyChangelogProposals } from "../../commit/changelog";
 import { detectChangelogBoundaries } from "../../commit/changelog/detect";
 import { parseUnreleasedSection } from "../../commit/changelog/parse";
@@ -8,7 +8,6 @@ import { formatCommitMessage } from "../../commit/message";
 import { resolvePrimaryModel, resolveSmolModel } from "../../commit/model-selection";
 import type { CommitCommandArgs, ConventionalAnalysis } from "../../commit/types";
 import { ModelRegistry } from "../../config/model-registry";
-import { renderPromptTemplate } from "../../config/prompt-templates";
 import { Settings } from "../../config/settings";
 import { discoverAuthStorage, discoverContextFiles } from "../../sdk";
 import * as git from "../../utils/git";
@@ -305,8 +304,8 @@ async function confirmSplitCommitPlan(plan: SplitCommitPlan): Promise<boolean> {
 	}
 	const rl = createInterface({ input: process.stdin, output: process.stdout });
 	try {
-		const prompt = renderPromptTemplate(splitConfirmPrompt, { count: plan.commits.length });
-		const answer = await rl.question(prompt);
+		const splitConfirmQuestion = prompt.render(splitConfirmPrompt, { count: plan.commits.length });
+		const answer = await rl.question(splitConfirmQuestion);
 		return ["y", "yes"].includes(answer.trim().toLowerCase());
 	} finally {
 		rl.close();

package/src/commit/agentic/tools/analyze-file.ts

@@ -1,9 +1,9 @@
+import { prompt } from "@oh-my-pi/pi-utils";
 import { Type } from "@sinclair/typebox";
 import analyzeFilePrompt from "../../../commit/agentic/prompts/analyze-file.md" with { type: "text" };
 import type { CommitAgentState } from "../../../commit/agentic/state";
 import type { NumstatEntry } from "../../../commit/types";
 import type { ModelRegistry } from "../../../config/model-registry";
-import { renderPromptTemplate } from "../../../config/prompt-templates";
 import type { Settings } from "../../../config/settings";
 import type { CustomTool, CustomToolContext } from "../../../extensibility/custom-tools/types";
 import type { AuthStorage } from "../../../session/auth-storage";
@@ -66,7 +66,7 @@ export function createAnalyzeFileTool(options: {
 			const numstat = options.state.overview?.numstat ?? [];
 			const tasks = params.files.map((file, index) => {
 				const relatedFiles = formatRelatedFiles(params.files, file, numstat);
-				const prompt = renderPromptTemplate(analyzeFilePrompt, {
+				const assignment = prompt.render(analyzeFilePrompt, {
 					file,
 					goal: params.goal,
 					related_files: relatedFiles,
@@ -74,7 +74,7 @@ export function createAnalyzeFileTool(options: {
 				return {
 					id: `AnalyzeFile${index + 1}`,
 					description: `Analyze ${file}`,
-					assignment: prompt,
+					assignment,
 				};
 			});
 			const taskParams: TaskParams = {

package/src/commit/agentic/validation.ts

@@ -1,7 +1,7 @@
 import { stripTypePrefix } from "../../commit/analysis/summary";
 import { validateSummary } from "../../commit/analysis/validation";
 import type { CommitType, ConventionalDetail } from "../../commit/types";
-import { normalizeUnicode } from "../../patch/normalize";
+import { normalizeUnicode } from "../../edit/normalize";
 
 export const SUMMARY_MAX_CHARS = 72;
 export const MAX_DETAIL_ITEMS = 6;

package/src/commit/analysis/conventional.ts

@@ -1,11 +1,11 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Api, AssistantMessage, Model } from "@oh-my-pi/pi-ai";
 import { completeSimple, validateToolCall } from "@oh-my-pi/pi-ai";
+import { prompt } from "@oh-my-pi/pi-utils";
 import { Type } from "@sinclair/typebox";
 import analysisSystemPrompt from "../../commit/prompts/analysis-system.md" with { type: "text" };
 import analysisUserPrompt from "../../commit/prompts/analysis-user.md" with { type: "text" };
 import type { ChangelogCategory, ConventionalAnalysis } from "../../commit/types";
-import { renderPromptTemplate } from "../../config/prompt-templates";
 import { toReasoningEffort } from "../../thinking";
 import { extractTextContent, extractToolCall, normalizeAnalysis, parseJsonPayload } from "../utils";
 
@@ -76,7 +76,7 @@ export async function generateConventionalAnalysis({
 	stat,
 	diff,
 }: ConventionalAnalysisInput): Promise<ConventionalAnalysis> {
-	const prompt = renderPromptTemplate(analysisUserPrompt, {
+	const userContent = prompt.render(analysisUserPrompt, {
 		context_files: contextFiles && contextFiles.length > 0 ? contextFiles : undefined,
 		user_context: userContext,
 		types_description: typesDescription,
@@ -89,8 +89,8 @@ export async function generateConventionalAnalysis({
 	const response = await completeSimple(
 		model,
 		{
-			systemPrompt: renderPromptTemplate(analysisSystemPrompt),
-			messages: [{ role: "user", content: prompt, timestamp: Date.now() }],
+			systemPrompt: prompt.render(analysisSystemPrompt),
+			messages: [{ role: "user", content: userContent, timestamp: Date.now() }],
 			tools: [ConventionalAnalysisTool],
 		},
 		{ apiKey, maxTokens: 2400, reasoning: toReasoningEffort(thinkingLevel) },

package/src/commit/analysis/summary.ts

@@ -1,11 +1,11 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Api, AssistantMessage, Model } from "@oh-my-pi/pi-ai";
 import { completeSimple, validateToolCall } from "@oh-my-pi/pi-ai";
+import { prompt } from "@oh-my-pi/pi-utils";
 import { Type } from "@sinclair/typebox";
 import summarySystemPrompt from "../../commit/prompts/summary-system.md" with { type: "text" };
 import summaryUserPrompt from "../../commit/prompts/summary-user.md" with { type: "text" };
 import type { CommitSummary } from "../../commit/types";
-import { renderPromptTemplate } from "../../config/prompt-templates";
 import { toReasoningEffort } from "../../thinking";
 import { extractTextContent, extractToolCall } from "../utils";
 
@@ -44,7 +44,7 @@ export async function generateSummary({
 	userContext,
 }: SummaryInput): Promise<CommitSummary> {
 	const systemPrompt = renderSummaryPrompt({ commitType, scope, maxChars });
-	const userPrompt = renderPromptTemplate(summaryUserPrompt, {
+	const userPrompt = prompt.render(summaryUserPrompt, {
 		user_context: userContext,
 		details: details.join("\n"),
 		stat,
@@ -73,7 +73,7 @@ function renderSummaryPrompt({
 	maxChars: number;
 }): string {
 	const scopePrefix = scope ? `(${scope})` : "";
-	return renderPromptTemplate(summarySystemPrompt, {
+	return prompt.render(summarySystemPrompt, {
 		commit_type: commitType,
 		scope_prefix: scopePrefix,
 		chars: String(maxChars),

package/src/commit/changelog/generate.ts

@@ -1,11 +1,11 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Api, AssistantMessage, Model } from "@oh-my-pi/pi-ai";
 import { completeSimple, validateToolCall } from "@oh-my-pi/pi-ai";
+import { prompt } from "@oh-my-pi/pi-utils";
 import { type TSchema, Type } from "@sinclair/typebox";
 import changelogSystemPrompt from "../../commit/prompts/changelog-system.md" with { type: "text" };
 import changelogUserPrompt from "../../commit/prompts/changelog-user.md" with { type: "text" };
 import { CHANGELOG_CATEGORIES, type ChangelogCategory, type ChangelogGenerationResult } from "../../commit/types";
-import { renderPromptTemplate } from "../../config/prompt-templates";
 import { toReasoningEffort } from "../../thinking";
 import { extractTextContent, extractToolCall, parseJsonPayload } from "../utils";
 
@@ -48,7 +48,7 @@ export async function generateChangelogEntries({
 	stat,
 	diff,
 }: ChangelogPromptInput): Promise<ChangelogGenerationResult> {
-	const prompt = renderPromptTemplate(changelogUserPrompt, {
+	const userContent = prompt.render(changelogUserPrompt, {
 		changelog_path: changelogPath,
 		is_package_changelog: isPackageChangelog,
 		existing_entries: existingEntries,
@@ -58,8 +58,8 @@ export async function generateChangelogEntries({
 	const response = await completeSimple(
 		model,
 		{
-			systemPrompt: renderPromptTemplate(changelogSystemPrompt),
-			messages: [{ role: "user", content: prompt, timestamp: Date.now() }],
+			systemPrompt: prompt.render(changelogSystemPrompt),
+			messages: [{ role: "user", content: userContent, timestamp: Date.now() }],
 			tools: [changelogTool],
 		},
 		{ apiKey, maxTokens: 1200, reasoning: toReasoningEffort(thinkingLevel) },

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

@@ -1,11 +1,11 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Api, AssistantMessage, Message, Model } from "@oh-my-pi/pi-ai";
 import { completeSimple } from "@oh-my-pi/pi-ai";
+import { prompt } from "@oh-my-pi/pi-utils";
 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 { toReasoningEffort } from "../../thinking";
 import { truncateToTokenLimit } from "./utils";
 
@@ -38,7 +38,7 @@ export async function runMapPhase({
 	config,
 }: MapPhaseInput): Promise<FileObservation[]> {
 	const filtered = files.filter(file => !isExcludedFile(file.filename));
-	const systemPrompt = renderPromptTemplate(fileObserverSystemPrompt);
+	const systemPrompt = prompt.render(fileObserverSystemPrompt);
 	const maxFileTokens = config?.maxFileTokens ?? MAX_FILE_TOKENS;
 	const maxConcurrency = config?.maxConcurrency ?? MAX_CONCURRENCY;
 	const timeoutMs = config?.timeoutMs ?? MAP_PHASE_TIMEOUT_MS;
@@ -56,14 +56,14 @@ export async function runMapPhase({
 
 		const contextHeader = generateContextHeader(filtered, file.filename);
 		const truncated = truncateToTokenLimit(file.content, maxFileTokens);
-		const prompt = renderPromptTemplate(fileObserverUserPrompt, {
+		const userContent = prompt.render(fileObserverUserPrompt, {
 			filename: file.filename,
 			diff: truncated,
 			context_header: contextHeader,
 		});
 		const request = {
 			systemPrompt,
-			messages: [{ role: "user", content: prompt, timestamp: Date.now() }] as Message[],
+			messages: [{ role: "user", content: userContent, timestamp: Date.now() }] as Message[],
 		};
 
 		const response = await withRetry(

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

@@ -1,11 +1,11 @@
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Api, AssistantMessage, Model } from "@oh-my-pi/pi-ai";
 import { completeSimple, validateToolCall } from "@oh-my-pi/pi-ai";
+import { prompt } from "@oh-my-pi/pi-utils";
 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";
 import { toReasoningEffort } from "../../thinking";
 import { extractTextContent, extractToolCall, normalizeAnalysis, parseJsonPayload } from "../utils";
 
@@ -67,7 +67,7 @@ export async function runReducePhase({
 	scopeCandidates,
 	typesDescription,
 }: ReducePhaseInput): Promise<ConventionalAnalysis> {
-	const prompt = renderPromptTemplate(reduceUserPrompt, {
+	const userContent = prompt.render(reduceUserPrompt, {
 		types_description: typesDescription,
 		observations: observations.flatMap(obs => obs.observations.map(line => `- ${obs.file}: ${line}`)).join("\n"),
 		stat,
@@ -76,8 +76,8 @@ export async function runReducePhase({
 	const response = await completeSimple(
 		model,
 		{
-			systemPrompt: renderPromptTemplate(reduceSystemPrompt),
-			messages: [{ role: "user", content: prompt, timestamp: Date.now() }],
+			systemPrompt: prompt.render(reduceSystemPrompt),
+			messages: [{ role: "user", content: userContent, timestamp: Date.now() }],
 			tools: [ReduceTool],
 		},
 		{ apiKey, maxTokens: 2400, reasoning: toReasoningEffort(thinkingLevel) },

package/src/commit/pipeline.ts

@@ -1,9 +1,8 @@
 import * as path from "node:path";
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import type { Api, Model } from "@oh-my-pi/pi-ai";
-import { getProjectDir, logger } from "@oh-my-pi/pi-utils";
+import { getProjectDir, logger, prompt } from "@oh-my-pi/pi-utils";
 import { ModelRegistry } from "../config/model-registry";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import { Settings } from "../config/settings";
 import { discoverAuthStorage } from "../sdk";
 import { loadProjectContextFiles } from "../system-prompt";
@@ -26,7 +25,7 @@ import type { CommitCommandArgs, ConventionalAnalysis } from "./types";
 
 const SUMMARY_MAX_CHARS = 72;
 const RECENT_COMMITS_COUNT = 8;
-const TYPES_DESCRIPTION = renderPromptTemplate(typesDescriptionPrompt);
+const TYPES_DESCRIPTION = prompt.render(typesDescriptionPrompt);
 
 /**
  * Execute the omp commit pipeline for staged changes.
@@ -236,7 +235,7 @@ async function generateSummaryWithRetry(input: {
 }
 
 function buildRetryContext(base: string | undefined, errors: string[]): string {
-	return renderPromptTemplate(summaryRetryPrompt, {
+	return prompt.render(summaryRetryPrompt, {
 		base_context: base,
 		errors: errors.join("; "),
 	});

package/src/config/model-registry.ts

@@ -947,7 +947,10 @@ export class ModelRegistry {
 			}
 			const models = this.#applyProviderModelOverrides(
 				providerConfig.provider,
-				this.#applyProviderCompat(providerConfig.compat, cache.models),
+				this.#normalizeDiscoverableModels(
+					providerConfig,
+					this.#applyProviderCompat(providerConfig.compat, cache.models),
+				),
 			);
 			cachedModels.push(...models);
 			this.#providerDiscoveryStates.set(providerConfig.provider, {
@@ -967,11 +970,19 @@ export class ModelRegistry {
 		return models.map(model => ({ ...model, compat: mergeCompat(model.compat, compat) }));
 	}
 
+	#normalizeDiscoverableModels(providerConfig: DiscoveryProviderConfig, models: Model<Api>[]): Model<Api>[] {
+		if (providerConfig.provider !== "ollama" || providerConfig.api !== "openai-responses") {
+			return models;
+		}
+
+		return models.map(model => (model.api === "openai-completions" ? { ...model, api: "openai-responses" } : model));
+	}
+
 	#addImplicitDiscoverableProviders(configuredProviders: Set<string>): void {
 		if (!configuredProviders.has("ollama")) {
 			this.#discoverableProviders.push({
 				provider: "ollama",
-				api: "openai-completions",
+				api: "openai-responses",
 				baseUrl: Bun.env.OLLAMA_BASE_URL || "http://127.0.0.1:11434",
 				discovery: { type: "ollama" },
 				optional: true,
@@ -1203,7 +1214,10 @@ export class ModelRegistry {
 		}
 		return this.#applyProviderModelOverrides(
 			providerId,
-			this.#applyProviderCompat(providerConfig.compat, result.models),
+			this.#normalizeDiscoverableModels(
+				providerConfig,
+				this.#applyProviderCompat(providerConfig.compat, result.models),
+			),
 		);
 	}