pi-readseek 0.11.4 → 0.12.0

package/dist/index.ts

@@ -16,22 +16,22 @@ var EDIT_VARIANTS = [
 ];
 var GIT_SCOPES = ["tracked", "untracked", "ignored", "all"];
 var TOOL_NAMES = [
-  "show_content",
-  "show_structure",
-  "show_metadata",
-  "show_assets",
-  "check_syntax",
-  "check_rules",
-  "generate_caption",
-  "detect_objects",
-  "recognize_text",
-  "find_nodes",
-  "find_text",
-  "find_definitions",
-  "find_references",
-  "edit_text",
-  "rename_symbol",
-  "write_file"
+  "show",
+  "tree",
+  "meta",
+  "assets",
+  "syntax",
+  "check",
+  "caption",
+  "objects",
+  "ocr",
+  "search",
+  "grep",
+  "def",
+  "refs",
+  "edit",
+  "rename",
+  "write"
 ];
 var PARAM_DESCRIPTIONS = {
   path: "Absolute or relative file path",
@@ -47,8 +47,8 @@ var PARAM_DESCRIPTIONS = {
   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.",
-  at: "Location selector: line:N[:COLUMN], hash:H[:COLUMN], symbol:NAME, page:N, node:ID, or asset:ID",
-  assetAt: "Document selector: page:N, node:ID, or asset:ID",
+  at: "Location selector: N[:COLUMN], START-END, H[:COLUMN], NAME, line:N[:COLUMN], hash:H[:COLUMN], symbol:NAME, page:N, node:ID, or asset:ID",
+  assetAt: "Document selector: N, page:N, node:ID, or asset:ID",
   rule: "KDL node selection rule, @path, or '-' for standard input",
   rules: "KDL structural checks, @path, or '-' for standard input",
   stdinName: "File name hint when the target is '-'",
@@ -60,7 +60,7 @@ 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 find_text also supports regex via pattern",
+  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":"..."}}',
@@ -97,22 +97,22 @@ var PARAM_DESCRIPTIONS = {
   scopeContext: "Context lines within each symbol"
 };
 var TOOL_DESCRIPTIONS = {
-  show_content: "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.",
-  show_structure: "Show parsed source or document hierarchy. Use shallow depth for file overviews.",
-  show_metadata: "Show format, source identity, language, dimensions, or page count without decoding image content or inference.",
-  show_assets: "Return selected document asset descriptors with usable cached paths. Adapters attach images from those paths.",
-  check_syntax: "Check parser syntax diagnostics. Exit 0 is clean, 1 has findings, 2 is failure; this is not type checking.",
-  check_rules: "Evaluate KDL structural assertions. Exit 0 is clean, 1 has findings, 2 is failure.",
-  generate_caption: "Explicitly infer a caption using an installed model. Include text and objects to request OCR and detection too; never downloads models automatically.",
-  detect_objects: "Explicitly infer object labels and bounding boxes using an installed model.",
-  recognize_text: "Explicitly recognize text from pixels using an installed model; reading never silently invokes OCR.",
-  find_nodes: "Find AST nodes by pattern or KDL selection rule. Returns edit-ready anchors. Use `find_text` for text and regex.",
-  find_text: "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.",
-  find_definitions: "Find a symbol definition or declaration by qualified or unqualified name.",
-  find_references: "Find identifier-name matches with name, or binding-scoped references with at. Use before renaming or deleting a symbol.",
-  edit_text: "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.",
-  rename_symbol: "Rename a symbol at a line or hash cursor with binding-aware edits and stale-plan protection.",
-  write_file: "Create or replace a complete text file and return `LINE:HASH` anchors. Use `edit_text` for small changes."
+  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.",
+  tree: "Show parsed source or document hierarchy. Use shallow depth for file overviews.",
+  meta: "Show format, source identity, language, dimensions, or page count without decoding image content or inference.",
+  assets: "Return selected document asset descriptors with usable cached paths. Adapters attach images from those paths.",
+  syntax: "Check parser syntax diagnostics. Exit 0 is clean, 1 has findings, 2 is failure; this is not type checking.",
+  check: "Evaluate KDL structural assertions. Exit 0 is clean, 1 has findings, 2 is failure.",
+  caption: "Explicitly infer a caption using an installed model. Include text and objects to request OCR and detection too; never downloads models automatically.",
+  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.",
+  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.",
+  rename: "Rename a symbol at a line or hash cursor with binding-aware edits and stale-plan protection.",
+  write: "Create or replace a complete text file and return `LINE:HASH` anchors. Use `edit` for small changes."
 };
 function rewriteBacktickedToolNames(text, aliases = {}) {
   return TOOL_NAMES.reduce((rewritten, toolName) => rewritten.replaceAll(`\`${toolName}\``, `\`${aliases[toolName] ?? toolName}\``), text);
@@ -205,22 +205,22 @@ function tool(name, title, properties, required) {
   return { name, title, description: TOOL_DESCRIPTIONS[name], inputSchema: { type: "object", properties, required, additionalProperties: false } };
 }
 var TOOL_CONTRACTS = [
-  tool("show_content", "Show content", { ...path, ...at, ...lang, ...stdin, ...noAnchors, end: integer(PARAM_DESCRIPTIONS.end), limit: integer(PARAM_DESCRIPTIONS.limit) }, ["path"]),
-  tool("show_structure", "Show structure", { ...path, ...at, ...lang, ...stdin, depth: integer(PARAM_DESCRIPTIONS.depth, 0), kind: string(PARAM_DESCRIPTIONS.kind), outline: { type: "boolean", description: PARAM_DESCRIPTIONS.outline } }, ["path"]),
-  tool("show_metadata", "Show metadata", { ...path, ...lang, ...stdin }, ["path"]),
-  tool("show_assets", "Show assets", { ...path, at: string(PARAM_DESCRIPTIONS.assetAt), ...stdin }, ["path"]),
-  tool("check_syntax", "Check syntax", { ...path, ...lang, ...stdin }, ["path"]),
-  tool("check_rules", "Check rules", { path: string(PARAM_DESCRIPTIONS.searchPath), ...gitScopeSchema, rules: string(PARAM_DESCRIPTIONS.rules) }, ["rules"]),
-  tool("generate_caption", "Generate caption", { ...path, ...at, ...stdin, ...level, include: { type: "array", items: { type: "string", enum: ["text", "objects"] }, minItems: 1, uniqueItems: true, description: PARAM_DESCRIPTIONS.include } }, ["path"]),
-  tool("detect_objects", "Detect objects", { ...path, ...at, ...stdin, ...level }, ["path"]),
-  tool("recognize_text", "Recognize text", { ...path, ...at, ...stdin, ...level }, ["path"]),
-  tool("find_nodes", "Find 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("find_text", "Find 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("find_definitions", "Find definitions", { ...path, ...lang, ...gitScopeSchema, ...noAnchors, name: string(PARAM_DESCRIPTIONS.name) }, ["name"]),
-  tool("find_references", "Find references", { ...path, ...at, ...lang, ...gitScopeSchema, ...noAnchors, name: string(PARAM_DESCRIPTIONS.refsName) }, []),
-  tool("edit_text", "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"]),
-  tool("rename_symbol", "Rename symbol", { ...path, ...at, ...lang, ...gitScopeSchema, ...apply, to: string(PARAM_DESCRIPTIONS.to), workspace: { type: "boolean", description: PARAM_DESCRIPTIONS.workspace } }, ["path", "at", "to"]),
-  tool("write_file", "Write file", { ...path, content: string(PARAM_DESCRIPTIONS.content) }, ["path", "content"])
+  tool("show", "Show content", { ...path, ...at, ...lang, ...stdin, ...noAnchors, end: integer(PARAM_DESCRIPTIONS.end), limit: integer(PARAM_DESCRIPTIONS.limit) }, ["path"]),
+  tool("tree", "Show structure", { ...path, ...at, ...lang, ...stdin, depth: integer(PARAM_DESCRIPTIONS.depth, 0), kind: string(PARAM_DESCRIPTIONS.kind), outline: { type: "boolean", description: PARAM_DESCRIPTIONS.outline } }, ["path"]),
+  tool("meta", "Show metadata", { ...path, ...lang, ...stdin }, ["path"]),
+  tool("assets", "Show assets", { ...path, at: string(PARAM_DESCRIPTIONS.assetAt), ...stdin }, ["path"]),
+  tool("syntax", "Check syntax", { ...path, ...lang, ...stdin }, ["path"]),
+  tool("check", "Check rules", { path: string(PARAM_DESCRIPTIONS.searchPath), ...gitScopeSchema, rules: string(PARAM_DESCRIPTIONS.rules) }, ["rules"]),
+  tool("caption", "Generate caption", { ...path, ...at, ...stdin, ...level, include: { type: "array", items: { type: "string", enum: ["text", "objects"] }, minItems: 1, uniqueItems: true, description: PARAM_DESCRIPTIONS.include } }, ["path"]),
+  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("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"]),
+  tool("rename", "Rename symbol", { ...path, ...at, ...lang, ...gitScopeSchema, ...apply, to: string(PARAM_DESCRIPTIONS.to), workspace: { type: "boolean", description: PARAM_DESCRIPTIONS.workspace } }, ["path", "at", "to"]),
+  tool("write", "Write file", { ...path, content: string(PARAM_DESCRIPTIONS.content) }, ["path", "content"])
 ];
 function getToolContract(name) {
   const contract = TOOL_CONTRACTS.find((entry) => entry.name === name);
@@ -231,44 +231,44 @@ function getToolContract(name) {
 // ../readseek-api/src/policy.ts
 var REPLACEABLE_TOOLS = [
   {
-    tool: "show_content",
+    tool: "show",
     builtIn: "read",
     benefit: "it returns LINE:HASH anchors for safe edits."
   },
   {
-    tool: "edit_text",
+    tool: "edit",
     builtIn: "edit",
     benefit: "it verifies fresh LINE:HASH anchors."
   },
   {
-    tool: "find_text",
+    tool: "grep",
     builtIn: "grep",
     benefit: "it returns LINE:HASH anchors."
   },
   {
-    tool: "write_file",
+    tool: "write",
     builtIn: "write",
     benefit: "it returns LINE:HASH anchors."
   }
 ];
 var TOOL_COMPACT_GUIDELINES = {
-  show_content: [
-    "Use `show_structure` for shallow overviews and `check_syntax` for diagnostics; use `find_definitions`, `find_references`, or `find_nodes` for targeted symbol questions."
+  show: [
+    "Use `tree` for shallow overviews and `syntax` for diagnostics; use `def`, `refs`, or `search` for targeted symbol questions."
   ],
-  edit_text: [
+  edit: [
     "Prefer set_line, replace_lines, and insert_after; use replace only when anchors are impractical."
   ],
-  find_text: [
-    "Use `find_text` with summary first for broad searches, then narrow by path, glob, or pattern."
+  grep: [
+    "Use `grep` with summary first for broad searches, then narrow by path, glob, or pattern."
   ],
-  write_file: [
-    "Use anchored edits rather than `write_file` for small changes or appends."
+  write: [
+    "Use anchored edits rather than `write` for small changes or appends."
   ],
-  find_nodes: [
-    "Use `find_nodes` for AST patterns; use `find_text` for plain text."
+  search: [
+    "Use `search` for AST patterns; use `grep` for plain text."
   ],
-  find_references: [
-    "Use `find_references` before changing a symbol; use at with line:N:C to follow one binding."
+  refs: [
+    "Use `refs` before changing a symbol; use at with line:N:C to follow one binding."
   ]
 };
 function resolveToolName(name, aliases = {}) {
@@ -279,21 +279,21 @@ function renderCompactGuidelines(name, aliases = {}) {
 }
 function renderToolRoutingPolicy(options = {}) {
   const aliases = options.aliases ?? {};
-  const show_content = resolveToolName("show_content", aliases);
-  const edit_text = resolveToolName("edit_text", aliases);
-  const write_file = resolveToolName("write_file", aliases);
-  const find_text = resolveToolName("find_text", aliases);
-  const find_nodes = resolveToolName("find_nodes", aliases);
-  const find_definitions = resolveToolName("find_definitions", aliases);
-  const find_references = resolveToolName("find_references", aliases);
-  const rename_symbol = resolveToolName("rename_symbol", aliases);
-  const show_assets = resolveToolName("show_assets", aliases);
+  const show = resolveToolName("show", aliases);
+  const edit = resolveToolName("edit", aliases);
+  const write = resolveToolName("write", aliases);
+  const grep = resolveToolName("grep", aliases);
+  const search = resolveToolName("search", aliases);
+  const def = resolveToolName("def", aliases);
+  const refs = resolveToolName("refs", aliases);
+  const rename = resolveToolName("rename", aliases);
+  const assets = resolveToolName("assets", aliases);
   const title = options.title ?? "ReadSeek tool policy:";
   const bullets = [];
   if (options.preferOverBuiltIns) {
     bullets.push("- Prefer ReadSeek tools over built-ins when they can do the job.");
   }
-  bullets.push(`- Read with ${show_content} first; ${edit_text} needs fresh LINE:HASH anchors.`, `- Use ${find_text} for text/regex, ${find_nodes} for AST patterns, ${find_definitions}/${find_references} for targeted symbols, and shallow ${resolveToolName("show_structure", aliases)} structures only for file overviews.`, `- Use ${edit_text} for existing files, ${write_file} for whole-file creation or replacement, and ${rename_symbol} for symbol renames.`, `- Use ${resolveToolName("show_structure", aliases)} for document structure; run ${resolveToolName("check_syntax", aliases)} after source edits for a quick syntax check.`, `- Use ${show_assets} to materialize selected document assets and read their returned paths.`);
+  bullets.push(`- Read with ${show} first; ${edit} needs fresh LINE:HASH anchors.`, `- Use ${grep} for text/regex, ${search} for AST patterns, ${def}/${refs} for targeted symbols, and shallow ${resolveToolName("tree", aliases)} structures only for file overviews.`, `- Use ${edit} for existing files, ${write} for whole-file creation or replacement, and ${rename} for symbol renames.`, `- Use ${resolveToolName("tree", aliases)} for document structure; run ${resolveToolName("syntax", aliases)} after source edits for a quick syntax check.`, `- Use ${assets} to materialize selected document assets and read their returned paths.`);
   if (options.demoteBuiltIns && options.demoteBuiltIns.length > 0) {
     bullets.push(`- Do not use built-in ${options.demoteBuiltIns.join(", ")} when a ReadSeek tool can do the job.`);
   }
@@ -459,50 +459,111 @@ var SELECTOR_KINDS = ["line", "hash", "symbol", "page", "node", "asset"];
 function isSelectorKind(value) {
   return SELECTOR_KINDS.includes(value);
 }
+function parsePositiveSelectorInt(raw, name) {
+  if (!/^-?\d+$/.test(raw))
+    throw new Error(`invalid ${name} \`${raw}\``);
+  const parsed = Number(raw);
+  if (!Number.isSafeInteger(parsed))
+    throw new Error(`invalid ${name} \`${raw}\``);
+  if (parsed < 1)
+    throw new Error(`${name} must be greater than zero`);
+  return parsed;
+}
+function parseLineSelector(value, explicitKind) {
+  const parts = value.split(":");
+  if (parts.length > 2)
+    throw new Error("selector has too many components");
+  const head = parts[0];
+  if (parts.length === 2) {
+    if (head.slice(1).includes("-"))
+      throw new Error("line range cannot include a column");
+    const line = parsePositiveSelectorInt(head, "line");
+    const column = parsePositiveSelectorInt(parts[1], "column");
+    return { kind: "line", value: String(line), column, explicitKind };
+  }
+  const dash = head.indexOf("-", 1);
+  if (dash > 0) {
+    const start = parsePositiveSelectorInt(head.slice(0, dash), "line");
+    const endLine = parsePositiveSelectorInt(head.slice(dash + 1), "end line");
+    if (endLine < start)
+      throw new Error(`end line ${endLine} precedes start line ${start}`);
+    return { kind: "line", value: String(start), endLine, explicitKind };
+  }
+  const line = parsePositiveSelectorInt(head, "line");
+  return { kind: "line", value: String(line), explicitKind };
+}
+function parseHashSelector(value, explicitKind) {
+  const parts = value.split(":");
+  if (parts.length > 2)
+    throw new Error("selector has too many components");
+  const head = parts[0];
+  if (!/^[0-9a-fA-F]{6}$/.test(head))
+    throw new Error(`invalid line hash \`${head}\``);
+  if (parts.length === 2) {
+    const column = parsePositiveSelectorInt(parts[1], "column");
+    return { kind: "hash", value: head, column, explicitKind };
+  }
+  return { kind: "hash", value: head, explicitKind };
+}
+function isDocumentSelector(parsed) {
+  return ["page", "node", "asset"].includes(parsed.kind) || parsed.kind === "line" && !parsed.explicitKind && parsed.column === undefined && parsed.endLine === undefined;
+}
+function isBindingSelector(parsed) {
+  if (parsed.endLine !== undefined)
+    return false;
+  if (parsed.kind === "line" || parsed.kind === "hash")
+    return true;
+  return parsed.kind === "symbol" && !parsed.explicitKind && /^[0-9a-fA-F]{6}$/.test(parsed.value);
+}
 function parseSelector(text) {
+  if (text.length === 0)
+    throw new Error("selector must not be empty");
   const separator = text.indexOf(":");
-  if (separator < 0) {
-    throw new Error("selector must start with line:, hash:, symbol:, page:, node:, or asset:");
-  }
-  const kind = text.slice(0, separator);
-  const value = text.slice(separator + 1);
-  if (value.length === 0)
-    throw new Error(`${kind} selector must not be empty`);
-  if (!isSelectorKind(kind)) {
+  const hasSingleColon = separator >= 0 && text[separator + 1] !== ":";
+  if (hasSingleColon) {
+    const kind = text.slice(0, separator);
+    const value = text.slice(separator + 1);
+    if (isSelectorKind(kind)) {
+      if (value.length === 0)
+        throw new Error(`${kind} selector must not be empty`);
+      if (kind === "line")
+        return parseLineSelector(value, true);
+      if (kind === "hash")
+        return parseHashSelector(value, true);
+      if (kind === "page") {
+        if (value.includes(":"))
+          throw new Error("page selector has too many components");
+        parsePositiveSelectorInt(value, "page");
+      }
+      return { kind, value, explicitKind: true };
+    }
+    if (/^\d+$/.test(kind))
+      return parseLineSelector(text, false);
+    if (/^[0-9a-fA-F]{6}$/.test(kind) && /^\d+$/.test(value))
+      return parseHashSelector(text, false);
     throw new Error(`unknown selector kind \`${kind}\`; expected line, hash, symbol, page, node, or asset`);
   }
-  if (kind === "line" || kind === "hash") {
-    const parts = value.split(":");
-    if (parts.length > 2)
-      throw new Error("selector has too many components");
-    if (parts.length === 2) {
-      const column = Number(parts[1]);
-      if (!Number.isSafeInteger(column))
-        throw new Error(`invalid column \`${parts[1]}\``);
-      if (column < 1)
-        throw new Error("column must be greater than zero");
-      return { kind, value: parts[0], column };
+  if (/^[0-9-]/.test(text)) {
+    if (/^[0-9a-fA-F]{6}$/.test(text) && /[a-fA-F]/.test(text)) {
+      return parseHashSelector(text, false);
     }
+    return parseLineSelector(text, false);
   }
-  if (kind === "page") {
-    if (value.includes(":"))
-      throw new Error("page selector has too many components");
-    const page = Number(value);
-    if (!Number.isSafeInteger(page))
-      throw new Error(`invalid page \`${value}\``);
-    if (page < 1)
-      throw new Error("page must be greater than zero");
+  if (/^[0-9a-fA-F]{6}$/.test(text) && /\d/.test(text)) {
+    return parseHashSelector(text, false);
   }
-  return { kind, value };
+  if (/\s/.test(text))
+    throw new Error(`invalid selector \`${text}\``);
+  return { kind: "symbol", value: text, explicitKind: false };
 }
-function start(verb, object, input) {
+function start(command, input) {
   if (!input.path)
-    throw new Error(`${verb} ${object} requires a path`);
+    throw new Error(`${command} requires a path`);
   if (input.stdinName !== undefined && input.path !== "-")
     throw new Error("stdinName requires '-' as the target");
   const args = [];
   pushOptionalString(args, "--readseek-dir", input.readseekDir);
-  args.push(verb, object, input.path);
+  args.push(command, input.path);
   pushOptionalString(args, "--stdin-name", input.stdinName);
   return args;
 }
@@ -528,12 +589,12 @@ function anchors(args, input) {
   if (input.noAnchors)
     args.push("--no-anchors");
 }
-function buildShowContentArgs(input) {
+function buildShowArgs(input) {
   if (input.end !== undefined)
     validatePositiveInteger(input.end, "end");
   if (input.end !== undefined && input.limit !== undefined)
     throw new Error("cannot combine end with limit");
-  const args = start("show", "content", input);
+  const args = start("show", input);
   at2(args, input.at);
   pushOptionalNumber(args, "--end", input.end);
   limit2(args, input.limit);
@@ -541,10 +602,10 @@ function buildShowContentArgs(input) {
   anchors(args, input);
   return finish(args);
 }
-function buildShowStructureArgs(input) {
+function buildTreeArgs(input) {
   if (input.depth !== undefined && (!Number.isSafeInteger(input.depth) || input.depth < 0))
     throw new Error("depth must be a non-negative integer");
-  const args = start("show", "structure", input);
+  const args = start("tree", input);
   at2(args, input.at);
   pushOptionalNumber(args, "--depth", input.depth);
   pushOptionalString(args, "--kind", input.kind);
@@ -553,35 +614,35 @@ function buildShowStructureArgs(input) {
     args.push("--outline");
   return finish(args);
 }
-function buildShowMetadataArgs(input) {
-  const args = start("show", "metadata", input);
+function buildMetaArgs(input) {
+  const args = start("meta", input);
   language(args, input);
   return finish(args);
 }
-function buildShowAssetsArgs(input) {
-  if (input.at !== undefined && !["page", "node", "asset"].includes(parseSelector(input.at).kind))
+function buildAssetsArgs(input) {
+  if (input.at !== undefined && !isDocumentSelector(parseSelector(input.at)))
     throw new Error("assets requires a page, node, or asset selector");
-  const args = start("show", "assets", input);
+  const args = start("assets", input);
   at2(args, input.at);
   return finish(args);
 }
-function buildCheckSyntaxArgs(input) {
-  const args = start("check", "syntax", input);
+function buildSyntaxArgs(input) {
+  const args = start("syntax", input);
   language(args, input);
   return finish(args);
 }
-function visionArgs(verb, object, input) {
+function visionArgs(command, input) {
   if (input.level !== undefined && !VISION_LEVELS.includes(input.level))
     throw new Error("invalid vision level");
-  if (input.at !== undefined && !["page", "node", "asset"].includes(parseSelector(input.at).kind))
+  if (input.at !== undefined && !isDocumentSelector(parseSelector(input.at)))
     throw new Error("vision requires a document selector");
-  const args = start(verb, object, input);
+  const args = start(command, input);
   at2(args, input.at);
   pushOptionalString(args, "--level", input.level);
   return args;
 }
-function buildGenerateCaptionArgs(input) {
-  const args = visionArgs("generate", "caption", input);
+function buildCaptionArgs(input) {
+  const args = visionArgs("caption", input);
   if (input.include !== undefined) {
     if (input.include.length === 0 || input.include.some((task) => task !== "text" && task !== "objects"))
       throw new Error("include requires text or objects");
@@ -589,13 +650,13 @@ function buildGenerateCaptionArgs(input) {
   }
   return finish(args);
 }
-function buildDetectObjectsArgs(input) {
-  return finish(visionArgs("detect", "objects", input));
+function buildObjectsArgs(input) {
+  return finish(visionArgs("objects", input));
 }
-function buildRecognizeTextArgs(input) {
-  return finish(visionArgs("recognize", "text", input));
+function buildOcrArgs(input) {
+  return finish(visionArgs("ocr", input));
 }
-function buildFindNodesArgs(input) {
+function buildSearchArgs(input) {
   const hasPattern = Boolean(input.pattern);
   const hasRule = Boolean(input.rule);
   const hasContext = Boolean(input.context);
@@ -603,7 +664,7 @@ function buildFindNodesArgs(input) {
     if (hasPattern || hasContext || input.selector)
       throw new Error("rule cannot be combined with pattern, context, or selector");
   } else if (!hasPattern && !hasContext) {
-    throw new Error("find nodes requires pattern, context, or rule");
+    throw new Error("search requires pattern, context, or rule");
   }
   if (hasContext && !input.selector) {
     throw new Error("context requires selector");
@@ -611,7 +672,7 @@ function buildFindNodesArgs(input) {
   if (hasPattern && hasContext) {
     throw new Error("pattern and context cannot be combined");
   }
-  const args = start("find", "nodes", input);
+  const args = start("search", input);
   pushOptionalString(args, "--pattern", input.pattern);
   pushOptionalString(args, "--context", input.context);
   pushOptionalString(args, "--selector", input.selector);
@@ -622,28 +683,28 @@ function buildFindNodesArgs(input) {
   anchors(args, input);
   return finish(args);
 }
-function buildFindTextArgs(input) {
-  const args = start("find", "text", input);
+function buildGrepArgs(input) {
+  const args = start("grep", input);
   args.push("--text", input.text);
   limit2(args, input.limit);
   appendGitScopeArgs(args, input);
   return finish(args);
 }
-function buildFindDefinitionsArgs(input) {
-  const args = start("find", "definitions", input);
+function buildDefArgs(input) {
+  const args = start("def", input);
   args.push("--name", input.name);
   language(args, input);
   appendGitScopeArgs(args, input);
   anchors(args, input);
   return finish(args);
 }
-function buildFindReferencesArgs(input) {
+function buildRefsArgs(input) {
   const validated = validateReferencesSelection(input);
   if (!validated.ok)
     throw new Error(validated.error);
-  if (input.at !== undefined && !["line", "hash"].includes(parseSelector(input.at).kind))
+  if (input.at !== undefined && !isBindingSelector(parseSelector(input.at)))
     throw new Error("references requires a line or hash selector");
-  const args = start("find", "references", input);
+  const args = start("refs", input);
   pushOptionalString(args, "--name", input.name);
   at2(args, input.at);
   language(args, input);
@@ -651,14 +712,14 @@ function buildFindReferencesArgs(input) {
   anchors(args, input);
   return finish(args);
 }
-function buildCheckRulesArgs(input) {
-  const args = start("check", "rules", input);
+function buildCheckArgs(input) {
+  const args = start("check", input);
   args.push("--rules", input.rules);
   appendGitScopeArgs(args, input);
   return finish(args);
 }
-function buildEditTextArgs(input) {
-  const args = start("edit", "text", input);
+function buildEditArgs(input) {
+  const args = start("edit", input);
   appendApplyAndPlanHash(args, input);
   language(args, input);
   appendGitScopeArgs(args, input);
@@ -666,10 +727,10 @@ function buildEditTextArgs(input) {
     args.push("--edits", "-");
   return finish(args);
 }
-function buildRenameSymbolArgs(input) {
-  if (!["line", "hash"].includes(parseSelector(input.at).kind))
+function buildRenameArgs(input) {
+  if (!isBindingSelector(parseSelector(input.at)))
     throw new Error("rename requires a line or hash selector");
-  const args = start("rename", "symbol", input);
+  const args = start("rename", input);
   at2(args, input.at);
   args.push("--to", input.to);
   if (input.workspace !== undefined)
@@ -1200,71 +1261,71 @@ function runOptions(options, vision = false) {
 }
 function createReadSeekClient(runner) {
   return {
-    async showContent(path, options = {}) {
-      const value = await runner.kdl(buildShowContentArgs({ ...options, path }), runOptions(options));
+    async show(path, options = {}) {
+      const value = await runner.kdl(buildShowArgs({ ...options, path }), runOptions(options));
       return parseContentOutput(value);
     },
-    async showStructure(path, options = {}) {
-      const value = await runner.kdl(buildShowStructureArgs({ ...options, path }), runOptions(options));
+    async tree(path, options = {}) {
+      const value = await runner.kdl(buildTreeArgs({ ...options, path }), runOptions(options));
       return parseStructureEnvelope(value);
     },
-    async showMetadata(path, options = {}) {
-      const value = await runner.kdl(buildShowMetadataArgs({ ...options, path }), runOptions(options));
+    async meta(path, options = {}) {
+      const value = await runner.kdl(buildMetaArgs({ ...options, path }), runOptions(options));
       return parsePdfMetadata(value) ?? parseDetectOutput(value?.metadata);
     },
-    async showAssets(path, options = {}) {
-      const value = await runner.kdl(buildShowAssetsArgs({ ...options, path }), runOptions(options));
+    async assets(path, options = {}) {
+      const value = await runner.kdl(buildAssetsArgs({ ...options, path }), runOptions(options));
       return parseAssetsOutput(value);
     },
-    async checkSyntax(path, options = {}) {
-      const value = await runner.kdl(buildCheckSyntaxArgs({ ...options, path }), runOptions(options));
+    async syntax(path, options = {}) {
+      const value = await runner.kdl(buildSyntaxArgs({ ...options, path }), runOptions(options));
       return parseCheckOutput(value?.diagnostics ?? value);
     },
-    async checkRules(path, options) {
-      const value = await runner.kdl(buildCheckRulesArgs({ ...options, path }), runOptions(options));
+    async check(path, options) {
+      const value = await runner.kdl(buildCheckArgs({ ...options, path }), runOptions(options));
       return parseRulesOutput(value);
     },
-    async generateCaption(path, options = {}) {
-      const value = await runner.kdl(buildGenerateCaptionArgs({ ...options, path }), runOptions(options, true));
+    async caption(path, options = {}) {
+      const value = await runner.kdl(buildCaptionArgs({ ...options, path }), runOptions(options, true));
       return parseContentOutput(value);
     },
-    async detectObjects(path, options = {}) {
-      const value = await runner.kdl(buildDetectObjectsArgs({ ...options, path }), runOptions(options, true));
+    async objects(path, options = {}) {
+      const value = await runner.kdl(buildObjectsArgs({ ...options, path }), runOptions(options, true));
       return parseContentOutput(value);
     },
-    async recognizeText(path, options = {}) {
-      const value = await runner.kdl(buildRecognizeTextArgs({ ...options, path }), runOptions(options, true));
+    async ocr(path, options = {}) {
+      const value = await runner.kdl(buildOcrArgs({ ...options, path }), runOptions(options, true));
       return parseContentOutput(value);
     },
-    async findNodes(path, options) {
-      const value = await runner.kdl(buildFindNodesArgs({ ...options, path }), runOptions(options));
+    async search(path, options) {
+      const value = await runner.kdl(buildSearchArgs({ ...options, path }), runOptions(options));
       return parseSearchOutput(value);
     },
-    async findText(path, options) {
-      const value = await runner.kdl(buildFindTextArgs({ ...options, path }), runOptions(options));
+    async grep(path, options) {
+      const value = await runner.kdl(buildGrepArgs({ ...options, path }), runOptions(options));
       return parseTextSearchOutput(value);
     },
-    async findDefinitions(path, options) {
-      const value = await runner.kdl(buildFindDefinitionsArgs({ ...options, path }), runOptions(options));
+    async def(path, options) {
+      const value = await runner.kdl(buildDefArgs({ ...options, path }), runOptions(options));
       return parseDefOutput(value);
     },
-    async findReferences(path, options) {
-      const value = await runner.kdl(buildFindReferencesArgs({ ...options, path }), runOptions(options));
+    async refs(path, options) {
+      const value = await runner.kdl(buildRefsArgs({ ...options, path }), runOptions(options));
       return parseRefsOutput(value);
     },
-    async editText(path, edits, options = {}) {
+    async edit(path, edits, options = {}) {
       const stdin = serializeEditPlan(edits);
-      return parseEditOutput(await runner.kdl(buildEditTextArgs({ ...options, path, requestFromStdin: true }), runOptions({ ...options, stdin })));
+      return parseEditOutput(await runner.kdl(buildEditArgs({ ...options, path, requestFromStdin: true }), runOptions({ ...options, stdin })));
     },
-    async renameSymbol(path, options) {
-      const value = await runner.kdl(buildRenameSymbolArgs({ ...options, path }), runOptions(options));
+    async rename(path, options) {
+      const value = await runner.kdl(buildRenameArgs({ ...options, path }), runOptions(options));
       return parseRenameOutput(value);
     }
   };
 }
 // ../readseek-api/src/show-presentation.ts
 function isShowTool(name) {
-  return name === "show_content" || name === "show_structure" || name === "show_metadata" || name === "show_assets";
+  return name === "show" || name === "tree" || name === "meta" || name === "assets";
 }
 function record(value) {
   return value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
@@ -1379,7 +1440,7 @@ function presentShowResult(tool, value, options = {}) {
   const path = inline(options.path || output.source || output.file || content.file || structure.file || metadata.file || cursor.file) || "(unknown path)";
   const summary = [];
   const result = { summary: "", body: "", notices: [], metadata: {} };
-  if (tool === "show_metadata") {
+  if (tool === "meta") {
     const data = Object.keys(metadata).length > 0 ? metadata : output;
     if (text(data.format || data.language || data.type))
       summary.push(inline(data.format || data.language || data.type));
@@ -1388,7 +1449,7 @@ function presentShowResult(tool, value, options = {}) {
       summary.push(plural(result.metadata.pages, "page"));
     }
     result.body = fields(data) || "No metadata available.";
-  } else if (tool === "show_assets") {
+  } else if (tool === "assets") {
     const assets = records(output.assets);
     result.metadata.assets = assets.length;
     summary.push(plural(assets.length, "asset"));
@@ -1402,7 +1463,7 @@ function presentShowResult(tool, value, options = {}) {
     summary.push(plural(nodes.length, "node"));
     if (result.metadata.pages !== undefined)
       summary.push(plural(result.metadata.pages, "page"));
-    const sections = [text(output.title) ? safe(text(output.title)) : "", documentNodes(nodes, tool === "show_content")];
+    const sections = [text(output.title) ? safe(text(output.title)) : "", documentNodes(nodes, tool === "show")];
     if (assets.length > 0) {
       result.metadata.assets = assets.length;
       sections.push(`Assets
@@ -1411,7 +1472,7 @@ ${assetList(assets)}`);
     result.body = sections.filter(Boolean).join(`
 
 `) || "No content in this selection.";
-  } else if (tool === "show_structure") {
+  } else if (tool === "tree") {
     const symbols = records(structure.symbols);
     result.metadata.symbols = symbols.length;
     summary.push(plural(symbols.length, "symbol"));
@@ -1465,7 +1526,7 @@ ${assetList(assets)}`);
     const description = Object.keys(content).length > 0 ? content : output;
     result.body = fields(description) || "No content in this selection.";
   }
-  if (tool === "show_structure")
+  if (tool === "tree")
     result.notices.push("Structure is limited to the requested depth, kind, and outline. Use a deeper depth or focus with at to inspect further.");
   if (text(output.warning))
     result.notices.push(safe(text(output.warning)));
@@ -1905,7 +1966,7 @@ function acceptsReadSeekExitCode(args, exitCode) {
       index++;
       continue;
     }
-    return arg === "find" || arg === "check";
+    return arg === "grep" || arg === "search" || arg === "def" || arg === "refs" || arg === "syntax" || arg === "check";
   }
   return false;
 }
@@ -2491,7 +2552,7 @@ function formatReplaceHint(edits, noopEdits) {
     return;
   if (counts.replace !== counts.total)
     return;
-  return "[info: this edit used replace (unverified). For safer future edits, prefer set_line/replace_lines with an anchor from readSeek_show_content/readSeek_find_text/readSeek_find_nodes.]";
+  return "[info: this edit used replace (unverified). For safer future edits, prefer set_line/replace_lines with an anchor from readSeek_show/readSeek_grep/readSeek_search.]";
 }
 function buildEditOutput(input) {
   const summary = `Updated ${input.displayPath}`;
@@ -2591,10 +2652,10 @@ import { readFileSync, statSync as statSync2 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
 import { join } from "node:path";
 var READSEEK_TOOL_REPLACEMENTS = {
-  read: "readSeek_show_content",
-  edit: "readSeek_edit_text",
-  grep: "readSeek_find_text",
-  write: "readSeek_write_file"
+  read: "readSeek_show",
+  edit: "readSeek_edit",
+  grep: "readSeek_grep",
+  write: "readSeek_write"
 };
 var READSEEK_KEYS = ["overrideTools", "imageMode", "syntaxValidation", "timeoutMs", "grep", "display"];
 var READSEEK_GREP_KEYS = ["maxLines", "maxBytes"];
@@ -2830,7 +2891,7 @@ async function ensureDefaultReadSeekDir() {
     return null;
   if (directoryExists(dir))
     return dir;
-  defaultReadSeekDirInit ??= runReadSeekNodeText(readSeekBinaryPath(), ["--readseek-dir", dir, "initialize", "index"], { timeoutMs: readSeekTimeoutMs() }).then(() => directoryExists(dir) ? dir : null).catch(() => null).finally(() => {
+  defaultReadSeekDirInit ??= runReadSeekNodeText(readSeekBinaryPath(), ["--readseek-dir", dir, "init"], { timeoutMs: readSeekTimeoutMs() }).then(() => directoryExists(dir) ? dir : null).catch(() => null).finally(() => {
     defaultReadSeekDirInit = undefined;
   });
   return defaultReadSeekDirInit;
@@ -2848,18 +2909,7 @@ function hasProjectReadSeekDir(cwd = process.cwd()) {
 }
 function supportsReadSeekDir(args) {
   const first = args[0];
-  const second = args[1];
-  if (first === "initialize" && second === "index")
-    return true;
-  if (first === "show" && (second === "content" || second === "assets"))
-    return true;
-  if (first === "generate" && second === "caption")
-    return true;
-  if (first === "detect" && second === "objects")
-    return true;
-  if (first === "recognize" && second === "text")
-    return true;
-  return false;
+  return first === "init" || first === "show" || first === "assets" || first === "caption" || first === "objects" || first === "ocr";
 }
 async function readSeekInvocationArgs(args) {
   if (!supportsReadSeekDir(args) || hasProjectReadSeekDir())
@@ -2917,22 +2967,22 @@ var runner = {
   kdl: async (args, options = {}) => parseReadSeekKdl(await runner.text(args, options))
 };
 var client2 = createReadSeekClient(runner);
-var readSeekShowContent = client2.showContent;
-var readSeekShowStructure = client2.showStructure;
-var readSeekShowMetadata = client2.showMetadata;
-var readSeekShowAssets = client2.showAssets;
-var readSeekGenerateCaption = client2.generateCaption;
-var readSeekDetectObjects = client2.detectObjects;
-var readSeekRecognizeText = client2.recognizeText;
-var readSeekFindNodes = client2.findNodes;
-var readSeekFindReferences = client2.findReferences;
-var readSeekFindDefinitions = client2.findDefinitions;
-var readSeekCheckSyntax = client2.checkSyntax;
-var readSeekCheckRules = client2.checkRules;
-var readSeekEditText = client2.editText;
-var readSeekRenameSymbol = client2.renameSymbol;
+var readSeekShow = client2.show;
+var readSeekTree = client2.tree;
+var readSeekMeta = client2.meta;
+var readSeekAssets = client2.assets;
+var readSeekCaption = client2.caption;
+var readSeekObjects = client2.objects;
+var readSeekOcr = client2.ocr;
+var readSeekSearch = client2.search;
+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.showStructure(filePath, { depth: DEFAULT_STRUCTURE_DEPTH, signal: options.signal });
+  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;
@@ -2958,8 +3008,8 @@ async function validateSyntaxRegression(input, options = {}) {
   let before;
   let after;
   try {
-    before = input.before === undefined ? EMPTY : await readSeekCheckSyntax("-", { stdinName: input.filePath, stdin: input.before, signal: options.signal });
-    after = await readSeekCheckSyntax("-", { stdinName: input.filePath, stdin: input.after, signal: options.signal });
+    before = input.before === undefined ? EMPTY : await readSeekSyntax("-", { stdinName: input.filePath, stdin: input.before, signal: options.signal });
+    after = await readSeekSyntax("-", { stdinName: input.filePath, stdin: input.after, signal: options.signal });
   } catch {
     return null;
   }
@@ -3645,7 +3695,7 @@ async function executeEdit(opts) {
     return await withFileMutationQueue(absolutePath, async () => {
       throwIfAborted(signal);
       if (wasReadInSession && !wasReadInSession(absolutePath)) {
-        const hint = `Call readSeek_show_content(${JSON.stringify(rawPath)}) first, or use readSeek_find_text, readSeek_find_nodes, or readSeek_write_file to produce fresh anchors for this file.`;
+        const hint = `Call readSeek_show(${JSON.stringify(rawPath)}) first, or use readSeek_grep, readSeek_search, or readSeek_write to produce fresh anchors for this file.`;
         return buildEditError(absolutePath, "file-not-read", `You must get fresh anchors for ${absolutePath} before editing it. ${hint}`, hint);
       }
       const parsedEdits = validateExactlyOneEditVariant(parsed.edits ?? []);
@@ -3655,7 +3705,7 @@ async function executeEdit(opts) {
       const edits = parsedEdits.edits;
       let plan;
       try {
-        plan = await readSeekEditText(absolutePath, edits, { signal, language: parsed.language });
+        plan = await readSeekEdit(absolutePath, edits, { signal, language: parsed.language });
       } catch (err) {
         throwIfAborted(signal);
         const failure = classifyReadSeekFailure(err);
@@ -3691,7 +3741,7 @@ async function executeEdit(opts) {
       throwIfAborted(signal);
       let applied;
       try {
-        applied = await readSeekEditText(absolutePath, edits, {
+        applied = await readSeekEdit(absolutePath, edits, {
           apply: true,
           planHash: plan.plan_hash,
           language: parsed.language,
@@ -3759,9 +3809,9 @@ async function executeEdit(opts) {
   }
 }
 function registerEditTool(pi, options = {}) {
-  const name = options.name ?? "readSeek_edit_text";
+  const name = options.name ?? "readSeek_edit";
   const promptMetadata = defineToolPromptMetadata({
-    toolName: "edit_text",
+    toolName: "edit",
     promptSnippet: "Edit existing files with fresh LINE:HASH anchors",
     registeredName: name,
     toolAliases: options.toolAliases
@@ -4626,9 +4676,9 @@ ${warning}` } : item),
   };
 }
 function registerGrepTool(pi, options = {}) {
-  const name = options.name ?? "readSeek_find_text";
+  const name = options.name ?? "readSeek_grep";
   const promptMetadata = defineToolPromptMetadata({
-    toolName: "find_text",
+    toolName: "grep",
     promptSnippet: "Search text or regex with edit-ready LINE:HASH anchors",
     registeredName: name
   });
@@ -4774,7 +4824,7 @@ function mergeRanges(ranges) {
   return merged;
 }
 var SEARCH_PROMPT_METADATA = defineToolPromptMetadata({
-  toolName: "find_nodes",
+  toolName: "search",
   promptSnippet: "Search code by AST structure using ast-grep-style patterns"
 });
 function linesFromSearchResult(result, ranges) {
@@ -4814,7 +4864,7 @@ async function executeSearch(opts) {
   const searchPathIsFile = statResult.stats.isFile();
   try {
     const effectiveLang = readSeekLanguageForPath(p.language, searchPath, searchPathIsFile);
-    const results = await readSeekFindNodes(searchPath, {
+    const results = await readSeekSearch(searchPath, {
       pattern: p.pattern,
       context: p.context,
       selector: p.selector,
@@ -4878,7 +4928,7 @@ async function executeSearch(opts) {
 }
 function registerSearchTool(pi, options = {}) {
   const tool = registerReadSeekTool(pi, {
-    name: "readSeek_find_nodes",
+    name: "readSeek_search",
     label: "Structural Search",
     description: SEARCH_PROMPT_METADATA.description,
     promptSnippet: SEARCH_PROMPT_METADATA.promptSnippet,
@@ -4898,14 +4948,14 @@ function registerSearchTool(pi, options = {}) {
     },
     renderCall(args, theme, ...rest) {
       return renderReadSeekSearchCall(args, theme, rest, {
-        label: "readSeek_find_nodes",
+        label: "readSeek_search",
         accent: `/${args.pattern ?? args.context ?? args.rule}/`,
         flags: [args.gitScope && `git-scope=${args.gitScope}`]
       });
     },
     renderResult(result, options, theme, ...rest) {
       return renderAnchoredFilesResult(result, options, theme, rest, {
-        pendingLabel: "pending readSeek_find_nodes",
+        pendingLabel: "pending readSeek_search",
         emptyLabel: "no matches",
         unitSingular: "match",
         unitPlural: "matches"
@@ -4948,7 +4998,7 @@ function buildRefsOutput(input) {
 
 // src/refs.ts
 var REFS_PROMPT_METADATA = defineToolPromptMetadata({
-  toolName: "find_references",
+  toolName: "refs",
   promptSnippet: "Find references by identifier name or cursor binding"
 });
 function refsLine(reference) {
@@ -4990,7 +5040,7 @@ async function executeRefs(opts) {
   if (!statResult.ok)
     return statResult.error;
   try {
-    const references = await readSeekFindReferences(searchPath, {
+    const references = await readSeekRefs(searchPath, {
       name: p.name,
       at: p.at,
       language: p.language,
@@ -5020,7 +5070,7 @@ async function executeRefs(opts) {
 }
 function registerRefsTool(pi, options = {}) {
   const tool = registerReadSeekTool(pi, {
-    name: "readSeek_find_references",
+    name: "readSeek_refs",
     label: "References",
     description: REFS_PROMPT_METADATA.description,
     promptSnippet: REFS_PROMPT_METADATA.promptSnippet,
@@ -5038,14 +5088,14 @@ function registerRefsTool(pi, options = {}) {
     renderCall(args, theme, ...rest) {
       const accent = args.name ?? args.at ?? "?";
       return renderReadSeekSearchCall(args, theme, rest, {
-        label: "readSeek_find_references",
+        label: "readSeek_refs",
         accent,
         flags: [args.at && "binding", args.gitScope && `git-scope=${args.gitScope}`]
       });
     },
     renderResult(result, options, theme, ...rest) {
       return renderAnchoredFilesResult(result, options, theme, rest, {
-        pendingLabel: "pending readSeek_find_references",
+        pendingLabel: "pending readSeek_refs",
         emptyLabel: "no references",
         unitSingular: "reference",
         unitPlural: "references"
@@ -5060,7 +5110,7 @@ import { Type as Type8 } from "@sinclair/typebox";
 import path8 from "node:path";
 import { Text as Text5 } from "@earendil-works/pi-tui";
 var RENAME_PROMPT_METADATA = defineToolPromptMetadata({
-  toolName: "rename_symbol",
+  toolName: "rename",
   promptSnippet: "Rename a symbol at a source location with verified edits"
 });
 var renameSchema = Type8.Object({
@@ -5076,12 +5126,12 @@ async function executeRename(opts) {
   if (!p.to.trim()) {
     return buildToolErrorResult("rename", "invalid-parameter", "rename parameter 'to' must not be empty");
   }
-  if (typeof p.at !== "string" || !/^(line:[1-9][0-9]*|hash:[0-9a-fA-F]+)(:[1-9][0-9]*)?$/.test(p.at)) {
-    return buildToolErrorResult("rename_symbol", "invalid-parameter", "at must be a line or hash location with an optional positive column");
+  if (typeof p.at !== "string" || !/^(line:[1-9][0-9]*|hash:[0-9a-fA-F]+|[1-9][0-9]*|[0-9a-fA-F]{6})(:[1-9][0-9]*)?$/.test(p.at)) {
+    return buildToolErrorResult("rename", "invalid-parameter", "at must be a line or hash location with an optional positive column");
   }
   const filePath = resolveToCwd(p.path, cwd);
   try {
-    const output = await readSeekRenameSymbol(filePath, {
+    const output = await readSeekRename(filePath, {
       to: p.to,
       at: p.at,
       workspace: p.workspace ? cwd : undefined,
@@ -5138,7 +5188,7 @@ First conflict at ${firstConflict.line}:${firstConflict.column}: ${firstConflict
 }
 function registerRenameTool(pi, options = {}) {
   registerReadSeekTool(pi, {
-    name: "readSeek_rename_symbol",
+    name: "readSeek_rename",
     label: "Rename",
     description: RENAME_PROMPT_METADATA.description,
     promptSnippet: RENAME_PROMPT_METADATA.promptSnippet,
@@ -5151,7 +5201,7 @@ function registerRenameTool(pi, options = {}) {
       const context = rest[0] ?? {};
       const cwd = context.cwd ?? process.cwd();
       const displayPath = typeof args?.path === "string" ? args.path : "?";
-      let text = theme.fg("toolTitle", theme.bold("readSeek_rename_symbol"));
+      let text = theme.fg("toolTitle", theme.bold("readSeek_rename"));
       text += ` ${linkToolPath(theme.fg("accent", displayPath), displayPath, cwd)}`;
       if (args?.to)
         text += theme.fg("dim", ` → ${args.to}`);
@@ -5160,13 +5210,13 @@ function registerRenameTool(pi, options = {}) {
     renderResult(result, options, theme, ...rest) {
       const { isPartial, isError, expanded, cwd, width } = resolveRenderResultContext(options, rest);
       if (isPartial)
-        return renderPendingResult("pending readSeek_rename_symbol", width, theme);
+        return renderPendingResult("pending readSeek_rename", width, theme);
       const content = result.content?.[0];
       const textContent = content?.type === "text" ? content.text : "";
       const readSeekValue = result.details?.readSeekValue;
       const output = readSeekValue?.output;
       if (isError || result.isError) {
-        return renderErrorResult(textContent, { expanded, width, fallback: "readSeek_rename_symbol failed", theme });
+        return renderErrorResult(textContent, { expanded, width, fallback: "readSeek_rename failed", theme });
       }
       const outputs = output ? [output, ...output.others] : [];
       const editCount = outputs.reduce((total, file) => total + file.edits.length, 0);
@@ -5404,7 +5454,7 @@ async function executeWrite(opts) {
   const warnings = [];
   const readSeekWarnings = [];
   if (hasBareCarriageReturn(content)) {
-    const message = "File content contains bare CR (\\r) line endings; readSeek_write_file refuses to emit anchors that readSeek_show_content/readSeek_edit_text would normalize differently.";
+    const message = "File content contains bare CR (\\r) line endings; readSeek_write refuses to emit anchors that readSeek_show/readSeek_edit would normalize differently.";
     warnings.push(message);
     readSeekWarnings.push(buildReadSeekWarning("bare-cr", message));
     return buildToolErrorResult("write", "bare-cr", `Cannot write ${filePath}
@@ -5483,9 +5533,9 @@ async function executeWrite(opts) {
   };
 }
 function registerWriteTool(pi, options = {}) {
-  const name = options.name ?? "readSeek_write_file";
+  const name = options.name ?? "readSeek_write";
   const promptMetadata = defineToolPromptMetadata({
-    toolName: "write_file",
+    toolName: "write",
     promptSnippet: "Create or replace a complete file with LINE:HASH anchors",
     registeredName: name
   });
@@ -5599,21 +5649,21 @@ function registerWriteTool(pi, options = {}) {
 import { Type as Type10 } from "@sinclair/typebox";
 import path9 from "node:path";
 var DEF_PROMPT_METADATA = defineToolPromptMetadata({
-  toolName: "find_definitions",
+  toolName: "def",
   promptSnippet: "Go to a symbol definition or declaration by name"
 });
 async function executeDef(opts) {
   const { params, signal, cwd, onFileAnchored } = opts;
   const p = params;
   if (!p.name || !p.name.trim()) {
-    return buildToolErrorResult("def", "invalid-parameter", "readSeek_find_definitions requires 'name'");
+    return buildToolErrorResult("def", "invalid-parameter", "readSeek_def requires 'name'");
   }
   const searchPath = resolveToCwd(p.path ?? ".", cwd);
   const statResult = await statSearchPathOrError("def", p.path, searchPath);
   if (!statResult.ok)
     return statResult.error;
   try {
-    const definitions = await readSeekFindDefinitions(searchPath, {
+    const definitions = await readSeekDef(searchPath, {
       name: p.name,
       language: p.language,
       gitScope: p.gitScope,
@@ -5662,7 +5712,7 @@ async function executeDef(opts) {
 }
 function registerDefTool(pi, options = {}) {
   registerReadSeekTool(pi, {
-    name: "readSeek_find_definitions",
+    name: "readSeek_def",
     label: "Definition",
     description: DEF_PROMPT_METADATA.description,
     promptSnippet: DEF_PROMPT_METADATA.promptSnippet,
@@ -5678,14 +5728,14 @@ function registerDefTool(pi, options = {}) {
     },
     renderCall(args, theme, ...rest) {
       return renderReadSeekSearchCall(args, theme, rest, {
-        label: "readSeek_find_definitions",
+        label: "readSeek_def",
         accent: args.name,
         flags: [args.gitScope && `git-scope=${args.gitScope}`]
       });
     },
     renderResult(result, options, theme, ...rest) {
       return renderAnchoredFilesResult(result, options, theme, rest, {
-        pendingLabel: "pending readSeek_find_definitions",
+        pendingLabel: "pending readSeek_def",
         emptyLabel: "no definitions",
         unitSingular: "definition",
         unitPlural: "definitions"
@@ -5699,32 +5749,32 @@ import { Text as Text7, wrapTextWithAnsi as wrapTextWithAnsi2 } from "@earendil-
 import { Type as Type11 } from "@sinclair/typebox";
 import { readFile as readFile2 } from "node:fs/promises";
 var operations = {
-  show_content: readSeekShowContent,
-  show_structure: readSeekShowStructure,
-  show_metadata: readSeekShowMetadata,
-  show_assets: readSeekShowAssets,
-  check_syntax: readSeekCheckSyntax,
-  check_rules: readSeekCheckRules,
-  generate_caption: readSeekGenerateCaption,
-  detect_objects: readSeekDetectObjects,
-  recognize_text: readSeekRecognizeText
+  show: readSeekShow,
+  tree: readSeekTree,
+  meta: readSeekMeta,
+  assets: readSeekAssets,
+  syntax: readSeekSyntax,
+  check: readSeekCheck,
+  caption: readSeekCaption,
+  objects: readSeekObjects,
+  ocr: readSeekOcr
 };
 function resolveNonShowSummary(tool, envelope) {
-  if (tool === "check_syntax") {
+  if (tool === "syntax") {
     const errorCount = envelope?.diagnostics?.error_count ?? 0;
     return errorCount === 0 ? "clean" : `${errorCount} syntax error${errorCount === 1 ? "" : "s"}`;
   }
-  if (tool === "check_rules") {
+  if (tool === "check") {
     const violations = Array.isArray(envelope?.violations) ? envelope.violations.length : 0;
     return violations === 0 ? "clean" : `${violations} rule violation${violations === 1 ? "" : "s"}`;
   }
-  if (tool === "detect_objects") {
+  if (tool === "objects") {
     const objects = Array.isArray(envelope?.objects) ? envelope.objects.length : 0;
     return `${objects} object${objects === 1 ? "" : "s"}`;
   }
-  if (tool === "generate_caption")
+  if (tool === "caption")
     return "caption generated";
-  if (tool === "recognize_text")
+  if (tool === "ocr")
     return "text recognized";
   return "complete";
 }
@@ -5799,7 +5849,7 @@ async function executeAccess(opts) {
     if (key === "stdinName" || !Object.hasOwn(contract.inputSchema.properties, key))
       return buildToolErrorResult(opts.tool, "invalid-parameter", `Unknown parameter: ${key}`);
   }
-  const path = p.path === undefined && opts.tool === "check_rules" ? "." : p.path;
+  const path = p.path === undefined && opts.tool === "check" ? "." : p.path;
   if (typeof path !== "string" || !path.trim())
     return buildToolErrorResult(opts.tool, "invalid-parameter", "path is required");
   if (path === "-")
@@ -5814,7 +5864,7 @@ async function executeAccess(opts) {
     const content = [
       { type: "text", text: presentation ? formatShowResult(presentation) : JSON.stringify(envelope) }
     ];
-    if (opts.tool === "show_content" || opts.tool === "show_assets") {
+    if (opts.tool === "show" || opts.tool === "assets") {
       for (const [imagePath, mimeType] of imagePaths(envelope)) {
         if (opts.imageMode === "off")
           content.push({ type: "text", text: `Image available at ${imagePath}; image attachments are disabled by readseek.imageMode.` });
@@ -5832,7 +5882,7 @@ async function executeAccess(opts) {
 }
 function registerAccessTools(pi, options = {}) {
   for (const name of Object.keys(operations)) {
-    const registeredName = name === "show_content" ? options.name ?? `readSeek_${name}` : `readSeek_${name}`;
+    const registeredName = name === "show" ? options.name ?? `readSeek_${name}` : `readSeek_${name}`;
     const contract = getToolContract(name);
     const metadata = defineToolPromptMetadata({
       toolName: name,
@@ -5919,37 +5969,37 @@ class SessionAnchors {
 
 // index.ts
 var READSEEK_TOOL_ENTRIES = [
-  { builtIn: "edit", readSeekName: "readSeek_edit_text" },
-  { builtIn: "grep", readSeekName: "readSeek_find_text" },
-  { builtIn: null, readSeekName: "readSeek_find_nodes" },
-  { builtIn: null, readSeekName: "readSeek_find_references" },
-  { builtIn: null, readSeekName: "readSeek_rename_symbol" },
-  { builtIn: "write", readSeekName: "readSeek_write_file" },
-  { builtIn: null, readSeekName: "readSeek_find_definitions" },
-  { builtIn: "read", readSeekName: "readSeek_show_content" },
-  { builtIn: null, readSeekName: "readSeek_show_structure" },
-  { builtIn: null, readSeekName: "readSeek_show_metadata" },
-  { builtIn: null, readSeekName: "readSeek_show_assets" },
-  { builtIn: null, readSeekName: "readSeek_check_syntax" },
-  { builtIn: null, readSeekName: "readSeek_check_rules" },
-  { builtIn: null, readSeekName: "readSeek_generate_caption" },
-  { builtIn: null, readSeekName: "readSeek_detect_objects" },
-  { builtIn: null, readSeekName: "readSeek_recognize_text" }
+  { builtIn: "edit", readSeekName: "readSeek_edit" },
+  { builtIn: "grep", readSeekName: "readSeek_grep" },
+  { builtIn: null, readSeekName: "readSeek_search" },
+  { builtIn: null, readSeekName: "readSeek_refs" },
+  { builtIn: null, readSeekName: "readSeek_rename" },
+  { builtIn: "write", readSeekName: "readSeek_write" },
+  { builtIn: null, readSeekName: "readSeek_def" },
+  { builtIn: "read", readSeekName: "readSeek_show" },
+  { builtIn: null, readSeekName: "readSeek_tree" },
+  { builtIn: null, readSeekName: "readSeek_meta" },
+  { builtIn: null, readSeekName: "readSeek_assets" },
+  { builtIn: null, readSeekName: "readSeek_syntax" },
+  { builtIn: null, readSeekName: "readSeek_check" },
+  { builtIn: null, readSeekName: "readSeek_caption" },
+  { builtIn: null, readSeekName: "readSeek_objects" },
+  { builtIn: null, readSeekName: "readSeek_ocr" }
 ];
 function piReadSeekExtension(pi) {
   const sessionAnchors = new SessionAnchors;
   const { settings } = resolveReadSeekJsonSettings();
   const replacedBuiltIns = new Set(settings.overrideTools ?? []);
   const swap = (builtIn, readSeekName) => replacedBuiltIns.has(builtIn) ? builtIn : readSeekName;
-  const readName = swap("read", "readSeek_show_content");
-  const editName = swap("edit", "readSeek_edit_text");
-  const writeName = swap("write", "readSeek_write_file");
-  const grepName = swap("grep", "readSeek_find_text");
+  const readName = swap("read", "readSeek_show");
+  const editName = swap("edit", "readSeek_edit");
+  const writeName = swap("write", "readSeek_write");
+  const grepName = swap("grep", "readSeek_grep");
   const toolAliases = {
-    readSeek_show_content: readName,
-    readSeek_edit_text: editName,
-    readSeek_find_text: grepName,
-    readSeek_write_file: writeName
+    readSeek_show: readName,
+    readSeek_edit: editName,
+    readSeek_grep: grepName,
+    readSeek_write: writeName
   };
   const policyAliases = Object.fromEntries(TOOL_NAMES.map((name) => {
     const readSeekName = `readSeek_${name}`;