@jerryan/pi-hashline-edit 0.7.2 → 0.7.3

package/README.md

@@ -34,12 +34,12 @@ pi install /path/to/pi-hashline-edit
 
 ### `read` — tagged line output
 
-Text files are returned with a `LINE#HASH:` prefix on every line. Line numbers may be left-padded within each returned block so the `#HASH:` columns align:
+Text files are returned with a `LINE#HASH│` prefix on every line. Line numbers may be left-padded within each returned block so the `#HASH│` columns align:
 
 ```text
- 8#A4:function hello() {
- 9#3F:  console.log("world");
-10#B2:}
+ 8#A4│function hello() {
+ 9#3F│  console.log("world");
+10#B2│}
 ```
 
 - `LINE` — 1-indexed line number.
@@ -80,22 +80,22 @@ After a successful edit, the response contains a unified diff where context and
 Each edit result shows a unified diff with hashline-formatted lines:
 
 ```text
- 8#A4:function hello() {
--9   :  console.log("world");
-+9#B1:  console.log("hashline");
-10#B2:}
+ 8#A4│function hello() {
+-9   │  console.log("world");
++9#B1│  console.log("hashline");
+10#B2│}
 ```
 
-- Context lines: ` NN#HH:content` (space prefix)
-- Removed lines: `-NN   :content` (no hash, aligned colon)
-- Added lines: `+NN#HH:content` (hash for new anchors)
+- Context lines: ` NN#HH│content` (space prefix)
+- Removed lines: `-NN   │content` (no hash, aligned separator)
+- Added lines: `+NN#HH│content` (hash for new anchors)
 - Multiple hunks are shown when edits are far apart.
 
 ## Design Decisions
 
 - **Stale anchors fail.** A hash mismatch means the file has changed since the last `read`. The error includes a snippet with fresh `LINE#HASH` references for the affected lines for immediate retry.
 - **No fallback relocation.** Mismatched anchors are never silently relocated to a "close enough" line. This trades convenience for correctness.
-- **Strict patch content.** If `lines` contains `LINE#HASH:` display prefixes or diff `+`/`-` markers, the edit is rejected with `[E_INVALID_PATCH]`. The model must send literal file content; the runtime does not silently strip accidental prefixes.
+- **Strict patch content.** If `lines` contains `LINE#HASH│` display prefixes or diff `+`/`-` markers, the edit is rejected with `[E_INVALID_PATCH]`. The model must send literal file content; the runtime does not silently strip accidental prefixes.
 - **Full-file deletion guardrail.** Edits that would empty a file with more than 50 lines are rejected with `[E_WOULD_EMPTY]`. Small files show the full diff normally; large deletions are almost always mistakes.
 - **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.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jerryan/pi-hashline-edit",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "Hashline read/edit tool override for pi-coding-agent",
   "repository": {
     "type": "git",

package/prompts/edit.md

@@ -9,7 +9,7 @@ Each edit entry replaces an inclusive anchor range:
 - `range` — `[start, end]` pair of LINE#HASH anchors from the most recent `read` or diff output.
   Use the same anchor twice for single-line: `["42#A4", "42#A4"]`.
 - `lines` — new content replacing the range (string array). Use `[]` to delete.
-  Must be literal file content, not LINE#HASH-prefixed output. Match indentation exactly.
+  Must be literal file content, not LINE#HASH│-prefixed output. Match indentation exactly.
 
 Example:
 ```json

package/prompts/read.md

@@ -1,4 +1,4 @@
-Read a UTF-8 text file or a supported image. Text lines are prefixed `LINE#HASH:content` — copy those anchors verbatim into `edit`.
+Read a UTF-8 text file or a supported image. Text lines are prefixed `LINE#HASH│content` — copy those anchors verbatim into `edit`.
 
 Use `offset` and `limit` to page through. Default cap: {{DEFAULT_MAX_LINES}} lines or {{DEFAULT_MAX_BYTES}}; when truncated, the tail of the output tells you the next `offset`.
 

package/src/edit-diff.ts

@@ -5,6 +5,8 @@ import {
   FUZZY_DOUBLE_QUOTES_RE,
   FUZZY_SINGLE_QUOTES_RE,
   FUZZY_UNICODE_SPACES_RE,
+  ANCHOR_SEP,
+  CONTENT_SEP,
 } from "./hashline";
 
 // ─── Line ending normalization ──────────────────────────────────────────
@@ -241,8 +243,7 @@ export function generateDiffString(
     newContent.split("\n").length,
   );
   const lineNumWidth = String(maxLineNum).length;
-  const hashPad = " ".repeat(3); // align with `#HH:`
-
+  const hashPad = " ".repeat(ANCHOR_SEP.length + 2); // align with `${ANCHOR_SEP}HH${CONTENT_SEP}`
   const output: string[] = [];
 
   for (let h = 0; h < patch.hunks.length; h++) {
@@ -262,17 +263,17 @@ export function generateDiffString(
 
       if (prefix === "-") {
         const padded = String(oldLineNum).padStart(lineNumWidth, " ");
-        output.push(`-${padded}${hashPad}:${text}`);
+        output.push(`-${padded}${hashPad}${CONTENT_SEP}${text}`);
         oldLineNum++;
       } else if (prefix === "+") {
         const padded = String(newLineNum).padStart(lineNumWidth, " ");
         const hash = computeLineHash(newLineNum, text);
-        output.push(`+${padded}#${hash}:${text}`);
+        output.push(`+${padded}${ANCHOR_SEP}${hash}${CONTENT_SEP}${text}`);
         newLineNum++;
       } else {
         const padded = String(newLineNum).padStart(lineNumWidth, " ");
         const hash = computeLineHash(newLineNum, text);
-        output.push(` ${padded}#${hash}:${text}`);
+        output.push(` ${padded}${ANCHOR_SEP}${hash}${CONTENT_SEP}${text}`);
         oldLineNum++;
         newLineNum++;
       }

package/src/edit.ts

@@ -17,6 +17,7 @@ import {
   applyHashlineEdits,
   resolveEditAnchors,
   type HashlineToolEdit,
+  ANCHOR_SEP,
 } from "./hashline";
 import { loadFileKindAndText } from "./file-kind";
 import { resolveToCwd } from "./path-utils";
@@ -29,7 +30,7 @@ const editEntrySchema = Type.Object(
   {
     range: Type.Tuple([Type.String(), Type.String()], {
       description:
-        'LINE#HASH anchor pair [start, end] copied from a recent `read` or `--- Anchors ---` block. Use the same anchor twice for single-line: ["42#A4", "42#A4"].',
+        `LINE${ANCHOR_SEP}HASH anchor pair [start, end] copied from a recent \`read\` or diff output. Use the same anchor twice for single-line: ["42${ANCHOR_SEP}A4", "42${ANCHOR_SEP}A4"].`,
     }),
     lines: Type.Array(Type.String(), {
       description: "New content lines. Use [] to delete.",
@@ -41,7 +42,7 @@ export const hashlineEditToolSchema = Type.Object(
   {
     path: Type.String({ description: "path" }),
     edits: Type.Array(editEntrySchema, {
-      description: "Edits to apply to $path. Each edit replaces the range [start, end] with lines. Use the same anchor twice for single-line; use [] to delete.",
+      description: `Edits to apply to $path. Each edit replaces the range [start, end] with lines. Use the same anchor twice for single-line; use [] to delete.`,
     }),
   },
   { additionalProperties: false },

package/src/hashline.ts

@@ -39,6 +39,9 @@ const DICT = Array.from({ length: 256 }, (_, i) => {
   return `${HEX[h]}${HEX[l]}`;
 });
 
+export const ANCHOR_SEP = "#";
+export const CONTENT_SEP = "│";
+
 // FNV-1a 32-bit constants
 const FNV_OFFSET = 0x811c9dc5;
 const FNV_PRIME = 0x01000193;
@@ -48,10 +51,10 @@ const FNV_PRIME = 0x01000193;
  * payloads. The runtime no longer strips them — the model must send literal
  * file content. Matching any of these triggers `[E_INVALID_PATCH]`.
  */
-const HASHLINE_PREFIX_RE =
-  /^\s*(?:>>>|>>)?\s*(?:\d+\s*#\s*|#\s*)[0-9A-F]{2}:/;
-const HASHLINE_PREFIX_PLUS_RE =
-  /^\+\s*(?:\d+\s*#\s*|#\s*)[0-9A-F]{2}:/;
+const HASHLINE_PREFIX_RE = new RegExp(
+  `^\\s*(?:>>>|>>)?\\s*(?:\\d+\\s*${ANCHOR_SEP}\\s*|${ANCHOR_SEP}\\s*)?[0-9A-F]{2}${CONTENT_SEP}`);
+const HASHLINE_PREFIX_PLUS_RE = new RegExp(
+  `^\\+\\s*(?:\\d+\\s*${ANCHOR_SEP}\\s*|${ANCHOR_SEP}\\s*)?[0-9A-F]{2}${CONTENT_SEP}`);
 const DIFF_MINUS_RE = /^-\s*\d+\s{4}/;
 
 export function computeLineHash(idx: number, line: string): string {
@@ -90,16 +93,16 @@ function diagnoseLineRef(ref: string): string {
   const core = ref.replace(/^\s*[>+-]*\s*/, "").trim();
 
   if (!core.length) {
-    return `[E_BAD_REF] Invalid line reference "${ref}". Expected "LINE#HASH" (e.g. "5#MQ").`;
+    return `[E_BAD_REF] Invalid line reference "${ref}". Expected "LINE${ANCHOR_SEP}HASH" (e.g. "5${ANCHOR_SEP}MQ").`;
   }
   if (/^\d+\s*$/.test(core)) {
-    return `[E_BAD_REF] Invalid line reference "${ref}": missing hash, use "LINE#HASH" from read output (e.g. "5#MQ").`;
+    return `[E_BAD_REF] Invalid line reference "${ref}": missing hash, use "LINE${ANCHOR_SEP}HASH" from read output (e.g. "5${ANCHOR_SEP}MQ").`;
   }
-  if (/^\d+\s*:/.test(core)) {
-    return `[E_BAD_REF] Invalid line reference "${ref}": wrong separator, use "LINE#HASH" instead of "LINE:...".`;
+  if (new RegExp(`^\d+\s*[:${CONTENT_SEP}]`).test(core)) {
+    return `[E_BAD_REF] Invalid line reference "${ref}": wrong separator, use "LINE${ANCHOR_SEP}HASH" instead of "LINE:..." or "LINE${CONTENT_SEP}...".`;
   }
 
-  const hashMatch = core.match(/^(\d+)\s*#\s*([^\s:]+)(?:\s*:.*)?$/);
+  const hashMatch = core.match(new RegExp(`^(\d+)\s*${ANCHOR_SEP}\s*([^\s${CONTENT_SEP}]+)(?:\s*${CONTENT_SEP}.*)?$`));
   if (hashMatch) {
     const line = Number.parseInt(hashMatch[1]!, 10);
     const hash = hashMatch[2]!;
@@ -114,16 +117,16 @@ function diagnoseLineRef(ref: string): string {
     }
   }
 
-  const missingHashMatch = core.match(/^(\d+)\s*#\s*$/);
+  const missingHashMatch = core.match(new RegExp(`^(\d+)\s*${ANCHOR_SEP}\s*$`));
   if (missingHashMatch) {
-    return `[E_BAD_REF] Invalid line reference "${ref}": missing hash after "#", use "LINE#HASH" from read output.`;
+    return `[E_BAD_REF] Invalid line reference "${ref}": missing hash after "${ANCHOR_SEP}", use "LINE${ANCHOR_SEP}HASH" from read output.`;
   }
 
-  if (/^0+\s*#/.test(core)) {
+  if (new RegExp(`^0+\s*${ANCHOR_SEP}`).test(core)) {
     return `[E_BAD_REF] Line number must be >= 1, got 0 in "${ref}".`;
   }
 
-  return `[E_BAD_REF] Invalid line reference "${trimmed || ref}". Expected "LINE#HASH" (e.g. "5#MQ").`;
+  return `[E_BAD_REF] Invalid line reference "${trimmed || ref}". Expected "LINE${ANCHOR_SEP}HASH" (e.g. "5${ANCHOR_SEP}MQ").`;
 }
 
 export function parseLineRef(ref: string): { line: number; hash: string } {
@@ -136,7 +139,7 @@ export function parseLineRef(ref: string): { line: number; hash: string } {
 
 function parseAnchorRef(ref: string): Anchor {
   const core = ref.replace(/^\s*[>+-]*\s*/, "").trimEnd();
-  const match = core.match(/^([0-9]+)\s*#\s*([^\s:]+)(?:\s*:(.*))?$/s);
+  const match = core.match(new RegExp(`^([0-9]+)\s*${ANCHOR_SEP}\s*([^\s${CONTENT_SEP}]+)(?:\s*${CONTENT_SEP}(.*))?$`, 's'));
   if (!match) {
     throw new Error(diagnoseLineRef(ref));
   }
@@ -203,9 +206,9 @@ function formatMismatchError(
   const sorted = [...displayLines].sort((a, b) => a - b);
   const maxDisplayLine = sorted[sorted.length - 1] ?? 1;
   const lineNumberWidth = String(maxDisplayLine).length;
-  const anchorList = uniqueMismatches.map((m) => `${m.line}#${m.expected}`).join(", ");
+  const anchorList = uniqueMismatches.map((m) => `${m.line}${ANCHOR_SEP}${m.expected}`).join(", ");
   const out: string[] = [
-    `[E_STALE_ANCHOR] ${uniqueMismatches.length} stale anchor${uniqueMismatches.length > 1 ? "s" : ""}: ${anchorList}. Retry with the >>> LINE#HASH lines below; keep both endpoints for range replaces.`,
+    `[E_STALE_ANCHOR] ${uniqueMismatches.length} stale anchor${uniqueMismatches.length > 1 ? "s" : ""}: ${anchorList}. Retry with the >>> LINE${ANCHOR_SEP}HASH lines below; keep both endpoints for range replaces.`,
     "",
   ];
 
@@ -215,11 +218,11 @@ function formatMismatchError(
     prev = num;
     const content = fileLines[num - 1];
     const hash = computeLineHash(num, content);
-    const prefix = `${String(num).padStart(lineNumberWidth, " ")}#${hash}`;
+    const prefix = `${String(num).padStart(lineNumberWidth, " ")}${ANCHOR_SEP}${hash}`;
     out.push(
       retryLineSet.has(num)
-        ? `>>> ${prefix}:${content}`
-        : `    ${prefix}:${content}`,
+        ? `>>> ${prefix}${CONTENT_SEP}${content}`
+        : `    ${prefix}${CONTENT_SEP}${content}`,
     );
   }
 
@@ -242,7 +245,7 @@ function assertNoDisplayPrefixes(lines: string[]): void {
       DIFF_MINUS_RE.test(line)
     ) {
       throw new Error(
-        `[E_INVALID_PATCH] "lines" must contain literal file content, not rendered "LINE#HASH:" or diff "+/-" prefixes. Offending line: ${JSON.stringify(line)}`,
+        `[E_INVALID_PATCH] "lines" must contain literal file content, not rendered "LINE${ANCHOR_SEP}HASH${CONTENT_SEP}" or diff "+/-" prefixes. Offending line: ${JSON.stringify(line)}`,
       );
     }
   }
@@ -435,15 +438,15 @@ function describeEdit(edit: HashlineEdit): string {
   switch (edit.op) {
     case "replace":
       return edit.end
-        ? `replace ${edit.pos.line}#${edit.pos.hash}-${edit.end.line}#${edit.end.hash}`
-        : `replace ${edit.pos.line}#${edit.pos.hash}`;
+        ? `replace ${edit.pos.line}${ANCHOR_SEP}${edit.pos.hash}-${edit.end.line}${ANCHOR_SEP}${edit.end.hash}`
+        : `replace ${edit.pos.line}${ANCHOR_SEP}${edit.pos.hash}`;
     case "append":
       return edit.pos
-        ? `append after ${edit.pos.line}#${edit.pos.hash}`
+        ? `append after ${edit.pos.line}${ANCHOR_SEP}${edit.pos.hash}`
         : "append at EOF";
     case "prepend":
       return edit.pos
-        ? `prepend before ${edit.pos.line}#${edit.pos.hash}`
+        ? `prepend before ${edit.pos.line}${ANCHOR_SEP}${edit.pos.hash}`
         : "prepend at BOF";
     case "replace_text":
       return `replace_text \"${previewText(edit.oldText)}\"`;
@@ -575,7 +578,7 @@ function resolveEditToSpan(
       ) {
         noopEdits.push({
           editIndex: index,
-          loc: `${edit.pos.line}#${edit.pos.hash}`,
+          loc: `${edit.pos.line}${ANCHOR_SEP}${edit.pos.hash}`,
           currentContent: originalLines.join("\n"),
         });
         return null;
@@ -627,7 +630,7 @@ function resolveEditToSpan(
       if (edit.lines.length === 0) {
         noopEdits.push({
           editIndex: index,
-          loc: edit.pos ? `${edit.pos.line}#${edit.pos.hash}` : "EOF",
+          loc: edit.pos ? `${edit.pos.line}${ANCHOR_SEP}${edit.pos.hash}` : "EOF",
           currentContent: edit.pos ? fileLines[edit.pos.line - 1] ?? "" : "",
         });
         return null;
@@ -678,7 +681,7 @@ function resolveEditToSpan(
       if (edit.lines.length === 0) {
         noopEdits.push({
           editIndex: index,
-          loc: edit.pos ? `${edit.pos.line}#${edit.pos.hash}` : "BOF",
+          loc: edit.pos ? `${edit.pos.line}${ANCHOR_SEP}${edit.pos.hash}` : "BOF",
           currentContent: edit.pos ? fileLines[edit.pos.line - 1] ?? "" : "",
         });
         return null;
@@ -988,7 +991,7 @@ export function formatHashlineRegion(
     .map((line, index) => {
       const lineNumber = startLine + index;
       const paddedLineNumber = String(lineNumber).padStart(lineNumberWidth, " ");
-      return `${paddedLineNumber}#${computeLineHash(lineNumber, line)}:${line}`;
+      return `${paddedLineNumber}${ANCHOR_SEP}${computeLineHash(lineNumber, line)}${CONTENT_SEP}${line}`;
     })
     .join("\n");
 }