openzoo 0.50.57 → 0.50.59

package/lib/cursorbackend.js

@@ -53,7 +53,7 @@ import {
 import {
   desktopAction, displayBounds, imageSize, noteShotMeta, resolveAppName,
 } from './grokbotDesktop.js';
-import { startHostMcps, hostMcpTools, hostMcpHas, callHostMcp, hostMcpServers } 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.'
+                ? `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 ? ` 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;
@@ -240,16 +242,60 @@ function portOpen(port, host = '127.0.0.1', ms = 150) {
   });
 }
 
-async function chromeArgs(baseArgs) {
-  const args = [...(baseArgs || ['-y', 'chrome-devtools-mcp@latest'])];
-  if (args.some((a) => String(a).includes('browserUrl') || String(a) === '--browserUrl')) return args;
-  for (const port of [9222, 9333]) {
-    if (await portOpen(port)) {
-      args.push('--browserUrl', `http://127.0.0.1:${port}`);
-      break;
-    }
+/**
+ * "Chrome with Claude" for the hijack. Preference order:
+ *   1. the user's REAL Chrome (their logins): Chrome 144+ writes
+ *      DevToolsActivePort under its user-data-dir once the human flips
+ *      chrome://inspect/#remote-debugging -> "Allow remote debugging for this
+ *      browser". chrome-devtools-mcp attaches with --autoConnect.
+ *   2. the user's real Brave the same way (Brave exposes a port, not the
+ *      channel autoConnect expects) -> --browserUrl to that port.
+ *   3. any browser already listening on 9222/9333 -> --browserUrl.
+ *   4. chrome-devtools-mcp's own persistent profile (log in there once).
+ * Chrome 136+ refuses --remote-debugging-port on the default profile, so
+ * relaunching the user's browser with a flag is not an option — the toggle is.
+ */
+export const CHROME_TOGGLE_HINT = 'To let bots drive your real Chrome (your logins): open chrome://inspect/#remote-debugging in Chrome, turn on "Allow remote debugging for this browser", then restart `openzoo bot`. Until then the bot drives its own Chrome profile — log into sites there once and it persists.';
+
+let chromeMode = { mode: 'own-profile', detail: '' };
+export function chromeStatus() {
+  return { ...chromeMode, hint: chromeMode.mode === 'own-profile' ? CHROME_TOGGLE_HINT : '' };
+}
+
+function readActivePort(dir) {
+  try {
+    const first = fs.readFileSync(path.join(dir, 'DevToolsActivePort'), 'utf8').split('\n')[0].trim();
+    const n = Number(first);
+    return Number.isFinite(n) && n > 0 ? n : 0;
+  } catch {
+    return 0;
   }
-  return args;
+}
+
+/** Pure: decide the chrome-devtools-mcp argv from what is observable. */
+export function chromeArgsFor(baseArgs, { chromePort = 0, bravePort = 0, openPorts = [] } = {}) {
+  const args = [...(baseArgs || ['-y', 'chrome-devtools-mcp@latest'])];
+  const has = (flag) => args.some((a) => String(a) === flag || String(a).startsWith(`${flag}=`));
+  if (has('--browserUrl') || has('--autoConnect') || has('--wsEndpoint')) return { args, mode: 'explicit', detail: '' };
+  if (chromePort) { args.push('--autoConnect'); return { args, mode: 'real-chrome', detail: `Chrome DevToolsActivePort ${chromePort}` }; }
+  if (bravePort) { args.push('--browserUrl', `http://127.0.0.1:${bravePort}`); return { args, mode: 'real-brave', detail: `Brave DevToolsActivePort ${bravePort}` }; }
+  const port = openPorts.find((n) => n === 9222 || n === 9333);
+  if (port) { args.push('--browserUrl', `http://127.0.0.1:${port}`); return { args, mode: `attached:${port}`, detail: `browser listening on ${port}` }; }
+  return { args, mode: 'own-profile', detail: '~/.cache/chrome-devtools-mcp/chrome-profile' };
+}
+
+async function chromeArgs(baseArgs, home = os.homedir()) {
+  const chromeDir = path.join(home, 'Library', 'Application Support', 'Google', 'Chrome');
+  const braveDir = path.join(home, 'Library', 'Application Support', 'BraveSoftware', 'Brave-Browser');
+  let chromePort = readActivePort(chromeDir);
+  if (chromePort && !(await portOpen(chromePort))) chromePort = 0;
+  let bravePort = readActivePort(braveDir);
+  if (bravePort && !(await portOpen(bravePort))) bravePort = 0;
+  const openPorts = [];
+  for (const port of [9222, 9333]) if (await portOpen(port)) openPorts.push(port);
+  const got = chromeArgsFor(baseArgs, { chromePort, bravePort, openPorts });
+  chromeMode = { mode: got.mode, detail: got.detail };
+  return got.args;
 }
 
 async function connectOne(cfg, log) {
@@ -263,7 +309,11 @@ async function connectOne(cfg, log) {
     });
   } else {
     let args = cfg.args || [];
-    if (cfg.name === 'chrome-devtools') args = await chromeArgs(args);
+    if (cfg.name === 'chrome-devtools') {
+      args = await chromeArgs(args);
+      log?.(`cursor-backend:      mcp chrome-devtools mode=${chromeMode.mode} ${chromeMode.detail}`);
+      if (chromeMode.mode === 'own-profile') log?.(`cursor-backend:      mcp chrome-devtools ${CHROME_TOGGLE_HINT}`);
+    }
     const env = { ...getDefaultEnvironment(), PATH: process.env.PATH || '', ...(cfg.env || {}) };
     if (process.env.NVM_DIR) env.NVM_DIR = process.env.NVM_DIR;
     transport = new StdioClientTransport({
@@ -289,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) {
@@ -319,6 +411,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.57",
+  "version": "0.50.59",
   "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",