openmausbot 0.1.73 → 0.1.74

package/dist-server/mcp-gate.js

@@ -346,9 +346,62 @@ import {
   spawn,
   execFile as execFile2
 } from "node:child_process";
+var cliGroups = /* @__PURE__ */ new WeakSet();
+var stopping = /* @__PURE__ */ new WeakMap();
 function killCliTree(child2, timeoutMs = 5e3) {
+  const existing = stopping.get(child2);
+  if (existing) return existing;
   const pid = child2.pid;
-  if (!pid || child2.exitCode !== null || child2.signalCode !== null) return Promise.resolve(true);
+  if (!pid) return Promise.resolve(true);
+  if (!Number.isInteger(pid) || pid <= 1 || pid === process.pid) return Promise.resolve(false);
+  const run = stopCliTree(child2, pid, Number.isFinite(timeoutMs) ? Math.max(0, timeoutMs) : 5e3);
+  stopping.set(child2, run);
+  void run.then((stopped) => {
+    if (!stopped) stopping.delete(child2);
+  });
+  return run;
+}
+async function stopCliTree(child2, pid, timeoutMs) {
+  const exited = () => child2.exitCode !== null || child2.signalCode !== null;
+  if (process.platform !== "win32") {
+    const group = cliGroups.has(child2);
+    const settled = () => {
+      if (!exited()) return false;
+      if (!group) return true;
+      try {
+        process.kill(-pid, 0);
+        return false;
+      } catch (error) {
+        return error.code === "ESRCH";
+      }
+    };
+    const signal = (value) => {
+      try {
+        if (group) process.kill(-pid, value);
+        else child2.kill(value);
+      } catch {
+        try {
+          child2.kill(value);
+        } catch {
+        }
+      }
+    };
+    const wait = async (ms) => {
+      const deadline = Date.now() + ms;
+      while (!settled()) {
+        const remaining = deadline - Date.now();
+        if (remaining <= 0) return false;
+        await new Promise((resolve) => setTimeout(resolve, Math.min(25, remaining)));
+      }
+      return true;
+    };
+    if (settled()) return true;
+    signal("SIGTERM");
+    if (await wait(timeoutMs)) return true;
+    signal("SIGKILL");
+    return wait(1e3);
+  }
+  if (exited()) return true;
   return new Promise((resolve) => {
     let timer;
     const done = (stopped) => {
@@ -360,24 +413,13 @@ function killCliTree(child2, timeoutMs = 5e3) {
     child2.once("close", closed);
     timer = setTimeout(() => done(false), timeoutMs);
     timer.unref?.();
-    if (process.platform === "win32") {
-      execFile2("taskkill", ["/PID", String(pid), "/T", "/F"], { windowsHide: true }, (err) => {
-        if (!err) return;
-        try {
-          child2.kill();
-        } catch {
-        }
-      });
-      return;
-    }
-    try {
-      process.kill(-pid, "SIGTERM");
-    } catch {
+    execFile2("taskkill", ["/PID", String(pid), "/T", "/F"], { windowsHide: true }, (err) => {
+      if (!err) return;
       try {
-        child2.kill("SIGTERM");
+        child2.kill();
       } catch {
       }
-    }
+    });
   });
 }