pi-hashline-edit-pro 4.4.1 → 4.4.3

package/README.md

@@ -230,7 +230,7 @@ Codes starting with `E_` are errors: nothing was written — except `File was wr
 
 | Code | Meaning |
 | --- | --- |
-| `[E_BAD_SHAPE]` | Request envelope or edit item has unknown, missing, or wrongly-typed fields (for example `replacement_lines` must be an array of strings, one element per line), or content contains a NUL byte (`U+0000`), which would make the file binary. |
+| `[E_BAD_SHAPE]` | Request envelope or edit item has unknown, missing, or wrongly-typed fields (for example `replacement_lines` must be an array of strings, one element per line), content contains a NUL byte (`U+0000`), which would make the file binary, or a grep `glob` has invalid bracket or brace syntax. |
 | `[W_BAD_SHAPE]` | Auto-corrected request slip reported as a warning (for example stringified array text that could not be parsed and was kept as one literal line). |
 | `[E_BAD_REF]` | An anchor in `remove_from`/`remove_to` is not a bare 4-character anchor (the anchor table is letters only). |
 | `[W_BAD_REF]` | A pasted `anchor│` or diff-preview marker was stripped from an anchor field with a warning. |
@@ -252,6 +252,8 @@ Codes starting with `E_` are errors: nothing was written — except `File was wr
 | `[E_BATCH_OVERLAP]` | Batched `replace`/`insert` calls target overlapping ranges; the whole batch was refused. One `before` plus one `after` insert on the same anchor line is not an overlap. Retry with disjoint ranges. |
 | `[E_OP_ABORTED]` | An edit aborted (a same-message batch member failed, or the file changed or was deleted after the edit started). Nothing was written. Fix the sibling failure and retry the batch, otherwise call `read` for fresh anchors and retry. The abort names the failing call and its error code when one is known. |
 | `[E_UNSAFE_REGEX]` | A grep regex can trigger excessive backtracking; simplify it or search with `literal: true`. |
+| `[E_GREP_FAILED]` | `anchor_grep` could not start ripgrep or ripgrep exited with an error (for example a pattern valid in JavaScript but unsupported by ripgrep's regex engine); the message carries ripgrep's output. Retry with `literal: true` or simplify the pattern. |
+| `[E_GREP_TIMEOUT]` | `anchor_grep` timed out after 10 seconds; narrow `path` or simplify `pattern` and retry. |
 | `[E_AUTO_READ_ALL]` | File already attached and unchanged since this session's start; the attached content is still exact. |
 
 ## Troubleshooting
@@ -263,6 +265,7 @@ Codes starting with `E_` are errors: nothing was written — except `File was wr
 - Reset the anchor state. Anchors live in `~/.config/pi-hashline-edit-pro/hash-store.sqlite` (with `-wal`/`-shm` sidecars) and in per-session ownership logs under `~/.config/pi-hashline-edit-pro/sessions/`. Quit pi, delete those files, and everything is rebuilt on the next session. Anchor history is lost, but no project files are touched.
 - Corrupt store. If the store fails its health check it is renamed to `hash-store.sqlite.corrupt-<timestamp>` and rebuilt automatically.
 - Config directory moved. If `XDG_CONFIG_HOME` is set on a non-Windows platform, the config directory (and the anchor state inside it) lives at `$XDG_CONFIG_HOME/pi-hashline-edit-pro` instead of `~/.config/pi-hashline-edit-pro`. An existing store is not migrated automatically. To keep anchor and undo history, move the old `hash-store.sqlite` files (plus `-wal`/`-shm` sidecars) into the new directory before the first run.
+- Windows drives in WSL. Editing a file under a Windows mount (`/mnt/c`, drvfs/9p) can fail with `EPERM` from `fchmod` because those filesystems do not store POSIX modes. Mode preservation is best-effort there, so `replace`, `insert`, and `undo_last_change` still write the edit.
 
 ## Development
 

package/index.ts

@@ -1,6 +1,6 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
 import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES } from "@earendil-works/pi-coding-agent";
-import { initHasher, lineChecksum } from "./src/hashline";
+import { initHasher } from "./src/hashline";
 import { regReplace } from "./src/replace";
 import { regInsert } from "./src/insert";
 import { regGrep } from "./src/grep";
@@ -23,7 +23,7 @@ import {
   adjustDiffContextLines,
   setAutoReadAllIgnoreFromText,
 } from "./src/config";
-import { loadHashStore, persistSnapshot, pruneMissing } from "./src/hash-store";
+import { loadHashStore, pruneMissing } from "./src/hash-store";
 import { initRegistry, gcRegistrySidecars, clearRegistry, freeAnchors, sessionKeyFor, withAnchorSession, releaseRegistrySession } from "./src/anchor-registry";
 import { serveRows } from "./src/served";
 import { finalizeTurn, planAssistantMessage } from "./src/batch";
@@ -216,7 +216,6 @@ export default function (pi: ExtensionAPI): void {
           DEFAULT_MAX_LINES,
         );
         const fileLines = splitLines(normalized);
-        persistSnapshot(await loadHashStore(), absolutePath, normalized, fileHashes, fileLines.map(lineChecksum));
         serveRows(absolutePath, fileHashes, fileLines, preview.servedHashes);
         return {
           content: [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-hashline-edit-pro",
-  "version": "4.4.1",
+  "version": "4.4.3",
   "type": "module",
   "description": "Hash-anchored read/replace/insert/grep tools for pi-coding-agent. Every line gets a unique 4-char tokenizer-friendly anchor that stays stable across edits; stale or ambiguous anchors are rejected, never fuzzy-matched. Undo persists across restarts.",
   "main": "index.ts",

package/src/anchor-registry.ts

@@ -671,7 +671,7 @@ export function alignOwnershipWithSpans(
   prevAnchors: string[],
   prevChecksums: string[],
   newChecksums: string[],
-  spans: { start: number; end: number; replacementCount: number }[],
+  spans: { start: number; end: number; replacementCount: number; carry?: number }[],
   options?: { shadow?: boolean },
 ): Aligned {
   const state = options?.shadow ? shadowStateFrom(current()!) : current()!;
@@ -699,15 +699,24 @@ export function alignOwnershipWithSpans(
       }
     }
     const replacement: (string | undefined)[] = new Array(span.replacementCount);
-    for (let k = 0; k < span.replacementCount; k++) {
-      const positional = k < spanLength ? prevAnchors[prevStart + k] : undefined;
-      if (
-        positional !== undefined &&
-        prevChecksums[prevStart + k] === newChecksums[start + k] &&
-        (!state.owned.has(positional) || state.owned.get(positional)!.path === path)
-      ) {
-        replacement[k] = positional;
-        reused.add(positional);
+    const carryIndex =
+      span.carry !== undefined && span.carry >= 0 && span.carry < span.replacementCount ? span.carry : undefined;
+    const carried = carryIndex === undefined ? undefined : prevAnchors[prevStart];
+    if (carryIndex !== undefined && carried !== undefined && prevChecksums[prevStart] === newChecksums[start + carryIndex]) {
+      replacement[carryIndex] = carried;
+      reused.add(carried);
+    } else {
+      for (let k = 0; k < span.replacementCount; k++) {
+        if (k === carryIndex) continue;
+        const positional = k < spanLength ? prevAnchors[prevStart + k] : undefined;
+        if (
+          positional !== undefined &&
+          prevChecksums[prevStart + k] === newChecksums[start + k] &&
+          (!state.owned.has(positional) || state.owned.get(positional)!.path === path)
+        ) {
+          replacement[k] = positional;
+          reused.add(positional);
+        }
       }
     }
     for (let k = 0; k < span.replacementCount; k++) {
@@ -819,7 +828,7 @@ export async function allocateFileAnchors(
   options?: {
     persist?: boolean;
     shadow?: boolean;
-    previous?: { content: string; hashes: string[]; spans?: { start: number; end: number; replacementCount: number }[] };
+    previous?: { content: string; hashes: string[]; spans?: { start: number; end: number; replacementCount: number; carry?: number }[] };
   },
 ): Promise<string[]> {
   ensureRegistry();

package/src/auto-read-all.ts

@@ -24,7 +24,6 @@ const EXEC_MAX_BYTES = 64 * 1024 * 1024;
 const SCAN_CONCURRENCY = 32;
 const SCAN_LIMIT_MULTIPLIER = 4;
 const MAX_REPORTED_OMISSIONS = 50;
-export const AUTO_READ_ALL_CHUNK_BYTES = 48 * 1024;
 
 const HEADER =
   "[hashline auto-read-all] Every non-ignored project file is attached below as `=== path ===` then `anchor│content` rows with live anchors.\nEdit directly from the attachment with replace and insert; do not call read for files in [files complete: ...].\nFiles listed as omitted or not attached can be read normally.\nAnchors are case-sensitive and stay valid until their line is edited.";
@@ -87,24 +86,17 @@ function isExcludedBySegment(path: string): boolean {
   }
   return false;
 }
+const EXCLUDED_PATTERN_SUFFIXES = [
+  ".min.js", ".min.css", ".min.mjs", "-min.js", "-min.css", ".umd.js", ".map", ".lock",
+  "_pb2.py", ".pb.go", ".g.dart", ".freezed.dart", ".designer.cs", ".g.cs", ".snap",
+];
+const EXCLUDED_PATTERN_INFIXES = [".bundle.", ".chunk.", ".generated.", ".gen."];
+
 function isExcludedByPattern(baseLower: string): boolean {
-  if (baseLower.endsWith(".min.js") || baseLower.endsWith(".min.css") || baseLower.endsWith(".min.mjs")) return true;
-  if (baseLower.endsWith("-min.js") || baseLower.endsWith("-min.css")) return true;
-  if (baseLower.includes(".bundle.") || baseLower.includes(".chunk.")) return true;
-  if (baseLower.endsWith(".umd.js")) return true;
-  if (baseLower.endsWith(".map")) return true;
-  if (baseLower.endsWith(".lock")) return true;
-  if (baseLower.includes(".generated.") || baseLower.includes(".gen.")) return true;
-  if (baseLower.endsWith("_pb2.py")) return true;
-  if (baseLower.endsWith(".pb.go")) return true;
-  if (baseLower.endsWith(".g.dart")) return true;
-  if (baseLower.endsWith(".freezed.dart")) return true;
-  if (baseLower.endsWith(".designer.cs")) return true;
-  if (baseLower.endsWith(".g.cs")) return true;
-  if (baseLower.endsWith(".snap")) return true;
-  if (baseLower.startsWith("coreui-icons.")) return true;
-  if (baseLower === "coreui.css") return true;
-  return false;
+  return EXCLUDED_PATTERN_SUFFIXES.some((suffix) => baseLower.endsWith(suffix))
+    || EXCLUDED_PATTERN_INFIXES.some((infix) => baseLower.includes(infix))
+    || baseLower.startsWith("coreui-icons.")
+    || baseLower === "coreui.css";
 }
 export function normalizeAutoReadAllIgnoreList(entries: readonly string[] | undefined): string[] {
   const seen = new Set<string>();
@@ -203,7 +195,6 @@ export interface AutoReadAllInjection {
   files: number;
   bytes: number;
   omitted: string[];
-  chunks: string[];
   completeFiles: number;
 }
 
@@ -371,24 +362,6 @@ export async function discoverAutoReadAllFiles(cwd: string, mode: AutoReadAllMod
   return { files, source, discovered: unique.length, skippedBinary, skippedLarge, skippedOther, skippedByName };
 }
 
-export function chunkAutoReadAllSections(sections: string[], maxBytes: number = AUTO_READ_ALL_CHUNK_BYTES): string[] {
-  const chunks: string[] = [];
-  let current: string[] = [];
-  let currentBytes = 0;
-  for (const section of sections) {
-    const sectionBytes = Buffer.byteLength(section, "utf-8") + 2;
-    if (current.length > 0 && currentBytes + sectionBytes > maxBytes) {
-      chunks.push(current.join("\n\n"));
-      current = [];
-      currentBytes = 0;
-    }
-    current.push(section);
-    currentBytes += sectionBytes;
-  }
-  if (current.length > 0) chunks.push(current.join("\n\n"));
-  return chunks;
-}
-
 async function candidateFileBytes(cwd: string, file: string): Promise<number | undefined> {
   try {
     const stats = await lstat(resolve(cwd, file));
@@ -462,12 +435,11 @@ export async function buildAutoReadAllInjection(cwd: string, budgetBytes: number
   }
   if (sections.length === 0) return undefined;
   const sectionTexts = sections.map((section) => section.text);
-  const chunks = chunkAutoReadAllSections(sectionTexts);
   const coverage = `[coverage: ${completeFiles} complete]`;
   const completeNames = sections.map((section) => section.file);
   const machineList = `[files complete: ${JSON.stringify(completeNames)} omitted: ${JSON.stringify(omitted)}]`;
   const text = `${HEADER}\n\n${coverage}\n${machineList}\n\n${sectionTexts.join("\n\n")}\n\n${buildFooter(sections.length, discovery, omitted)}`;
-  return { text, files: sections.length, bytes, omitted, chunks, completeFiles };
+  return { text, files: sections.length, bytes, omitted, completeFiles };
 }
 
 export function autoReadAllBudget(model: { contextWindow?: number } | undefined): number {

package/src/batch.ts

@@ -63,6 +63,7 @@ export interface BatchPiece {
   warnings: string[];
   noop: boolean;
   foldedLines: number;
+  carryIndex?: number;
 }
 
 export interface BatchMemberInput {
@@ -495,10 +496,18 @@ export async function executeBatchMember(input: BatchMemberInput): Promise<TResu
   const baseLines = base.baseLines;
   const originalSlice = baseLines.slice(start - 1, end);
   const noop = originalSlice.length === newLines.length && originalSlice.every((line, index) => line === newLines[index]);
+  const foldedLines = input.foldedLines ?? 0;
+  const carryIndex =
+    input.kind === "insert" && foldedLines > 0
+      ? input.direction === "after"
+        ? 0
+        : newLines.length - 1
+      : undefined;
   const piece: BatchPiece = {
     order: input.member.order,
     kind: input.kind,
     ...(input.direction !== undefined ? { direction: input.direction } : {}),
+    ...(carryIndex !== undefined ? { carryIndex } : {}),
     start,
     end,
     fromHash: input.hedit.hash_bounds[0].hash,
@@ -506,7 +515,7 @@ export async function executeBatchMember(input: BatchMemberInput): Promise<TResu
     newLines: [...newLines],
     warnings: [...input.extraWarnings, ...planned.warnings],
     noop,
-    foldedLines: input.foldedLines ?? 0,
+    foldedLines,
   };
   runtime.pieces.push(piece);
   if (input.kind === "replace") runtime.replaceCount += 1;
@@ -571,6 +580,15 @@ function mergeInsertPairs(pieces: BatchPiece[]): BatchPiece[] {
   return merged;
 }
 
+function pieceMappingSpans(pieces: BatchPiece[]): { start: number; end: number; replacementCount: number; carry?: number }[] {
+  return pieces.map((piece) => ({
+    start: piece.start - 1,
+    end: piece.end - 1,
+    replacementCount: piece.newLines.length,
+    ...(piece.carryIndex !== undefined ? { carry: piece.carryIndex } : {}),
+  }));
+}
+
 async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise<TResult> {
   const runtime = batches.get(member.batchKey);
   if (!runtime || !runtime.base || !runtime.paths) throw new Error(`[E_STALE_ANCHOR] Batch ${member.display} is no longer tracked. Call read for fresh anchors.`);
@@ -637,7 +655,7 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
     discardBatchState(runtime);
     throw new Error(`[E_OP_ABORTED] Batch ${runtime.display} aborted: the file changed after the batch started. Call read for fresh anchors and retry.`);
   }
-  const preflightSpans = effectivePieces.map((piece) => ({ start: piece.start - 1, end: piece.end - 1, replacementCount: piece.newLines.length }));
+  const preflightSpans = pieceMappingSpans(effectivePieces);
   try {
     await lineHashes(composed, runtime.target, {
       content: base.content,
@@ -670,7 +688,7 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
     throw error;
   }
   const updatedSnapshotId = await safeSnapId(paths.absolutePath, "post-edit");
-  const spans = effectivePieces.map((piece) => ({ start: piece.start - 1, end: piece.end - 1, replacementCount: piece.newLines.length }));
+  const spans = pieceMappingSpans(effectivePieces);
   let resultHashes: string[];
   try {
     resultHashes = await lineHashes(composed, runtime.target, {

package/src/commit.ts

@@ -12,6 +12,7 @@ import { spanForEdit } from "./replace";
 import { restoreEndings, stripBOM, toLF } from "./normalize";
 export interface CommitMeta {
   editAnchors?: [string, string];
+  anchorCarry?: number;
   path: string;
   absolutePath: string;
   mutationTargetPath: string;
@@ -107,6 +108,7 @@ export async function commitEdit(pipe: PipelineResult, meta: CommitMeta): Promis
   };
 
   const span = meta.editAnchors ? spanForEdit(pipe.originalHashes, meta.editAnchors[0], meta.editAnchors[1], pipe.result) : undefined;
+  if (span && meta.anchorCarry !== undefined) span.carry = meta.anchorCarry;
   let resultHashes: string[];
   try {
     resultHashes = await lineHashes(pipe.result, mutationTargetPath, {

package/src/fs-write.ts

@@ -13,7 +13,7 @@ import {
 } from "node:fs/promises";
 import { dirname, join, parse, resolve, sep } from "node:path";
 import { toCwd } from "./paths";
-import { errCode } from "./utils";
+import { errCode, isModeUnsupported } from "./utils";
 
 export interface FileIdentity {
   dev: number;
@@ -196,7 +196,11 @@ export async function writeAtomic(
     await tempHandle.writeFile(content, "utf-8");
     const mode = existingStats ? existingStats.mode & 0o7777 : restoreMode;
     if (mode !== undefined) {
-      await tempHandle.chmod(mode);
+      try {
+        await tempHandle.chmod(mode);
+      } catch (error) {
+        if (!isModeUnsupported(error)) throw error;
+      }
     }
     await tempHandle.sync();
   } catch (error: unknown) {

package/src/grep.ts

@@ -13,11 +13,13 @@ import { ANCHOR_POOL_EXHAUSTED_PREFIX, MAX_GREP_LINE_BYTES } from "./constants";
 import { toCwd, toDisplayPath } from "./paths";
 import { loadP, loadGuide } from "./prompts";
 import { normReq } from "./payload-contract";
-import { abortIf, errCode, gutterWidth, isRec, makePrepareArguments, rejectUnknownFields, truncateToBytes, visLines } from "./utils";
+import { abortIf, clipLine, errCode, gutterWidth, isRec, makePrepareArguments, rejectUnknownFields, truncateToBytes, visLines } from "./utils";
 import { withAnchorSession } from "./anchor-registry";
 import { serveRows } from "./served";
 import { Text } from "@earendil-works/pi-tui";
 import { expandHint, getResultText, reuseText, type CallT, type FgT } from "./replace-render";
+export const RG_TIMEOUT_MS = 10_000;
+
 const GREP_KS = new Set(["pattern", "path", "glob", "context", "ignoreCase", "literal", "limit"]);
 
 function cmp(a: string, b: string): number {
@@ -54,6 +56,14 @@ export function assertGrepReq(request: unknown): asserts request is GrepReq {
   }
 }
 
+function compileGrepGlob(glob: string): RegExp {
+  try {
+    return globToRegex(glob);
+  } catch {
+    throw new Error(`[E_BAD_SHAPE] Invalid glob pattern: ${glob}. Fix the bracket or brace syntax, or search without glob.`);
+  }
+}
+
 function buildRegex(pattern: string, literal: boolean, ignoreCase: boolean): RegExp {
   if (!literal) assertSafeRegex(pattern);
   const source = literal ? pattern.replace(/[.*+?^${}()|[\]\\]/g, "\\$&") : pattern;
@@ -314,8 +324,8 @@ async function collectRgMatches(
     const rgTimeout = setTimeout(() => {
       timedOut = true;
       if (!child.killed) child.kill("SIGKILL");
-      reject(new Error("rg timeout"));
-    }, 10000);
+      reject(new Error(`[E_GREP_TIMEOUT] ripgrep timed out after ${RG_TIMEOUT_MS}ms. Narrow the path or pattern and retry.`));
+    }, RG_TIMEOUT_MS);
     child.stderr?.on("data", (chunk) => {
       stderr += chunk.toString();
     });
@@ -355,7 +365,8 @@ async function collectRgMatches(
     child.on("error", (error) => {
       cleanup();
       if (rgPath === cachedRgPath) cachedRgPath = undefined;
-      reject(error);
+      const detail = error instanceof Error ? error.message : String(error);
+      reject(new Error(`[E_GREP_FAILED] ripgrep could not start: ${clipLine(detail)}`));
     });
     child.on("close", (code) => {
       cleanup();
@@ -365,8 +376,10 @@ async function collectRgMatches(
         return;
       }
       if (code !== 0 && code !== 1) {
-        const msg = stderr.trim() || `ripgrep exited with code ${code}`;
-        reject(new Error(msg));
+        const detail = clipLine(stderr.trim(), 300);
+        reject(new Error(detail
+          ? `[E_GREP_FAILED] ripgrep exited with code ${code}: ${detail}`
+          : `[E_GREP_FAILED] ripgrep exited with code ${code}.`));
         return;
       }
       resolve(result);
@@ -538,7 +551,7 @@ export function regGrep(pi: ExtensionAPI): void {
           throw new Error(`[E_ACCESS] Cannot access path: ${req.path ?? ctx.cwd}`);
         }
         const globRoot = baseStat.isFile() ? dirname(base) : base;
-        const globRegex = req.glob === undefined ? undefined : globToRegex(req.glob);
+        const globRegex = req.glob === undefined ? undefined : compileGrepGlob(req.glob);
         const matchesGlob = (absPath: string): boolean => {
           if (globRegex === undefined) return true;
           const displayPath = toDisplayPath(ctx.cwd, absPath);

package/src/hash-store.ts

@@ -2,7 +2,7 @@ import { randomUUID } from "node:crypto";
 import { existsSync } from "node:fs";
 import { chmod, readFile, rename, mkdir, stat } from "node:fs/promises";
 import { hashStorePath, hashStoreDir, legacyHashStorePath } from "./paths";
-import { errCode, isRec, splitLines } from "./utils";
+import { errCode, isModeUnsupported, isRec, splitLines } from "./utils";
 import { initHasher, contentChecksum, lineChecksum } from "./hashline/hasher";
 import { HASH_STORE_VERSION, HASH_STORE_BUSY_TIMEOUT } from "./constants";
 import {
@@ -278,7 +278,11 @@ async function openStore(storePath: string): Promise<HashStore> {
   await initHasher();
   await mkdir(hashStoreDir(), { recursive: true, mode: 0o700 });
   if (process.platform !== "win32") {
-    await chmod(hashStoreDir(), 0o700);
+    try {
+      await chmod(hashStoreDir(), 0o700);
+    } catch (error) {
+      if (errCode(error) !== "ENOENT" && !isModeUnsupported(error)) throw error;
+    }
   }
 
   let existed = existsSync(storePath);
@@ -319,7 +323,7 @@ async function openStore(storePath: string): Promise<HashStore> {
       try {
         await chmod(candidate, 0o600);
       } catch (error) {
-        if (errCode(error) !== "ENOENT") throw error;
+        if (errCode(error) !== "ENOENT" && !isModeUnsupported(error)) throw error;
       }
     }
   }
@@ -529,6 +533,7 @@ export function getAllocatedState(store: HashStore, path: string, deleteCorrupt
       checksums = undefined;
     }
   }
+  if (checksums !== undefined && checksums.length !== parsedAnchors.length) return undefined;
   return { anchors: parsedAnchors, checksums, contentChecksum: row.checksum };
 }
 
@@ -550,8 +555,13 @@ export function getUndoEntry(store: HashStore, path: string): UndoRecord | undef
   if (!row) return undefined;
   const parsed = parseStoredHashes(row, () => store.stmts.undoDelete(path));
   if (!parsed) return undefined;
+  const content = row.content as string;
+  if (splitLines(content).length !== parsed.length) {
+    store.stmts.undoDelete(path);
+    return undefined;
+  }
   return {
-    content: row.content as string,
+    content,
     bom: row.bom as string,
     ending: row.ending as string,
     hashes: parsed,

package/src/hashline/hash.ts

@@ -101,7 +101,7 @@ export function _lineHashesPure(content: string): string[] {
 export async function lineHashes(
   content: string,
   path?: string,
-  previous?: { content: string; hashes: string[]; spans?: { start: number; end: number; replacementCount: number }[] },
+  previous?: { content: string; hashes: string[]; spans?: { start: number; end: number; replacementCount: number; carry?: number }[] },
   store?: HashStore,
   persist?: boolean,
   shadow?: boolean,

package/src/hashline/parse.ts

@@ -38,7 +38,7 @@ function diagRef(ref: string): string {
 	return `[E_BAD_REF] Invalid anchor "${trimmed}". Expected a 4-character anchor (letters only, e.g. "Hasu").`;
 }
 
-function parseRef(ref: string): Anchor {
+export function parseHashRef(ref: string): Anchor {
 	const trimmed = ref.trim();
 
 	if (
@@ -51,8 +51,6 @@ function parseRef(ref: string): Anchor {
 	throw new Error(diagRef(ref));
 }
 
-export const parseHashRef = parseRef;
-
 const JSON_ENVELOPE_RE = /^\s*\["(.*)"\]\.\s*$/;
 
 function unwrapJsonEnvelope(line: string): string {

package/src/insert.ts

@@ -241,6 +241,10 @@ export function buildInsertToolDef(flags: EditToolFlags = DEFAULT_EDIT_FLAGS): I
             path: pipe.path,
             absolutePath,
             mutationTargetPath,
+            editAnchors: [editParams.remove_from, editParams.remove_to],
+            ...(anchorLine === undefined
+              ? {}
+              : { anchorCarry: req.direction === "after" ? 0 : editParams.replacement_lines.length - 1 }),
             signal,
             verb: "inserted",
             noopNoun: "Insertion",

package/src/replace-diff.ts

@@ -23,6 +23,7 @@ export interface DiffSpan {
   start: number;
   end: number;
   replacementCount: number;
+  carry?: number;
 }
 
 interface PlacedSpan {
@@ -37,10 +38,7 @@ function fmtDiffLine(
   line: string,
   hash: string | undefined,
 ): string {
-  if (hash === undefined) {
-    return `${prefix}${" ".repeat(ANCHOR_LEN)}${HASH_SEP}${line}`;
-  }
-  return `${prefix}${hash}${HASH_SEP}${line}`;
+  return `${prefix}${hash ?? " ".repeat(ANCHOR_LEN)}${HASH_SEP}${line}`;
 }
 
 function isBlankLine(line: string): boolean {

package/src/utils.ts

@@ -99,28 +99,9 @@ export function errCode(error: unknown): string | undefined {
 	return undefined;
 }
 
-export function lastNonEmptyIndex(lines: string[]): number {
-	for (let i = lines.length - 1; i >= 0; i--) {
-		if (lines[i]!.length > 0) return i;
-	}
-	return -1;
-}
-
-export function firstNonEmptyIndex(lines: string[]): number {
-	for (let i = 0; i < lines.length; i++) {
-		if (lines[i]!.length > 0) return i;
-	}
-	return -1;
-}
-
-export function lastNonEmpty(lines: string[]): string | undefined {
-	const idx = lastNonEmptyIndex(lines);
-	return idx >= 0 ? lines[idx] : undefined;
-}
-
-export function firstNonEmpty(lines: string[]): string | undefined {
-	const idx = firstNonEmptyIndex(lines);
-	return idx >= 0 ? lines[idx] : undefined;
+export function isModeUnsupported(error: unknown): boolean {
+	const code = errCode(error);
+	return code === "EPERM" || code === "ENOTSUP" || code === "EOPNOTSUPP" || code === "EINVAL" || code === "ENOSYS";
 }
 
 export function truncateToBytes(s: string, maxBytes: number): string {