openmausbot 0.1.94 → 0.1.96

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

@@ -1,17 +1,29 @@
-// Per-turn MCP entry point. Only a scoped browser capability crosses into the
-// agent process; engine commands, session names, and credentials stay in OMB.
+// Per-turn MCP entry point for the tools the harness serves itself: the
+// built-in browser and the cloud computer. argv[2] names which one. Only a
+// turn-scoped capability crosses into the agent process; engine commands,
+// session names, and provider credentials (the Boat token) stay in OMB.
 import { pathToFileURL } from "node:url";
 const MAX_INPUT_BYTES = 1_048_576;
 const MAX_OUTPUT_BYTES = 16_777_216;
 const MAX_PENDING = 16;
+const NAMES = { browser: "Browser", computer: "Cloud computer" };
+/** What a model needs after a failed call, per tool family: the failure is
+ * about this one connection, and an uncertain action must be checked first. */
+const 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) {
+async function boundedJson(response, name) {
     if (!response.body)
-        throw new Error("Browser server returned an empty response.");
+        throw new Error(`${name} server returned an empty response.`);
     const reader = response.body.getReader();
     const chunks = [];
     let size = 0;
@@ -22,7 +34,7 @@ async function boundedJson(response) {
                 break;
             size += value.byteLength;
             if (size > MAX_OUTPUT_BYTES)
-                throw new Error("Browser response exceeded the size limit.");
+                throw new Error(`${name} response exceeded the size limit.`);
             chunks.push(Buffer.from(value));
         }
         return JSON.parse(Buffer.concat(chunks).toString("utf8"));
@@ -31,7 +43,7 @@ async function boundedJson(response) {
         await reader.cancel().catch(() => { });
     }
 }
-export async function browserProxyRequest(frame, connection) {
+export async function harnessMcpRequest(frame, connection) {
     if (!frame || typeof frame !== "object" || Array.isArray(frame))
         return failure(null, null, "Invalid request.", -32600);
     const message = frame;
@@ -40,10 +52,11 @@ export async function browserProxyRequest(frame, connection) {
         return failure(null, null, "Invalid request.", -32600);
     if (!Object.hasOwn(message, "id"))
         return undefined;
+    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: {} };
@@ -52,30 +65,30 @@ export async function browserProxyRequest(frame, connection) {
     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), {
+            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(130_000),
         });
-        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, 2_000) : "Browser server is unavailable. Start a new bot turn or try again.");
+            throw new Error(typeof payload?.error === "string" ? payload.error.slice(0, 2_000) : `${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.");
+            ? 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) => {
@@ -114,11 +127,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."));
+                    output(failure(request.id ?? null, request.method, `Too many pending ${kind} requests.`));
                 continue;
             }
             pending++;
-            void browserProxyRequest(frame, connection).then(output).finally(() => { pending--; });
+            void harnessMcpRequest(frame, connection).then(output).finally(() => { pending--; });
         }
         if (input.length > MAX_INPUT_BYTES) {
             process.stdin.destroy();
@@ -126,5 +139,12 @@ 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);
+}