@oh-my-pi/pi-coding-agent 15.3.2 → 15.4.2

package/src/task/executor.ts

@@ -7,7 +7,6 @@
 import path from "node:path";
 import type { AgentEvent, AgentIdentity, AgentTelemetryConfig, ThinkingLevel } from "@oh-my-pi/pi-agent-core";
 import { recordHandoff, resolveTelemetry } from "@oh-my-pi/pi-agent-core";
-import { type JsonSchemaValidationIssue, validateJsonSchemaValue } from "@oh-my-pi/pi-ai/utils/schema";
 import { logger, prompt, untilAborted } from "@oh-my-pi/pi-utils";
 import { ModelRegistry } from "../config/model-registry";
 import { resolveModelOverrideWithAuthFallback } from "../config/model-resolver";
@@ -33,7 +32,10 @@ import { SKILL_PROMPT_MESSAGE_TYPE } from "../session/messages";
 import { SessionManager } from "../session/session-manager";
 import { truncateTail } from "../session/streaming-output";
 import type { ContextFileEntry } from "../tools";
-import { jtdToJsonSchema, normalizeSchema } from "../tools/jtd-to-json-schema";
+import { normalizeSchema } from "../tools/jtd-to-json-schema";
+import { buildOutputValidator, summarizeValidationFailure } from "../tools/output-schema-validator";
+
+import { type ReportFindingDetails, toReviewFinding } from "../tools/review";
 import { ToolAbortError } from "../tools/tool-errors";
 import type { EventBus } from "../utils/event-bus";
 import { buildNamedToolChoice } from "../utils/tool-choice";
@@ -183,6 +185,8 @@ export interface ExecutorOptions {
 	 */
 	parentArtifactManager?: ArtifactManager;
 	parentHindsightSessionState?: HindsightSessionState;
+	/** Parent agent's eval executor session id. Subagents reuse it so eval state is shared. */
+	parentEvalSessionId?: string;
 	/**
 	 * Parent agent's OpenTelemetry configuration. When defined, the subagent's
 	 * loop is started with the same tracer/hooks but its own agent identity
@@ -208,51 +212,6 @@ function parseStringifiedJson(value: unknown): unknown {
 	}
 }
 
-interface OutputValidator {
-	validate: (value: unknown) => { ok: true } | { ok: false; message: string; missingRequired: string[] };
-	requiredFields: string[];
-}
-
-function buildOutputValidator(schema: unknown): { validator?: OutputValidator; error?: string } {
-	const { normalized, error } = normalizeSchema(schema);
-	if (error) return { error };
-	if (normalized === undefined) return {};
-	const jsonSchema = jtdToJsonSchema(normalized);
-	const required = extractRequiredFields(jsonSchema);
-	return {
-		validator: {
-			requiredFields: required,
-			validate: value => {
-				const result = validateJsonSchemaValue(jsonSchema, value);
-				if (result.success) return { ok: true };
-				const missing = computeMissingRequired(required, value);
-				const message = formatValidationIssue(result.issues[0]) ?? "schema validation failed";
-				return { ok: false, message, missingRequired: missing };
-			},
-		},
-	};
-}
-
-function extractRequiredFields(jsonSchema: unknown): string[] {
-	if (!jsonSchema || typeof jsonSchema !== "object") return [];
-	const required = (jsonSchema as { required?: unknown }).required;
-	return Array.isArray(required) ? required.filter((k): k is string => typeof k === "string") : [];
-}
-
-function computeMissingRequired(required: readonly string[], value: unknown): string[] {
-	if (required.length === 0) return [];
-	if (value === null || value === undefined) return [...required];
-	if (typeof value !== "object" || Array.isArray(value)) return [];
-	const record = value as Record<string, unknown>;
-	return required.filter(key => !(key in record) || record[key] === undefined);
-}
-
-function formatValidationIssue(issue: JsonSchemaValidationIssue | undefined): string | undefined {
-	if (!issue) return undefined;
-	const path = issue.path.length > 0 ? issue.path.map(String).join(".") : "(root)";
-	return `${path}: ${issue.message}`;
-}
-
 function previewOffendingData(value: unknown, maxLength = 500): string {
 	let serialized: string;
 	try {
@@ -306,7 +265,7 @@ function resolveFallbackCompletion(rawOutput: string, outputSchema: unknown): {
 	if (candidate === undefined) return null;
 	const { validator, error } = buildOutputValidator(outputSchema);
 	if (error) return null;
-	if (validator && !validator.validate(candidate).ok) return null;
+	if (validator && !validator.validate(candidate).success) return null;
 	return { data: candidate };
 }
 
@@ -393,9 +352,10 @@ export function finalizeSubprocessOutput(args: FinalizeSubprocessOutputArgs): Fi
 					stderr = `schema_violation: invalid output schema: ${schemaError}`;
 					exitCode = 1;
 				} else {
-					const verdict = validator ? validator.validate(completeData) : { ok: true as const };
-					if (!verdict.ok) {
-						const outcome = buildSchemaViolationOutcome(verdict, completeData);
+					const result = validator?.validate(completeData) ?? { success: true as const };
+					if (!result.success) {
+						const summary = summarizeValidationFailure(result, completeData, validator?.requiredFields ?? []);
+						const outcome = buildSchemaViolationOutcome(summary, completeData);
 						rawOutput = outcome.rawOutput;
 						stderr = outcome.stderr;
 						exitCode = outcome.exitCode;
@@ -420,9 +380,10 @@ export function finalizeSubprocessOutput(args: FinalizeSubprocessOutputArgs): Fi
 		if (fallback) {
 			const completeData = normalizeCompleteData(fallback.data, reportFindings);
 			const { validator } = buildOutputValidator(outputSchema);
-			const verdict = validator ? validator.validate(completeData) : { ok: true as const };
-			if (!verdict.ok) {
-				const outcome = buildSchemaViolationOutcome(verdict, completeData);
+			const result = validator?.validate(completeData) ?? { success: true as const };
+			if (!result.success) {
+				const summary = summarizeValidationFailure(result, completeData, validator?.requiredFields ?? []);
+				const outcome = buildSchemaViolationOutcome(summary, completeData);
 				rawOutput = outcome.rawOutput;
 				stderr = outcome.stderr;
 				exitCode = outcome.exitCode;
@@ -1277,6 +1238,7 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 					customTools: mcpProxyTools.length > 0 ? mcpProxyTools : undefined,
 					localProtocolOptions: options.localProtocolOptions,
 					telemetry: subagentTelemetry,
+					parentEvalSessionId: options.parentEvalSessionId,
 				}),
 			);
 
@@ -1324,22 +1286,25 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 			}
 
 			const extensionRunner = session.extensionRunner;
+			const pendingExtensionMessages: Promise<void>[] = [];
 			if (extensionRunner) {
 				extensionRunner.initialize(
 					{
 						sendMessage: (message, options) => {
-							session.sendCustomMessage(message, options).catch(e => {
+							const sendPromise = session.sendCustomMessage(message, options).catch(e => {
 								logger.error("Extension sendMessage failed", {
 									error: e instanceof Error ? e.message : String(e),
 								});
 							});
+							pendingExtensionMessages.push(sendPromise);
 						},
 						sendUserMessage: (content, options) => {
-							session.sendUserMessage(content, options).catch(e => {
+							const sendPromise = session.sendUserMessage(content, options).catch(e => {
 								logger.error("Extension sendUserMessage failed", {
 									error: e instanceof Error ? e.message : String(e),
 								});
 							});
+							pendingExtensionMessages.push(sendPromise);
 						},
 						appendEntry: (customType, data) => {
 							session.sessionManager.appendCustomEntry(customType, data);
@@ -1375,6 +1340,9 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 					logger.error("Extension error", { path: err.extensionPath, error: err.error });
 				});
 				await awaitAbortable(extensionRunner.emit({ type: "session_start" }));
+				while (pendingExtensionMessages.length > 0) {
+					await awaitAbortable(Promise.all(pendingExtensionMessages.splice(0)));
+				}
 			}
 
 			const MAX_YIELD_RETRIES = 3;
@@ -1547,7 +1515,8 @@ export async function runSubprocess(options: ExecutorOptions): Promise<SingleRes
 	// Use final output if available, otherwise accumulated output
 	let rawOutput = finalOutputChunks.length > 0 ? finalOutputChunks.join("") : outputChunks.join("");
 	const yieldItems = progress.extractedToolData?.yield as YieldItem[] | undefined;
-	const reportFindings = progress.extractedToolData?.report_finding as ReviewFinding[] | undefined;
+	const reportFindingDetails = progress.extractedToolData?.report_finding as ReportFindingDetails[] | undefined;
+	const reportFindings: ReviewFinding[] | undefined = reportFindingDetails?.map(toReviewFinding);
 	const finalized = finalizeSubprocessOutput({
 		rawOutput,
 		exitCode,

package/src/task/index.ts

@@ -558,6 +558,7 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 		const commitStyle = this.session.settings.get("task.isolation.commits");
 		const maxConcurrency = this.session.settings.get("task.maxConcurrency");
 		const taskDepth = this.session.taskDepth ?? 0;
+		const subagentLspEnabled = (this.session.enableLsp ?? true) && this.session.settings.get("task.enableLsp");
 
 		if (isolationMode === "none" && "isolated" in params) {
 			return {
@@ -843,6 +844,7 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 				file => path.basename(file.path).toLowerCase() !== "agents.md",
 			);
 			const promptTemplates = this.session.promptTemplates;
+			const parentEvalSessionId = this.session.getEvalSessionId?.() ?? undefined;
 
 			// Initialize progress for all tasks
 			for (let i = 0; i < tasksWithUniqueIds.length; i++) {
@@ -872,7 +874,7 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 				if (!isIsolated) {
 					return runSubprocess({
 						cwd: this.session.cwd,
-						agent,
+						agent: effectiveAgent,
 						task: renderSubagentUserPrompt(task.assignment, simpleMode),
 						assignment: task.assignment.trim(),
 						context: sharedContext,
@@ -888,7 +890,7 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 						persistArtifacts: !!artifactsDir,
 						artifactsDir: effectiveArtifactsDir,
 						contextFile: contextFilePath,
-						enableLsp: false,
+						enableLsp: subagentLspEnabled,
 						signal,
 						eventBus: this.session.eventBus,
 						onProgress: progress => {
@@ -910,6 +912,7 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 						parentArtifactManager,
 						parentHindsightSessionState: this.session.getHindsightSessionState?.(),
 						parentTelemetry: this.session.getTelemetry?.(),
+						parentEvalSessionId,
 					});
 				}
 
@@ -927,7 +930,7 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 					const result = await runSubprocess({
 						cwd: this.session.cwd,
 						worktree: isolationDir,
-						agent,
+						agent: effectiveAgent,
 						task: renderSubagentUserPrompt(task.assignment, simpleMode),
 						assignment: task.assignment.trim(),
 						context: sharedContext,
@@ -943,7 +946,7 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 						persistArtifacts: !!artifactsDir,
 						artifactsDir: effectiveArtifactsDir,
 						contextFile: contextFilePath,
-						enableLsp: false,
+						enableLsp: subagentLspEnabled,
 						signal,
 						eventBus: this.session.eventBus,
 						onProgress: progress => {
@@ -965,6 +968,7 @@ export class TaskTool implements AgentTool<TaskToolSchemaInstance, TaskToolDetai
 						parentArtifactManager,
 						parentHindsightSessionState: this.session.getHindsightSessionState?.(),
 						parentTelemetry: this.session.getTelemetry?.(),
+						parentEvalSessionId,
 					});
 					if (mergeMode === "branch" && result.exitCode === 0) {
 						try {

package/src/tool-discovery/tool-index.ts

@@ -44,47 +44,6 @@ export interface DiscoverableToolSearchResult {
 	score: number;
 }
 
-// ─── Legacy MCP-typed aliases (back-compat) ──────────────────────────────────
-
-/** @deprecated Use DiscoverableTool with source === "mcp" */
-export type DiscoverableMCPTool = Pick<
-	DiscoverableTool,
-	"name" | "label" | "schemaKeys" | "serverName" | "mcpToolName"
-> & { description: string };
-
-/** @deprecated Use DiscoverableToolServerSummary */
-export type DiscoverableMCPToolServerSummary = DiscoverableToolServerSummary;
-
-/** @deprecated Use DiscoverableToolSummary */
-export type DiscoverableMCPToolSummary = DiscoverableToolSummary;
-
-/** Tool object stored on legacy MCP index documents. Carries both legacy `description` and the
- *  generic `summary`/`source` so the legacy index is structurally assignable to
- *  DiscoverableToolSearchIndex (search functions read termFrequencies, not the tool fields). */
-export type DiscoverableMCPSearchTool = DiscoverableTool & { description: string };
-
-/** @deprecated Use DiscoverableToolSearchDocument */
-export interface DiscoverableMCPSearchDocument {
-	tool: DiscoverableMCPSearchTool;
-	termFrequencies: Map<string, number>;
-	length: number;
-}
-
-/** @deprecated Use DiscoverableToolSearchIndex.
- *  Documents on this index expose `tool.description` (legacy MCP shape) while still being
- *  searchable via `searchDiscoverableTools`. */
-export interface DiscoverableMCPSearchIndex {
-	documents: DiscoverableMCPSearchDocument[];
-	averageLength: number;
-	documentFrequencies: Map<string, number>;
-}
-
-/** @deprecated Use DiscoverableToolSearchResult */
-export interface DiscoverableMCPSearchResult {
-	tool: DiscoverableMCPSearchTool;
-	score: number;
-}
-
 // ─── BM25 Constants ───────────────────────────────────────────────────────────
 
 const BM25_K1 = 1.2;
@@ -295,96 +254,3 @@ export function searchDiscoverableTools(
 		.sort((left, right) => right.score - left.score || left.tool.name.localeCompare(right.tool.name))
 		.slice(0, limit);
 }
-
-// ─── Legacy MCP-specific shims (back-compat wrappers) ────────────────────────
-
-/** @deprecated Use getDiscoverableTool */
-export function getDiscoverableMCPTool(tool: AgentTool): DiscoverableMCPTool | null {
-	if (!isMCPToolName(tool.name)) return null;
-	const toolRecord = tool as AgentTool & {
-		label?: string;
-		description?: string;
-		mcpServerName?: string;
-		mcpToolName?: string;
-		parameters?: unknown;
-	};
-	return {
-		name: tool.name,
-		label: typeof toolRecord.label === "string" ? toolRecord.label : tool.name,
-		description: typeof toolRecord.description === "string" ? toolRecord.description : "",
-		serverName: typeof toolRecord.mcpServerName === "string" ? toolRecord.mcpServerName : undefined,
-		mcpToolName: typeof toolRecord.mcpToolName === "string" ? toolRecord.mcpToolName : undefined,
-		schemaKeys: getSchemaPropertyKeys(toolRecord.parameters),
-	};
-}
-
-/** @deprecated Use collectDiscoverableTools with source filter */
-export function collectDiscoverableMCPTools(tools: Iterable<AgentTool>): DiscoverableMCPTool[] {
-	const discoverable: DiscoverableMCPTool[] = [];
-	for (const tool of tools) {
-		const metadata = getDiscoverableMCPTool(tool);
-		if (metadata) {
-			discoverable.push(metadata);
-		}
-	}
-	return discoverable;
-}
-
-/** @deprecated Use selectDiscoverableToolNamesByServer */
-export function selectDiscoverableMCPToolNamesByServer(
-	tools: Iterable<DiscoverableMCPTool>,
-	serverNames: ReadonlySet<string>,
-): string[] {
-	if (serverNames.size === 0) return [];
-	return Array.from(tools)
-		.filter(tool => tool.serverName !== undefined && serverNames.has(tool.serverName))
-		.map(tool => tool.name);
-}
-
-/** @deprecated Use summarizeDiscoverableTools */
-export function summarizeDiscoverableMCPTools(tools: DiscoverableMCPTool[]): DiscoverableMCPToolSummary {
-	const serverToolCounts = new Map<string, number>();
-	for (const tool of tools) {
-		if (!tool.serverName) continue;
-		serverToolCounts.set(tool.serverName, (serverToolCounts.get(tool.serverName) ?? 0) + 1);
-	}
-	const servers = Array.from(serverToolCounts.entries())
-		.sort(([left], [right]) => left.localeCompare(right))
-		.map(([name, toolCount]) => ({ name, toolCount }));
-	return {
-		servers,
-		toolCount: tools.length,
-	};
-}
-
-/** @deprecated Use buildDiscoverableToolSearchIndex.
- *  Builds an index whose documents preserve the legacy `description` field on each tool while
- *  also carrying the generic `summary` (set from `description`) so the index remains usable
- *  with `searchDiscoverableTools`. */
-export function buildDiscoverableMCPSearchIndex(tools: Iterable<DiscoverableMCPTool>): DiscoverableMCPSearchIndex {
-	const adapted: DiscoverableMCPSearchTool[] = Array.from(tools).map(t => ({
-		name: t.name,
-		label: t.label,
-		description: t.description,
-		summary: t.description,
-		source: "mcp" as DiscoverableToolSource,
-		serverName: t.serverName,
-		mcpToolName: t.mcpToolName,
-		schemaKeys: t.schemaKeys,
-	}));
-	const generic = buildDiscoverableToolSearchIndex(adapted);
-	// Documents reference `adapted` tools (with `description`), so the cast is sound.
-	return generic as unknown as DiscoverableMCPSearchIndex;
-}
-
-/** @deprecated Use searchDiscoverableTools */
-export function searchDiscoverableMCPTools(
-	index: DiscoverableMCPSearchIndex | DiscoverableToolSearchIndex,
-	query: string,
-	limit: number,
-): DiscoverableMCPSearchResult[] {
-	return searchDiscoverableTools(index as DiscoverableToolSearchIndex, query, limit) as DiscoverableMCPSearchResult[];
-}
-
-/** @deprecated Use formatDiscoverableToolServerSummary */
-export const formatDiscoverableMCPToolServerSummary = formatDiscoverableToolServerSummary;

package/src/tools/ast-edit.ts

@@ -6,7 +6,7 @@ import { Text } from "@oh-my-pi/pi-tui";
 import { $envpos, prompt, untilAborted } from "@oh-my-pi/pi-utils";
 import * as z from "zod/v4";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
-import { computeLineHash, HL_BODY_SEP } from "../hashline/hash";
+import { computeFileHash, formatHashlineHeader } from "../hashline/hash";
 import type { Theme } from "../modes/theme/theme";
 import astEditDescription from "../prompts/tools/ast-edit.md" with { type: "text" };
 import { Ellipsis, fileHyperlink, renderStatusLine, renderTreeList, truncateToWidth } from "../tui";
@@ -257,12 +257,26 @@ export class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolD
 			}
 
 			const useHashLines = resolveFileDisplayMode(this.session).hashLines;
+			const hashContexts = new Map<string, { fileHash: string }>();
+			if (useHashLines) {
+				for (const relativePath of fileList) {
+					const absolutePath = path.resolve(this.session.cwd, relativePath);
+					try {
+						const fullText = await Bun.file(absolutePath).text();
+						const fileHash = computeFileHash(fullText);
+						hashContexts.set(relativePath, { fileHash });
+					} catch {
+						// Best-effort: if a file disappears between ast-edit and rendering, emit plain line output.
+					}
+				}
+			}
 			const outputLines: string[] = [];
 			const displayLines: string[] = [];
 			const renderChangesForFile = (relativePath: string): { model: string[]; display: string[] } => {
 				const modelOut: string[] = [];
 				const displayOut: string[] = [];
 				const fileChanges = changesByFile.get(relativePath) ?? [];
+				const hashContext = hashContexts.get(relativePath);
 				const lineNumberWidth = fileChanges.reduce(
 					(width, change) => Math.max(width, String(change.startLine).length),
 					0,
@@ -272,13 +286,9 @@ export class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolD
 					const afterFirstLine = change.after.split("\n", 1)[0] ?? "";
 					const beforeLine = beforeFirstLine.slice(0, 120);
 					const afterLine = afterFirstLine.slice(0, 120);
-					const beforeRef = useHashLines
-						? `${change.startLine}${computeLineHash(change.startLine, beforeFirstLine)}`
-						: `${change.startLine}:${change.startColumn}`;
-					const afterRef = useHashLines
-						? `${change.startLine}${computeLineHash(change.startLine, afterFirstLine)}`
-						: `${change.startLine}:${change.startColumn}`;
-					const lineSeparator = useHashLines ? HL_BODY_SEP : " ";
+					const beforeRef = hashContext ? `${change.startLine}` : `${change.startLine}:${change.startColumn}`;
+					const afterRef = hashContext ? `${change.startLine}` : `${change.startLine}:${change.startColumn}`;
+					const lineSeparator = hashContext ? ":" : " ";
 					modelOut.push(`-${beforeRef}${lineSeparator}${beforeLine}`);
 					modelOut.push(`+${afterRef}${lineSeparator}${afterLine}`);
 					displayOut.push(formatCodeFrameLine("-", change.startLine, beforeLine, lineNumberWidth));
@@ -291,10 +301,13 @@ export class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolD
 				const grouped = formatGroupedFiles(fileList, relativePath => {
 					const rendered = renderChangesForFile(relativePath);
 					const count = fileReplacementCounts.get(relativePath) ?? 0;
+					const hashContext = hashContexts.get(relativePath);
+					const hashSuffix = hashContext ? `#${hashContext.fileHash}` : "";
 					return {
-						headerSuffix: ` (${formatCount("replacement", count)})`,
+						headerSuffix: `${hashSuffix} (${formatCount("replacement", count)})`,
 						modelLines: rendered.model,
 						displayLines: rendered.display,
+						skip: rendered.model.length === 0,
 					};
 				});
 				outputLines.push(...grouped.model);
@@ -302,6 +315,15 @@ export class AstEditTool implements AgentTool<typeof astEditSchema, AstEditToolD
 			} else {
 				for (const relativePath of fileList) {
 					const rendered = renderChangesForFile(relativePath);
+					if (rendered.model.length === 0) continue;
+					if (outputLines.length > 0) {
+						outputLines.push("");
+						displayLines.push("");
+					}
+					const hashContext = hashContexts.get(relativePath);
+					if (hashContext) {
+						outputLines.push(formatHashlineHeader(relativePath, hashContext.fileHash));
+					}
 					outputLines.push(...rendered.model);
 					displayLines.push(...rendered.display);
 				}
@@ -499,11 +521,12 @@ export const astEditToolRenderer = {
 							let contextDir = searchBase ?? "";
 							return group.map(line => {
 								if (line.startsWith("## ")) {
-									// Strip ` (3 replacements)` suffix attached by formatGroupedFiles.
+									// Strip ` (3 replacements)` and `#hash` suffixes from formatGroupedFiles.
 									const fileName = line
 										.slice(3)
 										.trimEnd()
-										.replace(/\s+\([^)]*\)\s*$/, "");
+										.replace(/\s+\([^)]*\)\s*$/, "")
+										.replace(/#[0-9a-f]+$/, "");
 									const absPath = contextDir && fileName ? path.join(contextDir, fileName) : undefined;
 									const styled = uiTheme.fg("dim", line);
 									return absPath ? fileHyperlink(absPath, styled) : styled;
@@ -514,14 +537,14 @@ export const astEditToolRenderer = {
 										.trimEnd()
 										.replace(/\s+\([^)]*\)\s*$/, "");
 									const isDirectory = raw.endsWith("/");
-									const name = raw.replace(/\/$/, "");
+									const name = isDirectory ? raw.replace(/\/$/, "") : raw.replace(/#[0-9a-f]+$/, "");
 									if (isDirectory) {
 										if (searchBase) {
 											contextDir = name === "." ? searchBase : path.join(searchBase, name);
 										}
 										return uiTheme.fg("accent", line);
 									}
-									// Root-level file with optional suffix, e.g. `# foo.ts (3 replacements)`.
+									// Root-level file with optional `#hash` and ` (3 replacements)` suffixes.
 									const absPath = searchBase && name ? path.join(searchBase, name) : undefined;
 									const styled = uiTheme.fg("accent", line);
 									return absPath ? fileHyperlink(absPath, styled) : styled;

package/src/tools/ast-grep.ts

@@ -5,7 +5,9 @@ import type { Component } from "@oh-my-pi/pi-tui";
 import { Text } from "@oh-my-pi/pi-tui";
 import { prompt, untilAborted } from "@oh-my-pi/pi-utils";
 import * as z from "zod/v4";
+import { getFileReadCache } from "../edit/file-read-cache";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
+import { computeFileHash, formatHashlineHeader } from "../hashline/hash";
 import type { Theme } from "../modes/theme/theme";
 import astGrepDescription from "../prompts/tools/ast-grep.md" with { type: "text" };
 import { Ellipsis, fileHyperlink, renderStatusLine, renderTreeList, truncateToWidth } from "../tui";
@@ -216,25 +218,43 @@ export class AstGrepTool implements AgentTool<typeof astGrepSchema, AstGrepToolD
 			}
 
 			const useHashLines = resolveFileDisplayMode(this.session).hashLines;
+			const hashContexts = new Map<string, { absolutePath: string; fileHash: string }>();
+			if (useHashLines) {
+				for (const relativePath of fileList) {
+					const absolutePath = path.resolve(this.session.cwd, relativePath);
+					try {
+						const fullText = await Bun.file(absolutePath).text();
+						const fileHash = computeFileHash(fullText);
+						hashContexts.set(relativePath, { absolutePath, fileHash });
+					} catch {
+						// Best-effort: if a file disappears between ast-grep and rendering, emit plain line output.
+					}
+				}
+			}
 			const outputLines: string[] = [];
 			const displayLines: string[] = [];
 			const renderMatchesForFile = (relativePath: string): { model: string[]; display: string[] } => {
 				const modelOut: string[] = [];
 				const displayOut: string[] = [];
 				const fileMatches = matchesByFile.get(relativePath) ?? [];
+				const hashContext = hashContexts.get(relativePath);
 				const lineNumberWidth = fileMatches.reduce((width, match) => {
 					const lineCount = match.text.split("\n").length;
 					const endLine = match.startLine + lineCount - 1;
 					return Math.max(width, String(match.startLine).length, String(endLine).length);
 				}, 0);
+				const cacheEntries: Array<readonly [number, string]> = [];
 				for (const match of fileMatches) {
 					const matchLines = match.text.split("\n");
 					for (let index = 0; index < matchLines.length; index++) {
 						const lineNumber = match.startLine + index;
 						const isMatch = index === 0;
 						const line = matchLines[index] ?? "";
-						modelOut.push(formatMatchLine(lineNumber, line, isMatch, { useHashLines }));
+						modelOut.push(
+							formatMatchLine(lineNumber, line, isMatch, { useHashLines: hashContext !== undefined }),
+						);
 						displayOut.push(formatCodeFrameLine(isMatch ? "*" : " ", lineNumber, line, lineNumberWidth));
+						cacheEntries.push([lineNumber, line] as const);
 					}
 					if (match.metaVariables && Object.keys(match.metaVariables).length > 0) {
 						const serializedMeta = Object.entries(match.metaVariables)
@@ -246,19 +266,39 @@ export class AstGrepTool implements AgentTool<typeof astGrepSchema, AstGrepToolD
 					}
 					fileMatchCounts.set(relativePath, (fileMatchCounts.get(relativePath) ?? 0) + 1);
 				}
+				if (hashContext && cacheEntries.length > 0) {
+					getFileReadCache(this.session).recordSparse(hashContext.absolutePath, cacheEntries, {
+						fileHash: hashContext.fileHash,
+					});
+				}
 				return { model: modelOut, display: displayOut };
 			};
 
 			if (isDirectory) {
 				const grouped = formatGroupedFiles(fileList, relativePath => {
 					const rendered = renderMatchesForFile(relativePath);
-					return { modelLines: rendered.model, displayLines: rendered.display };
+					const hashContext = hashContexts.get(relativePath);
+					return {
+						modelLines: rendered.model,
+						displayLines: rendered.display,
+						headerSuffix: hashContext ? `#${hashContext.fileHash}` : "",
+						skip: rendered.model.length === 0,
+					};
 				});
 				outputLines.push(...grouped.model);
 				displayLines.push(...grouped.display);
 			} else {
 				for (const relativePath of fileList) {
 					const rendered = renderMatchesForFile(relativePath);
+					if (rendered.model.length === 0) continue;
+					if (outputLines.length > 0) {
+						outputLines.push("");
+						displayLines.push("");
+					}
+					const hashContext = hashContexts.get(relativePath);
+					if (hashContext) {
+						outputLines.push(formatHashlineHeader(relativePath, hashContext.fileHash));
+					}
 					outputLines.push(...rendered.model);
 					displayLines.push(...rendered.display);
 				}
@@ -385,7 +425,8 @@ export const astGrepToolRenderer = {
 									const fileName = line
 										.slice(3)
 										.trimEnd()
-										.replace(/\s+\([^)]*\)\s*$/, "");
+										.replace(/\s+\([^)]*\)\s*$/, "")
+										.replace(/#[0-9a-f]+$/, "");
 									const absPath = contextDir && fileName ? path.join(contextDir, fileName) : undefined;
 									const styled = uiTheme.fg("dim", line);
 									return absPath ? fileHyperlink(absPath, styled) : styled;
@@ -396,7 +437,7 @@ export const astGrepToolRenderer = {
 										.trimEnd()
 										.replace(/\s+\([^)]*\)\s*$/, "");
 									const isDirectory = raw.endsWith("/");
-									const name = raw.replace(/\/$/, "");
+									const name = isDirectory ? raw.replace(/\/$/, "") : raw.replace(/#[0-9a-f]+$/, "");
 									if (isDirectory) {
 										if (searchBase) {
 											contextDir = name === "." ? searchBase : path.join(searchBase, name);

package/src/tools/browser/tab-worker.ts

@@ -575,8 +575,10 @@ export class WorkerCore {
 			if (signal.aborted) onCancel();
 			else signal.addEventListener("abort", onCancel, { once: true });
 			try {
+				const hooks = this.#hooksForActiveRun();
+				if (!hooks) throw new ToolError("Browser runtime started without an active run");
 				const returnValue = await Promise.race([
-					runtime.run(msg.code, `browser-run-${msg.id}.js`),
+					runtime.run(msg.code, `browser-run-${msg.id}.js`, hooks, { runId: msg.id, cwd: msg.session.cwd }),
 					cancelRejection,
 				]);
 				await this.#postReadyInfo();
@@ -601,7 +603,6 @@ export class WorkerCore {
 		this.#runtime = new JsRuntime({
 			initialCwd: session.cwd,
 			sessionId: `browser-tab-${this.#targetId ?? "unknown"}`,
-			getHooks: () => this.#hooksForActiveRun(),
 		});
 		return this.#runtime;
 	}

package/src/tools/eval.ts

@@ -6,6 +6,7 @@ import { prompt } from "@oh-my-pi/pi-utils";
 import * as z from "zod/v4";
 import { jsBackend, pythonBackend } from "../eval";
 import type { ExecutorBackend } from "../eval/backend";
+import { defaultEvalSessionId } from "../eval/session-id";
 import type { EvalCellResult, EvalDisplayOutput, EvalLanguage, EvalStatusEvent, EvalToolDetails } from "../eval/types";
 import type { RenderResultOptions } from "../extensibility/custom-tools/types";
 import { truncateToVisualLines } from "../modes/components/visual-truncate";
@@ -347,7 +348,7 @@ export class EvalTool implements AgentTool<typeof evalSchema> {
 						pushUpdate();
 					},
 				});
-				const sessionId = sessionFile ? `session:${sessionFile}:cwd:${session.cwd}` : `cwd:${session.cwd}`;
+				const sessionId = session.getEvalSessionId?.() ?? defaultEvalSessionId(session);
 
 				for (let i = 0; i < cells.length; i++) {
 					const cell = cells[i];