@wrongstack/tools 0.119.1 → 0.141.0

package/dist/builtin.js

@@ -1,6 +1,6 @@
+import { spawn, execFileSync, spawnSync } from 'node:child_process';
 import * as Core from '@wrongstack/core';
 import { buildChildEnv, expectDefined, detectNewlineStyle, normalizeToLf, toStyle, atomicWrite, unifiedDiff, compileGlob, loadPlan, emptyPlan, clearPlan, savePlan, getPlanTemplate, addPlanItem, deriveTodosFromPlanItem, removePlanItem, setPlanItemStatus, formatPlan, loadTasks, emptyTaskFile, saveTasks, computeTaskItemProgress, formatTaskList, resolveWstackPaths } from '@wrongstack/core';
-import { spawn, execFileSync, spawnSync } from 'node:child_process';
 import * as fs12 from 'node:fs/promises';
 import * as path from 'node:path';
 import { resolve, sep, dirname } from 'node:path';
@@ -65,7 +65,7 @@ async function* spawnStream(opts) {
         waiter = resolve7;
       });
     }
-    const chunk = expectDefined(queue.shift());
+    const chunk = queue.shift();
     if (chunk.kind === "close") {
       if (!spawnFailed) exitCode = chunk.code ?? 0;
       break;
@@ -181,9 +181,9 @@ function collapseConsecutiveDuplicates(text, minRun = REPEAT_RUN_THRESHOLD) {
     while (j < lines.length && lines[j] === lines[i]) j++;
     const run = j - i;
     if (run >= minRun) {
-      out.push(expectDefined(lines[i]), `\u2026 \u27E8repeated ${run}\xD7\u27E9`);
+      out.push(lines[i], `\u2026 \u27E8repeated ${run}\xD7\u27E9`);
     } else {
-      for (let k = i; k < j; k++) out.push(expectDefined(lines[k]));
+      for (let k = i; k < j; k++) out.push(lines[k]);
     }
     i = j;
   }
@@ -838,44 +838,46 @@ var bashTool = {
     let pending = "";
     let timedOut = false;
     const timers = [];
-    const timer = setTimeout(() => {
-      timedOut = true;
+    function killWithTimeout(child2, timeoutMs2) {
       if (isWin) {
         try {
-          child.kill();
+          child2.kill();
         } catch {
         }
-      } else {
+        return;
+      }
+      try {
+        if (typeof child2.pid === "number") {
+          try {
+            process.kill(-child2.pid, "SIGTERM");
+          } catch {
+            child2.kill("SIGTERM");
+          }
+        } else {
+          child2.kill("SIGTERM");
+        }
+      } catch {
+      }
+      const killTimer = setTimeout(() => {
         try {
-          if (typeof child.pid === "number") {
+          if (typeof child2.pid === "number") {
             try {
-              process.kill(-child.pid, "SIGTERM");
+              process.kill(-child2.pid, "SIGKILL");
             } catch {
-              child.kill("SIGTERM");
+              child2.kill("SIGKILL");
             }
           } else {
-            child.kill("SIGTERM");
+            child2.kill("SIGKILL");
           }
-          const killTimer = setTimeout(() => {
-            try {
-              if (typeof child.pid === "number") {
-                try {
-                  process.kill(-child.pid, "SIGKILL");
-                } catch {
-                  child.kill("SIGKILL");
-                }
-              } else {
-                child.kill("SIGKILL");
-              }
-            } catch {
-            } finally {
-              killTimer.unref?.();
-            }
-          }, 2e3);
-          timers.push(killTimer);
         } catch {
         }
-      }
+      }, timeoutMs2);
+      timers.push(killTimer);
+      killTimer.unref?.();
+    }
+    const timer = setTimeout(() => {
+      timedOut = true;
+      killWithTimeout(child, 2e3);
     }, timeoutMs);
     timers.push(timer);
     timer.unref?.();
@@ -3891,19 +3893,7 @@ if (ALLOW_PRIVATE && !process.env["CI"]) {
     "[WrongStack] WARNING: WRONGSTACK_FETCH_ALLOW_PRIVATE=1 is active \u2014\n  fetch tool can now access private IPs (10.x, 192.168.x, 169.254.x),\n  cloud metadata endpoints, and plaintext HTTP. Use only on isolated networks."
   );
 }
-function combineSignals(signals) {
-  const anyFn = AbortSignal.any;
-  if (typeof anyFn === "function") return anyFn(signals);
-  const ctrl = new AbortController();
-  for (const sig of signals) {
-    if (sig.aborted) {
-      ctrl.abort(sig.reason);
-      return ctrl.signal;
-    }
-    sig.addEventListener("abort", () => ctrl.abort(sig.reason), { once: true });
-  }
-  return ctrl.signal;
-}
+var combineSignals = (signals) => AbortSignal.any(signals);
 function guardedLookup(hostname, options, callback) {
   dns.lookup(hostname, { all: true }).then((records) => {
     const family = options?.family;
@@ -6117,7 +6107,11 @@ function checkRg() {
 }
 function spawnRgFind(pattern, base) {
   const args = ["--files", "--glob", pattern, base];
-  const child = spawn("rg", args, { env: buildChildEnv(), stdio: ["ignore", "pipe", "pipe"] });
+  const child = spawn("rg", args, {
+    signal: AbortSignal.timeout(3e4),
+    env: buildChildEnv(),
+    stdio: ["ignore", "pipe", "pipe"]
+  });
   let buf = "";
   child.stdout?.on("data", (chunk) => {
     buf += chunk.toString();