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

package/src/tools/exit-plan-mode.ts

@@ -1,8 +1,7 @@
 import * as fs from "node:fs/promises";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { isEnoent } from "@oh-my-pi/pi-utils";
+import { isEnoent, prompt } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import exitPlanModeDescription from "../prompts/tools/exit-plan-mode.md" with { type: "text" };
 import type { ToolSession } from ".";
 import { resolvePlanPath } from "./plan-mode-guard";
@@ -49,7 +48,7 @@ export class ExitPlanModeTool implements AgentTool<typeof exitPlanModeSchema, Ex
 	readonly concurrency = "exclusive";
 
 	constructor(private readonly session: ToolSession) {
-		this.description = renderPromptTemplate(exitPlanModeDescription);
+		this.description = prompt.render(exitPlanModeDescription);
 	}
 
 	async execute(

package/src/tools/fetch.ts

@@ -4,7 +4,7 @@ import type { AgentToolResult } from "@oh-my-pi/pi-agent-core";
 import type { ImageContent, TextContent } from "@oh-my-pi/pi-ai";
 import { htmlToMarkdown } from "@oh-my-pi/pi-natives";
 import { type Component, Text } from "@oh-my-pi/pi-tui";
-import { ptree, truncate } from "@oh-my-pi/pi-utils";
+import { $which, ptree, truncate } from "@oh-my-pi/pi-utils";
 import { parseHTML } from "linkedom";
 import type { Settings } from "../config/settings";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
@@ -23,7 +23,7 @@ import { convertWithMarkit, fetchBinary } from "../web/scrapers/utils";
 import { applyListLimit } from "./list-limit";
 import { formatStyledArtifactReference, type OutputMeta } from "./output-meta";
 import { formatExpandHint, getDomain } from "./render-utils";
-import { ToolAbortError } from "./tool-errors";
+import { ToolAbortError, ToolError } from "./tool-errors";
 import { toolResult } from "./tool-result";
 import { clampTimeout } from "./tool-timeouts";
 
@@ -94,7 +94,7 @@ const MAX_INLINE_IMAGE_OUTPUT_BYTES = 0.75 * 1024 * 1024;
  * Check if a command exists (cross-platform)
  */
 function hasCommand(cmd: string): boolean {
-	return Boolean(Bun.which(cmd));
+	return Boolean($which(cmd));
 }
 
 /**
@@ -137,6 +137,70 @@ export function isReadableUrlPath(value: string): boolean {
 	return /^https?:\/\//i.test(value) || /^www\./i.test(value);
 }
 
+const URL_LINE_RANGE_RE = /^L(\d+)(?:-L?(\d+))?$/i;
+
+export interface ParsedReadUrlTarget {
+	path: string;
+	raw: boolean;
+	offset?: number;
+	limit?: number;
+}
+
+export function parseReadUrlTarget(readPath: string, sel?: string): ParsedReadUrlTarget | null {
+	const embedded = sel ? undefined : tryExtractEmbeddedUrlSelector(readPath);
+	const urlPath = embedded?.path ?? readPath;
+	if (!isReadableUrlPath(urlPath)) {
+		return null;
+	}
+
+	const selector = sel ?? embedded?.sel;
+	const raw = selector === "raw";
+	const lineMatch = selector ? URL_LINE_RANGE_RE.exec(selector) : null;
+	if (lineMatch) {
+		const startLine = Number.parseInt(lineMatch[1]!, 10);
+		if (startLine < 1) {
+			throw new ToolError("L0 is invalid; lines are 1-indexed. Use sel=L1.");
+		}
+		const endLine = lineMatch[2] ? Number.parseInt(lineMatch[2], 10) : undefined;
+		if (endLine !== undefined && endLine < startLine) {
+			throw new ToolError(`Invalid range L${startLine}-L${endLine}: end must be >= start.`);
+		}
+		return {
+			path: urlPath,
+			raw: false,
+			offset: startLine,
+			limit: endLine !== undefined ? endLine - startLine + 1 : undefined,
+		};
+	}
+
+	return { path: urlPath, raw };
+}
+
+function tryExtractEmbeddedUrlSelector(readPath: string): { path: string; sel?: string } | null {
+	const lastColonIndex = readPath.lastIndexOf(":");
+	if (lastColonIndex <= 0) {
+		return null;
+	}
+
+	const candidateSelector = readPath.slice(lastColonIndex + 1);
+	const isEmbeddedSelector = candidateSelector === "raw" || URL_LINE_RANGE_RE.test(candidateSelector);
+	if (!isEmbeddedSelector) {
+		return null;
+	}
+
+	const basePath = readPath.slice(0, lastColonIndex);
+	if (!isReadableUrlPath(basePath)) {
+		return null;
+	}
+
+	try {
+		new URL(basePath.startsWith("http://") || basePath.startsWith("https://") ? basePath : `https://${basePath}`);
+		return { path: basePath, sel: candidateSelector };
+	} catch {
+		return null;
+	}
+}
+
 /**
  * Normalize MIME type (lowercase, strip charset/params)
  */

package/src/tools/find.ts

@@ -4,10 +4,9 @@ import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallb
 import { FileType, type GlobMatch, glob } from "@oh-my-pi/pi-natives";
 import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
-import { isEnoent, untilAborted } from "@oh-my-pi/pi-utils";
+import { isEnoent, prompt, untilAborted } from "@oh-my-pi/pi-utils";
 import type { Static } from "@sinclair/typebox";
 import { 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 findDescription from "../prompts/tools/find.md" with { type: "text" };
@@ -86,7 +85,7 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 		options?: FindToolOptions,
 	) {
 		this.#customOps = options?.operations;
-		this.description = renderPromptTemplate(findDescription);
+		this.description = prompt.render(findDescription);
 	}
 
 	async execute(
@@ -234,8 +233,8 @@ export class FindTool implements AgentTool<typeof findSchema, FindToolDetails> {
 				});
 			};
 			const onMatch = onUpdate
-				? (match: GlobMatch | null) => {
-						if (signal?.aborted || !match) return;
+				? (err: Error | null, match: GlobMatch | null) => {
+						if (err || signal?.aborted || !match) return;
 						let relativePath = match.path;
 						if (!relativePath) return;
 						if (match.fileType === FileType.Dir && !relativePath.endsWith("/")) {

package/src/tools/fs-cache-invalidation.ts

@@ -1,10 +1,12 @@
 import { invalidateFsScanCache } from "@oh-my-pi/pi-natives";
+import { invalidateChunkCache } from "../edit/modes/chunk";
 
 /**
  * Invalidate shared filesystem scan caches after a content write/update.
  */
 export function invalidateFsScanAfterWrite(path: string): void {
 	invalidateFsScanCache(path);
+	invalidateChunkCache(path);
 }
 
 /**
@@ -12,6 +14,7 @@ export function invalidateFsScanAfterWrite(path: string): void {
  */
 export function invalidateFsScanAfterDelete(path: string): void {
 	invalidateFsScanCache(path);
+	invalidateChunkCache(path);
 }
 
 /**
@@ -22,7 +25,9 @@ export function invalidateFsScanAfterDelete(path: string): void {
  */
 export function invalidateFsScanAfterRename(oldPath: string, newPath: string): void {
 	invalidateFsScanCache(oldPath);
+	invalidateChunkCache(oldPath);
 	if (newPath !== oldPath) {
 		invalidateFsScanCache(newPath);
+		invalidateChunkCache(newPath);
 	}
 }

package/src/tools/gemini-image.ts

@@ -1,13 +1,20 @@
 import * as os from "node:os";
 import * as path from "node:path";
 import { getAntigravityHeaders, getEnvApiKey, StringEnum } from "@oh-my-pi/pi-ai";
-import { $env, isEnoent, ptree, readSseJson, Snowflake, untilAborted } from "@oh-my-pi/pi-utils";
+import {
+	$env,
+	isEnoent,
+	parseImageMetadata,
+	prompt,
+	ptree,
+	readSseJson,
+	Snowflake,
+	untilAborted,
+} from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import type { ModelRegistry } from "../config/model-registry";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import type { CustomTool } from "../extensibility/custom-tools/types";
 import geminiImageDescription from "../prompts/tools/gemini-image.md" with { type: "text" };
-import { detectSupportedImageMimeTypeFromFile } from "../utils/mime";
 import { resolveReadPath } from "./path-utils";
 
 const DEFAULT_MODEL = "gemini-3-pro-image-preview";
@@ -417,7 +424,8 @@ async function loadImageFromPath(imagePath: string, cwd: string): Promise<Inline
 			throw new Error(`Image file too large: ${imagePath}`);
 		}
 
-		const mimeType = await detectSupportedImageMimeTypeFromFile(resolved);
+		const metadata = parseImageMetadata(buffer);
+		const mimeType = metadata?.mimeType;
 		if (!mimeType) {
 			throw new Error(`Unsupported image type: ${imagePath}`);
 		}
@@ -599,7 +607,7 @@ async function parseAntigravitySseForImage(response: Response, signal?: AbortSig
 export const geminiImageTool: CustomTool<typeof geminiImageSchema, GeminiImageToolDetails> = {
 	name: "generate_image",
 	label: "GenerateImage",
-	description: renderPromptTemplate(geminiImageDescription),
+	description: prompt.render(geminiImageDescription),
 	parameters: geminiImageSchema,
 	async execute(_toolCallId, params, _onUpdate, ctx, signal) {
 		return untilAborted(signal, async () => {

package/src/tools/gh.ts

@@ -1,9 +1,8 @@
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
-import { abortableSleep, isEnoent, untilAborted } from "@oh-my-pi/pi-utils";
+import { abortableSleep, isEnoent, prompt, untilAborted } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import ghIssueViewDescription from "../prompts/tools/gh-issue-view.md" with { type: "text" };
 import ghPrCheckoutDescription from "../prompts/tools/gh-pr-checkout.md" with { type: "text" };
 import ghPrDiffDescription from "../prompts/tools/gh-pr-diff.md" with { type: "text" };
@@ -1902,7 +1901,7 @@ function buildTextResult(
 export class GhRepoViewTool implements AgentTool<typeof ghRepoViewSchema, GhToolDetails> {
 	readonly name = "gh_repo_view";
 	readonly label = "GitHub Repo";
-	readonly description = renderPromptTemplate(ghRepoViewDescription);
+	readonly description = prompt.render(ghRepoViewDescription);
 	readonly parameters = ghRepoViewSchema;
 	readonly strict = true;
 
@@ -1943,7 +1942,7 @@ export class GhRepoViewTool implements AgentTool<typeof ghRepoViewSchema, GhTool
 export class GhIssueViewTool implements AgentTool<typeof ghIssueViewSchema, GhToolDetails> {
 	readonly name = "gh_issue_view";
 	readonly label = "GitHub Issue";
-	readonly description = renderPromptTemplate(ghIssueViewDescription);
+	readonly description = prompt.render(ghIssueViewDescription);
 	readonly parameters = ghIssueViewSchema;
 	readonly strict = true;
 
@@ -1980,7 +1979,7 @@ export class GhIssueViewTool implements AgentTool<typeof ghIssueViewSchema, GhTo
 export class GhPrViewTool implements AgentTool<typeof ghPrViewSchema, GhToolDetails> {
 	readonly name = "gh_pr_view";
 	readonly label = "GitHub PR";
-	readonly description = renderPromptTemplate(ghPrViewDescription);
+	readonly description = prompt.render(ghPrViewDescription);
 	readonly parameters = ghPrViewSchema;
 	readonly strict = true;
 
@@ -2024,7 +2023,7 @@ export class GhPrViewTool implements AgentTool<typeof ghPrViewSchema, GhToolDeta
 export class GhPrDiffTool implements AgentTool<typeof ghPrDiffSchema, GhToolDetails> {
 	readonly name = "gh_pr_diff";
 	readonly label = "GitHub PR Diff";
-	readonly description = renderPromptTemplate(ghPrDiffDescription);
+	readonly description = prompt.render(ghPrDiffDescription);
 	readonly parameters = ghPrDiffSchema;
 	readonly strict = true;
 
@@ -2073,7 +2072,7 @@ export class GhPrDiffTool implements AgentTool<typeof ghPrDiffSchema, GhToolDeta
 export class GhPrCheckoutTool implements AgentTool<typeof ghPrCheckoutSchema, GhToolDetails> {
 	readonly name = "gh_pr_checkout";
 	readonly label = "GitHub PR Checkout";
-	readonly description = renderPromptTemplate(ghPrCheckoutDescription);
+	readonly description = prompt.render(ghPrCheckoutDescription);
 	readonly parameters = ghPrCheckoutSchema;
 	readonly strict = true;
 
@@ -2204,7 +2203,7 @@ export class GhPrCheckoutTool implements AgentTool<typeof ghPrCheckoutSchema, Gh
 export class GhPrPushTool implements AgentTool<typeof ghPrPushSchema, GhToolDetails> {
 	readonly name = "gh_pr_push";
 	readonly label = "GitHub PR Push";
-	readonly description = renderPromptTemplate(ghPrPushDescription);
+	readonly description = prompt.render(ghPrPushDescription);
 	readonly parameters = ghPrPushSchema;
 	readonly strict = true;
 
@@ -2265,7 +2264,7 @@ export class GhPrPushTool implements AgentTool<typeof ghPrPushSchema, GhToolDeta
 export class GhSearchIssuesTool implements AgentTool<typeof ghSearchIssuesSchema, GhToolDetails> {
 	readonly name = "gh_search_issues";
 	readonly label = "GitHub Issue Search";
-	readonly description = renderPromptTemplate(ghSearchIssuesDescription);
+	readonly description = prompt.render(ghSearchIssuesDescription);
 	readonly parameters = ghSearchIssuesSchema;
 	readonly strict = true;
 
@@ -2300,7 +2299,7 @@ export class GhSearchIssuesTool implements AgentTool<typeof ghSearchIssuesSchema
 export class GhSearchPrsTool implements AgentTool<typeof ghSearchPrsSchema, GhToolDetails> {
 	readonly name = "gh_search_prs";
 	readonly label = "GitHub PR Search";
-	readonly description = renderPromptTemplate(ghSearchPrsDescription);
+	readonly description = prompt.render(ghSearchPrsDescription);
 	readonly parameters = ghSearchPrsSchema;
 	readonly strict = true;
 
@@ -2335,7 +2334,7 @@ export class GhSearchPrsTool implements AgentTool<typeof ghSearchPrsSchema, GhTo
 export class GhRunWatchTool implements AgentTool<typeof ghRunWatchSchema, GhToolDetails> {
 	readonly name = "gh_run_watch";
 	readonly label = "GitHub Run Watch";
-	readonly description = renderPromptTemplate(ghRunWatchDescription);
+	readonly description = prompt.render(ghRunWatchDescription);
 	readonly parameters = ghRunWatchSchema;
 	readonly strict = true;
 

package/src/tools/grep.ts

@@ -1,18 +1,19 @@
 import * as path from "node:path";
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 
-import { type GrepMatch, type GrepResult, grep } from "@oh-my-pi/pi-natives";
+import { type GrepMatch, GrepOutputMode, type GrepResult, grep } 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 { formatChunkedGrepLine } from "../edit/modes/chunk";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
-import type { Theme } from "../modes/theme/theme";
-import { computeLineHash } from "../patch/hashline";
+import { getLanguageFromPath, type Theme } from "../modes/theme/theme";
 import grepDescription from "../prompts/tools/grep.md" with { type: "text" };
 import { DEFAULT_MAX_COLUMN, type TruncationResult, truncateHead } from "../session/streaming-output";
 import { Ellipsis, Hasher, type RenderCache, renderStatusLine, renderTreeList, truncateToWidth } from "../tui";
+import { resolveEditMode } from "../utils/edit-mode";
 import { resolveFileDisplayMode } from "../utils/file-display-mode";
 import type { ToolSession } from ".";
 import { formatFullOutputReference, type OutputMeta } from "./output-meta";
@@ -72,9 +73,10 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 
 	constructor(private readonly session: ToolSession) {
 		const displayMode = resolveFileDisplayMode(session);
-		this.description = renderPromptTemplate(grepDescription, {
+		this.description = prompt.render(grepDescription, {
 			IS_HASHLINE_MODE: displayMode.hashLines,
 			IS_LINE_NUMBER_MODE: !displayMode.hashLines && displayMode.lineNumbers,
+			IS_CHUNK_MODE: displayMode.chunked,
 		});
 	}
 
@@ -89,6 +91,7 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 
 		return untilAborted(signal, async () => {
 			const normalizedPattern = pattern.trim();
+			const chunkMode = resolveEditMode(this.session) === "chunk";
 			if (!normalizedPattern) {
 				throw new ToolError("Pattern must not be empty");
 			}
@@ -162,7 +165,7 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 				throw new ToolError(`Path not found: ${scopePath}`);
 			}
 
-			const effectiveOutputMode = "content";
+			const effectiveOutputMode = GrepOutputMode.Content;
 			const effectiveLimit = normalizedLimit ?? DEFAULT_MATCH_LIMIT;
 			const internalLimit = Math.min(effectiveLimit * 5, 2000);
 
@@ -270,6 +273,50 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 				}
 				matchesByFile.get(relativePath)!.push(match);
 			}
+			if (chunkMode) {
+				const annotatedLines = await Promise.all(
+					selectedMatches.map(match => {
+						const relativePath = match.path.startsWith("/") ? match.path.slice(1) : match.path;
+						const absoluteFilePath = isDirectory ? path.join(searchPath, relativePath) : searchPath;
+						const displayPath = formatPath(match.path);
+						fileMatchCounts.set(displayPath, (fileMatchCounts.get(displayPath) ?? 0) + 1);
+						return formatChunkedGrepLine({
+							filePath: absoluteFilePath,
+							lineNumber: match.lineNumber,
+							line: match.line,
+							cwd: this.session.cwd,
+							language: getLanguageFromPath(absoluteFilePath),
+						});
+					}),
+				);
+				const rawOutput = annotatedLines.join("\n");
+				const truncation = truncateHead(rawOutput, { maxLines: Number.MAX_SAFE_INTEGER });
+				const truncated = Boolean(matchLimitReached || result.limitReached || truncation.truncated);
+				const details: GrepToolDetails = {
+					scopePath,
+					matchCount: selectedMatches.length,
+					fileCount: fileList.length,
+					files: fileList,
+					fileMatches: fileList.map(path => ({
+						path,
+						count: fileMatchCounts.get(path) ?? 0,
+					})),
+					truncated,
+					matchLimitReached: matchLimitReached ? effectiveLimit : undefined,
+					resultLimitReached: result.limitReached ? internalLimit : undefined,
+				};
+				if (truncation.truncated) details.truncation = truncation;
+				const resultBuilder = toolResult(details)
+					.text(truncation.content)
+					.limits({
+						matchLimit: matchLimitReached ? effectiveLimit : undefined,
+						resultLimit: result.limitReached ? internalLimit : undefined,
+					});
+				if (truncation.truncated) {
+					resultBuilder.truncation(truncation, { direction: "head" });
+				}
+				return resultBuilder.done();
+			}
 			const renderMatchesForFile = (relativePath: string) => {
 				const fileMatches = matchesByFile.get(relativePath) ?? [];
 				for (const match of fileMatches) {
@@ -286,12 +333,13 @@ export class GrepTool implements AgentTool<typeof grepSchema, GrepToolDetails> {
 					}
 					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}`;
 					};
 					if (match.contextBefore) {
 						for (const ctx of match.contextBefore) {

package/src/tools/index.ts

@@ -1,17 +1,20 @@
 import type { AgentTool } from "@oh-my-pi/pi-agent-core";
+import type { ToolChoice } from "@oh-my-pi/pi-ai";
 import type { SearchDb } from "@oh-my-pi/pi-natives";
 import { $env, logger } from "@oh-my-pi/pi-utils";
 import type { AsyncJobManager } from "../async";
 import type { PromptTemplate } from "../config/prompt-templates";
 import type { Settings } from "../config/settings";
+import { EditTool } from "../edit";
 import type { Skill } from "../extensibility/skills";
 import type { InternalUrlRouter } from "../internal-urls";
 import { getPreludeDocs, warmPythonEnvironment } from "../ipy/executor";
 import { checkPythonKernelAvailability } from "../ipy/kernel";
 import { LspTool } from "../lsp";
 import type { DiscoverableMCPSearchIndex, DiscoverableMCPTool } from "../mcp/discoverable-tool-metadata";
-import { EditTool } from "../patch";
 import type { PlanModeState } from "../plan-mode/state";
+import type { CustomMessage } from "../session/messages";
+import type { ToolChoiceQueue } from "../session/tool-choice-queue";
 import { TaskTool } from "../task";
 import type { AgentOutputManager } from "../task/output-manager";
 import type { EventBus } from "../utils/event-bus";
@@ -22,9 +25,11 @@ import { AstGrepTool } from "./ast-grep";
 import { AwaitTool } from "./await-tool";
 import { BashTool } from "./bash";
 import { BrowserTool } from "./browser";
+
 import { CalculatorTool } from "./calculator";
 import { CancelJobTool } from "./cancel-job";
 import { type CheckpointState, CheckpointTool, RewindTool } from "./checkpoint";
+import { DebugTool } from "./debug";
 import { ExitPlanModeTool } from "./exit-plan-mode";
 import { FindTool } from "./find";
 import {
@@ -45,6 +50,7 @@ import { wrapToolWithMetaNotice } from "./output-meta";
 import { PythonTool } from "./python";
 import { ReadTool } from "./read";
 import { RenderMermaidTool } from "./render-mermaid";
+import { createReportToolIssueTool, isAutoQaEnabled } from "./report-tool-issue";
 import { ResolveTool } from "./resolve";
 import { reportFindingTool } from "./review";
 import { SearchToolBm25Tool } from "./search-tool-bm25";
@@ -55,10 +61,10 @@ import { WriteTool } from "./write";
 
 // Exa MCP tools (22 tools)
 
+export * from "../edit";
 export * from "../exa";
 export type * from "../exa/types";
 export * from "../lsp";
-export * from "../patch";
 export * from "../session/streaming-output";
 export * from "../task";
 export * from "../web/search";
@@ -71,6 +77,7 @@ export * from "./browser";
 export * from "./calculator";
 export * from "./cancel-job";
 export * from "./checkpoint";
+export * from "./debug";
 export * from "./exit-plan-mode";
 export * from "./find";
 export * from "./gemini-image";
@@ -78,10 +85,10 @@ export * from "./gh";
 export * from "./grep";
 export * from "./inspect-image";
 export * from "./notebook";
-export * from "./pending-action";
 export * from "./python";
 export * from "./read";
 export * from "./render-mermaid";
+export * from "./report-tool-issue";
 export * from "./resolve";
 export * from "./review";
 export * from "./search-tool-bm25";
@@ -175,12 +182,21 @@ export interface ToolSession {
 	getSelectedMCPToolNames?: () => string[];
 	/** Merge MCP tool selections into the active session tool set. */
 	activateDiscoveredMCPTools?: (toolNames: string[]) => Promise<string[]>;
-	/** Pending action store for preview/apply workflows */
-	pendingActionStore?: import("./pending-action").PendingActionStore;
+	/** The tool-choice queue used to force forthcoming tool invocations and carry invocation handlers. */
+	getToolChoiceQueue?(): ToolChoiceQueue;
+	/** Build a model-provider-specific ToolChoice that targets the named tool, or undefined if unsupported. */
+	buildToolChoice?(toolName: string): ToolChoice | undefined;
+	/** Steer a hidden custom message into the conversation (e.g. a preview reminder). */
+	steer?(message: { customType: string; content: string; details?: unknown }): void;
+	/** Peek the currently in-flight tool-choice queue directive's invocation handler. Used by the `resolve` tool to dispatch to the pending action. */
+	peekQueueInvoker?(): ((input: unknown) => Promise<unknown> | unknown) | undefined;
 	/** Get active checkpoint state if any. */
 	getCheckpointState?: () => CheckpointState | undefined;
 	/** Set or clear active checkpoint state. */
 	setCheckpointState?: (state: CheckpointState | null) => void;
+
+	/** Queue a hidden message to be injected at the next agent turn. */
+	queueDeferredMessage?(message: CustomMessage): void;
 }
 
 type ToolFactory = (session: ToolSession) => Tool | null | Promise<Tool | null>;
@@ -191,6 +207,7 @@ export const BUILTIN_TOOLS: Record<string, ToolFactory> = {
 	render_mermaid: s => new RenderMermaidTool(s),
 	ask: AskTool.createIf,
 	bash: s => new BashTool(s),
+	debug: DebugTool.createIf,
 	python: s => new PythonTool(s),
 	calc: s => new CalculatorTool(s),
 	ssh: loadSshTool,
@@ -225,6 +242,7 @@ export const BUILTIN_TOOLS: Record<string, ToolFactory> = {
 export const HIDDEN_TOOLS: Record<string, ToolFactory> = {
 	submit_result: s => new SubmitResultTool(s),
 	report_finding: () => reportFindingTool,
+	report_tool_issue: s => createReportToolIssueTool(s),
 	exit_plan_mode: s => new ExitPlanModeTool(s),
 	resolve: s => new ResolveTool(s),
 };
@@ -282,11 +300,7 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 	const isTestEnv = Bun.env.BUN_ENV === "test" || Bun.env.NODE_ENV === "test";
 	const skipPythonWarm = isTestEnv || $env.PI_PYTHON_SKIP_CHECK === "1";
 	if (shouldCheckPython) {
-		const availability = await logger.timeAsync(
-			"createTools:pythonCheck",
-			checkPythonKernelAvailability,
-			session.cwd,
-		);
+		const availability = await logger.time("createTools:pythonCheck", checkPythonKernelAvailability, session.cwd);
 		pythonAvailable = availability.ok;
 		if (!availability.ok) {
 			logger.warn("Python kernel unavailable, falling back to bash", {
@@ -296,12 +310,13 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 			const sessionFile = session.getSessionFile?.() ?? undefined;
 			const warmSessionId = sessionFile ? `session:${sessionFile}:cwd:${session.cwd}` : `cwd:${session.cwd}`;
 			try {
-				await logger.timeAsync(
+				await logger.time(
 					"createTools:warmPython",
 					warmPythonEnvironment,
 					session.cwd,
 					warmSessionId,
 					session.settings.get("python.sharedGateway"),
+					sessionFile,
 				);
 			} catch (err) {
 				logger.warn("Failed to warm Python environment", {
@@ -343,9 +358,10 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 	}
 	const allTools: Record<string, ToolFactory> = { ...BUILTIN_TOOLS, ...HIDDEN_TOOLS };
 	const isToolAllowed = (name: string) => {
-		if (name === "lsp") return enableLsp;
+		if (name === "lsp") return enableLsp && session.settings.get("lsp.enabled");
 		if (name === "bash") return allowBash;
 		if (name === "python") return allowPython;
+		if (name === "debug") return session.settings.get("debug.enabled");
 		if (name === "todo_write") return !includeSubmitResult && session.settings.get("todo.enabled");
 		if (name === "find") return session.settings.get("find.enabled");
 		if (name === "grep") return session.settings.get("grep.enabled");
@@ -357,7 +373,6 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 		if (name === "inspect_image") return session.settings.get("inspect_image.enabled");
 		if (name === "web_search") return session.settings.get("web_search.enabled");
 		if (name === "search_tool_bm25") return session.settings.get("mcp.discoveryMode");
-		if (name === "lsp") return session.settings.get("lsp.enabled");
 		if (name === "calc") return session.settings.get("calc.enabled");
 		if (name === "browser") return session.settings.get("browser.enabled");
 		if (name === "checkpoint" || name === "rewind") return session.settings.get("checkpoint.enabled");
@@ -384,21 +399,28 @@ export async function createTools(session: ToolSession, toolNames?: string[]): P
 
 	const baseResults = await Promise.all(
 		baseEntries.map(async ([name, factory]) => {
-			const tool = await logger.timeAsync(`createTools:${name}`, factory, session);
+			const tool = await logger.time(`createTools:${name}`, factory, session);
 			return tool ? wrapToolWithMetaNotice(tool) : null;
 		}),
 	);
 	const tools = baseResults.filter((r): r is Tool => r !== null);
 	const hasDeferrableTools = tools.some(tool => tool.deferrable === true);
-	if (!hasDeferrableTools) {
-		return tools;
-	}
-	if (tools.some(tool => tool.name === "resolve")) {
-		return tools;
+	if (hasDeferrableTools && !tools.some(tool => tool.name === "resolve")) {
+		const resolveTool = await logger.time("createTools:resolve", HIDDEN_TOOLS.resolve, session);
+		if (resolveTool) {
+			tools.push(wrapToolWithMetaNotice(resolveTool));
+		}
 	}
-	const resolveTool = await logger.timeAsync("createTools:resolve", HIDDEN_TOOLS.resolve, session);
-	if (resolveTool) {
-		tools.push(wrapToolWithMetaNotice(resolveTool));
+
+	// Auto-inject report_tool_issue when autoqa is enabled (env or setting).
+	// Injected unconditionally into every agent, regardless of requested tool list.
+	const autoQA = isAutoQaEnabled(session.settings);
+	if (autoQA && !tools.some(t => t.name === "report_tool_issue")) {
+		const qaTool = await HIDDEN_TOOLS.report_tool_issue(session);
+		if (qaTool) {
+			tools.push(wrapToolWithMetaNotice(qaTool));
+		}
 	}
+
 	return tools;
 }

package/src/tools/inspect-image.ts

@@ -1,8 +1,8 @@
 import type { AgentTool, AgentToolContext, AgentToolResult, AgentToolUpdateCallback } from "@oh-my-pi/pi-agent-core";
 import { type Api, type AssistantMessage, completeSimple, type Model } from "@oh-my-pi/pi-ai";
+import { prompt } from "@oh-my-pi/pi-utils";
 import { type Static, Type } from "@sinclair/typebox";
 import { expandRoleAlias, resolveModelFromString } from "../config/model-resolver";
-import { renderPromptTemplate } from "../config/prompt-templates";
 import inspectImageDescription from "../prompts/tools/inspect-image.md" with { type: "text" };
 import inspectImageSystemPromptTemplate from "../prompts/tools/inspect-image-system.md" with { type: "text" };
 import {
@@ -10,7 +10,7 @@ import {
 	type LoadedImageInput,
 	loadImageInput,
 	MAX_IMAGE_INPUT_BYTES,
-} from "../utils/image-input";
+} from "../utils/image-loading";
 import type { ToolSession } from "./index";
 import { ToolError } from "./tool-errors";
 
@@ -49,7 +49,7 @@ export class InspectImageTool implements AgentTool<typeof inspectImageSchema, In
 		private readonly session: ToolSession,
 		private readonly completeImageRequest: typeof completeSimple = completeSimple,
 	) {
-		this.description = renderPromptTemplate(inspectImageDescription);
+		this.description = prompt.render(inspectImageDescription);
 	}
 
 	async execute(
@@ -127,7 +127,7 @@ export class InspectImageTool implements AgentTool<typeof inspectImageSchema, In
 		const response = await this.completeImageRequest(
 			model,
 			{
-				systemPrompt: renderPromptTemplate(inspectImageSystemPromptTemplate),
+				systemPrompt: prompt.render(inspectImageSystemPromptTemplate),
 				messages: [
 					{
 						role: "user",