openmausbot 0.1.93 → 0.1.95

package/dist-server/enterprise/server/index.js

@@ -14589,7 +14589,8 @@ function resolveProxy(relative) {
   return existsSync(source) ? source : join(SERVER_ROOT, `${relative}.js`);
 }
 var SPAWNED_PROXIES = {
-  browser: resolveProxy("browser-proxy"),
+  // The built-in browser and the cloud computer: argv[2] picks which.
+  harnessMcp: resolveProxy("harness-mcp-proxy"),
   localComputer: resolveProxy("local-computer-proxy"),
   permission: resolveProxy("permission-proxy"),
   containerMcp: resolveProxy("container-mcp"),
@@ -14598,6 +14599,7 @@ var SPAWNED_PROXIES = {
   dweb: resolveProxy("drivers/dweb-proxy"),
   connectors: resolveProxy("connector-proxy"),
   mcpGate: resolveProxy("mcp-gate"),
+  mcpRemote: resolveProxy("mcp-remote-proxy"),
   phone: resolveProxy("drivers/phone-proxy"),
   hook: resolveProxy("hooks/omb-hook"),
   // Loaded by the external `pi` process via `-e`, not by this server — but

package/dist-server/{browser-proxy.js → harness-mcp-proxy.js}

@@ -1,13 +1,21 @@
-// server/browser-proxy.ts
+// server/harness-mcp-proxy.ts
 import { pathToFileURL } from "node:url";
 var MAX_INPUT_BYTES = 1048576;
 var MAX_OUTPUT_BYTES = 16777216;
 var MAX_PENDING = 16;
+var NAMES = { browser: "Browser", computer: "Cloud computer" };
+var RECOVERY = {
+  browser: " This failure does not establish that all browsers are unavailable. Inspect available connections with select_computer if that tool is present. Keep the requested computer and account; do not bypass a permission refusal or human takeover, and do not repeat an uncertain action without checking its result.",
+  computer: " Keep working on the assigned cloud computer only; do not bypass a person's control of it, and take a fresh screenshot before repeating an action whose result is uncertain."
+};
+function parseHarnessMcpKind(value) {
+  return value === "browser" || value === "computer" ? value : null;
+}
 function failure(id, method, message, code = -32603) {
   return method === "tools/call" ? { jsonrpc: "2.0", id, result: { content: [{ type: "text", text: message }], isError: true } } : { jsonrpc: "2.0", id, error: { code, message } };
 }
-async function boundedJson(response) {
-  if (!response.body) throw new Error("Browser server returned an empty response.");
+async function boundedJson(response, name) {
+  if (!response.body) throw new Error(`${name} server returned an empty response.`);
   const reader = response.body.getReader();
   const chunks = [];
   let size = 0;
@@ -16,7 +24,7 @@ async function boundedJson(response) {
       const { value, done } = await reader.read();
       if (done) break;
       size += value.byteLength;
-      if (size > MAX_OUTPUT_BYTES) throw new Error("Browser response exceeded the size limit.");
+      if (size > MAX_OUTPUT_BYTES) throw new Error(`${name} response exceeded the size limit.`);
       chunks.push(Buffer.from(value));
     }
     return JSON.parse(Buffer.concat(chunks).toString("utf8"));
@@ -25,45 +33,46 @@ async function boundedJson(response) {
     });
   }
 }
-async function browserProxyRequest(frame, connection) {
+async function harnessMcpRequest(frame, connection) {
   if (!frame || typeof frame !== "object" || Array.isArray(frame)) return failure(null, null, "Invalid request.", -32600);
   const message = frame;
   const id = message.id ?? null;
   if (message.jsonrpc !== "2.0" || typeof message.method !== "string" || id !== null && typeof id !== "number" && typeof id !== "string") return failure(null, null, "Invalid request.", -32600);
   if (!Object.hasOwn(message, "id")) return void 0;
+  const name = NAMES[connection.kind];
   if (message.method === "initialize") return {
     jsonrpc: "2.0",
     id,
-    result: { protocolVersion: "2024-11-05", capabilities: { tools: {} }, serverInfo: { name: "openmausbot-browser", version: "1" } }
+    result: { protocolVersion: "2024-11-05", capabilities: { tools: {} }, serverInfo: { name: `openmausbot-${connection.kind}`, version: "1" } }
   };
   if (message.method === "ping") return { jsonrpc: "2.0", id, result: {} };
   if (message.method !== "tools/list" && message.method !== "tools/call") return failure(id, message.method, "Method not found.", -32601);
   try {
     const url = new URL(connection.url);
     if (!connection.token || url.protocol !== "http:" || !["127.0.0.1", "localhost", "[::1]"].includes(url.hostname) || url.username || url.password || url.pathname !== "/" || url.search || url.hash) {
-      throw new Error("Browser connection is not configured. Start a new bot turn from OpenMausBot.");
+      throw new Error(`${name} connection is not configured. Start a new bot turn from OpenMausBot.`);
     }
     const body = JSON.stringify({ method: message.method, params: message.params ?? {} });
-    if (Buffer.byteLength(body) > MAX_INPUT_BYTES) throw new Error("Browser request exceeded the size limit.");
-    const response = await fetch(new URL("/api/internal/browser/mcp", url), {
+    if (Buffer.byteLength(body) > MAX_INPUT_BYTES) throw new Error(`${name} request exceeded the size limit.`);
+    const response = await fetch(new URL(`/api/internal/${connection.kind}/mcp`, url), {
       method: "POST",
       redirect: "error",
       headers: { "content-type": "application/json", authorization: `Bearer ${connection.token}` },
       body,
       signal: AbortSignal.timeout(13e4)
     });
-    const payload = await boundedJson(response);
+    const payload = await boundedJson(response, name);
     if (!response.ok || !payload || typeof payload !== "object" || !Object.hasOwn(payload, "result")) {
-      throw new Error(typeof payload?.error === "string" ? payload.error.slice(0, 2e3) : "Browser server is unavailable. Start a new bot turn or try again.");
+      throw new Error(typeof payload?.error === "string" ? payload.error.slice(0, 2e3) : `${name} server is unavailable. Start a new bot turn or try again.`);
     }
     return { jsonrpc: "2.0", id, result: payload.result };
   } catch (error) {
-    const detail = error instanceof Error && !/fetch failed|abort|timeout/i.test(error.message) ? error.message : "Browser connection was interrupted. Do not repeat the action until its state is checked.";
-    return failure(id, message.method, detail + " This failure does not establish that all browsers are unavailable. Inspect available connections with select_computer if that tool is present. Keep the requested computer and account; do not bypass a permission refusal or human takeover, and do not repeat an uncertain action without checking its result.");
+    const detail = error instanceof Error && !/fetch failed|abort|timeout/i.test(error.message) ? error.message : `${name} connection was interrupted. Do not repeat the action until its state is checked.`;
+    return failure(id, message.method, detail + RECOVERY[connection.kind]);
   }
 }
-function run() {
-  const connection = { url: process.env.OMB_HARNESS_URL ?? "", token: process.env.OMB_BROWSER_TOKEN ?? "" };
+function run(kind) {
+  const connection = { url: process.env.OMB_HARNESS_URL ?? "", token: process.env.OMB_MCP_TOKEN ?? "", kind };
   let input = Buffer.alloc(0);
   let pending = 0;
   const output = (message) => {
@@ -102,11 +111,11 @@ function run() {
       }
       if (pending >= MAX_PENDING) {
         const request = frame;
-        if (request && Object.hasOwn(request, "id")) output(failure(request.id ?? null, request.method, "Too many pending browser requests."));
+        if (request && Object.hasOwn(request, "id")) output(failure(request.id ?? null, request.method, `Too many pending ${kind} requests.`));
         continue;
       }
       pending++;
-      void browserProxyRequest(frame, connection).then(output).finally(() => {
+      void harnessMcpRequest(frame, connection).then(output).finally(() => {
         pending--;
       });
     }
@@ -116,7 +125,14 @@ function run() {
     }
   });
 }
-if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) run();
+if (process.argv[1] && import.meta.url === pathToFileURL(process.argv[1]).href) {
+  const kind = parseHarnessMcpKind(process.argv[2]);
+  if (!kind) {
+    process.stderr.write("usage: harness-mcp-proxy browser|computer\n");
+    process.exitCode = 2;
+  } else run(kind);
+}
 export {
-  browserProxyRequest
+  harnessMcpRequest,
+  parseHarnessMcpKind
 };