pi-readseek 0.4.12 → 0.4.13

package/src/refs.ts

@@ -4,12 +4,12 @@ import { Type } from "@sinclair/typebox";
 import path from "node:path";
 import { defineToolPromptMetadata } from "./tool-prompt-metadata.js";
 import { statSearchPathOrError } from "./stat-search-path.js";
-import { buildReadseekLineWithHash, buildToolErrorResult } from "./readseek-value.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 { registerReadseekTool } from "./register-tool.js";
+import { registerReadSeekTool } from "./register-tool.js";
 
 import { clampLineToWidth, renderAnchoredFilesResult, renderToolLabel } from "./tui-render-utils.js";
 
@@ -44,14 +44,14 @@ export interface ExecuteRefsOptions {
   onFileAnchored?: FileAnchoredCallback;
 }
 
-function refsLine(reference: ReadseekReference): RefsOutputLine {
+function refsLine(reference: ReadSeekReference): RefsOutputLine {
   return {
-    ...buildReadseekLineWithHash(reference.line, reference.line_hash, reference.text),
+    ...buildReadSeekLineWithHash(reference.line, reference.line_hash, reference.text),
     enclosingSymbol: reference.enclosingSymbol,
   };
 }
 
-function groupReferences(references: ReadseekReference[], cwd: string): RefsOutputFile[] {
+function groupReferences(references: ReadSeekReference[], cwd: string): RefsOutputFile[] {
   const files = new Map<string, RefsOutputFile>();
   const seen = new Set<string>();
   for (const reference of references) {
@@ -69,7 +69,7 @@ function groupReferences(references: ReadseekReference[], cwd: string): RefsOutp
   return [...files.values()];
 }
 
-function isReadseekCursorValidationFailure(message: string): boolean {
+function isReadSeekCursorValidationFailure(message: string): boolean {
   return (
     /line and column must be greater than zero/i.test(message) ||
     /line \d+ not found/i.test(message) ||
@@ -115,8 +115,8 @@ export async function executeRefs(opts: ExecuteRefsOptions): Promise<any> {
       details: { readseekValue: builtOutput.readseekValue },
     };
   } catch (err: any) {
-    const failure = classifyReadseekFailure(err);
-    if (p.scope && isReadseekCursorValidationFailure(failure.message)) {
+    const failure = classifyReadSeekFailure(err);
+    if (p.scope && isReadSeekCursorValidationFailure(failure.message)) {
       return buildToolErrorResult("refs", "invalid-parameter", failure.message);
     }
     return buildToolErrorResult("refs", failure.code, failure.message, failure.hint ? { hint: failure.hint } : {});
@@ -124,7 +124,7 @@ export async function executeRefs(opts: ExecuteRefsOptions): Promise<any> {
 }
 
 export function registerRefsTool(pi: ExtensionAPI, options: RefsToolOptions = {}) {
-  const tool = registerReadseekTool(pi, {
+  const tool = registerReadSeekTool(pi, {
     policy: "read-only",
     pythonName: "refs",
     defaultExposure: "opt-in",

package/src/register-tool.ts

@@ -1,20 +1,20 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 
-export type ReadseekToolPolicy = "read-only" | "mutating";
+export type ReadSeekToolPolicy = "read-only" | "mutating";
 
-export type ReadseekToolExposure = "safe-by-default" | "opt-in" | "not-safe-by-default";
+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;
+export interface ReadSeekToolConfig {
+  policy: ReadSeekToolPolicy;
   pythonName: string;
-  defaultExposure: ReadseekToolExposure;
+  defaultExposure: ReadSeekToolExposure;
 }
 
-export interface ReadseekToolPtc extends ReadseekToolConfig {
+export interface ReadSeekToolPtc extends ReadSeekToolConfig {
   callable: true;
   enabled: true;
   readOnly: boolean;
@@ -28,12 +28,12 @@ type ToolSpec = Parameters<ExtensionAPI["registerTool"]>[0];
  * `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>(
+export function registerReadSeekTool<T extends ToolSpec>(
   pi: ExtensionAPI,
-  config: ReadseekToolConfig,
+  config: ReadSeekToolConfig,
   tool: T,
-): T & { ptc: ReadseekToolPtc } {
-  const ptc: ReadseekToolPtc = {
+): T & { ptc: ReadSeekToolPtc } {
+  const ptc: ReadSeekToolPtc = {
     callable: true,
     enabled: true,
     policy: config.policy,

package/src/replace-symbol.ts

@@ -1,15 +1,16 @@
 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";
 
-export interface ReplaceSymbolInput {
+interface ReplaceSymbolInput {
 	filePath: string;
 	content: string;
 	symbol: string;
 	newBody: string;
 }
 
-export type ReplaceSymbolResult =
+type ReplaceSymbolResult =
 	| { type: "ok"; content: string; replacement: string; warnings: string[]; range: { start: number; end: number } }
 	| { type: "not-found"; message: string }
 	| { type: "ambiguous"; message: string }
@@ -50,7 +51,7 @@ export async function replaceSymbol(input: ReplaceSymbolInput): Promise<ReplaceS
 	const lines = input.content.split("\n");
 	const sigLine = lines[sym.startLine - 1] ?? "";
 	const indent = detectIndent(sigLine);
-	const reindented = reindent(dedent(input.newBody), indent);
+	const reindented = reindent(dedent(normalizeToLF(input.newBody)), indent);
 	const warnings: string[] = [];
 	const leaf = input.symbol.replace(/@\d+$/, "").split(".").pop() ?? "";
 	const declNameRe =

package/src/sg-output.ts

@@ -1,10 +1,10 @@
-import type { ReadseekLine, ReadseekRange } from "./readseek-value.js";
+import type { ReadSeekLine, ReadSeekRange } from "./readseek-value.js";
 
 export interface SgOutputFile {
   displayPath: string;
   path: string;
-  ranges: ReadseekRange[];
-  lines: ReadseekLine[];
+  ranges: ReadSeekRange[];
+  lines: ReadSeekLine[];
   symbols?: Array<{ name: string; kind?: string }>;
 }
 
@@ -19,8 +19,8 @@ export interface SgOutputResult {
     tool: "search";
     files: Array<{
       path: string;
-      ranges: ReadseekRange[];
-      lines: ReadseekLine[];
+      ranges: ReadSeekRange[];
+      lines: ReadSeekLine[];
     }>;
   };
 }

package/src/sg.ts

@@ -5,13 +5,13 @@ import { Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
 
 import { defineToolPromptMetadata } from "./tool-prompt-metadata.js";
-import { buildReadseekLineWithHash, buildToolErrorResult, type ReadseekLine } from "./readseek-value.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, isReadseekAvailable, readseekSearch, type ReadseekHashline, type ReadseekSearchFileOutput } from "./readseek-client.js";
+import { classifyReadSeekFailure, isReadSeekAvailable, readseekSearch, type ReadSeekHashline, type ReadSeekSearchFileOutput } from "./readseek-client.js";
 import { buildSgOutput } from "./sg-output.js";
 import type { FileAnchoredCallback } from "./tool-types.js";
-import { registerReadseekTool } from "./register-tool.js";
+import { registerReadSeekTool } from "./register-tool.js";
 
 import { clampLineToWidth, renderAnchoredFilesResult, renderToolLabel } from "./tui-render-utils.js";
 
@@ -53,7 +53,7 @@ const SG_PROMPT_METADATA = defineToolPromptMetadata({
 });
 
 export function isSgAvailable(): boolean {
-  return isReadseekAvailable();
+  return isReadSeekAvailable();
 }
 
 interface SgToolOptions {
@@ -70,19 +70,19 @@ export interface ExecuteSgOptions {
   onFileAnchored?: FileAnchoredCallback;
 }
 
-function readseekLineFromSearch(line: ReadseekHashline): ReadseekLine {
-  return buildReadseekLineWithHash(line.line, line.hash, line.text);
+function readseekLineFromSearch(line: ReadSeekHashline): ReadSeekLine {
+  return buildReadSeekLineWithHash(line.line, line.hash, line.text);
 }
 
-function linesFromSearchResult(result: ReadseekSearchFileOutput, ranges: SgRange[]): ReadseekLine[] {
-  const lineMap = new Map<number, ReadseekLine>();
+function linesFromSearchResult(result: ReadSeekSearchFileOutput, ranges: SgRange[]): ReadSeekLine[] {
+  const lineMap = new Map<number, ReadSeekLine>();
   for (const match of result.matches) {
     for (const line of match.hashlines) {
       lineMap.set(line.line, readseekLineFromSearch(line));
     }
   }
 
-  const lines: ReadseekLine[] = [];
+  const lines: ReadSeekLine[] = [];
   const seen = new Set<number>();
   for (const range of ranges) {
     for (let line = range.startLine; line <= range.endLine; line++) {
@@ -140,7 +140,7 @@ export async function executeSg(opts: ExecuteSgOptions): Promise<any> {
       displayPath: string;
       path: string;
       ranges: SgRange[];
-      lines: ReadseekLine[];
+      lines: ReadSeekLine[];
       symbols?: SgEnclosingSymbol[];
     }> = [];
 
@@ -183,13 +183,13 @@ export async function executeSg(opts: ExecuteSgOptions): Promise<any> {
       },
     };
   } catch (err: any) {
-    const failure = classifyReadseekFailure(err);
+    const failure = classifyReadSeekFailure(err);
     return buildToolErrorResult("search", failure.code, failure.message, failure.hint ? { hint: failure.hint } : {});
   }
 }
 
 export function registerSgTool(pi: ExtensionAPI, options: SgToolOptions = {}) {
-  const tool = registerReadseekTool(pi, {
+  const tool = registerReadSeekTool(pi, {
     policy: "read-only",
     pythonName: "search",
     defaultExposure: "opt-in",

package/src/tool-prompt-metadata.ts

@@ -41,20 +41,20 @@ const COMPACT_GUIDELINES: Record<string, string[]> = {
   ],
 };
 
-export interface ToolPromptMetadata {
+interface ToolPromptMetadata {
   description: string;
   promptSnippet: string;
   promptGuidelines: string[];
 }
 
-export function loadPrompt(promptUrl: URL): string {
+function loadPrompt(promptUrl: URL): string {
   return readFileSync(promptUrl, "utf-8")
     .replaceAll("{{DEFAULT_MAX_LINES}}", String(DEFAULT_MAX_LINES))
     .replaceAll("{{DEFAULT_MAX_BYTES}}", formatSize(DEFAULT_MAX_BYTES))
     .trim();
 }
 
-export function firstPromptParagraph(prompt: string): string {
+function firstPromptParagraph(prompt: string): string {
   return prompt.split(/\n\s*\n/, 1)[0]?.trim() ?? prompt;
 }
 

package/src/write.ts

@@ -7,9 +7,9 @@ import { Type } from "@sinclair/typebox";
 
 import { resolveToCwd } from "./path-utils.js";
 import { ensureHashInit, formatHashlineDisplay } from "./hashline.js";
-import { buildReadseekError, buildReadseekLine, buildReadseekWarning, type ReadseekLine, type ReadseekWarning } from "./readseek-value.js";
+import { buildReadSeekError, buildReadSeekLine, buildReadSeekWarning, buildToolErrorResult, type ReadSeekLine, type ReadSeekWarning } from "./readseek-value.js";
 import { looksLikeBinary } from "./binary-detect.js";
-import { getOrGenerateMap } from "./map-cache.js";
+import { getOrGenerateMap } from "./file-map.js";
 import { formatFileMapWithBudget } from "./readseek/formatter.js";
 
 import { defineToolPromptMetadata } from "./tool-prompt-metadata.js";
@@ -19,7 +19,7 @@ import { buildDiffData, type DiffData } from "./diff-data.js";
 import { clampLineToWidth, clampLinesToWidth, isRendererExpanded, linkToolPath, renderErrorResult, renderToolLabel, summaryLine } from "./tui-render-utils.js";
 import { DiffPreviewComponent } from "./tui-diff-component.js";
 import type { FileAnchoredCallback } from "./tool-types.js";
-import { registerReadseekTool } from "./register-tool.js";
+import { registerReadSeekTool } from "./register-tool.js";
 
 const WRITE_PENDING_PREVIEW_STATE_KEY = "hashline-write-pending-preview";
 
@@ -84,8 +84,8 @@ export interface WriteResult extends WriteDiffFields {
   readseekValue: {
     tool: "write";
     path: string;
-    lines: ReadseekLine[];
-    warnings: ReadseekWarning[];
+    lines: ReadSeekLine[];
+    warnings: ReadSeekWarning[];
     diff?: string;
     diffData?: DiffData;
     map?: { appended: boolean };
@@ -173,26 +173,11 @@ function mapFsWriteError(err: any, path: string): MappedFsError {
 
 function buildWriteFsErrorResult(err: any, absolutePath: string) {
   const mapped = mapFsWriteError(err, absolutePath);
-  return {
-    content: [{ type: "text" as const, text: mapped.message }],
-    isError: true,
-    details: {
-      readseekValue: {
-        tool: "write" as const,
-        path: absolutePath,
-        lines: [] as ReadseekLine[],
-        warnings: [] as ReadseekWarning[],
-        ok: false,
-        error: buildReadseekError(
-          mapped.code,
-          mapped.message,
-          undefined,
-          mapped.includeMeta ? { fsCode: err?.code, fsMessage: err?.message } : undefined,
-        ),
-      },
-      warnings: [] as string[],
-    },
-  };
+  return buildToolErrorResult("write", mapped.code, mapped.message, {
+    path: absolutePath,
+    extra: { lines: [], warnings: [] },
+    details: mapped.includeMeta ? { fsCode: err?.code, fsMessage: err?.message } : undefined,
+  });
 }
 
 export async function executeWrite(opts: {
@@ -205,12 +190,12 @@ export async function executeWrite(opts: {
 
   const { path: filePath, content, map: requestMap, cwd } = opts;
   const warnings: string[] = [];
-  const readseekWarnings: ReadseekWarning[] = [];
+  const readseekWarnings: ReadSeekWarning[] = [];
 
   if (hasBareCarriageReturn(content)) {
     const message = "File content contains bare CR (\\r) line endings; write refuses to emit anchors that read/edit would normalize differently.";
     warnings.push(message);
-    readseekWarnings.push(buildReadseekWarning("bare-cr", message));
+    readseekWarnings.push(buildReadSeekWarning("bare-cr", message));
     return {
       text: `Cannot write ${filePath}\n⚠️ ${message}`,
       warnings,
@@ -224,7 +209,7 @@ export async function executeWrite(opts: {
   }
   if (looksLikeBinary(Buffer.from(content, "utf-8"))) {
     warnings.push("File content appears to be binary.");
-    readseekWarnings.push(buildReadseekWarning("binary-content", "File content appears to be binary."));
+    readseekWarnings.push(buildReadSeekWarning("binary-content", "File content appears to be binary."));
     return {
       text: `Cannot write ${filePath}\n⚠️ File content appears to be binary — refusing to write.`,
       warnings,
@@ -257,12 +242,12 @@ export async function executeWrite(opts: {
 
   // Compute hashlines
   const rawLines = content.split("\n");
-  const readseekLines: ReadseekLine[] = [];
+  const readseekLines: ReadSeekLine[] = [];
   const displayLines: string[] = [];
 
   for (let i = 0; i < rawLines.length; i++) {
     const lineNum = i + 1;
-    const readseekLine = buildReadseekLine(lineNum, rawLines[i]);
+    const readseekLine = buildReadSeekLine(lineNum, rawLines[i]);
     readseekLines.push(readseekLine);
     displayLines.push(formatHashlineDisplay(lineNum, rawLines[i]));
   }
@@ -325,7 +310,7 @@ export async function executeWrite(opts: {
 }
 
 export function registerWriteTool(pi: ExtensionAPI, options: WriteToolOptions = {}) {
-  const tool = registerReadseekTool(pi, {
+  const tool = registerReadSeekTool(pi, {
     policy: "mutating",
     pythonName: "write",
     defaultExposure: "not-safe-by-default",
@@ -363,7 +348,7 @@ export function registerWriteTool(pi: ExtensionAPI, options: WriteToolOptions =
 
           // Lift binary-content signal into a fatal readseekValue.error envelope so
           // downstream consumers get the same taxonomy shape as every other tool.
-          // The existing ReadseekWarning entry is preserved on readseekValue.warnings for
+          // The existing ReadSeekWarning entry is preserved on readseekValue.warnings for
           // backward compatibility.
           for (const code of ["binary-content", "bare-cr"] as const) {
             const warning = result.readseekValue.warnings.find((w) => w.code === code);
@@ -375,7 +360,7 @@ export function registerWriteTool(pi: ExtensionAPI, options: WriteToolOptions =
                   readseekValue: {
                     ...result.readseekValue,
                     ok: false,
-                    error: buildReadseekError(code, warning.message),
+                    error: buildReadSeekError(code, warning.message),
                   },
                   warnings: result.warnings,
                 },

package/src/map-cache.ts

@@ -1,82 +0,0 @@
-import { stat } from "node:fs/promises";
-import type { FileMap } from "./readseek/types.js";
-import { readseekMap } from "./readseek-client.js";
-
-interface CacheEntry {
-	mtimeMs: number;
-	map: FileMap | null;
-}
-
-export const MAP_CACHE_MAX_SIZE = 500;
-
-interface MapCacheGlobalState {
-	cache: Map<string, CacheEntry>;
-	inflight: Map<string, Promise<FileMap | null>>;
-	maxSize: number;
-}
-
-const MAP_CACHE_STATE_KEY = Symbol.for("pi-readseek.mapCacheState.v1");
-
-type MapCacheGlobalSlots = typeof globalThis & Record<symbol, MapCacheGlobalState | undefined>;
-
-function getMapCacheState(): MapCacheGlobalState {
-	const globalObject = globalThis as MapCacheGlobalSlots;
-	const state = globalObject[MAP_CACHE_STATE_KEY] ?? {
-		cache: new Map<string, CacheEntry>(),
-		inflight: new Map<string, Promise<FileMap | null>>(),
-		maxSize: MAP_CACHE_MAX_SIZE,
-	};
-	globalObject[MAP_CACHE_STATE_KEY] = state;
-	return state;
-}
-// Move an existing entry to the most-recently-used position (Map insertion-order tail).
-function touchMapEntry<K, V>(map: Map<K, V>, key: K, value: V): void {
-	map.delete(key);
-	map.set(key, value);
-}
-
-function rememberInMemory(absPath: string, entry: CacheEntry): void {
-	const state = getMapCacheState();
-	touchMapEntry(state.cache, absPath, entry);
-	if (state.cache.size > state.maxSize) {
-		const oldestKey = state.cache.keys().next().value;
-		if (oldestKey !== undefined) state.cache.delete(oldestKey);
-	}
-}
-
-/**
- * Get or generate a structural file map, with mtime-based in-memory caching.
- * Readseek already caches map results in `.readseek/maps/` with its own binary
- * format.  The in-memory layer here avoids redundant process spawns within a
- * single session.
- *
- * Returns null on any failure — never throws.
- */
-export async function getOrGenerateMap(absPath: string): Promise<FileMap | null> {
-	try {
-		const fileStat = await stat(absPath);
-		const { mtimeMs } = fileStat;
-		const state = getMapCacheState();
-		const cached = state.cache.get(absPath);
-		if (cached && cached.mtimeMs === mtimeMs) {
-			touchMapEntry(state.cache, absPath, cached);
-			return cached.map;
-		}
-		const inflight = state.inflight.get(absPath);
-		if (inflight) return inflight;
-
-		const generation = (async () => {
-			const map = await readseekMap(absPath, fileStat.size);
-			rememberInMemory(absPath, { mtimeMs, map });
-			return map;
-		})()
-			.catch(() => null)
-			.finally(() => {
-				state.inflight.delete(absPath);
-			});
-		state.inflight.set(absPath, generation);
-		return generation;
-	} catch {
-		return null;
-	}
-}