@theokit/sdk-tools 0.20.0 → 0.21.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.20.1
+
+### Patch Changes
+
+- apply_patch (V4A) M18 review fixes — a security-critical writing tool hardened after adversarial review:
+  - **Security:** the forbidden-secret guard now blocks `.env`/`.git`/`node_modules`/`.theo` at ANY path
+    depth (not just the first segment) and defeats absolute-path spelling (`<root>/.env`) — closing a hole
+    where a nested `sub/.git/hooks/…` or an absolute secret path could be written.
+  - **Contract:** every fs error (`EISDIR`/`ENOTDIR`/`EACCES`/…) maps to a typed `{ ok: false, error: 'io_error' }`
+    instead of throwing out of the handler (the "always JSON" contract now holds).
+  - **Atomicity:** a file touched by two hunks is rejected (`duplicate_target`) — no silent lost-update.
+  - **Safety:** Add over an existing file is rejected (`file_exists`); Delete of a missing file is `not_found`.
+  - **Matching:** `*** End of File` edits of the last line now apply (eof anchoring made a hint with a
+    general-search fallback, fixing the phantom-trailing-newline case).
+
 ## 0.20.0
 
 ### Minor Changes

package/dist/index.cjs

@@ -4,105 +4,17 @@ var promises = require('fs/promises');
 var path = require('path');
 var sdk = require('@theokit/sdk');
 var zod = require('zod');
-var fs = require('fs');
 var pathSafety = require('@theokit/sdk/path-safety');
 var persistence = require('@theokit/sdk/persistence');
 var filesystem = require('@theokit/sdk/filesystem');
 var child_process = require('child_process');
+var fs = require('fs');
 var sandbox = require('@theokit/sdk/sandbox');
 var interactive = require('@theokit/sdk/interactive');
 var promises$1 = require('dns/promises');
 var net = require('net');
 
 // src/apply-patch.ts
-var PathTraversalError = class extends sdk.ConfigurationError {
-  name = "PathTraversalError";
-  constructor(input, resolvedPath) {
-    super(`Path traversal attempt: ${input} \u2192 ${resolvedPath}`, {
-      code: "path_traversal"
-    });
-  }
-};
-var ForbiddenPathError = class extends sdk.ConfigurationError {
-  name = "ForbiddenPathError";
-  constructor(path) {
-    super(
-      `Path '${path}' is in the sensitive-file blocklist (.env, .git/, node_modules/, .theo/, lock files)`,
-      {
-        code: "forbidden_path"
-      }
-    );
-  }
-};
-function safePathJoin(base, ...parts) {
-  if (base === "") {
-    throw new Error("safePathJoin: base must be non-empty");
-  }
-  const baseResolved = path.resolve(base);
-  const target = path.resolve(base, ...parts);
-  if (target !== baseResolved && !target.startsWith(baseResolved + path.sep)) {
-    throw new PathTraversalError(parts.join("/"), target);
-  }
-  return target;
-}
-function assertNoSymlinkEscape(path$1, base) {
-  let baseResolved;
-  try {
-    baseResolved = fs.realpathSync(base);
-  } catch {
-    baseResolved = path.resolve(base);
-  }
-  const resolved = realpathOfDeepestExisting(path$1);
-  if (resolved === void 0) return;
-  if (resolved !== baseResolved && !resolved.startsWith(baseResolved + path.sep)) {
-    throw new PathTraversalError(`symlink ${path$1}`, resolved);
-  }
-}
-function realpathOfDeepestExisting(path$1) {
-  try {
-    return fs.realpathSync(path$1);
-  } catch {
-  }
-  try {
-    const stat2 = fs.lstatSync(path$1);
-    if (stat2.isSymbolicLink()) {
-      const target = fs.readlinkSync(path$1);
-      const parentReal = realpathOfDeepestExisting(path.dirname(path$1));
-      const parentBase = parentReal ?? path.dirname(path$1);
-      return path.resolve(parentBase, target);
-    }
-  } catch {
-  }
-  let cursor = path.dirname(path$1);
-  let suffix = path$1.slice(cursor.length);
-  while (cursor !== path.dirname(cursor)) {
-    try {
-      const real = fs.realpathSync(cursor);
-      return path.resolve(real, `.${suffix}`);
-    } catch {
-      suffix = path$1.slice(path.dirname(cursor).length);
-      cursor = path.dirname(cursor);
-    }
-  }
-  return void 0;
-}
-var LOCK_FILES = /* @__PURE__ */ new Set(["pnpm-lock.yaml", "package-lock.json", "yarn.lock", "bun.lockb"]);
-function isForbiddenPath(input) {
-  const normalized = input.replace(/\\/g, "/").replace(/^\.\//, "");
-  if (normalized.length === 0) return false;
-  const segments = normalized.split("/").filter((s) => s.length > 0);
-  if (segments.length === 0) return false;
-  const first = segments[0];
-  if (first === ".env.example") return false;
-  if (first === ".env") return true;
-  if (/^\.env\./.test(first)) return true;
-  if (first === ".git") return true;
-  if (first === "node_modules") return true;
-  if (first === ".theo") return true;
-  const basename = segments[segments.length - 1];
-  if (LOCK_FILES.has(basename)) return true;
-  return false;
-}
 
 // src/internal/v4a-patch.ts
 var BEGIN = "*** Begin Patch";
@@ -267,7 +179,14 @@ function matchesAt(lines, pattern, at, eq) {
 function seekSequence(lines, pattern, searchStart, eof) {
   if (pattern.length === 0) return searchStart;
   if (pattern.length > lines.length) return null;
-  const start = eof ? Math.max(searchStart, lines.length - pattern.length) : searchStart;
+  const starts = eof ? [Math.max(searchStart, lines.length - pattern.length), searchStart] : [searchStart];
+  for (const start of starts) {
+    const hit = searchFrom(lines, pattern, start);
+    if (hit !== null) return hit;
+  }
+  return null;
+}
+function searchFrom(lines, pattern, start) {
   for (const eq of LADDER) {
     for (let i = start; i <= lines.length - pattern.length; i++) {
       if (matchesAt(lines, pattern, i, eq)) return i;
@@ -324,12 +243,28 @@ async function applyV4APatch(projectRoot, patch) {
     const detail = err instanceof V4APatchError ? err.message : String(err);
     return JSON.stringify({ ok: false, error: "parse_error", detail });
   }
-  const plan = await buildPlan(projectRoot, hunks);
-  if ("error" in plan) return plan.error;
-  await executePlan(plan.ops);
-  return JSON.stringify({ ok: true, files_patched: plan.patched });
+  try {
+    const plan = await buildPlan(projectRoot, hunks);
+    if ("error" in plan) return plan.error;
+    await executePlan(plan.ops);
+    return JSON.stringify({ ok: true, files_patched: plan.patched });
+  } catch (err) {
+    return JSON.stringify({
+      ok: false,
+      error: "io_error",
+      detail: err instanceof Error ? err.message : String(err)
+    });
+  }
+}
+function hunkTargets(hunk) {
+  if (hunk.kind === "update" && hunk.movePath) return [hunk.path, hunk.movePath];
+  return [hunk.path];
 }
 async function buildPlan(projectRoot, hunks) {
+  const dup = firstDuplicateTarget(hunks);
+  if (dup !== null) {
+    return { error: JSON.stringify({ ok: false, error: "duplicate_target", path: dup }) };
+  }
   const ops = [];
   const patched = [];
   for (const hunk of hunks) {
@@ -340,6 +275,16 @@ async function buildPlan(projectRoot, hunks) {
   }
   return { ops, patched };
 }
+function firstDuplicateTarget(hunks) {
+  const seen = /* @__PURE__ */ new Set();
+  for (const hunk of hunks) {
+    for (const t of hunkTargets(hunk)) {
+      if (seen.has(t)) return t;
+      seen.add(t);
+    }
+  }
+  return null;
+}
 async function executePlan(ops) {
   for (const op of ops) {
     if ("rm" in op) {
@@ -350,11 +295,29 @@ async function executePlan(ops) {
     }
   }
 }
+async function pathExists(abs) {
+  try {
+    await promises.stat(abs);
+    return true;
+  } catch {
+    return false;
+  }
+}
 async function planHunk(projectRoot, hunk) {
   const scope = v4aScope(projectRoot, hunk.path);
   if ("error" in scope) return scope;
-  if (hunk.kind === "add") return { ops: [{ write: { abs: scope.abs, content: hunk.content } }] };
-  if (hunk.kind === "delete") return { ops: [{ rm: scope.abs }] };
+  if (hunk.kind === "add") {
+    if (await pathExists(scope.abs)) {
+      return { error: JSON.stringify({ ok: false, error: "file_exists", path: hunk.path }) };
+    }
+    return { ops: [{ write: { abs: scope.abs, content: hunk.content } }] };
+  }
+  if (hunk.kind === "delete") {
+    if (!await pathExists(scope.abs)) {
+      return { error: JSON.stringify({ ok: false, error: "not_found", path: hunk.path }) };
+    }
+    return { ops: [{ rm: scope.abs }] };
+  }
   return planUpdate(projectRoot, hunk, scope.abs);
 }
 async function planUpdate(projectRoot, hunk, abs) {
@@ -388,20 +351,25 @@ async function planUpdate(projectRoot, hunk, abs) {
   if ("error" in dest) return dest;
   return { ops: [{ write: { abs: dest.abs, content: updated } }, { rm: abs }] };
 }
+var FORBIDDEN_SEGMENTS = /* @__PURE__ */ new Set([".env", ".git", "node_modules", ".theo"]);
+function isForbiddenRel(rel) {
+  return rel.split(/[/\\]/).filter(Boolean).some((s) => s !== ".env.example" && (FORBIDDEN_SEGMENTS.has(s) || /^\.env\./.test(s)));
+}
 function v4aScope(projectRoot, file) {
-  if (isForbiddenPath(file)) {
-    return { error: JSON.stringify({ ok: false, error: "forbidden_path", path: file }) };
-  }
+  let abs;
   try {
-    const abs = safePathJoin(projectRoot, file);
-    assertNoSymlinkEscape(abs, projectRoot);
-    return { abs };
+    abs = pathSafety.safePathJoin(projectRoot, file);
+    pathSafety.assertNoSymlinkEscape(abs, projectRoot);
   } catch (err) {
-    if (err instanceof PathTraversalError || err instanceof ForbiddenPathError) {
+    if (err instanceof pathSafety.PathTraversalError || err instanceof pathSafety.ForbiddenPathError) {
       return { error: JSON.stringify({ ok: false, error: "path_traversal", path: file }) };
     }
     throw err;
   }
+  if (pathSafety.isForbiddenPath(file) || isForbiddenRel(path.relative(projectRoot, abs))) {
+    return { error: JSON.stringify({ ok: false, error: "forbidden_path", path: file }) };
+  }
+  return { abs };
 }
 function createSessionArtifactStore(options) {
   const { dir } = options;
@@ -609,7 +577,7 @@ async function editViaBackend(filesystem$1, ctx, path, old_string, new_string) {
   return JSON.stringify({ ok: true, replacements: 1 });
 }
 async function editViaLocal(projectRoot, path, old_string, new_string) {
-  const absolutePath = safePathJoin(projectRoot, path);
+  const absolutePath = pathSafety.safePathJoin(projectRoot, path);
   let content;
   try {
     content = await promises.readFile(absolutePath, "utf-8");
@@ -627,14 +595,14 @@ async function editViaLocal(projectRoot, path, old_string, new_string) {
   return JSON.stringify({ ok: true, replacements: 1 });
 }
 function editScopeError(path, projectRoot) {
-  if (isForbiddenPath(path)) {
+  if (pathSafety.isForbiddenPath(path)) {
     return JSON.stringify({ ok: false, error: "forbidden_path", path });
   }
   try {
-    assertNoSymlinkEscape(safePathJoin(projectRoot, path), projectRoot);
+    pathSafety.assertNoSymlinkEscape(pathSafety.safePathJoin(projectRoot, path), projectRoot);
     return null;
   } catch (err) {
-    if (err instanceof PathTraversalError || err instanceof ForbiddenPathError) {
+    if (err instanceof pathSafety.PathTraversalError || err instanceof pathSafety.ForbiddenPathError) {
       return JSON.stringify({ ok: false, error: "path_traversal", path });
     }
     throw err;
@@ -720,11 +688,11 @@ function formatError(message, code) {
 function checkPathScope(path, projectRoot) {
   if (path === void 0 || path === "") return null;
   try {
-    const abs = safePathJoin(projectRoot, path);
-    assertNoSymlinkEscape(abs, projectRoot);
+    const abs = pathSafety.safePathJoin(projectRoot, path);
+    pathSafety.assertNoSymlinkEscape(abs, projectRoot);
     return null;
   } catch (err) {
-    if (err instanceof PathTraversalError || err instanceof ForbiddenPathError) {
+    if (err instanceof pathSafety.PathTraversalError || err instanceof pathSafety.ForbiddenPathError) {
       return JSON.stringify({ ok: false, error: "path_traversal", path });
     }
     throw err;
@@ -744,25 +712,25 @@ function createSettleGate(timer) {
     }
   };
 }
-function armTimeoutKill(child, timeoutMs, onTimeout, resolve2) {
+function armTimeoutKill(child, timeoutMs, onTimeout, resolve) {
   const timer = setTimeout(() => {
     gate.fire(() => {
       try {
         process.kill(-(child.pid ?? 0), "SIGKILL");
       } catch {
       }
-      resolve2(onTimeout());
+      resolve(onTimeout());
     });
   }, timeoutMs);
   const gate = createSettleGate(timer);
   return gate;
 }
-function attachChildSettlers(child, gate, onClose, onError, resolve2) {
+function attachChildSettlers(child, gate, onClose, onError, resolve) {
   child.on("close", (code) => {
-    gate.fire(() => resolve2(onClose(code)));
+    gate.fire(() => resolve(onClose(code)));
   });
   child.on("error", (err) => {
-    gate.fire(() => resolve2(onError(err)));
+    gate.fire(() => resolve(onError(err)));
   });
 }
 
@@ -829,7 +797,7 @@ function formatGitResult(result, timeoutMs) {
   return JSON.stringify({ ok: true, diff: result.stdout, truncated: result.truncated });
 }
 function runGitProcess(cwd, args, timeoutMs, maxStdoutBytes) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve) => {
     const child = child_process.spawn("git", args, { cwd, detached: true, stdio: ["ignore", "pipe", "pipe"] });
     const stdoutChunks = [];
     const stderrChunks = [];
@@ -839,7 +807,7 @@ function runGitProcess(cwd, args, timeoutMs, maxStdoutBytes) {
       child,
       timeoutMs,
       () => ({ kind: "timeout" }),
-      resolve2
+      resolve
     );
     child.stdout.on("data", (chunk) => {
       if (gate.settled()) return;
@@ -869,7 +837,7 @@ function runGitProcess(cwd, args, timeoutMs, maxStdoutBytes) {
         return code === 0 ? { kind: "ok", stdout, truncated } : { kind: "error", stderr };
       },
       (err) => ({ kind: "error", stderr: err.message }),
-      resolve2
+      resolve
     );
   });
 }
@@ -895,7 +863,7 @@ function createGlobTool(opts) {
         await walkDirBackend(backend, searchRel, searchRel, regex, found, 0);
         return JSON.stringify({ ok: true, files: found.sort(), count: found.length });
       }
-      const searchRoot = cwd ? safePathJoin(projectRoot, cwd) : projectRoot;
+      const searchRoot = cwd ? pathSafety.safePathJoin(projectRoot, cwd) : projectRoot;
       const files = [];
       await walkDir(searchRoot, searchRoot, regex, files);
       const relativePaths = files.map((f) => path.relative(projectRoot, f)).sort();
@@ -906,10 +874,10 @@ function createGlobTool(opts) {
 function globScopeError(cwd, projectRoot) {
   if (!cwd) return null;
   try {
-    assertNoSymlinkEscape(safePathJoin(projectRoot, cwd), projectRoot);
+    pathSafety.assertNoSymlinkEscape(pathSafety.safePathJoin(projectRoot, cwd), projectRoot);
     return null;
   } catch (err) {
-    if (err instanceof PathTraversalError || err instanceof ForbiddenPathError) {
+    if (err instanceof pathSafety.PathTraversalError || err instanceof pathSafety.ForbiddenPathError) {
       return JSON.stringify({ ok: false, error: "path_traversal", path: cwd });
     }
     throw err;
@@ -1548,29 +1516,29 @@ function createListDirTool(opts) {
       path: zod.z.string().min(1).describe("Project-relative directory path. Use '.' for root.")
     }),
     handler: async ({ path }, ctx) => {
-      const relative2 = path === "" || path === "." ? "." : path;
-      if (relative2 !== "." && isForbiddenPath(relative2)) {
+      const relative3 = path === "" || path === "." ? "." : path;
+      if (relative3 !== "." && pathSafety.isForbiddenPath(relative3)) {
         return JSON.stringify({ ok: false, error: "forbidden_path", path });
       }
       if (filesystem$1) {
         const backend = await filesystem.resolveFilesystem(filesystem$1, ctx ?? {});
-        return listViaBackend(backend, relative2, path, max);
+        return listViaBackend(backend, relative3, path, max);
       }
-      return listViaLocalFs(projectRoot, relative2, path, max);
+      return listViaLocalFs(projectRoot, relative3, path, max);
     }
   });
 }
-async function listViaLocalFs(projectRoot, relative2, originalPath, max) {
-  const boundary = resolveDirBoundary(relative2, projectRoot, originalPath);
+async function listViaLocalFs(projectRoot, relative3, originalPath, max) {
+  const boundary = resolveDirBoundary(relative3, projectRoot, originalPath);
   if ("error" in boundary) return boundary.error;
   const readResult = await readDirSafe(boundary.absolutePath, originalPath);
   if ("error" in readResult) return readResult.error;
   return formatListing(readResult.dirents, max);
 }
-async function listViaBackend(backend, relative2, originalPath, max) {
+async function listViaBackend(backend, relative3, originalPath, max) {
   let names;
   try {
-    names = await backend.list(relative2);
+    names = await backend.list(relative3);
   } catch (err) {
     if (err instanceof filesystem.FileNotFoundError) {
       return JSON.stringify({ ok: false, error: "not_found", path: originalPath });
@@ -1584,7 +1552,7 @@ async function listViaBackend(backend, relative2, originalPath, max) {
   const windowed = names.slice(0, max);
   const entries = await Promise.all(
     windowed.map(async (name) => {
-      const child = relative2 === "." ? name : `${relative2}/${name}`;
+      const child = relative3 === "." ? name : `${relative3}/${name}`;
       let type = "file";
       try {
         type = (await backend.stat(child)).isDirectory ? "directory" : "file";
@@ -1595,13 +1563,13 @@ async function listViaBackend(backend, relative2, originalPath, max) {
   );
   return JSON.stringify({ ok: true, entries, truncated: totalCount > max, totalCount });
 }
-function resolveDirBoundary(relative2, projectRoot, originalPath) {
+function resolveDirBoundary(relative3, projectRoot, originalPath) {
   try {
-    const absolutePath = relative2 === "." ? projectRoot : safePathJoin(projectRoot, relative2);
-    assertNoSymlinkEscape(absolutePath, projectRoot);
+    const absolutePath = relative3 === "." ? projectRoot : pathSafety.safePathJoin(projectRoot, relative3);
+    pathSafety.assertNoSymlinkEscape(absolutePath, projectRoot);
     return { absolutePath };
   } catch (err) {
-    if (err instanceof PathTraversalError || err instanceof ForbiddenPathError) {
+    if (err instanceof pathSafety.PathTraversalError || err instanceof pathSafety.ForbiddenPathError) {
       return { error: JSON.stringify({ ok: false, error: "path_traversal", path: originalPath }) };
     }
     throw err;
@@ -1763,7 +1731,7 @@ function isForbiddenAtAnyDepth(path) {
   });
 }
 function forbiddenReadError(path$1, allowAbsolute) {
-  if (isForbiddenPath(path$1)) {
+  if (pathSafety.isForbiddenPath(path$1)) {
     return JSON.stringify({ ok: false, error: "forbidden_path", path: path$1 });
   }
   if (allowAbsolute && path.isAbsolute(path$1) && isForbiddenAtAnyDepth(path$1)) {
@@ -1819,22 +1787,22 @@ function createReadFileTool(opts) {
 }
 async function readViaBackend(backend, path, view, onRead) {
   try {
-    const stat2 = await backend.stat(path);
-    if (stat2.size > MAX_FILE_SIZE) {
+    const stat3 = await backend.stat(path);
+    if (stat3.size > MAX_FILE_SIZE) {
       return JSON.stringify({
         ok: false,
         error: "too_large",
         path,
-        size: stat2.size,
+        size: stat3.size,
         limit: MAX_FILE_SIZE
       });
     }
     const raw = await backend.readFile(path);
     if (raw.includes("\0")) {
-      return JSON.stringify({ ok: false, error: "binary_file", path, size: stat2.size });
+      return JSON.stringify({ ok: false, error: "binary_file", path, size: stat3.size });
     }
-    onRead?.(stat2.mtimeMs);
-    return JSON.stringify({ ok: true, content: renderView(raw, view), size: stat2.size });
+    onRead?.(stat3.mtimeMs);
+    return JSON.stringify({ ok: true, content: renderView(raw, view), size: stat3.size });
   } catch (err) {
     if (err instanceof filesystem.FileNotFoundError) {
       return JSON.stringify({ ok: false, error: "not_found", path });
@@ -1850,11 +1818,11 @@ function resolveBoundary(path$1, projectRoot, allowAbsolute) {
     return { absolutePath: path$1 };
   }
   try {
-    const absolutePath = safePathJoin(projectRoot, path$1);
-    assertNoSymlinkEscape(absolutePath, projectRoot);
+    const absolutePath = pathSafety.safePathJoin(projectRoot, path$1);
+    pathSafety.assertNoSymlinkEscape(absolutePath, projectRoot);
     return { absolutePath };
   } catch (err) {
-    if (err instanceof PathTraversalError || err instanceof ForbiddenPathError) {
+    if (err instanceof pathSafety.PathTraversalError || err instanceof pathSafety.ForbiddenPathError) {
       return { error: JSON.stringify({ ok: false, error: "path_traversal", path: path$1 }) };
     }
     throw err;
@@ -1873,22 +1841,22 @@ async function openHandleSafe(absolutePath, path) {
   }
 }
 async function readContent(handle, path, view, onRead) {
-  const stat2 = await handle.stat();
-  if (stat2.size > MAX_FILE_SIZE) {
+  const stat3 = await handle.stat();
+  if (stat3.size > MAX_FILE_SIZE) {
     return JSON.stringify({
       ok: false,
       error: "too_large",
       path,
-      size: stat2.size,
+      size: stat3.size,
       limit: MAX_FILE_SIZE
     });
   }
-  if (await isBinaryProbe(handle, Number(stat2.size))) {
-    return JSON.stringify({ ok: false, error: "binary_file", path, size: stat2.size });
+  if (await isBinaryProbe(handle, Number(stat3.size))) {
+    return JSON.stringify({ ok: false, error: "binary_file", path, size: stat3.size });
   }
   const raw = await handle.readFile({ encoding: "utf-8" });
-  onRead?.(stat2.mtimeMs);
-  return JSON.stringify({ ok: true, content: renderView(raw, view), size: stat2.size });
+  onRead?.(stat3.mtimeMs);
+  return JSON.stringify({ ok: true, content: renderView(raw, view), size: stat3.size });
 }
 async function isBinaryProbe(handle, size) {
   const probeLen = Math.min(BINARY_PROBE_BYTES, size);
@@ -1976,7 +1944,7 @@ function createRunVitestTool(opts) {
   });
 }
 function validateVitestScope(path, projectRoot) {
-  if (path !== void 0 && path !== "" && isForbiddenPath(path)) {
+  if (path !== void 0 && path !== "" && pathSafety.isForbiddenPath(path)) {
     return JSON.stringify({ ok: false, error: "forbidden_path", path });
   }
   return checkPathScope(path, projectRoot);
@@ -2022,7 +1990,7 @@ function appendCapped(chunks, chunk, current, cap) {
   return current + chunk.length;
 }
 function runProcess(cwd, command, args, timeoutMs, maxStdoutBytes) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve) => {
     const child = child_process.spawn(command, args, {
       cwd,
       detached: true,
@@ -2035,7 +2003,7 @@ function runProcess(cwd, command, args, timeoutMs, maxStdoutBytes) {
       child,
       timeoutMs,
       () => ({ kind: "timeout" }),
-      resolve2
+      resolve
     );
     child.stdout.on("data", (chunk) => {
       if (gate.settled()) return;
@@ -2054,7 +2022,7 @@ function runProcess(cwd, command, args, timeoutMs, maxStdoutBytes) {
         exitCode: code ?? 0
       }),
       (err) => ({ kind: "spawn_error", message: err.message }),
-      resolve2
+      resolve
     );
   });
 }
@@ -2135,11 +2103,11 @@ function resolveSearchScope(path$1, projectRoot, allowAbsolute) {
     return { scopeAbs: scopeRel };
   }
   try {
-    const scopeAbs = scopeRel === "." ? projectRoot : safePathJoin(projectRoot, scopeRel);
-    assertNoSymlinkEscape(scopeAbs, projectRoot);
+    const scopeAbs = scopeRel === "." ? projectRoot : pathSafety.safePathJoin(projectRoot, scopeRel);
+    pathSafety.assertNoSymlinkEscape(scopeAbs, projectRoot);
     return { scopeAbs };
   } catch (err) {
-    if (err instanceof PathTraversalError || err instanceof ForbiddenPathError) {
+    if (err instanceof pathSafety.PathTraversalError || err instanceof pathSafety.ForbiddenPathError) {
       return { error: JSON.stringify({ ok: false, error: "path_traversal", path: path$1 }) };
     }
     throw err;
@@ -2148,7 +2116,7 @@ function resolveSearchScope(path$1, projectRoot, allowAbsolute) {
 async function handleEntry(entry, absDir, state) {
   const entryAbs = path.join(absDir, entry.name);
   const entryRel = path.relative(state.projectRoot, entryAbs);
-  if (isForbiddenPath(entryRel)) return;
+  if (pathSafety.isForbiddenPath(entryRel)) return;
   if (entry.isDirectory()) {
     await walk(entryAbs, state);
     return;
@@ -2214,10 +2182,10 @@ function resolveScopeRel(path$1, projectRoot, allowAbsolute) {
   if (scopeRel === "") return { rel: "" };
   if (allowAbsolute && path.isAbsolute(scopeRel)) return { rel: scopeRel };
   try {
-    assertNoSymlinkEscape(safePathJoin(projectRoot, scopeRel), projectRoot);
+    pathSafety.assertNoSymlinkEscape(pathSafety.safePathJoin(projectRoot, scopeRel), projectRoot);
     return { rel: scopeRel };
   } catch (err) {
-    if (err instanceof PathTraversalError || err instanceof ForbiddenPathError) {
+    if (err instanceof pathSafety.PathTraversalError || err instanceof pathSafety.ForbiddenPathError) {
       return { error: JSON.stringify({ ok: false, error: "path_traversal", path: path$1 }) };
     }
     throw err;
@@ -2239,7 +2207,7 @@ async function walkBackend(backend, dirRel, state, depth) {
 }
 async function handleBackendEntry(backend, dirRel, name, state, depth) {
   const entryRel = dirRel === "" ? name : `${dirRel}/${name}`;
-  if (isForbiddenPath(entryRel)) return;
+  if (pathSafety.isForbiddenPath(entryRel)) return;
   let st;
   try {
     st = await backend.stat(entryRel);
@@ -2305,7 +2273,7 @@ function createShellTool(opts) {
   });
 }
 function runShell(cwd, command, timeoutMs) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve) => {
     const child = child_process.spawn("/bin/sh", ["-c", command], {
       cwd,
       detached: true,
@@ -2319,7 +2287,7 @@ function runShell(cwd, command, timeoutMs) {
       child,
       timeoutMs,
       () => ({ kind: "timeout" }),
-      (result) => resolve2(formatResult(result, timeoutMs))
+      (result) => resolve(formatResult(result, timeoutMs))
     );
     child.stdout.on("data", (chunk) => {
       if (gate.settled()) return;
@@ -2357,7 +2325,7 @@ function runShell(cwd, command, timeoutMs) {
         exitCode: code
       }),
       (err) => ({ kind: "error", message: err.message }),
-      (result) => resolve2(formatResult(result, timeoutMs))
+      (result) => resolve(formatResult(result, timeoutMs))
     );
   });
 }
@@ -2739,7 +2707,7 @@ function createWriteFileTool(opts) {
       content: zod.z.string().describe("UTF-8 content to write.")
     }),
     handler: async ({ path, content }, ctx) => {
-      if (isForbiddenPath(path)) {
+      if (pathSafety.isForbiddenPath(path)) {
         return JSON.stringify({ ok: false, error: "forbidden_path", path });
       }
       if (filesystem$1) {
@@ -2761,10 +2729,10 @@ function readBeforeWriteError(guard, path, currentMtimeMs) {
 async function writeViaLocalFs(projectRoot, path$1, content, guard) {
   let absolutePath;
   try {
-    absolutePath = safePathJoin(projectRoot, path$1);
-    assertNoSymlinkEscape(absolutePath, projectRoot);
+    absolutePath = pathSafety.safePathJoin(projectRoot, path$1);
+    pathSafety.assertNoSymlinkEscape(absolutePath, projectRoot);
   } catch (err) {
-    if (err instanceof PathTraversalError || err instanceof ForbiddenPathError) {
+    if (err instanceof pathSafety.PathTraversalError || err instanceof pathSafety.ForbiddenPathError) {
       return JSON.stringify({ ok: false, error: "path_traversal", path: path$1 });
     }
     throw err;
@@ -2804,12 +2772,12 @@ async function writeViaBackend(backend, path, content, guard) {
       if (rbw) return rbw;
       expectedMtime = current ?? void 0;
     }
-    const stat2 = await backend.writeFile(
+    const stat3 = await backend.writeFile(
       path,
       content,
       expectedMtime !== void 0 ? { expectedMtime } : void 0
     );
-    return JSON.stringify({ ok: true, path, bytes: stat2.size });
+    return JSON.stringify({ ok: true, path, bytes: stat3.size });
   } catch (err) {
     return backendErrorToJson(err, path);
   }
@@ -2837,8 +2805,8 @@ async function isBinaryFile(absolutePath) {
     return false;
   }
   try {
-    const stat2 = await handle.stat();
-    const probeLen = Math.min(BINARY_PROBE_BYTES3, Number(stat2.size));
+    const stat3 = await handle.stat();
+    const probeLen = Math.min(BINARY_PROBE_BYTES3, Number(stat3.size));
     if (probeLen <= 0) return false;
     const probe = Buffer.alloc(probeLen);
     const { bytesRead } = await handle.read(probe, 0, probeLen, 0);