@wrongstack/tools 0.281.3 → 0.282.0

package/dist/bash.js

@@ -403,14 +403,34 @@ function redactCommand(cmd) {
   return result;
 }
 var DEFAULT_GRACE_MS = 2e3;
-function killWin32Tree(pid) {
+var WIN32_TASKKILL_TIMEOUT_MS = 5e3;
+function killWin32Tree(pid, opts = {}) {
   try {
     const child = spawn("taskkill", ["/pid", String(pid), "/T", "/F"], {
       stdio: "ignore",
       windowsHide: true
     });
-    child.on("error", () => {
-    });
+    let settled = false;
+    let timeout;
+    const settle = () => {
+      if (settled) return;
+      settled = true;
+      if (timeout) clearTimeout(timeout);
+      try {
+        opts.onSettled?.();
+      } catch {
+      }
+    };
+    child.on("error", settle);
+    child.on("close", settle);
+    timeout = setTimeout(() => {
+      try {
+        child.kill();
+      } catch {
+      }
+      settle();
+    }, Math.max(1, opts.timeoutMs ?? WIN32_TASKKILL_TIMEOUT_MS));
+    timeout.unref?.();
     child.unref();
     return true;
   } catch {
@@ -640,17 +660,18 @@ var ProcessRegistryImpl = class {
     const isWin2 = os2.platform() === "win32";
     if (isWin2) {
       const liveRealChild = p.child.exitCode === null && typeof p.child.pid === "number";
-      if (liveRealChild && killWin32Tree(pid)) {
-        const fallback = setTimeout(() => {
-          if (p.child.exitCode === null) {
-            try {
-              p.child.kill("SIGKILL");
-            } catch {
-            }
+      const directFallback = () => {
+        if (p.child.exitCode === null) {
+          try {
+            p.child.kill("SIGKILL");
+          } catch {
           }
-        }, graceMs);
-        fallback.unref?.();
-      } else {
+        }
+      };
+      if (liveRealChild && killWin32Tree(pid, {
+        timeoutMs: Math.max(graceMs, WIN32_TASKKILL_TIMEOUT_MS),
+        onSettled: directFallback
+      })) ; else {
         try {
           p.child.kill(force ? "SIGKILL" : "SIGTERM");
         } catch {
@@ -1710,17 +1731,14 @@ var bashTool = {
     const spool = createOutputSpool({ tool: "bash", thresholdBytes: MAX_OUTPUT });
     function killWithTimeout(child2, timeoutMs2) {
       if (isWin2) {
-        if (typeof child2.pid === "number" && child2.exitCode === null && killWin32Tree(child2.pid)) {
-          const fallback = setTimeout(() => {
-            if (child2.exitCode === null) {
-              try {
-                child2.kill();
-              } catch {
-              }
+        if (typeof child2.pid === "number" && child2.exitCode === null) {
+          const attempted = registry.kill(child2.pid, { force: true, graceMs: timeoutMs2 });
+          if (!attempted) {
+            try {
+              child2.kill();
+            } catch {
             }
-          }, 2e3);
-          timers.push(fallback);
-          fallback.unref?.();
+          }
         } else {
           try {
             child2.kill();