openmausbot 0.1.99 → 0.1.100

package/dist-server/server/mcp-probe.js

@@ -8,7 +8,13 @@ import { killCliTree, spawnCli } from "./procs.js";
 export const SIGN_IN_REQUIRED = "This server needs you to sign in.";
 const MAX_STDOUT_BYTES = 1_048_576;
 const MAX_TOOLS = 100;
-const DEFAULT_TIMEOUT_MS = 8_000;
+/** A command starts on this computer and answers fast. */
+export const STDIO_PROBE_TIMEOUT_MS = 8_000;
+/** A URL server answers over the internet, and initialize + tools/list for
+ * an account with many businesses (Whop, admin scope) can take well over
+ * 8 seconds. The probe only runs when the person asks for it, never on a
+ * bot's turn. */
+export const REMOTE_PROBE_TIMEOUT_MS = 30_000;
 function probeEnvironment(server) {
     const env = { ...process.env, PATH: augmentedPath() };
     stripWorkspaceCredentialEnv(env);
@@ -58,19 +64,20 @@ function publicTools(raw, secrets) {
 /** Prove the MCP handshake and list the tools of one configured server,
  * whichever way it is reached. Neither path returns anything the renderer
  * must not see: child stderr, environment values, header values. */
-export function probeMcpServer(server, timeoutMs = DEFAULT_TIMEOUT_MS, signal) {
+export function probeMcpServer(server, timeoutMs, signal) {
     return isRemoteMcpServer(server)
-        ? probeRemoteMcpServer(server, timeoutMs, signal)
-        : probeStdioMcpServer(server, timeoutMs, signal);
+        ? probeRemoteMcpServer(server, timeoutMs ?? REMOTE_PROBE_TIMEOUT_MS, signal)
+        : probeStdioMcpServer(server, timeoutMs ?? STDIO_PROBE_TIMEOUT_MS, signal);
 }
-/** Connect to a remote server over its transport, bounded by the same
- * timeout as a command. HTTP status codes are safe to show and are the one
- * detail that tells a wrong token from a wrong address. */
+/** Connect to a remote server over its transport, bounded by one timeout
+ * for initialize + tools/list together. HTTP status codes are safe to show
+ * and are the one detail that tells a wrong token from a wrong address. */
 async function probeRemoteMcpServer(server, timeoutMs, signal) {
     if (signal?.aborted)
         return { ok: false, error: publicProbeError("cancelled") };
-    const timeout = AbortSignal.timeout(timeoutMs);
-    const combined = signal ? AbortSignal.any([signal, timeout]) : timeout;
+    const timeout = new AbortController();
+    const timer = setTimeout(() => timeout.abort(), timeoutMs);
+    const combined = signal ? AbortSignal.any([signal, timeout.signal]) : timeout.signal;
     const client = new RemoteMcpClient(server);
     try {
         await client.initialize("OpenMausBot", combined);
@@ -84,7 +91,7 @@ async function probeRemoteMcpServer(server, timeoutMs, signal) {
     catch (error) {
         if (signal?.aborted)
             return { ok: false, error: publicProbeError("cancelled") };
-        if (timeout.aborted)
+        if (timeout.signal.aborted)
             return { ok: false, error: publicProbeError("timeout") };
         // A 401 that names an OAuth sign-in is not a wrong address or header:
         // the person has to sign in. Anything else keeps the plain status.
@@ -105,6 +112,7 @@ async function probeRemoteMcpServer(server, timeoutMs, signal) {
         return { ok: false, error: "Could not reach this address. Check the URL and your network." };
     }
     finally {
+        clearTimeout(timer);
         await client.close().catch(() => { });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openmausbot",
-  "version": "0.1.99",
+  "version": "0.1.100",
   "description": "Run the OpenMausBot server anywhere and pair your devices to it",
   "license": "Apache-2.0",
   "type": "module",

package/dist/assets/channel-TsOXCiPg.js

@@ -1 +0,0 @@
-import{U as a,C as n}from"./mermaid.core-DP6qPqu1.js";const t=(r,o)=>a.lang.round(n.parse(r)[o]);export{t as c};

package/dist/assets/swimlanesDiagram-TC7HE7FX-DzhbBHtd.js

@@ -1,8 +0,0 @@
-import{c as r,s as e}from"./flowDiagram-KWPJA3E3-cQUfEYrx.js";import{_ as a}from"./mermaid.core-DP6qPqu1.js";import"./chunk-5VM5RSS4-DtGbsjOM.js";import"./chunk-XXDRQBXY-C__m3ZXl.js";import"./chunk-WEXAMYUT-BKEeM7CJ.js";import"./chunk-GWA4HPMP-BP_JyGWQ.js";import"./channel-TsOXCiPg.js";import"./index-C8xb62XS.js";var o=a(t=>`${e(t)}
-  .swimlane.cluster:not([data-color-id]) rect {
-    stroke: ${t.clusterBorder} !important;
-  }
-  [data-look="neo"].cluster rect {
-    filter: none;
-  }
-`,"getStyles"),s=o,u=r({styles:s});export{u as diagram};