pi-readseek 0.4.10 → 0.4.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-readseek",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "Pi extension for readseek-backed hash-anchored read/edit/grep, structural code maps, structural search, and file exploration",
   "type": "module",
   "exports": {
@@ -39,7 +39,7 @@
     "node": ">=20.0.0"
   },
   "dependencies": {
-    "@jarkkojs/readseek": "^0.4.13",
+    "@jarkkojs/readseek": "^0.4.16",
     "diff": "^8.0.3",
     "ignore": "^7.0.5",
     "picomatch": "^4.0.4",

package/src/edit.ts

@@ -16,6 +16,7 @@ import { buildEditOutput } from "./edit-output.js";
 import { classifyEdit, isDifftAvailable, runDifftastic } from "./edit-classify.js";
 import type { SemanticSummary } from "./readseek-value.js";
 import { buildReadseekError } from "./readseek-value.js";
+import { classifyReadseekFailure } from "./readseek-client.js";
 import { countEditTypes, formatEditCallText, formatEditResultText } from "./edit-render-helpers.js";
 import { validateSyntaxRegression } from "./edit-syntax-validate.js";
 import { resolveSyntaxValidateMode, type SyntaxValidateOptions } from "./syntax-validate-mode.js";
@@ -276,20 +277,26 @@ export async function executeEdit(opts: ExecuteEditOptions): Promise<any> {
 	// readseekMapContent is invoked at most once per replace_symbol edit.
 	const replaceSymbolRanges: { start: number; end: number }[] = [];
 	const rsProbeResults: { type: "ok"; content: string; replacement: string; warnings: string[]; range: { start: number; end: number } }[] = [];
-	for (const rs of replaceSymbolEdits) {
-		throwIfAborted(signal);
-		const probe = await replaceSymbol({
-			filePath: absolutePath,
-			content: originalNormalized,
-			symbol: rs.replace_symbol.symbol,
-			newBody: rs.replace_symbol.new_body,
-		});
-		if (probe.type !== "ok") {
-			// symbol-resolution errors surface before the overlap check.
-			return buildEditError(absolutePath, "invalid-edit-variant", probe.message);
+	try {
+		for (const rs of replaceSymbolEdits) {
+			throwIfAborted(signal);
+			const probe = await replaceSymbol({
+				filePath: absolutePath,
+				content: originalNormalized,
+				symbol: rs.replace_symbol.symbol,
+				newBody: rs.replace_symbol.new_body,
+			});
+			if (probe.type !== "ok") {
+				// symbol-resolution errors surface before the overlap check.
+				return buildEditError(absolutePath, "invalid-edit-variant", probe.message);
+			}
+			rsProbeResults.push(probe);
+			replaceSymbolRanges.push(probe.range);
 		}
-		rsProbeResults.push(probe);
-		replaceSymbolRanges.push(probe.range);
+	} catch (err) {
+		throwIfAborted(signal);
+		const failure = classifyReadseekFailure(err);
+		return buildEditError(absolutePath, failure.code, failure.message, failure.hint);
 	}
 
 	const sortedReplaceSymbolRanges = [...replaceSymbolRanges].sort((a, b) => a.start - b.start || a.end - b.end);

package/src/refs.ts

@@ -2,8 +2,8 @@ import type { ExtensionAPI, ToolRenderResultOptions } from "@earendil-works/pi-c
 import { Text } from "@earendil-works/pi-tui";
 import { Type } from "@sinclair/typebox";
 import path from "node:path";
-import { stat as fsStat } from "node:fs/promises";
 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";
@@ -91,25 +91,8 @@ export async function executeRefs(opts: ExecuteRefsOptions): Promise<any> {
   }
   const searchPath = resolveToCwd(p.path ?? ".", cwd);
 
-  try {
-    await fsStat(searchPath);
-  } catch (err: any) {
-    if (err?.code === "ENOENT") {
-      return buildToolErrorResult("refs", "path-not-found", `Error: path '${p.path ?? "."}' does not exist`, {
-        path: p.path ?? searchPath,
-      });
-    }
-    if (err?.code === "EACCES" || err?.code === "EPERM") {
-      return buildToolErrorResult("refs", "permission-denied", `Error: permission denied for path '${p.path ?? "."}'`, {
-        path: p.path ?? searchPath,
-      });
-    }
-    const message = `Error: could not access path '${p.path ?? "."}': ${err?.message ?? String(err)}`;
-    return buildToolErrorResult("refs", "fs-error", message, {
-      path: p.path ?? searchPath,
-      details: { fsCode: err?.code, fsMessage: err?.message },
-    });
-  }
+  const statResult = await statSearchPathOrError("refs", p.path, searchPath);
+  if (!statResult.ok) return statResult.error;
 
   try {
     const references = await readseekRefs(searchPath, p.name, {

package/src/sg.ts

@@ -1,5 +1,4 @@
 import path from "node:path";
-import { stat as fsStat } from "node:fs/promises";
 
 import type { ExtensionAPI, ToolRenderResultOptions } from "@earendil-works/pi-coding-agent";
 import { Text } from "@earendil-works/pi-tui";
@@ -8,6 +7,7 @@ import { Type } from "@sinclair/typebox";
 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, isReadseekAvailable, readseekSearch, type ReadseekHashline, type ReadseekSearchFileOutput } from "./readseek-client.js";
 import { buildSgOutput } from "./sg-output.js";
 import type { FileAnchoredCallback } from "./tool-types.js";
@@ -112,23 +112,10 @@ export async function executeSg(opts: ExecuteSgOptions): Promise<any> {
     return buildToolErrorResult("search", "invalid-parameter", message);
   }
   const searchPath = resolveToCwd(p.path ?? ".", cwd);
-  let searchPathIsFile = false;
 
-  try {
-    const stat = await fsStat(searchPath);
-    searchPathIsFile = stat.isFile();
-  } catch (err: any) {
-    if (err?.code === "ENOENT") {
-      const message = `Error: path '${p.path ?? "."}' does not exist`;
-      return buildToolErrorResult("search", "path-not-found", message, { path: p.path ?? searchPath });
-    }
-    if (err?.code === "EACCES" || err?.code === "EPERM") {
-      const message = `Error: permission denied for path '${p.path ?? "."}'`;
-      return buildToolErrorResult("search", "permission-denied", message, { path: p.path ?? searchPath });
-    }
-    const message = `Error: could not access path '${p.path ?? "."}': ${err?.message ?? String(err)}`;
-    return buildToolErrorResult("search", "fs-error", message, { path: p.path ?? searchPath, details: { fsCode: err?.code, fsMessage: err?.message } });
-  }
+  const statResult = await statSearchPathOrError("search", p.path, searchPath);
+  if (!statResult.ok) return statResult.error;
+  const searchPathIsFile = statResult.stats.isFile();
 
   try {
     const effectiveLang = readseekLanguageForPath(p.lang, searchPath, searchPathIsFile);

package/src/stat-search-path.ts

@@ -0,0 +1,34 @@
+import { stat as fsStat } from "node:fs/promises";
+import type { Stats } from "node:fs";
+
+import { buildToolErrorResult, type ToolErrorResult } from "./readseek-value.js";
+
+export type StatSearchPathResult =
+  | { ok: true; stats: Stats }
+  | { ok: false; error: ToolErrorResult };
+
+/**
+ * Stat a tool's search path, mapping access failures into the shared readseek
+ * error taxonomy. Used by refs and search, which reject a missing or
+ * unreadable path with identical codes and messages.
+ */
+export async function statSearchPathOrError(
+  tool: string,
+  rawPath: string | undefined,
+  searchPath: string,
+): Promise<StatSearchPathResult> {
+  try {
+    return { ok: true, stats: await fsStat(searchPath) };
+  } catch (err: any) {
+    const display = rawPath ?? ".";
+    const path = rawPath ?? searchPath;
+    if (err?.code === "ENOENT") {
+      return { ok: false, error: buildToolErrorResult(tool, "path-not-found", `Error: path '${display}' does not exist`, { path }) };
+    }
+    if (err?.code === "EACCES" || err?.code === "EPERM") {
+      return { ok: false, error: buildToolErrorResult(tool, "permission-denied", `Error: permission denied for path '${display}'`, { path }) };
+    }
+    const message = `Error: could not access path '${display}': ${err?.message ?? String(err)}`;
+    return { ok: false, error: buildToolErrorResult(tool, "fs-error", message, { path, details: { fsCode: err?.code, fsMessage: err?.message } }) };
+  }
+}

package/src/write.ts

@@ -222,6 +222,21 @@ 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."));
+    return {
+      text: `Cannot write ${filePath}\n⚠️ File content appears to be binary — refusing to write.`,
+      warnings,
+      readseekValue: {
+        tool: "write",
+        path: filePath,
+        lines: [],
+        warnings: readseekWarnings,
+      },
+    };
+  }
+
   const previousContent = await readPreviousTextForDiff(filePath);
   const existedBeforeWrite = await access(filePath).then(() => true, () => false);
 
@@ -240,22 +255,6 @@ export async function executeWrite(opts: {
     throw err;
   }
 
-  // Binary detection
-  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."));
-    return {
-      text: `Wrote ${filePath}\n⚠️ File content appears to be binary — hashlines not generated.`,
-      warnings,
-      readseekValue: {
-        tool: "write",
-        path: filePath,
-        lines: [],
-        warnings: readseekWarnings,
-      },
-    };
-  }
-
   // Compute hashlines
   const rawLines = content.split("\n");
   const readseekLines: ReadseekLine[] = [];