@oh-my-pi/pi-coding-agent 8.12.2 → 8.12.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@oh-my-pi/pi-coding-agent",
-	"version": "8.12.2",
+	"version": "8.12.4",
 	"description": "Coding agent CLI with read, bash, edit, write tools and session management",
 	"type": "module",
 	"ompConfig": {
@@ -58,10 +58,6 @@
 			"types": "./src/internal-urls/*.ts",
 			"import": "./src/internal-urls/*.ts"
 		},
-		"./vendor/photon/*": {
-			"types": "./src/vendor/photon/*",
-			"import": "./src/vendor/photon/*"
-		},
 		"./*": {
 			"types": "./src/*.ts",
 			"import": "./src/*.ts"
@@ -83,11 +79,12 @@
 		"test": "bun test"
 	},
 	"dependencies": {
-		"@oh-my-pi/omp-stats": "8.12.2",
-		"@oh-my-pi/pi-agent-core": "8.12.2",
-		"@oh-my-pi/pi-ai": "8.12.2",
-		"@oh-my-pi/pi-tui": "8.12.2",
-		"@oh-my-pi/pi-utils": "8.12.2",
+		"@oh-my-pi/omp-stats": "8.12.4",
+		"@oh-my-pi/pi-agent-core": "8.12.4",
+		"@oh-my-pi/pi-ai": "8.12.4",
+		"@oh-my-pi/pi-natives": "8.12.4",
+		"@oh-my-pi/pi-tui": "8.12.4",
+		"@oh-my-pi/pi-utils": "8.12.4",
 		"@openai/agents": "^0.4.4",
 		"@sinclair/typebox": "^0.34.48",
 		"ajv": "^8.17.1",

package/src/config/settings-manager.ts

@@ -72,6 +72,13 @@ export interface NotificationSettings {
 	onComplete?: NotificationMethod; // default: "auto"
 }
 
+export interface AskSettings {
+	/** Timeout in seconds for ask tool selections (0 or null to disable, default: 30) */
+	timeout?: number | null;
+	/** Notification method when ask tool is waiting for input (default: "auto") */
+	notification?: NotificationMethod;
+}
+
 export interface ExaSettings {
 	enabled?: boolean; // default: true (master toggle for all Exa tools)
 	enableSearch?: boolean; // default: true (search, deep, code, crawl)
@@ -242,6 +249,7 @@ export interface Settings {
 	showHardwareCursor?: boolean; // Show terminal cursor while still positioning it for IME
 	normativeRewrite?: boolean; // default: false (rewrite tool call arguments to normalized format in session history)
 	readLineNumbers?: boolean; // default: false (prepend line numbers to read tool output by default)
+	ask?: AskSettings;
 }
 
 export const DEFAULT_BASH_INTERCEPTOR_RULES: BashInterceptorRule[] = [
@@ -307,6 +315,7 @@ const DEFAULT_SETTINGS: Settings = {
 	terminal: { showImages: true },
 	images: { autoResize: true },
 	notifications: { onComplete: "auto" },
+	ask: { timeout: 30, notification: "auto" },
 	exa: {
 		enabled: true,
 		enableSearch: true,
@@ -1117,6 +1126,33 @@ export class SettingsManager {
 		await this.save();
 	}
 
+	/** Get ask tool timeout in milliseconds (0 or null = disabled) */
+	getAskTimeout(): number | null {
+		const timeout = this.settings.ask?.timeout;
+		if (timeout === null || timeout === 0) return null;
+		return (timeout ?? 30) * 1000;
+	}
+
+	async setAskTimeout(seconds: number | null): Promise<void> {
+		if (!this.globalSettings.ask) {
+			this.globalSettings.ask = {};
+		}
+		this.globalSettings.ask.timeout = seconds;
+		await this.save();
+	}
+
+	getAskNotification(): NotificationMethod {
+		return this.settings.ask?.notification ?? "auto";
+	}
+
+	async setAskNotification(method: NotificationMethod): Promise<void> {
+		if (!this.globalSettings.ask) {
+			this.globalSettings.ask = {};
+		}
+		this.globalSettings.ask.notification = method;
+		await this.save();
+	}
+
 	getImageAutoResize(): boolean {
 		return this.settings.images?.autoResize ?? true;
 	}

package/src/config.ts

@@ -93,11 +93,6 @@ export function getToolsDir(): string {
 	return path.join(getAgentDir(), "tools");
 }
 
-/** Get path to managed binaries directory (fd, rg) */
-export function getBinDir(): string {
-	return path.join(getAgentDir(), "bin");
-}
-
 /** Get path to slash commands directory */
 export function getCommandsDir(): string {
 	return path.join(getAgentDir(), "commands");

package/src/exec/bash-executor.ts

@@ -3,7 +3,7 @@
  *
  * Provides unified bash execution for AgentSession.executeBash() and direct calls.
  */
-import { cspawn, Exception, ptree } from "@oh-my-pi/pi-utils";
+import { Exception, ptree } from "@oh-my-pi/pi-utils";
 import { OutputSink } from "../session/streaming-output";
 import { getShellConfig } from "../utils/shell";
 import { getOrCreateSnapshot, getSnapshotSourceCommand } from "../utils/shell-snapshot";
@@ -50,11 +50,12 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 		artifactId: options?.artifactId,
 	});
 
-	const child = cspawn([shell, ...args, finalCommand], {
+	using child = ptree.spawn([shell, ...args, finalCommand], {
 		cwd: options?.cwd,
 		env: finalEnv,
 		signal: options?.signal,
 		timeout: options?.timeout,
+		detached: true,
 	});
 
 	// Pump streams - errors during abort/timeout are expected
@@ -65,9 +66,8 @@ export async function executeBash(command: string, options?: BashExecutorOptions
 
 	// Wait for process exit
 	try {
-		await child.exited;
 		return {
-			exitCode: child.exitCode ?? 0,
+			exitCode: await child.exited,
 			cancelled: false,
 			...(await sink.dump()),
 		};

package/src/exec/exec.ts

@@ -35,22 +35,19 @@ export async function execCommand(
 	cwd: string,
 	options?: ExecOptions,
 ): Promise<ExecResult> {
-	const proc = ptree.cspawn([command, ...args], {
+	const result = await ptree.exec([command, ...args], {
 		cwd,
 		signal: options?.signal,
 		timeout: options?.timeout,
+		allowNonZero: true,
+		allowAbort: true,
+		stderr: "full",
 	});
-	// Read streams before awaiting exit to avoid data loss if streams close
-	const [stdoutText, stderrText] = await Promise.all([proc.stdout.text(), proc.stderr.text()]);
-	try {
-		await proc.exited;
-	} catch {
-		// ChildProcess rejects on non-zero exit; we handle it below
-	}
+
 	return {
-		stdout: stdoutText,
-		stderr: stderrText,
-		code: proc.exitCode ?? 0,
-		killed: proc.exitReason instanceof ptree.AbortError,
+		stdout: result.stdout,
+		stderr: result.stderr,
+		code: result.exitCode ?? 0,
+		killed: Boolean(result.exitError?.aborted),
 	};
 }

package/src/extensibility/plugins/doctor.ts

@@ -6,8 +6,6 @@ export async function runDoctorChecks(): Promise<DoctorCheck[]> {
 
 	// Check external tools
 	const tools = [
-		{ name: "fd", description: "File finder" },
-		{ name: "rg", description: "Ripgrep" },
 		{ name: "sd", description: "Find-replace" },
 		{ name: "sg", description: "AST-grep" },
 		{ name: "git", description: "Version control" },

package/src/ipy/kernel.ts

@@ -1,9 +1,9 @@
 import { createServer } from "node:net";
 import * as path from "node:path";
-import { logger } from "@oh-my-pi/pi-utils";
-import { $, type Subprocess } from "bun";
+import { logger, ptree } from "@oh-my-pi/pi-utils";
+import { $ } from "bun";
 import { nanoid } from "nanoid";
-import { getShellConfig, killProcessTree } from "../utils/shell";
+import { getShellConfig } from "../utils/shell";
 import { getOrCreateSnapshot } from "../utils/shell-snapshot";
 import { time } from "../utils/timings";
 import { htmlToBasicMarkdown } from "../web/scrapers/types";
@@ -452,7 +452,7 @@ export function serializeWebSocketMessage(msg: JupyterMessage): ArrayBuffer {
 export class PythonKernel {
 	readonly id: string;
 	readonly kernelId: string;
-	readonly gatewayProcess: Subprocess | null;
+	readonly gatewayProcess: ptree.ChildProcess | null;
 	readonly gatewayUrl: string;
 	readonly sessionId: string;
 	readonly username: string;
@@ -469,7 +469,7 @@ export class PythonKernel {
 	private constructor(
 		id: string,
 		kernelId: string,
-		gatewayProcess: Subprocess | null,
+		gatewayProcess: ptree.ChildProcess | null,
 		gatewayUrl: string,
 		sessionId: string,
 		username: string,
@@ -633,14 +633,14 @@ export class PythonKernel {
 			kernelEnv.PYTHONPATH = pythonPathParts;
 		}
 
-		let gatewayProcess: Subprocess | null = null;
+		let gatewayProcess: ptree.ChildProcess | null = null;
 		let gatewayUrl: string | null = null;
 		let lastError: string | null = null;
 
 		for (let attempt = 0; attempt < GATEWAY_STARTUP_ATTEMPTS; attempt += 1) {
 			const gatewayPort = await allocatePort();
 			const candidateUrl = `http://127.0.0.1:${gatewayPort}`;
-			const candidateProcess = Bun.spawn(
+			const candidateProcess = ptree.spawn(
 				[
 					runtime.pythonPath,
 					"-m",
@@ -653,10 +653,8 @@ export class PythonKernel {
 				],
 				{
 					cwd: options.cwd,
-					stdin: "ignore",
-					stdout: "pipe",
-					stderr: "pipe",
 					env: kernelEnv,
+					detached: true,
 				},
 			);
 
@@ -687,7 +685,7 @@ export class PythonKernel {
 
 			if (gatewayProcess && gatewayUrl) break;
 
-			await killProcessTree(candidateProcess.pid);
+			candidateProcess.kill();
 			lastError = exited ? "Kernel gateway process exited during startup" : "Kernel gateway failed to start";
 		}
 
@@ -702,7 +700,7 @@ export class PythonKernel {
 		});
 
 		if (!createResponse.ok) {
-			await killProcessTree(gatewayProcess.pid);
+			gatewayProcess.kill();
 			throw new Error(`Failed to create kernel: ${await createResponse.text()}`);
 		}
 
@@ -1118,7 +1116,7 @@ export class PythonKernel {
 			await releaseSharedGateway();
 		} else if (this.gatewayProcess) {
 			try {
-				await killProcessTree(this.gatewayProcess.pid);
+				this.gatewayProcess.kill();
 			} catch (err: unknown) {
 				logger.warn("Failed to terminate gateway process", {
 					error: err instanceof Error ? err.message : String(err),

package/src/migrations.ts

@@ -5,7 +5,7 @@ import * as fs from "node:fs";
 import * as path from "node:path";
 import { isEnoent, logger } from "@oh-my-pi/pi-utils";
 import chalk from "chalk";
-import { getAgentDbPath, getAgentDir, getBinDir } from "./config";
+import { getAgentDbPath, getAgentDir } from "./config";
 import { AgentStorage } from "./session/agent-storage";
 import type { AuthCredential } from "./session/auth-storage";
 
@@ -144,50 +144,6 @@ export async function migrateSessionsFromAgentRoot(): Promise<void> {
 	}
 }
 
-/**
- * Move fd/rg binaries from tools/ to bin/ if they exist.
- */
-async function migrateToolsToBin(): Promise<void> {
-	const agentDir = getAgentDir();
-	const toolsDir = path.join(agentDir, "tools");
-	const binDir = getBinDir();
-
-	if (!fs.existsSync(toolsDir)) return;
-
-	const binaries = ["fd", "rg", "fd.exe", "rg.exe"];
-	let movedAny = false;
-
-	for (const bin of binaries) {
-		const oldPath = path.join(toolsDir, bin);
-		const newPath = path.join(binDir, bin);
-		if (!fs.existsSync(oldPath)) continue;
-
-		if (!fs.existsSync(binDir)) {
-			await fs.promises.mkdir(binDir, { recursive: true });
-		}
-
-		if (!fs.existsSync(newPath)) {
-			try {
-				await fs.promises.rename(oldPath, newPath);
-				movedAny = true;
-			} catch (error) {
-				logger.warn("Failed to migrate binary", { from: oldPath, to: newPath, error: String(error) });
-			}
-		} else {
-			// Target exists, just delete the old one
-			try {
-				await fs.promises.rm(oldPath, { force: true });
-			} catch {
-				// Ignore
-			}
-		}
-	}
-
-	if (movedAny) {
-		console.log(chalk.green(`Migrated managed binaries tools/ → bin/`));
-	}
-}
-
 /**
  * Run all migrations. Called once on startup.
  *
@@ -201,7 +157,6 @@ export async function runMigrations(_cwd: string): Promise<{
 	// Then: run data migrations
 	const migratedAuthProviders = await migrateAuthToAgentDb();
 	await migrateSessionsFromAgentRoot();
-	await migrateToolsToBin();
 
 	return { migratedAuthProviders, deprecationWarnings: [] };
 }

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

@@ -189,6 +189,29 @@ export const SETTINGS_DEFS: SettingDef[] = [
 		get: sm => sm.getNotificationOnComplete(),
 		set: (sm, v) => sm.setNotificationOnComplete(v as NotificationMethod),
 	},
+	{
+		id: "askTimeout",
+		tab: "behavior",
+		type: "enum",
+		label: "Ask tool timeout",
+		description: "Auto-select recommended option after timeout (disabled in plan mode)",
+		values: ["off", "15", "30", "60", "120"],
+		get: sm => {
+			const timeout = sm.getAskTimeout();
+			return timeout === null ? "off" : String(timeout / 1000);
+		},
+		set: (sm, v) => sm.setAskTimeout(v === "off" ? null : Number.parseInt(v, 10)),
+	},
+	{
+		id: "askNotification",
+		tab: "behavior",
+		type: "enum",
+		label: "Ask notification",
+		description: "Notify when ask tool is waiting for input",
+		values: ["auto", "bell", "osc99", "osc9", "off"],
+		get: sm => sm.getAskNotification(),
+		set: (sm, v) => sm.setAskNotification(v as NotificationMethod),
+	},
 	{
 		id: "startupQuiet",
 		tab: "behavior",

package/src/modes/rpc/rpc-client.ts

@@ -112,7 +112,7 @@ export class RpcClient {
 			args.push(...this.options.args);
 		}
 
-		this.process = ptree.cspawn(["bun", cliPath, ...args], {
+		this.process = ptree.spawn(["bun", cliPath, ...args], {
 			cwd: this.options.cwd,
 			env: { ...process.env, ...this.options.env },
 			stdin: "pipe",
@@ -140,7 +140,7 @@ export class RpcClient {
 		await Bun.sleep(100);
 
 		try {
-			const exitCode = await Promise.race([this.process.exited, Bun.sleep(50).then(() => null)]);
+			const exitCode = await Promise.race([this.process.exited, Bun.sleep(500).then(() => null)]);
 			if (exitCode !== null) {
 				throw new Error(
 					`Agent process exited immediately with code ${exitCode}. Stderr: ${this.process.peekStderr()}`,
@@ -154,11 +154,11 @@ export class RpcClient {
 	/**
 	 * Stop the RPC agent process.
 	 */
-	async stop(): Promise<void> {
+	stop() {
 		if (!this.process) return;
 
 		this.lineReader?.cancel();
-		await this.process.killAndWait();
+		this.process.kill();
 
 		this.process = null;
 		this.lineReader = null;

package/src/session/compaction/compaction.ts

@@ -133,6 +133,14 @@ export function calculateContextTokens(usage: Usage): number {
 	return usage.totalTokens || usage.input + usage.output + usage.cacheRead + usage.cacheWrite;
 }
 
+export function calculatePromptTokens(usage: Usage): number {
+	const promptTokens = usage.input + usage.cacheRead + usage.cacheWrite;
+	if (promptTokens > 0) {
+		return promptTokens;
+	}
+	return calculateContextTokens(usage);
+}
+
 /**
  * Get usage from an assistant message if available.
  * Skips aborted and error messages as they don't have valid usage data.
@@ -237,6 +245,17 @@ export function estimateTokens(message: AgentMessage): number {
 	return 0;
 }
 
+function estimateEntriesTokens(entries: SessionEntry[], startIndex: number, endIndex: number): number {
+	let total = 0;
+	for (let i = startIndex; i < endIndex; i++) {
+		const msg = getMessageFromEntry(entries[i]);
+		if (msg) {
+			total += estimateTokens(msg);
+		}
+	}
+	return total;
+}
+
 /**
  * Find valid cut points: indices of user, assistant, custom, or bashExecution messages.
  * Never cut at tool results (they must follow their tool call).
@@ -616,8 +635,17 @@ export function prepareCompaction(
 
 	const lastUsage = getLastAssistantUsage(pathEntries);
 	const tokensBefore = lastUsage ? calculateContextTokens(lastUsage) : 0;
+	let keepRecentTokens = settings.keepRecentTokens;
+	if (lastUsage) {
+		const estimatedTokens = estimateEntriesTokens(pathEntries, boundaryStart, boundaryEnd);
+		const promptTokens = calculatePromptTokens(lastUsage);
+		const ratio = estimatedTokens > 0 ? promptTokens / estimatedTokens : 0;
+		if (Number.isFinite(ratio) && ratio > 1) {
+			keepRecentTokens = Math.max(1, Math.floor(keepRecentTokens / ratio));
+		}
+	}
 
-	const cutPoint = findCutPoint(pathEntries, boundaryStart, boundaryEnd, settings.keepRecentTokens);
+	const cutPoint = findCutPoint(pathEntries, boundaryStart, boundaryEnd, keepRecentTokens);
 
 	// Get UUID of first kept entry
 	const firstKeptEntry = pathEntries[cutPoint.firstKeptEntryIndex];
@@ -742,8 +770,8 @@ export async function compact(
 		]);
 		// Merge into single summary
 		summary = `${historyResult}\n\n---\n\n**Turn Context (split turn):**\n\n${turnPrefixResult}`;
-	} else {
-		// Just generate history summary
+	} else if (messagesToSummarize.length > 0) {
+		// Generate history summary from messages to summarize
 		summary = await generateSummary(
 			messagesToSummarize,
 			model,
@@ -754,6 +782,12 @@ export async function compact(
 			previousSummary,
 			summaryOptions,
 		);
+	} else if (previousSummary) {
+		// No new messages to summarize, preserve previous summary
+		summary = previousSummary;
+	} else {
+		// No messages and no previous summary
+		summary = "No prior history.";
 	}
 
 	const shortSummary = await generateShortSummary(

package/src/ssh/ssh-executor.ts

@@ -1,4 +1,4 @@
-import { cspawn, logger, ptree } from "@oh-my-pi/pi-utils";
+import { logger, ptree } from "@oh-my-pi/pi-utils";
 import { OutputSink } from "../session/streaming-output";
 import { buildRemoteCommand, ensureConnection, ensureHostInfo, type SSHConnectionTarget } from "./connection-manager";
 import { hasSshfs, mountRemote } from "./sshfs-mount";
@@ -76,7 +76,7 @@ export async function executeSSH(
 		}
 	}
 
-	const child = cspawn(["ssh", ...(await buildRemoteCommand(host, resolvedCommand))], {
+	using child = ptree.spawn(["ssh", ...(await buildRemoteCommand(host, resolvedCommand))], {
 		signal: options?.signal,
 		timeout: options?.timeout,
 	});
@@ -92,10 +92,8 @@ export async function executeSSH(
 	);
 
 	try {
-		await child.exited;
-		const exitCode = child.exitCode ?? 0;
 		return {
-			exitCode,
+			exitCode: await child.exited,
 			cancelled: false,
 			...(await sink.dump()),
 		};

package/src/system-prompt.ts

@@ -4,7 +4,8 @@
 import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
-import { globPaths } from "@oh-my-pi/pi-utils";
+import { find as wasmFind } from "@oh-my-pi/pi-natives";
+import { untilAborted } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import chalk from "chalk";
 import { contextFileCapability } from "./capability/context-file";
@@ -201,17 +202,21 @@ type ProjectTreeScan = {
 const GLOB_TIMEOUT_MS = 5000;
 
 /**
- * Scan project tree using fs.promises.glob with exclusion filters.
- * Returns null if glob fails.
+ * Scan project tree using ripgrep-wasm find with exclusion filters.
+ * Returns null if scan fails.
  */
 async function scanProjectTreeWithGlob(root: string): Promise<ProjectTreeScan | null> {
 	let entries: string[];
+	const timeoutSignal = AbortSignal.timeout(GLOB_TIMEOUT_MS);
 	try {
-		entries = await globPaths("**/*", {
-			cwd: root,
-			gitignore: true,
-			timeoutMs: GLOB_TIMEOUT_MS,
-		});
+		const result = await untilAborted(timeoutSignal, () =>
+			wasmFind({
+				pattern: "**/*",
+				path: root,
+				fileType: "file",
+			}),
+		);
+		entries = result.matches.map(match => match.path).filter(entry => entry.length > 0);
 	} catch {
 		return null;
 	}
@@ -222,7 +227,7 @@ async function scanProjectTreeWithGlob(root: string): Promise<ProjectTreeScan |
 	dirContents.set(root, new Map());
 
 	for (const entry of entries) {
-		const filePath = entry.trim();
+		const filePath = entry;
 		if (!filePath) continue;
 		const absolutePath = path.join(root, filePath);
 		// Check static ignores on path components