@oh-my-pi/pi-coding-agent 6.7.670 → 6.8.0

package/src/main.ts

@@ -9,6 +9,7 @@ import { homedir, tmpdir } from "node:os";
 import { join, resolve } from "node:path";
 import { createInterface } from "node:readline/promises";
 import { type ImageContent, supportsXhigh } from "@oh-my-pi/pi-ai";
+import { postmortem } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
 import { type Args, parseArgs, printHelp } from "./cli/args";
 import { parseConfigArgs, printConfigHelp, runConfigCommand } from "./cli/config-cli";
@@ -31,8 +32,7 @@ import { resolvePromptInput } from "./core/system-prompt";
 import { printTimings, time } from "./core/timings";
 import { initializeWithSettings } from "./discovery";
 import { runMigrations, showDeprecationWarnings } from "./migrations";
-import { runAsyncCleanup } from "./modes/cleanup";
-import { InteractiveMode, installTerminalCrashHandlers, runPrintMode, runRpcMode } from "./modes/index";
+import { InteractiveMode, runPrintMode, runRpcMode } from "./modes/index";
 import { initTheme, stopThemeWatcher } from "./modes/interactive/theme/theme";
 import { getChangelogPath, getNewEntries, parseChangelog } from "./utils/changelog";
 
@@ -352,9 +352,9 @@ async function buildSessionOptions(
 
 	// Auto-discover SYSTEM.md if no CLI system prompt provided
 	const systemPromptSource = parsed.systemPrompt ?? discoverSystemPromptFile();
-	const resolvedSystemPrompt = resolvePromptInput(systemPromptSource, "system prompt");
+	const resolvedSystemPrompt = await resolvePromptInput(systemPromptSource, "system prompt");
 	const appendPromptSource = parsed.appendSystemPrompt ?? discoverAppendSystemPromptFile();
-	const resolvedAppendPrompt = resolvePromptInput(appendPromptSource, "append system prompt");
+	const resolvedAppendPrompt = await resolvePromptInput(appendPromptSource, "append system prompt");
 
 	if (sessionManager) {
 		options.sessionManager = sessionManager;
@@ -708,7 +708,6 @@ export async function main(args: string[]) {
 			writeStdout(chalk.dim(`Model scope: ${modelList} ${chalk.gray("(Ctrl+P to cycle)")}`));
 		}
 
-		installTerminalCrashHandlers();
 		printTimings();
 		await runInteractiveMode(
 			session,
@@ -734,10 +733,6 @@ export async function main(args: string[]) {
 		});
 		await session.dispose();
 		stopThemeWatcher();
-		await runAsyncCleanup();
-		if (process.stdout.writableLength > 0) {
-			await new Promise<void>((resolve) => process.stdout.once("drain", resolve));
-		}
-		process.exit(0);
+		await postmortem.quit(0);
 	}
 }

package/src/migrations.ts

@@ -4,11 +4,11 @@
 
 import { existsSync, mkdirSync, readdirSync, readFileSync, renameSync, rmSync, writeFileSync } from "node:fs";
 import { join } from "node:path";
+import { logger } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
 import { getAgentDbPath, getAgentDir, getBinDir } from "./config";
 import { AgentStorage } from "./core/agent-storage";
 import type { AuthCredential } from "./core/auth-storage";
-import { logger } from "./core/logger";
 
 /**
  * Migrate legacy oauth.json and settings.json apiKeys to agent.db.

package/src/modes/index.ts

@@ -1,48 +1,15 @@
 /**
  * Run modes for the coding agent.
  */
-
-import { emergencyTerminalRestore } from "@oh-my-pi/pi-tui";
-import { runAsyncCleanup } from "./cleanup";
-
-/**
- * Install handlers that restore terminal state on crash/signal.
- * Must be called before entering interactive mode.
- */
-export function installTerminalCrashHandlers(): void {
-	const cleanup = () => {
-		emergencyTerminalRestore();
-	};
-
-	// Signals - run async cleanup before exit
-	process.on("SIGINT", () => {
-		cleanup();
-		void runAsyncCleanup().finally(() => process.exit(128 + 2));
-	});
-	process.on("SIGTERM", () => {
-		cleanup();
-		void runAsyncCleanup().finally(() => process.exit(128 + 15));
-	});
-	process.on("SIGHUP", () => {
-		cleanup();
-		void runAsyncCleanup().finally(() => process.exit(128 + 1));
-	});
-
-	// Crashes - exit immediately (async cleanup may not be safe in corrupted state)
-	process.on("uncaughtException", (err) => {
-		cleanup();
-		console.error("Uncaught exception:", err);
-		process.exit(1);
-	});
-	process.on("unhandledRejection", (reason) => {
-		cleanup();
-		console.error("Unhandled rejection:", reason);
-		process.exit(1);
-	});
-}
-
 export { InteractiveMode, type InteractiveModeOptions } from "./interactive/interactive-mode";
 export { type PrintModeOptions, runPrintMode } from "./print-mode";
 export { type ModelInfo, RpcClient, type RpcClientOptions, type RpcEventListener } from "./rpc/rpc-client";
 export { runRpcMode } from "./rpc/rpc-mode";
 export type { RpcCommand, RpcResponse, RpcSessionState } from "./rpc/rpc-types";
+
+import { emergencyTerminalRestore } from "@oh-my-pi/pi-tui";
+import { postmortem } from "@oh-my-pi/pi-utils";
+
+postmortem.register("terminal-restore", () => {
+	emergencyTerminalRestore();
+});

package/src/modes/interactive/components/extensions/state-manager.ts

@@ -3,6 +3,7 @@
  * Handles data loading, tree building, filtering, and toggle persistence.
  */
 
+import { logger } from "@oh-my-pi/pi-utils";
 import type { ContextFile } from "../../../../capability/context-file";
 import type { ExtensionModule } from "../../../../capability/extension-module";
 import type { Hook } from "../../../../capability/hook";
@@ -13,7 +14,6 @@ import type { Skill } from "../../../../capability/skill";
 import type { SlashCommand } from "../../../../capability/slash-command";
 import type { CustomTool } from "../../../../capability/tool";
 import type { SourceMeta } from "../../../../capability/types";
-import { logger } from "../../../../core/logger";
 import {
 	disableProvider,
 	enableProvider,

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

@@ -3,7 +3,7 @@
  * Supports Ctrl+G for external editor.
  */
 
-import * as fs from "node:fs";
+import { rm } from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
 import { Container, Editor, matchesKey, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
@@ -75,7 +75,7 @@ export class HookEditorComponent extends Container {
 
 		// Ctrl+G for external editor
 		if (matchesKey(keyData, "ctrl+g")) {
-			this.openExternalEditor();
+			void this.openExternalEditor();
 			return;
 		}
 
@@ -83,7 +83,7 @@ export class HookEditorComponent extends Container {
 		this.editor.handleInput(keyData);
 	}
 
-	private openExternalEditor(): void {
+	private async openExternalEditor(): Promise<void> {
 		const editorCmd = process.env.VISUAL || process.env.EDITOR;
 		if (!editorCmd) {
 			return;
@@ -93,21 +93,24 @@ export class HookEditorComponent extends Container {
 		const tmpFile = path.join(os.tmpdir(), `omp-hook-editor-${nanoid()}.md`);
 
 		try {
-			fs.writeFileSync(tmpFile, currentText, "utf-8");
+			await Bun.write(tmpFile, currentText);
 			this.tui.stop();
 
 			const [editor, ...editorArgs] = editorCmd.split(" ");
-			const result = Bun.spawnSync([editor, ...editorArgs, tmpFile], {
-				stdio: ["inherit", "inherit", "inherit"],
+			const child = Bun.spawn([editor, ...editorArgs, tmpFile], {
+				stdin: "inherit",
+				stdout: "inherit",
+				stderr: "inherit",
 			});
+			const exitCode = await child.exited;
 
-			if (result.exitCode === 0) {
-				const newContent = fs.readFileSync(tmpFile, "utf-8").replace(/\n$/, "");
+			if (exitCode === 0) {
+				const newContent = (await Bun.file(tmpFile).text()).replace(/\n$/, "");
 				this.editor.setText(newContent);
 			}
 		} finally {
 			try {
-				fs.unlinkSync(tmpFile);
+				await rm(tmpFile, { force: true });
 			} catch {
 				// Ignore cleanup errors
 			}

package/src/modes/interactive/components/login-dialog.ts

@@ -1,5 +1,6 @@
 import { getOAuthProviders } from "@oh-my-pi/pi-ai";
 import { Container, getEditorKeybindings, Input, Spacer, Text, type TUI } from "@oh-my-pi/pi-tui";
+import { $ } from "bun";
 import { theme } from "../theme/theme";
 import { DynamicBorder } from "./dynamic-border";
 
@@ -83,9 +84,21 @@ export class LoginDialogComponent extends Container {
 			this.contentContainer.addChild(new Text(theme.fg("warning", instructions), 1, 0));
 		}
 
-		// Try to open browser using Bun.spawn
-		const openCmd = process.platform === "darwin" ? "open" : process.platform === "win32" ? "start" : "xdg-open";
-		Bun.spawn([openCmd, url], { stdout: "ignore", stderr: "ignore" });
+		// Try to open browser using $
+		const openArgs =
+			process.platform === "darwin"
+				? ["open", url]
+				: process.platform === "win32"
+					? ["cmd", "/c", "start", "", url]
+					: ["xdg-open", url];
+		const [openCmd, ...openRest] = openArgs;
+		void (async () => {
+			try {
+				await $`${openCmd} ${openRest}`.quiet().nothrow();
+			} catch {
+				// Best-effort: browser opening is non-critical
+			}
+		})();
 
 		this.tui.requestRender();
 	}
@@ -100,10 +113,10 @@ export class LoginDialogComponent extends Container {
 		this.contentContainer.addChild(new Text(theme.fg("dim", "(Escape to cancel)"), 1, 0));
 		this.tui.requestRender();
 
-		return new Promise((resolve, reject) => {
-			this.inputResolver = resolve;
-			this.inputRejecter = reject;
-		});
+		const { promise, resolve, reject } = Promise.withResolvers<string>();
+		this.inputResolver = resolve;
+		this.inputRejecter = reject;
+		return promise;
 	}
 
 	/**
@@ -122,10 +135,10 @@ export class LoginDialogComponent extends Container {
 		this.input.setValue("");
 		this.tui.requestRender();
 
-		return new Promise((resolve, reject) => {
-			this.inputResolver = resolve;
-			this.inputRejecter = reject;
-		});
+		const { promise, resolve, reject } = Promise.withResolvers<string>();
+		this.inputResolver = resolve;
+		this.inputRejecter = reject;
+		return promise;
 	}
 
 	/**

package/src/modes/interactive/components/settings-defs.ts

@@ -321,6 +321,15 @@ export const SETTINGS_DEFS: SettingDef[] = [
 		get: (sm) => sm.getEditPatchMode(),
 		set: (sm, v) => sm.setEditPatchMode(v),
 	},
+	{
+		id: "editStreamingAbort",
+		tab: "tools",
+		type: "boolean",
+		label: "Edit streaming abort",
+		description: "Abort streaming edit tool calls when patch preview fails",
+		get: (sm) => sm.getEditStreamingAbort(),
+		set: (sm, v) => sm.setEditStreamingAbort(v),
+	},
 	{
 		id: "readLineNumbers",
 		tab: "tools",

package/src/modes/interactive/components/status-line.ts

@@ -1,5 +1,6 @@
 import type { AssistantMessage } from "@oh-my-pi/pi-ai";
 import { type Component, truncateToWidth, visibleWidth } from "@oh-my-pi/pi-tui";
+import { $ } from "bun";
 import { type FSWatcher, watch } from "fs";
 import { dirname, join } from "path";
 import type { AgentSession } from "../../../core/agent-session";
@@ -158,51 +159,51 @@ export class StatusLineComponent implements Component {
 			return this.cachedGitStatus;
 		}
 
-		try {
-			const result = Bun.spawnSync(["git", "status", "--porcelain"], {
-				stdout: "pipe",
-				stderr: "pipe",
-			});
+		// Fire async fetch, return cached value
+		(async () => {
+			try {
+				const result = await $`git status --porcelain`.quiet().nothrow();
 
-			if (!result.success) {
-				this.cachedGitStatus = null;
-				this.gitStatusLastFetch = now;
-				return null;
-			}
+				if (result.exitCode !== 0) {
+					this.cachedGitStatus = null;
+					this.gitStatusLastFetch = now;
+					return;
+				}
 
-			const output = result.stdout.toString("utf8");
+				const output = result.stdout.toString();
 
-			let staged = 0;
-			let unstaged = 0;
-			let untracked = 0;
+				let staged = 0;
+				let unstaged = 0;
+				let untracked = 0;
 
-			for (const line of output.split("\n")) {
-				if (!line) continue;
-				const x = line[0];
-				const y = line[1];
+				for (const line of output.split("\n")) {
+					if (!line) continue;
+					const x = line[0];
+					const y = line[1];
 
-				if (x === "?" && y === "?") {
-					untracked++;
-					continue;
-				}
+					if (x === "?" && y === "?") {
+						untracked++;
+						continue;
+					}
 
-				if (x && x !== " " && x !== "?") {
-					staged++;
-				}
+					if (x && x !== " " && x !== "?") {
+						staged++;
+					}
 
-				if (y && y !== " ") {
-					unstaged++;
+					if (y && y !== " ") {
+						unstaged++;
+					}
 				}
+
+				this.cachedGitStatus = { staged, unstaged, untracked };
+				this.gitStatusLastFetch = now;
+			} catch {
+				this.cachedGitStatus = null;
+				this.gitStatusLastFetch = now;
 			}
+		})();
 
-			this.cachedGitStatus = { staged, unstaged, untracked };
-			this.gitStatusLastFetch = now;
-			return this.cachedGitStatus;
-		} catch {
-			this.cachedGitStatus = null;
-			this.gitStatusLastFetch = now;
-			return null;
-		}
+		return this.cachedGitStatus;
 	}
 
 	private buildSegmentContext(width: number): SegmentContext {

package/src/modes/interactive/components/todo-display.ts

@@ -1,6 +1,6 @@
 import * as path from "node:path";
 import { Text } from "@oh-my-pi/pi-tui";
-import { logger } from "../../../core/logger";
+import { logger } from "@oh-my-pi/pi-utils";
 import { getArtifactsDir } from "../../../core/tools/task/artifacts";
 import { theme } from "../theme/theme";
 import type { TodoItem } from "../types";

package/src/modes/interactive/components/tool-execution.ts

@@ -10,7 +10,7 @@ import {
 	Text,
 	type TUI,
 } from "@oh-my-pi/pi-tui";
-import { sanitizeText } from "../../../core/streaming-output";
+import { sanitizeText } from "@oh-my-pi/pi-utils";
 import { BASH_DEFAULT_PREVIEW_LINES } from "../../../core/tools/bash";
 import { computeEditDiff, computePatchDiff, type EditDiffError, type EditDiffResult } from "../../../core/tools/patch";
 import { PYTHON_DEFAULT_PREVIEW_LINES } from "../../../core/tools/python";

package/src/modes/interactive/controllers/command-controller.ts

@@ -1,7 +1,8 @@
-import * as fs from "node:fs";
+import { mkdir, rm } from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
 import { Loader, Markdown, Spacer, Text, visibleWidth } from "@oh-my-pi/pi-tui";
+import { $ } from "bun";
 import { nanoid } from "nanoid";
 import { getDebugLogPath } from "../../../config";
 import { loadCustomShare } from "../../../core/custom-share";
@@ -22,17 +23,20 @@ export class CommandController {
 	constructor(private readonly ctx: InteractiveModeContext) {}
 
 	openInBrowser(urlOrPath: string): void {
-		try {
-			const args =
-				process.platform === "darwin"
-					? ["open", urlOrPath]
-					: process.platform === "win32"
-						? ["cmd", "/c", "start", "", urlOrPath]
-						: ["xdg-open", urlOrPath];
-			Bun.spawn(args, { stdin: "ignore", stdout: "ignore", stderr: "ignore" });
-		} catch {
-			// Best-effort: browser opening is non-critical
-		}
+		const args =
+			process.platform === "darwin"
+				? ["open", urlOrPath]
+				: process.platform === "win32"
+					? ["cmd", "/c", "start", "", urlOrPath]
+					: ["xdg-open", urlOrPath];
+		const [cmd, ...cmdArgs] = args;
+		void (async () => {
+			try {
+				await $`${cmd} ${cmdArgs}`.quiet().nothrow();
+			} catch {
+				// Best-effort: browser opening is non-critical
+			}
+		})();
 	}
 
 	async handleExportCommand(text: string): Promise<void> {
@@ -69,6 +73,13 @@ export class CommandController {
 
 	async handleShareCommand(): Promise<void> {
 		const tmpFile = path.join(os.tmpdir(), `${nanoid()}.html`);
+		const cleanupTempFile = async () => {
+			try {
+				await rm(tmpFile, { force: true });
+			} catch {
+				// Ignore cleanup errors
+			}
+		};
 		try {
 			await this.ctx.session.exportToHtml(tmpFile);
 		} catch (error: unknown) {
@@ -85,21 +96,17 @@ export class CommandController {
 				this.ctx.ui.setFocus(loader);
 				this.ctx.ui.requestRender();
 
-				const restoreEditor = () => {
+				const restoreEditor = async () => {
 					loader.dispose();
 					this.ctx.editorContainer.clear();
 					this.ctx.editorContainer.addChild(this.ctx.editor);
 					this.ctx.ui.setFocus(this.ctx.editor);
-					try {
-						fs.unlinkSync(tmpFile);
-					} catch {
-						// Ignore cleanup errors
-					}
+					await cleanupTempFile();
 				};
 
 				try {
 					const result = await customShare.fn(tmpFile);
-					restoreEditor();
+					await restoreEditor();
 
 					if (typeof result === "string") {
 						this.ctx.showStatus(`Share URL: ${result}`);
@@ -115,34 +122,26 @@ export class CommandController {
 					}
 					return;
 				} catch (err) {
-					restoreEditor();
+					await restoreEditor();
 					this.ctx.showError(`Custom share failed: ${err instanceof Error ? err.message : String(err)}`);
 					return;
 				}
 			}
 		} catch (err) {
-			try {
-				fs.unlinkSync(tmpFile);
-			} catch {
-				// Ignore cleanup errors
-			}
+			await cleanupTempFile();
 			this.ctx.showError(err instanceof Error ? err.message : String(err));
 			return;
 		}
 
 		try {
-			const authResult = Bun.spawnSync(["gh", "auth", "status"]);
+			const authResult = await $`gh auth status`.quiet().nothrow();
 			if (authResult.exitCode !== 0) {
-				try {
-					fs.unlinkSync(tmpFile);
-				} catch {}
+				await cleanupTempFile();
 				this.ctx.showError("GitHub CLI is not logged in. Run 'gh auth login' first.");
 				return;
 			}
 		} catch {
-			try {
-				fs.unlinkSync(tmpFile);
-			} catch {}
+			await cleanupTempFile();
 			this.ctx.showError("GitHub CLI (gh) is not installed. Install it from https://cli.github.com/");
 			return;
 		}
@@ -153,71 +152,33 @@ export class CommandController {
 		this.ctx.ui.setFocus(loader);
 		this.ctx.ui.requestRender();
 
-		const restoreEditor = () => {
+		const restoreEditor = async () => {
 			loader.dispose();
 			this.ctx.editorContainer.clear();
 			this.ctx.editorContainer.addChild(this.ctx.editor);
 			this.ctx.ui.setFocus(this.ctx.editor);
-			try {
-				fs.unlinkSync(tmpFile);
-			} catch {
-				// Ignore cleanup errors
-			}
+			await cleanupTempFile();
 		};
 
-		let proc: ReturnType<typeof Bun.spawn> | null = null;
-
 		loader.onAbort = () => {
-			proc?.kill();
-			restoreEditor();
+			void restoreEditor();
 			this.ctx.showStatus("Share cancelled");
 		};
 
 		try {
-			proc = Bun.spawn(["gh", "gist", "create", "--public=false", tmpFile], {
-				stdout: "pipe",
-				stderr: "pipe",
-			});
-
-			const readStream = async (stream: ReadableStream<Uint8Array> | null): Promise<string> => {
-				if (!stream) return "";
-				const reader = stream.getReader();
-				const decoder = new TextDecoder();
-				let output = "";
-				try {
-					while (true) {
-						const { done, value } = await reader.read();
-						if (done) break;
-						output += decoder.decode(value, { stream: true });
-					}
-				} catch {
-					// Ignore read errors
-				} finally {
-					output += decoder.decode();
-					reader.releaseLock();
-				}
-				return output;
-			};
-
-			const [stdout, stderr, code] = await Promise.all([
-				readStream(proc.stdout as ReadableStream<Uint8Array> | null),
-				readStream(proc.stderr as ReadableStream<Uint8Array> | null),
-				proc.exited.catch(() => 1),
-			]);
-			const result = { stdout, stderr, code };
-
+			const result = await $`gh gist create --public=false ${tmpFile}`.quiet().nothrow();
 			if (loader.signal.aborted) return;
 
-			restoreEditor();
+			await restoreEditor();
 
-			if (result.code !== 0) {
-				const errorMsg = result.stderr?.trim() || "Unknown error";
+			if (result.exitCode !== 0) {
+				const errorMsg = result.stderr.toString("utf-8").trim() || "Unknown error";
 				this.ctx.showError(`Failed to create gist: ${errorMsg}`);
 				return;
 			}
 
-			const gistUrl = result.stdout?.trim();
-			const gistId = gistUrl?.split("/").pop();
+			const gistUrl = result.stdout.toString("utf-8").trim();
+			const gistId = gistUrl.split("/").pop();
 			if (!gistId) {
 				this.ctx.showError("Failed to parse gist ID from gh output");
 				return;
@@ -228,7 +189,7 @@ export class CommandController {
 			this.openInBrowser(previewUrl);
 		} catch (error: unknown) {
 			if (!loader.signal.aborted) {
-				restoreEditor();
+				await restoreEditor();
 				this.ctx.showError(`Failed to create gist: ${error instanceof Error ? error.message : "Unknown error"}`);
 			}
 		}
@@ -420,7 +381,7 @@ export class CommandController {
 		this.ctx.ui.requestRender();
 	}
 
-	handleDebugCommand(): void {
+	async handleDebugCommand(): Promise<void> {
 		const width = this.ctx.ui.terminal.columns;
 		const allLines = this.ctx.ui.render(width);
 
@@ -442,8 +403,13 @@ export class CommandController {
 			"",
 		].join("\n");
 
-		fs.mkdirSync(path.dirname(debugLogPath), { recursive: true });
-		fs.writeFileSync(debugLogPath, debugData);
+		try {
+			await mkdir(path.dirname(debugLogPath), { recursive: true });
+			await Bun.write(debugLogPath, debugData);
+		} catch (error) {
+			this.ctx.showError(`Failed to write debug log: ${error instanceof Error ? error.message : String(error)}`);
+			return;
+		}
 
 		this.ctx.chatContainer.addChild(new Spacer(1));
 		this.ctx.chatContainer.addChild(
@@ -519,7 +485,7 @@ export class CommandController {
 
 	async handleSkillCommand(skillPath: string, args: string): Promise<void> {
 		try {
-			const content = fs.readFileSync(skillPath, "utf-8");
+			const content = await Bun.file(skillPath).text();
 			const body = content.replace(/^---\n[\s\S]*?\n---\n/, "").trim();
 			const metaLines = [`Skill: ${skillPath}`];
 			if (args) {