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

package/src/task/worktree.ts

@@ -3,7 +3,7 @@ import * as fs from "node:fs/promises";
 import * as os from "node:os";
 import * as path from "node:path";
 import { projfsOverlayStart, projfsOverlayStop } from "@oh-my-pi/pi-natives";
-import { getWorktreeDir, isEnoent, logger, Snowflake } from "@oh-my-pi/pi-utils";
+import { $which, getWorktreeDir, isEnoent, logger, Snowflake } from "@oh-my-pi/pi-utils";
 import { $ } from "bun";
 import * as git from "../utils/git";
 
@@ -348,7 +348,7 @@ export async function ensureFuseOverlay(baseCwd: string, id: string): Promise<st
 	const mergedDir = path.join(baseDir, "merged");
 
 	// Clean up any stale mount at this path (linux only)
-	const fusermount = Bun.which("fusermount3") ?? Bun.which("fusermount");
+	const fusermount = $which("fusermount3") ?? $which("fusermount");
 	if (fusermount) {
 		await $`${fusermount} -u ${mergedDir}`.quiet().nothrow();
 	}
@@ -358,7 +358,7 @@ export async function ensureFuseOverlay(baseCwd: string, id: string): Promise<st
 	await fs.mkdir(workDir, { recursive: true });
 	await fs.mkdir(mergedDir, { recursive: true });
 
-	const binary = Bun.which("fuse-overlayfs");
+	const binary = $which("fuse-overlayfs");
 	if (!binary) {
 		await fs.rm(baseDir, { recursive: true, force: true });
 		throw new Error(
@@ -380,7 +380,7 @@ export async function ensureFuseOverlay(baseCwd: string, id: string): Promise<st
 
 export async function cleanupFuseOverlay(mergedDir: string): Promise<void> {
 	try {
-		const fusermount = Bun.which("fusermount3") ?? Bun.which("fusermount");
+		const fusermount = $which("fusermount3") ?? $which("fusermount");
 		if (fusermount) {
 			await $`${fusermount} -u ${mergedDir}`.quiet().nothrow();
 		}

package/src/tools/ask.ts

@@ -17,9 +17,8 @@
 
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { type Component, Container, Markdown, renderInlineMarkdown, TERMINAL, Text } from "@oh-my-pi/pi-tui";
-import { untilAborted } from "@oh-my-pi/pi-utils";
+import { prompt, untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import { getMarkdownTheme, type Theme, theme } from "../modes/theme/theme";
 import askDescription from "../prompts/tools/ask.md" with { type: "text" };
@@ -385,7 +384,7 @@ export class AskTool implements AgentTool<typeof askSchema, AskToolDetails> {
 	readonly strict = true;
 
 	constructor(private readonly session: ToolSession) {
-		this.description = renderPromptTemplate(askDescription);
+		this.description = prompt.render(askDescription);
 	}
 
 	static createIf(session: ToolSession): AskTool | null {

package/src/tools/ast-edit.ts

@@ -3,12 +3,11 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import { type AstReplaceChange, astEdit } from "@oh-my-pi/pi-natives";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
-import { untilAborted } from "@oh-my-pi/pi-utils";
+import { prompt, untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import { renderPromptTemplate } from "../config/prompt-templates";
+import { computeLineHash } from "../edit/line-hash";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
-import { computeLineHash } from "../patch/hashline";
 import astEditDescription from "../prompts/tools/ast-edit.md" with { type: "text" };
 import { Ellipsis, Hasher, type RenderCache, renderStatusLine, renderTreeList, truncateToWidth } from "../tui";
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
@@ -31,6 +30,7 @@ import {
 	PARSE_ERRORS_LIMIT,
 	PREVIEW_LIMITS,
 } from "./render-utils";
+import { queueResolveHandler } from "./resolve";
 import { ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
 
@@ -71,7 +71,7 @@ export class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolD
 	readonly strict = true;
 	readonly deferrable = true;
 	constructor(private readonly session: ToolSession) {
-		this.description = renderPromptTemplate(astEditDescription);
+		this.description = prompt.render(astEditDescription);
 	}
 
 	async execute(
@@ -201,7 +201,7 @@ export class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolD
 				filesSearched: result.filesSearched,
 				applied: result.applied,
 				limitReached: result.limitReached,
-				parseErrors: dedupedParseErrors,
+				...(dedupedParseErrors.length > 0 ? { parseErrors: dedupedParseErrors } : {}),
 				scopePath,
 				files: fileList,
 				fileReplacements: [],
@@ -289,7 +289,7 @@ export class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolD
 			if (!result.applied && result.totalReplacements > 0) {
 				const previewReplacementPlural = result.totalReplacements !== 1 ? "s" : "";
 				const previewFilePlural = result.filesTouched !== 1 ? "s" : "";
-				this.session.pendingActionStore?.push({
+				queueResolveHandler(this.session, {
 					label: `AST Edit: ${result.totalReplacements} replacement${previewReplacementPlural} in ${result.filesTouched} file${previewFilePlural}`,
 					sourceToolName: this.name,
 					apply: async (_reason: string) => {
@@ -311,7 +311,7 @@ export class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolD
 							filesSearched: applyResult.filesSearched,
 							applied: applyResult.applied,
 							limitReached: applyResult.limitReached,
-							parseErrors: dedupedApplyParseErrors,
+							...(dedupedApplyParseErrors.length > 0 ? { parseErrors: dedupedApplyParseErrors } : {}),
 							scopePath,
 							files: fileList,
 							fileReplacements,

package/src/tools/ast-grep.ts

@@ -3,12 +3,11 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import { type AstFindMatch, astGrep } from "@oh-my-pi/pi-natives";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
-import { untilAborted } from "@oh-my-pi/pi-utils";
+import { prompt, untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import { renderPromptTemplate } from "../config/prompt-templates";
+import { computeLineHash } from "../edit/line-hash";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
-import { computeLineHash } from "../patch/hashline";
 import astGrepDescription from "../prompts/tools/ast-grep.md" with { type: "text" };
 import { Ellipsis, Hasher, type RenderCache, renderStatusLine, renderTreeList, truncateToWidth } from "../tui";
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
@@ -65,7 +64,7 @@ export class AstGrepTool implements AgentTool<typeof astGrepSchema, AstGrepToolD
 	readonly strict = true;
 
 	constructor(private readonly session: ToolSession) {
-		this.description = renderPromptTemplate(astGrepDescription);
+		this.description = prompt.render(astGrepDescription);
 	}
 
 	async execute(
@@ -188,7 +187,7 @@ export class AstGrepTool implements AgentTool<typeof astGrepSchema, AstGrepToolD
 				fileCount: result.filesWithMatches,
 				filesSearched: result.filesSearched,
 				limitReached: result.limitReached,
-				parseErrors: dedupedParseErrors,
+				...(dedupedParseErrors.length > 0 ? { parseErrors: dedupedParseErrors } : {}),
 				scopePath,
 				files: fileList,
 				fileMatches: [],
@@ -213,12 +212,13 @@ export class AstGrepTool implements AgentTool<typeof astGrepSchema, AstGrepToolD
 					const lineNumbers = matchLines.map((_, index) => match.startLine + index);
 					const lineWidth = Math.max(...lineNumbers.map(value => value.toString().length));
 					const formatLine = (lineNumber: number, line: string, isMatch: boolean): string => {
+						const separator = isMatch ? ":" : "-";
 						if (useHashLines) {
 							const ref = `${lineNumber}#${computeLineHash(lineNumber, line)}`;
-							return isMatch ? `>>${ref}:${line}` : `  ${ref}:${line}`;
+							return `${ref}${separator}${line}`;
 						}
 						const padded = lineNumber.toString().padStart(lineWidth, " ");
-						return isMatch ? `>>${padded}:${line}` : `  ${padded}:${line}`;
+						return `${padded}${separator}${line}`;
 					};
 					for (let index = 0; index < matchLines.length; index++) {
 						outputLines.push(formatLine(match.startLine + index, matchLines[index], index === 0));

package/src/tools/auto-generated-guard.ts

@@ -4,8 +4,9 @@
  * Prevents editing of files that appear to be automatically generated
  * by code generation tools (protoc, sqlc, buf, swagger, etc.).
  */
-import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import { isEnoent, peekFile } from "@oh-my-pi/pi-utils";
+import { LRUCache } from "lru-cache/raw";
 import { settings } from "../config/settings";
 import { ToolError } from "./tool-errors";
 
@@ -209,40 +210,19 @@ function isAutoGeneratedFileName(filePath: string): boolean {
 
 /**
  * Check if leading header comments contain auto-generated markers.
- * Returns the matched marker text if found, null otherwise.
+ * Returns the matched marker text if found, undefined otherwise.
  */
-function detectAutoGeneratedMarker(content: string, filePath: string): string | null {
+function detectAutoGeneratedMarker(content: string, filePath: string): string | undefined {
 	const commentStyles = getCommentStylesForPath(filePath);
 	const headerCommentText = extractLeadingHeaderCommentText(content, commentStyles);
-	if (!headerCommentText) return null;
+	if (!headerCommentText) return undefined;
 
 	for (const markerPattern of AUTO_GENERATED_HEADER_MARKERS) {
 		const match = markerPattern.exec(headerCommentText);
 		if (match?.[0]) return match[0];
 	}
 
-	return null;
-}
-
-/**
- * Read the first N bytes of a file as a UTF-8 string.
- * More efficient than reading the entire file.
- */
-async function readFilePrefix(filePath: string, bytes: number): Promise<string | null> {
-	const handle = await fs.open(filePath, "r").catch(() => null);
-	if (!handle) {
-		return null;
-	}
-
-	try {
-		const buffer = Buffer.allocUnsafe(bytes);
-		const { bytesRead } = await handle.read(buffer, 0, bytes, 0);
-		return buffer.toString("utf-8", 0, bytesRead);
-	} catch {
-		return null;
-	} finally {
-		await handle.close();
-	}
+	return undefined;
 }
 
 /**
@@ -259,6 +239,33 @@ function buildAutoGeneratedError(displayPath: string, detected: string): ToolErr
 	);
 }
 
+const decoder = new TextDecoder("utf-8");
+
+const autoGeneratedMap = new LRUCache<string, { marker: string | undefined }>({ max: 10 });
+
+async function getAutoGeneratedMarker(filePath: string): Promise<string | undefined> {
+	if (isAutoGeneratedFileName(filePath)) {
+		return filePath.split("/").pop() ?? "";
+	}
+
+	const cached = autoGeneratedMap.get(filePath);
+	if (cached) return cached.marker;
+
+	let marker: string | undefined;
+	try {
+		const content = await peekFile(filePath, CHECK_BYTE_COUNT, header => decoder.decode(header));
+		marker = detectAutoGeneratedMarker(content, filePath);
+	} catch (err) {
+		if (isEnoent(err)) {
+			return undefined;
+		}
+		throw err;
+	}
+
+	autoGeneratedMap.set(filePath, { marker });
+	return marker;
+}
+
 /**
  * Check if a file is auto-generated by examining its content.
  * Throws ToolError if the file appears to be auto-generated.
@@ -266,24 +273,12 @@ function buildAutoGeneratedError(displayPath: string, detected: string): ToolErr
  * @param absolutePath - Absolute path to the file
  * @param displayPath - Path to show in error messages (relative or as provided)
  */
-export async function checkAutoGeneratedFile(absolutePath: string, displayPath?: string): Promise<void> {
+export async function assertEditableFile(absolutePath: string, displayPath?: string) {
 	if (!settings.get("edit.blockAutoGenerated")) {
 		return;
 	}
-
 	const pathForDisplay = displayPath ?? absolutePath;
-
-	if (isAutoGeneratedFileName(absolutePath)) {
-		const fileName = absolutePath.split("/").pop() ?? "";
-		throw buildAutoGeneratedError(pathForDisplay, fileName);
-	}
-
-	const content = await readFilePrefix(absolutePath, CHECK_BYTE_COUNT);
-	if (content === null) {
-		return;
-	}
-
-	const marker = detectAutoGeneratedMarker(content, absolutePath);
+	const marker = await getAutoGeneratedMarker(absolutePath);
 	if (marker) {
 		throw buildAutoGeneratedError(pathForDisplay, marker);
 	}
@@ -297,7 +292,7 @@ export async function checkAutoGeneratedFile(absolutePath: string, displayPath?:
  * @param content - File content to check (can be full content or prefix)
  * @param displayPath - Path to show in error messages
  */
-export async function checkAutoGeneratedFileContent(content: string, displayPath: string): Promise<void> {
+export function assertEditableFileContent(content: string, displayPath: string): void {
 	if (!settings.get("edit.blockAutoGenerated")) {
 		return;
 	}

package/src/tools/await-tool.ts

@@ -1,6 +1,6 @@
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
+import { prompt } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import awaitDescription from "../prompts/tools/await.md" with { type: "text" };
 import type { ToolSession } from "./index";
 
@@ -36,7 +36,7 @@ export class AwaitTool implements AgentTool<typeof awaitSchema, AwaitToolDetails
 	readonly strict = true;
 
 	constructor(private readonly session: ToolSession) {
-		this.description = renderPromptTemplate(awaitDescription);
+		this.description = prompt.render(awaitDescription);
 	}
 
 	static createIf(session: ToolSession): AwaitTool | null {

package/src/tools/bash.ts

@@ -1,11 +1,9 @@
 import * as fs from "node:fs";
-import * as path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { ImageProtocol, TERMINAL, Text } from "@oh-my-pi/pi-tui";
-import { $env, getProjectDir, isEnoent } from "@oh-my-pi/pi-utils";
+import { $env, getProjectDir, isEnoent, prompt } from "@oh-my-pi/pi-utils";
 import { Type } from "@sinclair/typebox";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import { type BashResult, executeBash } from "../exec/bash-executor";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import { truncateToVisualLines } from "../modes/components/visual-truncate";
@@ -22,7 +20,7 @@ import { applyHeadTail } from "./bash-normalize";
 import { expandInternalUrls, type InternalUrlExpansionOptions } from "./bash-skill-urls";
 import { formatStyledTruncationWarning, type OutputMeta } from "./output-meta";
 import { resolveToCwd } from "./path-utils";
-import { replaceTabs } from "./render-utils";
+import { formatToolWorkingDirectory, replaceTabs } from "./render-utils";
 import { ToolAbortError, ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { clampTimeout } from "./tool-timeouts";
@@ -218,7 +216,7 @@ export class BashTool implements AgentTool<BashToolSchema, BashToolDetails> {
 	constructor(private readonly session: ToolSession) {
 		this.#asyncEnabled = this.session.settings.get("async.enabled");
 		this.parameters = this.#asyncEnabled ? bashSchemaWithAsync : bashSchemaBase;
-		this.description = renderPromptTemplate(bashDescription, {
+		this.description = prompt.render(bashDescription, {
 			asyncEnabled: this.#asyncEnabled,
 			hasAstGrep: this.session.settings.get("astGrep.enabled"),
 			hasAstEdit: this.session.settings.get("astEdit.enabled"),
@@ -481,26 +479,10 @@ interface BashRenderContext {
 }
 
 function formatBashCommand(args: BashRenderArgs): string {
-	const command = args.command || "…";
+	const command = replaceTabs(args.command || "…");
 	const prompt = "$";
 	const cwd = getProjectDir();
-	let displayWorkdir = args.cwd;
-
-	if (displayWorkdir) {
-		const resolvedCwd = path.resolve(cwd);
-		const resolvedWorkdir = path.resolve(displayWorkdir);
-		if (resolvedWorkdir === resolvedCwd) {
-			displayWorkdir = undefined;
-		} else {
-			const relativePath = path.relative(resolvedCwd, resolvedWorkdir);
-			const isWithinCwd =
-				relativePath && !relativePath.startsWith("..") && !relativePath.startsWith(`..${path.sep}`);
-			if (isWithinCwd) {
-				displayWorkdir = relativePath;
-			}
-		}
-	}
-
+	const displayWorkdir = formatToolWorkingDirectory(args.cwd, cwd);
 	const renderedCommand = [formatBashEnvAssignments(getBashEnvForDisplay(args)), command].filter(Boolean).join(" ");
 	return displayWorkdir ? `${prompt} cd ${displayWorkdir} && ${renderedCommand}` : `${prompt} ${renderedCommand}`;
 }

package/src/tools/browser.ts

@@ -4,7 +4,7 @@ import * as path from "node:path";
 import { Readability } from "@mozilla/readability";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { StringEnum } from "@oh-my-pi/pi-ai";
-import { getPuppeteerDir, logger, Snowflake, untilAborted } from "@oh-my-pi/pi-utils";
+import { $which, getPuppeteerDir, logger, prompt, Snowflake, untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { type HTMLElement, parseHTML } from "linkedom";
 import type {
@@ -16,7 +16,6 @@ import type {
 	default as Puppeteer,
 	SerializedAXNode,
 } from "puppeteer";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import browserDescription from "../prompts/tools/browser.md" with { type: "text" };
 import type { ToolSession } from "../sdk";
 import { resizeImage } from "../utils/image-resize";
@@ -88,8 +87,8 @@ function resolveSystemChromium(): string | undefined {
 		return undefined;
 	}
 	const candidates = [
-		Bun.which("chromium"),
-		Bun.which("chromium-browser"),
+		$which("chromium"),
+		$which("chromium-browser"),
 		path.join(os.homedir(), ".nix-profile/bin/chromium"),
 		"/run/current-system/sw/bin/chromium",
 	];
@@ -539,7 +538,7 @@ export class BrowserTool implements AgentTool<typeof browserSchema, BrowserToolD
 	readonly #patchedClients = new WeakSet<object>();
 
 	constructor(private readonly session: ToolSession) {
-		this.description = renderPromptTemplate(browserDescription, {});
+		this.description = prompt.render(browserDescription, {});
 	}
 
 	async #closeBrowser(): Promise<void> {

package/src/tools/calculator.ts

@@ -1,9 +1,8 @@
 import type { AgentTool, AgentToolResult } from "@oh-my-pi/pi-agent-core";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
-import { untilAborted } from "@oh-my-pi/pi-utils";
+import { prompt, untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import type { Theme } from "../modes/theme/theme";
 import calculatorDescription from "../prompts/tools/calculator.md" with { type: "text" };
@@ -402,7 +401,7 @@ export class CalculatorTool implements AgentTool<typeof calculatorSchema, Calcul
 	readonly strict = true;
 
 	constructor(_session: ToolSession) {
-		this.description = renderPromptTemplate(calculatorDescription);
+		this.description = prompt.render(calculatorDescription);
 	}
 
 	async execute(

package/src/tools/cancel-job.ts

@@ -1,6 +1,6 @@
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
+import { prompt } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import cancelJobDescription from "../prompts/tools/cancel-job.md" with { type: "text" };
 import type { ToolSession } from "./index";
 
@@ -23,7 +23,7 @@ export class CancelJobTool implements AgentTool<typeof cancelJobSchema, CancelJo
 	readonly strict = true;
 
 	constructor(private readonly session: ToolSession) {
-		this.description = renderPromptTemplate(cancelJobDescription);
+		this.description = prompt.render(cancelJobDescription);
 	}
 
 	static createIf(session: ToolSession): CancelJobTool | null {

package/src/tools/checkpoint.ts

@@ -1,6 +1,6 @@
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
+import { prompt } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import checkpointDescription from "../prompts/tools/checkpoint.md" with { type: "text" };
 import rewindDescription from "../prompts/tools/rewind.md" with { type: "text" };
 import type { ToolSession } from ".";
@@ -54,7 +54,7 @@ export class CheckpointTool implements AgentTool<typeof checkpointSchema, Checkp
 	readonly strict = true;
 
 	constructor(private readonly session: ToolSession) {
-		this.description = renderPromptTemplate(checkpointDescription);
+		this.description = prompt.render(checkpointDescription);
 	}
 
 	static createIf(session: ToolSession): CheckpointTool | null {
@@ -96,7 +96,7 @@ export class RewindTool implements AgentTool<typeof rewindSchema, RewindToolDeta
 	readonly strict = true;
 
 	constructor(private readonly session: ToolSession) {
-		this.description = renderPromptTemplate(rewindDescription);
+		this.description = prompt.render(rewindDescription);
 	}
 
 	static createIf(session: ToolSession): RewindTool | null {