pi-hashline-edit-pro 2.8.4 → 3.0.0

package/src/hashline/hash.ts

@@ -7,36 +7,20 @@ import {
   persistSnapshot,
 } from "../hash-store";
 import { xxh32, initHasher } from "./hasher";
-import { HASH_LEN, ALPH, ALPH_RE, HASH_CLASS, HASH_RUN } from "./alphabet";
-export { initHasher, HASH_LEN, ALPH_RE, HASH_CLASS, HASH_RUN };
+import { HASH_LEN, ANCHOR_COUNT, anchorAt, anchorIndex, HASH_CLASS, HASH_RUN } from "./alphabet";
+export { initHasher, HASH_LEN, HASH_CLASS, HASH_RUN };
 
 export const ANCHOR_LEN = HASH_LEN;
 
 export const HASH_SEP = "│";
 
-export const HASH_SPACE = ALPH.length ** HASH_LEN;
+export const HASH_SPACE = ANCHOR_COUNT;
 export const MAX_HASH_LINES = HASH_SPACE;
 
-export const HASH_PROBE_STRIDE = ALPH.length ** 2 + ALPH.length + 1;
-
-function idxToHash(idx: number): string {
-  let out = "";
-  for (let j = 0; j < HASH_LEN; j++) {
-    out = ALPH[idx % ALPH.length]! + out;
-    idx = Math.floor(idx / ALPH.length);
-  }
-  return out;
-}
-
-const hashCache = new Map<number, string>();
+export const HASH_PROBE_STRIDE = 571;
 
 function hashAt(idx: number): string {
-  let hash = hashCache.get(idx);
-  if (hash === undefined) {
-    hash = idxToHash(idx);
-    hashCache.set(idx, hash);
-  }
-  return hash;
+  return anchorAt(idx);
 }
 
 export const HL_PREFIX_PLUS_RE = new RegExp(
@@ -182,13 +166,7 @@ export async function lineHashes(
 }
 
 function hashToIndex(hash: string): number {
-  let idx = 0;
-  for (let j = 0; j < HASH_LEN; j++) {
-    const charIdx = ALPH.indexOf(hash[j]!);
-    if (charIdx < 0) return -1;
-    idx = idx * ALPH.length + charIdx;
-  }
-  return idx;
+  return anchorIndex(hash);
 }
 
 function nearestNew(

package/src/hashline/parse.ts

@@ -1,8 +1,8 @@
 import {
 	ANCHOR_LEN,
-	ALPH_RE,
 	HASH_CLASS,
 } from "./hash";
+import { ALPH_RE } from "./alphabet";
 import { NEW_CONTENT_NOT_ARRAY_MSG } from "../constants";
 
 const HASH_EXTRACT_RE = new RegExp(HASH_CLASS);
@@ -13,11 +13,11 @@ function diagRef(ref: string): string {
 	const trimmed = ref.trim();
 
 	if (!trimmed.length) {
-		return `[E_BAD_REF] Invalid anchor. Expected a 3-char alphanumeric anchor (e.g. "aB3").`;
+		return `[E_BAD_REF] Invalid anchor. Expected a 4-char alphanumeric anchor (e.g. "Hasu").`;
 	}
 
 	if (/^\d+/.test(trimmed)) {
-		return `[E_BAD_REF] Invalid anchor. Use the anchor alone (e.g. "aB3"): no line numbers or trailing content.`;
+		return `[E_BAD_REF] Invalid anchor. Use the anchor alone (e.g. "Hasu"): no line numbers or trailing content.`;
 	}
 	if (trimmed.includes("│") && trimmed.includes("\n")) {
 		const lines = trimmed.split(/\r?\n/);
@@ -26,16 +26,16 @@ function diagRef(ref: string): string {
 		const hashRe = HASH_EXTRACT_RE;
 		const firstMatch = first.match(hashRe);
 		const lastMatch = last.match(hashRe);
-		const firstHash = firstMatch?.[0] ?? "aB3";
-		const lastHash = lastMatch?.[0] ?? "aB3";
+		const firstHash = firstMatch?.[0] ?? "Hasu";
+		const lastHash = lastMatch?.[0] ?? "Hasu";
 		const preview = first.slice(0, 60);
-		return `[E_BAD_REF] Invalid anchor — remove_from and remove_to must each be a single bare 3-char hash (e.g. "aB3"), not a block with HASH│content. Received ${lines.length} lines starting "${preview}…" — use only the first hash "${firstHash}" as remove_from and "${lastHash}" as remove_to, and put the new content (without HASH│) in replacement_lines.`;
+		return `[E_BAD_REF] Invalid anchor — remove_from and remove_to must each be a single bare 4-char hash (e.g. "Hasu"), not a block with HASH│content. Received ${lines.length} lines starting "${preview}…" — use only the first hash "${firstHash}" as remove_from and "${lastHash}" as remove_to, and put the new content (without HASH│) in replacement_lines.`;
 	}
 	if (trimmed.includes("│")) {
-		return `[E_BAD_REF] Invalid anchor "${trimmed}": use only the 3-char anchor, drop everything from "│" onward.`;
+		return `[E_BAD_REF] Invalid anchor "${trimmed}": use only the 4-char anchor, drop everything from "│" onward.`;
 	}
 
-	return `[E_BAD_REF] Invalid anchor "${trimmed}". Expected a 3-char alphanumeric anchor (e.g. "aB3").`;
+	return `[E_BAD_REF] Invalid anchor "${trimmed}". Expected a 4-char alphanumeric anchor (e.g. "Hasu").`;
 }
 
 function parseRef(ref: string): Anchor {

package/src/hashline/resolve.ts

@@ -159,12 +159,12 @@ function assertItem(edit: Record<string, unknown>): void {
 
   if ("remove_from" in edit && typeof edit.remove_from !== "string") {
     throw new Error(
-      `[E_BAD_SHAPE] Field "remove_from" must be an anchor string (3-char anchor).`,
+      `[E_BAD_SHAPE] Field "remove_from" must be an anchor string (4-char anchor).`,
     );
   }
   if ("remove_to" in edit && typeof edit.remove_to !== "string") {
     throw new Error(
-      `[E_BAD_SHAPE] Field "remove_to" must be an anchor string (3-char anchor).`,
+      `[E_BAD_SHAPE] Field "remove_to" must be an anchor string (4-char anchor).`,
     );
   }
   if (!("replacement_lines" in edit)) {
@@ -175,7 +175,7 @@ function assertItem(edit: Record<string, unknown>): void {
   }
   if (typeof edit.remove_from !== "string" || typeof edit.remove_to !== "string") {
     throw new Error(
-      `[E_BAD_SHAPE] The edit requires "remove_from" and "remove_to" anchor strings (3-char anchors from read output).`,
+      `[E_BAD_SHAPE] The edit requires "remove_from" and "remove_to" anchor strings (4-char anchors from read output).`,
     );
   }
 }

package/src/insert.ts

@@ -31,7 +31,7 @@ export function assertInsertReq(request: unknown): asserts request is InsertReq
     throw new Error('[E_BAD_SHAPE] Insert request requires a non-empty "path" string.');
   }
   if (typeof request.anchor !== "string" || request.anchor.length === 0) {
-    throw new Error('[E_BAD_SHAPE] Insert request requires an "anchor" string (3-char anchor from read output).');
+    throw new Error('[E_BAD_SHAPE] Insert request requires an "anchor" string (4-char anchor from read output).');
   }
   if (request.direction !== "before" && request.direction !== "after") {
     throw new Error('[E_BAD_SHAPE] Insert request "direction" must be "before" or "after".');
@@ -49,23 +49,23 @@ const insertToolSchema = Type.Object(
     }),
     anchor: Type.String({
       description:
-        'Bare 3-char anchor only (e.g. "aB3"): copy just the anchor from the leftmost column of a read row like `aB3│content`; never the line content. A pasted diff row like `+aB3│x` or an `anchor│` prefix is stripped automatically with a warning. The anchored line is preserved; the new lines go after or before it.',
+        'Bare 4-char anchor from a read row like `Hasu│content`, never the content. A pasted `+Hasu│x` diff row or `anchor│` prefix is stripped with a warning. The anchor line is preserved; lines go after or before it.',
     }),
     direction: Type.Union(
       [
-        Type.Literal("after", { description: "Insert the lines after the anchor line" }),
-        Type.Literal("before", { description: "Insert the lines before the anchor line" }),
+        Type.Literal("after"),
+        Type.Literal("before"),
       ],
       { description: '"after" or "before"' },
     ),
     lines: Type.Array(
       Type.String({
         description:
-          "One line to insert. Each element is exactly one line; do not embed \\n inside an element: use separate elements.",
+          "One line to insert; never embed \\n inside an element.",
       }),
       {
         description:
-          'Lines to insert as an array of strings, one element per line. Use [""] for a blank line. The anchor line is preserved; never include it in lines.',
+          'One string per line; [""] is a blank line; never include the anchor line.',
       }
     ),
   },

package/src/payload-contract.ts

@@ -4,22 +4,22 @@ import { isRec, normalizeFilePath, rejectUnknownFields } from "./utils";
 const replacementLinesSchema = Type.Array(
   Type.String({
     description:
-      "One replacement line. Each element is exactly one line; do not embed \\n inside an element: use separate elements.",
+      "One replacement line; never embed \\n inside an element.",
   }),
   {
     description:
-      "Replacement lines as an array of strings, one element per line. Use [] to delete the range.",
+      "One string per line. Use [] to delete the range.",
   },
 );
 
 const removeFromSchema = Type.String({
   description:
-    "Bare 3-char anchor only (e.g. \"aB3\"): copy just the anchor from the leftmost column of a read row like `aB3│content`; never the line content. Marks the FIRST line to remove (inclusive)",
+    "Bare 4-char anchor from a read row like `Hasu│content` (the leftmost column), never the row content. Marks the FIRST line to remove (inclusive)",
 });
 
 const removeToSchema = Type.String({
   description:
-    "Bare 3-char anchor only (e.g. \"aB3\"): copy just the anchor from the leftmost column of a read row like `aB3│content`; never the line content. Marks the LAST line to remove (inclusive)",
+    "Bare 4-char anchor from a read row like `Hasu│content` (the leftmost column), never the row content. Marks the LAST line to remove (inclusive)",
 });
 
 export const editToolSchema = Type.Object(
@@ -27,7 +27,7 @@ export const editToolSchema = Type.Object(
     path: Type.Optional(
       Type.String({
         description:
-          "Path to edit. Required: always provide it explicitly; it is only auto-resolved from the anchors as a fallback when omitted by mistake.",
+          "Path to edit; always provide it explicitly — it is only auto-resolved from the anchors as a fallback.",
       }),
     ),
     remove_from: removeFromSchema,

package/src/utils.ts

@@ -114,7 +114,7 @@ export function getCached<K, V>(map: Map<K, V>, key: K, compute: (key: K) => V):
 }
 
 export function isHashRow(line: string): boolean {
-	return /^[A-Za-z0-9]{3}│/.test(line);
+	return /^[A-Za-z0-9]{4}│/.test(line);
 }
 
 function gutterWidth(max: number, fallback: number): number {