pi-readseek 0.12.0 → 0.12.1

package/dist/index.ts

@@ -43,7 +43,7 @@ var PARAM_DESCRIPTIONS = {
   pattern: "AST pattern (ast-grep style), such as console.log($$$ARGS)",
   patternContext: "Surrounding code context for sub-statement patterns",
   selector: "Target AST node kind to extract from pattern context",
-  grepPattern: "Regex pattern; set literal for exact text",
+  grepPattern: "Native regex pattern; set literal for exact text. Empty regex matches every line; empty literal is invalid.",
   name: "Qualified or unqualified symbol name",
   refsName: "Identifier to find references for",
   gitScope: "In a Git repository, which files to search: tracked, untracked, ignored (untracked plus ignored), or all. Defaults to tracked plus untracked.",
@@ -60,7 +60,6 @@ var PARAM_DESCRIPTIONS = {
   kind: "Restrict structure to this node kind",
   outline: "Show outline of document hierarchy or source symbols",
   noAnchors: "Omit source line anchors",
-  text: "Literal native text query; adapter grep also supports regex via pattern",
   edits: "Use set_line, replace_lines, insert_after, replace_symbol, or replace",
   editVariant: "Exactly one nested edit variant",
   setLine: 'Replace one line: {"set_line":{"anchor":"LINE:HASH","new_text":"..."}}',
@@ -92,9 +91,10 @@ var PARAM_DESCRIPTIONS = {
   literal: "Treat pattern literally",
   context: "Surrounding lines for each match",
   matchLimit: "Maximum matches to return",
+  grepLimit: "Maximum matching lines to return; positive integer, defaults to 100",
   summary: "Return per-file counts",
   grepScope: "Group matches by enclosing symbol",
-  scopeContext: "Context lines within each symbol"
+  scopeContext: "Non-negative context lines within each symbol; requires scope: symbol"
 };
 var TOOL_DESCRIPTIONS = {
   show: "Read source, document content, or image descriptors without inference. Obtain fresh `LINE:HASH` anchors before edits; use at with a column for cursor context. Document results include typed nodes and cached asset paths.",
@@ -107,7 +107,7 @@ var TOOL_DESCRIPTIONS = {
   objects: "Explicitly infer object labels and bounding boxes using an installed model.",
   ocr: "Explicitly recognize text from pixels using an installed model; reading never silently invokes OCR.",
   search: "Find AST nodes by pattern or KDL selection rule. Returns edit-ready anchors. Use `grep` for text and regex.",
-  grep: "Search text or regex and return edit-ready `LINE:HASH` anchors. Native CLI text is literal; adapters preserve regex, glob, context, summary, and symbol grouping.",
+  grep: "Search with native regex or literal matching. Returns matching-line counts, source LINE:HASH anchors, and document node-local locations. Native glob, context, summary, limits, Git scope, and symbol grouping apply; default limit is 100 matching lines.",
   def: "Find a symbol definition or declaration by qualified or unqualified name.",
   refs: "Find identifier-name matches with name, or binding-scoped references with at. Use before renaming or deleting a symbol.",
   edit: "Edit existing files with fresh `LINE:HASH` anchors. Each edits item contains exactly one set_line, replace_lines, insert_after, replace_symbol, or replace object. Preview before applying a verified plan.",
@@ -215,7 +215,7 @@ var TOOL_CONTRACTS = [
   tool("objects", "Detect objects", { ...path, ...at, ...stdin, ...level }, ["path"]),
   tool("ocr", "Recognize text", { ...path, ...at, ...stdin, ...level }, ["path"]),
   tool("search", "Search AST nodes", { ...path, ...lang, ...stdin, ...limit, ...gitScopeSchema, ...noAnchors, pattern: string(PARAM_DESCRIPTIONS.pattern), context: string(PARAM_DESCRIPTIONS.patternContext), selector: string(PARAM_DESCRIPTIONS.selector), rule: string(PARAM_DESCRIPTIONS.rule) }, []),
-  tool("grep", "Search text", { ...path, ...limit, ...gitScopeSchema, text: string(PARAM_DESCRIPTIONS.text), pattern: string(PARAM_DESCRIPTIONS.grepPattern), glob: string(PARAM_DESCRIPTIONS.glob), ignoreCase: { type: "boolean", description: PARAM_DESCRIPTIONS.ignoreCase }, literal: { type: "boolean", description: PARAM_DESCRIPTIONS.literal }, context: integer(PARAM_DESCRIPTIONS.context, 0), summary: { type: "boolean", description: PARAM_DESCRIPTIONS.summary }, scope: { type: "string", enum: ["symbol"], description: PARAM_DESCRIPTIONS.grepScope }, scopeContext: integer(PARAM_DESCRIPTIONS.scopeContext, 0) }, []),
+  tool("grep", "Search text", { path: string(PARAM_DESCRIPTIONS.searchPath), limit: { ...integer(PARAM_DESCRIPTIONS.grepLimit), default: 100 }, ...gitScopeSchema, pattern: string(PARAM_DESCRIPTIONS.grepPattern), glob: string(PARAM_DESCRIPTIONS.glob), ignoreCase: { type: "boolean", description: PARAM_DESCRIPTIONS.ignoreCase }, literal: { type: "boolean", description: PARAM_DESCRIPTIONS.literal }, context: integer(PARAM_DESCRIPTIONS.context, 0), summary: { type: "boolean", description: PARAM_DESCRIPTIONS.summary }, scope: { type: "string", enum: ["symbol"], description: PARAM_DESCRIPTIONS.grepScope }, scopeContext: integer(PARAM_DESCRIPTIONS.scopeContext, 0) }, ["pattern"]),
   tool("def", "Find definitions", { ...path, ...lang, ...gitScopeSchema, ...noAnchors, name: string(PARAM_DESCRIPTIONS.name) }, ["name"]),
   tool("refs", "Find references", { ...path, ...at, ...lang, ...gitScopeSchema, ...noAnchors, name: string(PARAM_DESCRIPTIONS.refsName) }, []),
   tool("edit", "Hash-verified edit", { ...path, ...lang, ...gitScopeSchema, ...apply, edits: { type: "array", minItems: 1, items: editItemSchema, description: PARAM_DESCRIPTIONS.edits }, postEditVerify: { type: "boolean", description: PARAM_DESCRIPTIONS.postEditVerify } }, ["path", "edits"]),
@@ -243,7 +243,7 @@ var REPLACEABLE_TOOLS = [
   {
     tool: "grep",
     builtIn: "grep",
-    benefit: "it returns LINE:HASH anchors."
+    benefit: "it runs native regex/literal matching and returns source LINE:HASH anchors or document locations."
   },
   {
     tool: "write",
@@ -325,6 +325,59 @@ function validateReferencesSelection(input) {
     return { ok: false, error: "exactly one of name or at is required" };
   return { ok: true };
 }
+function validateGrepParams(input) {
+  if (!input || typeof input !== "object" || Array.isArray(input)) {
+    return { ok: false, error: "grep params must be an object" };
+  }
+  const params = input;
+  const allowed = [
+    "pattern",
+    "path",
+    "glob",
+    "ignoreCase",
+    "literal",
+    "context",
+    "limit",
+    "summary",
+    "scope",
+    "scopeContext",
+    "gitScope",
+    "signal",
+    "stdin",
+    "timeoutMs",
+    "cancelable"
+  ];
+  if (Object.keys(params).some((key) => !allowed.includes(key)))
+    return { ok: false, error: "unknown grep parameter" };
+  if (typeof params.pattern !== "string")
+    return { ok: false, error: "grep requires a pattern string" };
+  if (params.literal === true && params.pattern.length === 0)
+    return { ok: false, error: "literal pattern must not be empty" };
+  for (const key of ["path", "glob"]) {
+    if (params[key] !== undefined && (typeof params[key] !== "string" || params[key].length === 0)) {
+      return { ok: false, error: `${key} must be a non-empty string` };
+    }
+  }
+  for (const key of ["ignoreCase", "literal", "summary"]) {
+    if (params[key] !== undefined && typeof params[key] !== "boolean")
+      return { ok: false, error: `${key} must be a boolean` };
+  }
+  for (const key of ["context", "limit", "scopeContext"]) {
+    const value = params[key];
+    const minimum = key === "limit" ? 1 : 0;
+    if (value !== undefined && (typeof value !== "number" || !Number.isSafeInteger(value) || value < minimum)) {
+      return { ok: false, error: `${key} must be a ${minimum === 1 ? "positive" : "non-negative"} integer` };
+    }
+  }
+  if (params.scope !== undefined && params.scope !== "symbol")
+    return { ok: false, error: "scope must be symbol" };
+  if (params.scopeContext !== undefined && params.scope !== "symbol")
+    return { ok: false, error: "scopeContext requires scope" };
+  if (params.gitScope !== undefined && !GIT_SCOPES.includes(params.gitScope)) {
+    return { ok: false, error: "invalid gitScope" };
+  }
+  return { ok: true };
+}
 var VARIANT_FIELDS = {
   set_line: ["anchor", "new_text"],
   replace_lines: ["start_anchor", "end_anchor", "new_text"],
@@ -423,7 +476,6 @@ function coerceObviousBase10Int(value, name) {
   return invalidInteger(value, name);
 }
 // ../readseek-api/src/argv.ts
-var DEFAULT_STRUCTURE_DEPTH = 1;
 function appendGitScopeArgs(args, input) {
   if (input.gitScope !== undefined)
     args.push("--git-scope", input.gitScope);
@@ -684,11 +736,29 @@ function buildSearchArgs(input) {
   return finish(args);
 }
 function buildGrepArgs(input) {
-  const args = start("grep", input);
-  args.push("--text", input.text);
-  limit2(args, input.limit);
+  const validated = validateGrepParams(input);
+  if (!validated.ok)
+    throw new Error(validated.error);
+  const args = ["grep", "--kdl", `--pattern=${input.pattern}`];
+  const needsPathTerminator = input.path !== undefined && input.path.startsWith("-") && input.path !== "-";
+  if (input.path !== undefined && !needsPathTerminator)
+    args.push(input.path);
+  if (input.literal)
+    args.push("--literal");
+  if (input.ignoreCase)
+    args.push("--ignore-case");
+  if (input.glob !== undefined)
+    args.push(`--glob=${input.glob}`);
+  pushOptionalNumber(args, "--context", input.context);
+  limit2(args, input.limit ?? 100);
+  if (input.summary)
+    args.push("--summary");
+  pushOptionalString(args, "--scope", input.scope);
+  pushOptionalNumber(args, "--scope-context", input.scopeContext);
   appendGitScopeArgs(args, input);
-  return finish(args);
+  if (input.path !== undefined && needsPathTerminator)
+    args.push("--", input.path);
+  return args;
 }
 function buildDefArgs(input) {
   const args = start("def", input);
@@ -1120,25 +1190,41 @@ var DocumentOutput = Type.Object({
   assets: Type.Array(DocumentAsset, { default: [] }),
   vision: Type.Array(DocumentVision, { default: [] })
 });
-var TextHit = Type.Object({
-  line: Int,
-  column: Int,
+var GrepCount = Type.Integer({ minimum: 0, maximum: Number.MAX_SAFE_INTEGER });
+var GrepPosition = Type.Integer({ minimum: 1, maximum: Number.MAX_SAFE_INTEGER });
+var GrepAnchor = Type.String({ pattern: "^[1-9][0-9]*:[0-9a-f]{6}$" });
+var GrepLineSchema = Type.Object({
+  line: GrepPosition,
+  hash: Type.String({ pattern: "^[0-9a-f]{6}$" }),
   text: Str,
-  start_line: Int,
-  end_line: Int,
-  start_byte: Int,
-  end_byte: Int,
-  hashlines: Hashlines
+  kind: Type.Union([Type.Literal("match"), Type.Literal("context")])
 });
-var DocumentHit = Type.Object({ node_id: Str, kind: Str, snippet: Str, page: OptInt });
-var TextSearchOutput = Type.Object({
-  text: Str,
-  mode: Type.Literal("literal"),
-  total_matches: Int,
-  returned_matches: Int,
+var GrepHitSchema = Type.Object({ line: GrepPosition, column: GrepPosition, start_byte: GrepCount, end_byte: GrepCount, text: Str, anchor: GrepAnchor });
+var GrepSymbolSchema = Type.Object({ name: Str, kind: Str, start_line: GrepPosition, end_line: GrepPosition, lines: Type.Array(GrepLineSchema) });
+var GrepSourceResultSchema = Type.Object({
+  file: Str,
+  file_hash: Str,
+  language: Str,
+  total_matches: GrepCount,
+  returned_matches: GrepCount,
+  hits: Type.Array(GrepHitSchema),
+  lines: Type.Array(GrepLineSchema),
+  symbols: Type.Array(GrepSymbolSchema)
+});
+var GrepDocumentHitSchema = Type.Object({ node_id: Str, kind: Str, snippet: Str, line: GrepPosition, page: Type.Optional(GrepPosition) });
+var GrepDocumentResultSchema = Type.Object({ file: Str, content_hash: Str, total_matches: GrepCount, returned_matches: GrepCount, hits: Type.Array(GrepDocumentHitSchema) });
+var GrepOutputSchema = Type.Object({
+  pattern: Str,
+  mode: Type.Union([Type.Literal("regex"), Type.Literal("literal")]),
+  ignore_case: Bool,
+  summary: Bool,
+  total_matches: GrepCount,
+  returned_matches: GrepCount,
   truncated: Bool,
-  results: Type.Array(Type.Object({ file: Str, file_hash: Str, matches: Type.Array(TextHit) })),
-  documents: Type.Array(Type.Object({ file: Str, content_hash: Str, hits: Type.Array(DocumentHit) }))
+  count_unit: Type.Literal("lines"),
+  scope: Type.Optional(Type.Literal("symbol")),
+  results: Type.Array(GrepSourceResultSchema),
+  documents: Type.Array(GrepDocumentResultSchema)
 });
 var RuleFinding = Type.Object({
   name: Str,
@@ -1183,8 +1269,35 @@ function parseStructureEnvelope(value) {
     throw new Error("invalid readseek structure: missing structure");
   return { ...output.metadata !== undefined ? { metadata: parseDetectOutput(output.metadata) } : {}, structure: parseStructureOutput(output.structure) };
 }
-function parseTextSearchOutput(value) {
-  return parse(TextSearchOutput, value, "text search output");
+function parseGrepOutput(value) {
+  const output = parse(GrepOutputSchema, value, "grep output");
+  const invalid = (message) => {
+    throw new Error(`invalid readseek grep output: ${message}`);
+  };
+  const groups = [...output.results, ...output.documents];
+  if (output.returned_matches > output.total_matches || groups.reduce((sum, group) => sum + group.total_matches, 0) !== output.total_matches || groups.reduce((sum, group) => sum + group.returned_matches, 0) !== output.returned_matches)
+    invalid("inconsistent counts");
+  for (const group of groups) {
+    if (group.total_matches === 0 || group.returned_matches > group.total_matches)
+      invalid("inconsistent file counts");
+    if (output.summary ? group.hits.length !== 0 : group.hits.length !== group.returned_matches)
+      invalid("inconsistent hit count");
+  }
+  for (const result of output.results) {
+    if (output.summary && (result.lines.length > 0 || result.symbols.length > 0))
+      invalid("summary contains display entries");
+    if (output.scope !== "symbol" && result.symbols.length > 0)
+      invalid("symbols require symbol scope");
+    for (const hit of result.hits) {
+      if (hit.end_byte < hit.start_byte || Number(hit.anchor.split(":")[0]) !== hit.line)
+        invalid("invalid hit span or anchor");
+    }
+    for (const symbol of result.symbols) {
+      if (symbol.end_line < symbol.start_line || symbol.lines.some((line) => line.line < symbol.start_line || line.line > symbol.end_line))
+        invalid("invalid symbol range");
+    }
+  }
+  return output;
 }
 function parseRulesOutput(value) {
   return parse(RulesOutput, value, "rules output");
@@ -1301,9 +1414,9 @@ function createReadSeekClient(runner) {
       const value = await runner.kdl(buildSearchArgs({ ...options, path }), runOptions(options));
       return parseSearchOutput(value);
     },
-    async grep(path, options) {
-      const value = await runner.kdl(buildGrepArgs({ ...options, path }), runOptions(options));
-      return parseTextSearchOutput(value);
+    async grep(params) {
+      const value = await runner.kdl(buildGrepArgs(params), runOptions(params));
+      return parseGrepOutput(value);
     },
     async def(path, options) {
       const value = await runner.kdl(buildDefArgs({ ...options, path }), runOptions(options));
@@ -1786,6 +1899,46 @@ function search(root) {
     }))
   };
 }
+function grepChildren(node, allowed) {
+  if (node.children.some((child) => !allowed.includes(child.name))) {
+    throw new Error(`invalid readseek KDL grep: unexpected child of ${node.name}`);
+  }
+}
+function grepLine(node) {
+  grepChildren(node, []);
+  const parsed = line(node);
+  if (requireProperty(node, "number") !== parsed.line)
+    throw new Error("invalid readseek KDL grep line number");
+  return { ...parsed, kind: requireProperty(node, "kind") };
+}
+function grep(root) {
+  grepChildren(root, ["match", "document"]);
+  return parseGrepOutput({
+    ...properties(root),
+    results: children(root, "match").map((match) => {
+      grepChildren(match, ["hit", "line", "symbol"]);
+      return {
+        ...properties(match),
+        hits: children(match, "hit").map((hit) => {
+          grepChildren(hit, []);
+          return properties(hit);
+        }),
+        lines: children(match, "line").map(grepLine),
+        symbols: children(match, "symbol").map((symbol) => {
+          grepChildren(symbol, ["line"]);
+          return { ...properties(symbol), lines: children(symbol, "line").map(grepLine) };
+        })
+      };
+    }),
+    documents: children(root, "document").map((document) => {
+      grepChildren(document, ["hit"]);
+      return { ...properties(document), hits: children(document, "hit").map((hit) => {
+        grepChildren(hit, []);
+        return properties(hit);
+      }) };
+    })
+  });
+}
 function references(root) {
   const parsed = children(root, "reference").map((reference) => {
     const sourceLine = child(reference, "line");
@@ -1901,7 +2054,7 @@ function parseReadSeekKdl(text) {
     case "document":
       return root.properties.has("format") ? pdfDocument(root) : sourceDocument(root);
     case "search":
-      return search(root);
+      return ["mode", "ignore_case", "summary", "count_unit"].some((key) => root.properties.has(key)) ? grep(root) : search(root);
     case "check":
       return diagnostics(root);
     case "refs":
@@ -2975,19 +3128,13 @@ var readSeekCaption = client2.caption;
 var readSeekObjects = client2.objects;
 var readSeekOcr = client2.ocr;
 var readSeekSearch = client2.search;
+var readSeekGrep = client2.grep;
 var readSeekRefs = client2.refs;
 var readSeekDef = client2.def;
 var readSeekSyntax = client2.syntax;
 var readSeekCheck = client2.check;
 var readSeekEdit = client2.edit;
 var readSeekRename = client2.rename;
-async function readSeekMap(filePath, options = {}) {
-  const envelope = await client2.tree(filePath, { depth: DEFAULT_STRUCTURE_DEPTH, signal: options.signal });
-  const map = "structure" in envelope ? envelope.structure : undefined;
-  if (!map || map.language === "unknown" && map.symbols.length === 0)
-    return null;
-  return map;
-}
 
 // src/edit-syntax-validate.ts
 function dedupeSortLines(diagnostics) {
@@ -3907,29 +4054,12 @@ ${theme.fg("error", info.errorText)}`;
 }
 
 // src/grep.ts
-import { readFile as fsReadFile2, stat as fsStat } from "node:fs/promises";
-import path5 from "node:path";
-import { createGrepTool } from "@earendil-works/pi-coding-agent";
 import { Type as Type5 } from "@sinclair/typebox";
 import { Text as Text4 } from "@earendil-works/pi-tui";
 
-// src/binary-detect.ts
-function looksLikeBinary(buf) {
-  if (buf.length === 0)
-    return false;
-  if (buf.includes(0))
-    return true;
-  const decoded = buf.toString("utf8");
-  if (!decoded.includes("�"))
-    return false;
-  return !Buffer.from(decoded, "utf8").equals(buf);
-}
-
 // src/grep-output.ts
-import {
-  formatSize,
-  truncateHead
-} from "@earendil-works/pi-coding-agent";
+import path5 from "node:path";
+import { formatSize, truncateHead } from "@earendil-works/pi-coding-agent";
 
 // src/grep-budget.ts
 import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES } from "@earendil-works/pi-coding-agent";
@@ -3949,283 +4079,75 @@ function resolveGrepOutputBudget() {
 }
 
 // src/grep-output.ts
-function hasScope(group) {
-  return group.scope !== undefined;
-}
-function renderEntry(displayPath, entry) {
-  if (entry.kind === "separator")
-    return entry.text;
-  const marker = entry.kind === "match" ? ">>" : "  ";
-  return `${displayPath}:${marker}${entry.line.anchor}|${entry.line.display}`;
-}
-function renderGroupHeader(group) {
-  if (!group.scope) {
-    return `--- ${group.displayPath} (${group.matchCount} matches) ---`;
-  }
-  const parent = group.scope.symbol.parentName ? ` in ${group.scope.symbol.parentName}` : "";
-  const suffix = group.scope.contextLines !== undefined ? `, scoped to ±${group.scope.contextLines} lines` : "";
-  return `--- ${group.displayPath} :: ${group.scope.symbol.kind} ${group.scope.symbol.name}${parent} (${group.scope.symbol.startLine}-${group.scope.symbol.endLine}, ${group.matchCount} matches${suffix}) ---`;
-}
-function buildScopeMetadata(groups, warnings) {
-  return {
-    mode: "symbol",
-    groups: groups.filter(hasScope).map((group) => ({
-      path: group.absolutePath,
-      displayPath: group.displayPath,
-      symbol: group.scope.symbol,
-      matchCount: group.matchCount,
-      matchLines: [...group.scope.matchLines],
-      lineAnchors: group.entries.flatMap((entry) => entry.kind === "separator" ? [] : [entry.line.anchor])
-    })),
-    warnings: [...warnings]
-  };
-}
-function buildGrepOutput(input) {
-  const fileCount = new Set(input.groups.map((group) => group.absolutePath)).size;
-  const header = `[${input.totalMatches} matches in ${fileCount} files]`;
-  let text;
-  if (input.summary) {
-    const fileLines = [...input.groups].sort((a, b) => b.matchCount - a.matchCount).map((group) => `${group.absolutePath}: ${group.matchCount} matches`);
-    text = [header, ...fileLines].join(`
-`);
-  } else {
-    const blocks = [header];
-    for (const group of input.groups) {
-      blocks.push(renderGroupHeader(group));
-      for (const entry of group.entries) {
-        blocks.push(renderEntry(group.displayPath, entry));
+function buildGrepOutput(output, cwd) {
+  const recordBlocks = new Map;
+  const fileCount = new Set([...output.results, ...output.documents].map((group) => path5.resolve(cwd, group.file))).size;
+  const blocks = [`[${output.total_matches} matches in ${fileCount} files]`];
+  for (const group of output.results) {
+    const absolutePath = path5.resolve(cwd, group.file);
+    const displayPath = path5.relative(cwd, absolutePath) || absolutePath;
+    if (output.summary) {
+      blocks.push(`${absolutePath}: ${group.total_matches} matches`);
+      continue;
+    }
+    blocks.push(`--- ${displayPath} (${group.total_matches} matches) ---`);
+    const renderLines = (lines) => {
+      for (const line of lines) {
+        const built = buildReadSeekLineWithHash(line.line, line.hash, line.text);
+        const marker = line.kind === "match" ? ">>" : "  ";
+        blocks.push(`${displayPath}:${marker}${built.anchor}|${built.display}`);
+        recordBlocks.set(blocks.length - 1, { path: absolutePath, line: line.line, anchor: built.anchor, kind: line.kind });
       }
+    };
+    renderLines(group.lines);
+    for (const symbol of group.symbols) {
+      blocks.push(`--- ${displayPath} :: ${symbol.kind} ${symbol.name} (${symbol.start_line}-${symbol.end_line}) ---`);
+      renderLines(symbol.lines);
     }
-    text = blocks.join(`
-`);
   }
-  const passthroughLines = input.passthroughLines ?? [];
-  if (passthroughLines.length > 0) {
-    text += `
-
-${passthroughLines.join(`
-`)}`;
-  }
-  if (input.limit !== undefined && input.totalMatches === input.limit) {
-    text += `
-
-[Results truncated at ${input.limit} matches — refine pattern or increase limit]`;
+  for (const group of output.documents) {
+    const absolutePath = path5.resolve(cwd, group.file);
+    const displayPath = path5.relative(cwd, absolutePath) || absolutePath;
+    if (output.summary) {
+      blocks.push(`${absolutePath}: ${group.total_matches} matches`);
+      continue;
+    }
+    blocks.push(`--- ${displayPath} (${group.total_matches} matches, document) ---`);
+    for (const hit of group.hits) {
+      const page = hit.page === undefined ? "" : ` page:${hit.page}`;
+      blocks.push(`${displayPath} node:${hit.node_id}${page} (${hit.kind}): ${escapeControlCharsForDisplay(hit.snippet)}`);
+    }
   }
-  const scopeWarnings = input.scopeWarnings ?? [];
-  if (!input.summary && input.scopeMode === "symbol" && scopeWarnings.length > 0) {
-    text = `${scopeWarnings.map((warning) => warning.message).join(`
-
-`)}
-
-${text}`;
+  if (output.truncated) {
+    blocks.push(`
+[Results truncated: ${output.returned_matches} of ${output.total_matches} matching lines returned — refine pattern or increase limit]`);
   }
+  let text = blocks.join(`
+`);
   const budget = resolveGrepOutputBudget();
-  const truncated = truncateHead(text, {
-    maxLines: budget.maxLines,
-    maxBytes: budget.maxBytes
+  const truncated = truncateHead(text, { maxLines: budget.maxLines, maxBytes: budget.maxBytes });
+  let endOffset = 0;
+  const records = blocks.flatMap((block, index) => {
+    endOffset += block.length + (index > 0 ? 1 : 0);
+    const record = recordBlocks.get(index);
+    return record && endOffset <= truncated.content.length ? [record] : [];
   });
   if (truncated.truncated) {
     text = `${truncated.content}
 
 [Output truncated: showing ${truncated.outputLines} of ${truncated.totalLines} lines (${formatSize(truncated.outputBytes)} of ${formatSize(truncated.totalBytes)}). Refine pattern or increase limit.]`;
   }
-  const readSeekValue = {
-    tool: "grep",
-    summary: input.summary,
-    totalMatches: input.totalMatches,
-    records: input.records.map((record) => ({
-      path: record.path,
-      line: record.line,
-      anchor: record.anchor,
-      kind: record.kind
-    }))
-  };
-  if (!input.summary && input.scopeMode === "symbol") {
-    readSeekValue.scopes = buildScopeMetadata(input.groups, scopeWarnings);
-  }
   return {
     text,
-    readSeekValue
-  };
-}
-
-// src/file-map.ts
-async function getOrGenerateMap(absPath) {
-  try {
-    return await readSeekMap(absPath);
-  } catch {
-    return null;
-  }
-}
-
-// src/grep-symbol-scope.ts
-function findEnclosingSymbol(map, lineNumber) {
-  const byQualifiedName = new Map;
-  for (const symbol of map.symbols) {
-    const qname = symbol.qualified_name ?? symbol.name;
-    if (!byQualifiedName.has(qname))
-      byQualifiedName.set(qname, symbol);
-  }
-  const candidates = map.symbols.filter((symbol) => lineNumber >= symbol.start_line && lineNumber <= symbol.end_line).map((symbol) => {
-    const qname = symbol.qualified_name ?? symbol.name;
-    const dot = qname.lastIndexOf(".");
-    const parent = dot === -1 ? undefined : byQualifiedName.get(qname.slice(0, dot));
-    return {
-      name: symbol.name,
-      kind: symbol.kind === "constructor" ? "method" : symbol.kind,
-      startLine: symbol.start_line,
-      endLine: symbol.end_line,
-      parentName: parent?.name
-    };
-  }).sort((a, b) => {
-    const rangeA = a.endLine - a.startLine;
-    const rangeB = b.endLine - b.startLine;
-    if (rangeA !== rangeB)
-      return rangeA - rangeB;
-    if (a.startLine !== b.startLine)
-      return a.startLine - b.startLine;
-    return a.name.localeCompare(b.name);
-  });
-  return candidates[0] ?? null;
-}
-function firstLineNumber(group) {
-  const first = group.entries.find((e) => e.kind !== "separator");
-  return first ? first.line.line : Number.MAX_SAFE_INTEGER;
-}
-function buildSymbolEntries(fileLines, symbol, matchLines, scopeContext) {
-  if (scopeContext === undefined) {
-    const entries = [];
-    for (let lineNumber = symbol.startLine;lineNumber <= symbol.endLine; lineNumber++) {
-      const built = buildReadSeekLine(lineNumber, fileLines[lineNumber - 1] ?? "");
-      entries.push({ kind: matchLines.has(lineNumber) ? "match" : "context", line: built });
-    }
-    return entries;
-  }
-  const ranges = [...matchLines].sort((a, b) => a - b).map((ln) => ({
-    startLine: Math.max(symbol.startLine, ln - scopeContext),
-    endLine: Math.min(symbol.endLine, ln + scopeContext)
-  }));
-  const merged = [];
-  for (const r of ranges) {
-    const last = merged[merged.length - 1];
-    if (last && r.startLine <= last.endLine + 1) {
-      last.endLine = Math.max(last.endLine, r.endLine);
-    } else {
-      merged.push({ ...r });
-    }
-  }
-  const entries = [];
-  for (let i = 0;i < merged.length; i++) {
-    if (i > 0)
-      entries.push({ kind: "separator", text: "--" });
-    const range = merged[i];
-    for (let ln = range.startLine;ln <= range.endLine; ln++) {
-      const built = buildReadSeekLine(ln, fileLines[ln - 1] ?? "");
-      entries.push({ kind: matchLines.has(ln) ? "match" : "context", line: built });
-    }
-  }
-  return entries;
-}
-function buildFallbackEntries(fileLines, matchLines, contextLines) {
-  const lineMap = new Map;
-  for (const matchLine of matchLines) {
-    const start = Math.max(1, matchLine - contextLines);
-    const end = Math.min(fileLines.length, matchLine + contextLines);
-    for (let lineNumber = start;lineNumber <= end; lineNumber++) {
-      const built = buildReadSeekLine(lineNumber, fileLines[lineNumber - 1] ?? "");
-      const candidate = { kind: lineNumber === matchLine ? "match" : "context", line: built };
-      const existing = lineMap.get(lineNumber);
-      if (!existing || existing.kind === "context" && candidate.kind === "match") {
-        lineMap.set(lineNumber, candidate);
-      }
-    }
-  }
-  const ordered = [...lineMap.entries()].sort(([a], [b]) => a - b);
-  const entries = [];
-  for (let i = 0;i < ordered.length; i++) {
-    if (i > 0 && ordered[i][0] > ordered[i - 1][0] + 1)
-      entries.push({ kind: "separator", text: "--" });
-    entries.push(ordered[i][1]);
-  }
-  return entries;
-}
-function scopeGrepGroupsToSymbols(input) {
-  const warnings = [];
-  const rendered = [];
-  for (const group of input.groups) {
-    const fileLines = input.fileLinesByPath.get(group.absolutePath);
-    const fileMap = input.fileMapsByPath.get(group.absolutePath) ?? null;
-    if (!fileLines || !fileMap) {
-      warnings.push({
-        code: "unmappable-file",
-        message: `[Warning: symbol scoping unavailable for ${group.absolutePath} — showing normal grep lines for this file]`,
-        path: group.absolutePath
-      });
-      rendered.push({ order: firstLineNumber(group), group });
-      continue;
-    }
-    const symbolBuckets = new Map;
-    const fallbackMatchLines = [];
-    for (const entry of group.entries) {
-      if (entry.kind !== "match")
-        continue;
-      const symbol = findEnclosingSymbol(fileMap, entry.line.line);
-      if (!symbol) {
-        fallbackMatchLines.push(entry.line.line);
-        warnings.push({
-          code: "no-enclosing-symbol",
-          message: `[Warning: no enclosing symbol for ${group.absolutePath}:${entry.line.line} — showing normal grep lines for this match]`,
-          path: group.absolutePath,
-          line: entry.line.line
-        });
-        continue;
-      }
-      const key = `${symbol.startLine}:${symbol.endLine}:${symbol.parentName ?? ""}:${symbol.name}`;
-      const bucket = symbolBuckets.get(key) ?? { symbol, matchLines: new Set };
-      bucket.matchLines.add(entry.line.line);
-      symbolBuckets.set(key, bucket);
-    }
-    const scopedGroups = [...symbolBuckets.values()].sort((a, b) => {
-      if (a.symbol.startLine !== b.symbol.startLine)
-        return a.symbol.startLine - b.symbol.startLine;
-      return a.symbol.name.localeCompare(b.symbol.name);
-    }).map(({ symbol, matchLines }) => ({
-      displayPath: group.displayPath,
-      absolutePath: group.absolutePath,
-      matchCount: matchLines.size,
-      scope: {
-        mode: "symbol",
-        symbol,
-        matchLines: [...matchLines].sort((a, b) => a - b),
-        ...input.scopeContext !== undefined ? { contextLines: input.scopeContext } : {}
-      },
-      entries: buildSymbolEntries(fileLines, symbol, matchLines, input.scopeContext)
-    }));
-    for (const scopedGroup of scopedGroups)
-      rendered.push({ order: scopedGroup.scope.symbol.startLine, group: scopedGroup });
-    if (fallbackMatchLines.length > 0) {
-      rendered.push({
-        order: Math.min(...fallbackMatchLines),
-        group: {
-          displayPath: group.displayPath,
-          absolutePath: group.absolutePath,
-          matchCount: fallbackMatchLines.length,
-          entries: buildFallbackEntries(fileLines, fallbackMatchLines, input.contextLines)
-        }
-      });
-    }
-    if (scopedGroups.length === 0 && fallbackMatchLines.length === 0) {
-      rendered.push({ order: firstLineNumber(group), group });
+    readSeekValue: {
+      ...output,
+      tool: "grep",
+      totalMatches: output.total_matches,
+      returnedMatches: output.returned_matches,
+      fileCount,
+      records
     }
-  }
-  rendered.sort((a, b) => {
-    if (a.order !== b.order)
-      return a.order - b.order;
-    if (a.group.absolutePath !== b.group.absolutePath)
-      return a.group.absolutePath.localeCompare(b.group.absolutePath);
-    return a.group.displayPath.localeCompare(b.group.displayPath);
-  });
-  return { groups: rendered.map((item) => item.group), warnings };
+  };
 }
 
 // src/grep-render-helpers.ts
@@ -4243,7 +4165,6 @@ function formatGrepCallText(args) {
     suffix: parts.length > 0 ? parts.join(" ") : undefined
   };
 }
-var GREP_TRUNCATION_THRESHOLD = 50;
 function formatGrepResultText(input) {
   if (input.isError && input.errorText) {
     return {
@@ -4256,17 +4177,15 @@ function formatGrepResultText(input) {
   }
   const { totalMatches, summary, fileCount } = input;
   const noMatches = totalMatches === 0;
-  const truncated = totalMatches > GREP_TRUNCATION_THRESHOLD;
+  const truncated = input.truncated ?? false;
   const matchWord = totalMatches === 1 ? "match" : "matches";
   const fileWord = fileCount === 1 ? "file" : "files";
   const summaryText = noMatches ? "" : `✓ ${totalMatches} ${matchWord} in ${fileCount} ${fileWord}`;
   const badges = [];
   if (truncated)
-    badges.push("10/file cap");
+    badges.push("truncated");
   if (summary)
     badges.push("summary");
-  if (input.hasBinaryWarning)
-    badges.push("⚠ binary");
   return {
     summary: summaryText,
     badges,
@@ -4319,78 +4238,12 @@ var grepSchema = Type5.Object({
   scope: Type5.Optional(Type5.Literal("symbol", {
     description: PARAM_DESCRIPTIONS.grepScope
   })),
-  scopeContext: optionalIntOrString(PARAM_DESCRIPTIONS.scopeContext)
+  scopeContext: optionalIntOrString(PARAM_DESCRIPTIONS.scopeContext),
+  ...readSeekGitSearchParams()
 });
-var MATCH_LINE_RE = /^(.*?):(\d+): (.*)$/;
-var CONTEXT_LINE_RE = /^(.*?)-(\d+)- (.*)$/;
-function parseGrepOutputLine(line) {
-  const match = line.match(MATCH_LINE_RE);
-  if (match) {
-    return {
-      kind: "match",
-      displayPath: match[1],
-      lineNumber: Number.parseInt(match[2], 10),
-      text: match[3]
-    };
-  }
-  const context = line.match(CONTEXT_LINE_RE);
-  if (context) {
-    return {
-      kind: "context",
-      displayPath: context[1],
-      lineNumber: Number.parseInt(context[2], 10),
-      text: context[3]
-    };
-  }
-  return null;
-}
-var GREP_MAX_MATCHES_PER_FILE = 10;
-function dedupeContextEntries(entries) {
-  if (entries.length === 0)
-    return entries;
-  const byLine = new Map;
-  for (const entry of entries) {
-    if (entry.kind === "separator")
-      continue;
-    const existing = byLine.get(entry.line.line);
-    if (!existing || entry.kind === "match" && existing.kind === "context") {
-      byLine.set(entry.line.line, entry);
-    }
-  }
-  const sorted = [...byLine.entries()].sort(([a], [b]) => a - b);
-  const result = [];
-  for (let i = 0;i < sorted.length; i++) {
-    if (i > 0 && sorted[i][0] > sorted[i - 1][0] + 1) {
-      result.push({ kind: "separator", text: "--" });
-    }
-    result.push(sorted[i][1]);
-  }
-  return result;
-}
-function truncateGroupEntries(group) {
-  let matchesSeen = 0;
-  let truncatedCount = 0;
-  const kept = [];
-  for (const entry of group.entries) {
-    if (entry.kind === "match") {
-      matchesSeen++;
-      if (matchesSeen <= GREP_MAX_MATCHES_PER_FILE) {
-        kept.push(entry);
-      } else {
-        truncatedCount++;
-      }
-    } else if (matchesSeen <= GREP_MAX_MATCHES_PER_FILE) {
-      kept.push(entry);
-    }
-  }
-  if (truncatedCount > 0) {
-    kept.push({ kind: "separator", text: `... +${truncatedCount} more matches` });
-  }
-  return { ...group, entries: kept };
-}
 async function executeGrep(opts) {
-  const { toolCallId, params, signal, onUpdate, cwd, onFileAnchored } = opts;
-  await ensureHashInit();
+  const { params, signal, cwd, onFileAnchored } = opts;
+  signal?.throwIfAborted();
   const rawParams = params;
   const context = coerceObviousBase10Int(rawParams.context, "context");
   if (!context.ok) {
@@ -4418,261 +4271,28 @@ async function executeGrep(opts) {
     const message = `Invalid scopeContext: expected a non-negative integer, received ${scopeContext.value}.`;
     return buildToolErrorResult("grep", "invalid-params-combo", message);
   }
-  const p = {
-    ...rawParams,
+  const output = await readSeekGrep({
+    pattern: rawParams.pattern,
+    path: resolveToCwd(rawParams.path ?? ".", cwd),
+    glob: rawParams.glob,
+    ignoreCase: rawParams.ignoreCase,
+    literal: rawParams.literal,
     context: context.value,
     limit: limit.value,
-    scopeContext: scopeContext.value
-  };
-  const builtin = createGrepTool(cwd);
-  const result = await builtin.execute(toolCallId, {
-    ...p,
-    context: context.value,
-    limit: limit.value
-  }, signal, onUpdate);
-  const textBlock = result.content?.find((item) => item.type === "text" && ("text" in item) && typeof item.text === "string");
-  if (!textBlock?.text)
-    return result;
-  const { path: rawSearchPath } = p;
-  const searchPath = resolveToCwd(rawSearchPath || ".", cwd);
-  let searchPathIsDirectory = false;
-  try {
-    searchPathIsDirectory = (await fsStat(searchPath)).isDirectory();
-  } catch {
-    searchPathIsDirectory = false;
-  }
-  if (!searchPathIsDirectory) {
-    try {
-      const buf = await fsReadFile2(searchPath);
-      if (looksLikeBinary(buf)) {
-        const warning = `[Warning: '${p.path ?? searchPath}' appears to be a binary file — grep skips binary files by default. Use a hex tool or the read tool to inspect it.]`;
-        return {
-          ...result,
-          content: result.content.map((item) => item === textBlock ? { ...item, text: warning } : item),
-          details: {
-            ...typeof result.details === "object" && result.details !== null ? result.details : {},
-            readSeekValue: {
-              tool: "grep",
-              summary: !!p.summary,
-              totalMatches: 0,
-              records: []
-            }
-          }
-        };
-      }
-    } catch {}
-  }
-  const fileCache = new Map;
-  const bareCRFiles = new Set;
-  const getFileLines = async (absolutePath) => {
-    throwIfAborted(signal);
-    if (fileCache.has(absolutePath))
-      return fileCache.get(absolutePath);
-    try {
-      const rawBuffer = await fsReadFile2(absolutePath);
-      if (looksLikeBinary(rawBuffer)) {
-        fileCache.set(absolutePath, undefined);
-        return;
-      }
-      const raw = rawBuffer.toString("utf-8");
-      if (hasBareCarriageReturn(raw))
-        bareCRFiles.add(absolutePath);
-      const lines = normalizeToLF(stripBom(raw).text).split(`
-`);
-      fileCache.set(absolutePath, lines);
-      return lines;
-    } catch {
-      fileCache.set(absolutePath, undefined);
-      return;
-    }
-  };
-  const toAbsolutePath = (displayPath) => {
-    if (searchPathIsDirectory)
-      return path5.resolve(searchPath, displayPath);
-    return searchPath;
-  };
-  const groupsByPath = new Map;
-  const passthroughLines = [];
-  let totalMatches = 0;
-  let parsedCount = 0;
-  let candidateUnparsedCount = 0;
-  const candidateLinePattern = /^.+(?::|-)\d+(?::|-)\s/;
-  if (!p.summary) {
-    const pathsToRead = new Set;
-    for (const line of textBlock.text.split(`
-`)) {
-      throwIfAborted(signal);
-      const parsed = parseGrepOutputLine(line);
-      if (parsed && Number.isFinite(parsed.lineNumber) && parsed.lineNumber >= 1) {
-        pathsToRead.add(toAbsolutePath(parsed.displayPath));
-      }
-    }
-    const CONCURRENCY = 8;
-    const pathList = [...pathsToRead];
-    for (let i = 0;i < pathList.length; i += CONCURRENCY) {
-      await Promise.all(pathList.slice(i, i + CONCURRENCY).map((p) => getFileLines(p)));
-    }
-  }
-  const addSummaryMatch = (displayPath, absolutePath) => {
-    let group = groupsByPath.get(displayPath);
-    if (!group) {
-      group = { displayPath, absolutePath, matchCount: 0, entries: [] };
-      groupsByPath.set(displayPath, group);
-    }
-    group.matchCount++;
-    totalMatches++;
-  };
-  const addEntry = (displayPath, absolutePath, kind, line) => {
-    let group = groupsByPath.get(displayPath);
-    if (!group) {
-      group = { displayPath, absolutePath, matchCount: 0, entries: [] };
-      groupsByPath.set(displayPath, group);
-    }
-    group.entries.push({ kind, line });
-    if (kind === "match") {
-      group.matchCount++;
-      totalMatches++;
-    }
-  };
-  for (const line of textBlock.text.split(`
-`)) {
-    throwIfAborted(signal);
-    const parsed = parseGrepOutputLine(line);
-    if (!parsed || !Number.isFinite(parsed.lineNumber) || parsed.lineNumber < 1) {
-      if (candidateLinePattern.test(line)) {
-        candidateUnparsedCount++;
-      }
-      const trimmed = line.trim();
-      if (trimmed.startsWith("[") && trimmed.endsWith("]")) {
-        passthroughLines.push(trimmed);
-      }
-      continue;
-    }
-    parsedCount++;
-    const absolute = toAbsolutePath(parsed.displayPath);
-    if (p.summary) {
-      if (parsed.kind === "match") {
-        addSummaryMatch(parsed.displayPath, absolute);
-      }
-      continue;
-    }
-    const fileLines = await getFileLines(absolute);
-    if (fileLines === undefined)
-      continue;
-    if (parsed.kind === "match" && bareCRFiles.has(absolute)) {
-      const flags = p.ignoreCase ? "i" : "";
-      let patternRe = null;
-      try {
-        patternRe = p.literal ? new RegExp(p.pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&"), flags) : new RegExp(p.pattern, flags);
-      } catch {}
-      if (patternRe !== null) {
-        let emitted = false;
-        for (let i = 0;i < fileLines.length; i++) {
-          if (!patternRe.test(fileLines[i]))
-            continue;
-          addEntry(parsed.displayPath, absolute, "match", buildReadSeekLine(i + 1, fileLines[i]));
-          emitted = true;
-        }
-        if (emitted)
-          continue;
-      }
-    }
-    const sourceLine = fileLines[parsed.lineNumber - 1] ?? parsed.text;
-    const built = buildReadSeekLine(parsed.lineNumber, sourceLine);
-    addEntry(parsed.displayPath, absolute, parsed.kind, {
-      ...built,
-      display: escapeControlCharsForDisplay(parsed.text)
-    });
-  }
-  if (p.summary && parsedCount === 0 && candidateUnparsedCount > 0) {
-    const passthroughDetails = typeof result.details === "object" && result.details !== null ? result.details : {};
-    return {
-      ...result,
-      details: {
-        ...passthroughDetails,
-        readSeekValue: {
-          tool: "grep",
-          summary: true,
-          totalMatches: 0,
-          records: []
-        }
-      }
-    };
-  }
-  if (parsedCount === 0 && candidateUnparsedCount > 0) {
-    const warning = "[hashline grep passthrough] Unparsed grep format; returned original output.";
-    const passthroughDetails = typeof result.details === "object" && result.details !== null ? result.details : {};
-    return {
-      ...result,
-      content: result.content.map((item) => item === textBlock ? { ...item, text: `${textBlock.text}
-
-${warning}` } : item),
-      details: {
-        ...passthroughDetails,
-        hashlinePassthrough: true,
-        hashlineWarning: warning,
-        readSeekValue: {
-          tool: "grep",
-          summary: !!p.summary,
-          totalMatches: 0,
-          records: []
-        }
-      }
-    };
-  }
-  const summary = !!p.summary;
-  const effectiveLimit = typeof p.limit === "number" ? p.limit : 100;
-  const groups = [...groupsByPath.values()];
-  for (const group of groups) {
-    group.entries = dedupeContextEntries(group.entries);
-  }
-  let renderedGroups = totalMatches > GREP_TRUNCATION_THRESHOLD ? groups.map(truncateGroupEntries) : groups;
-  let scopeWarnings = [];
-  if (p.scope === "symbol" && !summary) {
-    const fileLinesByPath = new Map;
-    const fileMapsByPath = new Map;
-    for (const group of renderedGroups) {
-      const lines = await getFileLines(group.absolutePath);
-      if (lines)
-        fileLinesByPath.set(group.absolutePath, lines);
-      fileMapsByPath.set(group.absolutePath, await getOrGenerateMap(group.absolutePath));
-    }
-    const scoped = scopeGrepGroupsToSymbols({
-      groups: renderedGroups,
-      fileLinesByPath,
-      fileMapsByPath,
-      contextLines: typeof p.context === "number" ? p.context : 0,
-      scopeContext: typeof p.scopeContext === "number" ? p.scopeContext : undefined
-    });
-    renderedGroups = scoped.groups;
-    scopeWarnings = scoped.warnings;
-  }
-  const readSeekRecords = renderedGroups.flatMap((group) => group.entries.flatMap((entry) => entry.kind === "separator" ? [] : [{ path: group.absolutePath, ...entry.line, kind: entry.kind }]));
-  const builtOutput = buildGrepOutput({
-    summary: !!summary,
-    totalMatches,
-    groups: renderedGroups,
-    limit: effectiveLimit,
-    records: readSeekRecords,
-    scopeMode: p.scope === "symbol" && !summary ? "symbol" : undefined,
-    scopeWarnings,
-    passthroughLines
+    summary: rawParams.summary,
+    scope: rawParams.scope,
+    scopeContext: scopeContext.value,
+    gitScope: rawParams.gitScope,
+    signal
   });
-  if (!summary && readSeekRecords.length > 0) {
-    const anchoredPaths = new Set(readSeekRecords.map((record) => record.path));
-    for (const absolutePath of anchoredPaths) {
-      onFileAnchored?.(absolutePath);
-    }
+  signal?.throwIfAborted();
+  const builtOutput = buildGrepOutput(output, cwd);
+  for (const absolutePath of new Set(builtOutput.readSeekValue.records.map((record) => record.path))) {
+    onFileAnchored?.(absolutePath);
   }
-  const existingDetails = typeof result.details === "object" && result.details !== null ? result.details : {};
-  const { linesTruncated: _ignoredLinesTruncated, truncation: _ignoredTruncation, ...compactDetails } = existingDetails;
   return {
-    ...result,
-    content: result.content.map((item) => item === textBlock ? { ...item, text: builtOutput.text } : item),
-    details: {
-      ...compactDetails,
-      readSeekValue: builtOutput.readSeekValue
-    }
+    content: [{ type: "text", text: builtOutput.text }],
+    details: { readSeekValue: builtOutput.readSeekValue }
   };
 }
 function registerGrepTool(pi, options = {}) {
@@ -4727,22 +4347,16 @@ function registerGrepTool(pi, options = {}) {
       if (isError || result.isError)
         return renderErrorResult(textContent, { expanded, width, theme });
       const readSeekValue = result.details?.readSeekValue;
-      const hasBinaryWarning = textContent.includes("appears to be a binary file");
-      const fileSet = new Set;
-      for (const r of readSeekValue?.records ?? []) {
-        if (r.path)
-          fileSet.add(r.path);
-      }
       const info = formatGrepResultText({
         totalMatches: readSeekValue?.totalMatches ?? 0,
         summary: readSeekValue?.summary ?? false,
         records: readSeekValue?.records ?? [],
-        fileCount: fileSet.size,
-        hasBinaryWarning
+        fileCount: readSeekValue?.fileCount ?? 0,
+        truncated: readSeekValue?.truncated
       });
-      if (info.noMatches && !hasBinaryWarning)
+      if (info.noMatches)
         return new Text4(summaryLine("no matches", { theme, style: "dim" }), 0, 0);
-      const matchCount = readSeekValue?.totalMatches ?? 0;
+      const matchCount = readSeekValue?.returnedMatches ?? 0;
       const matchWord = matchCount === 1 ? "match" : "matches";
       let text = summaryLine(`${matchCount} ${matchWord} returned`, {
         hidden: !!textContent && !expanded,
@@ -4769,10 +4383,10 @@ import path6 from "node:path";
 import { Type as Type6 } from "@sinclair/typebox";
 
 // src/stat-search-path.ts
-import { stat as fsStat2 } from "node:fs/promises";
+import { stat as fsStat } from "node:fs/promises";
 async function statSearchPathOrError(tool, rawPath, searchPath) {
   try {
-    return { ok: true, stats: await fsStat2(searchPath) };
+    return { ok: true, stats: await fsStat(searchPath) };
   } catch (err) {
     const path = rawPath ?? searchPath;
     const { code, message } = formatFsError(err, "stat-error");
@@ -5251,6 +4865,18 @@ import { withFileMutationQueue as withFileMutationQueue2, truncateHead as trunca
 import { Text as Text6 } from "@earendil-works/pi-tui";
 import { Type as Type9 } from "@sinclair/typebox";
 
+// src/binary-detect.ts
+function looksLikeBinary(buf) {
+  if (buf.length === 0)
+    return false;
+  if (buf.includes(0))
+    return true;
+  const decoded = buf.toString("utf8");
+  if (!decoded.includes("�"))
+    return false;
+  return !Buffer.from(decoded, "utf8").equals(buf);
+}
+
 // src/pending-diff-preview.ts
 import { existsSync as existsSync3, readFileSync as readFileSync2, realpathSync, statSync as statSync4 } from "node:fs";
 import { dirname, isAbsolute, relative as relative2, resolve, sep } from "node:path";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-readseek",
-  "version": "0.12.0",
+  "version": "0.12.1",
   "description": "Pi extension for LINE:HASH-anchored file operations and structural code navigation",
   "type": "module",
   "exports": {
@@ -39,8 +39,8 @@
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@jarkkojs/readseek": "^0.12.0",
-    "@jarkkojs/readseek-api": "^0.12.0",
+    "@jarkkojs/readseek": "^0.12.1",
+    "@jarkkojs/readseek-api": "^0.12.1",
     "diff": "^9.0.0",
     "xxhash-wasm": "^1.1.0"
   },

package/prompts/grep.md

@@ -1,4 +1,4 @@
-Search text or regex in files and return edit-ready `LINE:HASH` anchors. Use for identifiers, strings, configuration, errors, comments, and documentation.
+Search text or regex with native ReadSeek. Source results return edit-ready `LINE:HASH` anchors; document results return `node:`/`page:` selectors, not editable anchors.
 
 ## Modes
 
@@ -13,15 +13,16 @@ Search text or regex in files and return edit-ready `LINE:HASH` anchors. Use for
 
 ## Parameters
 
-- `pattern` — regular expression by default; set `literal: true` for exact text.
+- `pattern` — UTF-8 RE2 regular expression by default; set `literal: true` for exact text. Lookaround and backreferences are not supported.
 - `path` — file or directory; defaults to the current directory.
 - `glob` — file-name filter such as `*.ts` or `**/*.test.ts`.
 - `ignoreCase` — case-insensitive search.
 - `context` — surrounding lines in normal mode.
-- `limit` — maximum matches; defaults to 100.
+- `limit` — maximum matching lines (not occurrences); positive, defaults to 100.
 - `summary` — return counts without anchors.
 - `scope` — only `"symbol"` is supported.
-- `scopeContext` — non-negative context inside symbol scope.
+- `scopeContext` — non-negative context inside symbol scope; requires `scope: "symbol"`.
+- `gitScope` — `tracked`, `untracked`, `ignored`, or `all`; defaults to tracked plus untracked files.
 
 If `limit` or the display budget truncates output, start with `summary`, narrow
 the file set and pattern, then request context or symbol blocks.