pi-readseek 0.4.30 → 0.5.1

package/src/readseek-settings.ts

@@ -2,30 +2,42 @@ import { readFileSync, statSync, type Stats } from "node:fs";
 import { homedir } from "node:os";
 import { join } from "node:path";
 
+export type ReadSeekImageAnalysisMode = "force" | "off" | "auto";
+export type ReadSeekSyntaxValidationMode = "warn" | "block" | "off";
+
+interface ReadSeekGrepSettings {
+  maxLines?: number;
+  maxBytes?: number;
+}
+
 interface ReadSeekJsonSettings {
-  grep?: { maxLines?: number; maxBytes?: number };
-  edit?: { diffDisplay?: "collapsed" | "expanded" };
-  read?: { ocrMode?: "on" | "off" | "auto" };
+  excludeTools?: string[];
+  imageMode?: ReadSeekImageAnalysisMode;
+  syntaxValidation?: ReadSeekSyntaxValidationMode;
+  timeoutMs?: number;
+  grep?: ReadSeekGrepSettings;
 }
 
-interface ReadSeekSettingsWarning {
+export interface ReadSeekSettingsWarning {
   source: string;
   message: string;
   path?: string;
 }
 
-interface ReadSeekSettingsResult {
+export interface ReadSeekSettingsResult {
   settings: ReadSeekJsonSettings;
   warnings: ReadSeekSettingsWarning[];
 }
 
+const READSEEK_KEYS = ["excludeTools", "imageMode", "syntaxValidation", "timeoutMs", "grep"];
+const READSEEK_GREP_KEYS = ["maxLines", "maxBytes"];
 
-function defaultGlobalSettingsPath(): string {
-  return join(homedir(), ".pi/agent/readseek/settings.json");
+function globalSettingsPath(): string {
+  return join(homedir(), ".pi/agent/settings.json");
 }
 
-function defaultProjectSettingsPath(): string {
-  return join(process.cwd(), ".pi/readseek/settings.json");
+function projectSettingsPath(): string {
+  return join(process.cwd(), ".pi/settings.json");
 }
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -36,6 +48,20 @@ function invalid(source: string, path: string): ReadSeekSettingsWarning {
   return { source, path, message: `Invalid readseek setting at ${path}` };
 }
 
+function warnUnknownKeys(
+  raw: Record<string, unknown>,
+  known: string[],
+  prefix: string,
+  source: string,
+  warnings: ReadSeekSettingsWarning[],
+): void {
+  for (const key of Object.keys(raw)) {
+    if (known.includes(key)) continue;
+    const path = `${prefix}.${key}`;
+    warnings.push({ source, path, message: `Unknown readseek setting at ${path}` });
+  }
+}
+
 function readPositive(
   raw: Record<string, unknown>,
   key: string,
@@ -50,40 +76,111 @@ function readPositive(
   return undefined;
 }
 
+function readEnum<T extends string>(
+  raw: Record<string, unknown>,
+  key: string,
+  values: readonly T[],
+  path: string,
+  source: string,
+  warnings: ReadSeekSettingsWarning[],
+): T | undefined {
+  if (!(key in raw)) return undefined;
+  const val = raw[key];
+  if (typeof val === "string" && (values as readonly string[]).includes(val)) return val as T;
+  warnings.push(invalid(source, path));
+  return undefined;
+}
+
+function readImageMode(
+  raw: Record<string, unknown>,
+  source: string,
+  warnings: ReadSeekSettingsWarning[],
+): ReadSeekImageAnalysisMode | undefined {
+  if (!("imageMode" in raw)) return undefined;
+  const val = raw.imageMode;
+  if (val === "on") return "force";
+  if (val === "force" || val === "off" || val === "auto") return val;
+  warnings.push(invalid(source, "readseek.imageMode"));
+  return undefined;
+}
+
+function readStringArray(
+  raw: Record<string, unknown>,
+  key: string,
+  path: string,
+  source: string,
+  warnings: ReadSeekSettingsWarning[],
+): string[] | undefined {
+  if (!(key in raw)) return undefined;
+  const value = raw[key];
+  if (!Array.isArray(value)) {
+    warnings.push(invalid(source, path));
+    return undefined;
+  }
+
+  const strings: string[] = [];
+  value.forEach((item, index) => {
+    if (typeof item !== "string" || item.trim() === "") {
+      warnings.push(invalid(source, `${path}[${index}]`));
+      return;
+    }
+    strings.push(item);
+  });
+  return strings;
+}
 
 function validateSettings(raw: unknown, source: string): ReadSeekSettingsResult {
   const settings: ReadSeekJsonSettings = {};
   const warnings: ReadSeekSettingsWarning[] = [];
-  if (!isRecord(raw)) return { settings, warnings };
-
-  if (isRecord(raw.grep)) {
-    const grep: NonNullable<ReadSeekJsonSettings["grep"]> = {};
-    const maxLines = readPositive(raw.grep, "maxLines", "grep.maxLines", source, warnings);
-    if (maxLines !== undefined) grep.maxLines = maxLines;
-    const maxBytes = readPositive(raw.grep, "maxBytes", "grep.maxBytes", source, warnings);
-    if (maxBytes !== undefined) grep.maxBytes = maxBytes;
-    if (Object.keys(grep).length > 0) settings.grep = grep;
+  if (!isRecord(raw)) {
+    warnings.push({ source, message: "Invalid readseek settings: expected a JSON object" });
+    return { settings, warnings };
   }
-
-
-  if (isRecord(raw.edit)) {
-    const edit: NonNullable<ReadSeekJsonSettings["edit"]> = {};
-    if ("diffDisplay" in raw.edit) {
-      const value = raw.edit.diffDisplay;
-      if (value === "collapsed" || value === "expanded") edit.diffDisplay = value;
-      else warnings.push(invalid(source, "edit.diffDisplay"));
+  if (!("readseek" in raw)) {
+    if (Object.keys(raw).length > 0) {
+      warnings.push({ source, path: "readseek", message: "Missing readseek section: every setting belongs under \"readseek\"" });
     }
-    if (Object.keys(edit).length > 0) settings.edit = edit;
+    return { settings, warnings };
+  }
+  if (!isRecord(raw.readseek)) {
+    warnings.push(invalid(source, "readseek"));
+    return { settings, warnings };
   }
 
-  if (isRecord(raw.read)) {
-    const read: NonNullable<ReadSeekJsonSettings["read"]> = {};
-    if ("ocrMode" in raw.read) {
-      const value = raw.read.ocrMode;
-      if (value === "on" || value === "off" || value === "auto") read.ocrMode = value;
-      else warnings.push(invalid(source, "read.ocrMode"));
+  const section = raw.readseek;
+  warnUnknownKeys(section, READSEEK_KEYS, "readseek", source, warnings);
+
+  const excludeTools = readStringArray(section, "excludeTools", "readseek.excludeTools", source, warnings);
+  if (excludeTools !== undefined) settings.excludeTools = excludeTools;
+
+  const imageMode = readImageMode(section, source, warnings);
+  if (imageMode !== undefined) settings.imageMode = imageMode;
+
+  const syntaxValidation = readEnum(
+    section,
+    "syntaxValidation",
+    ["warn", "block", "off"] as const,
+    "readseek.syntaxValidation",
+    source,
+    warnings,
+  );
+  if (syntaxValidation !== undefined) settings.syntaxValidation = syntaxValidation;
+
+  const timeoutMs = readPositive(section, "timeoutMs", "readseek.timeoutMs", source, warnings);
+  if (timeoutMs !== undefined) settings.timeoutMs = timeoutMs;
+
+  if ("grep" in section) {
+    if (isRecord(section.grep)) {
+      warnUnknownKeys(section.grep, READSEEK_GREP_KEYS, "readseek.grep", source, warnings);
+      const grep: ReadSeekGrepSettings = {};
+      const maxLines = readPositive(section.grep, "maxLines", "readseek.grep.maxLines", source, warnings);
+      if (maxLines !== undefined) grep.maxLines = maxLines;
+      const maxBytes = readPositive(section.grep, "maxBytes", "readseek.grep.maxBytes", source, warnings);
+      if (maxBytes !== undefined) grep.maxBytes = maxBytes;
+      if (Object.keys(grep).length > 0) settings.grep = grep;
+    } else {
+      warnings.push(invalid(source, "readseek.grep"));
     }
-    if (Object.keys(read).length > 0) settings.read = read;
   }
 
   return { settings, warnings };
@@ -128,43 +225,29 @@ function readSettingsFile(path: string): ReadSeekSettingsResult {
 }
 
 function mergeSettings(base: ReadSeekJsonSettings, override: ReadSeekJsonSettings): ReadSeekJsonSettings {
-  const merged: ReadSeekJsonSettings = {};
+  const settings: ReadSeekJsonSettings = { ...base, ...override };
   const grep = { ...(base.grep ?? {}), ...(override.grep ?? {}) };
-  if (Object.keys(grep).length > 0) merged.grep = grep;
-  const edit = { ...(base.edit ?? {}), ...(override.edit ?? {}) };
-  if (Object.keys(edit).length > 0) merged.edit = edit;
-  const read = { ...(base.read ?? {}), ...(override.read ?? {}) };
-  if (Object.keys(read).length > 0) merged.read = read;
-  return merged;
+  if (Object.keys(grep).length > 0) settings.grep = grep;
+  return settings;
 }
 
 export function resolveReadSeekJsonSettings(): ReadSeekSettingsResult {
-  const globalResult = readSettingsFile(defaultGlobalSettingsPath());
-  const projectResult = readSettingsFile(defaultProjectSettingsPath());
+  const globalResult = readSettingsFile(globalSettingsPath());
+  const projectResult = readSettingsFile(projectSettingsPath());
   return {
     settings: mergeSettings(globalResult.settings, projectResult.settings),
     warnings: [...globalResult.warnings, ...projectResult.warnings],
   };
 }
 
-export function resolveEditDiffDisplay(env: NodeJS.ProcessEnv = process.env): "collapsed" | "expanded" {
-  const raw = env.READSEEK_EDIT_DIFF_DISPLAY;
-  if (typeof raw === "string") {
-    const normalized = raw.trim().toLowerCase();
-    if (normalized === "expanded" || normalized === "collapsed") return normalized;
-  }
-  const json = resolveReadSeekJsonSettings().settings.edit?.diffDisplay;
-  if (json === "expanded" || json === "collapsed") return json;
-  return "collapsed";
+export function resolveReadSeekImageMode(): ReadSeekImageAnalysisMode {
+  return resolveReadSeekJsonSettings().settings.imageMode ?? "force";
 }
 
-export function resolveReadSeekOcrMode(env: NodeJS.ProcessEnv = process.env): "on" | "off" | "auto" {
-  const raw = env.READSEEK_READ_OCR_MODE;
-  if (typeof raw === "string") {
-    const normalized = raw.trim().toLowerCase();
-    if (normalized === "on" || normalized === "off" || normalized === "auto") return normalized;
-  }
-  const json = resolveReadSeekJsonSettings().settings.read?.ocrMode;
-  if (json === "on" || json === "off" || json === "auto") return json;
-  return "on";
+export function resolveReadSeekSyntaxValidation(): ReadSeekSyntaxValidationMode | undefined {
+  return resolveReadSeekJsonSettings().settings.syntaxValidation;
+}
+
+export function resolveReadSeekTimeoutMs(): number | undefined {
+  return resolveReadSeekJsonSettings().settings.timeoutMs;
 }

package/src/readseek-value.ts

@@ -129,16 +129,16 @@ export function buildReadSeekError(
 export interface ToolErrorResult {
   content: [{ type: "text"; text: string }];
   isError: true;
-  details: { readseekValue: Record<string, unknown> };
+  details: { readSeekValue: Record<string, unknown> };
 }
 
 /**
  * Build the standard failure envelope shared by every read-family tool: a text
- * content block plus a `readseekValue` carrying `ok: false` and a
+ * content block plus a `readSeekValue` carrying `ok: false` and a
  * {@link buildReadSeekError} payload.
  *
  * `path` is included only when provided, and `extra` is merged into
- * `readseekValue` so callers can attach tool-specific fields (e.g. write's
+ * `readSeekValue` so callers can attach tool-specific fields (e.g. write's
  * `lines`/`warnings`).
  */
 export function buildToolErrorResult(
@@ -151,7 +151,7 @@ export function buildToolErrorResult(
     content: [{ type: "text", text: message }],
     isError: true,
     details: {
-      readseekValue: {
+      readSeekValue: {
         tool,
         ...(opts.extra ?? {}),
         ok: false,

package/src/refs-output.ts

@@ -17,7 +17,7 @@ interface BuildRefsOutputInput {
 
 interface RefsOutputResult {
   text: string;
-  readseekValue: {
+  readSeekValue: {
     tool: "refs";
     files: Array<{
       path: string;
@@ -30,13 +30,13 @@ export function buildRefsOutput(input: BuildRefsOutputInput): RefsOutputResult {
   if (input.files.length === 0) {
     return {
       text: `No references found for: ${input.name}`,
-      readseekValue: { tool: "refs", files: [] },
+      readSeekValue: { tool: "refs", files: [] },
     };
   }
 
   return {
     text: formatAnchoredFileBlocks(input.files, (line) => (line.enclosingSymbol ? ` (in ${line.enclosingSymbol})` : "")),
-    readseekValue: {
+    readSeekValue: {
       tool: "refs",
       files: input.files.map((file) => ({
         path: file.path,

package/src/refs.ts

@@ -5,10 +5,10 @@ import { defineToolPromptMetadata } from "./tool-prompt-metadata.js";
 import { statSearchPathOrError } from "./stat-search-path.js";
 import { buildReadSeekLineWithHash, buildToolErrorResult } from "./readseek-value.js";
 import { resolveToCwd } from "./path-utils.js";
-import { classifyReadSeekFailure, readseekRefs, type ReadSeekReference } from "./readseek-client.js";
+import { classifyReadSeekFailure, readSeekRefs, type ReadSeekReference } from "./readseek-client.js";
 import { buildRefsOutput, type RefsOutputFile, type RefsOutputLine } from "./refs-output.js";
 import type { FileAnchoredCallback } from "./tool-types.js";
-import { langParam, readseekGitSearchParams, searchPathParam, validateIgnoredRequiresOthers } from "./readseek-params.js";
+import { langParam, readSeekGitSearchParams, searchPathParam, validateIgnoredRequiresOthers } from "./readseek-params.js";
 import { registerReadSeekTool } from "./register-tool.js";
 
 import { renderAnchoredFilesResult, renderReadSeekSearchCall } from "./tui-render-utils.js";
@@ -94,7 +94,7 @@ export async function executeRefs(opts: ExecuteRefsOptions): Promise<any> {
   if (!statResult.ok) return statResult.error;
 
   try {
-    const references = await readseekRefs(searchPath, p.name, {
+    const references = await readSeekRefs(searchPath, p.name, {
       scope: p.scope,
       line: p.line,
       column: p.column,
@@ -111,7 +111,7 @@ export async function executeRefs(opts: ExecuteRefsOptions): Promise<any> {
     }
     return {
       content: [{ type: "text", text: builtOutput.text }],
-      details: { readseekValue: builtOutput.readseekValue },
+      details: { readSeekValue: builtOutput.readSeekValue },
     };
   } catch (err: any) {
     const failure = classifyReadSeekFailure(err);
@@ -124,11 +124,7 @@ export async function executeRefs(opts: ExecuteRefsOptions): Promise<any> {
 
 export function registerRefsTool(pi: ExtensionAPI, options: RefsToolOptions = {}) {
   const tool = registerReadSeekTool(pi, {
-    policy: "read-only",
-    pythonName: "refs",
-    defaultExposure: "opt-in",
-  }, {
-    name: "refs",
+    name: "readSeek_refs",
     label: "References",
     description: REFS_PROMPT_METADATA.description,
     promptSnippet: REFS_PROMPT_METADATA.promptSnippet,
@@ -140,7 +136,7 @@ export function registerRefsTool(pi: ExtensionAPI, options: RefsToolOptions = {}
       scope: Type.Optional(Type.Boolean({ description: "Restrict to the binding under line/column (single file)" })),
       line: Type.Optional(Type.Number({ description: "One-based cursor line, used with scope" })),
       column: Type.Optional(Type.Number({ description: "One-based cursor byte column, used with scope" })),
-      ...readseekGitSearchParams(),
+      ...readSeekGitSearchParams(),
     }),
     async execute(_toolCallId, params, signal, _onUpdate, ctx) {
       return executeRefs({ params, signal, cwd: ctx.cwd, onFileAnchored: options.onFileAnchored });

package/src/register-tool.ts

@@ -20,48 +20,10 @@ export function mapParam() {
   return Type.Optional(Type.Boolean({ description: "Append structural map" }));
 }
 
-export type ReadSeekToolPolicy = "read-only" | "mutating";
-
-export type ReadSeekToolExposure = "safe-by-default" | "opt-in" | "not-safe-by-default";
-
-/**
- * Per-tool fields of the pi tool config (`ptc`) that genuinely differ between
- * readseek tools. The remaining fields are constant or derived.
- */
-export interface ReadSeekToolConfig {
-  policy: ReadSeekToolPolicy;
-  pythonName: string;
-  defaultExposure: ReadSeekToolExposure;
-}
-
-export interface ReadSeekToolPtc extends ReadSeekToolConfig {
-  callable: true;
-  enabled: true;
-  readOnly: boolean;
-}
-
 type ToolSpec = Parameters<ExtensionAPI["registerTool"]>[0];
 
-/**
- * Attach the standard `ptc` envelope to a tool definition and register it.
- *
- * `callable` and `enabled` are always true and `readOnly` is derived from
- * `policy`, so callers supply only the fields that vary between tools.
- */
-export function registerReadSeekTool<T extends ToolSpec>(
-  pi: ExtensionAPI,
-  config: ReadSeekToolConfig,
-  tool: T,
-): T & { ptc: ReadSeekToolPtc } {
-  const ptc: ReadSeekToolPtc = {
-    callable: true,
-    enabled: true,
-    policy: config.policy,
-    readOnly: config.policy === "read-only",
-    pythonName: config.pythonName,
-    defaultExposure: config.defaultExposure,
-  };
-  const registered = { ...tool, ptc };
-  pi.registerTool(registered);
-  return registered;
+/** Register a readseek-backed tool definition. */
+export function registerReadSeekTool<T extends ToolSpec>(pi: ExtensionAPI, tool: T): T {
+  pi.registerTool(tool);
+  return tool;
 }

package/src/rename.ts

@@ -6,7 +6,7 @@ import { Text } from "@earendil-works/pi-tui";
 import { defineToolPromptMetadata } from "./tool-prompt-metadata.js";
 import { buildToolErrorResult } from "./readseek-value.js";
 import { resolveToCwd } from "./path-utils.js";
-import { classifyReadSeekFailure, readseekRename, type RenameOutput } from "./readseek-client.js";
+import { classifyReadSeekFailure, readSeekRename, type RenameOutput } from "./readseek-client.js";
 import { filePathParam, registerReadSeekTool } from "./register-tool.js";
 
 import { clampLinesToWidth, linkToolPath, renderPendingResult, resolveRenderResultContext, summaryLine } from "./tui-render-utils.js";
@@ -54,7 +54,7 @@ export async function executeRename(opts: ExecuteRenameOptions): Promise<any> {
 	const filePath = resolveToCwd(p.path, cwd);
 
 	try {
-		const output = await readseekRename(filePath, {
+		const output = await readSeekRename(filePath, {
 			to: p.to,
 			line: p.line,
 			column: p.column,
@@ -92,7 +92,7 @@ export async function executeRename(opts: ExecuteRenameOptions): Promise<any> {
 		return {
 			content: [{ type: "text", text }],
 			details: {
-				readseekValue: {
+				readSeekValue: {
 					tool: "rename",
 					ok: true,
 					path: filePath,
@@ -108,11 +108,7 @@ export async function executeRename(opts: ExecuteRenameOptions): Promise<any> {
 
 export function registerRenameTool(pi: ExtensionAPI) {
 	registerReadSeekTool(pi, {
-		policy: "mutating",
-		pythonName: "rename",
-		defaultExposure: "not-safe-by-default",
-	}, {
-		name: "rename",
+		name: "readSeek_rename",
 		label: "Rename",
 		description: RENAME_PROMPT_METADATA.description,
 		promptSnippet: RENAME_PROMPT_METADATA.promptSnippet,
@@ -138,8 +134,8 @@ export function registerRenameTool(pi: ExtensionAPI) {
 
 			const content = result.content?.[0];
 			const textContent = content?.type === "text" ? content.text : "";
-			const readseekValue = (result.details as any)?.readseekValue;
-			const output = readseekValue?.output as RenameOutput | undefined;
+			const readSeekValue = (result.details as any)?.readSeekValue;
+			const output = readSeekValue?.output as RenameOutput | undefined;
 
 			if (isError || result.isError) {
 			return new Text(textContent || "rename failed", 0, 0);

package/src/replace-symbol.ts

@@ -1,4 +1,4 @@
-import { readseekMapContent } from "./readseek-client.js";
+import { readSeekMapContent } from "./readseek-client.js";
 import { findSymbol } from "./readseek/symbol-lookup.js";
 import { formatAmbiguous, formatNotFound } from "./readseek/symbol-error-format.js";
 import { normalizeToLF } from "./edit-diff.js";
@@ -33,7 +33,7 @@ function reindent(text: string, indent: string): string {
 }
 
 export async function replaceSymbol(input: ReplaceSymbolInput): Promise<ReplaceSymbolResult> {
-	const map = await readseekMapContent(input.filePath, input.content);
+	const map = await readSeekMapContent(input.filePath, input.content);
 	if (!map) {
 		return {
 			type: "unsupported",

package/src/sg-output.ts

@@ -15,7 +15,7 @@ export interface BuildSgOutputInput {
 
 export interface SgOutputResult {
   text: string;
-  readseekValue: {
+  readSeekValue: {
     tool: "search";
     files: Array<{
       path: string;
@@ -29,7 +29,7 @@ export function buildSgOutput(input: BuildSgOutputInput): SgOutputResult {
   if (input.files.length === 0) {
     return {
       text: `No matches found for pattern: ${input.pattern}`,
-      readseekValue: {
+      readSeekValue: {
         tool: "search",
         files: [],
       },
@@ -38,7 +38,7 @@ export function buildSgOutput(input: BuildSgOutputInput): SgOutputResult {
 
   return {
     text: formatAnchoredFileBlocks(input.files),
-    readseekValue: {
+    readSeekValue: {
       tool: "search",
       files: input.files.map((file) => ({
         path: file.path,

package/src/sg.ts

@@ -7,10 +7,10 @@ import { defineToolPromptMetadata } from "./tool-prompt-metadata.js";
 import { buildReadSeekLineWithHash, buildToolErrorResult, type ReadSeekLine } from "./readseek-value.js";
 import { resolveToCwd } from "./path-utils.js";
 import { statSearchPathOrError } from "./stat-search-path.js";
-import { classifyReadSeekFailure, readseekSearch, type ReadSeekHashline, type ReadSeekSearchFileOutput } from "./readseek-client.js";
+import { classifyReadSeekFailure, readSeekSearch, type ReadSeekHashline, type ReadSeekSearchFileOutput } from "./readseek-client.js";
 import { buildSgOutput } from "./sg-output.js";
 import type { FileAnchoredCallback } from "./tool-types.js";
-import { langParam, readseekGitSearchParams, searchPathParam, validateIgnoredRequiresOthers } from "./readseek-params.js";
+import { langParam, readSeekGitSearchParams, searchPathParam, validateIgnoredRequiresOthers } from "./readseek-params.js";
 import { registerReadSeekTool } from "./register-tool.js";
 
 import { renderAnchoredFilesResult, renderReadSeekSearchCall } from "./tui-render-utils.js";
@@ -66,7 +66,7 @@ export interface ExecuteSgOptions {
   onFileAnchored?: FileAnchoredCallback;
 }
 
-function readseekLineFromSearch(line: ReadSeekHashline): ReadSeekLine {
+function readSeekLineFromSearch(line: ReadSeekHashline): ReadSeekLine {
   return buildReadSeekLineWithHash(line.line, line.hash, line.text);
 }
 
@@ -74,7 +74,7 @@ function linesFromSearchResult(result: ReadSeekSearchFileOutput, ranges: SgRange
   const lineMap = new Map<number, ReadSeekLine>();
   for (const match of result.matches) {
     for (const line of match.hashlines) {
-      lineMap.set(line.line, readseekLineFromSearch(line));
+      lineMap.set(line.line, readSeekLineFromSearch(line));
     }
   }
 
@@ -83,16 +83,16 @@ function linesFromSearchResult(result: ReadSeekSearchFileOutput, ranges: SgRange
   for (const range of ranges) {
     for (let line = range.startLine; line <= range.endLine; line++) {
       if (seen.has(line)) continue;
-      const readseekLine = lineMap.get(line);
-      if (!readseekLine) continue;
+      const readSeekLine = lineMap.get(line);
+      if (!readSeekLine) continue;
       seen.add(line);
-      lines.push(readseekLine);
+      lines.push(readSeekLine);
     }
   }
   return lines;
 }
 
-function readseekLanguageForPath(language: string | undefined, searchPath: string, isFile: boolean): string | undefined {
+function readSeekLanguageForPath(language: string | undefined, searchPath: string, isFile: boolean): string | undefined {
   if (language === "typescript" && isFile && path.extname(searchPath).toLowerCase() === ".tsx") return "tsx";
   return language;
 }
@@ -112,8 +112,8 @@ export async function executeSg(opts: ExecuteSgOptions): Promise<any> {
   const searchPathIsFile = statResult.stats.isFile();
 
   try {
-    const effectiveLang = readseekLanguageForPath(p.lang, searchPath, searchPathIsFile);
-    const results = await readseekSearch(searchPath, p.pattern, {
+    const effectiveLang = readSeekLanguageForPath(p.lang, searchPath, searchPathIsFile);
+    const results = await readSeekSearch(searchPath, p.pattern, {
       language: effectiveLang,
       cached: p.cached,
       others: p.others,
@@ -125,12 +125,12 @@ export async function executeSg(opts: ExecuteSgOptions): Promise<any> {
       return {
         content: [{ type: "text", text: emptyOutput.text }],
         details: {
-          readseekValue: emptyOutput.readseekValue,
+          readSeekValue: emptyOutput.readSeekValue,
         },
       };
     }
 
-    const readseekFiles: Array<{
+    const readSeekFiles: Array<{
       displayPath: string;
       path: string;
       ranges: SgRange[];
@@ -145,7 +145,7 @@ export async function executeSg(opts: ExecuteSgOptions): Promise<any> {
       const mergedRanges = mergeRanges(ranges);
       const lines = linesFromSearchResult(result, mergedRanges);
       if (lines.length === 0) continue;
-      readseekFiles.push({
+      readSeekFiles.push({
         displayPath: display,
         path: abs,
         ranges: mergedRanges.map((range) => ({ ...range })),
@@ -153,27 +153,27 @@ export async function executeSg(opts: ExecuteSgOptions): Promise<any> {
       });
     }
 
-    if (readseekFiles.length === 0) {
+    if (readSeekFiles.length === 0) {
       const emptyOutput = buildSgOutput({ pattern: p.pattern, files: [] });
       return {
         content: [{ type: "text", text: emptyOutput.text }],
         details: {
-          readseekValue: emptyOutput.readseekValue,
+          readSeekValue: emptyOutput.readSeekValue,
         },
       };
     }
 
     const builtOutput = buildSgOutput({
       pattern: p.pattern,
-      files: readseekFiles,
+      files: readSeekFiles,
     });
-    for (const readseekFile of readseekFiles) {
-      onFileAnchored?.(readseekFile.path);
+    for (const readSeekFile of readSeekFiles) {
+      onFileAnchored?.(readSeekFile.path);
     }
     return {
       content: [{ type: "text", text: builtOutput.text }],
       details: {
-        readseekValue: builtOutput.readseekValue,
+        readSeekValue: builtOutput.readSeekValue,
       },
     };
   } catch (err: any) {
@@ -184,11 +184,7 @@ export async function executeSg(opts: ExecuteSgOptions): Promise<any> {
 
 export function registerSgTool(pi: ExtensionAPI, options: SgToolOptions = {}) {
   const tool = registerReadSeekTool(pi, {
-    policy: "read-only",
-    pythonName: "search",
-    defaultExposure: "opt-in",
-  }, {
-    name: "search",
+    name: "readSeek_search",
     label: "Structural Search",
     description: SG_PROMPT_METADATA.description,
     promptSnippet: SG_PROMPT_METADATA.promptSnippet,
@@ -197,7 +193,7 @@ export function registerSgTool(pi: ExtensionAPI, options: SgToolOptions = {}) {
       pattern: Type.String({ description: "AST pattern" }),
       lang: langParam(),
       path: searchPathParam(),
-      ...readseekGitSearchParams(),
+      ...readSeekGitSearchParams(),
     }),
     async execute(_toolCallId, params, signal, _onUpdate, ctx) {
       return executeSg({ params, signal, cwd: ctx.cwd, onFileAnchored: options.onFileAnchored });