march-cli 0.1.24 → 0.1.25

package/bin/march.mjs

@@ -1,13 +1,13 @@
-#!/usr/bin/env node
-
-const emitWarning = process.emitWarning;
-process.emitWarning = function filteredWarning(warning, ...args) {
-  const message = typeof warning === "string" ? warning : warning?.message;
-  const type = typeof warning === "string" ? args[0] : warning?.name;
-  if (type === "ExperimentalWarning" && String(message).includes("SQLite")) return;
-  return emitWarning.call(this, warning, ...args);
-};
-
-const { run } = await import("../src/main.mjs");
-const code = await run(process.argv.slice(2));
-process.exitCode = code;
+#!/usr/bin/env node
+
+const emitWarning = process.emitWarning;
+process.emitWarning = function filteredWarning(warning, ...args) {
+  const message = typeof warning === "string" ? warning : warning?.message;
+  const type = typeof warning === "string" ? args[0] : warning?.name;
+  if (type === "ExperimentalWarning" && String(message).includes("SQLite")) return;
+  return emitWarning.call(this, warning, ...args);
+};
+
+const { run } = await import("../src/main.mjs");
+const code = await run(process.argv.slice(2));
+process.exitCode = code;

package/package.json

@@ -1,49 +1,49 @@
-{
-  "name": "march-cli",
-  "version": "0.1.24",
-  "description": "March CLI — terminal-native coding agent with context reconstruction",
-  "type": "module",
-  "main": "./src/main.mjs",
-  "bin": {
-    "march": "bin/march.mjs"
-  },
-  "files": [
-    "bin/",
-    "src/"
-  ],
-  "scripts": {
-    "dev": "cd .. && node march-cli/bin/march.mjs",
-    "test": "node test/smoke.test.mjs",
-    "test:fast": "node test/fast.test.mjs",
-    "test:real": "npm run test:shell-runtime-real && npm run test:shell-tui-real && npm run test:tui-key-real",
-    "test:shell-runtime-real": "node test/shell-real-runtime.acceptance.mjs",
-    "test:shell-tui-real": "node test/shell-tui-real.acceptance.mjs",
-    "test:tui-key-real": "node test/tui-key-real.acceptance.mjs",
-    "docs:dev": "vitepress dev docs --host 127.0.0.1",
-    "docs:build": "vitepress build docs",
-    "docs:preview": "vitepress preview docs --host 127.0.0.1",
-    "context": "cd .. && node march-cli/bin/march.mjs --dump-context",
-    "notify:experiment": "node scripts/notify-experiment.mjs",
-    "publish:env": "node scripts/npm-publish-from-env.mjs"
-  },
-  "dependencies": {
-    "@earendil-works/pi-ai": "^0.74.0",
-    "@earendil-works/pi-coding-agent": "^0.74.0",
-    "@earendil-works/pi-tui": "^0.74.0",
-    "@modelcontextprotocol/sdk": "^1.29.0",
-    "@xterm/headless": "^5.5.0",
-    "marked": "^18.0.3",
-    "node-notifier": "^10.0.1",
-    "node-pty": "^1.1.0",
-    "typebox": "^1.0.58",
-    "undici": "^7.25.0",
-    "web-tree-sitter": "^0.26.8",
-    "ws": "^8.20.1"
-  },
-  "optionalDependencies": {
-    "@vscode/ripgrep": "^1.18.0"
-  },
-  "devDependencies": {
-    "vitepress": "^1.6.4"
-  }
-}
+{
+  "name": "march-cli",
+  "version": "0.1.25",
+  "description": "March CLI — terminal-native coding agent with context reconstruction",
+  "type": "module",
+  "main": "./src/main.mjs",
+  "bin": {
+    "march": "bin/march.mjs"
+  },
+  "files": [
+    "bin/",
+    "src/"
+  ],
+  "scripts": {
+    "dev": "cd .. && node march-cli/bin/march.mjs",
+    "test": "node test/smoke.test.mjs",
+    "test:fast": "node test/fast.test.mjs",
+    "test:real": "npm run test:shell-runtime-real && npm run test:shell-tui-real && npm run test:tui-key-real",
+    "test:shell-runtime-real": "node test/shell-real-runtime.acceptance.mjs",
+    "test:shell-tui-real": "node test/shell-tui-real.acceptance.mjs",
+    "test:tui-key-real": "node test/tui-key-real.acceptance.mjs",
+    "docs:dev": "vitepress dev docs --host 127.0.0.1",
+    "docs:build": "vitepress build docs",
+    "docs:preview": "vitepress preview docs --host 127.0.0.1",
+    "context": "cd .. && node march-cli/bin/march.mjs --dump-context",
+    "notify:experiment": "node scripts/notify-experiment.mjs",
+    "publish:env": "node scripts/npm-publish-from-env.mjs"
+  },
+  "dependencies": {
+    "@earendil-works/pi-ai": "^0.74.0",
+    "@earendil-works/pi-coding-agent": "^0.74.0",
+    "@earendil-works/pi-tui": "^0.74.0",
+    "@modelcontextprotocol/sdk": "^1.29.0",
+    "@xterm/headless": "^5.5.0",
+    "marked": "^18.0.3",
+    "node-notifier": "^10.0.1",
+    "node-pty": "^1.1.0",
+    "typebox": "^1.0.58",
+    "undici": "^7.25.0",
+    "web-tree-sitter": "^0.26.8",
+    "ws": "^8.20.1"
+  },
+  "optionalDependencies": {
+    "@vscode/ripgrep": "^1.18.0"
+  },
+  "devDependencies": {
+    "vitepress": "^1.6.4"
+  }
+}

package/src/agent/command-exec-tool.mjs

@@ -1,172 +1,172 @@
-import { spawn, spawnSync } from "node:child_process";
-import { existsSync } from "node:fs";
-import { defineTool } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-import { toolText } from "./tool-result.mjs";
-import { stripAnsi } from "../text/ansi.mjs";
-
-const OUTPUT_LIMIT = 64 * 1024;
-const DEFAULT_COMMAND_TIMEOUT_SECONDS = 60;
-const COMMAND_KILL_GRACE_MS = 1000;
-
-export function createCommandExecTool({ cwd }) {
-  return defineTool({
-    name: "command_exec",
-    label: "Command Exec",
-    description: "Run a one-shot command in the project directory. Use terminal_* for interactive or long-running processes.",
-    parameters: Type.Object({
-      command: Type.String({ description: "Command to execute" }),
-      shell: Type.Optional(Type.String({ description: "auto (default), bash, or powershell" })),
-      timeout: Type.Optional(Type.Number({ description: "Timeout in seconds; default 60", default: DEFAULT_COMMAND_TIMEOUT_SECONDS })),
-    }),
-    execute: async (_toolCallId, params, signal) => executeCommand({ cwd, signal, ...params }),
-  });
-}
-
-export async function executeCommand({ cwd, command, shell = "auto", timeout = DEFAULT_COMMAND_TIMEOUT_SECONDS, signal, spawnImpl = spawn, killProcessTreeImpl = killProcessTree, forceSettleMs = COMMAND_KILL_GRACE_MS }) {
-  let resolved;
-  try {
-    resolved = resolveCommandShell(shell);
-  } catch (err) {
-    return toolText(`Error: ${err.message}`, { error: true });
-  }
-
-  const timeoutSeconds = Math.max(0.001, Number(timeout) || DEFAULT_COMMAND_TIMEOUT_SECONDS);
-  const timeoutMs = timeoutSeconds * 1000;
-  const result = await spawnCommand(spawnImpl, resolved.bin, [...resolved.args, String(command ?? "")], {
-    cwd,
-    timeoutMs,
-    signal,
-    windowsHide: true,
-    killProcessTreeImpl,
-    forceSettleMs,
-  });
-  if (result.error) {
-    const detail = result.timedOut ? ` (timed out after ${timeoutSeconds}s)` : "";
-    return toolText(`Error: ${result.error.message}${detail}`, { error: true });
-  }
-  const stdout = stripAnsi(result.stdout ?? "");
-  const stderr = stripAnsi(result.stderr ?? "");
-  const output = formatCommandOutput({ stdout, stderr, status: result.status });
-  return toolText(output, {
-    status: result.status,
-    stdout,
-    stderr,
-    shell: resolved.name,
-    error: result.status !== 0,
-  });
-}
-
-function spawnCommand(spawnImpl, bin, args, options) {
-  return new Promise((resolve) => {
-    let stdout = "";
-    let stderr = "";
-    let settled = false;
-    let timedOut = false;
-    let aborted = false;
-    let forceTimer = null;
-    const child = spawnImpl(bin, args, {
-      cwd: options.cwd,
-      windowsHide: options.windowsHide,
-      detached: process.platform !== "win32",
-    });
-    const timer = setTimeout(() => {
-      timedOut = true;
-      terminateChild(new Error("Command timed out"));
-    }, options.timeoutMs);
-    const onAbort = () => {
-      aborted = true;
-      terminateChild(new Error("Command aborted"));
-    };
-    if (options.signal?.aborted) queueMicrotask(onAbort);
-    else options.signal?.addEventListener?.("abort", onAbort, { once: true });
-
-    child.stdout?.setEncoding?.("utf8");
-    child.stderr?.setEncoding?.("utf8");
-    child.stdout?.on?.("data", (chunk) => { stdout = appendLimited(stdout, chunk); });
-    child.stderr?.on?.("data", (chunk) => { stderr = appendLimited(stderr, chunk); });
-    child.once?.("error", (error) => finish({ error }));
-    child.once?.("close", (status, signal) => finish({ status, signal }));
-
-    function terminateChild(error) {
-      if (settled) return;
-      forceTimer ??= setTimeout(() => finish({ error }), options.forceSettleMs);
-      try {
-        options.killProcessTreeImpl?.(child);
-      } catch {}
-    }
-
-    function finish(result) {
-      if (settled) return;
-      settled = true;
-      clearTimeout(timer);
-      clearTimeout(forceTimer);
-      options.signal?.removeEventListener?.("abort", onAbort);
-      const error = result.error ?? (timedOut ? Object.assign(new Error("Command timed out"), { code: "ETIMEDOUT" }) : null) ?? (aborted ? Object.assign(new Error("Command aborted"), { code: "ABORT_ERR" }) : null);
-      resolve({ ...result, error, stdout, stderr, timedOut, aborted });
-    }
-  });
-}
-
-export function killProcessTree(child, platform = process.platform, spawnImpl = spawn) {
-  if (!child?.pid) {
-    child?.kill?.("SIGTERM");
-    return;
-  }
-  if (platform === "win32") {
-    try {
-      const killer = spawnImpl("taskkill", ["/PID", String(child.pid), "/T", "/F"], { windowsHide: true, stdio: "ignore" });
-      killer?.on?.("error", () => child.kill?.("SIGTERM"));
-      killer?.unref?.();
-      return;
-    } catch {}
-  }
-  try {
-    process.kill(-child.pid, "SIGTERM");
-    return;
-  } catch {}
-  child.kill?.("SIGTERM");
-}
-
-function appendLimited(current, chunk) {
-  const next = current + String(chunk ?? "");
-  return next.length <= OUTPUT_LIMIT ? next : next.slice(-OUTPUT_LIMIT);
-}
-
-export function resolveCommandShell(shell = "auto", platform = process.platform) {
-  const normalized = String(shell ?? "auto").trim().toLowerCase();
-  if (normalized === "powershell" || (normalized === "auto" && platform === "win32")) {
-    return { name: "powershell", bin: findPowerShell() ?? "powershell.exe", args: ["-NoProfile", "-Command"] };
-  }
-  if (normalized === "bash" || normalized === "auto") {
-    return { name: "bash", bin: "bash", args: ["-lc"] };
-  }
-  throw new Error(`unsupported shell: ${shell}`);
-}
-
-function findPowerShell() {
-  for (const name of ["pwsh.exe", "powershell.exe"]) {
-    try {
-      const result = spawnSync("where", [name], { encoding: "utf-8", timeout: 5000, windowsHide: true });
-      if (result.status === 0 && result.stdout) {
-        const first = result.stdout.trim().split(/\r?\n/)[0];
-        if (first && existsSync(first)) return first;
-      }
-    } catch {}
-  }
-  return null;
-}
-
-function formatCommandOutput({ stdout, stderr, status }) {
-  const parts = [];
-  if (stdout) parts.push(stdout.trimEnd());
-  if (stderr) parts.push(stderr.trimEnd());
-  if (status && status !== 0) parts.push(`exit ${status}`);
-  const output = parts.filter(Boolean).join("\n");
-  return output ? truncateOutput(output) : "(no output)";
-}
-
-function truncateOutput(text) {
-  if (text.length <= OUTPUT_LIMIT) return text;
-  return `${text.slice(-OUTPUT_LIMIT)}\n... (truncated to last ${OUTPUT_LIMIT} chars)`;
-}
+import { spawn, spawnSync } from "node:child_process";
+import { existsSync } from "node:fs";
+import { defineTool } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+import { toolText } from "./tool-result.mjs";
+import { stripAnsi } from "../text/ansi.mjs";
+
+const OUTPUT_LIMIT = 64 * 1024;
+const DEFAULT_COMMAND_TIMEOUT_SECONDS = 60;
+const COMMAND_KILL_GRACE_MS = 1000;
+
+export function createCommandExecTool({ cwd }) {
+  return defineTool({
+    name: "command_exec",
+    label: "Command Exec",
+    description: "Run a one-shot command in the project directory. Use terminal_* for interactive or long-running processes.",
+    parameters: Type.Object({
+      command: Type.String({ description: "Command to execute" }),
+      shell: Type.Optional(Type.String({ description: "auto (default), bash, or powershell" })),
+      timeout: Type.Optional(Type.Number({ description: "Timeout in seconds; default 60", default: DEFAULT_COMMAND_TIMEOUT_SECONDS })),
+    }),
+    execute: async (_toolCallId, params, signal) => executeCommand({ cwd, signal, ...params }),
+  });
+}
+
+export async function executeCommand({ cwd, command, shell = "auto", timeout = DEFAULT_COMMAND_TIMEOUT_SECONDS, signal, spawnImpl = spawn, killProcessTreeImpl = killProcessTree, forceSettleMs = COMMAND_KILL_GRACE_MS }) {
+  let resolved;
+  try {
+    resolved = resolveCommandShell(shell);
+  } catch (err) {
+    return toolText(`Error: ${err.message}`, { error: true });
+  }
+
+  const timeoutSeconds = Math.max(0.001, Number(timeout) || DEFAULT_COMMAND_TIMEOUT_SECONDS);
+  const timeoutMs = timeoutSeconds * 1000;
+  const result = await spawnCommand(spawnImpl, resolved.bin, [...resolved.args, String(command ?? "")], {
+    cwd,
+    timeoutMs,
+    signal,
+    windowsHide: true,
+    killProcessTreeImpl,
+    forceSettleMs,
+  });
+  if (result.error) {
+    const detail = result.timedOut ? ` (timed out after ${timeoutSeconds}s)` : "";
+    return toolText(`Error: ${result.error.message}${detail}`, { error: true });
+  }
+  const stdout = stripAnsi(result.stdout ?? "");
+  const stderr = stripAnsi(result.stderr ?? "");
+  const output = formatCommandOutput({ stdout, stderr, status: result.status });
+  return toolText(output, {
+    status: result.status,
+    stdout,
+    stderr,
+    shell: resolved.name,
+    error: result.status !== 0,
+  });
+}
+
+function spawnCommand(spawnImpl, bin, args, options) {
+  return new Promise((resolve) => {
+    let stdout = "";
+    let stderr = "";
+    let settled = false;
+    let timedOut = false;
+    let aborted = false;
+    let forceTimer = null;
+    const child = spawnImpl(bin, args, {
+      cwd: options.cwd,
+      windowsHide: options.windowsHide,
+      detached: process.platform !== "win32",
+    });
+    const timer = setTimeout(() => {
+      timedOut = true;
+      terminateChild(new Error("Command timed out"));
+    }, options.timeoutMs);
+    const onAbort = () => {
+      aborted = true;
+      terminateChild(new Error("Command aborted"));
+    };
+    if (options.signal?.aborted) queueMicrotask(onAbort);
+    else options.signal?.addEventListener?.("abort", onAbort, { once: true });
+
+    child.stdout?.setEncoding?.("utf8");
+    child.stderr?.setEncoding?.("utf8");
+    child.stdout?.on?.("data", (chunk) => { stdout = appendLimited(stdout, chunk); });
+    child.stderr?.on?.("data", (chunk) => { stderr = appendLimited(stderr, chunk); });
+    child.once?.("error", (error) => finish({ error }));
+    child.once?.("close", (status, signal) => finish({ status, signal }));
+
+    function terminateChild(error) {
+      if (settled) return;
+      forceTimer ??= setTimeout(() => finish({ error }), options.forceSettleMs);
+      try {
+        options.killProcessTreeImpl?.(child);
+      } catch {}
+    }
+
+    function finish(result) {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      clearTimeout(forceTimer);
+      options.signal?.removeEventListener?.("abort", onAbort);
+      const error = result.error ?? (timedOut ? Object.assign(new Error("Command timed out"), { code: "ETIMEDOUT" }) : null) ?? (aborted ? Object.assign(new Error("Command aborted"), { code: "ABORT_ERR" }) : null);
+      resolve({ ...result, error, stdout, stderr, timedOut, aborted });
+    }
+  });
+}
+
+export function killProcessTree(child, platform = process.platform, spawnImpl = spawn) {
+  if (!child?.pid) {
+    child?.kill?.("SIGTERM");
+    return;
+  }
+  if (platform === "win32") {
+    try {
+      const killer = spawnImpl("taskkill", ["/PID", String(child.pid), "/T", "/F"], { windowsHide: true, stdio: "ignore" });
+      killer?.on?.("error", () => child.kill?.("SIGTERM"));
+      killer?.unref?.();
+      return;
+    } catch {}
+  }
+  try {
+    process.kill(-child.pid, "SIGTERM");
+    return;
+  } catch {}
+  child.kill?.("SIGTERM");
+}
+
+function appendLimited(current, chunk) {
+  const next = current + String(chunk ?? "");
+  return next.length <= OUTPUT_LIMIT ? next : next.slice(-OUTPUT_LIMIT);
+}
+
+export function resolveCommandShell(shell = "auto", platform = process.platform) {
+  const normalized = String(shell ?? "auto").trim().toLowerCase();
+  if (normalized === "powershell" || (normalized === "auto" && platform === "win32")) {
+    return { name: "powershell", bin: findPowerShell() ?? "powershell.exe", args: ["-NoProfile", "-Command"] };
+  }
+  if (normalized === "bash" || normalized === "auto") {
+    return { name: "bash", bin: "bash", args: ["-lc"] };
+  }
+  throw new Error(`unsupported shell: ${shell}`);
+}
+
+function findPowerShell() {
+  for (const name of ["pwsh.exe", "powershell.exe"]) {
+    try {
+      const result = spawnSync("where", [name], { encoding: "utf-8", timeout: 5000, windowsHide: true });
+      if (result.status === 0 && result.stdout) {
+        const first = result.stdout.trim().split(/\r?\n/)[0];
+        if (first && existsSync(first)) return first;
+      }
+    } catch {}
+  }
+  return null;
+}
+
+function formatCommandOutput({ stdout, stderr, status }) {
+  const parts = [];
+  if (stdout) parts.push(stdout.trimEnd());
+  if (stderr) parts.push(stderr.trimEnd());
+  if (status && status !== 0) parts.push(`exit ${status}`);
+  const output = parts.filter(Boolean).join("\n");
+  return output ? truncateOutput(output) : "(no output)";
+}
+
+function truncateOutput(text) {
+  if (text.length <= OUTPUT_LIMIT) return text;
+  return `${text.slice(-OUTPUT_LIMIT)}\n... (truncated to last ${OUTPUT_LIMIT} chars)`;
+}

package/src/agent/context-stats-tool.mjs

@@ -1,57 +1,57 @@
-import { defineTool } from "@earendil-works/pi-coding-agent";
-import { Type } from "typebox";
-import { toolText } from "./tool-result.mjs";
-
-export function createContextStatsTool({ engine }) {
-  return defineTool({
-    name: "context_stats",
-    label: "Context Stats",
-    description: "Show size statistics for the current March context layers without returning the full prompt text.",
-    parameters: Type.Object({}),
-    execute: async () => toolText(formatContextStats(engine), buildContextStats(engine)),
-  });
-}
-
-export function buildContextStats(engine) {
-  const layers = engine.buildContextLayers("");
-  const contextText = layers.map((layer) => layer.text).join("\n\n");
-  const layerStats = layers.map((layer) => ({
-    name: layer.name,
-    chars: layer.text.length,
-    estimatedTokens: estimateTokens(layer.text.length),
-  }));
-  return {
-    totalChars: contextText.length,
-    estimatedTokens: estimateTokens(contextText.length),
-    layers: layerStats,
-    runtime: {
-      turns: engine.turns?.length ?? 0,
-      toolDefs: engine.toolDefs?.length ?? 0,
-    },
-  };
-}
-
-function formatContextStats(engine) {
-  const stats = buildContextStats(engine);
-  const lines = [
-    "Context stats:",
-    `total_chars: ${stats.totalChars}`,
-    `estimated_tokens: ${stats.estimatedTokens}`,
-    "",
-    "Layers:",
-  ];
-  for (const layer of stats.layers) {
-    lines.push(`- ${layer.name}: ${layer.chars} chars, ~${layer.estimatedTokens} tokens`);
-  }
-  lines.push(
-    "",
-    "Runtime:",
-    `- turns: ${stats.runtime.turns}`,
-    `- tool_defs: ${stats.runtime.toolDefs}`,
-  );
-  return lines.join("\n");
-}
-
-function estimateTokens(chars) {
-  return Math.ceil(chars / 4);
-}
+import { defineTool } from "@earendil-works/pi-coding-agent";
+import { Type } from "typebox";
+import { toolText } from "./tool-result.mjs";
+
+export function createContextStatsTool({ engine }) {
+  return defineTool({
+    name: "context_stats",
+    label: "Context Stats",
+    description: "Show size statistics for the current March context layers without returning the full prompt text.",
+    parameters: Type.Object({}),
+    execute: async () => toolText(formatContextStats(engine), buildContextStats(engine)),
+  });
+}
+
+export function buildContextStats(engine) {
+  const layers = engine.buildContextLayers("");
+  const contextText = layers.map((layer) => layer.text).join("\n\n");
+  const layerStats = layers.map((layer) => ({
+    name: layer.name,
+    chars: layer.text.length,
+    estimatedTokens: estimateTokens(layer.text.length),
+  }));
+  return {
+    totalChars: contextText.length,
+    estimatedTokens: estimateTokens(contextText.length),
+    layers: layerStats,
+    runtime: {
+      turns: engine.turns?.length ?? 0,
+      toolDefs: engine.toolDefs?.length ?? 0,
+    },
+  };
+}
+
+function formatContextStats(engine) {
+  const stats = buildContextStats(engine);
+  const lines = [
+    "Context stats:",
+    `total_chars: ${stats.totalChars}`,
+    `estimated_tokens: ${stats.estimatedTokens}`,
+    "",
+    "Layers:",
+  ];
+  for (const layer of stats.layers) {
+    lines.push(`- ${layer.name}: ${layer.chars} chars, ~${layer.estimatedTokens} tokens`);
+  }
+  lines.push(
+    "",
+    "Runtime:",
+    `- turns: ${stats.runtime.turns}`,
+    `- tool_defs: ${stats.runtime.toolDefs}`,
+  );
+  return lines.join("\n");
+}
+
+function estimateTokens(chars) {
+  return Math.ceil(chars / 4);
+}

package/src/agent/editing/diff-apply.mjs

@@ -1,28 +1,28 @@
-/**
- * Apply unified-diff-like patches to in-memory text content.
- * Used by file-edit-tool for dry-run validation and safe application.
- */
-export function applyReplaceTextPatch(text, oldText, newText) {
-  const idx = text.indexOf(oldText);
-  if (idx === -1) {
-    return { ok: false, error: `Text not found in content` };
-  }
-  const before = text.slice(0, idx);
-  const after = text.slice(idx + oldText.length);
-  return { ok: true, result: before + newText + after };
-}
-
-export function applyReplaceRangePatch(text, startLine, endLine, newText) {
-  const lines = text.split("\n");
-  if (startLine < 1 || startLine > lines.length) {
-    return { ok: false, error: `startLine ${startLine} out of range (1-${lines.length})` };
-  }
-  if (endLine < startLine || endLine > lines.length) {
-    return { ok: false, error: `endLine ${endLine} out of range (${startLine}-${lines.length})` };
-  }
-  const zeroBasedStart = startLine - 1;
-  const before = lines.slice(0, zeroBasedStart);
-  const after = lines.slice(endLine);
-  const newLines = newText === "" ? [] : newText.split("\n");
-  return { ok: true, result: [...before, ...newLines, ...after].join("\n") };
-}
+/**
+ * Apply unified-diff-like patches to in-memory text content.
+ * Used by file-edit-tool for dry-run validation and safe application.
+ */
+export function applyReplaceTextPatch(text, oldText, newText) {
+  const idx = text.indexOf(oldText);
+  if (idx === -1) {
+    return { ok: false, error: `Text not found in content` };
+  }
+  const before = text.slice(0, idx);
+  const after = text.slice(idx + oldText.length);
+  return { ok: true, result: before + newText + after };
+}
+
+export function applyReplaceRangePatch(text, startLine, endLine, newText) {
+  const lines = text.split("\n");
+  if (startLine < 1 || startLine > lines.length) {
+    return { ok: false, error: `startLine ${startLine} out of range (1-${lines.length})` };
+  }
+  if (endLine < startLine || endLine > lines.length) {
+    return { ok: false, error: `endLine ${endLine} out of range (${startLine}-${lines.length})` };
+  }
+  const zeroBasedStart = startLine - 1;
+  const before = lines.slice(0, zeroBasedStart);
+  const after = lines.slice(endLine);
+  const newLines = newText === "" ? [] : newText.split("\n");
+  return { ok: true, result: [...before, ...newLines, ...after].join("\n") };
+}