@oh-my-pi/pi-coding-agent 14.5.3 → 14.5.6

package/src/edit/modes/hashline.ts

@@ -156,7 +156,6 @@ const locSchema = Type.Union(
 
 export const hashlineEditSchema = Type.Object(
 	{
-		path: Type.Optional(Type.String({ description: "File path (omit to use top-level `path`)" })),
 		loc: Type.Optional(locSchema),
 		content: Type.Optional(linesSchema),
 	},
@@ -165,7 +164,7 @@ export const hashlineEditSchema = Type.Object(
 
 export const hashlineEditParamsSchema = Type.Object(
 	{
-		path: Type.Optional(Type.String({ description: "Default file path used when an edit omits its own `path`" })),
+		path: Type.String({ description: "file path for edits" }),
 		edits: Type.Array(hashlineEditSchema, { description: "edits" }),
 	},
 	{ additionalProperties: false },
@@ -566,8 +565,8 @@ export class HashlineMismatchError extends Error {
 
 		const sorted = [...displayLines].sort((a, b) => a - b);
 		const out: string[] = [
-			`Edit rejected: ${mismatches.length} line${mismatches.length > 1 ? "s have" : " has"} changed since the last read. The edit was NOT applied.`,
-			"Realign your edit to the file state shown below. Copy the full anchors exactly as shown (for example `160sr`, not just `sr`).",
+			`Edit rejected: ${mismatches.length} line${mismatches.length > 1 ? "s have" : " has"} changed since the last read (marked *).`,
+			"The edit was NOT applied, please use the updated file content shown below, and issue another edit tool-call.",
 			"",
 		];
 
@@ -603,8 +602,8 @@ export class HashlineMismatchError extends Error {
 		const lines: string[] = [];
 
 		lines.push(
-			`Edit rejected: ${mismatches.length} line${mismatches.length > 1 ? "s have" : " has"} changed since the last read. The edit was NOT applied.`,
-			"Use the updated anchors shown below (`*` marks changed lines, leading space marks context) and retry the edit.",
+			`Edit rejected: ${mismatches.length} line${mismatches.length > 1 ? "s have" : " has"} changed since the last read (marked *).`,
+			"The edit was NOT applied, please use the updated file content shown below, and issue another edit tool-call.",
 		);
 		lines.push("");
 
@@ -1015,7 +1014,7 @@ export interface CompactHashlineDiffOptions {
 }
 
 const NUMBERED_DIFF_LINE_RE = /^([ +-])(\s*\d+)\|(.*)$/;
-const HASHLINE_PREVIEW_PLACEHOLDER = "   ";
+const HASHLINE_PREVIEW_PLACEHOLDER = "  ";
 
 type DiffRunKind = " " | "+" | "-" | "meta";
 type DiffRun = { kind: DiffRunKind; lines: string[] };
@@ -1142,7 +1141,7 @@ function collapseFromStart(lines: string[], maxLines: number, label: string): st
 	return [...lines.slice(0, maxLines), ` ... ${hidden} more ${label} lines`];
 }
 
-function collapseFromEnd(lines: string[], maxLines: number, label: string): string[] {
+function _collapseFromEnd(lines: string[], maxLines: number, label: string): string[] {
 	if (lines.length <= maxLines) return lines;
 	const hidden = lines.length - maxLines;
 	return [` ... ${hidden} more ${label} lines`, ...lines.slice(-maxLines)];
@@ -1191,11 +1190,11 @@ export function buildCompactHashlineDiffPreview(
 				break;
 			case " ":
 				if (runIndex === 0) {
-					out.push(...collapseFromEnd(run.lines, maxUnchangedRun, "unchanged"));
+					out.push(...run.lines.slice(-maxUnchangedRun));
 					break;
 				}
 				if (runIndex === runs.length - 1) {
-					out.push(...collapseFromStart(run.lines, maxUnchangedRun, "unchanged"));
+					out.push(...run.lines.slice(0, maxUnchangedRun));
 					break;
 				}
 				out.push(...collapseFromMiddle(run.lines, maxUnchangedRun, "unchanged"));

package/src/edit/modes/patch.ts

@@ -1576,27 +1576,33 @@ export async function computePatchDiff(
 	}
 }
 
-export const patchEditEntrySchema = Type.Object({
-	path: Type.Optional(Type.String({ description: "File path (omit to use top-level `path`)" })),
-	op: Type.Optional(
-		StringEnum(["create", "delete", "update"], {
-			description: "Operation (default: update)",
-		}),
-	),
-	rename: Type.Optional(Type.String({ description: "New path for move" })),
-	diff: Type.Optional(Type.String({ description: "Diff hunks (update) or full content (create)" })),
-});
-
-export const patchEditSchema = Type.Object({
-	path: Type.Optional(Type.String({ description: "Default file path used when an edit omits its own `path`" })),
-	edits: Type.Array(patchEditEntrySchema, { description: "Patch operations", minItems: 1 }),
-});
+export const patchEditEntrySchema = Type.Object(
+	{
+		op: Type.Optional(
+			StringEnum(["create", "delete", "update"], {
+				description: "Operation (default: update)",
+			}),
+		),
+		rename: Type.Optional(Type.String({ description: "New path for move" })),
+		diff: Type.Optional(Type.String({ description: "Diff hunks (update) or full content (create)" })),
+	},
+	{ additionalProperties: false },
+);
+
+export const patchEditSchema = Type.Object(
+	{
+		path: Type.String({ description: "file path for edits" }),
+		edits: Type.Array(patchEditEntrySchema, { description: "Patch operations", minItems: 1 }),
+	},
+	{ additionalProperties: false },
+);
 
 export type PatchEditEntry = Static<typeof patchEditEntrySchema>;
 export type PatchParams = Static<typeof patchEditSchema>;
 
 export interface ExecutePatchSingleOptions {
 	session: ToolSession;
+	path: string;
 	params: PatchEditEntry;
 	signal?: AbortSignal;
 	batchRequest?: LspBatchRequest;
@@ -1694,6 +1700,7 @@ export async function executePatchSingle(
 ): Promise<AgentToolResult<EditToolDetails, typeof patchEditEntrySchema>> {
 	const {
 		session,
+		path,
 		params,
 		signal,
 		batchRequest,
@@ -1702,10 +1709,7 @@ export async function executePatchSingle(
 		writethrough,
 		beginDeferredDiagnosticsForPath,
 	} = options;
-	const { path, op: rawOp, rename, diff } = params;
-	if (typeof path !== "string" || path.length === 0) {
-		throw new Error("patch edit: missing `path`. Provide `path` on the edit or supply a top-level `path`.");
-	}
+	const { op: rawOp, rename, diff } = params;
 
 	const op: Operation = rawOp === "create" || rawOp === "delete" ? rawOp : "update";
 

package/src/edit/modes/replace.ts

@@ -976,23 +976,29 @@ export function findContextLine(
 	return { index: undefined, confidence: bestScore };
 }
 
-export const replaceEditEntrySchema = Type.Object({
-	path: Type.Optional(Type.String({ description: "File path (omit to use top-level `path`)" })),
-	old_text: Type.String({ description: "Text to find (fuzzy whitespace matching enabled)" }),
-	new_text: Type.String({ description: "Replacement text" }),
-	all: Type.Optional(Type.Boolean({ description: "Replace all occurrences (default: unique match required)" })),
-});
-
-export const replaceEditSchema = Type.Object({
-	path: Type.Optional(Type.String({ description: "Default file path used when an edit omits its own `path`" })),
-	edits: Type.Array(replaceEditEntrySchema, { description: "Replacements", minItems: 1 }),
-});
+export const replaceEditEntrySchema = Type.Object(
+	{
+		old_text: Type.String({ description: "Text to find (fuzzy whitespace matching enabled)" }),
+		new_text: Type.String({ description: "Replacement text" }),
+		all: Type.Optional(Type.Boolean({ description: "Replace all occurrences (default: unique match required)" })),
+	},
+	{ additionalProperties: false },
+);
+
+export const replaceEditSchema = Type.Object(
+	{
+		path: Type.String({ description: "file path for edits" }),
+		edits: Type.Array(replaceEditEntrySchema, { description: "Replacements", minItems: 1 }),
+	},
+	{ additionalProperties: false },
+);
 
 export type ReplaceEditEntry = Static<typeof replaceEditEntrySchema>;
 export type ReplaceParams = Static<typeof replaceEditSchema>;
 
 export interface ExecuteReplaceSingleOptions {
 	session: ToolSession;
+	path: string;
 	params: ReplaceEditEntry;
 	signal?: AbortSignal;
 	batchRequest?: LspBatchRequest;
@@ -1007,6 +1013,7 @@ export async function executeReplaceSingle(
 ): Promise<AgentToolResult<EditToolDetails, typeof replaceEditEntrySchema>> {
 	const {
 		session,
+		path,
 		params,
 		signal,
 		batchRequest,
@@ -1015,10 +1022,7 @@ export async function executeReplaceSingle(
 		writethrough,
 		beginDeferredDiagnosticsForPath,
 	} = options;
-	const { path, old_text, new_text, all } = params;
-	if (typeof path !== "string" || path.length === 0) {
-		throw new Error("replace edit: missing `path`. Provide `path` on the edit or supply a top-level `path`.");
-	}
+	const { old_text, new_text, all } = params;
 
 	enforcePlanModeWrite(session, path);
 

package/src/edit/renderer.ts

@@ -28,8 +28,8 @@ import { Hasher, type RenderCache, renderStatusLine, truncateToWidth } from "../
 import type { EditMode } from "../utils/edit-mode";
 import type { VimToolDetails } from "../vim/types";
 import type { DiffError, DiffResult } from "./diff";
-import { expandApplyPatchToEntries, expandApplyPatchToPreviewEntries } from "./modes/apply-patch";
-import type { Operation, PatchEditEntry } from "./modes/patch";
+import { type ApplyPatchEntry, expandApplyPatchToEntries, expandApplyPatchToPreviewEntries } from "./modes/apply-patch";
+import type { Operation } from "./modes/patch";
 import type { PerFileDiffPreview } from "./streaming";
 
 // ═══════════════════════════════════════════════════════════════════════════
@@ -106,8 +106,12 @@ type EditRenderEntry = {
 	op?: Operation;
 };
 
+interface AtomRenderSummary {
+	entries: Array<{ path: string }>;
+}
+
 interface ApplyPatchRenderSummary {
-	entries: PatchEditEntry[];
+	entries: ApplyPatchEntry[];
 	error?: string;
 }
 
@@ -305,8 +309,54 @@ function getCallPreview(
 }
 
 const MISSING_APPLY_PATCH_END_ERROR = "The last line of the patch must be '*** End Patch'";
+const ATOM_HEADER_PREFIX = "---";
+
+function normalizeAtomPreviewPath(rawPath: string): string {
+	const trimmed = rawPath.trim();
+	if (trimmed.length < 2) return trimmed;
+	const first = trimmed[0];
+	const last = trimmed[trimmed.length - 1];
+	if ((first === '"' || first === "'") && first === last) {
+		return trimmed.slice(1, -1);
+	}
+	return trimmed;
+}
+
+function parseAtomPreviewHeader(line: string): string | null {
+	if (!line.startsWith(ATOM_HEADER_PREFIX)) return null;
+	let body = line.slice(ATOM_HEADER_PREFIX.length);
+	if (body.startsWith(" ")) body = body.slice(1);
+	const previewPath = normalizeAtomPreviewPath(body);
+	return previewPath.length > 0 ? previewPath : null;
+}
+
+function getAtomInputPaths(input: string): string[] {
+	const stripped = input.startsWith("\uFEFF") ? input.slice(1) : input;
+	const paths: string[] = [];
+	for (const rawLine of stripped.split("\n")) {
+		const line = rawLine.replace(/\r$/, "");
+		const path = parseAtomPreviewHeader(line);
+		if (path) paths.push(path);
+	}
+	return paths;
+}
+
+function getAtomRenderSummary(args: EditRenderArgs, editMode: EditMode | undefined): AtomRenderSummary | undefined {
+	if (editMode !== "atom" || typeof args.input !== "string") {
+		return undefined;
+	}
+	return { entries: getAtomInputPaths(args.input).map(path => ({ path })) };
+}
+
+function getApplyPatchRenderSummary(
+	args: EditRenderArgs,
+	isPartial: boolean,
+	editMode: EditMode | undefined,
+): ApplyPatchRenderSummary | undefined {
+	if (editMode !== undefined && editMode !== "apply_patch") {
+		return undefined;
+	}
 
-function getApplyPatchRenderSummary(args: EditRenderArgs, isPartial: boolean): ApplyPatchRenderSummary | undefined {
 	if (typeof args.input !== "string") {
 		return undefined;
 	}
@@ -397,8 +447,10 @@ export const editToolRenderer = {
 		}
 
 		const editArgs = args as EditRenderArgs;
-		const applyPatchSummary = getApplyPatchRenderSummary(editArgs, options.isPartial);
+		const atomSummary = getAtomRenderSummary(editArgs, renderContext?.editMode);
+		const applyPatchSummary = getApplyPatchRenderSummary(editArgs, options.isPartial, renderContext?.editMode);
 		const firstApplyPatchEntry = applyPatchSummary?.entries[0];
+		const firstAtomEntry = atomSummary?.entries[0];
 		// Extract path from first edit entry when top-level path is absent (new schema)
 		const firstEdit = Array.isArray(editArgs.edits) && editArgs.edits.length > 0 ? editArgs.edits[0] : undefined;
 		const rawPath =
@@ -406,6 +458,7 @@ export const editToolRenderer = {
 			editArgs.path ||
 			filePathFromEditEntry(firstEdit?.path) ||
 			getPartialJsonEditPath(editArgs) ||
+			firstAtomEntry?.path ||
 			firstApplyPatchEntry?.path ||
 			"";
 		const rename = editArgs.rename || firstEdit?.rename || firstEdit?.move || firstApplyPatchEntry?.rename;
@@ -415,9 +468,10 @@ export const editToolRenderer = {
 			options?.spinnerFrame !== undefined ? formatStatusIcon("running", uiTheme, options.spinnerFrame) : "";
 		let text = `${formatTitle(getOperationTitle(op), uiTheme)} ${spinner ? `${spinner} ` : ""}${description}`;
 		// Show file count hint for multi-file edits
-		const fileCount = Array.isArray(editArgs.edits)
-			? countEditFiles(editArgs.edits)
-			: (applyPatchSummary?.entries.length ?? 0);
+		let fileCount = atomSummary?.entries.length ?? applyPatchSummary?.entries.length ?? 0;
+		if (Array.isArray(editArgs.edits)) {
+			fileCount = countEditFiles(editArgs.edits);
+		}
 		if (fileCount > 1) {
 			text += uiTheme.fg("dim", ` (+${fileCount - 1} more)`);
 		}
@@ -465,11 +519,14 @@ function renderSingleFileResult(
 	const details = result.details;
 	const isError = result.isError ?? (details && "isError" in details ? details.isError : false);
 	const firstEdit = args?.edits?.[0];
+	const atomSummary = getAtomRenderSummary(args ?? {}, options.renderContext?.editMode);
+	const firstAtomEntry = atomSummary?.entries[0];
 	const rawPath =
 		args?.file_path ||
 		args?.path ||
 		filePathFromEditEntry(firstEdit?.path) ||
 		(details && "path" in details ? details.path : "") ||
+		firstAtomEntry?.path ||
 		"";
 	const op = args?.op || firstEdit?.op || details?.op;
 	const rename = args?.rename || firstEdit?.rename || firstEdit?.move || details?.move;

package/src/edit/streaming.ts

@@ -15,7 +15,7 @@
 import type { Theme } from "../modes/theme/theme";
 import { type EditMode, resolveEditMode } from "../utils/edit-mode";
 import { computeEditDiff, type DiffError, type DiffResult } from "./diff";
-import { expandApplyPatchToEntries, expandApplyPatchToPreviewEntries } from "./modes/apply-patch";
+import { type ApplyPatchEntry, expandApplyPatchToEntries, expandApplyPatchToPreviewEntries } from "./modes/apply-patch";
 import { computeHashlineDiff, type HashlineToolEdit } from "./modes/hashline";
 import { computePatchDiff, type PatchEditEntry } from "./modes/patch";
 import type { ReplaceEditEntry } from "./modes/replace";
@@ -126,33 +126,19 @@ export function dropIncompleteLastEdit<T>(edits: readonly T[], partialJson: stri
 }
 
 // -----------------------------------------------------------------------------
-// Multi-file grouping
+// Apply_patch remains multi-file because the Codex envelope carries paths per hunk.
 // -----------------------------------------------------------------------------
 
-/** Cap on how many distinct files a streaming preview will render diffs for. */
-const MAX_PREVIEW_FILES = 5;
+function groupApplyPatchEntriesByPath(entries: readonly ApplyPatchEntry[]): Map<string, ApplyPatchEntry[]> {
+	const groups = new Map<string, ApplyPatchEntry[]>();
 
-/**
- * Group a list of edits by their effective `path` (per-edit `path` falls back
- * to the top-level `args.path`). Insertion order is preserved and the number of
- * distinct buckets is capped at {@link MAX_PREVIEW_FILES}.
- */
-function groupEditsByPath<T extends { path?: string }>(
-	edits: readonly T[],
-	fallbackPath: string | undefined,
-): Map<string, Array<T & { path: string }>> {
-	const groups = new Map<string, Array<T & { path: string }>>();
-	for (const edit of edits) {
-		if (!edit) continue;
-		const editPath = edit.path ?? fallbackPath;
-		if (!editPath) continue;
-		let bucket = groups.get(editPath);
+	for (const entry of entries) {
+		let bucket = groups.get(entry.path);
 		if (!bucket) {
-			if (groups.size >= MAX_PREVIEW_FILES) continue;
 			bucket = [];
-			groups.set(editPath, bucket);
+			groups.set(entry.path, bucket);
 		}
-		bucket.push({ ...edit, path: editPath });
+		bucket.push(entry);
 	}
 	return groups;
 }
@@ -173,26 +159,21 @@ const replaceStrategy: EditStreamingStrategy<ReplaceArgs> = {
 		return { ...args, edits: dropIncompleteLastEdit(args.edits, partialJson, "edits") };
 	},
 	async computeDiffPreview(args, ctx) {
-		const groups = groupEditsByPath(args.edits ?? [], args.path);
-		if (groups.size === 0) return null;
-		const previews: PerFileDiffPreview[] = [];
-		for (const [path, fileEdits] of groups) {
-			const first = fileEdits[0];
-			if (!first || first.old_text === undefined || first.new_text === undefined) continue;
-			ctx.signal.throwIfAborted();
-			const result = await computeEditDiff(
-				path,
-				first.old_text,
-				first.new_text,
-				ctx.cwd,
-				ctx.allowFuzzy ?? true,
-				first.all,
-				ctx.fuzzyThreshold,
-			);
-			ctx.signal.throwIfAborted();
-			previews.push(toPerFilePreview(path, result));
-		}
-		return previews.length > 0 ? previews : null;
+		if (!args.path) return null;
+		const first = args.edits?.[0];
+		if (!first || first.old_text === undefined || first.new_text === undefined) return null;
+		ctx.signal.throwIfAborted();
+		const result = await computeEditDiff(
+			args.path,
+			first.old_text,
+			first.new_text,
+			ctx.cwd,
+			ctx.allowFuzzy ?? true,
+			first.all,
+			ctx.fuzzyThreshold,
+		);
+		ctx.signal.throwIfAborted();
+		return [toPerFilePreview(args.path, result)];
 	},
 	renderStreamingFallback() {
 		return "";
@@ -211,22 +192,17 @@ const patchStrategy: EditStreamingStrategy<PatchArgs> = {
 		return { ...args, edits: dropIncompleteLastEdit(args.edits, partialJson, "edits") };
 	},
 	async computeDiffPreview(args, ctx) {
-		const groups = groupEditsByPath(args.edits ?? [], args.path);
-		if (groups.size === 0) return null;
-		const previews: PerFileDiffPreview[] = [];
-		for (const [path, fileEdits] of groups) {
-			const first = fileEdits[0];
-			if (!first) continue;
-			ctx.signal.throwIfAborted();
-			const result = await computePatchDiff(
-				{ path, op: first.op ?? "update", rename: first.rename, diff: first.diff },
-				ctx.cwd,
-				{ fuzzyThreshold: ctx.fuzzyThreshold, allowFuzzy: ctx.allowFuzzy },
-			);
-			ctx.signal.throwIfAborted();
-			previews.push(toPerFilePreview(path, result));
-		}
-		return previews.length > 0 ? previews : null;
+		if (!args.path) return null;
+		const first = args.edits?.[0];
+		if (!first) return null;
+		ctx.signal.throwIfAborted();
+		const result = await computePatchDiff(
+			{ path: args.path, op: first.op ?? "update", rename: first.rename, diff: first.diff },
+			ctx.cwd,
+			{ fuzzyThreshold: ctx.fuzzyThreshold, allowFuzzy: ctx.allowFuzzy },
+		);
+		ctx.signal.throwIfAborted();
+		return [toPerFilePreview(args.path, result)];
 	},
 	renderStreamingFallback() {
 		return "";
@@ -245,16 +221,11 @@ const hashlineStrategy: EditStreamingStrategy<HashlineArgs> = {
 		return { ...args, edits: dropIncompleteLastEdit(args.edits, partialJson, "edits") };
 	},
 	async computeDiffPreview(args, ctx) {
-		const groups = groupEditsByPath(args.edits ?? [], args.path);
-		if (groups.size === 0) return null;
-		const previews: PerFileDiffPreview[] = [];
-		for (const [path, fileEdits] of groups) {
-			ctx.signal.throwIfAborted();
-			const result = await computeHashlineDiff({ path, edits: fileEdits }, ctx.cwd);
-			ctx.signal.throwIfAborted();
-			previews.push(toPerFilePreview(path, result));
-		}
-		return previews;
+		if (!args.path || !args.edits?.length) return null;
+		ctx.signal.throwIfAborted();
+		const result = await computeHashlineDiff({ path: args.path, edits: args.edits }, ctx.cwd);
+		ctx.signal.throwIfAborted();
+		return [toPerFilePreview(args.path, result)];
 	},
 	renderStreamingFallback() {
 		return "";
@@ -272,7 +243,7 @@ const applyPatchStrategy: EditStreamingStrategy<ApplyPatchArgs> = {
 	},
 	async computeDiffPreview(args, ctx) {
 		if (typeof args.input !== "string" || args.input.length === 0) return null;
-		let entries: PatchEditEntry[];
+		let entries: ApplyPatchEntry[];
 		try {
 			entries = expandApplyPatchToEntries({ input: args.input });
 		} catch {
@@ -282,7 +253,7 @@ const applyPatchStrategy: EditStreamingStrategy<ApplyPatchArgs> = {
 				return [{ path: "", error: err instanceof Error ? err.message : String(err) }];
 			}
 		}
-		const groups = groupEditsByPath(entries, undefined);
+		const groups = groupApplyPatchEntriesByPath(entries);
 		if (groups.size === 0) return null;
 		const previews: PerFileDiffPreview[] = [];
 		for (const [path, fileEntries] of groups) {
@@ -319,18 +290,17 @@ const vimStrategy: EditStreamingStrategy<unknown> = {
 };
 
 interface AtomArgs {
-	path?: string;
-	edits?: unknown[];
+	input?: string;
+	__partialJson?: string;
 }
 
 const atomStrategy: EditStreamingStrategy<AtomArgs> = {
-	extractCompleteEdits(args, partialJson) {
-		if (!args.edits) return args;
-		return { ...args, edits: dropIncompleteLastEdit(args.edits, partialJson, "edits") };
+	extractCompleteEdits(args) {
+		return args;
 	},
 	async computeDiffPreview() {
-		// Atom edits are line-anchored and validated against live file hashes; a
-		// streaming preview without that validation could mislead. Skip for now.
+		// Atom edits can target file headers plus compact diff statements.
+		// We intentionally avoid speculative parsing while args are partial.
 		return null;
 	},
 	renderStreamingFallback() {

package/src/extensibility/extensions/types.ts

@@ -46,10 +46,10 @@ import type {
 	BashToolInput,
 	FindToolDetails,
 	FindToolInput,
-	GrepToolDetails,
-	GrepToolInput,
 	ReadToolDetails,
 	ReadToolInput,
+	SearchToolDetails,
+	SearchToolInput,
 	WriteToolInput,
 } from "../../tools";
 import type { TodoItem } from "../../tools/todo-write";
@@ -683,9 +683,9 @@ export interface WriteToolCallEvent extends ToolCallEventBase {
 	input: WriteToolInput;
 }
 
-export interface GrepToolCallEvent extends ToolCallEventBase {
-	toolName: "grep";
-	input: GrepToolInput;
+export interface SearchToolCallEvent extends ToolCallEventBase {
+	toolName: "search";
+	input: SearchToolInput;
 }
 
 export interface FindToolCallEvent extends ToolCallEventBase {
@@ -704,7 +704,7 @@ export type ToolCallEvent =
 	| ReadToolCallEvent
 	| EditToolCallEvent
 	| WriteToolCallEvent
-	| GrepToolCallEvent
+	| SearchToolCallEvent
 	| FindToolCallEvent
 	| CustomToolCallEvent;
 
@@ -736,9 +736,9 @@ export interface WriteToolResultEvent extends ToolResultEventBase {
 	details: undefined;
 }
 
-export interface GrepToolResultEvent extends ToolResultEventBase {
-	toolName: "grep";
-	details: GrepToolDetails | undefined;
+export interface SearchToolResultEvent extends ToolResultEventBase {
+	toolName: "search";
+	details: SearchToolDetails | undefined;
 }
 
 export interface FindToolResultEvent extends ToolResultEventBase {
@@ -757,7 +757,7 @@ export type ToolResultEvent =
 	| ReadToolResultEvent
 	| EditToolResultEvent
 	| WriteToolResultEvent
-	| GrepToolResultEvent
+	| SearchToolResultEvent
 	| FindToolResultEvent
 	| CustomToolResultEvent;
 
@@ -785,7 +785,7 @@ export function isToolCallEventType(toolName: "bash", event: ToolCallEvent): eve
 export function isToolCallEventType(toolName: "read", event: ToolCallEvent): event is ReadToolCallEvent;
 export function isToolCallEventType(toolName: "edit", event: ToolCallEvent): event is EditToolCallEvent;
 export function isToolCallEventType(toolName: "write", event: ToolCallEvent): event is WriteToolCallEvent;
-export function isToolCallEventType(toolName: "grep", event: ToolCallEvent): event is GrepToolCallEvent;
+export function isToolCallEventType(toolName: "search", event: ToolCallEvent): event is SearchToolCallEvent;
 export function isToolCallEventType(toolName: "find", event: ToolCallEvent): event is FindToolCallEvent;
 export function isToolCallEventType<TName extends string, TInput extends Record<string, unknown>>(
 	toolName: TName,

package/src/extensibility/hooks/types.ts

@@ -21,7 +21,7 @@ import type {
 	SessionEntry,
 	SessionManager,
 } from "../../session/session-manager";
-import type { BashToolDetails, FindToolDetails, GrepToolDetails, ReadToolDetails } from "../../tools";
+import type { BashToolDetails, FindToolDetails, ReadToolDetails, SearchToolDetails } from "../../tools";
 import type { TodoItem } from "../../tools/todo-write";
 
 // Re-export for backward compatibility
@@ -494,10 +494,10 @@ export interface WriteToolResultEvent extends ToolResultEventBase {
 	details: undefined;
 }
 
-/** Tool result event for grep tool */
-export interface GrepToolResultEvent extends ToolResultEventBase {
-	toolName: "grep";
-	details: GrepToolDetails | undefined;
+/** Tool result event for search tool */
+export interface SearchToolResultEvent extends ToolResultEventBase {
+	toolName: "search";
+	details: SearchToolDetails | undefined;
 }
 
 /** Tool result event for find tool */
@@ -522,7 +522,7 @@ export type ToolResultEvent =
 	| ReadToolResultEvent
 	| EditToolResultEvent
 	| WriteToolResultEvent
-	| GrepToolResultEvent
+	| SearchToolResultEvent
 	| FindToolResultEvent
 	| CustomToolResultEvent;