openmausbot 0.1.91 → 0.1.92

package/dist-server/local-computer-proxy.js

@@ -84,6 +84,9 @@ function nvmBinDirs() {
     return [];
   }
 }
+function sealedFixture() {
+  return process.env.OMB_TEST_SEALED_PATH === "1";
+}
 function knownDirs() {
   const home = homedir();
   return [
@@ -99,10 +102,13 @@ function knownDirs() {
     // opencode installer
     join(home, ".claude", "local"),
     // claude "local install"
-    "/opt/homebrew/bin",
-    // brew, Apple silicon
-    "/usr/local/bin",
-    // brew Intel / classic installs
+    // Machine-wide rather than under the (possibly temporary) home.
+    ...sealedFixture() ? [] : [
+      "/opt/homebrew/bin",
+      // brew, Apple silicon
+      "/usr/local/bin"
+      // brew Intel / classic installs
+    ],
     join(home, ".volta", "bin"),
     join(home, ".bun", "bin"),
     join(home, ".asdf", "shims"),
@@ -154,7 +160,7 @@ function augmentedPath() {
       ...(process.platform === "win32" ? windowsKnownDirs() : knownDirs()).filter((d) => existsSync(d))
     ]);
   }
-  if (!probed && !process.env.VITEST && process.platform !== "win32") {
+  if (!probed && !process.env.VITEST && !sealedFixture() && process.platform !== "win32") {
     probed = true;
     probeLoginShellPath();
   }
@@ -178,6 +184,119 @@ function probeLoginShellPath() {
     }
   );
 }
+function splitCliString(cli) {
+  const out = [];
+  let cur = "";
+  let quote = null;
+  for (const ch of cli.trim()) {
+    if (quote) {
+      if (ch === quote) quote = null;
+      else cur += ch;
+    } else if (ch === '"' || ch === "'") {
+      quote = ch;
+    } else if (/\s/.test(ch)) {
+      if (cur) out.push(cur);
+      cur = "";
+    } else {
+      cur += ch;
+    }
+  }
+  if (cur) out.push(cur);
+  return out;
+}
+function isFile(p) {
+  try {
+    return statSync(p, { throwIfNoEntry: false })?.isFile() ?? false;
+  } catch {
+    return false;
+  }
+}
+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);
+  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, env) {
+  const local = join(near, "node.exe");
+  if (isFile(local)) return local;
+  const onPath = whichWin("node.exe", env);
+  if (onPath && extname(onPath).toLowerCase() === ".exe") return onPath;
+  return process.versions.electron ? null : process.execPath;
+}
+function parseCmdShim(shim, env) {
+  let text;
+  try {
+    text = readFileSync(shim, "utf8");
+  } catch {
+    return null;
+  }
+  const dir = dirname(shim);
+  const npmEntry = /^SET "NP[MX]_CLI_JS=%~dp0\\([^"]+)"/im.exec(text);
+  const targets = [...npmEntry ? [npmEntry] : [], ...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, 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, env) {
+  let head = "";
+  let fd = null;
+  try {
+    fd = openSync(file, "r");
+    const buf = Buffer.alloc(128);
+    const n = readSync(fd, buf, 0, buf.length, 0);
+    head = buf.subarray(0, n).toString("utf8").split("\n", 1)[0];
+  } catch {
+    return null;
+  } finally {
+    if (fd !== null) {
+      try {
+        closeSync(fd);
+      } catch {
+      }
+    }
+  }
+  if (!/^#!.*\bnode(\.exe)?\b/.test(head)) return null;
+  const node = nodeExe(dirname(file), env);
+  return node ? { command: node, args: [file] } : null;
+}
+function resolveWord(cli, args2, env) {
+  if (process.platform !== "win32") return { command: cli, args: args2 };
+  const file = whichWin(cli, env);
+  if (!file) return { command: cli, args: args2 };
+  const ext = extname(file).toLowerCase();
+  if (ext === ".cmd" || ext === ".bat") {
+    const direct = parseCmdShim(file, env);
+    return direct ? { command: direct.command, args: [...direct.args, ...args2] } : { command: file, args: args2 };
+  }
+  if (ext === ".exe" || ext === ".com") return { command: file, args: args2 };
+  const viaNode = parseNodeShebang(file, env);
+  return viaNode ? { command: viaNode.command, args: [...viaNode.args, ...args2] } : { command: file, args: args2 };
+}
+function resolveCliSpawn(cli, args2, env) {
+  const trimmed = cli.trim();
+  if (trimmed.includes(" ") && existsSync(trimmed)) return resolveWord(trimmed, args2, env);
+  const split = splitCliString(cli);
+  if (split.length > 1 || split[0] !== trimmed) {
+    const [head, ...fixed] = split;
+    if (!head) return { command: cli, args: args2 };
+    return resolveWord(head, [...fixed, ...args2], env);
+  }
+  return resolveWord(cli, args2, env);
+}
 
 // server/mcp-tool-schema.ts
 var ROOT_COMBINATORS = ["anyOf", "oneOf", "allOf", "not"];
@@ -401,9 +520,11 @@ function createMcpBridgeInterceptor(options) {
   };
 }
 function runMcpBridge(options) {
-  const child = spawn(options.command, options.args, {
+  const env = options.env ?? { ...process.env, PATH: augmentedPath() };
+  const { command: command2, args: args2 } = resolveCliSpawn(options.command, options.args, env);
+  const child = spawn(command2, args2, {
     shell: false,
-    env: options.env ?? { ...process.env, PATH: augmentedPath() },
+    env,
     stdio: ["pipe", "pipe", "pipe"]
   });
   child.stdin.on("error", () => {

package/dist-server/mcp-gate.js

@@ -17,6 +17,9 @@ function nvmBinDirs() {
     return [];
   }
 }
+function sealedFixture() {
+  return process.env.OMB_TEST_SEALED_PATH === "1";
+}
 function knownDirs() {
   const home = homedir();
   return [
@@ -32,10 +35,13 @@ function knownDirs() {
     // opencode installer
     join(home, ".claude", "local"),
     // claude "local install"
-    "/opt/homebrew/bin",
-    // brew, Apple silicon
-    "/usr/local/bin",
-    // brew Intel / classic installs
+    // Machine-wide rather than under the (possibly temporary) home.
+    ...sealedFixture() ? [] : [
+      "/opt/homebrew/bin",
+      // brew, Apple silicon
+      "/usr/local/bin"
+      // brew Intel / classic installs
+    ],
     join(home, ".volta", "bin"),
     join(home, ".bun", "bin"),
     join(home, ".asdf", "shims"),
@@ -87,7 +93,7 @@ function augmentedPath() {
       ...(process.platform === "win32" ? windowsKnownDirs() : knownDirs()).filter((d) => existsSync(d))
     ]);
   }
-  if (!probed && !process.env.VITEST && process.platform !== "win32") {
+  if (!probed && !process.env.VITEST && !sealedFixture() && process.platform !== "win32") {
     probed = true;
     probeLoginShellPath();
   }