@wrongstack/tools 0.82.6 → 0.84.1

package/dist/pack.js

@@ -702,7 +702,7 @@ function getProcessRegistry() {
 
 // src/bash.ts
 var MAX_OUTPUT = 32768;
-var DEFAULT_TIMEOUT = 3e4;
+var DEFAULT_TIMEOUT_MS = 3e4;
 var STREAM_FLUSH_INTERVAL_MS = 200;
 var STREAM_FLUSH_BYTES = 4 * 1024;
 var bashTool = {
@@ -765,9 +765,19 @@ var bashTool = {
       };
       return;
     }
-    const timeoutMs = Math.max(1, Math.min(input.timeout_ms ?? DEFAULT_TIMEOUT, 6e5));
+    const timeoutMs = Math.max(1, Math.min(input.timeout_ms ?? DEFAULT_TIMEOUT_MS, 6e5));
     const isWin = os.platform() === "win32";
-    const shell = isWin ? process.env["COMSPEC"] ?? "cmd.exe" : process.env["SHELL"] ?? "/bin/bash";
+    const shell = (() => {
+      const explicit = process.env[isWin ? "WRONGSTACK_COMSPEC" : "WRONGSTACK_SHELL"];
+      if (explicit) return explicit;
+      if (isWin) return process.env["COMSPEC"] ?? "cmd.exe";
+      const fromEnv = process.env["SHELL"];
+      if (fromEnv) {
+        const name = fromEnv.split("/").pop() ?? "";
+        if (["bash", "zsh", "sh", "dash", "fish"].includes(name)) return fromEnv;
+      }
+      return "/bin/bash";
+    })();
     const args = isWin ? ["/c", input.command] : ["-c", input.command];
     const env = buildChildEnv(ctx.session?.id);
     const detached = isWin ? !!input.background : true;
@@ -3717,7 +3727,7 @@ var ALLOWED_COMMANDS = {
 };
 var MAX_ARGS = 20;
 var MAX_OUTPUT2 = 2e5;
-var TIMEOUT_MS = 3e4;
+var DEFAULT_TIMEOUT_MS2 = 3e4;
 var BLOCKED_ARG_PATTERNS = {
   // python -c/--command executes arbitrary code; python -m runs modules
   python: [/-c$/, /^--command$/, /^-m$/, /^--module$/],
@@ -3780,7 +3790,7 @@ var execTool = {
   permission: "confirm",
   mutating: true,
   riskTier: "standard",
-  timeoutMs: TIMEOUT_MS,
+  timeoutMs: DEFAULT_TIMEOUT_MS2,
   capabilities: ["shell.restricted"],
   inputSchema: {
     type: "object",
@@ -3841,7 +3851,7 @@ var execTool = {
       };
     }
     const args = (input.args ?? []).slice(0, MAX_ARGS);
-    const timeout = Math.max(1, Math.min(input.timeout ?? TIMEOUT_MS, TIMEOUT_MS));
+    const timeout = Math.max(1, Math.min(input.timeout ?? DEFAULT_TIMEOUT_MS2, DEFAULT_TIMEOUT_MS2));
     const argError = validateArgs(cmd, args);
     if (argError) {
       return {
@@ -3934,8 +3944,21 @@ function runCommand(cmd, args, cwd, timeout, signal, sessionId) {
   });
 }
 var MAX_BYTES = 131072;
-var TIMEOUT_MS2 = 2e4;
+var TIMEOUT_MS = 2e4;
 var ALLOW_PRIVATE = process.env["WRONGSTACK_FETCH_ALLOW_PRIVATE"] === "1";
+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;
+}
 function guardedLookup(hostname, options, callback) {
   dns.lookup(hostname, { all: true }).then((records) => {
     const family = options?.family;
@@ -3978,6 +4001,10 @@ function getPinnedDispatcher() {
   }
   return pinnedAgent;
 }
+process.on("beforeExit", () => {
+  pinnedAgent?.destroy();
+  pinnedAgent = void 0;
+});
 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"
@@ -4027,7 +4054,7 @@ var fetchTool = {
   // matching that pattern on any other tool that happens to have a `url`
   // input field.
   subjectKey: "url",
-  timeoutMs: TIMEOUT_MS2,
+  timeoutMs: TIMEOUT_MS,
   maxOutputBytes: MAX_BYTES,
   inputSchema: {
     type: "object",
@@ -4066,8 +4093,8 @@ var fetchTool = {
     await assertNotPrivate(u.hostname);
     yield { type: "log", text: `GET ${input.url}` };
     const ctrl = new AbortController();
-    const timer = setTimeout(() => ctrl.abort(new Error("fetch timeout")), TIMEOUT_MS2);
-    const combined = combineSignals(opts.signal, ctrl.signal);
+    const timer = setTimeout(() => ctrl.abort(new Error("fetch timeout")), TIMEOUT_MS);
+    const combined = combineSignals([opts.signal, ctrl.signal]);
     try {
       const res = await guardedFetch(input.url, 5, combined);
       const ct = res.headers.get("content-type") ?? "application/octet-stream";
@@ -4215,33 +4242,6 @@ function expandIPv6(addr) {
   if (fill < 0) return null;
   return [...head, ...new Array(fill).fill(0), ...tail];
 }
-function combineSignals(...sigs) {
-  const anyFn = AbortSignal.any;
-  if (typeof anyFn === "function") {
-    return anyFn(sigs);
-  }
-  const ctrl = new AbortController();
-  const cleanups = [];
-  const detach = () => {
-    for (const fn of cleanups) fn();
-    cleanups.length = 0;
-  };
-  for (const s of sigs) {
-    if (s.aborted) {
-      detach();
-      ctrl.abort(s.reason);
-      return ctrl.signal;
-    }
-    const onAbort = () => {
-      detach();
-      ctrl.abort(s.reason);
-    };
-    s.addEventListener("abort", onAbort, { once: true });
-    cleanups.push(() => s.removeEventListener("abort", onAbort));
-  }
-  ctrl.signal.addEventListener("abort", detach, { once: true });
-  return ctrl.signal;
-}
 function prettyJson(s) {
   try {
     return JSON.stringify(JSON.parse(s), null, 2);
@@ -4377,7 +4377,7 @@ async function detectFixer(cwd) {
     }
   }
 }
-var TIMEOUT_MS3 = 3e4;
+var TIMEOUT_MS2 = 3e4;
 var MAX_OUTPUT3 = 1e5;
 var gitTool = {
   name: "git",
@@ -4390,7 +4390,7 @@ var gitTool = {
   // and `MUTATING_SUBCOMMANDS` is consulted at runtime for per-call checks.
   mutating: true,
   capabilities: ["fs.write", "shell.restricted"],
-  timeoutMs: TIMEOUT_MS3,
+  timeoutMs: TIMEOUT_MS2,
   inputSchema: {
     type: "object",
     properties: {
@@ -6409,7 +6409,7 @@ function expectDefined12(value) {
 }
 var DEFAULT_NUM = 10;
 var MAX_RESULTS = 50;
-var TIMEOUT_MS4 = 15e3;
+var TIMEOUT_MS3 = 15e3;
 var searchTool = {
   name: "search",
   category: "Search",
@@ -6418,7 +6418,7 @@ var searchTool = {
   permission: "confirm",
   mutating: false,
   capabilities: ["net.outbound"],
-  timeoutMs: TIMEOUT_MS4,
+  timeoutMs: TIMEOUT_MS3,
   inputSchema: {
     type: "object",
     properties: {
@@ -6481,7 +6481,7 @@ var searchTool = {
 async function duckduckgoSearch(query2, num, signal) {
   const encoded = encodeURIComponent(query2);
   const url = `https://lite.duckduckgo.com/lite/?q=${encoded}&kd=-1&kl=wt-wt`;
-  const results = await fetchWithTimeout(url, signal, TIMEOUT_MS4).then((r) => r.text()).then((html) => parseDuckDuckGo(html, num)).catch(() => [{ title: "Search unavailable", url: "", snippet: "Could not reach DuckDuckGo" }]);
+  const results = await fetchWithTimeout(url, signal, TIMEOUT_MS3).then((r) => r.text()).then((html) => parseDuckDuckGo(html, num)).catch(() => [{ title: "Search unavailable", url: "", snippet: "Could not reach DuckDuckGo" }]);
   return {
     query: query2,
     results,
@@ -6522,7 +6522,7 @@ function parseDuckDuckGo(html, num) {
 async function googleSearch(query2, num, signal) {
   const encoded = encodeURIComponent(query2);
   const url = `https://www.google.com/search?q=${encoded}&hl=en`;
-  const html = await fetchWithTimeout(url, signal, TIMEOUT_MS4).then((r) => r.text()).catch(() => "");
+  const html = await fetchWithTimeout(url, signal, TIMEOUT_MS3).then((r) => r.text()).catch(() => "");
   const results = parseGoogleResults(html, num);
   return {
     query: query2,
@@ -6560,7 +6560,7 @@ function parseGoogleResults(html, num) {
 async function bingSearch(query2, num, signal) {
   const encoded = encodeURIComponent(query2);
   const url = `https://www.bing.com/search?q=${encoded}`;
-  const html = await fetchWithTimeout(url, signal, TIMEOUT_MS4).then((r) => r.text()).catch(() => "");
+  const html = await fetchWithTimeout(url, signal, TIMEOUT_MS3).then((r) => r.text()).catch(() => "");
   const results = parseBingResults(html, num);
   return {
     query: query2,