@theokit/sdk-tools 0.20.1 → 0.21.0

package/dist/index.js

@@ -1,106 +1,18 @@
 import { rm, mkdir, writeFile, readFile, readdir, open, stat, copyFile } from 'fs/promises';
-import { dirname, relative, join, isAbsolute, resolve, sep } from 'path';
+import { dirname, relative, join, isAbsolute } from 'path';
 import { Tool, ConfigurationError } from '@theokit/sdk';
 import { z } from 'zod';
-import { existsSync, statSync, mkdirSync, writeFileSync, realpathSync, readFileSync, lstatSync, readlinkSync, readdirSync } from 'fs';
-import { safeFilenameForId, safePathJoin as safePathJoin$1 } from '@theokit/sdk/path-safety';
+import { safePathJoin, assertNoSymlinkEscape, PathTraversalError, ForbiddenPathError, isForbiddenPath, safeFilenameForId } from '@theokit/sdk/path-safety';
 import { replaceFileAtomic } from '@theokit/sdk/persistence';
 import { resolveFilesystem, FileNotFoundError, FilesystemSecurityError, FilesystemReadOnlyError, StaleFileError, FilesystemError } from '@theokit/sdk/filesystem';
 import { spawn } from 'child_process';
+import { existsSync, statSync, mkdirSync, writeFileSync, readFileSync, readdirSync } from 'fs';
 import { resolveSandbox } from '@theokit/sdk/sandbox';
 import { resolveInteractive, InteractiveUnavailableError, NoSuchSessionError } from '@theokit/sdk/interactive';
 import { lookup } from 'dns/promises';
 import { isIP } from 'net';
 
 // src/apply-patch.ts
-var PathTraversalError = class extends ConfigurationError {
-  name = "PathTraversalError";
-  constructor(input, resolvedPath) {
-    super(`Path traversal attempt: ${input} \u2192 ${resolvedPath}`, {
-      code: "path_traversal"
-    });
-  }
-};
-var ForbiddenPathError = class extends 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 = resolve(base);
-  const target = resolve(base, ...parts);
-  if (target !== baseResolved && !target.startsWith(baseResolved + sep)) {
-    throw new PathTraversalError(parts.join("/"), target);
-  }
-  return target;
-}
-function assertNoSymlinkEscape(path, base) {
-  let baseResolved;
-  try {
-    baseResolved = realpathSync(base);
-  } catch {
-    baseResolved = resolve(base);
-  }
-  const resolved = realpathOfDeepestExisting(path);
-  if (resolved === void 0) return;
-  if (resolved !== baseResolved && !resolved.startsWith(baseResolved + sep)) {
-    throw new PathTraversalError(`symlink ${path}`, resolved);
-  }
-}
-function realpathOfDeepestExisting(path) {
-  try {
-    return realpathSync(path);
-  } catch {
-  }
-  try {
-    const stat3 = lstatSync(path);
-    if (stat3.isSymbolicLink()) {
-      const target = readlinkSync(path);
-      const parentReal = realpathOfDeepestExisting(dirname(path));
-      const parentBase = parentReal ?? dirname(path);
-      return resolve(parentBase, target);
-    }
-  } catch {
-  }
-  let cursor = dirname(path);
-  let suffix = path.slice(cursor.length);
-  while (cursor !== dirname(cursor)) {
-    try {
-      const real = realpathSync(cursor);
-      return resolve(real, `.${suffix}`);
-    } catch {
-      suffix = path.slice(dirname(cursor).length);
-      cursor = 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";
@@ -462,7 +374,7 @@ function createSessionArtifactStore(options) {
   const idStrategy = options.idStrategy ?? ((id) => safeFilenameForId(id));
   const extension = options.extension ?? ".md";
   function path(id) {
-    return safePathJoin$1(dir, `${idStrategy(id)}${extension}`);
+    return safePathJoin(dir, `${idStrategy(id)}${extension}`);
   }
   async function write(id, content) {
     const target = path(id);
@@ -798,25 +710,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)));
   });
 }
 
@@ -883,7 +795,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 = spawn("git", args, { cwd, detached: true, stdio: ["ignore", "pipe", "pipe"] });
     const stdoutChunks = [];
     const stderrChunks = [];
@@ -893,7 +805,7 @@ function runGitProcess(cwd, args, timeoutMs, maxStdoutBytes) {
       child,
       timeoutMs,
       () => ({ kind: "timeout" }),
-      resolve2
+      resolve
     );
     child.stdout.on("data", (chunk) => {
       if (gate.settled()) return;
@@ -923,7 +835,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
     );
   });
 }
@@ -2076,7 +1988,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 = spawn(command, args, {
       cwd,
       detached: true,
@@ -2089,7 +2001,7 @@ function runProcess(cwd, command, args, timeoutMs, maxStdoutBytes) {
       child,
       timeoutMs,
       () => ({ kind: "timeout" }),
-      resolve2
+      resolve
     );
     child.stdout.on("data", (chunk) => {
       if (gate.settled()) return;
@@ -2108,7 +2020,7 @@ function runProcess(cwd, command, args, timeoutMs, maxStdoutBytes) {
         exitCode: code ?? 0
       }),
       (err) => ({ kind: "spawn_error", message: err.message }),
-      resolve2
+      resolve
     );
   });
 }
@@ -2359,7 +2271,7 @@ function createShellTool(opts) {
   });
 }
 function runShell(cwd, command, timeoutMs) {
-  return new Promise((resolve2) => {
+  return new Promise((resolve) => {
     const child = spawn("/bin/sh", ["-c", command], {
       cwd,
       detached: true,
@@ -2373,7 +2285,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;
@@ -2411,7 +2323,7 @@ function runShell(cwd, command, timeoutMs) {
         exitCode: code
       }),
       (err) => ({ kind: "error", message: err.message }),
-      (result) => resolve2(formatResult(result, timeoutMs))
+      (result) => resolve(formatResult(result, timeoutMs))
     );
   });
 }