@oh-my-pi/pi-coding-agent 13.18.0 → 14.0.2

package/src/commit/agentic/tools/git-overview.ts

@@ -1,8 +1,8 @@
 import { Type } from "@sinclair/typebox";
 import type { CommitAgentState, GitOverviewSnapshot } from "../../../commit/agentic/state";
 import { extractScopeCandidates } from "../../../commit/analysis/scope";
-import type { ControlledGit } from "../../../commit/git";
 import type { CustomTool } from "../../../extensibility/custom-tools/types";
+import * as git from "../../../utils/git";
 
 const EXCLUDED_LOCK_FILES = new Set([
 	"Cargo.lock",
@@ -47,10 +47,7 @@ const gitOverviewSchema = Type.Object({
 	include_untracked: Type.Optional(Type.Boolean({ description: "Include untracked files when staged=false" })),
 });
 
-export function createGitOverviewTool(
-	git: ControlledGit,
-	state: CommitAgentState,
-): CustomTool<typeof gitOverviewSchema> {
+export function createGitOverviewTool(cwd: string, state: CommitAgentState): CustomTool<typeof gitOverviewSchema> {
 	return {
 		name: "git_overview",
 		label: "Git Overview",
@@ -58,13 +55,13 @@ export function createGitOverviewTool(
 		parameters: gitOverviewSchema,
 		async execute(_toolCallId, params) {
 			const staged = params.staged ?? true;
-			const allFiles = staged ? await git.getStagedFiles() : await git.getChangedFiles(false);
+			const allFiles = await git.diff.changedFiles(cwd, { cached: staged });
 			const { filtered: files, excluded } = filterExcludedFiles(allFiles);
-			const stat = await git.getStat(staged);
-			const allNumstat = await git.getNumstat(staged);
+			const stat = await git.diff(cwd, { stat: true, cached: staged });
+			const allNumstat = await git.diff.numstat(cwd, { cached: staged });
 			const numstat = allNumstat.filter(entry => !isExcludedFile(entry.path));
 			const scopeResult = extractScopeCandidates(numstat);
-			const untrackedFiles = !staged && params.include_untracked ? await git.getUntrackedFiles() : undefined;
+			const untrackedFiles = !staged && params.include_untracked ? await git.ls.untracked(cwd) : undefined;
 			const snapshot: GitOverviewSnapshot = {
 				files,
 				stat,

package/src/commit/agentic/tools/index.ts

@@ -1,5 +1,4 @@
 import type { CommitAgentState } from "../../../commit/agentic/state";
-import type { ControlledGit } from "../../../commit/git";
 import type { ModelRegistry } from "../../../config/model-registry";
 import type { Settings } from "../../../config/settings";
 import type { CustomTool } from "../../../extensibility/custom-tools/types";
@@ -15,7 +14,6 @@ import { createSplitCommitTool } from "./split-commit";
 
 export interface CommitToolOptions {
 	cwd: string;
-	git: ControlledGit;
 	authStorage: AuthStorage;
 	modelRegistry: ModelRegistry;
 	settings: Settings;
@@ -27,10 +25,10 @@ export interface CommitToolOptions {
 
 export function createCommitTools(options: CommitToolOptions): Array<CustomTool<any, any>> {
 	const tools: Array<CustomTool<any, any>> = [
-		createGitOverviewTool(options.git, options.state),
-		createGitFileDiffTool(options.git, options.state),
-		createGitHunkTool(options.git),
-		createRecentCommitsTool(options.git),
+		createGitOverviewTool(options.cwd, options.state),
+		createGitFileDiffTool(options.cwd, options.state),
+		createGitHunkTool(options.cwd),
+		createRecentCommitsTool(options.cwd),
 	];
 
 	if (options.enableAnalyzeFiles ?? true) {
@@ -48,8 +46,8 @@ export function createCommitTools(options: CommitToolOptions): Array<CustomTool<
 
 	tools.push(
 		createProposeChangelogTool(options.state, options.changelogTargets),
-		createProposeCommitTool(options.git, options.state),
-		createSplitCommitTool(options.git, options.state, options.changelogTargets),
+		createProposeCommitTool(options.cwd, options.state),
+		createSplitCommitTool(options.cwd, options.state, options.changelogTargets),
 	);
 
 	return tools;

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

@@ -9,9 +9,9 @@ import {
 	validateTypeConsistency,
 } from "../../../commit/agentic/validation";
 import { validateAnalysis } from "../../../commit/analysis/validation";
-import type { ControlledGit } from "../../../commit/git";
 import type { CommitType, ConventionalAnalysis, ConventionalDetail } from "../../../commit/types";
 import type { CustomTool } from "../../../extensibility/custom-tools/types";
+import * as git from "../../../utils/git";
 import { commitTypeSchema, detailSchema } from "./schemas.js";
 
 const proposeCommitSchema = Type.Object({
@@ -49,10 +49,7 @@ function normalizeDetails(
 	}));
 }
 
-export function createProposeCommitTool(
-	git: ControlledGit,
-	state: CommitAgentState,
-): CustomTool<typeof proposeCommitSchema> {
+export function createProposeCommitTool(cwd: string, state: CommitAgentState): CustomTool<typeof proposeCommitSchema> {
 	return {
 		name: "propose_commit",
 		label: "Propose Commit",
@@ -72,8 +69,8 @@ export function createProposeCommitTool(
 
 			const summaryValidation = validateSummaryRules(summary);
 			const analysisValidation = validateAnalysis(analysis);
-			const stagedFiles = state.overview?.files ?? (await git.getStagedFiles());
-			const diffText = state.diffText ?? (await git.getDiff(true));
+			const stagedFiles = state.overview?.files ?? (await git.diff.changedFiles(cwd, { cached: true }));
+			const diffText = state.diffText ?? (await git.diff(cwd, { cached: true }));
 			const typeValidation = validateTypeConsistency(params.type, stagedFiles, {
 				diffText,
 				summary,

package/src/commit/agentic/tools/recent-commits.ts

@@ -1,6 +1,6 @@
 import { Type } from "@sinclair/typebox";
-import type { ControlledGit } from "../../../commit/git";
 import type { CustomTool } from "../../../extensibility/custom-tools/types";
+import * as git from "../../../utils/git";
 
 const recentCommitsSchema = Type.Object({
 	count: Type.Optional(Type.Number({ description: "Number of commits to fetch", minimum: 1, maximum: 50 })),
@@ -25,7 +25,7 @@ function extractScope(subject: string): string | null {
 	return match?.[1]?.trim() ?? null;
 }
 
-export function createRecentCommitsTool(git: ControlledGit): CustomTool<typeof recentCommitsSchema> {
+export function createRecentCommitsTool(cwd: string): CustomTool<typeof recentCommitsSchema> {
 	return {
 		name: "recent_commits",
 		label: "Recent Commits",
@@ -33,7 +33,7 @@ export function createRecentCommitsTool(git: ControlledGit): CustomTool<typeof r
 		parameters: recentCommitsSchema,
 		async execute(_toolCallId, params) {
 			const count = params.count ?? 8;
-			const commits = await git.getRecentCommits(count);
+			const commits = await git.log.subjects(cwd, count);
 			const verbs: Record<string, number> = {};
 			const scopes: Record<string, number> = {};
 			const lengths: number[] = [];

package/src/commit/agentic/tools/split-commit.ts

@@ -10,9 +10,9 @@ import {
 	validateTypeConsistency,
 } from "../../../commit/agentic/validation";
 import { validateScope } from "../../../commit/analysis/validation";
-import type { ControlledGit } from "../../../commit/git";
 import type { ConventionalDetail } from "../../../commit/types";
 import type { CustomTool } from "../../../extensibility/custom-tools/types";
+import * as git from "../../../utils/git";
 import { commitTypeSchema, detailSchema } from "./schemas.js";
 
 const hunkSelectorSchema = Type.Union([
@@ -64,7 +64,7 @@ function normalizeDetails(
 }
 
 export function createSplitCommitTool(
-	git: ControlledGit,
+	cwd: string,
 	state: CommitAgentState,
 	changelogTargets: string[],
 ): CustomTool<typeof splitCommitSchema> {
@@ -74,13 +74,13 @@ export function createSplitCommitTool(
 		description: "Propose multiple atomic commits for unrelated changes.",
 		parameters: splitCommitSchema,
 		async execute(_toolCallId, params) {
-			const stagedFiles = state.overview?.files ?? (await git.getStagedFiles());
+			const stagedFiles = state.overview?.files ?? (await git.diff.changedFiles(cwd, { cached: true }));
 			const stagedSet = new Set(stagedFiles);
 			const changelogSet = new Set(changelogTargets);
 			const usedFiles = new Set<string>();
 			const errors: string[] = [];
 			const warnings: string[] = [];
-			const diffText = await git.getDiff(true);
+			const diffText = await git.diff(cwd, { cached: true });
 
 			const commits: SplitCommitGroup[] = params.commits.map((commit, index) => {
 				const scope = commit.scope?.trim() || null;

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/changelog/index.ts

@@ -2,8 +2,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 { logger } from "@oh-my-pi/pi-utils";
-import type { ControlledGit } from "../../commit/git";
 import { CHANGELOG_CATEGORIES } from "../../commit/types";
+import * as git from "../../utils/git";
 import { detectChangelogBoundaries } from "./detect";
 import { generateChangelogEntries } from "./generate";
 import { parseUnreleasedSection } from "./parse";
@@ -13,7 +13,6 @@ const CHANGELOG_SECTIONS = CHANGELOG_CATEGORIES;
 const DEFAULT_MAX_DIFF_CHARS = 120_000;
 
 export interface ChangelogFlowInput {
-	git: ControlledGit;
 	cwd: string;
 	model: Model<Api>;
 	apiKey: string;
@@ -25,7 +24,6 @@ export interface ChangelogFlowInput {
 }
 
 export interface ChangelogProposalInput {
-	git: ControlledGit;
 	cwd: string;
 	proposals: Array<{
 		path: string;
@@ -40,7 +38,6 @@ export interface ChangelogProposalInput {
  * Update CHANGELOG.md entries for staged changes.
  */
 export async function runChangelogFlow({
-	git,
 	cwd,
 	model,
 	apiKey,
@@ -58,9 +55,9 @@ export async function runChangelogFlow({
 	const updated: string[] = [];
 	for (const boundary of boundaries) {
 		onProgress?.(`Generating entries for ${boundary.changelogPath}…`);
-		const diff = await git.getDiffForFiles(boundary.files, true);
+		const diff = await git.diff(cwd, { cached: true, files: boundary.files });
 		if (!diff.trim()) continue;
-		const stat = await git.getStatForFiles(boundary.files, true);
+		const stat = await git.diff(cwd, { stat: true, cached: true, files: boundary.files });
 		const diffForPrompt = truncateDiff(diff, maxDiffChars ?? DEFAULT_MAX_DIFF_CHARS);
 		const changelogContent = await Bun.file(boundary.changelogPath).text();
 		let unreleased: { startLine: number; endLine: number; entries: Record<string, string[]> };
@@ -87,7 +84,7 @@ export async function runChangelogFlow({
 		const updatedContent = applyChangelogEntries(changelogContent, unreleased, generated.entries);
 		if (!dryRun) {
 			await Bun.write(boundary.changelogPath, updatedContent);
-			await git.stageFiles([path.relative(cwd, boundary.changelogPath)]);
+			await git.stage.files(cwd, [path.relative(cwd, boundary.changelogPath)]);
 		}
 		updated.push(boundary.changelogPath);
 	}
@@ -99,7 +96,6 @@ export async function runChangelogFlow({
  * Apply changelog entries provided by the commit agent.
  */
 export async function applyChangelogProposals({
-	git,
 	cwd,
 	proposals,
 	dryRun,
@@ -132,7 +128,7 @@ export async function applyChangelogProposals({
 		const updatedContent = applyChangelogEntries(changelogContent, unreleased, normalized, normalizedDeletions);
 		if (!dryRun) {
 			await Bun.write(proposal.path, updatedContent);
-			await git.stageFiles([path.relative(cwd, proposal.path)]);
+			await git.stage.files(cwd, [path.relative(cwd, proposal.path)]);
 		}
 		updated.push(proposal.path);
 	}

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,12 +1,12 @@
 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";
+import * as git from "../utils/git";
 import { runAgenticCommit } from "./agentic";
 import {
 	extractScopeCandidates,
@@ -16,7 +16,6 @@ import {
 	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";
@@ -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.
@@ -57,12 +56,11 @@ async function runLegacyCommitCommand(args: CommitCommandArgs): Promise<void> {
 		thinkingLevel: smolThinkingLevel,
 	} = await resolveSmolModel(settings, modelRegistry, primaryModel, primaryApiKey);
 
-	const git = new ControlledGit(cwd);
-	let stagedFiles = await git.getStagedFiles();
+	let stagedFiles = await git.diff.changedFiles(cwd, { cached: true });
 	if (stagedFiles.length === 0) {
 		process.stdout.write("No staged changes detected, staging all changes...\n");
-		await git.stageAll();
-		stagedFiles = await git.getStagedFiles();
+		await git.stage.files(cwd);
+		stagedFiles = await git.diff.changedFiles(cwd, { cached: true });
 	}
 	if (stagedFiles.length === 0) {
 		process.stderr.write("No changes to commit.\n");
@@ -71,7 +69,6 @@ async function runLegacyCommitCommand(args: CommitCommandArgs): Promise<void> {
 
 	if (!args.noChangelog) {
 		await runChangelogFlow({
-			git,
 			cwd,
 			model: primaryModel,
 			apiKey: primaryApiKey,
@@ -82,11 +79,11 @@ async function runLegacyCommitCommand(args: CommitCommandArgs): Promise<void> {
 		});
 	}
 
-	const diff = await git.getDiff(true);
-	const stat = await git.getStat(true);
-	const numstat = await git.getNumstat(true);
+	const diff = await git.diff(cwd, { cached: true });
+	const stat = await git.diff(cwd, { stat: true, cached: true });
+	const numstat = await git.diff.numstat(cwd, { cached: true });
 	const scopeCandidates = extractScopeCandidates(numstat).scopeCandidates;
-	const recentCommits = await git.getRecentCommits(RECENT_COMMITS_COUNT);
+	const recentCommits = await git.log.subjects(cwd, RECENT_COMMITS_COUNT);
 	const contextFiles = await loadProjectContextFiles({ cwd });
 	const formattedContextFiles = contextFiles.map(file => ({
 		path: path.relative(cwd, file.path),
@@ -131,10 +128,10 @@ async function runLegacyCommitCommand(args: CommitCommandArgs): Promise<void> {
 		return;
 	}
 
-	await git.commit(commitMessage);
+	await git.commit(cwd, commitMessage);
 	process.stdout.write("Commit created.\n");
 	if (args.push) {
-		await git.push();
+		await git.push(cwd);
 		process.stdout.write("Pushed to remote.\n");
 	}
 }
@@ -238,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/keybindings.ts

@@ -37,6 +37,7 @@ interface AppKeybindings {
 	"app.session.tree": true;
 	"app.session.fork": true;
 	"app.session.resume": true;
+	"app.session.observe": true;
 	"app.session.togglePath": true;
 	"app.session.toggleSort": true;
 	"app.session.rename": true;
@@ -144,6 +145,10 @@ export const KEYBINDINGS = {
 		defaultKeys: [],
 		description: "Resume session",
 	},
+	"app.session.observe": {
+		defaultKeys: "ctrl+s",
+		description: "Observe subagent sessions",
+	},
 	"app.session.togglePath": {
 		defaultKeys: "ctrl+p",
 		description: "Toggle session path display",
@@ -214,6 +219,7 @@ const KEYBINDING_NAME_MIGRATIONS = {
 	tree: "app.session.tree",
 	fork: "app.session.fork",
 	resume: "app.session.resume",
+	observeSessions: "app.session.observe",
 	toggleSTT: "app.stt.toggle",
 	// TUI editor (old names for backward compatibility)
 	cursorUp: "tui.editor.cursorUp",
@@ -260,9 +266,6 @@ function isLegacyKeybindingName(key: string): key is keyof typeof KEYBINDING_NAM
 	return key in KEYBINDING_NAME_MIGRATIONS;
 }
 
-/**
- * Normalize input to KeybindingsConfig, validating types.
- */
 function toKeybindingsConfig(value: unknown): KeybindingsConfig {
 	if (typeof value !== "object" || value === null) {
 		return {};
@@ -270,15 +273,13 @@ function toKeybindingsConfig(value: unknown): KeybindingsConfig {
 
 	const config: KeybindingsConfig = {};
 	for (const [key, val] of Object.entries(value)) {
-		// Allow undefined, string (KeyId), or array of strings
 		if (val === undefined) {
 			config[key] = undefined;
 		} else if (typeof val === "string") {
 			config[key] = val as KeyId;
 		} else if (Array.isArray(val) && val.every(v => typeof v === "string")) {
-			config[key] = val as string[] as KeyId[];
+			config[key] = val as KeyId[];
 		}
-		// Silently skip invalid entries
 	}
 	return config;
 }