openmausbot 0.1.75 → 0.1.77

package/dist-server/mcp-gate.js

@@ -136,28 +136,29 @@ function isFile(p) {
     return false;
   }
 }
-function whichWin(cli) {
-  const exts = (process.env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean);
+function whichWin(cli, env) {
+  const exts = ((env ?? process.env).PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";").filter(Boolean);
   const probe = (base) => {
     const order = extname(base) ? [base, ...exts.map((e) => base + e)] : [...exts.map((e) => base + e), base];
     return order.find(isFile) ?? null;
   };
   if (/[\\/]/.test(cli) || /^[a-zA-Z]:/.test(cli)) return probe(cli);
-  for (const dir of augmentedPath().split(delimiter)) {
+  const path = env ? env.PATH ?? env.Path ?? "" : augmentedPath();
+  for (const dir of path.split(delimiter)) {
     if (!dir) continue;
     const hit = probe(join(dir, cli));
     if (hit) return hit;
   }
   return null;
 }
-function nodeExe(near) {
+function nodeExe(near, env) {
   const local = join(near, "node.exe");
   if (isFile(local)) return local;
-  const onPath = whichWin("node.exe");
+  const onPath = whichWin("node.exe", env);
   if (onPath && extname(onPath).toLowerCase() === ".exe") return onPath;
   return process.versions.electron ? null : process.execPath;
 }
-function parseCmdShim(shim) {
+function parseCmdShim(shim, env) {
   let text;
   try {
     text = readFileSync(shim, "utf8");
@@ -168,13 +169,13 @@ function parseCmdShim(shim) {
   const targets = [...text.matchAll(/"%~?dp0%?\\?([^"]+)"/g)].map((m) => join(dir, m[1])).filter((p) => isFile(p) && basename(p).toLowerCase() !== "node.exe");
   const script = targets.find((p) => /\.[cm]?js$/i.test(p));
   if (script) {
-    const node = nodeExe(dir);
+    const node = nodeExe(dir, env);
     if (node) return { command: node, args: [script] };
   }
   const exe = targets.find((p) => extname(p).toLowerCase() === ".exe");
   return exe ? { command: exe, args: [] } : null;
 }
-function parseNodeShebang(file) {
+function parseNodeShebang(file, env) {
   let head = "";
   let fd = null;
   try {
@@ -193,32 +194,32 @@ function parseNodeShebang(file) {
     }
   }
   if (!/^#!.*\bnode(\.exe)?\b/.test(head)) return null;
-  const node = nodeExe(dirname(file));
+  const node = nodeExe(dirname(file), env);
   return node ? { command: node, args: [file] } : null;
 }
-function resolveWord(cli, args) {
+function resolveWord(cli, args, env) {
   if (process.platform !== "win32") return { command: cli, args };
-  const file = whichWin(cli);
+  const file = whichWin(cli, env);
   if (!file) return { command: cli, args };
   const ext = extname(file).toLowerCase();
   if (ext === ".cmd" || ext === ".bat") {
-    const direct = parseCmdShim(file);
+    const direct = parseCmdShim(file, env);
     return direct ? { command: direct.command, args: [...direct.args, ...args] } : { command: file, args };
   }
   if (ext === ".exe" || ext === ".com") return { command: file, args };
-  const viaNode = parseNodeShebang(file);
+  const viaNode = parseNodeShebang(file, env);
   return viaNode ? { command: viaNode.command, args: [...viaNode.args, ...args] } : { command: file, args };
 }
-function resolveCliSpawn(cli, args) {
+function resolveCliSpawn(cli, args, env) {
   const trimmed = cli.trim();
-  if (trimmed.includes(" ") && existsSync(trimmed)) return resolveWord(trimmed, args);
+  if (trimmed.includes(" ") && existsSync(trimmed)) return resolveWord(trimmed, args, env);
   const split = splitCliString(cli);
   if (split.length > 1 || split[0] !== trimmed) {
     const [head, ...fixed] = split;
     if (!head) return { command: cli, args };
-    return resolveWord(head, [...fixed, ...args]);
+    return resolveWord(head, [...fixed, ...args], env);
   }
-  return resolveWord(cli, args);
+  return resolveWord(cli, args, env);
 }
 
 // server/mcp-trim.ts
@@ -404,9 +405,13 @@ async function stopCliTree(child2, pid, timeoutMs) {
   if (exited()) return true;
   return new Promise((resolve) => {
     let timer;
+    let finished = false;
     const done = (stopped) => {
+      if (finished) return;
+      finished = true;
       clearTimeout(timer);
       child2.off("close", closed);
+      child2.off("exit", closed);
       resolve(stopped);
     };
     const closed = () => done(true);
@@ -414,7 +419,12 @@ async function stopCliTree(child2, pid, timeoutMs) {
     timer = setTimeout(() => done(false), timeoutMs);
     timer.unref?.();
     execFile2("taskkill", ["/PID", String(pid), "/T", "/F"], { windowsHide: true }, (err) => {
-      if (!err) return;
+      if (finished) return;
+      if (!err) {
+        if (exited()) done(true);
+        else child2.once("exit", closed);
+        return;
+      }
       try {
         child2.kill();
       } catch {