@oh-my-pi/pi-coding-agent 15.0.0 → 15.0.1

package/CHANGELOG.md

@@ -2,6 +2,47 @@
 
 ## [Unreleased]
 
+## [15.0.1] - 2026-05-14
+### Breaking Changes
+
+- Removed the dedicated `exit_plan_mode` tool and its prompt, requiring plan-mode completion to use the existing `resolve` tool path instead
+
+### Added
+
+- Added optional `extra` metadata object to the `resolve` tool so callers can pass context-specific payloads, including plan approval titles
+- Added `hide: true` frontmatter option for skill `SKILL.md` files. Hidden skills are still loaded and remain reachable via `skill://<name>` URLs and (when enabled) `/skill:<name>` slash commands, but are omitted from the rendered system prompt's `<skills>` listing so the model won't auto-discover them. Use for skills the user opts into explicitly rather than ones the model should pick up from descriptions.
+- Added middle elision for streaming tool outputs (bash, ssh, python, js eval) and post-execution tool result spill. When `tools.artifactHeadBytes` is set (default 20 KB), large outputs now keep both the first N KB and the last N KB with an inline `[… N lines elided (M KB) …]` marker between them, instead of dropping everything before the trailing tail. Setting `tools.artifactHeadBytes = 0` reverts to the previous tail-only behavior. The full output is still mirrored to the session artifact (`artifact://<id>`) regardless of elision mode. Exposes `truncateMiddle` and `formatMiddleElisionMarker` from `@oh-my-pi/pi-coding-agent/session/streaming-output`, extends `OutputSinkOptions` with `headBytes`, and adds `direction: "middle"` plus `headRange` / `tailRange` / `elidedLines` / `elidedBytes` to `TruncationMeta`.
+- Added per-line column cap shared across streaming tool outputs (`bash`, `ssh`, `python`, `js eval`) and the `read` tool. Lines wider than `tools.outputMaxColumns` bytes (default **768**) are ellipsis-truncated at write time and remaining bytes up to the next `\n` are dropped — bounded memory even on multi-MB single-line outputs (e.g. `cat /dev/urandom`). The cap lives on `OutputSink` as the new `maxColumns` option, persists state across chunk boundaries so split-mid-line writes still respect the budget, and exposes `columnDroppedBytes` / `columnTruncatedLines` on `OutputSummary`. Middle-elision byte math subtracts column drops so the "elided from middle" count stays honest. `read` reuses the same setting but trims its already-collected lines via `truncateLine`. Skipped when the read selector is `:raw`. The artifact file (`artifact://<id>`) keeps the full uncapped stream. Set `tools.outputMaxColumns = 0` to disable.
+- Added Bun HTTP/2 fetch opt-in. Dev scripts (`bun run dev`, `bun run stats`) now pass `bun --experimental-http2-fetch` so every `fetch()` advertises `h2` in the TLS ALPN list and falls back to HTTP/1.1 when the server doesn't select it. Multiplexing collapses parallel requests to the same origin onto one TLS connection. For the installed `omp` binary, export `BUN_FEATURE_FLAG_EXPERIMENTAL_HTTP2_CLIENT=1` in your shell to enable the same behavior (the flag has to be set before Bun starts; `process.env` from inside JS is too late). Requires Bun **1.3.14**.
+- Added per-subagent cost display (`$X.XX` in the task progress tree and the session-observer stats line). Cost is accumulated incrementally from `message_end` events and shown only when non-zero, using the `statusLineCost` theme color. Providers that do not report per-turn cost data (e.g. subscription/OAuth usage) continue to show nothing.
+
+### Changed
+
+- Changed plan-mode completion to use `resolve { action: "apply", reason, extra: { title } }` to request plan approval rather than calling `exit_plan_mode`
+- Changed resolve pending-action previews to trim and truncate long `reason` text for cleaner status-line rendering
+- Raised the image downscaling default JPEG quality from 75 to 80 in `resizeImage` output generation
+- Changed image resize metadata notes from coordinate-scale hints to a simple `Image resized from <original> to <displayed>` message and hide the note when the resized dimensions are unchanged
+- Removed `utils/image-convert.ts` and its `convertToPng` helper; callers now inline `new Bun.Image(bytes).png().toBase64()` from [`Bun.Image`](https://bun.com/docs/runtime/image) (Bun 1.3.14+).
+- Changed image decode/resize/encode in `utils/image-resize.ts` from the native `PhotonImage` binding to [`Bun.Image`](https://bun.com/docs/runtime/image). Same PNG/JPEG/WebP quality+dimension ladder, but pipelines run off-thread on Bun's statically-linked codecs with no native-addon round-trip. Bumped the minimum Bun runtime requirement to **1.3.14**.
+- Changed `search` pagination in multi-file scopes so `skip` now skips entire files and pages results in groups of up to 20 files, with output guiding the next `skip` value via `Showing files X-Y of N`
+- Changed multi-file search result selection to cap each file at 20 matches and round-robin across files, so one noisy file no longer suppresses visibility of hits in other files and truncation now reports per-file limits
+- Changed search truncation metadata/renderer output from match/result-based limits to file-based limits (`fileLimitReached`, `perFileLimitReached`) and updated truncation labels accordingly
+- Lowered `read.defaultLimit` default from `500` to `300` lines, and split the per-range context padding into asymmetric `RANGE_LEADING_CONTEXT_LINES = 1` / `RANGE_TRAILING_CONTEXT_LINES = 3` (was symmetric `RANGE_CONTEXT_LINES = 3`). Replay analysis over post-summarizer sessions (`scripts/session-stats/optimize_read_config.py`) showed that bare-path reads are over-provisioned at the median (file p50 = 220 lines) and that most follow-up reads are disjoint hops rather than adjacent extensions — so a smaller default plus narrower leading context reclaims tokens without measurably changing first-cover rate. Trailing context stays at 3 lines to keep anchor-stale recovery on narrow reads. Explicit `read.defaultLimit` overrides in settings are honoured unchanged.
+
+### Fixed
+
+- Fixed abrupt process termination data loss during session persistence by moving steady-state session writes to a synchronous path that writes each entry to the kernel page cache before returning
+- Fixed `--help` startup to avoid a config/model-registry load cycle so the root CLI help command now exits successfully in a clean environment
+- Queued `/skill:<name> [args]` invocations now show as compact `Steer: /skill:<name> [args]` / `Follow-up: /skill:<name> [args]` chips in the pending-messages bar and disappear when the agent consumes the queued message (parity with plain-text steer/follow-up). Previously the queued skill was invisible while queued and rendered as a full skill block at consumption with no chip ever appearing.
+- Plan-mode "Approve and compact context" no longer surfaces a red "Operation aborted" line on the plan-mode assistant message; the silent transition into compaction now renders cleanly on both live and replay paths. Real user-cancel aborts on unrelated turns and the existing "Compaction cancelled" path are unchanged.
+- Auto-recover conflict-resolution `write`/`read` paths that the agent malformed as `<file>:conflict://<N>` (or `<file>:conflict://*`) by mixing the `:conflicts` read selector with the `conflict://` scheme. The stripped `<file>:` prefix is stored on `ParsedConflictUri.recoveredPrefix` and, for writes, surfaces as a trailing note in the result text so the agent learns the correct shape. Clean `conflict://…` URIs are unchanged.
+- Fixed hashline edit renderer leaving a stray `@` in the displayed file path when the agent emitted a canonical `@@ PATH` header (or any `@`-run longer than one). Titles like `Edit: @ packages/foo.ts` now render as `Edit: packages/foo.ts`, matching the actual parser in `hashline/input.ts` which already strips every leading `@` before resolving the path. Purely cosmetic — the edit itself was always routed to the correct file.
+- Fixed model contextWindow and maxTokens defaulting to `UNK_CONTEXT_WINDOW` (222222) / `UNK_MAX_TOKENS` (8888) when cached or freshly-discovered provider models replace bundled models through `ModelRegistry.#mergeResolvedModels`. The merge now preserves the bundled model's values when the replacement only has sentinel fallbacks.
+- Fixed headless `browser.open` tab startup on slow Chromium target enumeration by making worker-side stealth user-agent target setup selective, bounded, and best-effort for non-active targets. Worker startup errors are now surfaced directly instead of degrading into the generic tab worker initialization timeout.
+- Fixed token display for sessions and subagents inflating far beyond the context window. `token_total` status-line segment and the subagent overlay token counter now show `input + output + cacheWrite` instead of `input + output + cacheRead + cacheWrite`. With prompt caching, `cacheRead` per turn equals the full cached context — summing it across all turns produces a cumulative total that is N×context_size (e.g. a 5-turn session with a 1 M-token context reported ~5 M tokens). Cache activity is still visible via the dedicated `cache_read`/`cache_write` status-line segments; billing cost is unaffected.
+- Fixed ACP clients missing `config_option_update` notifications when the thinking level changed via any path other than the client's own `session/set_session_config_option` call (slash commands, model auto-adjust, extension UI). `AgentSession` now emits a `thinking_level_changed` event from `setThinkingLevel`, and `AcpAgent` subscribes to each managed session for the session's lifetime and pushes a fresh `config_option_update` whenever the effective level changes — independent of any active prompt turn. The subscription is installed inside `#scheduleBootstrapUpdates`'s 50 ms timer so it shares the same race guard that prevents Zed's `Received session notification for unknown session` drop when notifications fire before `session/new` (or fork) returns; the pre-bootstrap thinking level is reported in the response's `configOptions`. The `session/set_session_config_option` handler keeps its own push only when the subscription has not yet been installed, so client-driven thinking changes still notify pre-bootstrap, post-bootstrap they flow through the subscription exactly once. Subscriptions are released in `#disposeSessionRecord`.
+- Fixed MCP OAuth refresh failing with `HTTP 401 invalid_client` for servers that require Dynamic Client Registration (RFC 7591) and have no `oauth.clientId` configured (e.g. `mcp.linear.app`). `MCPOAuthFlow` registered a fresh public PKCE client on each authorize and discarded the issued `client_id` once the flow object went out of scope; refresh then called the provider's `/token` endpoint without a `client_id`. The flow now exposes `resolvedClientId` / `registeredClientSecret` getters, `MCPCommandController#handleOAuthFlow` returns them alongside `credentialId`, and both the initial-connect and `/mcp reauth` paths persist them into `auth.{clientId,clientSecret}` (used at refresh) and `oauth.{clientId,clientSecret}` (used by subsequent `/mcp reauth` to skip re-registration). The `MCPAddWizard` `onOAuth` callback type is now `Promise<MCPAddWizardOAuthResult>` and `#launchOAuthFlow` folds the registered credentials into wizard state. Servers with a statically-configured `oauth.clientId` (Notion, Slack, Datadog) are unaffected — `#tryRegisterClient` short-circuits and the write-back is a no-op. ([#1061](https://github.com/can1357/oh-my-pi/pull/1061) by [@ldx](https://github.com/ldx)).
+
 ## [15.0.0] - 2026-05-13
 ### Breaking Changes
 

package/examples/extensions/plan-mode.ts

@@ -334,7 +334,6 @@ export default function planModeExtension(pi: ExtensionAPI) {
 		}
 
 		// Remove any previous plan-mode-context messages
-		const _beforeCount = event.messages.length;
 		const filtered = event.messages.filter(m => {
 			if (m.role === "user" && Array.isArray(m.content)) {
 				const hasOldContext = m.content.some(

package/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "15.0.0",
+	"version": "15.0.1",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"homepage": "https://github.com/can1357/oh-my-pi",
 	"author": "Can Boluk",
@@ -47,12 +47,12 @@
 		"@agentclientprotocol/sdk": "0.21.0",
 		"@babel/parser": "^7.29.3",
 		"@mozilla/readability": "^0.6.0",
-		"@oh-my-pi/omp-stats": "15.0.0",
-		"@oh-my-pi/pi-agent-core": "15.0.0",
-		"@oh-my-pi/pi-ai": "15.0.0",
-		"@oh-my-pi/pi-natives": "15.0.0",
-		"@oh-my-pi/pi-tui": "15.0.0",
-		"@oh-my-pi/pi-utils": "15.0.0",
+		"@oh-my-pi/omp-stats": "15.0.1",
+		"@oh-my-pi/pi-agent-core": "15.0.1",
+		"@oh-my-pi/pi-ai": "15.0.1",
+		"@oh-my-pi/pi-natives": "15.0.1",
+		"@oh-my-pi/pi-tui": "15.0.1",
+		"@oh-my-pi/pi-utils": "15.0.1",
 		"@puppeteer/browsers": "^2.13.0",
 		"@sinclair/typebox": "^0.34.49",
 		"@types/turndown": "5.0.6",
@@ -71,10 +71,10 @@
 		"zod": "4.4.3"
 	},
 	"devDependencies": {
-		"@types/bun": "^1.3.13"
+		"@types/bun": "^1.3.14"
 	},
 	"engines": {
-		"bun": ">=1.3.7"
+		"bun": ">=1.3.14"
 	},
 	"files": [
 		"src",

package/scripts/build-binary.ts

@@ -33,6 +33,11 @@ async function main(): Promise<void> {
 					"bun",
 					"build",
 					"--compile",
+					"--no-compile-autoload-bunfig",
+					"--no-compile-autoload-dotenv",
+					"--no-compile-autoload-tsconfig",
+					"--no-compile-autoload-package-json",
+					"--keep-names",
 					"--define",
 					'process.env.PI_COMPILED="true"',
 					"--external",

package/src/autoresearch/helpers.ts

@@ -1,3 +1,4 @@
+import * as git from "../utils/git";
 import type { ASIData, ASIValue, MetricDirection, NumericMetricMap } from "./types";
 
 export const METRIC_LINE_PREFIX = "METRIC";
@@ -199,3 +200,19 @@ function sanitizeAsiValue(value: unknown): ASIValue | undefined {
 	}
 	return undefined;
 }
+
+export async function tryGitStatus(cwd: string): Promise<string> {
+	try {
+		return await git.status(cwd, { porcelainV1: true, untrackedFiles: "all", z: true });
+	} catch {
+		return "";
+	}
+}
+
+export async function tryGitPrefix(cwd: string): Promise<string> {
+	try {
+		return await git.show.prefix(cwd);
+	} catch {
+		return "";
+	}
+}

package/src/autoresearch/tools/log-experiment.ts

@@ -8,7 +8,15 @@ import type { Theme } from "../../modes/theme/theme";
 import { replaceTabs, truncateToWidth } from "../../tools/render-utils";
 import * as git from "../../utils/git";
 import { computeRunModifiedPaths, getCurrentAutoresearchBranch, parseWorkDirDirtyPaths } from "../git";
-import { ensureNumericMetricMap, formatNum, mergeAsi, pathMatchesSpec, sanitizeAsi } from "../helpers";
+import {
+	ensureNumericMetricMap,
+	formatNum,
+	mergeAsi,
+	pathMatchesSpec,
+	sanitizeAsi,
+	tryGitPrefix,
+	tryGitStatus,
+} from "../helpers";
 import {
 	buildExperimentState,
 	computeConfidence,
@@ -445,22 +453,6 @@ async function tryReadHeadSha(cwd: string): Promise<string | null> {
 	}
 }
 
-async function tryGitStatus(cwd: string): Promise<string> {
-	try {
-		return await git.status(cwd, { porcelainV1: true, untrackedFiles: "all", z: true });
-	} catch {
-		return "";
-	}
-}
-
-async function tryGitPrefix(cwd: string): Promise<string> {
-	try {
-		return await git.show.prefix(cwd);
-	} catch {
-		return "";
-	}
-}
-
 function buildLogText(
 	state: ExperimentState,
 	experiment: ExperimentResult,

package/src/autoresearch/tools/run-experiment.ts

@@ -18,6 +18,8 @@ import {
 	killTree,
 	parseAsiLines,
 	parseMetricLines,
+	tryGitPrefix,
+	tryGitStatus,
 } from "../helpers";
 import { buildExperimentState } from "../state";
 import { openAutoresearchStorageIfExists } from "../storage";
@@ -265,23 +267,6 @@ export function createRunExperimentTool(
 		},
 	};
 }
-
-async function tryGitStatus(cwd: string): Promise<string> {
-	try {
-		return await git.status(cwd, { porcelainV1: true, untrackedFiles: "all", z: true });
-	} catch {
-		return "";
-	}
-}
-
-async function tryGitPrefix(cwd: string): Promise<string> {
-	try {
-		return await git.show.prefix(cwd);
-	} catch {
-		return "";
-	}
-}
-
 async function executeProcess(opts: {
 	command: string[];
 	cwd: string;

package/src/capability/skill.ts

@@ -14,6 +14,13 @@ export interface SkillFrontmatter {
 	description?: string;
 	globs?: string[];
 	alwaysApply?: boolean;
+	/**
+	 * When `true`, the skill is loaded and accessible via `skill://<name>` (and
+	 * `/skill:<name>` slash commands), but is omitted from the rendered system
+	 * prompt's skill listing. Use for skills the user opts into explicitly
+	 * rather than ones the model should auto-discover.
+	 */
+	hide?: boolean;
 	[key: string]: unknown;
 }
 

package/src/cli/list-models.ts

@@ -2,11 +2,11 @@
  * List available models with optional fuzzy search
  */
 import { type Api, getSupportedEfforts, type Model } from "@oh-my-pi/pi-ai";
+import { fuzzyFilter } from "@oh-my-pi/pi-tui";
 import { formatNumber } from "@oh-my-pi/pi-utils";
 import type { ModelRegistry } from "../config/model-registry";
 import { discoverAndLoadExtensions, loadExtensions } from "../extensibility/extensions";
 import { EventBus } from "../utils/event-bus";
-import { fuzzyFilter } from "../utils/fuzzy";
 
 interface ProviderRow {
 	provider: string;

package/src/cli/shell-cli.ts

@@ -5,10 +5,11 @@
  */
 import * as path from "node:path";
 import { createInterface } from "node:readline/promises";
-import { type MinimizerOptions, Shell } from "@oh-my-pi/pi-natives";
+import { Shell } from "@oh-my-pi/pi-natives";
 import { APP_NAME, getProjectDir } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
-import { Settings, type ShellMinimizerSettings } from "../config/settings";
+import { Settings } from "../config/settings";
+import { buildMinimizerOptions } from "../exec/bash-executor";
 import { getOrCreateSnapshot } from "../utils/shell-snapshot";
 
 export interface ShellCommandArgs {
@@ -41,17 +42,6 @@ export function parseShellArgs(args: string[]): ShellCommandArgs | undefined {
 	return result;
 }
 
-function buildMinimizerOptions(group: ShellMinimizerSettings): MinimizerOptions | undefined {
-	if (!group.enabled) return undefined;
-	return {
-		enabled: true,
-		settingsPath: group.settingsPath || undefined,
-		only: group.only.length > 0 ? group.only : undefined,
-		except: group.except.length > 0 ? group.except : undefined,
-		maxCaptureBytes: group.maxCaptureBytes,
-	};
-}
-
 export async function runShellCommand(cmd: ShellCommandArgs): Promise<void> {
 	if (!process.stdin.isTTY) {
 		process.stderr.write("Error: shell console requires an interactive TTY.\n");

package/src/cli/update-cli.ts

@@ -91,7 +91,7 @@ function resolveUpdateMethod(ompPath: string, bunBinDir: string | undefined): "b
 	return isPathInDirectory(ompPath, bunBinDir) ? "bun" : "binary";
 }
 
-export function _resolveUpdateMethodForTest(ompPath: string, bunBinDir: string | undefined): "bun" | "binary" {
+export function resolveUpdateMethodForTest(ompPath: string, bunBinDir: string | undefined): "bun" | "binary" {
 	return resolveUpdateMethod(ompPath, bunBinDir);
 }
 async function resolveUpdateTarget(): Promise<UpdateTarget> {

package/src/cli.ts

@@ -1,6 +1,14 @@
 #!/usr/bin/env bun
+import { installH2Fetch } from "@oh-my-pi/pi-ai";
 import { APP_NAME, MIN_BUN_VERSION, procmgr, VERSION } from "@oh-my-pi/pi-utils";
 
+// Activate HTTP/2 for all `fetch()` calls (provider streams, OAuth, model
+// discovery, web tools). Bun's HTTP/2 client is gated on a startup flag we
+// can't toggle from JS, so we patch globalThis.fetch to pass
+// `protocol: "http2"` per request, with transparent HTTP/1.1 fallback on
+// `HTTP2Unsupported`. See @oh-my-pi/pi-ai/utils/h2-fetch for details.
+installH2Fetch();
+
 // Strip macOS malloc-stack-logging env vars before any subprocess is spawned.
 // Otherwise every child bun process (subagents, plugin installs, ptree spawns,
 // etc.) prints a `MallocStackLogging: can't turn off …` warning to stderr.
@@ -12,40 +20,13 @@ procmgr.scrubProcessEnv();
  */
 import { type CommandEntry, run } from "@oh-my-pi/pi-utils/cli";
 
-function parseSemver(version: string): [number, number, number] {
-	function toint(value: string): number {
-		const int = Number.parseInt(value, 10);
-		if (Number.isNaN(int) || !Number.isFinite(int)) return 0;
-		return int;
-	}
-	const [majorRaw, minorRaw, patchRaw] = version.split(".").map(toint);
-	return [majorRaw, minorRaw, patchRaw];
-}
-
-function isAtLeastBunVersion(minimum: string): boolean {
-	const ver = parseSemver(Bun.version);
-	const min = parseSemver(minimum);
-	for (let i = 0; i < 3; i++) {
-		if (ver[i] !== min[i]) {
-			return ver[i] > min[i];
-		}
-	}
-	return true;
-}
-
-if (typeof Bun.JSONL?.parseChunk !== "function" || !isAtLeastBunVersion(MIN_BUN_VERSION)) {
+if (Bun.semver.order(Bun.version, MIN_BUN_VERSION) < 0) {
 	process.stderr.write(
-		`error: Bun runtime must be >= ${MIN_BUN_VERSION} (found v${Bun.version}). Please update Bun: bun upgrade\n`,
+		`error: Bun runtime must be >= ${MIN_BUN_VERSION} (found v${Bun.version}). Please upgrade: bun upgrade\n`,
 	);
 	process.exit(1);
 }
 
-// Detect known Bun errata that cause TUI crashes (e.g. Bun.stringWidth mishandling OSC sequences).
-if (Bun.stringWidth("\x1b[0m\x1b]8;;\x07") !== 0) {
-	process.stderr.write(`error: Bun runtime errata detected (v${Bun.version}). Please update Bun: bun upgrade\n`);
-	process.exit(1);
-}
-
 process.title = APP_NAME;
 
 const commands: CommandEntry[] = [

package/src/commit/agentic/tools/propose-changelog.ts

@@ -130,8 +130,15 @@ export function createProposeChangelogTool(
 				state.changelogProposal = { entries: normalized };
 			}
 
+			let text = response.valid ? "Changelog entries accepted." : "Changelog validation failed.";
+			if (response.errors.length > 0) {
+				text += `\n\nErrors:\n${response.errors.map(e => `- ${e}`).join("\n")}`;
+			}
+			if (response.warnings.length > 0) {
+				text += `\n\nWarnings:\n${response.warnings.map(w => `- ${w}`).join("\n")}`;
+			}
 			return {
-				content: [{ type: "text", text: JSON.stringify(response, null, 2) }],
+				content: [{ type: "text", text }],
 				details: response,
 			};
 		},

package/src/commit/analysis/conventional.ts

@@ -1,52 +1,16 @@
 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 type { Api, Model } from "@oh-my-pi/pi-ai";
+import { completeSimple } 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 type { ConventionalAnalysis } from "../../commit/types";
 import { toReasoningEffort } from "../../thinking";
-import { extractTextContent, extractToolCall, normalizeAnalysis, parseJsonPayload } from "../utils";
+import { createConventionalAnalysisTool, parseConventionalAnalysisResponse } from "../shared-llm";
 
-const ConventionalAnalysisTool = {
-	name: "create_conventional_analysis",
-	description: "Analyze a diff and return conventional commit classification.",
-	parameters: Type.Object({
-		type: Type.Union([
-			Type.Literal("feat"),
-			Type.Literal("fix"),
-			Type.Literal("refactor"),
-			Type.Literal("docs"),
-			Type.Literal("test"),
-			Type.Literal("chore"),
-			Type.Literal("style"),
-			Type.Literal("perf"),
-			Type.Literal("build"),
-			Type.Literal("ci"),
-			Type.Literal("revert"),
-		]),
-		scope: Type.Union([Type.String(), Type.Null()]),
-		details: Type.Array(
-			Type.Object({
-				text: Type.String(),
-				changelog_category: Type.Optional(
-					Type.Union([
-						Type.Literal("Added"),
-						Type.Literal("Changed"),
-						Type.Literal("Fixed"),
-						Type.Literal("Deprecated"),
-						Type.Literal("Removed"),
-						Type.Literal("Security"),
-						Type.Literal("Breaking Changes"),
-					]),
-				),
-				user_visible: Type.Optional(Type.Boolean()),
-			}),
-		),
-		issue_refs: Type.Array(Type.String()),
-	}),
-};
+const ConventionalAnalysisTool = createConventionalAnalysisTool(
+	"Analyze a diff and return conventional commit classification.",
+);
 
 export interface ConventionalAnalysisInput {
 	model: Model<Api>;
@@ -96,27 +60,5 @@ export async function generateConventionalAnalysis({
 		{ apiKey, maxTokens: 2400, reasoning: toReasoningEffort(thinkingLevel) },
 	);
 
-	return parseAnalysisFromResponse(response);
-}
-
-function parseAnalysisFromResponse(message: AssistantMessage): ConventionalAnalysis {
-	const toolCall = extractToolCall(message, "create_conventional_analysis");
-	if (toolCall) {
-		const parsed = validateToolCall([ConventionalAnalysisTool], toolCall) as {
-			type: ConventionalAnalysis["type"];
-			scope: string | null;
-			details: Array<{ text: string; changelog_category?: ChangelogCategory; user_visible?: boolean }>;
-			issue_refs: string[];
-		};
-		return normalizeAnalysis(parsed);
-	}
-
-	const text = extractTextContent(message);
-	const parsed = parseJsonPayload(text) as {
-		type: ConventionalAnalysis["type"];
-		scope: string | null;
-		details: Array<{ text: string; changelog_category?: ChangelogCategory; user_visible?: boolean }>;
-		issue_refs: string[];
-	};
-	return normalizeAnalysis(parsed);
+	return parseConventionalAnalysisResponse(response, ConventionalAnalysisTool);
 }

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

@@ -1,52 +1,14 @@
 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 type { Api, Model } from "@oh-my-pi/pi-ai";
+import { completeSimple } 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 type { ConventionalAnalysis, FileObservation } from "../../commit/types";
 import { toReasoningEffort } from "../../thinking";
-import { extractTextContent, extractToolCall, normalizeAnalysis, parseJsonPayload } from "../utils";
+import { createConventionalAnalysisTool, parseConventionalAnalysisResponse } from "../shared-llm";
 
-const ReduceTool = {
-	name: "create_conventional_analysis",
-	description: "Synthesize file observations into a conventional commit analysis.",
-	parameters: Type.Object({
-		type: Type.Union([
-			Type.Literal("feat"),
-			Type.Literal("fix"),
-			Type.Literal("refactor"),
-			Type.Literal("docs"),
-			Type.Literal("test"),
-			Type.Literal("chore"),
-			Type.Literal("style"),
-			Type.Literal("perf"),
-			Type.Literal("build"),
-			Type.Literal("ci"),
-			Type.Literal("revert"),
-		]),
-		scope: Type.Union([Type.String(), Type.Null()]),
-		details: Type.Array(
-			Type.Object({
-				text: Type.String(),
-				changelog_category: Type.Optional(
-					Type.Union([
-						Type.Literal("Added"),
-						Type.Literal("Changed"),
-						Type.Literal("Fixed"),
-						Type.Literal("Deprecated"),
-						Type.Literal("Removed"),
-						Type.Literal("Security"),
-						Type.Literal("Breaking Changes"),
-					]),
-				),
-				user_visible: Type.Optional(Type.Boolean()),
-			}),
-		),
-		issue_refs: Type.Array(Type.String()),
-	}),
-};
+const ReduceTool = createConventionalAnalysisTool("Synthesize file observations into a conventional commit analysis.");
 
 export interface ReducePhaseInput {
 	model: Model<Api>;
@@ -83,26 +45,5 @@ export async function runReducePhase({
 		{ apiKey, maxTokens: 2400, reasoning: toReasoningEffort(thinkingLevel) },
 	);
 
-	return parseAnalysisResponse(response);
-}
-
-function parseAnalysisResponse(message: AssistantMessage): ConventionalAnalysis {
-	const toolCall = extractToolCall(message, "create_conventional_analysis");
-	if (toolCall) {
-		const parsed = validateToolCall([ReduceTool], toolCall) as {
-			type: ConventionalAnalysis["type"];
-			scope: string | null;
-			details: Array<{ text: string; changelog_category?: ChangelogCategory; user_visible?: boolean }>;
-			issue_refs: string[];
-		};
-		return normalizeAnalysis(parsed);
-	}
-	const text = extractTextContent(message);
-	const parsed = parseJsonPayload(text) as {
-		type: ConventionalAnalysis["type"];
-		scope: string | null;
-		details: Array<{ text: string; changelog_category?: ChangelogCategory; user_visible?: boolean }>;
-		issue_refs: string[];
-	};
-	return normalizeAnalysis(parsed);
+	return parseConventionalAnalysisResponse(response, ReduceTool);
 }

package/src/commit/pipeline.ts

@@ -25,8 +25,8 @@ import type { CommitCommandArgs, ConventionalAnalysis } from "./types";
 
 const SUMMARY_MAX_CHARS = 72;
 const RECENT_COMMITS_COUNT = 8;
-let _typesDescription: string | undefined;
-const TYPES_DESCRIPTION = (): string => (_typesDescription ??= prompt.render(typesDescriptionPrompt));
+let typesDescription: string | undefined;
+const TYPES_DESCRIPTION = (): string => (typesDescription ??= prompt.render(typesDescriptionPrompt));
 
 /**
  * Execute the omp commit pipeline for staged changes.

package/src/commit/shared-llm.ts

@@ -0,0 +1,89 @@
+import type { AssistantMessage } from "@oh-my-pi/pi-ai";
+import { validateToolCall } from "@oh-my-pi/pi-ai";
+import { Type } from "@sinclair/typebox";
+import type { ChangelogCategory, ConventionalAnalysis } from "./types";
+import { extractTextContent, extractToolCall, normalizeAnalysis, parseJsonPayload } from "./utils";
+
+/**
+ * Shared TypeBox schema for the `create_conventional_analysis` tool used by
+ * both the single-pass analysis call and the map-reduce reduce phase. Schemas
+ * are identical across phases — only the surrounding tool `description`
+ * differs to reflect the input the phase is summarizing.
+ */
+export const conventionalAnalysisParameters = Type.Object({
+	type: Type.Union([
+		Type.Literal("feat"),
+		Type.Literal("fix"),
+		Type.Literal("refactor"),
+		Type.Literal("docs"),
+		Type.Literal("test"),
+		Type.Literal("chore"),
+		Type.Literal("style"),
+		Type.Literal("perf"),
+		Type.Literal("build"),
+		Type.Literal("ci"),
+		Type.Literal("revert"),
+	]),
+	scope: Type.Union([Type.String(), Type.Null()]),
+	details: Type.Array(
+		Type.Object({
+			text: Type.String(),
+			changelog_category: Type.Optional(
+				Type.Union([
+					Type.Literal("Added"),
+					Type.Literal("Changed"),
+					Type.Literal("Fixed"),
+					Type.Literal("Deprecated"),
+					Type.Literal("Removed"),
+					Type.Literal("Security"),
+					Type.Literal("Breaking Changes"),
+				]),
+			),
+			user_visible: Type.Optional(Type.Boolean()),
+		}),
+	),
+	issue_refs: Type.Array(Type.String()),
+});
+
+export interface ConventionalAnalysisTool {
+	name: "create_conventional_analysis";
+	description: string;
+	parameters: typeof conventionalAnalysisParameters;
+}
+
+/**
+ * Build a `create_conventional_analysis` tool descriptor. Phase-specific
+ * `description` text is the only thing that varies between callers.
+ */
+export function createConventionalAnalysisTool(description: string): ConventionalAnalysisTool {
+	return {
+		name: "create_conventional_analysis",
+		description,
+		parameters: conventionalAnalysisParameters,
+	};
+}
+
+interface ParsedConventionalAnalysis {
+	type: ConventionalAnalysis["type"];
+	scope: string | null;
+	details: Array<{ text: string; changelog_category?: ChangelogCategory; user_visible?: boolean }>;
+	issue_refs: string[];
+}
+
+/**
+ * Extract a {@link ConventionalAnalysis} from an assistant response, preferring
+ * a structured tool call and falling back to JSON embedded in text content.
+ */
+export function parseConventionalAnalysisResponse(
+	message: AssistantMessage,
+	tool: ConventionalAnalysisTool,
+): ConventionalAnalysis {
+	const toolCall = extractToolCall(message, tool.name);
+	if (toolCall) {
+		const parsed = validateToolCall([tool], toolCall) as ParsedConventionalAnalysis;
+		return normalizeAnalysis(parsed);
+	}
+	const text = extractTextContent(message);
+	const parsed = parseJsonPayload(text) as ParsedConventionalAnalysis;
+	return normalizeAnalysis(parsed);
+}