@wrongstack/tools 0.9.7 → 0.9.20

package/dist/pack.js

@@ -1,10 +1,10 @@
 import { spawn, execFileSync, spawnSync } from 'node:child_process';
 import { buildChildEnv, stripAnsi, detectNewlineStyle, normalizeToLf, toStyle, atomicWrite, unifiedDiff, compileGlob, loadPlan, emptyPlan, clearPlan, savePlan, getPlanTemplate, addPlanItem, deriveTodosFromPlanItem, removePlanItem, setPlanItemStatus, formatPlan } from '@wrongstack/core';
+import * as fs11 from 'node:fs/promises';
+import { stat } from 'node:fs/promises';
 import * as path from 'node:path';
 import { resolve, sep, dirname } from 'node:path';
 import * as os from 'node:os';
-import * as fs11 from 'node:fs/promises';
-import { stat } from 'node:fs/promises';
 import { createRequire } from 'node:module';
 import * as fs from 'node:fs';
 import { statSync, mkdirSync, writeFileSync } from 'node:fs';
@@ -112,6 +112,36 @@ function ensureInsideRoot(absPath, ctx) {
 function safeResolve(input, ctx) {
   return ensureInsideRoot(resolvePath(input, ctx), ctx);
 }
+async function assertRealInsideRoot(absPath, ctx) {
+  const realRoot = await fs11.realpath(ctx.projectRoot).catch(() => path.resolve(ctx.projectRoot));
+  let probe = absPath;
+  for (; ; ) {
+    let real;
+    try {
+      real = await fs11.realpath(probe);
+    } catch (err) {
+      if (err.code === "ENOENT") {
+        const parent = path.dirname(probe);
+        if (parent === probe) return;
+        probe = parent;
+        continue;
+      }
+      throw err;
+    }
+    const rel = path.relative(realRoot, real);
+    if (rel.startsWith("..") || path.isAbsolute(rel)) {
+      throw new Error(
+        `Path "${absPath}" resolves through a symlink outside project root "${realRoot}"`
+      );
+    }
+    return;
+  }
+}
+async function safeResolveReal(input, ctx) {
+  const abs = safeResolve(input, ctx);
+  await assertRealInsideRoot(abs, ctx);
+  return abs;
+}
 function truncateMiddle(s, max) {
   if (Buffer.byteLength(s, "utf8") <= max) return s;
   const half = Math.floor(max / 2);
@@ -258,8 +288,6 @@ var CircuitBreaker = class {
   lastSlowAt = null;
   /** Timestamp when the breaker was opened (for cooldown calculation). */
   openedAt = null;
-  /** Timestamp when the last call ran (for half-open gate). */
-  lastCallAt = null;
   constructor(config = {}) {
     this.maxConsecutiveFailures = config.maxConsecutiveFailures ?? DEFAULT_MAX_CONSECUTIVE_FAILURES;
     this.slowCallThresholdMs = config.slowCallThresholdMs ?? DEFAULT_SLOW_CALL_THRESHOLD_MS;
@@ -317,7 +345,6 @@ var CircuitBreaker = class {
    */
   afterCall(durationMs, failed) {
     const now = Date.now();
-    this.lastCallAt = now;
     if (this.state === "half-open") {
       if (failed) {
         this._trip();
@@ -2112,7 +2139,7 @@ function regexParse(opts) {
     }
     return lo + 1;
   }
-  function extractDeclaration(lineIdx, match) {
+  function extractDeclaration(lineIdx, _match) {
     const line = lines[lineIdx] ?? "";
     return line.trim().slice(0, 500);
   }
@@ -2577,7 +2604,7 @@ async function parseFile(file, content, lang) {
       return { file, lang, symbols: [], mtimeMs: Date.now() };
   }
 }
-async function runIndexer(ctx, opts) {
+async function runIndexer(_ctx, opts) {
   const { projectRoot, force = false, langs, ignore = [] } = opts;
   const store = new IndexStore(projectRoot);
   const startMs = Date.now();
@@ -2964,6 +2991,12 @@ var diffTool = {
   }
 };
 async function gitDiff(input, ctx, signal) {
+  if (input.a?.startsWith("-")) {
+    throw new Error(`diff: unsafe ref "${input.a}" \u2014 refs may not begin with '-' (flag injection)`);
+  }
+  if (input.b?.startsWith("-")) {
+    throw new Error(`diff: unsafe ref "${input.b}" \u2014 refs may not begin with '-' (flag injection)`);
+  }
   const gitDir = findGitDir(ctx.cwd);
   if (!gitDir) {
     return { diff: "", files: [], truncated: false, mode: "unified" };
@@ -3002,7 +3035,12 @@ function runGit(args, cwd, signal) {
   return new Promise((resolve7) => {
     let stdout = "";
     let stderr = "";
-    const child = spawn("git", args, { cwd, signal, env: buildChildEnv(), stdio: ["ignore", "pipe", "pipe"] });
+    const child = spawn("git", args, {
+      cwd,
+      signal,
+      env: buildChildEnv(),
+      stdio: ["ignore", "pipe", "pipe"]
+    });
     child.stdout?.on("data", (c) => {
       stdout += c.toString();
     });
@@ -3013,8 +3051,7 @@ function runGit(args, cwd, signal) {
     child.on("error", (e) => resolve7({ stdout: "", stderr: e.message, exitCode: 1 }));
   });
 }
-async function fileDiff(input, ctx, signal) {
-  input.path ? safeResolve(input.path, ctx) : ctx.cwd;
+async function fileDiff(input, ctx, _signal) {
   input.context ?? 3;
   const files = input.files ? (Array.isArray(input.files) ? input.files : input.files.split(",")).map((f) => f.trim()).filter(Boolean) : [];
   if (files.length === 0) {
@@ -3043,8 +3080,8 @@ ${formatUnified(lines)}`);
     mode: input.mode ?? "unified"
   };
 }
-function formatUnified(lines, context) {
-  return lines.map((line, i) => ` ${line}`).join("\n");
+function formatUnified(lines, _context) {
+  return lines.map((line, _i) => ` ${line}`).join("\n");
 }
 var documentTool = {
   name: "document",
@@ -3134,9 +3171,8 @@ async function resolveFiles(filesInput, cwd) {
   }
   return resolved;
 }
-function processFile(content, absPath, style, overwrite, target) {
+function processFile(content, absPath, _style, _overwrite, target) {
   const results = [];
-  content.split("\n");
   const functionRegex = /(?:async\s+)?function\s+(\w+)\s*\(([^)]*)\)/g;
   const arrowRegex = /(?:const|let|var)\s+(\w+)\s*=\s*(?:async\s+)?\(([^)]*)\)\s*=>/g;
   const classRegex = /class\s+(\w+)/g;
@@ -3218,7 +3254,7 @@ var editTool = {
     if (input.old_string === void 0) throw new Error("edit: old_string is required");
     if (input.new_string === void 0) throw new Error("edit: new_string is required");
     if (input.old_string === "") throw new Error("edit: old_string cannot be empty");
-    const absPath = safeResolve(input.path, ctx);
+    const absPath = await safeResolveReal(input.path, ctx);
     const stat11 = await fs11.stat(absPath).catch((err) => {
       if (err.code === "ENOENT") {
         throw new Error(`edit: file "${input.path}" does not exist. Use \`write\` instead.`);
@@ -3603,11 +3639,10 @@ function getPinnedDispatcher() {
   }
   return pinnedAgent;
 }
-async function fetchWithRedirectLimit(url, maxRedirects, signal) {
-  const headers = {
-    "user-agent": "WrongStack/1.0 (+https://wrongstack.com)",
-    accept: "text/html,application/json;q=0.9,text/plain;q=0.8,*/*;q=0.1"
-  };
+async function guardedFetch(url, maxRedirects, signal, headers = {
+  "user-agent": "WrongStack/1.0 (+https://wrongstack.com)",
+  accept: "text/html,application/json;q=0.9,text/plain;q=0.8,*/*;q=0.1"
+}) {
   let redirectCount = 0;
   let currentUrl = url;
   for (; ; ) {
@@ -3685,7 +3720,7 @@ var fetchTool = {
     const timer = setTimeout(() => ctrl.abort(new Error("fetch timeout")), TIMEOUT_MS2);
     const combined = combineSignals(opts.signal, ctrl.signal);
     try {
-      const res = await fetchWithRedirectLimit(input.url, 5, combined);
+      const res = await guardedFetch(input.url, 5, combined);
       const ct = res.headers.get("content-type") ?? "application/octet-stream";
       if (/^image\/|^audio\/|^video\/|application\/octet-stream/.test(ct)) {
         throw new Error(`fetch: refusing to read binary content-type "${ct}"`);
@@ -5050,6 +5085,10 @@ async function dockerLogs(service, lines, filterRe, cwd, signal, since) {
     child.stderr?.on("data", (c) => {
       if (stderr.length < MAX) stderr += c.toString();
     });
+    child.stdout?.on("error", () => {
+    });
+    child.stderr?.on("error", () => {
+    });
     child.on("close", () => {
       const output = stdout + stderr;
       const entries = parseLogLines(output, filterRe);
@@ -5515,14 +5554,16 @@ var readTool = {
   },
   async execute(input, ctx) {
     if (!input?.path) throw new Error("read: path is required");
-    const absPath = safeResolve(input.path, ctx);
+    const absPath = await safeResolveReal(input.path, ctx);
     let stat11;
     try {
       stat11 = await fs11.stat(absPath);
     } catch (err) {
       const code = err.code;
       if (code === "ENOENT") throw new Error(`read: file not found "${input.path}"`);
-      throw new Error(`read: failed to stat "${input.path}": ${err instanceof Error ? err.message : String(err)}`);
+      throw new Error(
+        `read: failed to stat "${input.path}": ${err instanceof Error ? err.message : String(err)}`
+      );
     }
     if (!stat11.isFile()) throw new Error(`read: "${input.path}" is not a regular file`);
     if (stat11.size > MAX_BYTES2) {
@@ -5677,7 +5718,6 @@ async function resolveFiles2(filesInput, ctx, extraGlob) {
   return resolved;
 }
 async function globFiles(pattern, base, extraGlob) {
-  const { spawn: spawn11 } = await import('node:child_process');
   const rgAvailable = await checkRg();
   if (rgAvailable) {
     try {
@@ -6119,11 +6159,8 @@ async function fetchWithTimeout(url, signal, timeoutMs) {
   const timer = setTimeout(() => controller.abort(), timeoutMs);
   const fetchSignal = anySignal(signal, controller.signal);
   try {
-    const res = await fetch(url, {
-      headers: {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
-      },
-      signal: fetchSignal
+    const res = await guardedFetch(url, 5, fetchSignal, {
+      "user-agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36"
     });
     clearTimeout(timer);
     return res;
@@ -6875,7 +6912,7 @@ var writeTool = {
   async execute(input, ctx) {
     if (!input?.path) throw new Error("write: path is required");
     if (input.content === void 0) throw new Error("write: content is required");
-    const absPath = safeResolve(input.path, ctx);
+    const absPath = await safeResolveReal(input.path, ctx);
     let existed = false;
     let prev = "";
     try {