pi-readseek 0.4.8 → 0.4.10

package/README.md

@@ -53,7 +53,3 @@ information.
 
 The upstream `@jarkkojs/readseek` packages are licensed separately as
 `Apache-2.0 AND LGPL-2.1-or-later`.
-
-`readseek` is originally derived from the source code of
-[`pi-hashline-readmap`](https://github.com/coctostan/pi-hashline-readmap).
-The relevant copyrights have been retained in [LICENSE](LICENSE).

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-readseek",
-  "version": "0.4.8",
+  "version": "0.4.10",
   "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.11",
+    "@jarkkojs/readseek": "^0.4.13",
     "diff": "^8.0.3",
     "ignore": "^7.0.5",
     "picomatch": "^4.0.4",

package/src/edit-diff.ts

@@ -14,6 +14,7 @@ export function detectLineEnding(content: string): "\r\n" | "\n" {
 			lf++;
 		}
 	}
+	if (lf === 0 && crlf === 0) return "\n";
 	if (lf === 0) return "\r\n";
 	if (crlf === 0) return "\n";
 	return crlf > lf ? "\r\n" : "\n";
@@ -36,11 +37,9 @@ export function stripBom(content: string): { bom: string; text: string } {
  * These cause line-count mismatches between normalizeToLF and external tools (ripgrep, wc).
  */
 export function hasBareCarriageReturn(content: string): boolean {
-	// Remove all \r\n first, then check if any \r remains
 	return content.replace(/\r\n/g, "").includes("\r");
 }
 
-
 const SINGLE_QUOTES_RE = /[\u2018\u2019\u201A\u201B]/g;
 const DOUBLE_QUOTES_RE = /[\u201C\u201D\u201E\u201F]/g;
 const UNICODE_SPACES_RE = /[\u00A0\u2002-\u200A\u202F\u205F\u3000]/g;

package/src/edit.ts

@@ -1,4 +1,4 @@
-import { readFile as fsReadFile, writeFile as fsWriteFile } from "fs/promises";
+import { readFile as fsReadFile, writeFile as fsWriteFile } from "node:fs/promises";
 
 import { createPatch } from "diff";
 import { withFileMutationQueue, type ExtensionAPI, type EditToolDetails, type ToolRenderResultOptions } from "@earendil-works/pi-coding-agent";
@@ -277,6 +277,7 @@ export async function executeEdit(opts: ExecuteEditOptions): Promise<any> {
 	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,

package/src/grep.ts

@@ -1,5 +1,5 @@
-import { readFile as fsReadFile, stat as fsStat } from "fs/promises";
-import path from "path";
+import { readFile as fsReadFile, stat as fsStat } from "node:fs/promises";
+import path from "node:path";
 
 import type { ExtensionAPI, ToolRenderResultOptions } from "@earendil-works/pi-coding-agent";
 import { createGrepTool } from "@earendil-works/pi-coding-agent";
@@ -315,6 +315,24 @@ export async function executeGrep(opts: ExecuteGrepOptions): Promise<any> {
 	let parsedCount = 0;
 	let candidateUnparsedCount = 0;
 	const candidateLinePattern = /^.+(?::|-)\d+(?::|-)\s/;
+	// Pre-read all matched files with bounded concurrency so the processing
+	// loop below hits the cache on every getFileLines call instead of
+	// serialising disk I/O.
+	if (!p.summary) {
+		const pathsToRead = new Set<string>();
+		for (const line of textBlock.text.split("\n")) {
+			throwIfAborted(signal);
+			const parsed = parseGrepOutputLine(line);
+			if (parsed && Number.isFinite(parsed.lineNumber) && parsed.lineNumber >= 1) {
+				pathsToRead.add(toAbsolutePath(parsed.displayPath));
+			}
+		}
+		const CONCURRENCY = 8;
+		const pathList = [...pathsToRead];
+		for (let i = 0; i < pathList.length; i += CONCURRENCY) {
+			await Promise.all(pathList.slice(i, i + CONCURRENCY).map((p) => getFileLines(p)));
+		}
+	}
 
 	const addSummaryMatch = (displayPath: string, absolutePath: string) => {
 		let group = groupsByPath.get(displayPath);

package/src/map-cache.ts

@@ -29,11 +29,15 @@ function getMapCacheState(): MapCacheGlobalState {
 	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();
-	if (state.cache.has(absPath)) state.cache.delete(absPath);
-	state.cache.set(absPath, entry);
+	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);
@@ -55,8 +59,7 @@ export async function getOrGenerateMap(absPath: string): Promise<FileMap | null>
 		const state = getMapCacheState();
 		const cached = state.cache.get(absPath);
 		if (cached && cached.mtimeMs === mtimeMs) {
-			state.cache.delete(absPath);
-			state.cache.set(absPath, cached);
+			touchMapEntry(state.cache, absPath, cached);
 			return cached.map;
 		}
 		const inflight = state.inflight.get(absPath);

package/src/path-utils.ts

@@ -1,5 +1,5 @@
-import * as os from "os";
-import { isAbsolute, resolve as resolvePath } from "path";
+import { homedir } from "node:os";
+import { isAbsolute, resolve as resolvePath } from "node:path";
 
 const UNICODE_SPACES = /[\u00A0\u2000-\u200A\u202F\u205F\u3000]/g;
 
@@ -13,8 +13,8 @@ function normalizeAtPrefix(filePath: string): string {
 
 function expandPath(filePath: string): string {
 	const normalized = normalizeUnicodeSpaces(normalizeAtPrefix(filePath));
-	if (normalized === "~") return os.homedir();
-	if (normalized.startsWith("~/")) return os.homedir() + normalized.slice(1);
+	if (normalized === "~") return homedir();
+	if (normalized.startsWith("~/")) return homedir() + normalized.slice(1);
 	return normalized;
 }
 

package/src/read.ts

@@ -1,4 +1,4 @@
-import { readFile as fsReadFile } from "fs/promises";
+import { readFile as fsReadFile } from "node:fs/promises";
 
 import type { ExtensionAPI, ToolRenderResultOptions, AgentToolResult } from "@earendil-works/pi-coding-agent";
 import {

package/src/write.ts

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { access, mkdir, readFile, writeFile } from "node:fs/promises";
 import { dirname, relative } from "node:path";
 
 import { withFileMutationQueue, type ExtensionAPI } from "@earendil-works/pi-coding-agent";
@@ -92,10 +92,9 @@ export interface WriteResult extends WriteDiffFields {
   };
 }
 
-function readPreviousTextForDiff(filePath: string): string {
+async function readPreviousTextForDiff(filePath: string): Promise<string> {
   try {
-    if (!existsSync(filePath)) return "";
-    const previous = readFileSync(filePath);
+    const previous = await readFile(filePath);
     if (looksLikeBinary(previous)) return "";
     return previous.toString("utf-8");
   } catch {
@@ -223,25 +222,24 @@ export async function executeWrite(opts: {
       },
     };
   }
-  const previousContent = readPreviousTextForDiff(filePath);
-  const existedBeforeWrite = existsSync(filePath);
+  const previousContent = await readPreviousTextForDiff(filePath);
+  const existedBeforeWrite = await access(filePath).then(() => true, () => false);
 
   // Create parent directories
   try {
-    mkdirSync(dirname(filePath), { recursive: true });
+    await mkdir(dirname(filePath), { recursive: true });
   } catch (err: any) {
     err.__phase = "mkdir";
     throw err;
   }
   // Write file
   try {
-    writeFileSync(filePath, content, "utf-8");
+    await writeFile(filePath, content, "utf-8");
   } catch (err: any) {
     err.__phase = "write";
     throw err;
   }
 
-
   // Binary detection
   if (looksLikeBinary(Buffer.from(content, "utf-8"))) {
     warnings.push("File content appears to be binary.");