pi-hashline-edit-pro 0.18.1 → 0.18.2

package/README.md

@@ -142,7 +142,9 @@ The file is created automatically when any setting is toggled. Both fields are i
 
 - **Stale anchors fail (per-line).** A hash mismatch means that specific line's content changed since the last `read`; the error tells the model to call `read()` to get fresh anchors, then copy the 3-character HASH of the start and end of the range being replaced into `hash_range_inclusive` of the next replace call. Because staleness is per-line, editing or appending lines does **not** invalidate anchors for lines whose content is unchanged — anchors for untouched regions stay valid across edits to other regions.
 - **No fallback relocation.** Mismatched anchors are never silently relocated to a "close enough" line. This trades convenience for correctness.
-- **Strict patch content.** If `content_lines` contains `+HASH│` display prefixes (or `-N   ` numbered deletion rows), the edit is rejected with `[E_INVALID_PATCH]`. This narrowly guards against pasting the tool's own diff-preview rows back as content; standard unified-diff lines (`+x`, `-x`, ` x`, `@@ … @@`) are **not** rejected — they are written literally, since literal content must never be silently altered. Bare `HASH│` content (the first 4 chars of a `content_lines` entry looking like 3 base64 chars + `│`) is rejected with `[E_BARE_HASH_PREFIX]`. When the suspect's prefix happens to match a real file-line anchor, the error message flags that as strong evidence the model copied an anchor from the read output.
+- **Strict patch content.** If `content_lines` contains diff-preview rows — `+HASH│` addition prefixes, `-HASH│` or `-   │` deletion rows (the padded format the diff preview emits), or `-N   ` numbered deletion rows — the edit is rejected with `[E_INVALID_PATCH]`. This narrowly guards against pasting the tool's own diff-preview rows back as content; standard unified-diff lines (`+x`, `-x`, ` x`, `@@ … @@`) are **not** rejected — they are written literally, since literal content must never be silently altered. Bare `HASH│` content (the first 4 chars of a `content_lines` entry looking like 3 base64 chars + `│`) is rejected with `[E_BARE_HASH_PREFIX]`. When the suspect's prefix happens to match a real file-line anchor, the error message flags that as strong evidence the model copied an anchor from the read output.
+
+- **BOM preservation.** A UTF-8 BOM is stripped for display and hashing but restored on write, so edits (and undo) never silently strip a BOM from a file that has one.
 - **Atomic writes.** Files are written via temp-file-then-rename to avoid corruption from interrupted writes. Symlink chains are resolved so the target file is updated without replacing the symlink. Hard-linked files are updated in place to preserve the shared inode. File permissions are preserved across atomic renames.
 - **Per-file mutation queue.** Edits queue by the canonical write target, so concurrent edits through different symlink paths still serialize onto the same underlying file.
 - **Boundary duplication auto-fix.** When the last line of a replacement matches the next surviving line (or the first line matches the preceding one), the runtime automatically strips the duplicate from `content_lines` before applying the edit. This catches a common LLM pattern where closing delimiters like `}`, `});`, or `} else {` are accidentally duplicated. The auto-fix is completely silent — the model sees a normal successful edit. The duplicate never reaches the file. Raw line comparison (not trimmed) avoids false positives when indentation differs.

package/index.ts

@@ -1,7 +1,7 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { initHasher } from "./src/hashline";
 import { regReplace, regReplaceFlat } from "./src/replace";
-import { regReplaceUndo } from "./src/replace-undo";
+import { regReplaceUndo, clearUndo } from "./src/replace-undo";
 import { regRead, fmtReadPreview } from "./src/read";
 import { visLines } from "./src/utils";
 import { AUTO_READ_MAX } from "./src/constants";
@@ -12,7 +12,8 @@ import {
 } from "./src/config";
 import { loadHashStore, pruneMissing } from "./src/hash-store";
 import { readNormFile } from "./src/file-reader";
-
+import { toCwd } from "./src/paths";
+import { resolveTarget } from "./src/fs-write";
 function registerReplaceTool(pi: ExtensionAPI, mode: string, autoRead?: boolean): void {
   if (mode === "flat") {
     regReplaceFlat(pi, autoRead);
@@ -73,8 +74,18 @@ export default function (pi: ExtensionAPI): void {
   });
 
   pi.on("tool_result", async (event, ctx) => {
-    if (!autoRead) return;
     if (event.isError) return;
+    if (event.toolName === "write") {
+      const writtenPath = (event.input as Record<string, unknown>)?.path;
+      if (typeof writtenPath === "string") {
+        try {
+          clearUndo(await resolveTarget(toCwd(writtenPath, ctx.cwd)));
+        } catch (error) {
+          console.error("Failed to clear undo after write:", error);
+        }
+      }
+    }
+    if (!autoRead) return;
     if (event.toolName !== "write" && event.toolName !== "replace") return;
 
     const filePath = (event.input as Record<string, unknown>)?.path;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "0.18.1",
+  "version": "0.18.2",
   "type": "module",
   "description": "Strict hashline read/replace tool for pi-coding-agent with hash-anchored edits (3-char, 18-bit, perfect hashing)",
   "main": "index.ts",
@@ -40,6 +40,9 @@
     "@earendil-works/pi-coding-agent": ">=0.74.0",
     "@earendil-works/pi-tui": "*"
   },
+  "engines": {
+    "node": ">=22.13.0"
+  },
   "scripts": {
     "test": "vitest run",
     "test:watch": "vitest",

package/prompts/read-guidelines.md

@@ -1 +1,2 @@
-- `read`: call before `replace` when you need fresh HASH anchors for a file.
+- `read`: call before `replace` when you need fresh HASH anchors for a file.
+- `read`: call again after any edit to that file — changed lines get new anchors.

package/prompts/read.md

@@ -1,3 +1 @@
-Read a text file. Each line returned as HASH│content (3-char URL-safe base64 hash). No line numbers — use the 3-char HASH to reference lines in replace calls.
-
-Text → HASH│content lines. Images → visual attachments. Binary/directory → rejected. Empty → HASH│ (replace to insert). Pageable with offset/limit. BOM stripped; non-UTF-8 shown as U+FFFD.
+Read a text file; each line returned as HASH│content with a 3-char URL-safe base64 hash. No line numbers — use the HASH as the anchor in replace calls. Images → visual attachments; Binary/directory → rejected; empty → HASH│ (replace to insert); pageable with offset/limit; BOM stripped; non-UTF-8 shown as U+FFFD.

package/prompts/replace-guidelines.md

@@ -1,2 +1,2 @@
-- `replace`: Provide hash_range_inclusive [start_hash, end_hash] targeting lines by their 3-char hashes (replaces every line from first anchor through last anchor inclusively), and content_lines as a native JSON array of strings for the replacement text.
-- `replace`: preserve leading whitespace exactly as it appears after │ in read output.
+- `replace`: content_lines is a native JSON array of strings — never a serialized JSON string; strip the HASH│ prefix from read output and keep leading whitespace exactly as shown after │; no line numbers or diff markers.
+- `replace`: hash_range_inclusive must use only anchors from the most recent read of the same file; on [E_STALE_ANCHOR], re-read the file and retry with fresh anchors.

package/prompts/undo-last-replace-guidelines.md

@@ -0,0 +1 @@
+- `undo_last_replace`: reverts only the most recent replace on the file — any write to the file clears the undo history, so call it immediately after a bad replace.

package/src/file-kind.ts

@@ -81,7 +81,7 @@ export async function loadFileKindAndText(
     }
 
 
-    const decoder = new TextDecoder("utf-8", { fatal: false });
+    const decoder = new TextDecoder("utf-8", { fatal: false, ignoreBOM: true });
     let hadUtf8DecodeErrors = false;
     const parts: string[] = [];
 

package/src/hashline/hash.ts

@@ -40,6 +40,9 @@ export const HL_PREFIX_RE = new RegExp(
 export const HL_PREFIX_PLUS_RE = new RegExp(
 	`^\\+\\s*${HASH_CLASS}│`,
 );
+export const HL_PREFIX_MINUS_RE = new RegExp(
+	`^-(?:\\s*${HASH_CLASS}│| {${ANCHOR_LEN}}│)`,
+);
 export const DIFF_MINUS_RE = /^-\s*\d+\s{4}/;
 
 export const HL_BARE_PREFIX_RE = new RegExp(`^\\s*(${HASH_CLASS})│`);

package/src/hashline/index.ts

@@ -5,6 +5,7 @@ export {
 	HASH_CLASS,
 	HL_PREFIX_RE,
 	HL_PREFIX_PLUS_RE,
+	HL_PREFIX_MINUS_RE,
 	DIFF_MINUS_RE,
 	HL_BARE_PREFIX_RE,
 	lineHashes,

package/src/hashline/parse.ts

@@ -2,6 +2,7 @@ import {
 	ANCHOR_LEN,
 	ALPH_RE,
 	HL_PREFIX_PLUS_RE,
+	HL_PREFIX_MINUS_RE,
 	DIFF_MINUS_RE,
 } from "./hash";
 import { CONTENT_LINES_NOT_STRING_MSG } from "../constants";
@@ -46,10 +47,11 @@ function assertNoPrefixes(lines: string[]): void {
 		if (!line.length) continue;
 		if (
 			HL_PREFIX_PLUS_RE.test(line) ||
+			HL_PREFIX_MINUS_RE.test(line) ||
 			DIFF_MINUS_RE.test(line)
 		) {
 			throw new Error(
-			`[E_INVALID_PATCH] "content_lines" must contain literal file content. Offending line looks like the diff preview's +HASH│ row: ${JSON.stringify(line)}. Use literal file content only — plain + or - lines are written literally.`
+			`[E_INVALID_PATCH] "content_lines" must contain literal file content. Offending line looks like a diff preview row (e.g. +HASH│ or -HASH│): ${JSON.stringify(line)}. Use literal file content only — plain + or - lines are written literally.`
 			);
 		}
 	}

package/src/read.ts

@@ -2,8 +2,6 @@ import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import {
 	createReadTool,
 	formatSize,
-	DEFAULT_MAX_BYTES,
-	DEFAULT_MAX_LINES,
 	truncateHead,
 	type TruncationResult,
 } from "@earendil-works/pi-coding-agent";
@@ -18,10 +16,7 @@ import { visLines } from "./utils";
 import { loadP, loadGuide } from "./prompts";
 import { valAccess } from "./validation";
 
-const R_DESC = loadP("../prompts/read.md", {
-	DEFAULT_MAX_LINES: String(DEFAULT_MAX_LINES),
-	DEFAULT_MAX_BYTES: formatSize(DEFAULT_MAX_BYTES),
-});
+const R_DESC = loadP("../prompts/read.md");
 
 const R_SNIPPET = loadP("../prompts/read-snippet.md");
 const R_GUIDE = loadGuide("../prompts/read-guidelines.md");

package/src/replace.ts

@@ -68,7 +68,7 @@ const changeItemSchema = Type.Object(
 
 export const editToolSchema = Type.Object(
   {
-    changes: Type.Array(changeItemSchema, { description: "Array of edits. Each edit pairs content_lines (literal file content, one string per line) with hash_range_inclusive (inclusive [start_hash, end_hash] — pair of 3-char hashes from read output)." }),
+    changes: Type.Array(changeItemSchema, { description: "Array of edits applied atomically against the same pre-edit snapshot." }),
     path: Type.String({ description: "Path to edit" }),
   },
   { additionalProperties: false },
@@ -117,6 +117,19 @@ interface PipelineResult {
 
 const ROOT_KS = new Set(["path", "changes", "content_lines", "hash_range_inclusive"]);
 
+const LEGACY_KS = ["oldText", "newText", "old_text", "new_text", "old_range", "start", "end", "lines"];
+
+export function assertNoLegacyKeys(request: unknown): void {
+  if (!isRec(request)) return;
+  for (const legacyKey of LEGACY_KS) {
+    if (has(request, legacyKey)) {
+      throw new Error(
+        `[E_LEGACY_SHAPE] "${legacyKey}" is not supported. Use {content_lines: [...], hash_range_inclusive: ["<START>", "<END>"]}.`
+      );
+    }
+  }
+}
+
 export function assertReq(
   request: unknown,
   flat?: boolean
@@ -125,13 +138,7 @@ export function assertReq(
     throw new Error("[E_BAD_SHAPE] Edit request must be an object.");
   }
 
-  for (const legacyKey of ["oldText", "newText", "old_text", "new_text", "old_range", "start", "end", "lines"]) {
-    if (has(request, legacyKey)) {
-      throw new Error(
-        `[E_LEGACY_SHAPE] "${legacyKey}" is not supported. Use {content_lines: [...], hash_range_inclusive: ["<START>", "<END>"]}.`
-      );
-    }
-  }
+  assertNoLegacyKeys(request);
 
   rejectUnknownFields(request, ROOT_KS, "Edit request");
 
@@ -269,6 +276,11 @@ export async function compPreview(
 ): Promise<RPreview> {
   try {
     const normalized = normReq(request);
+    if (flat && isRec(request) && Array.isArray(request.changes)) {
+      return {
+        error: `[E_BAD_SHAPE] Flat mode does not accept a "changes" array. Send content_lines and hash_range_inclusive at the top level (one edit per call), or use bulk mode for multiple edits per call.`
+      };
+    }
     assertReq(normalized, flat);
     const { path, originalNormalized, originalHashes, result, resultHashes } = await execPipeline(
       normalized,
@@ -312,25 +324,9 @@ export function reuseMarkdown(context: any, content: string, theme: any): Markdo
 
 const MODE_CFG = {
   flat: {
-    desc: " Only one edit per call. The `hash_range_inclusive` and `content_lines` fields sit at the top level of the request object.",
-    examples: [
-      "", "Single line:", "{ \"content_lines\": [\"const x = 1;\"], \"hash_range_inclusive\": [\"MQX\", \"MQX\"], \"path\": \"src/main.ts\" }", "", "Range replace:", "{ \"content_lines\": [\"function greet() {\", \"  return 1;\", \"}\"], \"hash_range_inclusive\": [\"ZPM\", \"VRW\"], \"path\": \"src/main.ts\" }",
-    ].join("\n"),
-    rules: "",
-    requestStructure: [
-      "Flat mode:", "```json", "{ \"content_lines\": [...], \"hash_range_inclusive\": [\"aB3\", \"xY7\"], \"path\": \"...\" }", "```",
-    ].join("\n"),
     prefix: "performing one edit per call",
   },
   bulk: {
-    desc: "\n\nPut all operations on one file in a single `replace` call. Stack every region into the `changes` array, even when they are far apart. Anchors within one call must all come from the same pre-edit read; the runtime applies them atomically against that one snapshot.",
-    examples: [
-      "", "Single line:", "{ \"changes\": [{ \"content_lines\": [\"const x = 1;\"], \"hash_range_inclusive\": [\"MQX\", \"MQX\"] }], \"path\": \"src/main.ts\" }", "", "Range replace:", "{ \"changes\": [{ \"content_lines\": [\"function greet() {\", \"  return 1;\", \"}\"], \"hash_range_inclusive\": [\"ZPM\", \"VRW\"] }], \"path\": \"src/main.ts\" }",
-    ].join("\n"),
-    rules: "- Multiple edits in one call must not overlap. Overlapping ranges are rejected with [E_EDIT_CONFLICT].",
-    requestStructure: [
-      "Bulk mode (default):", "```json", "{ \"changes\": [{ \"content_lines\": [...], \"hash_range_inclusive\": [\"aB3\", \"xY7\"] }], \"path\": \"...\" }", "```",
-    ].join("\n"),
     prefix: "batching all changes to a file in one call",
   },
 } as const;
@@ -355,6 +351,7 @@ export function buildToolDef(opts: { flat: boolean; autoRead?: boolean }): ToolD
     promptGuidelines: E_GUIDE,
     prepareArguments: opts.flat
       ? (args: unknown) => {
+          assertNoLegacyKeys(args);
           if (!isRec(args)) return args as any;
           const record = { ...args };
           normalizeFilePath(record);
@@ -363,8 +360,10 @@ export function buildToolDef(opts: { flat: boolean; autoRead?: boolean }): ToolD
           }
           return record;
         }
-      : (args: unknown) =>
-          normReq(args) as ReqParams,
+      : (args: unknown) => {
+          assertNoLegacyKeys(args);
+          return normReq(args) as ReqParams;
+        },
     renderShell: "default",
     renderCall(args, theme, context) {
       const previewInput = getPreviewInput(args);