pi-hashline-edit-pro 4.5.2 → 5.0.0

package/src/config.ts

@@ -14,6 +14,7 @@ export interface Config {
   autoRead: boolean;
   anchorGrepEnabled: boolean;
   copyMoveEnabled?: boolean;
+  replaceWithinEnabled?: boolean;
   autoReadAll?: AutoReadAllMode;
   autoReadAllIgnore?: string[];
   requirePath?: boolean;
@@ -25,6 +26,7 @@ const DEFAULT_CONFIG: Config = {
   autoRead: true,
   anchorGrepEnabled: true,
   copyMoveEnabled: true,
+  replaceWithinEnabled: true,
   autoReadAll: "off",
   autoReadAllIgnore: [],
   requirePath: false,
@@ -75,6 +77,7 @@ function parseConfig(content: string): Config {
   const autoRead = parsed.autoRead;
   const anchorGrepEnabled = parsed.anchorGrepEnabled;
   const copyMoveEnabled = parsed.copyMoveEnabled;
+  const replaceWithinEnabled = parsed.replaceWithinEnabled;
   const autoReadAll = parsed.autoReadAll;
   const requirePath = parsed.requirePath;
   const strictInput = parsed.strictInput;
@@ -84,6 +87,7 @@ function parseConfig(content: string): Config {
     autoRead: typeof autoRead === "boolean" ? autoRead : DEFAULT_CONFIG.autoRead,
     anchorGrepEnabled: typeof anchorGrepEnabled === "boolean" ? anchorGrepEnabled : DEFAULT_CONFIG.anchorGrepEnabled,
     copyMoveEnabled: typeof copyMoveEnabled === "boolean" ? copyMoveEnabled : DEFAULT_CONFIG.copyMoveEnabled,
+    replaceWithinEnabled: typeof replaceWithinEnabled === "boolean" ? replaceWithinEnabled : DEFAULT_CONFIG.replaceWithinEnabled,
     autoReadAll: parseAutoReadAllMode(autoReadAll),
     requirePath: typeof requirePath === "boolean" ? requirePath : DEFAULT_CONFIG.requirePath,
     strictInput: typeof strictInput === "boolean" ? strictInput : DEFAULT_CONFIG.strictInput,
@@ -196,7 +200,7 @@ export async function writeConfig(config: Config): Promise<void> {
 }
 
 
-type ToggleKey = "autoRead" | "anchorGrepEnabled" | "copyMoveEnabled" | "requirePath" | "strictInput";
+type ToggleKey = "autoRead" | "anchorGrepEnabled" | "copyMoveEnabled" | "replaceWithinEnabled" | "requirePath" | "strictInput";
 
 async function toggleFlag(key: ToggleKey): Promise<boolean> {
   const config = await updateConfig((c) => { c[key] = !(c[key] === true); });
@@ -205,6 +209,7 @@ async function toggleFlag(key: ToggleKey): Promise<boolean> {
 export const toggleAutoRead = (): Promise<boolean> => toggleFlag("autoRead");
 export const toggleAnchorGrep = (): Promise<boolean> => toggleFlag("anchorGrepEnabled");
 export const toggleCopyMove = (): Promise<boolean> => toggleFlag("copyMoveEnabled");
+export const toggleReplaceWithin = (): Promise<boolean> => toggleFlag("replaceWithinEnabled");
 export async function cycleAutoReadAllMode(): Promise<AutoReadAllMode> {
   let next: AutoReadAllMode = "off";
   await updateConfig((c) => {

package/src/constants.ts

@@ -13,6 +13,12 @@ export const HASH_STORE_VERSION = 9;
 export const NEW_CONTENT_NOT_ARRAY_MSG =
   `[E_BAD_SHAPE] "replacement_lines" must be an array of strings, one per line (use [] to delete).`;
 
+export const NEW_CONTENT_NOT_STRING_MSG =
+  `[E_BAD_SHAPE] "replacement_lines" must be a string holding the exact text to write. Use "" to delete the range and "\\n" for one blank line; line breaks inside the string separate lines.`;
+
+export const LINES_NOT_STRING_MSG =
+  `[E_BAD_SHAPE] "lines" must be a string holding the exact text to insert. Use "" to insert nothing and "\\n" for one blank line; line breaks inside the string separate lines.`;
+
 export const NUL_CONTENT_MSG =
   `[E_BAD_SHAPE] Content contains a NUL byte (U+0000); a text file cannot contain NUL, and writing it would break further reads and edits. Remove the NUL byte and retry. An empty replacement ([]) deletes a range or inserts nothing.`;
 

package/src/copy-move.ts

@@ -2,7 +2,7 @@ import type { ExtensionAPI, ToolDefinition } from "@earendil-works/pi-coding-age
 import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES, formatSize, truncateHead, withFileMutationQueue } from "@earendil-works/pi-coding-agent";
 import { Type } from "typebox";
 import { constants } from "node:fs";
-import { execPipeline, noteAnchorError, previewFromPipe, previewError, type PipelineResult, type ReqParams, type ReplaceDetails } from "./replace";
+import { execPipeline, noteAnchorError, previewFromPipe, previewError, type PipelineResult, type ReplaceDetails } from "./replace";
 import { commitEdit } from "./commit";
 import { readNormFile, safeSnapId, type NormFile } from "./file-reader";
 import {
@@ -14,6 +14,7 @@ import {
   resolveAnchorLine,
   stripAnchorRow,
   type Anchor,
+  type HTEdit,
 } from "./hashline";
 import { formatAnchorReclaimNotice, servedForPath, takeReclaimedPaths, withAnchorSession } from "./anchor-registry";
 import { loadP, loadGuide } from "./prompts";
@@ -49,7 +50,7 @@ interface TransferRefs {
 }
 
 export interface TransferPlan {
-  editParams: ReqParams;
+  editParams: HTEdit;
   foldedAnchorLines: number;
   anchorCarry?: number;
   servedOverride?: ReadonlyMap<string, string>;
@@ -224,10 +225,10 @@ interface CrossTransferPreparation {
   destinationPreload: NormFile;
   sourceDisplay: string;
   destinationDisplay: string;
-  destinationEdit: ReqParams;
+  destinationEdit: HTEdit;
   destinationFolded: number;
   endingOverrides: (LineEnding | undefined)[];
-  sourceEdit?: ReqParams;
+  sourceEdit?: HTEdit;
 }
 
 async function prepareCrossTransfer(input: {
@@ -292,7 +293,7 @@ async function prepareCrossTransfer(input: {
   }
 
   const moved = sourceLines.slice(sourceStart - 1, sourceEnd);
-  const destinationEdit: ReqParams = destinationPreload.normalized.length === 0
+  const destinationEdit: HTEdit = destinationPreload.normalized.length === 0
     ? {
         remove_from: destinationPreload.fileHashes[0]!,
         remove_to: destinationPreload.fileHashes[0]!,
@@ -309,7 +310,7 @@ async function prepareCrossTransfer(input: {
   if (kind === "copy") {
     return { sourcePreload, destinationPreload, sourceDisplay, destinationDisplay, destinationEdit, destinationFolded, endingOverrides };
   }
-  const sourceEdit: ReqParams = {
+  const sourceEdit: HTEdit = {
     remove_from: sourcePreload.fileHashes[sourceStart - 1]!,
     remove_to: sourcePreload.fileHashes[sourceEnd - 1]!,
     replacement_lines: [],
@@ -544,6 +545,7 @@ async function executeCrossFile(
       accessMode: constants.R_OK | constants.W_OK,
       signal,
       preloadedNorm: prepared.destinationPreload,
+      endingOverrides: prepared.endingOverrides,
     });
     if (kind === "copy") {
       return commitEdit(destinationPipe, {
@@ -610,6 +612,7 @@ export async function transferPreview(kind: TransferKind, request: unknown, cwd:
         noPersist: true,
         preloadedNorm: preload,
         served: plan.servedOverride,
+        endingOverrides: plan.endingOverrides,
         signal,
       });
       return previewFromPipe(pipe);
@@ -619,6 +622,7 @@ export async function transferPreview(kind: TransferKind, request: unknown, cwd:
       accessMode: constants.R_OK,
       noPersist: true,
       preloadedNorm: prepared.destinationPreload,
+      endingOverrides: prepared.endingOverrides,
       signal,
     });
     if (kind === "copy") return previewFromPipe(destinationPipe);
@@ -668,19 +672,19 @@ function getTransferInput(args: unknown): { path?: string; source_from?: string;
 
 const transferSourceFromSchema = Type.String({
   description:
-    "Bare 4-char anchor from a served anchor│content row (the text before the `│` separator), never the row content. Marks the FIRST source line (inclusive); this anchor and `source_to` resolve the source file.",
+    "4-char anchor of the FIRST source line to copy (never the row content).",
 });
 const transferSourceToSchema = Type.String({
   description:
-    "Bare 4-char anchor from a served anchor│content row (the text before the `│` separator), never the row content. Marks the LAST source line (inclusive); this anchor and `source_from` resolve the source file.",
+    "4-char anchor of the LAST source line to copy.",
 });
 const transferInsertAfterSchema = Type.String({
   description:
-    "Bare 4-char anchor of the destination line after which the block goes; it may live in another file than the source, and the destination file is the one this anchor belongs to. The anchor line is preserved.",
+    "4-char anchor of the destination line; the block goes after it and may live in another file.",
 });
 const transferPathRequiredSchema = Type.String({
   description:
-    "Path to the source or destination file the anchors were served for; required and must match anchor ownership. The anchors still resolve both files.",
+    "Path to the source or destination file the anchors were served for; required and must match anchor ownership.",
 });
 
 const transferToolSchema = Type.Object(
@@ -715,7 +719,6 @@ export function buildTransferToolDef(kind: TransferKind, flags: EditToolFlags =
       guidelines: loadGuide(`../prompts/${kind}-guidelines.md`),
     },
     flags,
-    kind,
   );
   return {
     name: kind,
@@ -764,6 +767,7 @@ export function buildTransferToolDef(kind: TransferKind, flags: EditToolFlags =
             signal,
             preloadedNorm: preload,
             served: plan.servedOverride,
+            endingOverrides: plan.endingOverrides,
           });
           return commitEdit(pipe, {
             path: pipe.path,

package/src/edit-common.ts

@@ -13,13 +13,17 @@ export interface EditToolFlags {
   strictInput: boolean;
   autoRead: boolean;
   autoReadAllActive: boolean;
+  replaceWithinEnabled: boolean;
+  copyMoveEnabled: boolean;
 }
 
 export const DEFAULT_EDIT_FLAGS: EditToolFlags = {
   requirePath: false,
   strictInput: false,
   autoRead: true,
-  autoReadAllActive: false
+  autoReadAllActive: false,
+  replaceWithinEnabled: true,
+  copyMoveEnabled: true
 };
 
 export async function currentEditFlags(): Promise<EditToolFlags> {
@@ -28,7 +32,9 @@ export async function currentEditFlags(): Promise<EditToolFlags> {
     requirePath: config.requirePath === true,
     strictInput: config.strictInput === true,
     autoRead: config.autoRead !== false,
-    autoReadAllActive: (config.autoReadAll ?? "off") !== "off"
+    autoReadAllActive: (config.autoReadAll ?? "off") !== "off",
+    replaceWithinEnabled: config.replaceWithinEnabled !== false,
+    copyMoveEnabled: config.copyMoveEnabled !== false
   };
 }
 
@@ -41,18 +47,18 @@ export function withReplacePrompts(base: { description: string; snippet: string;
     guidelines = guidelines.filter((guideline) => !guideline.includes("post-edit diff"));
     description = description.replace("and the last call shows the combined diff,", "and the last call shows the combined result,");
   }
+  if (!flags.replaceWithinEnabled) {
+    description = description.replace(/\n?To change only part of a line without retyping the rest, use `replace_within` instead; it preserves every character the request does not name\./, "");
+  }
   const descriptionParts = [description];
   if (flags.requirePath) {
     descriptionParts.push("Also give `path` matching the file the anchors were served for; it is required and must match anchor ownership.");
     snippetParts.push("; include `path` (required)");
-    guidelines.push("`replace`: include `path` matching the file the anchors were served for; it is required.");
   } else {
     descriptionParts.push("Path resolution is anchor-only; do not pass `path`.");
-    guidelines.push("`replace`: path resolution is anchor-only; don't pass `path`.");
   }
   if (flags.strictInput) {
     descriptionParts.push("Strict-input mode is on: auto-fixable slips are rejected instead of fixed with warnings.");
-    guidelines.push("`replace`: strict-input is on: auto-fixable slips are rejected instead of fixed.");
   }
   return { description: descriptionParts.join(" "), snippet: snippetParts.join(""), guidelines };
 }
@@ -78,39 +84,84 @@ export function withInsertPrompts(base: { description: string; snippet: string;
   if (flags.requirePath) {
     descriptionParts.push("Also give `path` matching the file the anchor was served for; it is required and must match anchor ownership.");
     snippetParts.push("; include `path` (required)");
-    guidelines.push("`insert`: include `path` matching the file the anchor was served for; it is required.");
   } else {
     descriptionParts.push("Path resolution is anchor-only; do not pass `path`.");
-    guidelines.push("`insert`: path resolution is anchor-only; don't pass `path`.");
   }
   if (flags.strictInput) {
     descriptionParts.push("Strict-input mode is on: auto-fixable slips are rejected instead of fixed with warnings.");
-    guidelines.push("`insert`: strict-input is on: auto-fixable slips are rejected instead of fixed.");
   }
   return { description: descriptionParts.join(" "), snippet: snippetParts.join(""), guidelines };
 }
 
+export function withReplaceWithinPrompts(base: { description: string; snippet: string; guidelines: string[] }, flags: EditToolFlags): { description: string; snippet: string; guidelines: string[] } {
+  const descriptionParts = [base.description];
+  const snippetParts = [base.snippet];
+  const guidelines = base.guidelines.map((guideline) => flags.copyMoveEnabled ? guideline : guideline.replace(", like `copy` and `move`", ""));
+  if (flags.requirePath) {
+    descriptionParts.push("Also give `path` matching the file the anchors were served for; it is required and must match anchor ownership.");
+    snippetParts.push("; include `path` (required)");
+  } else {
+    descriptionParts.push("Path resolution is anchor-only; do not pass `path`.");
+  }
+  if (flags.strictInput) {
+    descriptionParts.push("Strict-input mode is on: auto-fixable slips are rejected instead of fixed with warnings.");
+  }
+  return { description: descriptionParts.join(" "), snippet: snippetParts.join(""), guidelines };
+}
+
+function gatedEditOps(ops: string[], flags: EditToolFlags): string[] {
+  return ops.filter((op) => {
+    if (op === "replace_within") return flags.replaceWithinEnabled;
+    if (op === "copy" || op === "move") return flags.copyMoveEnabled;
+    return true;
+  });
+}
+
+function joinOps(ops: string[], options?: { backtick?: boolean; separator?: "/" }): string {
+  const formatted = ops.map((op) => (options?.backtick ? `\`${op}\`` : op));
+  if (options?.separator === "/") return formatted.join("/");
+  if (formatted.length <= 1) return formatted[0] ?? "";
+  const last = formatted[formatted.length - 1]!;
+  const head = formatted.slice(0, -1).join(", ");
+  return formatted.length === 2 ? `${head} or ${last}` : `${head}, or ${last}`;
+}
+
+export function withGrepPrompts(base: { description: string; snippet: string }, flags: EditToolFlags): { description: string; snippet: string } {
+  if (flags.copyMoveEnabled) return base;
+  return { ...base, description: base.description.replaceAll("replace, insert, copy, or move", joinOps(gatedEditOps(["replace", "insert", "copy", "move"], flags))) };
+}
+
 export function withUndoPrompts(base: { description: string; snippet: string; guidelines: string[] }, flags: EditToolFlags): { description: string; snippet: string; guidelines: string[] } {
-  if (flags.autoRead) return { description: base.description, snippet: base.snippet, guidelines: [...base.guidelines] };
-  const guidelines = base.guidelines.map((guideline) => guideline.includes("bad diff") ? "`undo_last_change`: only the last `replace`/`insert` per file is undoable; a `write` clears it, so undo right after a bad edit — review what you're restoring." : guideline);
-  return { description: base.description, snippet: base.snippet, guidelines };
+  const ops = gatedEditOps(["replace", "replace_within", "insert", "copy", "move"], flags);
+  let description = base.description;
+  let snippet = base.snippet;
+  let guidelines = [...base.guidelines];
+  if (!flags.autoRead) {
+    guidelines = guidelines.map((guideline) => guideline.includes("bad diff") ? "`undo_last_change`: only the last `replace`/`replace_within`/`insert`/`copy`/`move` per file is undoable; a `write` clears it, so undo right after a bad edit — review what you're restoring." : guideline);
+  }
+  if (ops.length !== 5) {
+    description = description.replaceAll("replace, replace_within, insert, copy, or move", joinOps(ops));
+    snippet = snippet.replaceAll("`replace`, `replace_within`, `insert`, `copy`, or `move`", joinOps(ops, { backtick: true }));
+    guidelines = guidelines.map((guideline) => guideline.replaceAll("`replace`/`replace_within`/`insert`/`copy`/`move`", joinOps(ops, { backtick: true, separator: "/" })));
+  }
+  if (!flags.copyMoveEnabled) {
+    guidelines = guidelines.filter((guideline) => !guideline.includes("cross-file `move`"));
+  }
+  return { description, snippet, guidelines };
 }
 
-export function withTransferPrompts(base: { description: string; snippet: string; guidelines: string[] }, flags: EditToolFlags, toolName: "copy" | "move"): { description: string; snippet: string; guidelines: string[] } {
+export function withTransferPrompts(base: { description: string; snippet: string; guidelines: string[] }, flags: EditToolFlags): { description: string; snippet: string; guidelines: string[] } {
   const descriptionParts = [base.description];
   const snippetParts = [base.snippet];
   const guidelines = [...base.guidelines];
   if (flags.requirePath) {
     descriptionParts.push("Also give `path` matching the source or destination file the anchors were served for; it is required and must match anchor ownership.");
     snippetParts.push("; include `path` (required)");
-    guidelines.push(`\`${toolName}\`: include \`path\` matching the source or destination file the anchors were served for; it is required.`);
   } else {
     descriptionParts.push("Path resolution is anchor-only; do not pass `path`.");
-    guidelines.push(`\`${toolName}\`: path resolution is anchor-only; don't pass \`path\`.`);
   }
   if (flags.strictInput) {
     descriptionParts.push("Strict-input mode is on: auto-fixable slips are rejected instead of fixed with warnings.");
-    guidelines.push(`\`${toolName}\`: strict-input is on: auto-fixable slips are rejected instead of fixed.`);
   }
   return { description: descriptionParts.join(" "), snippet: snippetParts.join(""), guidelines };
 }

package/src/edit-fidelity.ts

@@ -0,0 +1,108 @@
+import { splitLines } from "./utils";
+import type { DiffSpan } from "./replace-diff";
+
+const INVISIBLE_RE = /\p{Default_Ignorable_Code_Point}/u;
+const LOOKALIKE_SPACE_RE = /[\u00a0\u1680\u2000-\u200a\u202f\u205f\u3000]/u;
+const LOOKALIKE_DASH_RE = /[\u2010-\u2015\u2212]/u;
+const LOOKALIKE_QUOTE_RE = /[\u2018\u2019\u201c\u201d]/u;
+const MAX_LISTED_CHARS = 3;
+
+const CHAR_NAMES: Readonly<Record<number, string>> = {
+  0x00a0: "no-break space",
+  0x200b: "zero-width space",
+  0x200c: "zero-width non-joiner",
+  0x200d: "zero-width joiner",
+  0x200e: "left-to-right mark",
+  0x200f: "right-to-left mark",
+  0x2011: "non-breaking hyphen",
+  0x202f: "narrow no-break space",
+  0x2060: "word joiner",
+  0xfeff: "zero-width no-break space",
+};
+
+const LOOKALIKE_SUBSTITUTES: Readonly<Record<string, string>> = {
+  "\u00a0": " ",
+  "\u1680": " ",
+  "\u2000": " ",
+  "\u2001": " ",
+  "\u2002": " ",
+  "\u2003": " ",
+  "\u2004": " ",
+  "\u2005": " ",
+  "\u2006": " ",
+  "\u2007": " ",
+  "\u2008": " ",
+  "\u2009": " ",
+  "\u200a": " ",
+  "\u202f": " ",
+  "\u205f": " ",
+  "\u3000": " ",
+  "\u2010": "-",
+  "\u2011": "-",
+  "\u2012": "-",
+  "\u2013": "-",
+  "\u2014": "-",
+  "\u2015": "-",
+  "\u2212": "-",
+  "\u2018": "'",
+  "\u2019": "'",
+  "\u201c": "\"",
+  "\u201d": "\"",
+};
+
+export function isFidelitySensitiveChar(char: string): boolean {
+  return INVISIBLE_RE.test(char) || LOOKALIKE_SPACE_RE.test(char) || LOOKALIKE_DASH_RE.test(char) || LOOKALIKE_QUOTE_RE.test(char);
+}
+
+function describeChar(char: string): string {
+  const codePoint = char.codePointAt(0)!;
+  const hex = `U+${codePoint.toString(16).toUpperCase().padStart(4, "0")}`;
+  const name = CHAR_NAMES[codePoint];
+  return name === undefined ? hex : `${hex} (${name})`;
+}
+
+function unicodeLostHint(chars: string[]): string {
+  const listed = chars.slice(0, MAX_LISTED_CHARS).map(describeChar).join(", ");
+  const more = chars.length > MAX_LISTED_CHARS ? ` (+${chars.length - MAX_LISTED_CHARS} more)` : "";
+  return `[H_UNICODE_LOST] The removed line contained ${listed}${more}, which the replacement does not. If the request did not ask to remove it, copy the character from the served row.`;
+}
+
+function withCharsRestored(line: string, chars: readonly string[], replacementFor: (char: string) => string): string {
+  let out = line;
+  for (const char of chars) out = out.split(char).join(replacementFor(char));
+  return out;
+}
+
+function isDeliberateCharFix(oldLine: string, newLine: string, lostChars: readonly string[]): boolean {
+  if (lostChars.length === 0) return false;
+  if (withCharsRestored(oldLine, lostChars, (char) => LOOKALIKE_SUBSTITUTES[char] ?? "") === newLine) return true;
+  return withCharsRestored(oldLine, lostChars, () => "") === newLine;
+}
+
+export function fidelityHints(originalContent: string, resultContent: string, spans: readonly DiffSpan[] | undefined): string[] {
+  if (spans === undefined || spans.length === 0) return [];
+  const oldLines = splitLines(originalContent);
+  const newLines = splitLines(resultContent);
+  const lost = new Set<string>();
+  let offset = 0;
+  for (const span of [...spans].sort((a, b) => a.start - b.start)) {
+    const removedCount = span.end >= span.start ? span.end - span.start + 1 : 0;
+    const removed = removedCount > 0 ? oldLines.slice(span.start, span.end + 1) : [];
+    const inserted = newLines.slice(span.start + offset, span.start + offset + span.replacementCount);
+    if (removed.length > 0 && inserted.length > 0) {
+      const insertedText = inserted.join("\n");
+      const dropped: string[] = [];
+      for (const line of removed) {
+        for (const char of line) {
+          if (!dropped.includes(char) && isFidelitySensitiveChar(char) && !insertedText.includes(char)) dropped.push(char);
+        }
+      }
+      const deliberateFix = removed.length === 1 && inserted.length === 1 && isDeliberateCharFix(removed[0]!, inserted[0]!, dropped);
+      if (!deliberateFix) {
+        for (const char of dropped) lost.add(char);
+      }
+    }
+    offset += span.replacementCount - removedCount;
+  }
+  return lost.size > 0 ? [unicodeLostHint([...lost].sort())] : [];
+}

package/src/grep.ts

@@ -11,8 +11,9 @@ 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 } from "./prompts";
 import { normReq } from "./payload-contract";
+import { DEFAULT_EDIT_FLAGS, withGrepPrompts, type EditToolFlags } from "./edit-common";
 import { abortIf, clipLine, errCode, gutterWidth, isRec, makePrepareArguments, rejectUnknownFields, truncateToBytes, visLines } from "./utils";
 import { withAnchorSession, formatAnchorReclaimNotice, takeReclaimedPaths } from "./anchor-registry";
 import { serveRows } from "./served";
@@ -529,13 +530,13 @@ export function renderGrepResult(result: { content?: Array<{ type: string; text?
   if (lines.length > maxLines) shown.push(theme.fg("muted", `... ${lines.length - maxLines} more grep lines (${expandHint()})`));
   return reuseText(context, shown.join("\n"));
 }
-export function regGrep(pi: ExtensionAPI): void {
+export function regGrep(pi: ExtensionAPI, flags: EditToolFlags = DEFAULT_EDIT_FLAGS): void {
+  const prompted = withGrepPrompts({ description: loadP("../prompts/grep.md"), snippet: loadP("../prompts/grep-snippet.md") }, flags);
   pi.registerTool({
     name: "anchor_grep",
     label: "Anchor Grep",
-    description: loadP("../prompts/grep.md"),
-    promptSnippet: loadP("../prompts/grep-snippet.md"),
-    promptGuidelines: loadGuide("../prompts/grep-guidelines.md"),
+    description: prompted.description,
+    promptSnippet: prompted.snippet,
     prepareArguments: makePrepareArguments(),
     parameters: grepToolSchema,
     executionMode: "sequential",

package/src/hashline/apply.ts

@@ -68,12 +68,12 @@ function resToSpan(
   const startLine = edit.hash_bounds[0].line;
   const endLine = edit.hash_bounds[1].line;
   const originalLines = fileLines.slice(startLine - 1, endLine);
-  if (
+  const contentUnchanged =
     originalLines.length === edit.content_lines.length &&
     originalLines.every(
       (line, lineIndex) => line === edit.content_lines[lineIndex],
-    )
-  ) {
+    );
+  if (contentUnchanged && edit.content_separators === undefined) {
     return {
       kind: "noop",
       loc: edit.hash_bounds[0].hash,
@@ -82,7 +82,9 @@ function resToSpan(
   }
 
   if (edit.content_lines.length > 0) {
-    const lastReplacementLine = edit.content_lines[edit.content_lines.length - 1]!;
+    const lastIndex = edit.content_lines.length - 1;
+    const lastReplacementLine = edit.content_lines[lastIndex]!;
+    const lastEnding = edit.content_separators?.[lastIndex];
     const endsWithBlank = lastReplacementLine.length === 0;
     const endsAtEofWithoutNewline =
       endLine === fileLines.length && !content.endsWith("\n");
@@ -92,7 +94,7 @@ function resToSpan(
       start: lineStarts[startLine - 1]!,
       end: lineStarts[endLine - 1]! + fileLines[endLine - 1]!.length,
       replacement:
-        endsAtEofWithoutNewline && endsWithBlank
+        endsAtEofWithoutNewline && (endsWithBlank || lastEnding !== undefined)
           ? `${replacement}\n`
           : replacement,
     };

package/src/hashline/index.ts

@@ -19,6 +19,7 @@ export {
 	parseHashRef,
 	parseText,
 	parseTextWithSeparators,
+	parsePayloadText,
 	type Anchor,
 	type ParsedText,
 } from "./parse";
@@ -27,6 +28,7 @@ export {
 	type HEdit,
 	type RHEdit,
 	type HTEdit,
+	type HTPayloadEdit,
 	type NEdit,
 	resEdit,
 	stripAnchorRow,

package/src/hashline/parse.ts

@@ -81,10 +81,14 @@ export function parseTextWithSeparators(edit: string[]): ParsedText {
 	}
 	const lines: string[] = [];
 	const separators: (LineEnding | undefined)[] = [];
-	for (const line of edit) {
-		const parsed = splitWithEndings(unwrapJsonEnvelope(line));
-		lines.push(...parsed.lines);
-		separators.push(...parsed.endings);
+	for (const element of edit) {
+		const text = unwrapJsonEnvelope(element);
+		const parsed = splitWithEndings(text);
+		const lineCount = text.endsWith("\n") || text.endsWith("\r") ? parsed.lines.length - 1 : parsed.lines.length;
+		for (let index = 0; index < lineCount; index++) {
+			lines.push(parsed.lines[index]!);
+			separators.push(parsed.endings[index]!);
+		}
 	}
 	return { lines, separators };
 }
@@ -92,3 +96,10 @@ export function parseTextWithSeparators(edit: string[]): ParsedText {
 export function parseText(edit: string[]): string[] {
 	return parseTextWithSeparators(edit).lines;
 }
+
+export function parsePayloadText(text: string): ParsedText {
+	if (text.length === 0) return { lines: [], separators: [] };
+	const parsed = splitWithEndings(text);
+	const lineCount = text.endsWith("\n") || text.endsWith("\r") ? parsed.lines.length - 1 : parsed.lines.length;
+	return { lines: parsed.lines.slice(0, lineCount), separators: parsed.endings.slice(0, lineCount) };
+}