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

package/CHANGELOG.md

@@ -2,6 +2,111 @@
 
 ## [Unreleased]
 
+### Added
+- Added `omp commit` command to generate conventional commits with changelog updates
+- Added agentic commit mode with commit-specific tools and `--legacy` fallback
+- Added configurable settings for map-reduce analysis including concurrency, timeout, file thresholds, and token limits
+- Added support for excluding YAML lock files (`.lock.yml`, `.lock.yaml`, `-lock.yml`, `-lock.yaml`) from commit analysis
+- Added new TUI component library with reusable rendering utilities including code cells, file lists, tree lists, status lines, and output blocks
+- Added renderCodeCell component for displaying code with optional output sections, supporting syntax highlighting and status indicators
+- Added renderFileList component for rendering file/directory listings with language icons and metadata
+- Added renderTreeList component for hierarchical tree-based item rendering with expand/collapse support
+- Added renderStatusLine component for standardized tool status headers with icons, descriptions, and metadata
+- Added renderOutputBlock component for bordered output containers with structured sections
+- Added renderOutputBlock to Bash tool for improved output formatting with status indicators
+- Added `--legacy` flag to `omp commit` for using the deterministic pipeline instead of agentic mode
+- Added split commit support to automatically create multiple atomic commits for unrelated changes
+- Added git hunk inspection tools for fine-grained diff analysis in commit generation
+- Added commit message validation with filler word and meta phrase detection
+- Added automatic unicode normalization in commit summaries
+- Added real-time progress output to agentic commit mode showing thinking status, tool calls, and completion summary
+- Added hunk-level staging support in split commits allowing partial file changes per commit
+- Added dependency ordering for split commits ensuring commits are applied in correct sequence
+- Added circular dependency detection with validation errors for split commit plans
+- Added parallel file analysis with cross-file context awareness via `analyze_files` tool
+- Added AGENTS.md context file discovery for commit generation
+- Added progress indicators during changelog generation and model resolution
+- Added propose_changelog tool for agent-provided changelog entries in agentic commit workflow
+- Added fallback commit generation when agentic mode fails, using file pattern analysis and heuristic-based type inference
+- Added trivial change detection to automatically classify whitespace-only and import-reorganization commits
+- Added support for pre-computed file observations in commit agent to skip redundant analyze_files calls
+- Added diff content caching with smart file prioritization to optimize token usage in large changesets
+- Added lock file filtering (17 patterns including Cargo.lock, package-lock.json, bun.lock) from commit analysis
+- Added changelog deletion support to remove outdated entries via the changelog proposal interface
+- Added support for pre-computed changelog entries in commit agent to display existing unreleased sections for potential deletion
+- Added `ExistingChangelogEntries` interface to track changelog sections by path for changelog proposal context
+- Added conditional `analyze_files` skipping in commit agent when pre-analyzed observations are provided
+- Added guidance to commit agent prompts instructing subagents to write files directly instead of returning changes for manual application
+- Added mermaid diagram rendering with terminal graphics support (Kitty/iTerm2) for markdown output
+- Added renderMermaidToPng utility for converting mermaid code blocks to terminal-displayable PNG images via mmdc CLI
+- Added mermaid block extraction with content-addressed hashing for deduplication and cache lookup
+- Added background mermaid pre-rendering in assistant messages for responsive diagram display
+- Added two-level mermaid caching with pending deduplication to prevent redundant renders
+- Added Python kernel session pooling with MAX_KERNEL_SESSIONS limit and automatic eviction of oldest sessions
+- Added automatic idle kernel session cleanup timer (5-minute timeout, 30-second interval)
+- Added WASM binary generation script for photon module distribution
+
+### Changed
+- Changed changelog diff truncation limit to be configurable via settings
+- Changed tool result rendering to use new TUI component library across multiple tools (bash, calculator, fetch, find, grep, ls, notebook, python, read, ssh, write, lsp, web search) for consistent output formatting
+- Changed Bash tool output rendering to use renderOutputBlock with proper section handling and width-aware truncation
+- Changed Python tool output rendering to use renderCodeCell component for code cell display with status indicators
+- Changed Read tool output rendering to use renderCodeCell with syntax highlighting and warnings display
+- Changed Write tool output rendering to use renderCodeCell for code display with streaming preview support
+- Changed Fetch tool output rendering to use renderOutputBlock with metadata and content preview sections
+- Changed LSP tool output rendering to use renderStatusLine and renderOutputBlock for structured output display
+- Changed Web Search result rendering to use renderOutputBlock with answer, sources, related questions, and metadata sections
+- Changed Find, Grep, and Ls tools to use renderFileList and renderTreeList for consistent file/item listing
+- Changed Calculator tool result rendering to use renderTreeList for result item display
+- Changed Notebook and TodoWrite tools to use new TUI rendering components for consistent output format
+- Refactored render-utils to move tree-related utilities to TUI module (getTreeBranch, getTreeContinuePrefix)
+- Changed import organization in sdk.ts for consistency
+- Changed tool result rendering to merge call and result displays, showing tool arguments (command, pattern, query, path) in result headers for Bash, Calculator, Fetch, Find, Grep, Ls, LSP, Notebook, Read, SSH, TodoWrite, Web Search, and Write tools
+- Changed Read tool title to display line range when offset or limit arguments are provided
+- Changed worker instantiation to use direct URL import instead of pre-bundled worker files
+- Changed `omp commit` to use agentic mode by default with tool-based git inspection
+- Changed agentic commit progress output to show real-time thinking previews and structured tool argument details
+- Changed agentic commit progress output to display full multi-line assistant messages and render tool arguments with tree-style formatting for improved readability
+- Changed agentic commit progress output to render assistant messages as formatted Markdown with proper word wrapping
+- Changed output block border color to reflect state (error, success, warning) for improved visual feedback
+- Changed LSP hover rendering to display documentation text before code blocks in both collapsed and expanded views
+- Changed Write tool to show streaming preview of content being written with syntax highlighting
+- Changed Read tool to display resolved path information when reading from URLs or symlinks
+- Changed Calculator tool result display to show both expression and output (e.g., `2+2 = 4`) instead of just the result
+- Changed Python tool output to group status information under a labeled section for clearer organization
+- Changed SSH tool output to apply consistent styling to non-ANSI output lines
+- Changed Todo Write tool to respect expanded/collapsed state and use standard preview limits
+- Changed Web Search related questions to respect expanded/collapsed state instead of always showing all items
+- Changed empty and error state rendering across multiple tools (Find, Grep, Ls, Notebook, Calculator, Ask) to include consistent status headers
+- Changed split commit to support hunk selectors (all, indices, or line ranges) instead of whole-file staging
+- Changed `analyze_file` tool to `analyze_files` for batch parallel analysis of multiple files
+- Switched agentic commit from auto-generated changelogs to agent-proposed entries with validation and retry logic
+- Commit agent now resolves a separate smaller model for commit generation instead of reusing the primary model
+- Normalized code formatting and indentation across tool renderers and UI components
+- Changed git-file-diff tool to prioritize files by type and respect token budget limits with intelligent truncation
+- Changed git-overview tool to filter and report excluded lock files separately from staged files
+- Changed analyze-file tool to include file type inference and enriched related files with line counts
+- Changed propose-changelog tool to support optional deletion entries for removing existing changelog items
+- Changed commit agent to accept pre-computed file observations and format them into session prompts
+- Changed changelog skip condition in `applyChangelogProposals` to also check for empty deletions object
+- Changed `createCommitTools()` to build tools array incrementally with conditional `analyze_files` inclusion based on `enableAnalyzeFiles` flag
+- Changed system prompt guidance to clarify that pre-computed observations prevent redundant `analyze_files` calls
+- Removed map-reduce preprocessing phase from commit agent for faster iteration
+- Changed commit agent to process full diff text directly instead of pre-computed file observations
+- Changed commit agent initialization to load settingsManager, authStorage, modelRegistry, and stagedFiles in parallel
+- Changed commit agent prompt to remove pre-computed observations guidance and encourage direct analyze_files usage
+- Changed AuthStorage from constructor-based instantiation to async factory method (AuthStorage.create())
+- Changed Python kernel resource management with gateway shutdown on session disposal
+- Updated TypeScript configuration for better publish-time configuration handling with tsconfig.publish.json
+
+### Fixed
+- Fixed database busy errors during concurrent access by adding retry logic with exponential backoff when opening storage
+- Find tool now rejects searches from root directory and enforces a 5-second timeout on fd operations
+- Commit command now exits cleanly with exit code 0 on success
+- Handle undefined code parameter in code cell renderer
+- Fixed indentation formatting in split-commit tool function signature
+- Fixed changelog application to process proposals containing only deletion entries without additions
+- Fixed indentation formatting in Python tool output renderer
 ## [8.0.0] - 2026-01-23
 ### Added
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "8.0.16",
+	"version": "8.1.0",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -22,15 +22,17 @@
 			"import": "./src/extensibility/hooks/index.ts"
 		},
 		"./prompts/*": "./src/prompts/*",
-		"./*": "./src/*"
+		"./*": {
+			"types": "./src/*",
+			"import": "./src/*"
+		}
 	},
 	"files": [
 		"src",
 		"scripts",
 		"docs",
 		"examples",
-		"CHANGELOG.md",
-		"tsconfig.json"
+		"CHANGELOG.md"
 	],
 	"scripts": {
 		"check": "tsgo -p tsconfig.check.json",
@@ -38,17 +40,18 @@
 		"clean": "rm -rf dist",
 		"build": "tsgo -p tsconfig.build.json && chmod +x dist/cli.js",
 		"build:binary": "bun run generate-wasm-b64 && bun build --compile ./src/cli.ts --outfile dist/omp",
+		"generate-wasm-b64": "bun scripts/generate-wasm-b64.ts",
 		"generate-template": "bun scripts/generate-template.ts",
-		"postinstall": "bun run generate-template || true",
+		"postinstall": "(bun run generate-wasm-b64 && bun run generate-template) || true",
 		"test": "bun test",
-		"prepublishOnly": "bun run generate-template && cp tsconfig.publish.json tsconfig.json"
+		"prepublishOnly": "cp tsconfig.publish.json tsconfig.json && bun run generate-template"
 	},
 	"dependencies": {
-		"@oh-my-pi/omp-stats": "8.0.16",
-		"@oh-my-pi/pi-agent-core": "8.0.16",
-		"@oh-my-pi/pi-ai": "8.0.16",
-		"@oh-my-pi/pi-tui": "8.0.16",
-		"@oh-my-pi/pi-utils": "8.0.16",
+		"@oh-my-pi/omp-stats": "workspace:*",
+		"@oh-my-pi/pi-agent-core": "workspace:*",
+		"@oh-my-pi/pi-ai": "workspace:*",
+		"@oh-my-pi/pi-tui": "workspace:*",
+		"@oh-my-pi/pi-utils": "workspace:*",
 		"@openai/agents": "^0.3.7",
 		"@sinclair/typebox": "^0.34.46",
 		"ajv": "^8.17.1",

package/scripts/generate-wasm-b64.ts

@@ -0,0 +1,24 @@
+#!/usr/bin/env bun
+/**
+ * Generates a base64-encoded JavaScript module from the photon WASM file.
+ * This allows bundling the WASM binary inline for single-file distribution.
+ */
+
+import { join } from "node:path";
+
+const VENDOR_DIR = join(import.meta.dir, "../src/vendor/photon");
+const WASM_PATH = join(VENDOR_DIR, "photon_rs_bg.wasm");
+const OUTPUT_PATH = join(VENDOR_DIR, "photon_rs_bg.wasm.b64.js");
+
+const wasmFile = Bun.file(WASM_PATH);
+if (!(await wasmFile.exists())) {
+	console.error(`WASM file not found: ${WASM_PATH}`);
+	process.exit(1);
+}
+
+const wasmBytes = await wasmFile.arrayBuffer();
+const base64 = Buffer.from(wasmBytes).toString("base64");
+const content = `export default "${base64}";\n`;
+
+await Bun.write(OUTPUT_PATH, content);
+console.log(`Generated ${OUTPUT_PATH} (${Math.round(base64.length / 1024)}KB)`);

package/src/capability/context-file.ts

@@ -5,7 +5,7 @@
  * persistent guidance to the agent.
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { SourceMeta } from "./types";
 
 /**

package/src/capability/extension-module.ts

@@ -4,7 +4,7 @@
  * TypeScript/JavaScript extension modules loaded by the extension system.
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { SourceMeta } from "./types";
 
 /**

package/src/capability/extension.ts

@@ -4,7 +4,7 @@
  * Gemini-style extensions that provide MCP servers, tools, and context.
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { MCPServer } from "./mcp";
 import type { SourceMeta } from "./types";
 

package/src/capability/hook.ts

@@ -4,7 +4,7 @@
  * Pre/post tool execution hooks defined as shell scripts.
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { SourceMeta } from "./types";
 
 /**

package/src/capability/instruction.ts

@@ -4,7 +4,7 @@
  * GitHub Copilot-style instructions with optional file pattern matching.
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { SourceMeta } from "./types";
 
 /**

package/src/capability/mcp.ts

@@ -5,7 +5,7 @@
  * All providers translate their native format to this shape.
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { SourceMeta } from "./types";
 
 /**

package/src/capability/prompt.ts

@@ -4,7 +4,7 @@
  * Reusable prompt templates (Codex format) available via /prompts: menu.
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { SourceMeta } from "./types";
 
 /**

package/src/capability/rule.ts

@@ -5,7 +5,7 @@
  * Translated to a canonical shape regardless of source format.
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { SourceMeta } from "./types";
 
 /**

package/src/capability/settings.ts

@@ -4,7 +4,7 @@
  * Configuration settings from various sources (JSON, TOML, etc.)
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { SourceMeta } from "./types";
 
 /**

package/src/capability/skill.ts

@@ -4,7 +4,7 @@
  * Skills provide specialized knowledge or workflows that extend agent capabilities.
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { SourceMeta } from "./types";
 
 /**

package/src/capability/slash-command.ts

@@ -4,7 +4,7 @@
  * File-based slash commands defined as markdown files.
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { SourceMeta } from "./types";
 
 /**

package/src/capability/ssh.ts

@@ -4,7 +4,7 @@
  * Canonical shape for SSH host entries, regardless of source format.
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { SourceMeta } from "./types";
 
 /**

package/src/capability/system-prompt.ts

@@ -5,7 +5,7 @@
  * Distinct from context-files which are user instructions shown in conversation.
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { SourceMeta } from "./types";
 
 /**

package/src/capability/tool.ts

@@ -4,7 +4,7 @@
  * User-defined tools that extend agent capabilities.
  */
 
-import { defineCapability } from "./index";
+import { defineCapability } from ".";
 import type { SourceMeta } from "./types";
 
 /**

package/src/cli/args.ts

@@ -4,7 +4,7 @@
 
 import type { ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { APP_NAME, CONFIG_DIR_NAME, ENV_AGENT_DIR } from "@oh-my-pi/pi-coding-agent/config";
-import { BUILTIN_TOOLS } from "@oh-my-pi/pi-coding-agent/tools/index";
+import { BUILTIN_TOOLS } from "@oh-my-pi/pi-coding-agent/tools";
 import chalk from "chalk";
 
 export type Mode = "text" | "json" | "rpc";

package/src/cli/plugin-cli.ts

@@ -5,11 +5,7 @@
  */
 
 import { APP_NAME } from "@oh-my-pi/pi-coding-agent/config";
-import {
-	PluginManager,
-	parseSettingValue,
-	validateSetting,
-} from "@oh-my-pi/pi-coding-agent/extensibility/plugins/index";
+import { PluginManager, parseSettingValue, validateSetting } from "@oh-my-pi/pi-coding-agent/extensibility/plugins";
 import { theme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
 import chalk from "chalk";
 

package/src/commit/agentic/agent.ts

@@ -0,0 +1,309 @@
+import type { Api, Model } from "@oh-my-pi/pi-ai";
+import agentUserPrompt from "@oh-my-pi/pi-coding-agent/commit/agentic/prompts/session-user.md" with { type: "text" };
+import agentSystemPrompt from "@oh-my-pi/pi-coding-agent/commit/agentic/prompts/system.md" with { type: "text" };
+import type { CommitAgentState } from "@oh-my-pi/pi-coding-agent/commit/agentic/state";
+import { createCommitTools } from "@oh-my-pi/pi-coding-agent/commit/agentic/tools";
+import type { ControlledGit } from "@oh-my-pi/pi-coding-agent/commit/git";
+import typesDescriptionPrompt from "@oh-my-pi/pi-coding-agent/commit/prompts/types-description.md" with {
+	type: "text",
+};
+import type { ModelRegistry } from "@oh-my-pi/pi-coding-agent/config/model-registry";
+import { renderPromptTemplate } from "@oh-my-pi/pi-coding-agent/config/prompt-templates";
+import type { SettingsManager } from "@oh-my-pi/pi-coding-agent/config/settings-manager";
+import { getMarkdownTheme } from "@oh-my-pi/pi-coding-agent/modes/theme/theme";
+import { createAgentSession } from "@oh-my-pi/pi-coding-agent/sdk";
+import type { AgentSessionEvent } from "@oh-my-pi/pi-coding-agent/session/agent-session";
+import type { AuthStorage } from "@oh-my-pi/pi-coding-agent/session/auth-storage";
+import { Markdown } from "@oh-my-pi/pi-tui";
+import chalk from "chalk";
+
+export interface CommitAgentInput {
+	cwd: string;
+	git: ControlledGit;
+	model: Model<Api>;
+	settingsManager: SettingsManager;
+	modelRegistry: ModelRegistry;
+	authStorage: AuthStorage;
+	userContext?: string;
+	contextFiles?: Array<{ path: string; content: string }>;
+	changelogTargets: string[];
+	requireChangelog: boolean;
+	diffText?: string;
+	existingChangelogEntries?: ExistingChangelogEntries[];
+}
+
+export interface ExistingChangelogEntries {
+	path: string;
+	sections: Array<{ name: string; items: string[] }>;
+}
+
+export async function runCommitAgentSession(input: CommitAgentInput): Promise<CommitAgentState> {
+	const typesDescription = renderPromptTemplate(typesDescriptionPrompt);
+	const systemPrompt = renderPromptTemplate(agentSystemPrompt, {
+		types_description: typesDescription,
+	});
+	const state: CommitAgentState = { diffText: input.diffText };
+	const spawns = "quick_task";
+	const tools = createCommitTools({
+		cwd: input.cwd,
+		git: input.git,
+		authStorage: input.authStorage,
+		modelRegistry: input.modelRegistry,
+		settingsManager: input.settingsManager,
+		spawns,
+		state,
+		changelogTargets: input.changelogTargets,
+		enableAnalyzeFiles: true,
+	});
+
+	const { session } = await createAgentSession({
+		cwd: input.cwd,
+		authStorage: input.authStorage,
+		modelRegistry: input.modelRegistry,
+		settingsManager: input.settingsManager,
+		model: input.model,
+		systemPrompt,
+		customTools: tools,
+		enableLsp: false,
+		enableMCP: false,
+		hasUI: false,
+		spawns,
+		toolNames: ["__none__"],
+		contextFiles: input.contextFiles,
+		disableExtensionDiscovery: true,
+		skills: [],
+		promptTemplates: [],
+		slashCommands: [],
+	});
+	let toolCalls = 0;
+	let messageCount = 0;
+	let isThinking = false;
+	let thinkingLineActive = false;
+	const toolArgsById = new Map<string, { name: string; args?: Record<string, unknown> }>();
+	const writeThinkingLine = (text: string) => {
+		const line = chalk.dim(`… ${text}`);
+		process.stdout.write(`\r\x1b[2K${line}`);
+		thinkingLineActive = true;
+	};
+	const clearThinkingLine = () => {
+		if (!thinkingLineActive) return;
+		process.stdout.write("\r\x1b[2K");
+		thinkingLineActive = false;
+	};
+	const unsubscribe = session.subscribe((event: AgentSessionEvent) => {
+		switch (event.type) {
+			case "message_start":
+				if (event.message.role === "assistant") {
+					isThinking = true;
+					thinkingLineActive = false;
+				}
+				break;
+			case "message_update": {
+				if (event.message?.role !== "assistant") break;
+				const preview = extractMessagePreview(event.message?.content ?? []);
+				if (!preview) break;
+				writeThinkingLine(preview);
+				break;
+			}
+			case "tool_execution_start":
+				toolCalls += 1;
+				toolArgsById.set(event.toolCallId, { name: event.toolName, args: event.args });
+				break;
+			case "message_end": {
+				const role = event.message?.role;
+				if (role === "assistant") {
+					messageCount += 1;
+					isThinking = false;
+					clearThinkingLine();
+					const messageText = extractMessageText(event.message?.content ?? []);
+					if (messageText) {
+						writeAssistantMessage(messageText);
+					}
+				}
+				break;
+			}
+			case "tool_execution_end": {
+				const stored = toolArgsById.get(event.toolCallId) ?? { name: event.toolName };
+				toolArgsById.delete(event.toolCallId);
+				clearThinkingLine();
+				const toolLabel = formatToolLabel(stored.name);
+				const symbol = event.isError ? "" : "";
+				writeStdout(`${symbol} ${toolLabel}`);
+				const argsLines = formatToolArgs(stored.args);
+				if (argsLines.length > 0) {
+					writeStdout(formatToolArgsBlock(argsLines));
+				}
+				break;
+			}
+			case "agent_end":
+				if (isThinking) {
+					isThinking = false;
+				}
+				writeStdout(`● agent finished (${messageCount} messages, ${toolCalls} tools)`);
+				break;
+			default:
+				break;
+		}
+	});
+
+	try {
+		const prompt = renderPromptTemplate(agentUserPrompt, {
+			user_context: input.userContext,
+			changelog_targets: input.changelogTargets.length > 0 ? input.changelogTargets.join("\n") : undefined,
+			existing_changelog_entries: input.existingChangelogEntries,
+		});
+		const MAX_RETRIES = 3;
+		let retryCount = 0;
+		const needsChangelog = input.requireChangelog && input.changelogTargets.length > 0;
+
+		await session.prompt(prompt, { expandPromptTemplates: false });
+		while (retryCount < MAX_RETRIES && !isProposalComplete(state, needsChangelog)) {
+			retryCount += 1;
+			const reminder = buildReminderMessage(state, needsChangelog, retryCount, MAX_RETRIES);
+			await session.prompt(reminder, { expandPromptTemplates: false });
+		}
+
+		return state;
+	} finally {
+		unsubscribe();
+		await session.dispose();
+	}
+}
+
+function writeStdout(message: string): void {
+	process.stdout.write(`${message}\n`);
+}
+
+function extractMessagePreview(content: Array<{ type: string; text?: string }>): string | null {
+	const textBlocks = content
+		.filter((block) => block.type === "text" && typeof block.text === "string")
+		.map((block) => block.text?.trim())
+		.filter((value): value is string => Boolean(value));
+	if (textBlocks.length === 0) return null;
+	const combined = textBlocks.join(" ").replace(/\s+/g, " ").trim();
+	return truncateToolArg(combined);
+}
+
+function extractMessageText(content: Array<{ type: string; text?: string }>): string | null {
+	const textBlocks = content
+		.filter((block) => block.type === "text" && typeof block.text === "string")
+		.map((block) => block.text ?? "")
+		.filter((value) => value.trim().length > 0);
+	if (textBlocks.length === 0) return null;
+	return textBlocks.join("\n").trim();
+}
+
+function writeAssistantMessage(message: string): void {
+	const lines = renderMarkdownLines(message);
+	if (lines.length === 0) return;
+	let firstContentIndex = lines.findIndex((line) => line.trim().length > 0);
+	if (firstContentIndex === -1) {
+		firstContentIndex = 0;
+	}
+	for (const [index, line] of lines.entries()) {
+		const prefix = index === firstContentIndex ? "● " : "  ";
+		writeStdout(`${prefix}${line}`.trimEnd());
+	}
+}
+
+function renderMarkdownLines(message: string): string[] {
+	const width = Math.max(40, process.stdout.columns ?? 100);
+	const markdown = new Markdown(message, 0, 0, getMarkdownTheme());
+	return markdown.render(width);
+}
+
+function formatToolLabel(toolName: string): string {
+	const displayName = toolName
+		.split(/[_-]/)
+		.map((segment) => segment.charAt(0).toUpperCase() + segment.slice(1))
+		.join("");
+	return displayName;
+}
+
+function formatToolArgs(args?: Record<string, unknown>): string[] {
+	if (!args || Object.keys(args).length === 0) return [];
+	const lines: string[] = [];
+	const visit = (value: unknown, keyPath: string) => {
+		if (value === null || value === undefined) return;
+		if (Array.isArray(value)) {
+			if (value.length === 0) return;
+			const rendered = value.map((item) => renderPrimitive(item)).filter(Boolean);
+			if (rendered.length > 0) {
+				lines.push(`${keyPath}: ${rendered.join(", ")}`);
+			}
+			return;
+		}
+		if (typeof value === "object") {
+			const entries = Object.entries(value as Record<string, unknown>);
+			if (entries.length === 0) return;
+			for (const [childKey, childValue] of entries) {
+				visit(childValue, `${keyPath}.${childKey}`);
+			}
+			return;
+		}
+		const rendered = renderPrimitive(value);
+		if (rendered) {
+			lines.push(`${keyPath}: ${rendered}`);
+		}
+	};
+	for (const [key, value] of Object.entries(args)) {
+		visit(value, key);
+	}
+	return lines;
+}
+
+function renderPrimitive(value: unknown): string | null {
+	if (value === null || value === undefined) return null;
+	if (typeof value === "string") {
+		const trimmed = value.trim();
+		return trimmed.length > 0 ? trimmed : null;
+	}
+	if (typeof value === "number" || typeof value === "boolean") {
+		return String(value);
+	}
+	return null;
+}
+
+function formatToolArgsBlock(lines: string[]): string {
+	return lines
+		.map((line, index) => {
+			if (index === 0) return `  ⎿ ${line}`;
+			const branch = index === lines.length - 1 ? "└" : "├";
+			return `    ${branch} ${line}`;
+		})
+		.join("\n");
+}
+
+function isProposalComplete(state: CommitAgentState, requireChangelog: boolean): boolean {
+	const hasCommit = Boolean(state.proposal ?? state.splitProposal);
+	const hasChangelog = !requireChangelog || Boolean(state.changelogProposal);
+	return hasCommit && hasChangelog;
+}
+
+function buildReminderMessage(
+	state: CommitAgentState,
+	requireChangelog: boolean,
+	retryCount: number,
+	maxRetries: number,
+): string {
+	const missing: string[] = [];
+	if (!state.proposal && !state.splitProposal) {
+		missing.push("commit proposal (propose_commit or split_commit)");
+	}
+	if (requireChangelog && !state.changelogProposal) {
+		missing.push("changelog entries (propose_changelog)");
+	}
+	return `<system-reminder>
+CRITICAL: You must call the required tools before finishing.
+
+Missing: ${missing.join(", ") || "none"}.
+Reminder ${retryCount} of ${maxRetries}.
+
+Call the missing tool(s) now.
+</system-reminder>`;
+}
+
+function truncateToolArg(value: string): string {
+	if (value.length <= 40) return value;
+	return `${value.slice(0, 37)}...`;
+}