pi-readseek 0.4.12 → 0.4.14

package/src/read.ts

@@ -13,12 +13,11 @@ import { Text } from "@earendil-works/pi-tui";
 import { defineToolPromptMetadata } from "./tool-prompt-metadata.js";
 import { normalizeToLF, stripBom, hasBareCarriageReturn } from "./edit-diff.js";
 import { ensureHashInit, escapeControlCharsForDisplay } from "./hashline.js";
-import { buildReadseekWarning, buildToolErrorResult, renderReadseekLines, type ReadseekLine, type ReadseekWarning } from "./readseek-value.js";
+import { buildReadSeekWarning, buildToolErrorResult, renderReadSeekLines, type ReadSeekLine, type ReadSeekWarning } from "./readseek-value.js";
 import { looksLikeBinary } from "./binary-detect.js";
-import { isSupportedImageBuffer } from "./image-detect.js";
 import { resolveToCwd } from "./path-utils.js";
 import { throwIfAborted } from "./runtime.js";
-import { getOrGenerateMap } from "./map-cache.js";
+import { getOrGenerateMap } from "./file-map.js";
 import { formatFileMapWithBudget } from "./readseek/formatter.js";
 import { findSymbol, type SymbolMatch } from "./readseek/symbol-lookup.js";
 import { formatAmbiguous, formatNotFound } from "./readseek/symbol-error-format.js";
@@ -26,15 +25,15 @@ import { buildReadOutput } from "./read-output.js";
 
 import { buildLocalBundle } from "./read-local-bundle.js";
 import { coerceObviousBase10Int } from "./coerce-obvious-int.js";
-import { readseekRead } from "./readseek-client.js";
+import { readseekRead, readseekDetect, type ReadSeekDetection } from "./readseek-client.js";
 import { formatReadCallText, formatReadResultText } from "./read-render-helpers.js";
 import { clampLineToWidth, clampLinesToWidth, linkToolPath, renderPendingResult, renderToolLabel, resolveRenderResultContext, summaryLine, wrapReadHashlinesForWidth } from "./tui-render-utils.js";
 import type { FileAnchoredCallback } from "./tool-types.js";
-import { registerReadseekTool } from "./register-tool.js";
+import { registerReadSeekTool } from "./register-tool.js";
 
 const READ_PROMPT_METADATA = defineToolPromptMetadata({
 	promptUrl: new URL("../prompts/read.md", import.meta.url),
-	promptSnippet: "Read text files or images; text reads include hashline anchors and optional maps/symbol lookup",
+	promptSnippet: "Read text files or images; text reads include hashline anchors and optional maps/symbol lookup, image reads include the attachment plus OCR text",
 });
 
 interface ReadParams {
@@ -138,15 +137,8 @@ export async function executeRead(opts: ExecuteReadOptions): Promise<AgentToolRe
 		const message = "Cannot combine map with symbol. Use one or the other.";
 		return buildToolErrorResult("read", "invalid-params-combo", message, { path: rawParams.path });
 	}
-	// Delegate images to the built-in read tool
 	throwIfAborted(signal);
 	const ext = rawPath.split(".").pop()?.toLowerCase() ?? "";
-	if (["jpg", "jpeg", "png", "gif", "webp"].includes(ext)) {
-		const builtinRead = createReadTool(cwd);
-		return succeed(await builtinRead.execute(toolCallId, p, signal, onUpdate));
-	}
-
-	throwIfAborted(signal);
 	let rawBuffer: Buffer;
 	try {
 		rawBuffer = await fsReadFile(absolutePath);
@@ -168,17 +160,37 @@ export async function executeRead(opts: ExecuteReadOptions): Promise<AgentToolRe
 		return buildToolErrorResult("read", "fs-error", message, { path: rawParams.path, details: { fsCode: code, fsMessage: err?.message } });
 	}
 
-	if (isSupportedImageBuffer(rawBuffer)) {
-		const builtinRead = createReadTool(cwd);
-		return succeed(await builtinRead.execute(toolCallId, p, signal, onUpdate));
-	}
 	const hasBinaryContent = looksLikeBinary(rawBuffer);
+	if (hasBinaryContent) {
+		// Images are always binary; classify and OCR in a single readseek detect call.
+		let detection: ReadSeekDetection | undefined;
+		try {
+			detection = await readseekDetect(absolutePath, { ocr: true, signal });
+		} catch {
+			// detect unavailable — fall through to binary-as-text handling below
+		}
+		if (detection?.image) {
+			const builtinRead = createReadTool(cwd);
+			const builtinResult = await builtinRead.execute(toolCallId, p, signal, onUpdate);
+			const ocrText = detection.ocr?.text?.trim();
+			if (ocrText) {
+				return succeed({
+					...builtinResult,
+					content: [
+						...(builtinResult.content ?? []),
+						{ type: "text" as const, text: `OCR text extracted from image:\n${ocrText}` },
+					],
+				});
+			}
+			return succeed(builtinResult);
+		}
+	}
 	throwIfAborted(signal);
 	const rawText = rawBuffer.toString("utf-8");
 	const normalized = normalizeToLF(stripBom(rawText).text);
-	const allLines = splitReadseekLines(normalized);
+	const allLines = splitReadSeekLines(normalized);
 	const total = allLines.length;
-	const structuredWarnings: ReadseekWarning[] = [];
+	const structuredWarnings: ReadSeekWarning[] = [];
 	let startLine = p.offset !== undefined ? p.offset : 1;
 	let endIdx = p.limit !== undefined ? Math.min(startLine - 1 + p.limit, total) : total;
 	if (p.offset !== undefined && startLine > total) {
@@ -203,7 +215,7 @@ export async function executeRead(opts: ExecuteReadOptions): Promise<AgentToolRe
 					};
 					lines: string[];
 				}>;
-				warnings: ReadseekWarning[];
+				warnings: ReadSeekWarning[];
 		  }
 		| null = null;
 	if (p.symbol) {
@@ -248,7 +260,7 @@ export async function executeRead(opts: ExecuteReadOptions): Promise<AgentToolRe
 				lines.push(` To confirm: ${confirmHint}.]`);
 				const bannerText = lines.join("\n");
 				structuredWarnings.push(
-					buildReadseekWarning("fuzzy-symbol-match", bannerText, {
+					buildReadSeekWarning("fuzzy-symbol-match", bannerText, {
 						tier: lookup.tier,
 						symbol: lookup.symbol,
 						otherCandidates: lookup.otherCandidates,
@@ -261,7 +273,7 @@ export async function executeRead(opts: ExecuteReadOptions): Promise<AgentToolRe
 	if (p.bundle === "local") {
 		if (!symbolFileMap) {
 			const extLabel = ext || "unknown";
-			const warning = buildReadseekWarning(
+			const warning = buildReadSeekWarning(
 				"bundle-unmappable",
 				`[Warning: local bundle unavailable because symbol mapping is not available for .${extLabel} files — showing plain symbol read]`,
 			);
@@ -282,7 +294,7 @@ export async function executeRead(opts: ExecuteReadOptions): Promise<AgentToolRe
 		} else {
 			const bundle = buildLocalBundle(symbolFileMap, symbolMatch, allLines);
 			if (!bundle) {
-				const warning = buildReadseekWarning(
+				const warning = buildReadSeekWarning(
 					"bundle-context-unavailable",
 					`[Warning: local bundle context could not be determined for symbol '${symbolMatch.name}' — showing plain symbol read]`,
 				);
@@ -333,7 +345,7 @@ export async function executeRead(opts: ExecuteReadOptions): Promise<AgentToolRe
 			: `readseek returned ${readseekOutput.hashlines.length} lines for requested range ${startLine}-${endIdx} (${expectedLineCount} expected)`;
 		return buildToolErrorResult("read", "readseek-output-mismatch", message, { path: rawParams.path });
 	}
-	const readseekLines: ReadseekLine[] = readseekOutput.hashlines.map((line) => ({
+	const readseekLines: ReadSeekLine[] = readseekOutput.hashlines.map((line) => ({
 		line: line.line,
 		hash: line.hash,
 		anchor: `${line.line}:${line.hash}`,
@@ -341,7 +353,7 @@ export async function executeRead(opts: ExecuteReadOptions): Promise<AgentToolRe
 		display: escapeControlCharsForDisplay(line.text),
 	}));
 	const selected = readseekLines.map((line) => line.raw);
-	const formatted = renderReadseekLines(readseekLines);
+	const formatted = renderReadSeekLines(readseekLines);
 
 	const truncation = truncateHead(formatted, { maxLines: DEFAULT_MAX_LINES, maxBytes: DEFAULT_MAX_BYTES });
 
@@ -363,17 +375,17 @@ export async function executeRead(opts: ExecuteReadOptions): Promise<AgentToolRe
 	}
 
 	if (symbolWarning) {
-		structuredWarnings.push(buildReadseekWarning("symbol-warning", symbolWarning.trim()));
+		structuredWarnings.push(buildReadSeekWarning("symbol-warning", symbolWarning.trim()));
 	}
 
 	if (hasBinaryContent) {
 		const warning = "[Warning: file appears to be binary — output may be garbled]";
-		structuredWarnings.push(buildReadseekWarning("binary-content", warning));
+		structuredWarnings.push(buildReadSeekWarning("binary-content", warning));
 	}
 
 	if (hasBareCarriageReturn(rawText)) {
 		const warning = "[Warning: file contains bare CR (\\r) line endings — line numbering may be inconsistent with grep and other tools]";
-		structuredWarnings.push(buildReadseekWarning("bare-cr", warning));
+		structuredWarnings.push(buildReadSeekWarning("bare-cr", warning));
 	}
 
 	const readOutput = buildReadOutput({
@@ -420,14 +432,14 @@ export async function executeRead(opts: ExecuteReadOptions): Promise<AgentToolRe
 	});
 }
 
-function splitReadseekLines(text: string): string[] {
+function splitReadSeekLines(text: string): string[] {
 	if (text.length === 0) return [];
 	const withoutTrailingTerminator = text.endsWith("\n") ? text.slice(0, -1) : text;
 	return withoutTrailingTerminator.split("\n");
 }
 
 export function registerReadTool(pi: ExtensionAPI, options: ReadToolOptions = {}) {
-	const tool = registerReadseekTool(pi, {
+	const tool = registerReadSeekTool(pi, {
 		policy: "read-only",
 		pythonName: "read",
 		defaultExposure: "safe-by-default",
@@ -497,7 +509,7 @@ export function registerReadTool(pi: ExtensionAPI, options: ReadToolOptions = {}
 				return new Text(clampLinesToWidth([summaryLine(errorText)], width).join("\n"), 0, 0);
 			}
 
-			const readseekValue = (result.details as any)?.readseekValue as { range: { startLine: number; endLine: number; totalLines: number }; truncation: any; symbol: any; map: any; warnings: ReadseekWarning[] } | undefined;
+			const readseekValue = (result.details as any)?.readseekValue as { range: { startLine: number; endLine: number; totalLines: number }; truncation: any; symbol: any; map: any; warnings: ReadSeekWarning[] } | undefined;
 			if (!readseekValue) {
 				const lines = textContent.split("\n").filter(Boolean).length || textContent.split("\n").length;
 				return new Text(summaryLine(`loaded ${lines} ${lines === 1 ? "line" : "lines"}`, { hidden: !!textContent && !expanded }), 0, 0);

package/src/readseek/constants.ts

@@ -2,10 +2,6 @@
  * Constants for thresholds.
  */
 export const THRESHOLDS = {
-  /** Maximum lines before truncation */
-  MAX_LINES: 2000,
-  /** Maximum bytes before truncation */
-  MAX_BYTES: 50 * 1024,
   /** Maximum map size in bytes */
   MAX_MAP_BYTES: 25 * 1024,
   /** Target size for full detail */

package/src/readseek/formatter.ts

@@ -30,37 +30,14 @@ function formatNumber(n: number): string {
 /**
  * Format a symbol for display.
  */
-function formatSymbol(
-  symbol: FileSymbol,
-  level: DetailLevel,
-  indent = 0
-): string {
+function formatSymbol(symbol: FileSymbol, indent = 0): string {
   const prefix = "  ".repeat(indent);
   const lineRange =
     symbol.startLine === symbol.endLine
       ? `[${symbol.startLine}]`
       : `[${symbol.startLine}-${symbol.endLine}]`;
 
-  let { name } = symbol;
-
-  if (level === DetailLevel.Full) {
-    if (symbol.signature) {
-      // Check whether the signature already contains the symbol name.
-      // Full-declaration signatures (e.g. Rust "pub fn foo(x: i32) -> bool")
-      // include the name; partial signatures (e.g. Python "(x, y) -> None")
-      // do not and should be appended.
-      if (symbol.signature.includes(name)) {
-        name = symbol.signature;
-      } else {
-        if (symbol.modifiers?.length) {
-          name = `${symbol.modifiers.join(" ")} ${name}`;
-        }
-        name = `${name}${symbol.signature}`;
-      }
-    } else if (symbol.modifiers?.length) {
-      name = `${symbol.modifiers.join(" ")} ${name}`;
-    }
-  }
+  const { name } = symbol;
 
   // Format based on kind
   let formatted: string;
@@ -88,11 +65,6 @@ function formatSymbol(
     }
   }
 
-  // Append docstring at Full detail level
-  if (level === DetailLevel.Full && symbol.docstring) {
-    formatted += ` — ${symbol.docstring}`;
-  }
-
   return formatted;
 }
 
@@ -107,7 +79,7 @@ function formatSymbols(
   const lines: string[] = [];
 
   for (const symbol of symbols) {
-    lines.push(formatSymbol(symbol, level, indent));
+    lines.push(formatSymbol(symbol, indent));
 
     // Add children for full, compact, and minimal levels (not outline or truncated)
     if (
@@ -118,7 +90,7 @@ function formatSymbols(
       // For minimal, flatten children
       if (level === DetailLevel.Minimal) {
         for (const child of symbol.children) {
-          lines.push(formatSymbol(child, level, indent + 1));
+          lines.push(formatSymbol(child, indent + 1));
         }
       } else {
         lines.push(...formatSymbols(symbol.children, level, indent + 1));
@@ -132,7 +104,7 @@ function formatSymbols(
 /**
  * Format a complete file map to a string.
  */
-export function formatFileMap(map: FileMap, level?: DetailLevel): string {
+function formatFileMap(map: FileMap, level?: DetailLevel): string {
   const effectiveLevel = level ?? map.detailLevel;
   const fileName = basename(map.path);
 
@@ -165,20 +137,6 @@ export function formatFileMap(map: FileMap, level?: DetailLevel): string {
     lines.push("");
   }
 
-  // Add imports if present and not outline or truncated level
-  if (
-    effectiveLevel !== DetailLevel.Outline &&
-    effectiveLevel !== DetailLevel.Truncated &&
-    map.imports.length > 0
-  ) {
-    const importList =
-      map.imports.length > 10
-        ? [...map.imports.slice(0, 10), `...${map.imports.length - 10} more`]
-        : map.imports;
-    lines.push(`imports: ${importList.join(", ")}`);
-    lines.push("");
-  }
-
   // Add symbols
   if (map.truncatedInfo) {
     // Truncated format: first half, separator, second half
@@ -236,13 +194,12 @@ export function formatFileMap(map: FileMap, level?: DetailLevel): string {
 /**
  * Reduce detail level of a file map.
  */
-export function reduceToLevel(map: FileMap, level: DetailLevel): FileMap {
+function reduceToLevel(map: FileMap, level: DetailLevel): FileMap {
   if (level === DetailLevel.Outline) {
-    // Remove all children and signatures
+    // Remove all children
     return {
       ...map,
       detailLevel: DetailLevel.Outline,
-      imports: [],
       symbols: map.symbols.map((s) => ({
         name: s.name,
         kind: s.kind,
@@ -253,7 +210,6 @@ export function reduceToLevel(map: FileMap, level: DetailLevel): FileMap {
   }
 
   if (level === DetailLevel.Minimal) {
-    // Remove signatures and docstrings but keep children flattened
     return {
       ...map,
       detailLevel: DetailLevel.Minimal,
@@ -262,48 +218,28 @@ export function reduceToLevel(map: FileMap, level: DetailLevel): FileMap {
         kind: s.kind,
         startLine: s.startLine,
         endLine: s.endLine,
-        isExported: s.isExported,
         children: s.children?.map((c) => ({
           name: c.name,
           kind: c.kind,
           startLine: c.startLine,
           endLine: c.endLine,
-          isExported: c.isExported,
         })),
       })),
     };
   }
 
   if (level === DetailLevel.Compact) {
-    // Remove signatures but keep structure
-    return {
-      ...map,
-      detailLevel: DetailLevel.Compact,
-      symbols: map.symbols.map((s) => stripSignatures(s)),
-    };
+    return { ...map, detailLevel: DetailLevel.Compact };
   }
 
   return { ...map, detailLevel: DetailLevel.Full };
 }
 
-function stripSignatures(symbol: FileSymbol): FileSymbol {
-  return {
-    name: symbol.name,
-    kind: symbol.kind,
-    startLine: symbol.startLine,
-    endLine: symbol.endLine,
-    modifiers: symbol.modifiers,
-    docstring: symbol.docstring,
-    isExported: symbol.isExported,
-    children: symbol.children?.map(stripSignatures),
-  };
-}
-
 /**
  * Reduce a file map to truncated form: first N + last N symbols only.
  * Used when even Outline level exceeds budget.
  */
-export function reduceToTruncated(
+function reduceToTruncated(
   map: FileMap,
   symbolsEach: number = THRESHOLDS.TRUNCATED_SYMBOLS_EACH
 ): FileMap {
@@ -333,7 +269,6 @@ export function reduceToTruncated(
     ...map,
     symbols: [...firstSymbols, ...lastSymbols],
     detailLevel: DetailLevel.Truncated,
-    imports: [],
     truncatedInfo: {
       totalSymbols: total,
       shownSymbols: symbolsEach * 2,

package/src/readseek/symbol-lookup.ts

@@ -9,7 +9,7 @@ export interface SymbolMatch {
   parentName?: string;
 }
 
-export type SymbolLookupResult =
+type SymbolLookupResult =
   | { type: "found"; symbol: SymbolMatch }
   | { type: "ambiguous"; candidates: SymbolMatch[] }
   | {
@@ -88,22 +88,6 @@ function preferJavaTopLevelType(map: FileMap, candidates: SymbolCandidate[]): Sy
   return topLevelTypes.length === 1 ? topLevelTypes[0] : undefined;
 }
 
-function javaPackageName(map: FileMap): string | undefined {
-  if (map.language !== "Java") return undefined;
-  for (const entry of map.imports) {
-    const match = /^package\s+([A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*)\s*;?$/.exec(entry);
-    if (match) return match[1];
-  }
-  return undefined;
-}
-
-function stripJavaPackagePrefix(map: FileMap, query: string): string | undefined {
-  const packageName = javaPackageName(map);
-  if (!packageName) return undefined;
-  const prefix = `${packageName}.`;
-  return query.startsWith(prefix) ? query.slice(prefix.length) : undefined;
-}
-
 function resolveDotPathSuffix(symbols: FileSymbol[], parts: string[]): SymbolCandidate[] {
   for (let start = 1; start < parts.length; start++) {
     const candidates = resolveDotPath(symbols, parts.slice(start));
@@ -118,7 +102,6 @@ export function findSymbol(map: FileMap, query: string): SymbolLookupResult {
   if (map.symbols.length === 0) return { type: "not-found" };
 
   const allSymbols = flattenSymbols(map.symbols);
-  const javaRelativeQuery = stripJavaPackagePrefix(map, q);
 
   const atLineMatch = /^(.+?)@(\d+)$/.exec(q);
   if (atLineMatch) {
@@ -189,16 +172,6 @@ export function findSymbol(map: FileMap, query: string): SymbolLookupResult {
     return { type: "ambiguous", candidates: toMatches(exact.slice(0, 5)) };
   }
 
-  if (javaRelativeQuery) {
-    const javaExact = allSymbols.filter((c) => c.symbol.name === javaRelativeQuery);
-    if (javaExact.length === 1) return { type: "found", symbol: toMatch(javaExact[0].symbol, javaExact[0].parentName) };
-    if (javaExact.length > 1) {
-      const preferred = preferJavaTopLevelType(map, javaExact);
-      if (preferred) return { type: "found", symbol: toMatch(preferred.symbol, preferred.parentName) };
-      return { type: "ambiguous", candidates: toMatches(javaExact.slice(0, 5)) };
-    }
-  }
-
   if (q.includes(".")) {
     const parts = q.split(".").map((p) => p.trim());
     if (parts.length >= 2 && parts.every((p) => p.length > 0)) {
@@ -212,21 +185,6 @@ export function findSymbol(map: FileMap, query: string): SymbolLookupResult {
           candidates: toMatches(candidates.slice(0, 5)),
         };
       }
-      const javaParts = javaRelativeQuery?.includes(".")
-        ? javaRelativeQuery.split(".").map((p) => p.trim())
-        : [];
-      if (javaParts.length >= 2 && javaParts.every((p) => p.length > 0)) {
-        const javaCandidates = resolveDotPath(map.symbols, javaParts);
-        if (javaCandidates.length === 1) {
-          return { type: "found", symbol: toMatch(javaCandidates[0].symbol, javaCandidates[0].parentName) };
-        }
-        if (javaCandidates.length > 1) {
-          return {
-            type: "ambiguous",
-            candidates: toMatches(javaCandidates.slice(0, 5)),
-          };
-        }
-      }
       const suffixCandidates = resolveDotPathSuffix(map.symbols, parts);
       if (suffixCandidates.length === 1) {
         return { type: "found", symbol: toMatch(suffixCandidates[0].symbol, suffixCandidates[0].parentName) };

package/src/readseek/types.ts

@@ -12,16 +12,8 @@ export interface FileSymbol {
   startLine: number;
   /** Ending line number (1-indexed) */
   endLine: number;
-  /** Optional signature (for functions/methods) */
-  signature?: string;
   /** Child symbols (for nested structures like methods in classes) */
   children?: FileSymbol[];
-  /** Additional modifiers (async, static, etc.) */
-  modifiers?: string[];
-  /** First line of JSDoc / docstring (if present) */
-  docstring?: string;
-  /** Whether this symbol is exported from its module */
-  isExported?: boolean;
 }
 
 /**
@@ -50,20 +42,8 @@ export interface FileMap {
   language: string;
   /** Extracted symbols */
   symbols: FileSymbol[];
-  /** Module imports / dependencies */
-  imports: string[];
   /** Detail level used for this map */
   detailLevel: DetailLevel;
   /** Truncation metadata (present when symbols are truncated) */
   truncatedInfo?: TruncatedInfo;
 }
-
-/**
- * Language information.
- */
-export interface LanguageInfo {
-  /** Language identifier */
-  id: string;
-  /** Display name */
-  name: string;
-}