openzoo 0.50.58 → 0.50.60

package/lib/cursorbackend.js

@@ -53,7 +53,7 @@ import {
 import {
   desktopAction, displayBounds, imageSize, noteShotMeta, resolveAppName,
 } from './grokbotDesktop.js';
-import { startHostMcps, hostMcpTools, hostMcpHas, callHostMcp, hostMcpServers, chromeStatus } from './mcpbridge.js';
+import { startHostMcps, hostMcpTools, hostMcpHas, callHostMcp, hostMcpServers, chromeStatus, reattachChrome } from './mcpbridge.js';
 import * as ship from './ship.js';
 
 const TLS_DIR = path.join(os.homedir(), '.openzoo', 'cursor-tls');
@@ -2572,6 +2572,7 @@ async function zooComplete(prompt, log, agentId, parsed = {}, opts = {}) {
     if (opts.signal?.aborted) throw new Error('superseded');
   };
   await ensureTranscriptHydrated(agentId, log);
+  try { await reattachChrome({ log }); } catch (e) { log(`cursor-backend:      chrome reattach ${e.message}`); }
   log(`cursor-backend:      zoo POST :8402 model=${model} helper=${helper ? localExecSse.size : 0} hist=${historyMessages(agentId, spoken).length}${chatOnly ? ` visitor=${visitor.shortname} chat-only` : ''} ${JSON.stringify((spoken || '').slice(0, 60))}`);
   if (typeof opts.onProgress === 'function') opts.onProgress('Working on your Mac…');
 
@@ -2649,7 +2650,7 @@ async function zooComplete(prompt, log, agentId, parsed = {}, opts = {}) {
             return [
               `Host MCP tools from the user's local Claude/Grok config are attached (${servers.join(', ') || 'mcp'}): ${names.slice(0, 36).join(', ')}${names.length > 36 ? '…' : ''}.`,
               chrome.length
-                ? `For any web page or HTML form, use chrome-devtools tools (navigate_page / take_snapshot / fill / click). Do NOT use osascript, Quartz, Python Foundation, or AppleScript to read Brave. screenshot/click/type_text are for native Mac UI only. Browser mode: ${chromeStatus().mode}.${chromeStatus().hint ? ` If the human needs their logged-in browser, tell them once: ${chromeStatus().hint}` : ' This is the human\'s real logged-in browser; do not log out or change its settings.'}`
+                ? `For any web page or HTML form, use chrome-devtools tools (navigate_page / take_snapshot / fill / click). Do NOT use osascript, Quartz, Python Foundation, or AppleScript to read Brave. screenshot/click/type_text are for native Mac UI only. On heavy pages (x.com, gmail, big SPAs) take_snapshot can hang: prefer evaluate_script that returns only the text you need, or take_screenshot; a tool that times out says so — do not repeat it. Do not re-run schedule_wakeup or list_agents every turn; once is enough. Browser mode: ${chromeStatus().mode}.${chromeStatus().hint ? ` This Chrome is NOT the human's browser: a separate profile with no logins. If the human asks for their logged-in Chrome / Google / X / "the same chrome", do NOT open pages in this one and do NOT spawn anything — reply with exactly this and stop: ${chromeStatus().hint}` : ' This is the human\'s real logged-in browser; do not log out or change its settings.'}`
                 : 'Use matching MCP tools instead of inventing shell one-liners.',
             ].join(' ');
           })(),

package/lib/mcpbridge.js

@@ -20,6 +20,8 @@ const registry = new Map();
 let openaiTools = [];
 let started = null;
 let serversUp = [];
+let chromeCfg = null;
+let lastReattachCheck = 0;
 
 export function hostMcpTools() {
   return openaiTools;
@@ -323,7 +325,7 @@ async function connectOne(cfg, log) {
     try {
       transport.stderr?.on?.('data', (buf) => {
         const line = String(buf).trim().split('\n')[0];
-        if (line) log?.(`cursor-backend:      mcp ${cfg.name} ${line.slice(0, 160)}`);
+        if (line && !/No handler registered for issue code/.test(line)) log?.(`cursor-backend:      mcp ${cfg.name} ${line.slice(0, 160)}`);
       });
     } catch { /* */ }
   }
@@ -337,6 +339,48 @@ async function connectOne(cfg, log) {
   return { client, tools };
 }
 
+/**
+ * The human flipped chrome://inspect/#remote-debugging AFTER boot: Chrome
+ * writes DevToolsActivePort immediately. Swap the blank-profile
+ * chrome-devtools for one attached to their real browser, no restart.
+ * Cheap (two stats) — called at the top of every zoo turn, throttled 5s.
+ */
+export async function reattachChrome({ log = () => {}, home = os.homedir() } = {}) {
+  if (!chromeCfg || !started) return false;
+  if (/^(real-chrome|real-brave|explicit)$/.test(chromeMode.mode)) return false;
+  const now = Date.now();
+  if (now - lastReattachCheck < 5000) return false;
+  lastReattachCheck = now;
+  const chromeDir = path.join(home, 'Library', 'Application Support', 'Google', 'Chrome');
+  const braveDir = path.join(home, 'Library', 'Application Support', 'BraveSoftware', 'Brave-Browser');
+  const chromePort = readActivePort(chromeDir);
+  const bravePort = readActivePort(braveDir);
+  const port = chromePort || bravePort;
+  if (!port || !(await portOpen(port))) return false;
+  log(`cursor-backend:      mcp chrome-devtools real browser appeared on ${port} — re-attaching`);
+  const oldClients = new Set();
+  for (const [name, rec] of [...registry]) {
+    if (rec.server === chromeCfg.name) { oldClients.add(rec.client); registry.delete(name); }
+  }
+  for (const c of oldClients) { try { await c.close?.(); } catch { /* */ } }
+  serversUp = serversUp.filter((n) => n !== chromeCfg.name);
+  try {
+    const got = await connectOne(chromeCfg, log);
+    serversUp.push(chromeCfg.name);
+    for (const tool of got.tools) {
+      registry.set(toolOpenaiName(chromeCfg.name, tool.name), {
+        client: got.client, server: chromeCfg.name, tool: tool.name, description: tool.description || tool.name, schema: tool.inputSchema,
+      });
+    }
+    rebuildOpenai();
+    log(`cursor-backend:      mcp chrome-devtools re-attached mode=${chromeMode.mode} tools=${got.tools.length}`);
+    return true;
+  } catch (e) {
+    log(`cursor-backend:      mcp chrome-devtools re-attach FAIL ${e.message}`);
+    return false;
+  }
+}
+
 function rebuildOpenai() {
   openaiTools = [];
   for (const [name, rec] of registry) {
@@ -345,11 +389,33 @@ function rebuildOpenai() {
   }
 }
 
-export async function callHostMcp(name, args) {
+/**
+ * One MCP call, with a hard ceiling. Measured 2026-09-01: take_snapshot on
+ * x.com never returned and the whole zoo turn froze behind it. A tool that
+ * hangs must come back as an error string the model can route around.
+ */
+export const MCP_CALL_TIMEOUT_MS = Math.max(10_000, Number(process.env.OZ_MCP_CALL_TIMEOUT_MS || 75_000));
+export async function callHostMcp(name, args, { timeoutMs = MCP_CALL_TIMEOUT_MS } = {}) {
   const rec = registry.get(String(name || ''));
   if (!rec) throw new Error(`no mcp tool ${name}`);
-  const r = await rec.client.callTool({ name: rec.tool, arguments: args && typeof args === 'object' ? args : {} });
-  return flattenMcpResult(r);
+  let timer;
+  const ceiling = new Promise((_, rej) => {
+    timer = setTimeout(() => rej(new Error(`MCP tool ${name} timed out after ${Math.round(timeoutMs / 1000)}s. The page may be too heavy for that action. Use a narrower one: evaluate_script to pull the text you need, take_screenshot, or navigate_page to a lighter URL. Do not retry the same call.`)), timeoutMs);
+    timer.unref?.();
+  });
+  try {
+    const r = await Promise.race([
+      rec.client.callTool({ name: rec.tool, arguments: args && typeof args === 'object' ? args : {} }),
+      ceiling,
+    ]);
+    return flattenMcpResult(r);
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+export function registerHostMcpForTests(name, rec) {
+  registry.set(name, rec);
 }
 
 export function resetHostMcpForTests() {
@@ -367,6 +433,7 @@ export async function startHostMcps({ log = () => {}, home = os.homedir() } = {}
   }
   started = (async () => {
     const configs = loadHostMcpConfigs(home);
+    chromeCfg = configs.find((c) => c.name === 'chrome-devtools') || configs.find((c) => /chrome|devtools|browser/i.test(c.name)) || null;
     log(`cursor-backend:      mcp loading n=${configs.length} ${configs.map((c) => c.name).join(',')}`);
     const results = await Promise.allSettled(configs.map((cfg) => connectOne(cfg, log)));
     for (let i = 0; i < results.length; i++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openzoo",
-  "version": "0.50.58",
+  "version": "0.50.60",
   "description": "Local x402-paying proxy + MCP server for openzoo.fun — point any OpenAI-compatible harness (Cursor, Claude Code, aider, SDKs) at localhost and it pays per call from a local burner wallet. Solana and Base rails live; Robinhood experimental.",
   "license": "MIT",
   "type": "module",