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

package/src/extensibility/custom-commands/bundled/review/index.ts

@@ -15,6 +15,7 @@ import { renderPromptTemplate } from "../../../../config/prompt-templates";
 import type { CustomCommand, CustomCommandAPI } from "../../../../extensibility/custom-commands/types";
 import type { HookCommandContext } from "../../../../extensibility/hooks/types";
 import reviewRequestTemplate from "../../../../prompts/review-request.md" with { type: "text" };
+import * as git from "../../../../utils/git";
 
 // ─────────────────────────────────────────────────────────────────────────────
 // Types
@@ -258,20 +259,20 @@ export class ReviewCommand implements CustomCommand {
 				if (!baseBranch) return undefined;
 
 				const currentBranch = await getCurrentBranch(this.api);
-				const diffResult = await this.api.exec("git", ["diff", `${baseBranch}...${currentBranch}`], {
-					timeout: 30000,
-				});
-				if (diffResult.code !== 0) {
-					ctx.ui.notify(`Failed to get diff: ${diffResult.stderr}`, "error");
+				let diffText: string;
+				try {
+					diffText = await git.diff(this.api.cwd, { base: `${baseBranch}...${currentBranch}` });
+				} catch (err) {
+					ctx.ui.notify(`Failed to get diff: ${err instanceof Error ? err.message : String(err)}`, "error");
 					return undefined;
 				}
 
-				if (!diffResult.stdout.trim()) {
+				if (!diffText.trim()) {
 					ctx.ui.notify(`No changes between ${baseBranch} and ${currentBranch}`, "warning");
 					return undefined;
 				}
 
-				const stats = parseDiff(diffResult.stdout);
+				const stats = parseDiff(diffText);
 				if (stats.files.length === 0) {
 					ctx.ui.notify("No reviewable files (all changes filtered out)", "warning");
 					return undefined;
@@ -280,7 +281,7 @@ export class ReviewCommand implements CustomCommand {
 				return buildReviewPrompt(
 					`Reviewing changes between \`${baseBranch}\` and \`${currentBranch}\` (PR-style)`,
 					stats,
-					diffResult.stdout,
+					diffText,
 				);
 			}
 
@@ -292,12 +293,19 @@ export class ReviewCommand implements CustomCommand {
 					return undefined;
 				}
 
-				const [unstagedResult, stagedResult] = await Promise.all([
-					this.api.exec("git", ["diff"], { timeout: 30000 }),
-					this.api.exec("git", ["diff", "--cached"], { timeout: 30000 }),
-				]);
+				let unstagedDiff: string;
+				let stagedDiff: string;
+				try {
+					[unstagedDiff, stagedDiff] = await Promise.all([
+						git.diff(this.api.cwd),
+						git.diff(this.api.cwd, { cached: true }),
+					]);
+				} catch (err) {
+					ctx.ui.notify(`Failed to get diff: ${err instanceof Error ? err.message : String(err)}`, "error");
+					return undefined;
+				}
 
-				const combinedDiff = [unstagedResult.stdout, stagedResult.stdout].filter(Boolean).join("\n");
+				const combinedDiff = [unstagedDiff, stagedDiff].filter(Boolean).join("\n");
 
 				if (!combinedDiff.trim()) {
 					ctx.ui.notify("No diff content found", "warning");
@@ -327,25 +335,26 @@ export class ReviewCommand implements CustomCommand {
 				// Extract commit hash from selection (format: "abc1234 message")
 				const hash = selected.split(" ")[0];
 
-				// Get the commit diff (with timeout)
-				const showResult = await this.api.exec("git", ["show", "--format=", hash], { timeout: 30000 });
-				if (showResult.code !== 0) {
-					ctx.ui.notify(`Failed to get commit: ${showResult.stderr}`, "error");
+				let diffText: string;
+				try {
+					diffText = await git.show(this.api.cwd, hash, { format: "" });
+				} catch (err) {
+					ctx.ui.notify(`Failed to get commit: ${err instanceof Error ? err.message : String(err)}`, "error");
 					return undefined;
 				}
 
-				if (!showResult.stdout.trim()) {
+				if (!diffText.trim()) {
 					ctx.ui.notify("Commit has no diff content", "warning");
 					return undefined;
 				}
 
-				const stats = parseDiff(showResult.stdout);
+				const stats = parseDiff(diffText);
 				if (stats.files.length === 0) {
 					ctx.ui.notify("No reviewable files in commit (all changes filtered out)", "warning");
 					return undefined;
 				}
 
-				return buildReviewPrompt(`Reviewing commit \`${hash}\``, stats, showResult.stdout);
+				return buildReviewPrompt(`Reviewing commit \`${hash}\``, stats, diffText);
 			}
 
 			case 4: {
@@ -354,16 +363,21 @@ export class ReviewCommand implements CustomCommand {
 				if (!instructions?.trim()) return undefined;
 
 				// For custom, we still try to get current diff for context
-				const diffResult = await this.api.exec("git", ["diff", "HEAD"], { timeout: 30000 });
-				const hasDiff = diffResult.code === 0 && diffResult.stdout.trim();
+				let diffText: string | undefined;
+				try {
+					diffText = await git.diff(this.api.cwd, { base: "HEAD" });
+				} catch {
+					diffText = undefined;
+				}
+				const reviewDiff = diffText?.trim();
 
-				if (hasDiff) {
-					const stats = parseDiff(diffResult.stdout);
+				if (reviewDiff) {
+					const stats = parseDiff(reviewDiff);
 					// Even if all files filtered, include the custom instructions
 					return `${buildReviewPrompt(
 						`Custom review: ${instructions.split("\n")[0].slice(0, 60)}…`,
 						stats,
-						diffResult.stdout,
+						reviewDiff,
 					)}\n\n### Additional Instructions\n\n${instructions}`;
 				}
 
@@ -388,12 +402,7 @@ Use the Task tool with \`agent: "reviewer"\` to execute this review.`;
 
 async function getGitBranches(api: CustomCommandAPI): Promise<string[]> {
 	try {
-		const result = await api.exec("git", ["branch", "-a", "--format=%(refname:short)"]);
-		if (result.code !== 0) return [];
-		return result.stdout
-			.split("\n")
-			.map(b => b.trim())
-			.filter(Boolean);
+		return await git.branch.list(api.cwd, { all: true });
 	} catch {
 		return [];
 	}
@@ -401,8 +410,7 @@ async function getGitBranches(api: CustomCommandAPI): Promise<string[]> {
 
 async function getCurrentBranch(api: CustomCommandAPI): Promise<string> {
 	try {
-		const result = await api.exec("git", ["branch", "--show-current"]);
-		return result.stdout.trim() || "HEAD";
+		return (await git.branch.current(api.cwd)) ?? "HEAD";
 	} catch {
 		return "HEAD";
 	}
@@ -410,8 +418,7 @@ async function getCurrentBranch(api: CustomCommandAPI): Promise<string> {
 
 async function getGitStatus(api: CustomCommandAPI): Promise<string> {
 	try {
-		const result = await api.exec("git", ["status", "--porcelain"]);
-		return result.stdout;
+		return await git.status(api.cwd);
 	} catch {
 		return "";
 	}
@@ -419,12 +426,7 @@ async function getGitStatus(api: CustomCommandAPI): Promise<string> {
 
 async function getRecentCommits(api: CustomCommandAPI, count: number): Promise<string[]> {
 	try {
-		const result = await api.exec("git", ["log", `-${count}`, "--oneline", "--no-decorate"]);
-		if (result.code !== 0) return [];
-		return result.stdout
-			.split("\n")
-			.map(c => c.trim())
-			.filter(Boolean);
+		return await git.log.onelines(api.cwd, count);
 	} catch {
 		return [];
 	}

package/src/extensibility/custom-tools/types.ts

@@ -94,7 +94,7 @@ export type CustomToolSessionEvent =
 	  }
 	| {
 			reason: "auto_compaction_start";
-			trigger: "threshold" | "overflow";
+			trigger: "threshold" | "overflow" | "idle";
 			action: "context-full" | "handoff";
 	  }
 	| {

package/src/extensibility/extensions/types.ts

@@ -81,6 +81,8 @@ export interface ExtensionUIDialogOptions {
 	onLeft?: () => void;
 	/** Invoked when user presses right arrow in select dialogs */
 	onRight?: () => void;
+	/** Invoked when user presses the external editor shortcut in select dialogs */
+	onExternalEditor?: () => void;
 	/** Optional footer hint text rendered by interactive selector */
 	helpText?: string;
 }
@@ -566,7 +568,7 @@ export interface ToolExecutionEndEvent {
 /** Fired when auto-compaction starts */
 export interface AutoCompactionStartEvent {
 	type: "auto_compaction_start";
-	reason: "threshold" | "overflow";
+	reason: "threshold" | "overflow" | "idle";
 	action: "context-full" | "handoff";
 }
 

package/src/extensibility/hooks/types.ts

@@ -394,7 +394,7 @@ export interface TurnEndEvent {
 /** Event data for auto_compaction_start event. */
 export interface AutoCompactionStartEvent {
 	type: "auto_compaction_start";
-	reason: "threshold" | "overflow";
+	reason: "threshold" | "overflow" | "idle";
 	action: "context-full" | "handoff";
 }
 

package/src/extensibility/plugins/marketplace/fetcher.ts

@@ -8,7 +8,7 @@ import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
 import { isEnoent, logger } from "@oh-my-pi/pi-utils";
-import { $ } from "bun";
+import * as git from "../../../utils/git";
 
 import type { MarketplaceCatalog, MarketplaceSourceType } from "./types";
 import { isValidNameSegment } from "./types";
@@ -274,21 +274,11 @@ export async function fetchMarketplace(source: string, cacheDir: string): Promis
  * `promoteCloneToCache` after any duplicate/drift checks pass.
  */
 async function cloneAndReadCatalog(url: string, cacheDir: string): Promise<FetchResult> {
-	if (!Bun.which("git")) {
-		throw new Error("git is not installed. Install git to use git-based marketplace sources.");
-	}
-
 	const tmpDir = path.join(cacheDir, `.tmp-clone-${Date.now()}`);
 	await fs.mkdir(cacheDir, { recursive: true });
 
 	logger.debug(`[marketplace] cloning ${url} → ${tmpDir}`);
-
-	const result = await $`git clone --depth 1 --single-branch ${url} ${tmpDir}`.quiet().nothrow();
-	if (result.exitCode !== 0) {
-		await fs.rm(tmpDir, { recursive: true, force: true });
-		const stderr = result.stderr.toString().trim();
-		throw new Error(`git clone failed (exit ${result.exitCode}): ${stderr || "unknown error"}`);
-	}
+	await git.clone(url, tmpDir);
 
 	const catalogPath = path.join(tmpDir, CATALOG_RELATIVE_PATH);
 	let content: string;
@@ -325,48 +315,3 @@ export async function promoteCloneToCache(tmpDir: string, cacheDir: string, name
 	await fs.rename(tmpDir, finalDir);
 	return finalDir;
 }
-
-/**
- * Clone a git repository to a target directory. Shared by fetcher (marketplace clones)
- * and source-resolver (plugin source clones).
- *
- * @param url - Git clone URL (HTTPS, SSH, or GitHub shorthand expanded to HTTPS)
- * @param targetDir - Directory to clone into (must not exist)
- * @param options.ref - Optional branch/tag to clone
- * @param options.sha - Optional commit SHA to checkout after clone
- */
-export async function cloneGitRepo(
-	url: string,
-	targetDir: string,
-	options?: { ref?: string; sha?: string },
-): Promise<void> {
-	if (!Bun.which("git")) {
-		throw new Error("git is not installed. Install git to use git-based plugin sources.");
-	}
-
-	const cloneArgs = ["git", "clone", "--depth", "1"];
-	if (options?.ref) {
-		cloneArgs.push("--branch", options.ref, "--single-branch");
-	} else {
-		cloneArgs.push("--single-branch");
-	}
-	cloneArgs.push(url, targetDir);
-
-	logger.debug("[marketplace] cloning plugin source", { url, targetDir });
-
-	const result = await $`${cloneArgs}`.quiet().nothrow();
-	if (result.exitCode !== 0) {
-		await fs.rm(targetDir, { recursive: true, force: true });
-		const stderr = result.stderr.toString().trim();
-		throw new Error(`git clone failed (exit ${result.exitCode}): ${stderr || "unknown error"}`);
-	}
-
-	// If a specific SHA is requested, checkout that commit
-	if (options?.sha) {
-		const checkout = await $`git -C ${targetDir} checkout ${options.sha}`.quiet().nothrow();
-		if (checkout.exitCode !== 0) {
-			await fs.rm(targetDir, { recursive: true, force: true });
-			throw new Error(`Failed to checkout SHA ${options.sha} — shallow clone may not contain this commit`);
-		}
-	}
-}

package/src/extensibility/plugins/marketplace/source-resolver.ts

@@ -14,8 +14,8 @@ import * as fs from "node:fs/promises";
 import * as path from "node:path";
 
 import { isEnoent, pathIsWithin } from "@oh-my-pi/pi-utils";
+import * as git from "../../../utils/git";
 
-import { cloneGitRepo } from "./fetcher";
 import type { MarketplaceCatalogMetadata, MarketplacePluginEntry, PluginSource } from "./types";
 
 export interface ResolveContext {
@@ -87,7 +87,7 @@ async function resolveObjectSource(
 			// { source: "url", url: "https://github.com/owner/repo.git" }
 			// Despite the name, this is typically a git clone URL
 			const targetDir = path.join(context.tmpDir, `plugin-${crypto.randomUUID()}`);
-			await cloneGitRepo(source.url, targetDir, { ref: source.ref, sha: source.sha });
+			await git.clone(source.url, targetDir, { ref: source.ref, sha: source.sha });
 			return { dir: targetDir, tempCloneRoot: targetDir };
 		}
 
@@ -95,7 +95,7 @@ async function resolveObjectSource(
 			// { source: "github", repo: "owner/repo" }
 			const url = `https://github.com/${source.repo}.git`;
 			const targetDir = path.join(context.tmpDir, `plugin-${crypto.randomUUID()}`);
-			await cloneGitRepo(url, targetDir, { ref: source.ref, sha: source.sha });
+			await git.clone(url, targetDir, { ref: source.ref, sha: source.sha });
 			return { dir: targetDir, tempCloneRoot: targetDir };
 		}
 
@@ -106,7 +106,7 @@ async function resolveObjectSource(
 					? source.url
 					: `https://github.com/${source.url}.git`;
 			const cloneDir = path.join(context.tmpDir, `plugin-repo-${crypto.randomUUID()}`);
-			await cloneGitRepo(url, cloneDir, { ref: source.ref, sha: source.sha });
+			await git.clone(url, cloneDir, { ref: source.ref, sha: source.sha });
 
 			const subdirPath = path.resolve(cloneDir, source.path);
 			if (!pathIsWithin(cloneDir, subdirPath)) {

package/src/index.ts

@@ -51,6 +51,7 @@ export * from "./task/executor";
 export type * from "./task/types";
 // Tools (detail types and utilities)
 export * from "./tools";
+export * from "./utils/git";
 // UI components for extensions
 export {
 	HookEditorComponent as ExtensionEditorComponent,

package/src/internal-urls/types.ts

@@ -1,7 +1,7 @@
 /**
  * Types for the internal URL routing system.
  *
- * Internal URLs (agent://, artifact://, memory://, skill://, rule://, mcp://, pi://, local://) are resolved by tools like fetch and read,
+ * Internal URLs (agent://, artifact://, memory://, skill://, rule://, mcp://, pi://, local://) are resolved by tools like read,
  * providing access to agent outputs and server resources without exposing filesystem paths.
  */
 

package/src/main.ts

@@ -48,6 +48,7 @@ import type { AgentSession } from "./session/agent-session";
 import { resolveResumableSession, type SessionInfo, SessionManager } from "./session/session-manager";
 import { resolvePromptInput } from "./system-prompt";
 import { getChangelogPath, getNewEntries, parseChangelog } from "./utils/changelog";
+import type { EventBus } from "./utils/event-bus";
 
 async function checkForNewVersion(currentVersion: string): Promise<string | undefined> {
 	if (!settings.get("startup.checkUpdate")) {
@@ -119,10 +120,19 @@ async function runInteractiveMode(
 	setExtensionUIContext: (uiContext: ExtensionUIContext, hasUI: boolean) => void,
 	lspServers: Array<{ name: string; status: "ready" | "error"; fileTypes: string[]; error?: string }> | undefined,
 	mcpManager: MCPManager | undefined,
+	eventBus?: EventBus,
 	initialMessage?: string,
 	initialImages?: ImageContent[],
 ): Promise<void> {
-	const mode = new InteractiveMode(session, version, changelogMarkdown, setExtensionUIContext, lspServers, mcpManager);
+	const mode = new InteractiveMode(
+		session,
+		version,
+		changelogMarkdown,
+		setExtensionUIContext,
+		lspServers,
+		mcpManager,
+		eventBus,
+	);
 
 	await mode.init();
 
@@ -273,6 +283,17 @@ async function createSessionManager(parsed: Args, cwd: string): Promise<SessionM
 	if (parsed.sessionDir) {
 		return SessionManager.create(cwd, parsed.sessionDir);
 	}
+	// Auto-resume: behave like --continue if the setting is enabled and a prior
+	// session exists. When a prior session is resumed, mark parsed.continue so
+	// buildSessionOptions restores the session's model/thinking instead of
+	// overriding them with CLI defaults.
+	if (settings.get("autoResume")) {
+		const manager = await SessionManager.continueRecent(cwd, parsed.sessionDir);
+		if (manager.getEntries().length > 0) {
+			parsed.continue = true;
+		}
+		return manager;
+	}
 	// Default case (new session) returns undefined, SDK will create one
 	return undefined;
 }
@@ -718,7 +739,7 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 		}
 	}
 
-	const { session, setToolUIContext, modelFallbackMessage, lspServers, mcpManager } = await logger.timeAsync(
+	const { session, setToolUIContext, modelFallbackMessage, lspServers, mcpManager, eventBus } = await logger.timeAsync(
 		"createAgentSession",
 		() => createAgentSession(sessionOptions),
 	);
@@ -806,6 +827,7 @@ export async function runRootCommand(parsed: Args, rawArgs: string[]): Promise<v
 			setToolUIContext,
 			lspServers,
 			mcpManager,
+			eventBus,
 			initialMessage,
 			initialImages,
 		);

package/src/modes/acp/acp-event-mapper.ts

@@ -106,7 +106,6 @@ export function mapToolKind(toolName: string): ToolKind {
 		case "find":
 		case "ast_grep":
 			return "search";
-		case "fetch":
 		case "web_search":
 			return "fetch";
 		case "todo_write":

package/src/modes/components/footer.ts

@@ -5,7 +5,8 @@ import { formatNumber, getProjectDir } from "@oh-my-pi/pi-utils";
 import { theme } from "../../modes/theme/theme";
 import type { AgentSession } from "../../session/agent-session";
 import { shortenPath } from "../../tools/render-utils";
-import { findGitHeadPathAsync, sanitizeStatusText } from "../shared";
+import * as git from "../../utils/git";
+import { sanitizeStatusText } from "../shared";
 import { getContextUsageLevel, getContextUsageThemeColor } from "./status-line/context-thresholds";
 
 /**
@@ -55,13 +56,13 @@ export class FooterComponent implements Component {
 			this.#gitWatcher = null;
 		}
 
-		findGitHeadPathAsync().then(result => {
-			if (!result) {
+		git.head.resolve(getProjectDir()).then(head => {
+			if (!head) {
 				return;
 			}
 
 			try {
-				this.#gitWatcher = fs.watch(result.path, () => {
+				this.#gitWatcher = fs.watch(head.headPath, () => {
 					this.#cachedBranch = undefined; // Invalidate cache
 					if (this.#onBranchChange) {
 						this.#onBranchChange();
@@ -93,35 +94,14 @@ export class FooterComponent implements Component {
 	 * Returns null if not in a git repo, branch name otherwise.
 	 */
 	#getCurrentBranch(): string | null {
-		// Return cached value if available
 		if (this.#cachedBranch !== undefined) {
 			return this.#cachedBranch;
 		}
 
-		// Note: fire-and-forget async call - will return undefined on first call
-		// This is acceptable since it's a cached value that will update on next render
-		findGitHeadPathAsync().then(result => {
-			if (!result) {
-				this.#cachedBranch = null;
-				if (this.#onBranchChange) {
-					this.#onBranchChange();
-				}
-				return;
-			}
-			const content = result.content.trim();
-
-			if (content.startsWith("ref: refs/heads/")) {
-				this.#cachedBranch = content.slice(16);
-			} else {
-				this.#cachedBranch = "detached";
-			}
-			if (this.#onBranchChange) {
-				this.#onBranchChange();
-			}
-		});
-
-		// Return undefined while loading (will show on next render once loaded)
-		return null;
+		const headState = git.head.resolveSync(getProjectDir());
+		this.#cachedBranch =
+			headState === null ? null : headState.kind === "ref" ? (headState.branchName ?? headState.ref) : "detached";
+		return this.#cachedBranch;
 	}
 
 	render(width: number): string[] {

package/src/modes/components/hook-editor.ts

@@ -8,7 +8,7 @@
  */
 import { Container, Editor, matchesKey, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
 import { getEditorTheme, theme } from "../../modes/theme/theme";
-import { matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
+import { matchesAppExternalEditor, matchesAppInterrupt } from "../../modes/utils/keybinding-matchers";
 import { getEditorCommand, openInEditor } from "../../utils/external-editor";
 import { DynamicBorder } from "./dynamic-border";
 
@@ -87,7 +87,7 @@ export class HookEditorComponent extends Container {
 		}
 
 		// Ctrl+G for external editor
-		if (matchesKey(keyData, "ctrl+g")) {
+		if (matchesAppExternalEditor(keyData)) {
 			void this.#openExternalEditor();
 			return;
 		}
@@ -123,7 +123,7 @@ export class HookEditorComponent extends Container {
 		}
 
 		// Ctrl+G for external editor
-		if (matchesKey(keyData, "ctrl+g")) {
+		if (matchesAppExternalEditor(keyData)) {
 			void this.#openExternalEditor();
 			return;
 		}

package/src/modes/components/hook-selector.ts

@@ -16,7 +16,7 @@ import {
 	visibleWidth,
 } from "@oh-my-pi/pi-tui";
 import { getMarkdownTheme, theme } from "../../modes/theme/theme";
-import { matchesSelectCancel } from "../../modes/utils/keybinding-matchers";
+import { matchesAppExternalEditor, matchesSelectCancel } from "../../modes/utils/keybinding-matchers";
 import { CountdownTimer } from "./countdown-timer";
 import { DynamicBorder } from "./dynamic-border";
 
@@ -29,6 +29,7 @@ export interface HookSelectorOptions {
 	maxVisible?: number;
 	onLeft?: () => void;
 	onRight?: () => void;
+	onExternalEditor?: () => void;
 	helpText?: string;
 }
 
@@ -67,6 +68,7 @@ export class HookSelectorComponent extends Container {
 	#countdown: CountdownTimer | undefined;
 	#onLeftCallback: (() => void) | undefined;
 	#onRightCallback: (() => void) | undefined;
+	#onExternalEditorCallback: (() => void) | undefined;
 	constructor(
 		title: string,
 		options: string[],
@@ -84,6 +86,7 @@ export class HookSelectorComponent extends Container {
 		this.#baseTitle = title;
 		this.#onLeftCallback = opts?.onLeft;
 		this.#onRightCallback = opts?.onRight;
+		this.#onExternalEditorCallback = opts?.onExternalEditor;
 
 		this.addChild(new DynamicBorder());
 		this.addChild(new Spacer(1));
@@ -174,6 +177,8 @@ export class HookSelectorComponent extends Container {
 			this.#onLeftCallback?.();
 		} else if (matchesKey(keyData, "right")) {
 			this.#onRightCallback?.();
+		} else if (this.#onExternalEditorCallback && matchesAppExternalEditor(keyData)) {
+			this.#onExternalEditorCallback();
 		} else if (matchesSelectCancel(keyData)) {
 			this.#onCancelCallback();
 		}