pi-hashline-edit-pro 6.3.1 → 6.4.1

package/src/edit-fidelity.ts

@@ -218,15 +218,22 @@ function sameCallHead(payloadLine: string, referenceLine: string): boolean {
   return left !== undefined && left === right;
 }
 
-function indentMismatchHint(payloadLine: string, reference: ReferenceRow, anchor: string | undefined): string | undefined {
+function indentMismatchHint(
+  payloadLine: string,
+  reference: ReferenceRow,
+  newAnchor: string | undefined,
+  referenceAnchor: string | undefined,
+): string | undefined {
   const payloadIndent = leadingWhitespace(payloadLine);
   const referenceIndent = leadingWhitespace(reference.line);
   if (payloadIndent.length >= referenceIndent.length || !referenceIndent.startsWith(payloadIndent)) return undefined;
   const grams = gramSet([payloadLine], INDENT_SIMILARITY_RUN);
   const sharesLongRun = grams !== undefined && sharesRun(reference.line, grams, INDENT_SIMILARITY_RUN);
   if (!sharesLongRun && !sameCallHead(payloadLine, reference.line)) return undefined;
-  const label = anchor === undefined ? "the nearby line" : `${anchor}${HASH_SEP}`;
-  return `[H_INDENT_MISMATCH] new line has ${plural(payloadIndent.length, "leading whitespace character")}; ${label} has ${referenceIndent.length}.`;
+  const count = plural(payloadIndent.length, "leading whitespace character");
+  const referenceLabel = referenceAnchor === undefined ? "the nearby line" : `neighboring line ${referenceAnchor}${HASH_SEP}`;
+  const newLabel = newAnchor === undefined ? "new line" : `new line ${newAnchor}${HASH_SEP}`;
+  return `[H_INDENT_MISMATCH] ${newLabel} has ${count}; ${referenceLabel} has ${referenceIndent.length}.`;
 }
 
 function referenceRows(lines: string[], start: number, end: number): ReferenceRow[] {
@@ -373,11 +380,12 @@ export function fidelityHints(
   resultContent: string,
   spans: readonly DiffSpan[] | undefined,
   originalHashes?: readonly string[],
-  options?: { separatorMoved?: boolean; indentHints?: boolean },
+  options?: { separatorMoved?: boolean; indentHints?: boolean; resultHashes?: readonly string[] },
 ): string[] {
   if (spans === undefined || spans.length === 0) return [];
   const oldLines = splitLines(originalContent);
   const newLines = splitLines(resultContent);
+  const resultHashes = options?.resultHashes;
   const hints: string[] = [];
   const seen = new Set<string>();
   let sensitiveIndex: Map<string, IndexedLine[]> | undefined;
@@ -460,7 +468,7 @@ export function fidelityHints(
           let nearestDistance = Number.POSITIVE_INFINITY;
           for (const candidate of references) {
             if (candidate.index < span.start - INDENT_REFERENCE_WINDOW || candidate.index > span.end + INDENT_REFERENCE_WINDOW) continue;
-            if (indentMismatchHint(payload[payloadIndex]!, candidate, undefined) === undefined) continue;
+            if (indentMismatchHint(payload[payloadIndex]!, candidate, undefined, undefined) === undefined) continue;
             const distance = Math.abs(candidate.index - span.start);
             if (distance < nearestDistance) {
               nearest = candidate;
@@ -474,12 +482,14 @@ export function fidelityHints(
         }
         return undefined;
       };
+      const resultIndexForPayload = (payloadIndex: number): number =>
+        span.start + offset + (carried !== undefined && payloadIndex >= carried ? payloadIndex + 1 : payloadIndex);
       for (let index = 0; index < payload.length; index += 1) {
         if (hints.length >= MAX_FIDELITY_HINTS) break;
         const payloadLine = payload[index]!;
         const reference = indentReferenceFor(index);
         if (reference === undefined) continue;
-        const indentHint = indentMismatchHint(payloadLine, reference, originalHashes?.[reference.index]);
+        const indentHint = indentMismatchHint(payloadLine, reference, resultHashes?.[resultIndexForPayload(index)], originalHashes?.[reference.index]);
         if (indentHint === undefined) continue;
         const key = `indent:${reference.index}:${payloadLine}`;
         if (seen.has(key)) continue;

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, isModeUnsupported } from "./utils";
+import { errCode, isModeUnsupported, mapIoError } from "./utils";
 
 export interface FileIdentity {
   dev: number;
@@ -138,7 +138,7 @@ export async function resolveInCwd(path: string, cwd: string): Promise<{ absolut
   const resolved = await resolveTarget(absolute);
   return { absolute, resolved };
 }
-export async function writeAtomic(
+async function writeAtomicRaw(
   path: string,
   content: string,
   expectedIdentity?: FileIdentity,
@@ -223,3 +223,15 @@ export async function writeAtomic(
     throw error;
   }
 }
+export async function writeAtomic(
+  path: string,
+  content: string,
+  expectedIdentity?: FileIdentity,
+  restoreMode?: number,
+): Promise<void> {
+  try {
+    await writeAtomicRaw(path, content, expectedIdentity, restoreMode);
+  } catch (error) {
+    throw mapIoError(error, "write", path);
+  }
+}

package/src/grep.ts

@@ -1,5 +1,5 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { formatSize, DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, type TruncationResult } from "@earendil-works/pi-coding-agent";
+import { formatSize, DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, createGrepToolDefinition, type TruncationResult } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { stat } from "node:fs/promises";
 import { dirname, isAbsolute, join, win32 } from "node:path";
@@ -11,10 +11,10 @@ import { globToRegex } from "./glob";
 import { MAX_HASH_LINES, fmtRow, HASH_LEN, HASH_SEP, HASH_CLASS } from "./hashline";
 import { ANCHOR_POOL_EXHAUSTED_PREFIX, MAX_GREP_LINE_BYTES } from "./constants";
 import { toCwd, toDisplayPath } from "./paths";
-import { loadP, loadGuide } from "./prompts";
+import { loadP, loadGuidelines } from "./prompts";
 import { normReq } from "./payload-contract";
 import { DEFAULT_EDIT_FLAGS, withGrepPrompts, type EditToolFlags } from "./edit-common";
-import { abortIf, clipLine, errCode, isRec, makePrepareArguments, rejectUnknownFields, truncateToBytes, visLines, withLineNumbers } from "./utils";
+import { abortIf, clipLine, errCode, isRec, makePrepareArguments, rejectUnknownFields, truncateToBytes, visLines, gutterWidth } from "./utils";
 import { withAnchorSession, formatAnchorReclaimNotice, takeReclaimedPaths } from "./anchor-registry";
 import { serveRows } from "./served";
 import { Text } from "@earendil-works/pi-tui";
@@ -351,7 +351,12 @@ async function collectRgMatches(
 
 
 function displayRowsForHit(hit: FileHit): string[] {
-  return withLineNumbers(hit.rows.join("\n"), hit.lineNumbers).split("\n").slice(0, hit.rows.length);
+  const matched = new Set(hit.matchLines);
+  const width = gutterWidth(hit.lineNumbers.reduce((m, n) => (n > m ? n : m), 0), hit.lineNumbers.length);
+  return hit.rows.map((row, index) => {
+    const lineNumber = hit.lineNumbers[index]!;
+    return `${String(lineNumber).padStart(width)}${matched.has(lineNumber) ? ":" : "-"}${HASH_SEP} ${row}`;
+  });
 }
 
 const grepToolSchema = Type.Object(
@@ -408,7 +413,7 @@ export function fmtGrepCall(args: { pattern?: unknown; path?: unknown; glob?: un
   if (args?.ignoreCase === true) qualifiers.push("case-insensitive");
   if (typeof args?.context === "number") qualifiers.push(`context ${args.context}`);
   if (typeof args?.limit === "number") qualifiers.push(`limit ${args.limit}`);
-  let text = `${theme.fg("toolTitle", theme.bold("anchor_grep"))} ${pattern}`;
+  let text = `${theme.fg("toolTitle", theme.bold("grep"))} ${pattern}`;
   if (qualifiers.length > 0) text += ` ${theme.fg("dim", qualifiers.join(" "))}`;
   return text;
 }
@@ -436,6 +441,7 @@ function highlightMatches(text: string, regex: RegExp, theme: FgT): string {
 }
 
 const ANCHORED_ROW_RE = new RegExp(`^${HASH_CLASS}${HASH_SEP}`);
+const GREP_GUTTER_RE = /^\s*\d+(?: │ |[:-]│ )/;
 
 function highlightHitRow(row: string, highlight: RegExp, theme: FgT): string {
   const anchored = row.match(ANCHORED_ROW_RE);
@@ -447,9 +453,9 @@ function styleGrepLine(line: string, highlight: RegExp | undefined, theme: FgT):
   if (line.startsWith("=== ")) return theme.fg("accent", line);
   if (line.startsWith("[grep:") || line.startsWith("... ")) return theme.fg("dim", line);
   if (!highlight) return line;
-  const gutter = line.indexOf(" │ ");
-  if (gutter < 0) return highlightHitRow(line, highlight, theme);
-  const cut = gutter + " │ ".length;
+  const gutter = GREP_GUTTER_RE.exec(line);
+  if (gutter === null) return highlightHitRow(line, highlight, theme);
+  const cut = gutter[0].length;
   return line.slice(0, cut) + highlightHitRow(line.slice(cut), highlight, theme);
 }
 
@@ -471,11 +477,11 @@ export function regGrep(pi: ExtensionAPI, flags: EditToolFlags = DEFAULT_EDIT_FL
   const prompted = withGrepPrompts({
     description: loadP("../tool-prompts/grep.md"),
     snippet: loadP("../tool-prompts/grep-snippet.md"),
-    guidelines: loadGuide("../tool-prompts/grep-guidelines.md"),
+    guidelines: loadGuidelines("../tool-prompts/grep-guidelines.md"),
   }, flags);
   pi.registerTool({
-    name: "anchor_grep",
-    label: "Anchor Grep",
+    name: "grep",
+    label: "Grep",
     description: prompted.description,
     promptSnippet: prompted.snippet,
     promptGuidelines: prompted.guidelines,
@@ -627,6 +633,7 @@ export function regGrep(pi: ExtensionAPI, flags: EditToolFlags = DEFAULT_EDIT_FL
         if (limitTruncated) notes.push(`[grep: showing first ${limit} matches; increase limit to see more.]`);
         if (linesReplaced > 0) notes.push(`[grep: ${linesReplaced} line(s) exceed ${formatSize(MAX_GREP_LINE_BYTES)} and are shown as truncated fragments; use read to see the full lines.]`);
         if (poolSkipped > 0) notes.push(`[grep: ${poolSkipped} file(s) skipped because the session's anchor pool is exhausted; narrow the search.]`);
+        if (context > 0 && hits.length > 0) notes.push('[grep: match rows are "line:│", context rows are "line-│".]');
         const truncated = limitTruncated || rowTruncated;
         const truncation: TruncationResult | undefined = rowTruncated
           ? {
@@ -679,3 +686,7 @@ export function regGrep(pi: ExtensionAPI, flags: EditToolFlags = DEFAULT_EDIT_FL
     },
   });
 }
+
+export function regVanillaGrep(pi: ExtensionAPI, cwd: string): void {
+  pi.registerTool(createGrepToolDefinition(cwd));
+}

package/src/insert.ts

@@ -6,10 +6,11 @@ import { commitEdit } from "./commit";
 import { batchMemberFor, executeBatchMember, noteBatchFailure, registerBatchPlanner, type BatchMemberPlan, type BatchPlannerInput } from "./batch";
 import { readNormFile, type NormFile } from "./file-reader";
 import { MAX_HASH_LINES, parseHashRef, parsePayloadText, planEdit, preserveDeletionSeparators, resEdit, resolveAnchorLine, type Anchor, type HTEdit, type StripWarningLocation } from "./hashline";
+import { TEXT_ENDING_NOTE } from "./constants";
 import type { LineEnding } from "./normalize";
 import { stripAnchorRow } from "./hashline/resolve";
 import { withAnchorSession } from "./anchor-registry";
-import { loadP, loadGuide } from "./prompts";
+import { loadP, loadGuidelines } from "./prompts";
 import { assertInsertReq, normReq, type InsertReq } from "./payload-contract";
 import { isRec, literalEscapeHints, splitLines } from "./utils";
 import { queuedEdit, editToolBase, editRenderCallWrapper, editRenderResultWrapper, resolveEditTargetWithRequirement, throwIfStrictInput, withInsertPrompts, DEFAULT_EDIT_FLAGS, type EditToolFlags } from "./edit-common";
@@ -19,7 +20,7 @@ export { assertInsertReq, type InsertReq };
 
 const insertAnchorSchema = Type.String({
   description:
-    "4-char anchor of the line to insert next to (never the row content).",
+    "4-char anchor of the line to insert next to.",
 });
 
 const insertDirectionSchema = Type.Union(
@@ -28,7 +29,7 @@ const insertDirectionSchema = Type.Union(
 );
 const insertTextSchema = Type.String({
   description:
-    'The exact text to insert; an empty string inserts one blank line. A trailing line break sets the newline of the last line written instead of adding a blank line; a lone newline writes one blank line. Never include the anchor line.',
+    `The exact text to insert; an empty string inserts one blank line. ${TEXT_ENDING_NOTE} Never include the anchor line.`,
 });
 
 const insertPathRequiredSchema = Type.String({
@@ -192,7 +193,7 @@ export function buildInsertToolDef(flags: EditToolFlags = DEFAULT_EDIT_FLAGS): I
   const prompted = withInsertPrompts({
     description: loadP("../tool-prompts/insert.md"),
     snippet: loadP("../tool-prompts/insert-snippet.md"),
-    guidelines: loadGuide("../tool-prompts/insert-guidelines.md"),
+    guidelines: loadGuidelines("../tool-prompts/insert-guidelines.md"),
   }, flags);
   return {
     name: "insert",

package/src/line-endings.ts

@@ -35,9 +35,13 @@ export function splitSeparators(raw: string): LineEnding[] {
 export function joinSeparators(content: string, separators: readonly LineEnding[]): string {
 	let out = "";
 	let separatorIndex = 0;
-	for (const char of content) {
+	for (let index = 0; index < content.length; index += 1) {
+		const char = content[index]!;
 		if (char === "\n") {
-			out += separators[separatorIndex] ?? "\n";
+			const separator = separators[separatorIndex] ?? "\n";
+			const emptyLineBefore = content[index - 1] === "\n";
+			const followsLoneCr = separator === "\n" && separators[separatorIndex - 1] === "\r" && emptyLineBefore;
+			out += followsLoneCr ? "\r\n" : separator;
 			separatorIndex += 1;
 		} else {
 			out += char;

package/src/model-gate.ts

@@ -11,7 +11,7 @@ export const ANCHOR_TOOL_NAMES: readonly string[] = [
   "insert",
   "copy",
   "move",
-  "anchor_grep",
+  "grep",
   "undo_last_change",
 ];
 

package/src/payload-contract.ts

@@ -1,15 +1,15 @@
 import { Type } from "typebox";
 import { isRec, normalizeRequest, rejectUnknownFields, assertNoNul } from "./utils";
-import { TEXT_NOT_STRING_MSG, NEW_CONTENT_NOT_STRING_MSG } from "./constants";
+import { TEXT_ENDING_NOTE, TEXT_NOT_STRING_MSG, NEW_CONTENT_NOT_STRING_MSG } from "./constants";
 
 const textSchema = Type.String({
   description:
-    'The exact text to write in place of the removed range. "" deletes the range. A trailing line break sets the newline of the last line written instead of adding a blank line; a lone newline writes one blank line.',
+    `The exact text to write in place of the removed range. "" deletes the range. ${TEXT_ENDING_NOTE}`,
 });
 
 const removeFromSchema = Type.String({
   description:
-    "4-char anchor of the FIRST line to remove (never the row content).",
+    "4-char anchor of the FIRST line to remove.",
 });
 
 const removeToSchema = Type.String({
@@ -134,13 +134,14 @@ export function assertInsertReq(request: unknown): asserts request is InsertReq
   assertNoNul([request.text]);
 }
 
-const TRANSFER_KEYS = new Set(["path", "source_from", "source_to", "insert_after"]);
+const TRANSFER_KEYS = new Set(["path", "source_from", "source_to", "anchor", "direction"]);
 
 export interface TransferReq {
   path?: string;
   source_from: string;
   source_to: string;
-  insert_after: string;
+  anchor: string;
+  direction: "before" | "after";
 }
 
 export function assertTransferReq(request: unknown): asserts request is TransferReq {
@@ -157,8 +158,11 @@ export function assertTransferReq(request: unknown): asserts request is Transfer
   if (typeof request.source_to !== "string" || request.source_to.length === 0) {
     throw new Error('[E_BAD_SHAPE] Copy/move request requires a "source_to" string (4-char anchor from read output).');
   }
-  if (typeof request.insert_after !== "string" || request.insert_after.length === 0) {
-    throw new Error('[E_BAD_SHAPE] Copy/move request requires an "insert_after" string (4-char anchor from read output).');
+  if (typeof request.anchor !== "string" || request.anchor.length === 0) {
+    throw new Error('[E_BAD_SHAPE] Copy/move request requires an "anchor" string (4-char anchor from read output).');
+  }
+  if (request.direction !== "before" && request.direction !== "after") {
+    throw new Error('[E_BAD_SHAPE] Copy/move request "direction" must be "before" or "after" (the anchor is the destination line).');
   }
 }
 
@@ -222,7 +226,7 @@ export function getReplaceMatchInput(args: unknown): { path?: string; replace_fr
 
 const replaceMatchFromSchema = Type.String({
   description:
-    "4-char anchor of the FIRST line of the range searched (never the row content).",
+    "4-char anchor of the FIRST line of the range searched.",
 });
 const replaceMatchToSchema = Type.String({
   description:
@@ -234,7 +238,7 @@ const replaceMatchOldStringSchema = Type.String({
 });
 const replaceMatchNewStringSchema = Type.String({
   description:
-    'The exact replacement for every matched occurrence. "" deletes the matches. A trailing line break sets the newline of the last line written instead of adding a blank line; a lone newline writes one blank line; the rest of the range is kept byte-for-byte.',
+    `The exact replacement for every matched occurrence. "" deletes the matches. ${TEXT_ENDING_NOTE} The rest of the range is kept byte-for-byte.`,
 });
 const replaceMatchPathRequiredSchema = Type.String({
   description:

package/src/pre-edit-snapshot.ts

@@ -0,0 +1,19 @@
+import type { NormFile } from "./file-reader";
+
+export interface PreEditSnapshot extends NormFile {
+  served?: ReadonlyMap<string, string>;
+}
+
+const snapshots = new Map<string, PreEditSnapshot>();
+
+export function recordPreEditSnapshot(snapshot: PreEditSnapshot): void {
+  snapshots.set(snapshot.absolutePath, snapshot);
+}
+
+export function preEditSnapshotFor(path: string): PreEditSnapshot | undefined {
+  return snapshots.get(path);
+}
+
+export function clearPreEditSnapshots(): void {
+  snapshots.clear();
+}

package/src/prompts.ts

@@ -1,6 +1,23 @@
 import { readFileSync } from "node:fs";
 import { errCode } from "./utils";
 
+export interface Guideline {
+  id: string;
+  text: string;
+}
+
+const GUIDELINE_IDS_BY_NAME: Record<string, readonly string[]> = {
+  "read-guidelines.md": ["read-reread", "read-outline", "read-match-served"],
+  "replace-guidelines.md": ["replace-disjoint", "replace-deletion", "replace-single-line"],
+  "replace-match-guidelines.md": ["replace-match-fragment", "replace-match-wide-range"],
+  "insert-guidelines.md": ["insert-blank-edges"],
+  "copy-guidelines.md": ["copy-single-anchor"],
+  "move-guidelines.md": ["move-same-place"],
+  "transfer-guidelines.md": ["transfer-boundary-serving", "transfer-same-file", "transfer-cross-file", "transfer-batch-move"],
+  "grep-guidelines.md": ["grep-literal", "grep-row-markers"],
+  "undo-last-change-guidelines.md": ["undo-single-level", "undo-write-clears", "undo-cross-file-move"],
+};
+
 export function loadP(relativePath: string): string {
   return readFileSync(new URL(relativePath, import.meta.url), "utf-8").trim();
 }
@@ -22,3 +39,18 @@ export function loadGuide(relativePath: string): string[] {
     .filter((line) => line.startsWith("- "))
     .map((line) => line.slice(2));
 }
+
+export function loadGuidelines(relativePath: string): Guideline[] {
+  const name = relativePath.slice(relativePath.lastIndexOf("/") + 1);
+  const ids = GUIDELINE_IDS_BY_NAME[name];
+  if (ids === undefined) throw new Error(`[E_REGISTRY] No guideline ids are registered for ${relativePath}.`);
+  const texts = loadGuide(relativePath);
+  if (texts.length === 0) return [];
+  if (texts.length !== ids.length) {
+    console.warn(`hashline: ${relativePath} holds ${texts.length} guideline(s) but declares ${ids.length}; gating may be wrong`);
+  }
+  return ids.flatMap((id, index) => {
+    const text = texts[index];
+    return text === undefined ? [] : [{ id, text }];
+  });
+}

package/src/read.ts

@@ -16,7 +16,7 @@ import { readNormFile, safeSnapId } from "./file-reader";
 import { lineHashes, fmtRegion, fmtRow, HASH_SEP, MAX_HASH_LINES, parseHashRef, resolveAnchorLine, AnchorMismatchError } from "./hashline";
 import { toCwd } from "./paths";
 import { abortIf, isRec, makePrepareArguments, numberedRead, visLines, splitLines } from "./utils";
-import { loadP, loadGuide } from "./prompts";
+import { loadP, loadGuidelines, type Guideline } from "./prompts";
 import { withReadPrompts, DEFAULT_EDIT_FLAGS, type EditToolFlags } from "./edit-common";
 import { valAccess } from "./validation";
 import { withAnchorSession, adoptAnchors, ownerOf, ownersDifferingOnlyByCase, formatAnchorReclaimNotice, takeReclaimedPaths } from "./anchor-registry";
@@ -26,8 +26,8 @@ import { Text } from "@earendil-works/pi-tui";
 import { anchoredLine, readResultSchema, withStructuredErrors, type AnchoredLine, type ReadResult } from "./structured";
 const R_DESC = loadP("../tool-prompts/read.md");
 const R_SNIPPET = loadP("../tool-prompts/read-snippet.md");
-function readGuide(): string[] {
-  return loadGuide("../tool-prompts/read-guidelines.md");
+function readGuide(): Guideline[] {
+  return loadGuidelines("../tool-prompts/read-guidelines.md");
 }
 function normPosInt(
 	value: number | undefined,
@@ -300,13 +300,8 @@ export function regRead(pi: ExtensionAPI, flags: EditToolFlags = DEFAULT_EDIT_FL
 			}),
 			offset: Type.Optional(
 				Type.Union([
-					Type.Integer({
-						minimum: 1,
-						description: "Line number to start reading from (1-indexed)",
-					}),
-					Type.String({
-						description: "4-char anchor of a served line to start reading from",
-					}),
+					Type.Integer({ minimum: 1 }),
+					Type.String(),
 				], { description: "Line number (1-indexed) or a served anchor to start reading from" }),
 			),
 			limit: Type.Optional(

package/src/replace-diff.ts

@@ -163,6 +163,8 @@ function trimPlacedSpans(
   placed: PlacedSpan[],
   oldLines: string[],
   newLines: string[],
+  oldHashes: string[],
+  newHashes: string[],
 ): PlacedSpan[] {
   const out: PlacedSpan[] = [];
   for (const span of placed) {
@@ -170,11 +172,11 @@ function trimPlacedSpans(
     let oldEnd = span.oldEnd;
     let newStart = span.newStart;
     let newEnd = span.newEnd;
-    while (oldStart <= oldEnd && newStart <= newEnd && oldLines[oldStart] === newLines[newStart]) {
+    while (oldStart <= oldEnd && newStart <= newEnd && oldLines[oldStart] === newLines[newStart] && oldHashes[oldStart] === newHashes[newStart]) {
       oldStart += 1;
       newStart += 1;
     }
-    while (oldStart <= oldEnd && newStart <= newEnd && oldLines[oldEnd] === newLines[newEnd]) {
+    while (oldStart <= oldEnd && newStart <= newEnd && oldLines[oldEnd] === newLines[newEnd] && oldHashes[oldEnd] === newHashes[newEnd]) {
       oldEnd -= 1;
       newEnd -= 1;
     }
@@ -251,7 +253,7 @@ function genSpanDiff(
   if (oldHashes.length !== oldLines.length || newHashes.length !== newLines.length) return undefined;
   const placed = placeSpans(oldLines.length, newLines.length, spans);
   if (!placed) return undefined;
-  const trimmed = trimPlacedSpans(placed, oldLines, newLines);
+  const trimmed = trimPlacedSpans(placed, oldLines, newLines, oldHashes, newHashes);
   const ordered = [...trimmed].sort((a, b) => a.oldStart - b.oldStart || a.newStart - b.newStart);
   let oldPos = 0;
   let newPos = 0;

package/src/replace-match.ts

@@ -6,7 +6,7 @@ import { readNormFile, type NormFile } from "./file-reader";
 import { fmtRegion, MAX_HASH_LINES, parseHashRef, planEdit, preserveDeletionSeparators, resEdit, resolveAnchorLine, stripAnchorRow, type Anchor } from "./hashline";
 import { servedForPath, withAnchorSession } from "./anchor-registry";
 import { batchMemberFor, executeBatchMember, noteBatchFailure, registerBatchPlanner, type BatchMemberPlan, type BatchPlannerInput } from "./batch";
-import { loadP, loadGuide } from "./prompts";
+import { loadP, loadGuidelines } from "./prompts";
 import {
   assertReplaceMatchReq,
   buildReplaceMatchToolSchema,
@@ -177,7 +177,7 @@ export function buildReplaceMatchToolDef(flags: EditToolFlags = DEFAULT_EDIT_FLA
   const prompted = withReplaceMatchPrompts({
     description: loadP("../tool-prompts/replace-match.md"),
     snippet: loadP("../tool-prompts/replace-match-snippet.md"),
-    guidelines: loadGuide("../tool-prompts/replace-match-guidelines.md"),
+    guidelines: loadGuidelines("../tool-prompts/replace-match-guidelines.md"),
   }, flags);
   return {
     name: "replace_match",

package/src/replace-render.ts

@@ -81,7 +81,7 @@ export function highlightBatchRefs(text: string, theme: FgT): string {
 }
 
 export function fmtCall(
-  args: { path?: string; remove_from?: string; remove_to?: string; anchor?: string; source_from?: string; source_to?: string; insert_after?: string; replace_from?: string; replace_to?: string } | undefined,
+  args: { path?: string; remove_from?: string; remove_to?: string; anchor?: string; source_from?: string; source_to?: string; direction?: string; replace_from?: string; replace_to?: string } | undefined,
   state: RRState,
   expanded: boolean,
   theme: CallT,
@@ -89,7 +89,7 @@ export function fmtCall(
 ): string {
   const previewPath = state.preview && "path" in state.preview ? state.preview.path : undefined;
   const path = args?.path ?? state.resolvedPath ?? previewPath;
-  const anchorFallback = typeof args?.remove_from === "string" && typeof args?.remove_to === "string" ? `${args.remove_from}→${args.remove_to}` : typeof args?.anchor === "string" ? args.anchor : typeof args?.source_from === "string" && typeof args?.insert_after === "string" ? `${args.source_from}→${args.insert_after}` : typeof args?.replace_from === "string" && typeof args?.replace_to === "string" ? `${args.replace_from}→${args.replace_to}` : undefined;
+  const anchorFallback = typeof args?.remove_from === "string" && typeof args?.remove_to === "string" ? `${args.remove_from}→${args.remove_to}` : typeof args?.source_from === "string" && typeof args?.anchor === "string" ? `${args.source_from}→${args.anchor}` : typeof args?.anchor === "string" ? args.anchor : typeof args?.replace_from === "string" && typeof args?.replace_to === "string" ? `${args.replace_from}→${args.replace_to}` : undefined;
   const pathDisplay =
     typeof path === "string" && path.length > 0
       ? theme.fg("accent", path)
@@ -272,9 +272,9 @@ export function reuseMarkdown(context: any, content: string, theme: any): Markdo
 export function makeRenderCall(
 	preview: (args: unknown, cwd: string, signal?: AbortSignal) => Promise<RPreview>,
   options: {
-    getInput?: (args: unknown) => { path?: string; remove_from?: string; remove_to?: string; anchor?: string; source_from?: string; source_to?: string; insert_after?: string; replace_from?: string; replace_to?: string } | null;
+    getInput?: (args: unknown) => { path?: string; remove_from?: string; remove_to?: string; anchor?: string; source_from?: string; source_to?: string; direction?: string; replace_from?: string; replace_to?: string } | null;
     toolName?: string;
-    resolveTarget?: (input: { remove_from?: string; remove_to?: string; anchor?: string; source_from?: string; source_to?: string; insert_after?: string; replace_from?: string; replace_to?: string }) => string | undefined;
+    resolveTarget?: (input: { remove_from?: string; remove_to?: string; anchor?: string; source_from?: string; source_to?: string; direction?: string; replace_from?: string; replace_to?: string }) => string | undefined;
   } = {},
 ) {
 	const getInput = options.getInput ?? getPreviewInput;

package/src/replace-response.ts

@@ -160,6 +160,7 @@ export function buildChanged(input: SuccessInput, verb = "replaced", diffContext
   const fidelity = fidelityHints(originalNormalized, result, spans, originalHashes, {
     separatorMoved: fidelityOptions?.separatorMoved ?? (verb === "inserted" || verb === "edited"),
     indentHints: fidelityOptions?.indentHints ?? (verb !== "copied" && verb !== "moved"),
+    resultHashes,
   });
   const { warnings: noticeWarnings, hints } = splitNotices(fidelity.length > 0 ? [...(warnings ?? []), ...fidelity] : warnings);
   const annotatedHints = annotateLiteralEscapeHints(hints, result, spans, resultHashes);

package/src/replace-undo.ts

@@ -12,8 +12,8 @@ import { toLF, stripBOM, restoreEndings, type LineEnding } from "./normalize";
 import { joinSeparators } from "./line-endings";
 import { genDiff, genPatch, spansFromHashes } from "./replace-diff";
 import { getDiffContextLines } from "./config";
-import { cntDiff, errCode, makePrepareArguments, splitLines } from "./utils";
-import { loadP, loadGuide } from "./prompts";
+import { cntDiff, errCode, makePrepareArguments, mapIoError, splitLines } from "./utils";
+import { loadP, loadGuidelines } from "./prompts";
 import { withUndoPrompts, DEFAULT_EDIT_FLAGS, type EditToolFlags } from "./edit-common";
 import { buildMetrics } from "./replace-response";
 import { renderEditResult, fmtCall } from "./replace-render";
@@ -115,7 +115,7 @@ export function regUndo(pi: ExtensionAPI, flags: EditToolFlags = DEFAULT_EDIT_FL
   const prompted = withUndoPrompts({
     description: loadP("../tool-prompts/undo-last-change.md"),
     snippet: loadP("../tool-prompts/undo-last-change-snippet.md"),
-    guidelines: loadGuide("../tool-prompts/undo-last-change-guidelines.md"),
+    guidelines: loadGuidelines("../tool-prompts/undo-last-change-guidelines.md"),
   }, flags);
   pi.registerTool({
     name: "undo_last_change",
@@ -166,7 +166,7 @@ export function regUndo(pi: ExtensionAPI, flags: EditToolFlags = DEFAULT_EDIT_FL
               await handle.close();
             }
           } catch (error) {
-            if (errCode(error) !== "ENOENT") throw error;
+            if (errCode(error) !== "ENOENT") throw mapIoError(error, "read", path);
           }
 
           if (

package/src/replace.ts

@@ -12,7 +12,7 @@ import { readNormFile, type NormFile } from "./file-reader";
 import { editToolSchema, buildEditToolSchema, type ReqParams, type RawReqParams, assertReq, normReq } from "./payload-contract";
 import { literalEscapeHints, makePrepareArguments, splitLines } from "./utils";
 import { editResultSchema, withStructuredErrors } from "./structured";
-import { loadP, loadGuide } from "./prompts";
+import { loadP, loadGuidelines } from "./prompts";
 import { type FileIdentity } from "./fs-write";
 import { applyEdit,
   lineHashes,
@@ -292,7 +292,7 @@ export function buildToolDef(flags: EditToolFlags = DEFAULT_EDIT_FLAGS): ToolDef
   const prompted = withReplacePrompts({
     description: loadP("../tool-prompts/replace.md"),
     snippet: loadP("../tool-prompts/replace-snippet.md"),
-    guidelines: loadGuide("../tool-prompts/replace-guidelines.md"),
+    guidelines: loadGuidelines("../tool-prompts/replace-guidelines.md"),
   }, flags);
   const parameters = buildEditToolSchema(flags.requirePath);
   return {

package/src/structured.ts

@@ -1,5 +1,6 @@
 import { Type } from "typebox";
 import { HASH_CLASS, HASH_SEP } from "./hashline/hash";
+import { ioErrorCode } from "./utils";
 
 export type Json = null | boolean | number | string | Json[] | { [key: string]: Json };
 
@@ -200,7 +201,7 @@ export function messageOf(error: unknown): string {
 
 export function structuredError(error: unknown): StructuredError {
 	const message = messageOf(error);
-	return { ok: false, kind: "error", error: { code: ERROR_CODE_RE.exec(message)?.[1] ?? "E_TOOL", message } };
+	return { ok: false, kind: "error", error: { code: ERROR_CODE_RE.exec(message)?.[1] ?? ioErrorCode(error) ?? "E_TOOL", message } };
 }
 
 export type StructuredFailureResult<TDetails> = {

package/src/utils.ts

@@ -94,6 +94,35 @@ export function errCode(error: unknown): string | undefined {
 	return undefined;
 }
 
+const IO_ERROR_CODES: Record<string, string> = {
+  ENOENT: "E_NOT_FOUND",
+  EACCES: "E_ACCESS",
+  EPERM: "E_ACCESS",
+  EROFS: "E_ACCESS",
+  EISDIR: "E_ACCESS",
+  ENOTDIR: "E_ACCESS",
+  EEXIST: "E_ACCESS",
+  ELOOP: "E_ACCESS",
+  ENOSPC: "E_ACCESS",
+  EDQUOT: "E_ACCESS",
+  EMFILE: "E_ACCESS",
+  ENFILE: "E_ACCESS",
+  ENAMETOOLONG: "E_ACCESS",
+};
+
+export function ioErrorCode(error: unknown): string | undefined {
+  const code = errCode(error);
+  return code !== undefined ? IO_ERROR_CODES[code] : undefined;
+}
+
+export function mapIoError(error: unknown, action: string, path: string): Error {
+  if (error instanceof Error && /\[[EWH]_[A-Z0-9_]+\]/.test(error.message)) return error;
+  const mapped = ioErrorCode(error);
+  if (mapped === undefined) return error instanceof Error ? error : new Error(String(error));
+  const detail = error instanceof Error ? error.message : String(error);
+  return new Error(`[${mapped}] Cannot ${action} ${path}: ${detail}`);
+}
+
 export function isModeUnsupported(error: unknown): boolean {
 	const code = errCode(error);
 	return code === "EPERM" || code === "ENOTSUP" || code === "EOPNOTSUPP" || code === "EINVAL" || code === "ENOSYS";

package/src/write-hook.ts

@@ -6,7 +6,7 @@ import { resolveInCwd } from "./fs-write";
 import { abortIf, splitLines, isRec } from "./utils";
 import type { ModelLike } from "./model-gate";
 
-const HASH_ECHO_RE = new RegExp(`^(?: *[0-9]+ ${HASH_SEP} )?[+ -]?(${HASH_CLASS})${HASH_SEP}`);
+const HASH_ECHO_RE = new RegExp(`^(?: *[0-9]+(?: │ |[:-]│ ))?[+ -]?(${HASH_CLASS})${HASH_SEP}`);
 
 function searchEcho(lines: string[], served: ReadonlyMap<string, string> | ReadonlySet<string>): { line: number; hash: string } | undefined {
   for (let i = 0; i < lines.length; i++) {

package/tool-prompts/copy-snippet.md

@@ -1 +1 @@
-Copy lines to another position by anchor: `source_from`/`source_to` mark the range, the copy lands after `insert_after`; each anchor resolves its own file
+Copy lines to another position by anchor: `source_from`/`source_to` mark the range, `anchor` and `direction` the destination