pi-hashline-edit-pro 6.1.1 → 6.1.2

package/README.md

@@ -190,6 +190,8 @@ Edge cases:
 | `remove_to` | 4-char anchor marking the LAST line to remove (inclusive). |
 | `text` | The exact text to write in place of the removed range, as one string: `""` 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. Embedded `\r\n`/`\r`/`\n` are preserved; JSON decoding happens once, before the tool; the tool writes the string it receives and never decodes — `\uXXXX` is the character, `\\uXXXX` the literal text. Legacy arrays are converted to text (elements joined with LF); prefer the string form. |
 
+`replace_from` and `replace_to` are accepted as aliases for `remove_from` and `remove_to`.
+
 Example: read showed `Hasu│old` and `arvm│old2`; to replace both:
 
 ```json
@@ -219,6 +221,8 @@ After a successful edit, the diff is capped at 50KB. A row over 50KB is shown as
 
 `replace_match` changes part of a line (or a range of lines) without retyping the rest. `replace_from` and `replace_to` are bare anchors marking the first and last line of the range; use the same anchor for a single line. `old_string` is the exact text to find inside that range, and `new_string` replaces every occurrence of it; every other character stays untouched. That makes it the tool for a change the request quotes as a substring: a whole-line `replace` has to reproduce the rest of the line, so a slipped character becomes a wrong byte, while `replace_match` leaves everything the request did not name untouched. It is enabled by default; turn Replace match off in `/hashline-config` to remove the tool.
 
+`remove_from` and `remove_to` are accepted as aliases for `replace_from` and `replace_to`.
+
 `old_string` is matched against the range's text (LF line breaks, no final terminator) and every non-overlapping occurrence is replaced, left to right. A missing match is refused with `[E_SUBSTRING_NOT_FOUND]` and the current `anchor│content` rows, so the retry needs no `read`. The two boundary anchors are verified against what was last shown; lines strictly inside the range are matched against the file as it currently stands on disk.
 
 In a same-message batch it joins the other calls on its file: the batch validates everything against the pre-batch state and commits once, with one undo. A missing `old_string` aborts the whole batch unwritten. The post-edit diff carries fresh anchors, and the edit is undoable with `undo_last_change`.
@@ -346,7 +350,7 @@ The setting lives in `/hashline-config` as Auto-read all and in `config.json` as
 
 | Command | Description |
 | --- | --- |
-| `/hashline-config` | Open the settings window: auto-read anchors, auto-read all mode, ignore folders/files, disable on models, disable read on models, diff context lines, `anchor_grep` tool, copy/move tools, replace_match tool, required `path`, and strict input. Persists across sessions. |
+| `/hashline-config` | Open the settings window: auto-read anchors, auto-read all mode, ignore folders/files, disable on models, read on disabled models, diff context lines, `anchor_grep` tool, copy/move tools, replace_match tool, required `path`, and strict input. Persists across sessions. |
 | `/clear-anchors` | Clear the session's anchor claims. Anchors are re-claimed on the next `read`. |
 
 Settings live in `~/.config/pi-hashline-edit-pro/config.json`, created when a setting is first changed in `/hashline-config`:
@@ -363,7 +367,7 @@ Settings live in `~/.config/pi-hashline-edit-pro/config.json`, created when a se
   "strictInput": false,
   "diffContextLines": 1,
   "disableOnModels": [],
-  "disableReadOnModels": true
+  "readOnDisabledModels": "vanilla"
 }
 ```
 
@@ -378,10 +382,10 @@ Settings live in `~/.config/pi-hashline-edit-pro/config.json`, created when a se
 | `requirePath` | Require path | `false` | `replace`, `replace_match`, `insert`, `copy`, and `move` require a `path` argument that must match anchor ownership. |
 | `strictInput` | Strict input | `false` | Reject auto-fixable slips (`[W_BAD_SHAPE]`, `[W_BAD_REF]`, `[W_INVALID_PATCH]`, `[W_BARE_HASH_PREFIX]`) with `[E_BAD_SHAPE]` instead of applying them with a warning. |
 | `diffContextLines` | Diff context | `1` | Surrounding lines in post-edit diffs, 0-10 (needs Auto-read). |
-| `disableOnModels` | Disable on models | `[]` | Model globs matched case-insensitively against `provider/id`, the bare `id`, and `api`, with `*` and `?` wildcards. A matching model gets no anchored edit tools, no auto-read, and no write-echo refusal; `read` is only removed while Disable read on models is on. |
-| `disableReadOnModels` | Disable read on models | `true` | Also remove `read` from the active tools for a model matched by `disableOnModels`. Turn it off to keep `read` active on those models. |
+| `disableOnModels` | Disable on models | `[]` | Model globs matched case-insensitively against `provider/id`, the bare `id`, and `api`, with `*` and `?` wildcards. A matching model gets no anchored edit tools, no auto-read, and no write-echo refusal; `read` stays available as pi's ordinary read unless Read on disabled models is `remove`. |
+| `readOnDisabledModels` | Read on disabled models | `"vanilla"` | `read` for a model matched by `disableOnModels`: `"vanilla"` keeps pi's ordinary `read` active while the anchored edit tools stay off; `"remove"` disables `read` with the rest of the anchored tools. |
 
-`disableOnModels` turns off the whole anchored surface for the models you name, so another edit tool (`apply_patch`, a shell read) can own the session without competing instructions. A match removes `replace`, `replace_match`, `insert`, `copy`, `move`, `anchor_grep`, and `undo_last_change` from the active tools, and also `read` while Disable read on models is on (the default), restoring the built-in `grep` when it was active, and it also skips the auto-read-all injection, the auto-read block after `write`, the post-edit diff substitution, and the `write` hook that refuses a `write` echoing a served anchor. Because the extension's `read` replaces the built-in one, a matched model has no `read` at all unless another extension provides one, so turn Disable read on models off to keep the anchored `read` active on those models. The list is checked on `session_start`, on `model_select`, and again on `before_agent_start`, so a model change inside a session switches the surface immediately and another extension cannot re-add the tools mid-session. The default `[]` leaves every model unchanged.
+`disableOnModels` turns off the whole anchored surface for the models you name, so another edit tool (`apply_patch`, a shell read) can own the session without competing instructions. A match removes `replace`, `replace_match`, `insert`, `copy`, `move`, `anchor_grep`, and `undo_last_change` from the active tools, and also `read` when Read on disabled models is `remove`, restoring the built-in `grep` when it was active, and it also skips the auto-read-all injection, the auto-read block after `write`, the post-edit diff substitution, and the `write` hook that refuses a `write` echoing a served anchor. Because the extension's `read` replaces the built-in one, a matched model has no `read` at all under `remove` unless another extension provides one; the default `vanilla` gives those models pi's ordinary `read` while the anchored edit tools stay off. The list is checked on `session_start`, on `model_select`, and again on `before_agent_start`, so a model change inside a session switches the surface immediately and another extension cannot re-add the tools mid-session. The default `[]` leaves every model unchanged.
 
 When `PI_HASHLINE_DIR` is unset or empty, non-Windows platforms honor `XDG_CONFIG_HOME` when set (falling back to `~/.config`); on Windows the directory always uses `~/.config`, where `~` is `%USERPROFILE%`. To move the directory explicitly, see [Isolated state](#isolated-state).
 

package/index.ts

@@ -1,5 +1,5 @@
 import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
-import { DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES } from "@earendil-works/pi-coding-agent";
+import { createReadToolDefinition, DEFAULT_MAX_BYTES, DEFAULT_MAX_LINES } from "@earendil-works/pi-coding-agent";
 import { initHasher } from "./src/hashline";
 import { regReplaceMatch } from "./src/replace-match";
 import { regReplace } from "./src/replace";
@@ -16,7 +16,7 @@ import type { ReplaceDetails } from "./src/replace";
 import { extractHints, extractWarnings } from "./src/replace-render";
 import { MAX_HASH_LINES } from "./src/hashline";
 import { withStructuredText } from "./src/structured";
-import type { AutoReadAllMode } from "./src/config";
+import type { AutoReadAllMode, ReadOnDisabledModels } from "./src/config";
 import {
   readConfig,
   readConfigWithStatus,
@@ -25,7 +25,7 @@ import {
   toggleAnchorGrep,
   toggleCopyMove,
   toggleReplaceMatch,
-  toggleDisableReadOnModels,
+  cycleReadOnDisabledModels,
   toggleRequirePath,
   toggleStrictInput,
   adjustDiffContextLines,
@@ -62,7 +62,9 @@ export default function (pi: ExtensionAPI): void {
   let autoReadAll: AutoReadAllMode = "off";
   let autoReadAllIgnore: string[] = [];
   let disableOnModels: string[] = [];
-  let disableReadOnModels = true;
+  let readOnDisabledModels: ReadOnDisabledModels = "vanilla";
+  let readFlavor: "anchored" | "vanilla" = "anchored";
+  let readFlavorCwd: string | undefined;
   let autoReadAllInjected = false;
   let grepWasActive = false;
   const baseAnchorTools = new Set<string>();
@@ -71,7 +73,7 @@ export default function (pi: ExtensionAPI): void {
   async function refreshEditTools(): Promise<void> {
     try {
       const flags = await currentEditFlags(pi.getActiveTools().includes("codemode"));
-      regRead(pi, flags);
+      if (readFlavor !== "vanilla") regRead(pi, flags);
       regReplace(pi, flags);
       regReplaceMatch(pi, flags);
       regInsert(pi, flags);
@@ -84,11 +86,24 @@ export default function (pi: ExtensionAPI): void {
     }
   }
 
-  async function syncModelGate(model: ModelLike | undefined): Promise<void> {
-    if (disableOnModels.length > 0 && modelDisabled(model, disableOnModels)) {
+  async function syncModelGate(model: ModelLike | undefined, cwd: string): Promise<void> {
+    const gated = disableOnModels.length > 0 && modelDisabled(model, disableOnModels);
+    if (gated && readOnDisabledModels === "vanilla") {
+      if (readFlavor !== "vanilla" || readFlavorCwd !== cwd) {
+        pi.registerTool(createReadToolDefinition(cwd));
+        readFlavor = "vanilla";
+        readFlavorCwd = cwd;
+      }
+    } else if (readFlavor === "vanilla") {
+      readFlavor = "anchored";
+      readFlavorCwd = undefined;
+      await refreshEditTools();
+    }
+    if (gated) {
       const active = pi.getActiveTools();
-      const gated = disableReadOnModels ? ANCHOR_TOOL_NAMES : ANCHOR_TOOL_NAMES.filter((tool) => tool !== "read");
-      const next = active.filter((tool) => !gated.includes(tool));
+      const gatedTools = readOnDisabledModels === "vanilla" ? ANCHOR_TOOL_NAMES.filter((tool) => tool !== "read") : ANCHOR_TOOL_NAMES;
+      const next = active.filter((tool) => !gatedTools.includes(tool));
+      if (readOnDisabledModels === "vanilla" && baseAnchorTools.has("read") && !next.includes("read")) next.push("read");
       if (grepWasActive && !next.includes("grep")) next.push("grep");
       pi.setActiveTools(next);
       gateApplied = true;
@@ -136,7 +151,7 @@ export default function (pi: ExtensionAPI): void {
     autoReadAll = config.autoReadAll ?? "off";
     autoReadAllIgnore = config.autoReadAllIgnore ?? [];
     disableOnModels = config.disableOnModels ?? [];
-    disableReadOnModels = config.disableReadOnModels !== false;
+    readOnDisabledModels = config.readOnDisabledModels ?? "vanilla";
     const sessionBranch = (ctx as { sessionManager?: { getBranch?: () => Array<{ type?: string; customType?: string }> } }).sessionManager?.getBranch?.() ?? [];
     autoReadAllInjected = sessionBranch.some((entry) => entry.type === "custom_message" && entry.customType === AUTO_READ_ALL_CUSTOM_TYPE);
     await refreshEditTools();
@@ -148,7 +163,7 @@ export default function (pi: ExtensionAPI): void {
         return true;
       }),
     );
-    await syncModelGate(ctx.model);
+    await syncModelGate(ctx.model, ctx.cwd);
     const debugValue = process.env.PI_HASHLINE_DEBUG;
     if (debugValue === "1" || debugValue === "true") {
       ctx.ui.notify(`Hashline Edit mode active`, "info");
@@ -165,11 +180,11 @@ export default function (pi: ExtensionAPI): void {
     }
   });
   pi.on("model_select", async (event, ctx) => withAnchorSession(ctx, async () => {
-    await syncModelGate(event.model);
+    await syncModelGate(event.model, ctx.cwd);
   }));
 
   pi.on("before_agent_start", async (_event, ctx) => withAnchorSession(ctx, async () => {
-    await syncModelGate(ctx.model);
+    await syncModelGate(ctx.model, ctx.cwd);
     if (autoReadAll === "off" || autoReadAllInjected) return;
     if (modelDisabled(ctx.model, disableOnModels)) return;
     autoReadAllInjected = true;
@@ -201,7 +216,7 @@ export default function (pi: ExtensionAPI): void {
             else if (key === "autoReadAll") { autoReadAll = await cycleAutoReadAllMode(); autoReadAllInjected = false; }
             else if (key === "autoReadAllIgnore") autoReadAllIgnore = await setAutoReadAllIgnoreFromText(value ?? "");
             else if (key === "disableOnModels") disableOnModels = await setDisableOnModelsFromText(value ?? "");
-            else if (key === "disableReadOnModels") disableReadOnModels = await toggleDisableReadOnModels();
+            else if (key === "readOnDisabledModels") readOnDisabledModels = await cycleReadOnDisabledModels();
             else if (key === "diffContextLines") await adjustDiffContextLines(delta ?? 1);
             else if (key === "anchorGrepEnabled") {
               const enabled = await toggleAnchorGrep();
@@ -229,7 +244,7 @@ export default function (pi: ExtensionAPI): void {
             else if (key === "requirePath") await toggleRequirePath();
             else if (key === "strictInput") await toggleStrictInput();
             await refreshEditTools();
-            await syncModelGate(ctx.model);
+            await syncModelGate(ctx.model, ctx.cwd);
           },
         });
         await overlay.load();

package/package.json

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

package/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.
+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`.
 
 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/prompts/replace.md

@@ -1,2 +1,2 @@
-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 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`.

package/src/batch.ts

@@ -233,7 +233,7 @@ export function resetBatchStateForTests(): void {
 
 function normalizeEditArgs(name: string, args: unknown): NormalizedEditArgs | undefined {
   if (!isRec(args)) return undefined;
-  const normalized = normReq(args);
+  const normalized = normReq(args, name === "replace_match" ? "replace" : name === "replace" ? "remove" : undefined);
   if (!isRec(normalized)) return undefined;
   const path = typeof normalized.path === "string" ? normalized.path : undefined;
   if (name === "copy" || name === "move") {
@@ -787,7 +787,7 @@ async function finishBatch(member: PlannedMember, signal?: AbortSignal): Promise
     if (!planned) continue;
     if (executedOrders.has(planned.order)) continue;
     try {
-      const normalized = normReq(planned.args);
+      const normalized = normReq(planned.args, planned.kind === "replace_match" ? "replace" : planned.kind === "replace" ? "remove" : undefined);
       if (planned.kind === "insert") assertInsertReq(normalized);
       else if (planned.kind === "replace") assertReq(normalized);
       else if (planned.kind === "replace_match") assertReplaceMatchReq(normalized);

package/src/config-ui.ts

@@ -2,7 +2,7 @@ import { Key, matchesKey, visibleWidth } from "@earendil-works/pi-tui";
 import type { Theme } from "@earendil-works/pi-coding-agent";
 import { readConfig, type Config } from "./config";
 
-export type ConfigToggleKey = "autoRead" | "autoReadAll" | "autoReadAllIgnore" | "anchorGrepEnabled" | "copyMoveEnabled" | "replaceMatchEnabled" | "requirePath" | "strictInput" | "diffContextLines" | "disableOnModels" | "disableReadOnModels";
+export type ConfigToggleKey = "autoRead" | "autoReadAll" | "autoReadAllIgnore" | "anchorGrepEnabled" | "copyMoveEnabled" | "replaceMatchEnabled" | "requirePath" | "strictInput" | "diffContextLines" | "disableOnModels" | "readOnDisabledModels";
 
 export interface ConfigRow {
   key: ConfigToggleKey;
@@ -28,7 +28,7 @@ export function configRows(config: Config): ConfigRow[] {
     { key: "strictInput", label: "Strict input", hint: "Reject auto-fixable slips instead of warnings", enabled: config.strictInput === true },
     { key: "replaceMatchEnabled", label: "Replace match", hint: "replace_match tool (off while disabled)", enabled: config.replaceMatchEnabled !== false },
     { key: "disableOnModels", label: "Disable on models", hint: "Model globs (provider/id, model id, or api) that turn off the anchored edit tools (comma-separated)", enabled: (config.disableOnModels ?? []).length > 0, entries: config.disableOnModels ?? [] },
-    { key: "disableReadOnModels", label: "Disable read on models", hint: "Also turn off read for models matched by Disable on models (off keeps read active)", enabled: config.disableReadOnModels !== false },
+    { key: "readOnDisabledModels", label: "Read on disabled models", hint: "Read for models matched by Disable on models: vanilla (plain pi read), or remove it", enabled: (config.readOnDisabledModels ?? "vanilla") !== "remove", mode: config.readOnDisabledModels ?? "vanilla", cycle: ["remove", "vanilla"] },
   ];
 }
 

package/src/config.ts

@@ -6,6 +6,9 @@ import { writeAtomic } from "./fs-write";
 export type AutoReadAllMode = "off" | "on" | "git";
 const AUTO_READ_ALL_MODES: AutoReadAllMode[] = ["off", "on", "git"];
 
+export type ReadOnDisabledModels = "remove" | "vanilla";
+const READ_ON_DISABLED_MODELS: ReadOnDisabledModels[] = ["remove", "vanilla"];
+
 export const DEFAULT_DIFF_CONTEXT_LINES = 1;
 export const MIN_DIFF_CONTEXT_LINES = 0;
 export const MAX_DIFF_CONTEXT_LINES = 10;
@@ -21,7 +24,7 @@ export interface Config {
   strictInput?: boolean;
   diffContextLines?: number;
   disableOnModels?: string[];
-  disableReadOnModels?: boolean;
+  readOnDisabledModels?: ReadOnDisabledModels;
 }
 
 const DEFAULT_CONFIG: Config = {
@@ -35,7 +38,7 @@ const DEFAULT_CONFIG: Config = {
   strictInput: false,
   diffContextLines: DEFAULT_DIFF_CONTEXT_LINES,
   disableOnModels: [],
-  disableReadOnModels: true,
+  readOnDisabledModels: "vanilla",
 };
 
 function parseAutoReadAllMode(value: unknown): AutoReadAllMode {
@@ -45,6 +48,12 @@ function parseAutoReadAllMode(value: unknown): AutoReadAllMode {
   return DEFAULT_CONFIG.autoReadAll ?? "off";
 }
 
+function parseReadOnDisabledModels(value: unknown, legacy: unknown): ReadOnDisabledModels {
+  if (value === "remove" || value === "vanilla") return value;
+  if (typeof legacy === "boolean") return legacy ? "remove" : "vanilla";
+  return DEFAULT_CONFIG.readOnDisabledModels ?? "vanilla";
+}
+
 export function normalizeAutoReadAllIgnoreEntry(entry: string): string {
   return entry.trim().replace(/\\/g, "/").replace(/^\/+|\/+$/g, "").replace(/\/{2,}/g, "/");
 }
@@ -96,7 +105,8 @@ function parseConfig(content: string): Config {
   const diffContextLines = parsed.diffContextLines;
   const autoReadAllIgnore = parsed.autoReadAllIgnore;
   const disableOnModels = parsed.disableOnModels;
-  const disableReadOnModels = parsed.disableReadOnModels;
+  const readOnDisabledModels = parsed.readOnDisabledModels;
+  const legacyDisableReadOnModels = parsed.disableReadOnModels;
   return {
     autoRead: typeof autoRead === "boolean" ? autoRead : DEFAULT_CONFIG.autoRead,
     anchorGrepEnabled: typeof anchorGrepEnabled === "boolean" ? anchorGrepEnabled : DEFAULT_CONFIG.anchorGrepEnabled,
@@ -108,7 +118,7 @@ function parseConfig(content: string): Config {
     diffContextLines: normalizeDiffContextLines(diffContextLines),
     autoReadAllIgnore: parseAutoReadAllIgnore(autoReadAllIgnore),
     disableOnModels: parseDisableOnModels(disableOnModels),
-    disableReadOnModels: typeof disableReadOnModels === "boolean" ? disableReadOnModels : DEFAULT_CONFIG.disableReadOnModels,
+    readOnDisabledModels: parseReadOnDisabledModels(readOnDisabledModels, legacyDisableReadOnModels),
   };
 }
 
@@ -216,7 +226,7 @@ export async function writeConfig(config: Config): Promise<void> {
 }
 
 
-type ToggleKey = "autoRead" | "anchorGrepEnabled" | "copyMoveEnabled" | "replaceMatchEnabled" | "requirePath" | "strictInput" | "disableReadOnModels";
+type ToggleKey = "autoRead" | "anchorGrepEnabled" | "copyMoveEnabled" | "replaceMatchEnabled" | "requirePath" | "strictInput";
 
 async function toggleFlag(key: ToggleKey): Promise<boolean> {
   const config = await updateConfig((c) => { c[key] = !(c[key] === true); });
@@ -226,7 +236,15 @@ export const toggleAutoRead = (): Promise<boolean> => toggleFlag("autoRead");
 export const toggleAnchorGrep = (): Promise<boolean> => toggleFlag("anchorGrepEnabled");
 export const toggleCopyMove = (): Promise<boolean> => toggleFlag("copyMoveEnabled");
 export const toggleReplaceMatch = (): Promise<boolean> => toggleFlag("replaceMatchEnabled");
-export const toggleDisableReadOnModels = (): Promise<boolean> => toggleFlag("disableReadOnModels");
+export async function cycleReadOnDisabledModels(): Promise<ReadOnDisabledModels> {
+  let next: ReadOnDisabledModels = "vanilla";
+  await updateConfig((c) => {
+    const current = c.readOnDisabledModels ?? "vanilla";
+    next = READ_ON_DISABLED_MODELS[(READ_ON_DISABLED_MODELS.indexOf(current) + 1) % READ_ON_DISABLED_MODELS.length] ?? "remove";
+    c.readOnDisabledModels = next;
+  });
+  return next;
+}
 export async function cycleAutoReadAllMode(): Promise<AutoReadAllMode> {
   let next: AutoReadAllMode = "off";
   await updateConfig((c) => {

package/src/payload-contract.ts

@@ -85,7 +85,7 @@ export { normalizeRequest as normReq } from "./utils";
 export function getPreviewInput(args: unknown): { path?: string; remove_from: string; remove_to: string; text: string } | null {
   let normalized: unknown;
   try {
-    normalized = normalizeRequest(args);
+    normalized = normalizeRequest(args, "remove");
   } catch {
     return null;
   }
@@ -196,7 +196,12 @@ export function assertReplaceMatchReq(request: unknown): asserts request is Repl
 }
 
 export function getReplaceMatchInput(args: unknown): { path?: string; replace_from: string; replace_to: string; old_string: string; new_string: string } | null {
-  const normalized: unknown = args;
+  let normalized: unknown;
+  try {
+    normalized = normalizeRequest(args, "replace");
+  } catch {
+    return null;
+  }
   if (!isRec(normalized)) return null;
   if (
     typeof normalized.replace_from !== "string" ||

package/src/replace-match.ts

@@ -11,9 +11,10 @@ import {
   assertReplaceMatchReq,
   buildReplaceMatchToolSchema,
   getReplaceMatchInput,
+  normReq,
   type ReplaceMatchReq,
 } from "./payload-contract";
-import { literalEscapeHints, splitLines } from "./utils";
+import { literalEscapeHints, makePrepareArguments, splitLines } from "./utils";
 import { toLF } from "./normalize";
 import { MAX_RANGE_STALE_LINES } from "./constants";
 import {
@@ -110,7 +111,7 @@ export function buildReplaceMatchEdit(
 
 export async function replaceMatchPreview(request: unknown, cwd: string, signal?: AbortSignal): Promise<RPreview> {
   try {
-    const normalized: unknown = request;
+    const normalized = normReq(request, "replace");
     assertReplaceMatchReq(normalized);
     const req = normalized;
     const { refs, warnings } = parseMatchAnchors(req);
@@ -158,6 +159,7 @@ export function buildReplaceMatchToolDef(flags: EditToolFlags = DEFAULT_EDIT_FLA
     promptSnippet: prompted.snippet,
     promptGuidelines: prompted.guidelines,
     ...editToolBase,
+    prepareArguments: makePrepareArguments("replace"),
     parameters: buildReplaceMatchToolSchema(flags.requirePath),
     outputSchema: editResultSchema,
     renderCall: makeRenderCall(replaceMatchPreview, {
@@ -168,7 +170,7 @@ export function buildReplaceMatchToolDef(flags: EditToolFlags = DEFAULT_EDIT_FLA
     renderResult: editRenderResultWrapper,
     async execute(_toolCallId, params, signal, _onUpdate, ctx) {
       return withStructuredErrors(signal, { diff: "" }, () => withAnchorSession(ctx, async () => {
-        const normalized: unknown = params;
+        const normalized = normReq(params, "replace");
         assertReplaceMatchReq(normalized);
         const req = normalized;
         let refs: MatchRefs;

package/src/replace.ts

@@ -10,7 +10,7 @@ import {
 } from "./replace-diff";
 import { readNormFile, type NormFile } from "./file-reader";
 import { editToolSchema, buildEditToolSchema, type ReqParams, type RawReqParams, assertReq, normReq } from "./payload-contract";
-import { literalEscapeHints, splitLines } from "./utils";
+import { literalEscapeHints, makePrepareArguments, splitLines } from "./utils";
 import { editResultSchema, withStructuredErrors } from "./structured";
 import { loadP, loadGuide } from "./prompts";
 import { type FileIdentity } from "./fs-write";
@@ -240,7 +240,7 @@ export async function compPreview(
   signal?: AbortSignal,
 ): Promise<RPreview> {
   try {
-    const normalized = normReq(request);
+    const normalized = normReq(request, "remove");
     assertReq(normalized);
     const targetPath = await resolveEditTargetWithRequirement({
       removeFrom: (normalized as ReqParams).remove_from,
@@ -283,11 +283,12 @@ export function buildToolDef(flags: EditToolFlags = DEFAULT_EDIT_FLAGS): ToolDef
     promptSnippet: prompted.snippet,
     promptGuidelines: prompted.guidelines,
     ...editToolBase,
+    prepareArguments: makePrepareArguments("remove"),
     renderCall: editRenderCallWrapper(compPreview),
     renderResult: editRenderResultWrapper,
     async execute(_toolCallId, params, signal, _onUpdate, ctx) {
       return withStructuredErrors(signal, { diff: "" }, () => withAnchorSession(ctx, async () => {
-        const canonical = normReq(params);
+        const canonical = normReq(params, "remove");
         assertReq(canonical);
         const normalizedParams = canonical;
         const literalEscapes = literalEscapeHints([normalizedParams.text], "text");

package/src/utils.ts

@@ -8,15 +8,31 @@ export function isRec(value: unknown): value is Record<string, unknown> {
 }
 
 
-export function normalizeRequest(input: unknown): unknown {
+export type AnchorPairName = "remove" | "replace";
+
+const ANCHOR_ALIASES: Record<AnchorPairName, Record<string, string>> = {
+  remove: { replace_from: "remove_from", replace_to: "remove_to" },
+  replace: { remove_from: "replace_from", remove_to: "replace_to" },
+};
+
+function normalizeAnchorAliases(record: Record<string, unknown>, pair: AnchorPairName): void {
+  for (const [alias, canonical] of Object.entries(ANCHOR_ALIASES[pair])) {
+    if (!(alias in record)) continue;
+    if (record[canonical] === undefined) record[canonical] = record[alias];
+    delete record[alias];
+  }
+}
+
+export function normalizeRequest(input: unknown, pair?: AnchorPairName): unknown {
   if (!isRec(input)) return input;
   const record: Record<string, unknown> = { ...input };
   normalizeEditLines(record);
+  if (pair !== undefined) normalizeAnchorAliases(record, pair);
   return record;
 }
 
-export function makePrepareArguments(): (args: unknown) => any {
-  return normalizeRequest;
+export function makePrepareArguments(pair?: AnchorPairName): (args: unknown) => any {
+  return (args) => normalizeRequest(args, pair);
 }
 
 export function splitLines(text: string): string[] {