opencode-readseek 0.11.4 → 0.12.0

package/README.md

@@ -42,17 +42,17 @@ macOS/Windows supplied by `@jarkkojs/readseek`. Set
 
 ## Tools
 
-- Read without inference: `readseek_show_content`, `readseek_show_structure`,
-  `readseek_show_metadata`, `readseek_show_assets`.
-- Check: `readseek_check_syntax`, `readseek_check_rules`.
-- Explicit inference: `readseek_generate_caption`, `readseek_detect_objects`,
-  `readseek_recognize_text`.
-- Find: `readseek_find_text`, `readseek_find_nodes`, `readseek_find_definitions`,
-  `readseek_find_references`.
-- Mutate: `readseek_edit_text`, `readseek_rename_symbol`, `readseek_write_file`.
-
-Tool names mirror native verb-object commands, such as `show content`,
-`find nodes`, and `edit text`. Paths resolve against the project directory.
+- Read without inference: `readseek_show`, `readseek_tree`,
+  `readseek_meta`, `readseek_assets`.
+- Check: `readseek_syntax`, `readseek_check`.
+- Explicit inference: `readseek_caption`, `readseek_objects`,
+  `readseek_ocr`.
+- Find: `readseek_grep`, `readseek_search`, `readseek_def`,
+  `readseek_refs`.
+- Mutate: `readseek_edit`, `readseek_rename`, `readseek_write`.
+
+Tool names mirror native flat single-word commands, such as `show`,
+`search`, and `edit`. Paths resolve against the project directory.
 Use `at` selectors (`line:N[:COLUMN]`, `hash:H[:COLUMN]`, `symbol:NAME`,
 `page:N`, `node:ID`, or `asset:ID`) where supported. Structure defaults to
 `depth: 1`. Use separate structure, metadata, and syntax tools rather than
@@ -63,20 +63,20 @@ lines, document sections, structure trees, metadata fields, and asset paths.
 Notices identify omitted ranges and how to continue. The unchanged native result
 is retained separately in `metadata.readseek`; image attachments are unchanged.
 
-`readseek_find_nodes` accepts `pattern`, `context` with `selector`, or `rule`.
-`readseek_find_references` requires exactly one of `name` or `at`; binding
+`readseek_search` accepts `pattern`, `context` with `selector`, or `rule`.
+`readseek_refs` requires exactly one of `name` or `at`; binding
 references and renames use line or hash cursors. KDL selection/check rules
 may be inline or `@path`; tool calls cannot supply standard input.
 
-`readseek_find_text` accepts exactly one of literal `text` or regex `pattern`.
+`readseek_grep` accepts exactly one of literal `text` or regex `pattern`.
 The adapter also supports `literal`, `ignoreCase`, `glob`, `context`, `limit`,
-and per-file `summary`. Native `find text --text` searches literally.
+and per-file `summary`. Native `grep` searches literally.
 
 Read fresh `LINE:HASH` anchors before editing. Each edit item contains exactly
 one nested `set_line`, `replace_lines`, `insert_after`, `replace_symbol`, or
 `replace` object. Edits and renames default to applying after a verified plan
 and edit permission; use `apply: false` to preview and `planHash` to require
-that plan when applying. `write_file` replaces complete text files.
+that plan when applying. `write` replaces complete text files.
 
 Syntax and rule checks treat exit 1 as findings, not transport failure;
 exit 0 is clean and exit 2 is failure. Syntax checks do not typecheck.

package/dist/index.js

@@ -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,48 +205,48 @@ 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"])
 ];
 // ../readseek-api/src/policy.ts
 var BUILTIN_FALLBACKS = {
-  read: "show_content",
-  edit: "edit_text",
-  write: "write_file",
-  grep: "find_text",
-  apply_patch: "edit_text"
+  read: "show",
+  edit: "edit",
+  write: "write",
+  grep: "grep",
+  apply_patch: "edit"
 };
 var PREFERENCE_LEADS = {
-  show_content: "Preferred for reading source with anchors.",
-  edit_text: "Preferred for editing existing text files with fresh LINE:HASH anchors.",
-  write_file: "Preferred for creating or replacing a complete text file; returns LINE:HASH anchors.",
-  find_text: "Preferred text/regex search; returns edit-ready LINE:HASH anchors.",
-  find_nodes: "Preferred for AST or structural code search with ast-grep-style patterns.",
-  find_definitions: "Preferred for go-to-definition or declaration lookup by name.",
-  find_references: "Preferred for finding identifier-name matches or binding-specific references before rename_symbol or delete.",
-  rename_symbol: "Preferred for renaming a symbol with binding-aware, verified edits.",
-  show_assets: "Preferred for materializing selected document assets with usable cached paths."
+  show: "Preferred for reading source with anchors.",
+  edit: "Preferred for editing existing text files with fresh LINE:HASH anchors.",
+  write: "Preferred for creating or replacing a complete text file; returns LINE:HASH anchors.",
+  grep: "Preferred text/regex search; returns edit-ready LINE:HASH anchors.",
+  search: "Preferred for AST or structural code search with ast-grep-style patterns.",
+  def: "Preferred for go-to-definition or declaration lookup by name.",
+  refs: "Preferred for finding identifier-name matches or binding-specific references before `rename` or delete.",
+  rename: "Preferred for renaming a symbol with binding-aware, verified edits.",
+  assets: "Preferred for materializing selected document assets with usable cached paths."
 };
 var FALLBACK_TEMPLATES = {
-  read: "Prefer `show_content` with fresh LINE:HASH anchors.",
-  edit: "Prefer `edit_text` with fresh LINE:HASH anchors.",
-  write: "Prefer `write_file` so the result returns LINE:HASH anchors.",
-  grep: "Prefer `find_text` for text/regex search with edit-ready anchors.",
-  apply_patch: "Prefer `edit_text` for existing text files."
+  read: "Prefer `show` with fresh LINE:HASH anchors.",
+  edit: "Prefer `edit` with fresh LINE:HASH anchors.",
+  write: "Prefer `write` so the result returns LINE:HASH anchors.",
+  grep: "Prefer `grep` for text/regex search with edit-ready anchors.",
+  apply_patch: "Prefer `edit` for existing text files."
 };
 function resolveToolName(name, aliases = {}) {
   return aliases[name] ?? name;
@@ -262,21 +262,21 @@ function renderFallbackToolDescription(builtIn, 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.`);
   }
@@ -420,50 +420,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;
 }
@@ -489,12 +550,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);
@@ -502,10 +563,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);
@@ -514,35 +575,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");
@@ -550,13 +611,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);
@@ -564,7 +625,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");
@@ -572,7 +633,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);
@@ -583,28 +644,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);
@@ -612,14 +673,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);
@@ -627,10 +688,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)
@@ -1016,7 +1077,7 @@ function serializeEditPlan(edits) {
 }
 // ../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 : {};
@@ -1131,7 +1192,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));
@@ -1140,7 +1201,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"));
@@ -1154,7 +1215,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
@@ -1163,7 +1224,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"));
@@ -1217,7 +1278,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)));
@@ -1672,7 +1733,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;
 }
@@ -1873,12 +1934,12 @@ function resolveImagePolicy(options) {
   throw new Error('opencode-readseek imageMode must be "on", "auto", or "off"');
 }
 function contentArgs(filePath, options = {}) {
-  return buildShowContentArgs({ path: filePath, ...options, at: options.at ?? (options.end === undefined ? undefined : "line:1") });
+  return buildShowArgs({ path: filePath, ...options, at: options.at ?? (options.end === undefined ? undefined : "line:1") });
 }
 function requireContent(envelope) {
   const value = record2(envelope).content;
   if (value === undefined || value === null || typeof value !== "object") {
-    throw new Error("show content returned no source content");
+    throw new Error("show returned no source content");
   }
   return value;
 }
@@ -1954,7 +2015,7 @@ async function ensureReadSeekCache(context) {
     if (error.code !== "ENOENT")
       throw error;
   }
-  readSeekCacheInit ??= runReadSeekRaw(context, ["--readseek-dir", cacheDir, "initialize", "index"], { cancelable: false }).then(() => cacheDir).finally(() => {
+  readSeekCacheInit ??= runReadSeekRaw(context, ["--readseek-dir", cacheDir, "init"], { cancelable: false }).then(() => cacheDir).finally(() => {
     readSeekCacheInit = undefined;
   });
   return readSeekCacheInit;
@@ -2372,31 +2433,31 @@ import { pathToFileURL } from "node:url";
 import { tool as tool2 } from "@opencode-ai/plugin";
 function initialTitle(kind, args) {
   switch (kind) {
-    case "show_structure":
-    case "show_metadata":
-    case "check_syntax":
-    case "check_rules":
-    case "generate_caption":
-    case "detect_objects":
-    case "recognize_text":
-      return `${kind.replaceAll("_", " ")} ${args.path}`;
-    case "show_content":
+    case "tree":
+    case "meta":
+    case "syntax":
+    case "check":
+    case "caption":
+    case "objects":
+    case "ocr":
+      return `${kind} ${args.path}`;
+    case "show":
       return `Show content ${args.path}`;
-    case "show_assets":
+    case "assets":
       return `Show assets ${args.path}`;
-    case "find_nodes":
+    case "search":
       return `Find nodes ${args.pattern ?? args.context ?? args.rule}`;
-    case "find_text":
+    case "grep":
       return `Find text ${args.pattern ?? args.text}`;
-    case "find_definitions":
+    case "def":
       return `Find definition ${args.name}`;
-    case "find_references":
+    case "refs":
       return `Find references to ${args.name ?? args.at}`;
-    case "rename_symbol":
+    case "rename":
       return `Rename ${args.path}:${args.at} to ${args.to}`;
-    case "edit_text":
+    case "edit":
       return `Edit ${args.path}`;
-    case "write_file":
+    case "write":
       return `Write ${args.path}`;
   }
 }
@@ -2407,18 +2468,18 @@ function resultPresentation(kind, args, value) {
     return { title: presentation.summary, metadata: presentation.metadata };
   }
   switch (kind) {
-    case "check_syntax": {
+    case "syntax": {
       const diagnostics = record2(output.diagnostics ?? output);
       const errors = typeof diagnostics.error_count === "number" ? diagnostics.error_count : 0;
       const missing = typeof diagnostics.missing_count === "number" ? diagnostics.missing_count : 0;
       return { title: `Syntax ${args.path} (${errors} errors, ${missing} missing)`, metadata: { error_count: errors, missing_count: missing } };
     }
-    case "find_nodes": {
+    case "search": {
       const results = items(output.results);
       const matches = results.reduce((total, result) => total + items(record2(result).matches).length, 0);
       return { title: `Found ${matches} matches`, metadata: { results: results.length, matches } };
     }
-    case "find_text": {
+    case "grep": {
       const results = items(output.results);
       const matches = results.reduce((total, result) => {
         const entry = record2(result);
@@ -2426,15 +2487,15 @@ function resultPresentation(kind, args, value) {
       }, 0);
       return { title: `Found ${matches} matches`, metadata: { results: results.length, matches } };
     }
-    case "find_definitions": {
+    case "def": {
       const locations = items(output.locations).length;
       return { title: `Found ${locations} definitions`, metadata: { locations } };
     }
-    case "find_references": {
+    case "refs": {
       const references = items(output.references).length;
       return { title: `Found ${references} references`, metadata: { references } };
     }
-    case "rename_symbol": {
+    case "rename": {
       const oldName = output.old_name;
       const newName = output.new_name;
       const otherOutputs = items(output.others).map(record2);
@@ -2444,10 +2505,10 @@ function resultPresentation(kind, args, value) {
       const title = typeof oldName === "string" && typeof newName === "string" ? `${output.applied === true ? "Renamed" : "Plan"} ${oldName} -> ${newName}` : initialTitle(kind, args);
       return { title, metadata: { edits, conflicts, others } };
     }
-    case "edit_text":
-    case "write_file": {
+    case "edit":
+    case "write": {
       const preview = typeof output.preview_error === "string" ? " (preview unavailable)" : "";
-      return { title: `${kind === "edit_text" ? "Edited" : "Wrote"} ${args.path}${preview}`, metadata: {} };
+      return { title: `${kind === "edit" ? "Edited" : "Wrote"} ${args.path}${preview}`, metadata: {} };
     }
   }
   return { title: initialTitle(kind, args), metadata: {} };
@@ -2493,7 +2554,7 @@ function readseekTool(description, args, kind, execute, imagePolicy) {
 function createReadSeekTools(imagePolicy) {
   return {
     ...createAccessTools(imagePolicy),
-    readseek_find_text: readseekTool(openCodeToolDescription("find_text"), {
+    readseek_grep: readseekTool(openCodeToolDescription("grep"), {
       pattern: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.grepPattern),
       text: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.text),
       summary: tool3.schema.boolean().optional().describe(PARAM_DESCRIPTIONS.summary),
@@ -2503,7 +2564,7 @@ function createReadSeekTools(imagePolicy) {
       ignoreCase: tool3.schema.boolean().optional().describe(PARAM_DESCRIPTIONS.ignoreCase),
       context: tool3.schema.number().int().nonnegative().optional().describe(PARAM_DESCRIPTIONS.context),
       limit: tool3.schema.number().int().positive().optional().describe(PARAM_DESCRIPTIONS.matchLimit)
-    }, "find_text", async (input, context) => {
+    }, "grep", async (input, context) => {
       const target = resolvePath(context.directory, input.path ?? ".");
       if (input.pattern === undefined === (input.text === undefined)) {
         throw new Error("exactly one of pattern or text is required");
@@ -2511,7 +2572,7 @@ function createReadSeekTools(imagePolicy) {
       const pattern = input.pattern ?? input.text;
       await authorizeSearch(context, target, pattern);
       if (input.text !== undefined && !input.glob && !input.ignoreCase && !input.context && !input.summary) {
-        return runReadSeek(context, buildFindTextArgs({ path: target, text: pattern, limit: input.limit }));
+        return runReadSeek(context, buildGrepArgs({ path: target, text: pattern, limit: input.limit }));
       }
       let expression;
       try {
@@ -2593,7 +2654,7 @@ function createReadSeekTools(imagePolicy) {
       }
       return { results, truncated };
     }),
-    readseek_find_nodes: readseekTool(openCodeToolDescription("find_nodes"), {
+    readseek_search: readseekTool(openCodeToolDescription("search"), {
       pattern: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.pattern),
       context: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.patternContext),
       selector: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.selector),
@@ -2602,9 +2663,9 @@ function createReadSeekTools(imagePolicy) {
       path: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.projectSearchPath),
       language: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.language),
       gitScope: tool3.schema.enum(GIT_SCOPES).optional().describe(PARAM_DESCRIPTIONS.gitScope)
-    }, "find_nodes", async (input, context) => {
+    }, "search", async (input, context) => {
       const target = resolvePath(context.directory, input.path ?? ".");
-      const args = buildFindNodesArgs({
+      const args = buildSearchArgs({
         path: target,
         pattern: input.pattern,
         context: input.context,
@@ -2622,14 +2683,14 @@ function createReadSeekTools(imagePolicy) {
         throw new Error("rule stdin is unavailable in OpenCode tools; use inline KDL or @path");
       return runReadSeek(context, args);
     }),
-    readseek_find_definitions: readseekTool(openCodeToolDescription("find_definitions"), {
+    readseek_def: readseekTool(openCodeToolDescription("def"), {
       name: tool3.schema.string().describe(PARAM_DESCRIPTIONS.name),
       path: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.projectSearchPath),
       language: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.language),
       gitScope: tool3.schema.enum(GIT_SCOPES).optional().describe(PARAM_DESCRIPTIONS.gitScope)
-    }, "find_definitions", async (input, context) => {
+    }, "def", async (input, context) => {
       const target = resolvePath(context.directory, input.path ?? ".");
-      const args = buildFindDefinitionsArgs({
+      const args = buildDefArgs({
         path: target,
         name: input.name,
         language: input.language,
@@ -2638,16 +2699,16 @@ function createReadSeekTools(imagePolicy) {
       await authorizeSearch(context, target, input.name);
       return runReadSeek(context, args);
     }),
-    readseek_find_references: readseekTool(openCodeToolDescription("find_references"), {
+    readseek_refs: readseekTool(openCodeToolDescription("refs"), {
       name: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.refsName),
       path: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.projectSearchPath),
       language: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.language),
       at: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.at),
       gitScope: tool3.schema.enum(GIT_SCOPES).optional().describe(PARAM_DESCRIPTIONS.gitScope)
-    }, "find_references", async (input, context) => {
+    }, "refs", async (input, context) => {
       const target = resolvePath(context.directory, input.path ?? ".");
       const name = input.name;
-      const args = buildFindReferencesArgs({
+      const args = buildRefsArgs({
         path: target,
         name,
         at: input.at,
@@ -2657,7 +2718,7 @@ function createReadSeekTools(imagePolicy) {
       await authorizeSearch(context, target, name ?? "*");
       return runReadSeek(context, args);
     }),
-    readseek_rename_symbol: readseekTool(openCodeToolDescription("rename_symbol"), {
+    readseek_rename: readseekTool(openCodeToolDescription("rename"), {
       path: tool3.schema.string().describe(PARAM_DESCRIPTIONS.projectPath),
       at: tool3.schema.string().describe(PARAM_DESCRIPTIONS.at),
       to: tool3.schema.string().min(1).describe(PARAM_DESCRIPTIONS.to),
@@ -2666,7 +2727,7 @@ function createReadSeekTools(imagePolicy) {
       planHash: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.planHash),
       language: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.language),
       gitScope: tool3.schema.enum(GIT_SCOPES).optional().describe(PARAM_DESCRIPTIONS.gitScope)
-    }, "rename_symbol", async (input, context) => {
+    }, "rename", async (input, context) => {
       const filePath = resolvePath(context.directory, input.path);
       await authorizeRead(context, filePath);
       if (input.workspace) {
@@ -2676,7 +2737,7 @@ function createReadSeekTools(imagePolicy) {
           throw new Error("readseek could not identify a binding at the rename cursor");
         await authorizeSearch(context, context.directory, name);
       }
-      const args = buildRenameSymbolArgs({
+      const args = buildRenameArgs({
         path: filePath,
         to: input.to,
         at: input.at,
@@ -2696,7 +2757,7 @@ function createReadSeekTools(imagePolicy) {
         throw new Error("readseek rename plan did not include a plan hash");
       }
       await authorizeEdit(context, files);
-      return runReadSeek(context, buildRenameSymbolArgs({
+      return runReadSeek(context, buildRenameArgs({
         path: filePath,
         to: input.to,
         at: input.at,
@@ -2710,7 +2771,7 @@ function createReadSeekTools(imagePolicy) {
         timeoutMs: DEFAULT_READSEEK_TIMEOUT_MS
       });
     }),
-    readseek_edit_text: readseekTool(openCodeToolDescription("edit_text"), {
+    readseek_edit: readseekTool(openCodeToolDescription("edit"), {
       path: tool3.schema.string().describe(PARAM_DESCRIPTIONS.projectPath),
       edits: tool3.schema.array(tool3.schema.union([
         tool3.schema.object({
@@ -2750,7 +2811,7 @@ function createReadSeekTools(imagePolicy) {
       apply: tool3.schema.boolean().optional().describe(PARAM_DESCRIPTIONS.applyDefaultTrue),
       planHash: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.planHash),
       gitScope: tool3.schema.enum(GIT_SCOPES).optional().describe(PARAM_DESCRIPTIONS.gitScope)
-    }, "edit_text", async (input, context) => {
+    }, "edit", async (input, context) => {
       const filePath = resolvePath(context.directory, input.path);
       validateEdits(input.edits);
       return withFileMutationQueue(filePath, async () => {
@@ -2759,7 +2820,7 @@ function createReadSeekTools(imagePolicy) {
         await rejectSymlinkMutation(filePath);
         const edits = input.edits;
         const request = serializeEditPlan(edits);
-        const baseArgs = buildEditTextArgs({
+        const baseArgs = buildEditArgs({
           path: filePath,
           language: input.language,
           gitScope: input.gitScope,
@@ -2783,7 +2844,7 @@ function createReadSeekTools(imagePolicy) {
         }
         await authorizeEdit(context, [filePath], simpleDiff(filePath, before, after), false);
         context.abort.throwIfAborted();
-        const applied = record2(await runReadSeek(context, buildEditTextArgs({
+        const applied = record2(await runReadSeek(context, buildEditArgs({
           path: filePath,
           language: input.language,
           gitScope: input.gitScope,
@@ -2801,10 +2862,10 @@ function createReadSeekTools(imagePolicy) {
         return postMutationPreview(context, previewArgs, filePath, true);
       });
     }),
-    readseek_write_file: readseekTool(openCodeToolDescription("write_file"), {
+    readseek_write: readseekTool(openCodeToolDescription("write"), {
       path: tool3.schema.string().describe(PARAM_DESCRIPTIONS.projectPath),
       content: tool3.schema.string().describe(PARAM_DESCRIPTIONS.content)
-    }, "write_file", async (input, context) => {
+    }, "write", async (input, context) => {
       const filePath = resolvePath(context.directory, input.path);
       await authorizeExternal(context, filePath);
       return withFileMutationQueue(filePath, async () => {
@@ -2828,37 +2889,37 @@ function createAccessTools(imagePolicy) {
   const languageSchema = { language: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.language) };
   const levelSchema = { level: tool3.schema.enum(VISION_LEVEL_VALUES).optional().describe(PARAM_DESCRIPTIONS.level) };
   const definitions = {
-    show_content: { build: buildShowContentArgs, args: { ...pathSchema, ...atSchema, ...languageSchema, end: tool3.schema.number().int().positive().optional(), limit: tool3.schema.number().int().positive().optional(), noAnchors: tool3.schema.boolean().optional() } },
-    show_structure: { build: buildShowStructureArgs, args: { ...pathSchema, ...atSchema, ...languageSchema, depth: tool3.schema.number().int().nonnegative().optional(), kind: tool3.schema.string().optional(), outline: tool3.schema.boolean().optional() } },
-    show_metadata: { build: buildShowMetadataArgs, args: { ...pathSchema, ...languageSchema } },
-    show_assets: { build: buildShowAssetsArgs, args: { ...pathSchema, ...atSchema } },
-    check_syntax: { build: buildCheckSyntaxArgs, args: { ...pathSchema, ...languageSchema } },
-    check_rules: { build: buildCheckRulesArgs, args: { path: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.projectSearchPath), rules: tool3.schema.string().min(1), gitScope: tool3.schema.enum(GIT_SCOPES).optional() } },
-    generate_caption: { build: buildGenerateCaptionArgs, args: { ...pathSchema, ...atSchema, ...levelSchema, include: tool3.schema.array(tool3.schema.enum(["text", "objects"])).min(1).optional() } },
-    detect_objects: { build: buildDetectObjectsArgs, args: { ...pathSchema, ...atSchema, ...levelSchema } },
-    recognize_text: { build: buildRecognizeTextArgs, args: { ...pathSchema, ...atSchema, ...levelSchema } }
+    show: { build: buildShowArgs, args: { ...pathSchema, ...atSchema, ...languageSchema, end: tool3.schema.number().int().positive().optional(), limit: tool3.schema.number().int().positive().optional(), noAnchors: tool3.schema.boolean().optional() } },
+    tree: { build: buildTreeArgs, args: { ...pathSchema, ...atSchema, ...languageSchema, depth: tool3.schema.number().int().nonnegative().optional(), kind: tool3.schema.string().optional(), outline: tool3.schema.boolean().optional() } },
+    meta: { build: buildMetaArgs, args: { ...pathSchema, ...languageSchema } },
+    assets: { build: buildAssetsArgs, args: { ...pathSchema, ...atSchema } },
+    syntax: { build: buildSyntaxArgs, args: { ...pathSchema, ...languageSchema } },
+    check: { build: buildCheckArgs, args: { path: tool3.schema.string().optional().describe(PARAM_DESCRIPTIONS.projectSearchPath), rules: tool3.schema.string().min(1), gitScope: tool3.schema.enum(GIT_SCOPES).optional() } },
+    caption: { build: buildCaptionArgs, args: { ...pathSchema, ...atSchema, ...levelSchema, include: tool3.schema.array(tool3.schema.enum(["text", "objects"])).min(1).optional() } },
+    objects: { build: buildObjectsArgs, args: { ...pathSchema, ...atSchema, ...levelSchema } },
+    ocr: { build: buildOcrArgs, args: { ...pathSchema, ...atSchema, ...levelSchema } }
   };
   return Object.fromEntries(Object.entries(definitions).map(([name, definition]) => [
     `readseek_${name}`,
     readseekTool(openCodeToolDescription(name), definition.args, name, async (input, context) => {
       const filePath = resolvePath(context.directory, input.path ?? ".");
-      const buildInput = { ...input, path: filePath, ...name === "show_structure" ? { depth: input.depth ?? DEFAULT_STRUCTURE_DEPTH } : {} };
+      const buildInput = { ...input, path: filePath, ...name === "tree" ? { depth: input.depth ?? DEFAULT_STRUCTURE_DEPTH } : {} };
       let args = definition.build(buildInput);
       await authorizeRead(context, filePath);
-      if (name === "check_rules") {
+      if (name === "check") {
         if (input.rules === "-")
           throw new Error("rules stdin is unavailable in OpenCode tools; use inline KDL or @path");
         await authorizeSearch(context, filePath, input.rules);
         if (input.rules.startsWith("@"))
           await authorizeRead(context, resolvePath(context.directory, input.rules.slice(1)));
       }
-      const inference = ["generate_caption", "detect_objects", "recognize_text"].includes(name);
-      if (name === "show_content" || name === "show_assets" || inference) {
+      const inference = ["caption", "objects", "ocr"].includes(name);
+      if (name === "show" || name === "assets" || inference) {
         const readseekDir = await ensureReadSeekCache(context);
         args = definition.build({ ...buildInput, readseekDir });
       }
       return runReadSeek(context, args, { timeoutMs: inference ? DEFAULT_VISION_TIMEOUT_MS : DEFAULT_READSEEK_TIMEOUT_MS });
-    }, name === "show_content" || name === "show_assets" ? imagePolicy : undefined)
+    }, name === "show" || name === "assets" ? imagePolicy : undefined)
   ]));
 }
 
@@ -2873,28 +2934,28 @@ var SKILL = {
 
 When ReadSeek tools are unavailable, use the readseek CLI for structural navigation and anchored edits if it is installed and available on PATH. Run \`readseek --help\` to inspect supported commands before invoking them. Get fresh anchors before editing; re-read after external file changes.
 
-Commands use verb-object pairs, with the target path positional:
+Commands use flat single-word verbs, with target and primary query arguments positional:
 
 \`\`\`sh
-readseek show content file.ts --at line:10 --limit 40 --kdl
-readseek show structure file.ts --depth 1 --kdl
-readseek show metadata paper.pdf --kdl
-readseek show assets paper.pdf --at page:2 --kdl
-readseek check syntax file.ts --kdl
-readseek check rules . --rules @checks.kdl --kdl
-readseek find nodes src --pattern 'console.log($$$ARGS)' --kdl
-readseek find text src --text 'TODO' --kdl
-readseek find definitions src --name main --kdl
-readseek find references file.ts --at line:10:3 --kdl
-readseek edit text file.ts --edits @edits.kdl --kdl
-readseek rename symbol file.ts --at line:10:3 --to nextName --kdl
+readseek show file.ts --at line:10 --limit 40 --kdl
+readseek tree file.ts --depth 1 --kdl
+readseek meta paper.pdf --kdl
+readseek assets paper.pdf --at page:2 --kdl
+readseek syntax file.ts --kdl
+readseek check . @checks.kdl --kdl
+readseek search 'console.log($$$ARGS)' src --kdl
+readseek grep 'TODO' src --kdl
+readseek def main src --kdl
+readseek refs file.ts --at line:10:3 --kdl
+readseek edit file.ts @edits.kdl --kdl
+readseek rename file.ts --at line:10:3 nextName --kdl
 \`\`\`
 
-Native \`find text\` is literal, not regex. Reference selection requires exactly one of \`--name\` or \`--at\`; rename requires a line or hash cursor. Preview mutations first, then use \`--apply --plan-hash HASH\` with the returned plan hash. Edit requests are KDL: for example, \`set_line anchor="10:HASH" new_text="replacement"\`.
+Native \`grep\` is literal, not regex. Reference selection requires either a symbol \`name\` or \`--at\`; rename requires a line or hash cursor. Preview mutations first, then use \`--apply --plan-hash HASH\` with the returned plan hash. Edit requests are KDL: for example, \`set_line anchor="10:HASH" new_text="replacement"\`.
 
 Syntax and rule checks return exit 0 when clean, 1 for findings, and 2 on failure. Exit 1 is not a transport failure. Syntax checks are parser checks, not type checking.
 
-Content and assets return cached paths; assets auto-materialize. Read those paths directly. There is no extract command or asset destination option. Reading does not invoke inference. Request inference explicitly with \`generate caption\` (optionally \`--include text,objects\`), \`detect objects\`, or \`recognize text\`, using \`--level low|medium|high\` and an installed model; models are never downloaded automatically.
+Content and assets return cached paths; assets auto-materialize. Read those paths directly. There is no extract command or asset destination option. Reading does not invoke inference. Request inference explicitly with \`caption\` (optionally \`--include text,objects\`), \`objects\`, or \`ocr\`, using \`--level low|medium|high\` and an installed model; models are never downloaded automatically.
 
 This V2 plugin supplies guidance only; it does not register readseek_* tools. If the CLI is unavailable, use OpenCode's built-in tools instead.`
 };
@@ -2951,7 +3012,7 @@ var ReadSeekPlugin = async (_input, options) => {
         return;
       try {
         const result = output.metadata.readseek ?? JSON.parse(output.output);
-        if (input.tool === "readseek_rename_symbol") {
+        if (input.tool === "readseek_rename") {
           anchors.planRename(input.sessionID, result);
           if (record2(result).applied === true) {
             for (const filePath of renameFiles(result))

package/dist/v2.js

@@ -9,28 +9,28 @@ var SKILL = {
 
 When ReadSeek tools are unavailable, use the readseek CLI for structural navigation and anchored edits if it is installed and available on PATH. Run \`readseek --help\` to inspect supported commands before invoking them. Get fresh anchors before editing; re-read after external file changes.
 
-Commands use verb-object pairs, with the target path positional:
+Commands use flat single-word verbs, with target and primary query arguments positional:
 
 \`\`\`sh
-readseek show content file.ts --at line:10 --limit 40 --kdl
-readseek show structure file.ts --depth 1 --kdl
-readseek show metadata paper.pdf --kdl
-readseek show assets paper.pdf --at page:2 --kdl
-readseek check syntax file.ts --kdl
-readseek check rules . --rules @checks.kdl --kdl
-readseek find nodes src --pattern 'console.log($$$ARGS)' --kdl
-readseek find text src --text 'TODO' --kdl
-readseek find definitions src --name main --kdl
-readseek find references file.ts --at line:10:3 --kdl
-readseek edit text file.ts --edits @edits.kdl --kdl
-readseek rename symbol file.ts --at line:10:3 --to nextName --kdl
+readseek show file.ts --at line:10 --limit 40 --kdl
+readseek tree file.ts --depth 1 --kdl
+readseek meta paper.pdf --kdl
+readseek assets paper.pdf --at page:2 --kdl
+readseek syntax file.ts --kdl
+readseek check . @checks.kdl --kdl
+readseek search 'console.log($$$ARGS)' src --kdl
+readseek grep 'TODO' src --kdl
+readseek def main src --kdl
+readseek refs file.ts --at line:10:3 --kdl
+readseek edit file.ts @edits.kdl --kdl
+readseek rename file.ts --at line:10:3 nextName --kdl
 \`\`\`
 
-Native \`find text\` is literal, not regex. Reference selection requires exactly one of \`--name\` or \`--at\`; rename requires a line or hash cursor. Preview mutations first, then use \`--apply --plan-hash HASH\` with the returned plan hash. Edit requests are KDL: for example, \`set_line anchor="10:HASH" new_text="replacement"\`.
+Native \`grep\` is literal, not regex. Reference selection requires either a symbol \`name\` or \`--at\`; rename requires a line or hash cursor. Preview mutations first, then use \`--apply --plan-hash HASH\` with the returned plan hash. Edit requests are KDL: for example, \`set_line anchor="10:HASH" new_text="replacement"\`.
 
 Syntax and rule checks return exit 0 when clean, 1 for findings, and 2 on failure. Exit 1 is not a transport failure. Syntax checks are parser checks, not type checking.
 
-Content and assets return cached paths; assets auto-materialize. Read those paths directly. There is no extract command or asset destination option. Reading does not invoke inference. Request inference explicitly with \`generate caption\` (optionally \`--include text,objects\`), \`detect objects\`, or \`recognize text\`, using \`--level low|medium|high\` and an installed model; models are never downloaded automatically.
+Content and assets return cached paths; assets auto-materialize. Read those paths directly. There is no extract command or asset destination option. Reading does not invoke inference. Request inference explicitly with \`caption\` (optionally \`--include text,objects\`), \`objects\`, or \`ocr\`, using \`--level low|medium|high\` and an installed model; models are never downloaded automatically.
 
 This V2 plugin supplies guidance only; it does not register readseek_* tools. If the CLI is unavailable, use OpenCode's built-in tools instead.`
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "opencode-readseek",
-  "version": "0.11.4",
+  "version": "0.12.0",
   "description": "OpenCode plugin for anchored file operations and structural code navigation",
   "type": "module",
   "main": "./dist/index.js",
@@ -33,8 +33,8 @@
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@jarkkojs/readseek": "^0.11.4",
-    "@jarkkojs/readseek-api": "^0.11.4",
+    "@jarkkojs/readseek": "^0.12.0",
+    "@jarkkojs/readseek-api": "^0.12.0",
     "@opencode-ai/plugin": "^1.18.18"
   },
   "devDependencies": {