pi-hashline-edit-pro 1.0.0 → 1.0.1

package/README.md

@@ -127,6 +127,7 @@ Enabled by default. After a successful `write`, `replace`, or `undo_last_replace
 - History is in-memory and is lost when the session ends or the extension reloads.
 - A successful `write` clears the history for that file.
 - Call `read` after an undo to get fresh anchors for follow-up edits.
+- **Safety guard.** If the file was modified or deleted since the last replace, `undo_last_replace` refuses with `[E_UNDO_STALE]` rather than overwriting those changes.
 
 ## Commands and configuration
 
@@ -155,6 +156,10 @@ Settings live in `~/.config/pi-hashline-edit-pro/config.json`, created automatic
 | `[E_LEGACY_SHAPE]` | The request uses the unsupported `oldText`/`newText` dialect. |
 | `[E_BAD_OP]` | Range start line is after range end line — the pair is swapped automatically with a warning. |
 | `[E_WOULD_EMPTY]` | An edit would empty a non-empty file; use `write` instead. |
+| `[E_NOT_FOUND]` | The path does not exist. |
+| `[E_ACCESS]` | The file is not readable or writable. |
+| `[E_NOT_TEXT]` | The path is a directory, binary file, or image; hashline editing only supports text files. |
+| `[E_UNDO_STALE]` | `undo_last_replace` refused: the file was modified or deleted after the last replace. |
 | `[E_FILE_TOO_LARGE]` | The file exceeds the 238,328-line hashline limit. |
 
 ## Hashing

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "type": "module",
   "description": "Strict hashline read/replace tool for pi-coding-agent with hash-anchored edits (3-char, 62-symbol, perfect hashing)",
   "main": "index.ts",
@@ -47,7 +47,7 @@
     "test": "vitest run",
     "test:watch": "vitest",
     "test:coverage": "vitest run --coverage",
-    "lint": "eslint 'src/**/*.ts' 'index.ts' 'test/**/*.ts'",
+    "lint": "eslint \"src/**/*.ts\" \"index.ts\" \"test/**/*.ts\"",
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {

package/src/hash-store.ts

@@ -42,6 +42,19 @@ function openDb(storePath: string): { db: DatabaseSync; stmts: Prepared } {
   const db = new DatabaseSync(storePath, {
     timeout: HASH_STORE_BUSY_TIMEOUT,
   });
+  try {
+    return buildStore(db);
+  } catch (error) {
+    try {
+      db.close();
+    } catch {}
+    throw error;
+  }
+}
+
+function buildStore(
+  db: DatabaseSync,
+): { db: DatabaseSync; stmts: Prepared } {
   db.exec("PRAGMA journal_mode = WAL");
   db.exec("PRAGMA synchronous = NORMAL");
   db.exec(

package/src/replace-diff.ts

@@ -40,6 +40,10 @@ function fmtDiffLine(
   return `${prefix}${hash}${HASH_SEP}${line}`;
 }
 
+const ELLIPSIS_MARKER: unique symbol = Symbol("ellipsis");
+const isEllipsisMarker = (line: string | symbol): line is symbol =>
+  line === ELLIPSIS_MARKER;
+
 export function genDiff(
   oldContent: string,
   newContent: string,
@@ -78,7 +82,7 @@ export function genDiff(
     const nextPartIsChange =
       i < parts.length - 1 && (parts[i + 1]!.added || parts[i + 1]!.removed);
     if (lastWasChange || nextPartIsChange) {
-      let linesToShow = displayLines;
+      let linesToShow: (string | symbol)[] = displayLines;
       let skipStart = 0;
       let skipMiddle = 0;
 
@@ -87,7 +91,7 @@ export function genDiff(
         linesToShow = displayLines.slice(skipStart);
       } else if (nextPartIsChange && displayLines.length > contextLines * 2) {
         const tail = displayLines.slice(-contextLines);
-        linesToShow = [...displayLines.slice(0, contextLines), "__ELLIPSIS__", ...tail];
+        linesToShow = [...displayLines.slice(0, contextLines), ELLIPSIS_MARKER, ...tail];
         skipMiddle = displayLines.length - contextLines * 2;
       } else if (linesToShow.length > contextLines) {
         linesToShow = linesToShow.slice(0, contextLines);
@@ -98,7 +102,7 @@ export function genDiff(
         newLineNum += skipStart;
       }
       for (const line of linesToShow) {
-        if (line === "__ELLIPSIS__") {
+        if (isEllipsisMarker(line)) {
           output.push(" ...");
           newLineNum += skipMiddle;
           continue;

package/src/replace-undo.ts

@@ -7,7 +7,7 @@ import { contentChecksum } from "./hashline/hasher";
 import { resolveTarget, writeAtomic } from "./fs-write";
 import { toCwd } from "./paths";
 import { toLF, stripBOM, genDiff, restoreEndings } from "./replace-diff";
-import { cntDiff, splitLines } from "./utils";
+import { cntDiff, splitLines, errCode } from "./utils";
 import { loadP, loadGuide } from "./prompts";
 import { buildMetrics } from "./replace-response";
 import { changedRange } from "./hashline";
@@ -16,6 +16,7 @@ export interface UndoEntry {
   bom: string;
   originalEnding: "\r\n" | "\n";
   hashes: string[];
+  resultContent: string;
 }
 
 const undoMap = new Map<string, UndoEntry>();
@@ -66,13 +67,38 @@ export function regReplaceUndo(pi: ExtensionAPI): void {
       }
 
       return withFileMutationQueue(mutationTargetPath, async () => {
-        let currentNormalized = "";
+        let currentNormalized: string | undefined;
         try {
           const currentRaw = await readFile(mutationTargetPath, "utf-8");
           const { text: currentStripped } = stripBOM(currentRaw);
           currentNormalized = toLF(currentStripped);
-        } catch {
-          currentNormalized = "";
+        } catch (error) {
+          if (errCode(error) !== "ENOENT") throw error;
+        }
+
+        if (currentNormalized === undefined) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: `[E_UNDO_STALE] Cannot undo last replace on ${path}: the file no longer exists. Call read() to inspect the current state.`
+              },
+            ],
+            isError: true,
+            details: {},
+          };
+        }
+        if (currentNormalized !== undo.resultContent) {
+          return {
+            content: [
+              {
+                type: "text",
+                text: `[E_UNDO_STALE] Cannot undo last replace on ${path}: the file was modified after the replace, so undoing would overwrite those changes. Call read() to inspect the current state.`
+              },
+            ],
+            isError: true,
+            details: {},
+          };
         }
 
         const diffResult = genDiff(undo.content, currentNormalized, 0);

package/src/replace.ts

@@ -466,6 +466,7 @@ export function buildToolDef(): ToolDef {
           bom,
           originalEnding,
           hashes: originalHashes,
+          resultContent: result,
         });
         const updatedSnapshotId = (await fileSnap(absolutePath))
           .snapshotId;

package/src/validation.ts

@@ -13,25 +13,25 @@ export async function valAccess(
 	} catch (error: unknown) {
 		const code = errCode(error);
 		if (code === "ENOENT") {
-			throw new Error(`File not found: ${path}`);
+			throw new Error(`[E_NOT_FOUND] File not found: ${path}`);
 		}
 		if (code === "EACCES" || code === "EPERM") {
 			const accessLabel = accessMode & constants.W_OK ? "not writable" : "not readable";
-			throw new Error(`File is ${accessLabel}: ${path}`);
+			throw new Error(`[E_ACCESS] File is ${accessLabel}: ${path}`);
 		}
-		throw new Error(`Cannot access file: ${path}`);
+		throw new Error(`[E_ACCESS] Cannot access file: ${path}`);
 	}
 }
 
 export function valKind(file: LFile, path: string): asserts file is { kind: "text"; text: string; hadUtf8DecodeErrors?: true } {
 	if (file.kind === "directory") {
-		throw new Error(`Path is a directory: ${path}. Use ls to inspect directories.`);
+		throw new Error(`[E_NOT_TEXT] Path is a directory: ${path}. Use ls to inspect directories.`);
 	}
 	if (file.kind === "binary") {
-		throw new Error(`Path is a binary file: ${path} (${file.description}). Hashline edit only supports text files.`);
+		throw new Error(`[E_NOT_TEXT] Path is a binary file: ${path} (${file.description}). Hashline edit only supports text files.`);
 	}
 	if (file.kind === "image") {
-		throw new Error(`Path is an image file: ${path}. Hashline edit only supports text files.`);
+		throw new Error(`[E_NOT_TEXT] Path is an image file: ${path}. Hashline edit only supports text files.`);
 	}
 }