pi-hashline-edit-pro 6.3.0 → 6.4.0

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/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. "\\n" is one blank line, and a trailing line break sets the last line\'s ending instead of adding a 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/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, "\\n" is one blank line, and a trailing line break sets the last line\'s ending instead of adding a 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, "\\n" inserts one blank line, and a trailing line break sets the last line\'s ending instead of adding a 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/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-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

@@ -13,7 +13,7 @@ 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 { 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",

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/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

package/tool-prompts/copy.md

@@ -1,3 +1,3 @@
-Copy a range of lines to another position, targeted by 4-character anchors from any served anchor│content row. Give `source_from` and `source_to` as bare anchors marking the first and last line to copy in the source file, and `insert_after` as the bare anchor of the destination line after which the copy goes. The source lines stay in place, and the copied lines are written exactly as the source file holds them.
+Duplicate a range of lines at another anchor, in this or another file. The source rows and anchors stay live; the copied lines get fresh anchors in the destination's post-edit diff and keep their source line endings.
 
-A cross-file copy joins the destination file's batch. A copy always duplicates the content its source anchors were served from, so a same-message edit to the source file does not change what is copied.
+A copy duplicates the content its source anchors were served from, so a same-message edit to the source file does not change what is copied.

package/tool-prompts/grep-guidelines.md

@@ -1 +1,2 @@
-- `anchor_grep`: prefer it over shell `rg`/`grep` for searching, so hits carry anchors and need no `read`; use `literal: true` when the pattern contains regex metacharacters.
+- `grep`: set `literal: true` when the pattern contains regex metacharacters.
+- `grep`: `N:│` rows are matches and `N-│` rows are context;

package/tool-prompts/grep-snippet.md

@@ -1 +1 @@
-Search with `lineNumber │ anchor│content` hits usable directly for `replace`/`insert`; use `literal`/`glob`/`context`
+Search with `lineNumber:│ anchor│content` hits (`lineNumber-│` for context) usable directly for `replace`/`insert`; use `literal`/`glob`/`context`

package/tool-prompts/grep.md

@@ -1 +1 @@
-Search text files with ripgrep. Hits and context lines come back as `lineNumber │ anchor│content` rows, editable with replace, insert, copy, or move without a new read; the `=== path ===` header and line numbers locate the match. Patterns are regex by default; set `literal: true` to search exact text, `ignoreCase` for case-insensitive search, and `context` for surrounding rows. Avoid backreferences, nested quantifiers, and quantified alternation. Searches respect `.gitignore`, always skip `.git`, and skip binary and image files silently. A match over 500 bytes is shown as a `...` fragment around the hit, but its anchor still covers the whole line. When cut by match limit, raise `limit` (default 100); when cut by rows/bytes, refine `pattern` / narrow path.
+Search text files with ripgrep. Hits come back as `lineNumber:│ anchor│content` rows and context lines as `lineNumber-│ anchor│content`, editable with replace, insert, copy, or move without a new read; the `=== path ===` header and line numbers locate the match. Patterns are regex by default; set `literal: true` for exact text, `ignoreCase` for case-insensitive search, and `context` for surrounding rows. Rust regex syntax (no backreferences or look-around) through a linear-time engine. Searches respect `.gitignore`, always skip `.git`, and skip binary and image files silently. A match over 500 bytes is shown as a `...` fragment around the hit, but its anchor still covers the whole line. When cut by match limit, raise `limit` (default 100); when cut by rows/bytes, refine `pattern` or narrow `path`.

package/tool-prompts/insert-guidelines.md

@@ -1 +1 @@
-- `insert`: compare both edges of the inserted block in the post-edit diff against the request; a missing or extra `+anchor│` blank row at either boundary is the classic insert slip.
+- `insert`: a missing or extra `+anchor│` blank row at either block edge in the diff is the classic insert slip.

package/tool-prompts/insert.md

@@ -1 +1 @@
-Insert text after or before one existing line in a text file, addressed by the `anchor` field (a bare anchor from any served anchor│content row). `text` goes after the anchor line with `direction: "after"` or before it with `direction: "before"`. `text` is one string holding the exact text to insert. A trailing line break sets the last line's ending instead of adding a blank line, so a blank line next to the anchor line must be an extra break in `text`: `"x\n"` leaves the anchor line directly after `x`, and `"x\n\n"` leaves one blank line between them (`direction: "after"` mirrors this at the start of `text`).
+Insert text after or before one existing line, addressed by `anchor` (a bare anchor from any served `anchor│content` row). `direction` places `text` after or before the anchor line; `text` is the exact text to insert.

package/tool-prompts/move-snippet.md

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

package/tool-prompts/move.md

@@ -1,3 +1,3 @@
-Move a range of lines to another position, targeted by 4-character anchors from any served anchor│content row. Give `source_from` and `source_to` as bare anchors marking the first and last line to move in the source file, and `insert_after` as the bare anchor of the destination line after which the range goes. `insert_after` must sit outside the source range when both anchors share a file; moving a range in one file to where it already sits reports no change.
+Relocate a range of lines to another anchor, in this or another file. Within one file the destination must sit outside the source range; moving a range onto itself reports `No changes made` and leaves the anchors alone.
 
-A cross-file `move` whose source file also has batched edits in the message commits on its own. A batched cross-file `move` commits its source removal with the batch but shows only the destination diff; read the source file for fresh anchors.
+A cross-file move commits on its own when its source file also has batched edits in the message.

package/tool-prompts/read-guidelines.md

@@ -1,3 +1,3 @@
-- `read`: call again after an edit when you need anchors you lack — post-edit diff `+anchor│`/` anchor│` rows and any served `anchor│content` rows already carry fresh anchors for the changed range.
-- `read`: pass a served anchor as `offset` with `limit` to read from it without line-number math; an outline row's `[limit N]` is the span to request, and a row without one is a single line shown as its content.
-- `read`: an outline row shows a symbol label, or the line content for a single-line symbol; edit by anchor, and read the anchor (or copy `old_string` from a served row) before `replace_match`.
+- `read`: call again after an edit when you need anchors you lack — post-edit diff `+`/` ` rows and served `anchor│content` rows already carry fresh anchors for the changed range.
+- `read`: an auto-read-all outline row shows a symbol label, or a single-line symbol's content; its `[limit N]` is the span to request.
+- `read`: `replace_match` needs both boundary lines served; copy `old_string` from a served row or read the lines first.

package/tool-prompts/read.md

@@ -1,3 +1 @@
-Read a text file and return it as `anchor│content` rows, one per line: a 4-character anchor (letters only, case-sensitive), the `│` separator, then the line content. Target lines in edits by anchor, never by content or line number. Page long files with `offset` and `limit`; when the output says truncated, continue with the hinted `offset/limit`. Images attach visually; binary, directory, and UTF-16/UTF-32 text are rejected; an empty file returns one empty row you can replace to seed content.
-
-`offset` takes a 1-indexed line number or a served anchor; with an anchor, `limit` counts the lines to return after it. A stale anchor is refused with the current context rows and fresh anchors.
+Read a text file as `anchor│content` rows: a 4-character anchor (letters only, case-sensitive), `│`, then the line. Target edits by anchor, never by content or line number. `offset` takes a 1-indexed line number or a served anchor; with an anchor, `limit` counts lines after it — no line-number math. Page long files with `offset` and `limit`; when output says truncated, continue from the hinted `offset`. A stale anchor is refused with the current rows and fresh anchors. Images attach visually; binary, directory, and UTF-16/UTF-32 text are rejected; an empty file returns one empty row you can replace to seed content.

package/tool-prompts/replace-match-guidelines.md

@@ -1 +1,2 @@
 - `replace_match`: `old_string` is usually a fragment of the line, not the whole line; every occurrence inside the range is replaced, so scope the range with anchors when only some occurrences should change.
+- `replace_match`: when you intend to change every matching line in a range, anchor the first and last matching lines of that range so one call replaces them all, instead of one call per line.

package/tool-prompts/replace-match-snippet.md

@@ -1 +1 @@
-Replace part of a line or range by anchor: every occurrence of `old_string` inside `replace_from`/`replace_to` is replaced by `new_string`, leaving the rest of the text untouched
+Replace part of a line or range by anchor: every `old_string` occurrence inside `replace_from`/`replace_to` becomes `new_string`; the rest of the line stays untouched

package/tool-prompts/replace-match.md

@@ -1,3 +1,3 @@
-Replace part of a line (or a range of lines) without retyping the rest. `replace_from` and `replace_to` are bare anchors from served `anchor│content` rows marking the first and last line of the range; use the same anchor for one line. `old_string` is the text to find inside that range, and `new_string` replaces every occurrence of it. `remove_from`/`remove_to` are accepted as aliases for `replace_from`/`replace_to`.
+Replace part of a line (or a range of lines) without retyping the rest. `replace_from`/`replace_to` are bare anchors from served `anchor│content` rows marking the range's first and last line (the same anchor for one line), `old_string` is the text to find inside it, and `new_string` replaces every occurrence. `remove_from`/`remove_to` are accepted as aliases.
 
 The two boundary anchors must still match what was last shown; lines strictly inside the range are matched against the file as it is on disk.

package/tool-prompts/replace.md

@@ -1,2 +1,3 @@
-Replace a range of lines (or a single line) in a text file by anchor. `remove_from` and `remove_to` are the 4-character anchors of the first and last line to remove, and `text` is one string holding the exact replacement text. The text is written exactly as given, and nothing else in the file changes. `replace_from`/`replace_to` are accepted as aliases for `remove_from`/`remove_to`.
-To change only part of a line without retyping the rest, use `replace_match` instead; it preserves every character the request does not name. Deleting every line empties the file; the result names the new empty-line anchor, so a follow-up `replace` on it can seed content without a `read`.
+Replace a range of lines (or a single line) in a text file by anchor: `remove_from` and `remove_to` are the 4-character anchors of its first and last line, `text` is the exact replacement text, and `replace_from`/`replace_to` are accepted as aliases. Deleting every line empties the file, and the result names the empty-line anchor, so a follow-up `replace` can seed content without a `read`.
+
+To change only part of a line without retyping the rest, use `replace_match` instead; it preserves every character the request does not name.

package/tool-prompts/transfer-guidelines.md

@@ -1,4 +1,4 @@
-- `copy`/`move`: for a block transfer, only the source's two boundary rows and the destination line need serving; the interior transfers verbatim and the block lands in one commit. To append at the end, use the destination's last served line as `insert_after`.
-- `copy`/`move`: `insert_after` must sit outside the source range; `source_to` places the block right after itself.
-- `copy`/`move`: `source_from` and `source_to` may live in a different file than `insert_after`; an empty destination file is seeded with the copied or moved lines.
+- `copy`/`move`: only the source's two boundary rows and the destination line need serving; to append to the end of a file, anchor that file's last line with `direction: "after"` — not a marker line and not the block's own end.
+- `copy`/`move`: within one file the insertion point must fall before the source range's first line or after its last; anchoring the block's last line with `direction: "after"` (or its first line with `direction: "before"`) targets the gap right beside the block.
+- `copy`/`move`: `source_from` and `source_to` may live in a different file than `anchor`; an empty destination file is seeded with the copied or moved lines.
 - `move`: a batched cross-file move does not display the source file's diff; its removal commits with the batch, and the source file needs a read for fresh anchors.

package/tool-prompts/undo-last-change-guidelines.md

@@ -1,3 +1,3 @@
 - `undo_last_change`: history is one slot per file, not a stack; a second undo returns `E_UNDO_NONE`.
-- `undo_last_change`: a `write` clears the history, so undo right after a bad diff — review the diff's `-anchor│` rows first to confirm what you're restoring.
+- `undo_last_change`: a `write` clears the history, so undo before any other edit or write; the undo diff's `+anchor│` rows are the restored lines.
 - `undo_last_change`: a cross-file `move` records one undo entry per file; undo both the source and the destination to revert the whole move, because undoing one side alone leaves the moved lines duplicated or missing.

package/tool-prompts/undo-last-change-snippet.md

@@ -1 +1 @@
-Single-level undo: reverts a file's last `replace`, `replace_match`, `insert`, `copy`, or `move`
+Revert a file's most recent edit (single level)

package/tool-prompts/undo-last-change.md

@@ -1 +1 @@
-Undo the last replace, replace_match, insert, copy, or move on a file, restoring the previous content, BOM, and line endings. Use it when an edit removed or changed the wrong lines. If the file changed since that edit, the undo is refused and the file is left untouched; do not force it. A file deleted since the edit is restored. If the diff is truncated, use read to see the full file.
+Undo the last replace, replace_match, insert, copy, or move on a file, restoring the previous content, BOM, and line endings. If the file changed since that edit, the undo is refused and the file is left untouched; a file deleted since the edit is restored.