arena-bridge 0.6.4 → 0.6.6

package/CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to this project are documented here.
 The format follows [Keep a Changelog](https://keepachangelog.com/) and the project uses
 [Semantic Versioning](https://semver.org/).
 
+## 0.6.6
+
+### Fixed
+- The tunnel is now supervised: when the tunnel binary dies, it is started again automatically
+  and the new public URL is printed and saved to the config, instead of leaving a dead tunnel
+  behind (the bridge used to keep running while the public address had stopped working).
+
+## 0.6.5
+
+### Fixed
+- Peekaboo 4.9 compatibility: `peekaboo list` was removed in v4, so `mac_apps` now uses
+  `app list` and `mac_windows` uses `window list` (enumerating the running apps when no app is
+  given). `mac_menu` / `mac_menu_click` accept a process id, run against the local host
+  (`--no-remote`) and read the `menu_structure` payload; `mac_spaces` / `mac_space_switch` also
+  run locally, because a remote host cannot read or switch Spaces.
+
 ## 0.6.4
 
 ### Fixed

package/README.md

@@ -12,7 +12,7 @@
   <img src="https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square" alt="license">
   <img src="https://img.shields.io/badge/node-%3E%3D18-green.svg?style=flat-square" alt="node">
   <img src="https://img.shields.io/badge/dependencies-0-brightgreen.svg?style=flat-square" alt="dependencies">
-  <img src="https://img.shields.io/badge/tests-110%20passed-brightgreen.svg?style=flat-square" alt="tests">
+  <img src="https://img.shields.io/badge/tests-114%20passed-brightgreen.svg?style=flat-square" alt="tests">
 </p>
 
 <p align="center">
@@ -53,6 +53,10 @@ arena-bridge setup --root ~/projects --root ~/Documents
 
 `setup` печатает готовый промпт и публичный URL. Дальше — просто говорите агенту задачу.
 
+Туннель под присмотром: если `cloudflared`/`ngrok` упадёт, мост поднимет его заново и сам
+напечатает новый публичный адрес. Постоянный адрес вместо случайного — `arena-bridge tunnel
+--bin ngrok --domain <зарезервированный домен>`.
+
 Нужен туннель? Поставьте `cloudflared` (`brew install cloudflared` или бинарник в `/usr/local/bin`).
 Можно и через ngrok — `arena-bridge tunnel --bin ngrok`; с сохранённым токеном и зарезервированным
 доменом публичный адрес остаётся постоянным, и промпт агенту не нужно копировать заново:
@@ -157,6 +161,7 @@ cookies и localStorage нет.
 ```
 
 Установить Peekaboo: `brew install peekaboo` (или бинарник в `/usr/local/bin/peekaboo`).
+Проверено с Peekaboo 4.9 (4.3 тоже работает, но синтаксис команд обновлён под 4.9).
 macOS спросит разрешения **Screen Recording** и **Accessibility** для терминала, из которого
 запущен мост — без них скриншоты и клики не работают; `mac_permissions` покажет, что не так.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arena-bridge",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "Give a cloud AI agent (Arena.ai Agent Mode, Claude, Cursor, ...) controlled access to your own machine over HTTP/MCP: files, shell, Chrome and the macOS desktop, with an approval gate, trust windows and an audit log.",
   "type": "module",
   "bin": {

package/src/cli.mjs

@@ -199,7 +199,7 @@ async function cmdTunnel(args) {
   }
 
   console.log(`starting ${bin} (protocol=${protocol})…`);
-  const { child, urlPromise } = startTunnel(cfg, {
+  const { child, urlPromise, onUrl } = startTunnel(cfg, {
     port,
     protocol,
     bin,
@@ -229,6 +229,15 @@ async function cmdTunnel(args) {
   cfg.port = port;
   saveConfig(cfg);
 
+  onUrl((url) => {
+    if (url === publicUrl) return;
+    publicUrl = url;
+    cfg.publicUrl = url;
+    saveConfig(cfg);
+    console.log(`\n⚠ tunnel reconnected — new public URL: ${url}`);
+    console.log('Update the base URL in the agent chat (arena-bridge prompt prints a fresh copy).');
+  });
+
   console.log(`\npublic URL: ${publicUrl}   (saved as config.publicUrl)\n`);
   console.log('Paste this into the agent chat:');
   console.log('-----8<-----');

package/src/direct.mjs

@@ -29,7 +29,7 @@ export function createDirectServer(cfg, engine) {
           ok: true,
           mode: 'direct',
           device: cfg.device,
-          version: '0.6.4',
+          version: '0.6.6',
           uptime_sec: Math.round(process.uptime()),
         });
       }

package/src/hub.mjs

@@ -90,7 +90,7 @@ export function createHubServer(cfg) {
         return sendJson(res, 200, {
           ok: true,
           mode: 'hub',
-          version: '0.6.4',
+          version: '0.6.6',
           devices: [...devices.keys()],
         });
       }

package/src/mac.mjs

@@ -191,6 +191,7 @@ export function macTools(cfg = {}) {
     if (!outPath) {
       return [
         ['see', '--tree', '--no-screenshot', '--json', ...targetFlags(args)],
+        ['see', '--tree', '--no-screenshot', '--no-remote', '--json', ...targetFlags(args)],
         ['see', '--tree', '--json', ...targetFlags(args)],
         ['see', '--json', ...targetFlags(args)],
       ];
@@ -198,6 +199,7 @@ export function macTools(cfg = {}) {
     return [
       [...base, '--json', '--path', outPath],
       [...base, '--path', outPath, '--json'],
+      [...base, '--no-remote', '--json', '--path', outPath],
       ['image', '--mode', mode, ...targetFlags(args), '--json', '--path', outPath],
     ];
   };
@@ -467,9 +469,9 @@ export function macTools(cfg = {}) {
         const res = await runVariants(
           p.bin,
           [
-            ['list', 'apps', '--json'],
             ['app', 'list', '--json'],
-            ['list', 'apps'],
+            ['list', 'apps', '--json'],
+            ['app', 'list'],
           ],
           { timeout: 30 },
         );
@@ -492,12 +494,16 @@ export function macTools(cfg = {}) {
         const p = checkPeek(peek());
         if (!p.ok) return p;
         const flags = args.app ? ['--app', String(args.app)] : [];
+        if (!flags.length) {
+          const windows = await windowsOfAllApps(p.bin);
+          return { ok: true, windows, source: 'per-app', hint: 'Pass app or pid to narrow the list down.' };
+        }
         const res = await runVariants(
           p.bin,
           [
-            ['list', 'windows', ...flags, '--json'],
             ['window', 'list', ...flags, '--json'],
-            ['list', 'windows', ...flags],
+            ['list', 'windows', ...flags, '--json'],
+            ['window', 'list', ...flags],
           ],
           { timeout: 30 },
         );
@@ -642,10 +648,11 @@ export function macTools(cfg = {}) {
       handler: async (args) => {
         const p = checkPeek(peek());
         if (!p.ok) return p;
-        const flags = args.app ? ['--app', String(args.app)] : [];
+        const flags = menuFlags(args);
         const res = await runVariants(
           p.bin,
           [
+            ['menu', 'list', ...flags, '--no-remote', '--json'],
             ['menu', 'list', ...flags, '--json'],
             ['menu', 'list', ...flags],
           ],
@@ -654,9 +661,10 @@ export function macTools(cfg = {}) {
         const json = parseJson(res.stdout);
         return {
           ok: res.exit_code === 0,
-          menus: json ? (json.menus || json.data?.menus || json) : undefined,
+          menus: json ? (json.menus || json.data?.menus || json.data?.menu_structure || json) : undefined,
           output: json ? undefined : res.stdout.slice(0, 4000),
           error: res.exit_code === 0 ? undefined : (res.stderr || '').trim().slice(0, 600),
+          hint: res.exit_code === 0 ? undefined : menuHint(res),
         };
       },
     },
@@ -670,6 +678,7 @@ export function macTools(cfg = {}) {
           item: { type: 'string', description: 'name of the menu item' },
           path: { type: 'string', description: 'nested path, e.g. "File > Export"' },
           app: { type: 'string', description: 'required: the background menu click needs a target app' },
+          pid: { type: 'number', description: 'process id, when the app name is ambiguous' },
         },
         [],
       ),
@@ -680,22 +689,22 @@ export function macTools(cfg = {}) {
         if (!args.item && !args.path) {
           return { ok: false, error: 'missing_item', hint: 'Pass item ("Save") or path ("File > Export").' };
         }
-        if (!args.app) {
+        if (!args.app && !args.pid) {
           return {
             ok: false,
             error: 'missing_app',
             hint: 'A background menu click needs an explicit app: mac_menu_click {"app":"Safari","item":"Save"}.',
           };
         }
-        const flags = ['--app', String(args.app)];
+        const flags = menuFlags(args);
         const variants = args.path
           ? [
+              ['menu', 'click', '--path', String(args.path), ...flags, '--no-remote'],
               ['menu', 'click', '--path', String(args.path), ...flags],
-              ['menu', 'click', String(args.path), ...flags],
             ]
           : [
+              ['menu', 'click', '--item', String(args.item), ...flags, '--no-remote'],
               ['menu', 'click', '--item', String(args.item), ...flags],
-              ['menu', 'click', String(args.item), ...flags],
             ];
         const res = await runVariants(p.bin, variants, { timeout: 30 });
         return finish(res, 'menu-click');
@@ -713,6 +722,7 @@ export function macTools(cfg = {}) {
         const res = await runVariants(
           p.bin,
           [
+            ['space', 'list', '--no-remote', '--json'],
             ['space', 'list', '--json'],
             ['space', 'list'],
           ],
@@ -740,8 +750,8 @@ export function macTools(cfg = {}) {
         const res = await runVariants(
           p.bin,
           [
+            ['space', 'switch', '--to', String(args.to), '--foreground', '--no-remote'],
             ['space', 'switch', '--to', String(args.to), '--foreground'],
-            ['space', 'switch', String(args.to), '--foreground'],
           ],
           { timeout: 30 },
         );
@@ -821,6 +831,43 @@ export function macTools(cfg = {}) {
   ];
 }
 
+function menuFlags(args) {
+  const f = [];
+  if (args.app) f.push('--app', String(args.app));
+  if (args.pid) f.push('--pid', String(args.pid));
+  return f;
+}
+
+function menuHint(res) {
+  const text = (res.stderr || res.stdout || '').trim();
+  if (/multiple apps match/i.test(text)) {
+    return 'Several apps share that name — pass the process id from mac_apps: mac_menu {"pid":12345}.';
+  }
+  return text.slice(0, 600);
+}
+
+async function windowsOfAllApps(bin) {
+  const res = await runVariants(
+    bin,
+    [
+      ['app', 'list', '--json'],
+      ['list', 'apps', '--json'],
+    ],
+    { timeout: 30 },
+  );
+  const json = parseJson(res.stdout);
+  const apps = json ? (json.apps || json.data?.apps || []) : [];
+  const out = [];
+  for (const app of Array.isArray(apps) ? apps.slice(0, 6) : []) {
+    if (!app || !app.pid) continue;
+    const w = await run(bin, ['window', 'list', '--pid', String(app.pid), '--json'], { timeout: 20 });
+    const data = parseJson(w.stdout);
+    const list = data ? (data.windows || data.data?.windows || []) : [];
+    for (const win of Array.isArray(list) ? list : []) out.push({ ...win, app: app.name, pid: app.pid });
+  }
+  return out;
+}
+
 function checkPeek(p) {
   if (!p) return { ok: false, error: 'peekaboo_not_found', hint: NOT_FOUND_HINT };
   return { ok: true, bin: p };

package/src/mcp.mjs

@@ -48,7 +48,7 @@ export async function handleMcp(req, res, ctx) {
           mcpResponse(id, {
             protocolVersion: PROTOCOL_VERSION,
             capabilities: { tools: { listChanged: false } },
-            serverInfo: { name: 'arena-bridge', version: '0.6.4' },
+            serverInfo: { name: 'arena-bridge', version: '0.6.6' },
             instructions:
               'Tools operate the user\'s own machine. Dangerous operations may return ' +
               'PROTECTED and require a local human approval.',

package/src/tunnel.mjs

@@ -9,7 +9,10 @@ const NGROK_URL_RE = /https:\/\/[a-z0-9-]+\.ngrok(?:-free)?\.(?:app|io|dev)/i;
  * cloudflared: QUIC (UDP/7844) is blocked on many networks, so we default to http2 over TCP/443.
  * ngrok: an authtoken and an optional reserved domain give the same URL on every restart.
  */
-export function startTunnel(cfg, { port, protocol = 'http2', bin = 'cloudflared', authtoken, domain } = {}) {
+export function startTunnel(
+  cfg,
+  { port, protocol = 'http2', bin = 'cloudflared', authtoken, domain, restarts = 20, delay = 2000 } = {},
+) {
   const target = `http://127.0.0.1:${port}`;
   const isNgrok = /ngrok/i.test(bin);
   const args = isNgrok
@@ -24,12 +27,13 @@ export function startTunnel(cfg, { port, protocol = 'http2', bin = 'cloudflared'
     : ['tunnel', '--url', target, '--protocol', protocol];
   const urlPattern = isNgrok ? NGROK_URL_RE : URL_RE;
 
-  const child = spawn(bin, args, { stdio: ['ignore', 'pipe', 'pipe'] });
-
+  let child = null;
   let buffer = '';
   let settled = false;
+  let attempt = 0;
   let resolveUrl;
   let rejectUrl;
+  const listeners = new Set();
 
   const urlPromise = new Promise((resolve, reject) => {
     resolveUrl = resolve;
@@ -37,33 +41,48 @@ export function startTunnel(cfg, { port, protocol = 'http2', bin = 'cloudflared'
   });
 
   const onChunk = (chunk) => {
-    const text = chunk.toString();
-    buffer += text;
+    buffer += chunk.toString();
     const match = urlPattern.exec(buffer);
-    if (match && !settled) {
+    if (!match) return;
+    if (!settled) {
       settled = true;
       resolveUrl(match[0]);
     }
+    for (const fn of listeners) fn(match[0]);
   };
 
-  child.stdout.on('data', onChunk);
-  child.stderr.on('data', onChunk);
-
-  child.on('error', (e) => {
-    if (!settled) {
-      settled = true;
-      rejectUrl(new Error(`cannot start ${bin}: ${e.message}`));
-    }
-  });
+  const spawnChild = () => {
+    child = spawn(bin, args, { stdio: ['ignore', 'pipe', 'pipe'] });
+    buffer = '';
+    child.stdout.on('data', onChunk);
+    child.stderr.on('data', onChunk);
+    child.on('error', (e) => {
+      if (!settled) {
+        settled = true;
+        rejectUrl(new Error(`cannot start ${bin}: ${e.message}`));
+      }
+    });
+    child.on('exit', (code) => {
+      if (!settled) {
+        settled = true;
+        rejectUrl(new Error(`${bin} exited with code ${code} before the tunnel URL appeared`));
+        return;
+      }
+      if (attempt++ < restarts) {
+        setTimeout(spawnChild, delay);
+      }
+    });
+  };
 
-  child.on('exit', (code) => {
-    if (!settled) {
-      settled = true;
-      rejectUrl(new Error(`${bin} exited with code ${code} before the tunnel URL appeared`));
-    }
-  });
+  spawnChild();
 
-  return { child, urlPromise, args, target };
+  return {
+    child,
+    urlPromise,
+    args,
+    target,
+    onUrl: (fn) => listeners.add(fn),
+  };
 }
 
 export function isPortOpen(port, host = '127.0.0.1', timeout = 700) {