@browserbridge/bbx 1.3.0 → 1.5.0

package/README.md

@@ -110,7 +110,9 @@ Browser Bridge is optimized for the opposite starting point: **inspect the state
 3. Run `bbx install`, or target a specific browser with `bbx install --browser edge`, `bbx install --browser brave`, `bbx install --browser chromium`, or `bbx install --browser arc`
 4. In the extension side panel, install MCP or CLI (skill) for your agent of choice
 5. Enable Browser Bridge for the browser window you want to inspect/control with the AI agent
-6. Ask your agent to use Browser Bridge via MCP (`BB MCP` or `Browser Bridge MCP`), or invoke the `browser-bridge` / `$bbx` skill in CLI mode
+6. Ask your agent to use Browser Bridge via MCP (`BB MCP` or `Browser Bridge MCP`), or invoke the installed Browser Bridge skill in CLI mode (`/browser-bridge`, `browser-bridge`, or the client-specific skill trigger)
+
+MCP mode is self-contained: the server exposes tools, startup instructions, and prompt templates, so a separate CLI skill is not required for MCP guidance.
 
 ## How it works
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@browserbridge/bbx",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "private": false,
   "keywords": [
     "agent-tools",
@@ -61,7 +61,7 @@
     "postinstall": "node packages/native-host/bin/postinstall.js",
     "package:extension": "node scripts/package-extension.mjs",
     "check:extension-zip": "node scripts/check-extension-zip.mjs",
-    "release:check": "npm run lint && npm run typecheck && npm test && npm run coverage:check && npm run package:extension && npm pack --dry-run",
+    "release:check": "npm run lint && npm run typecheck && npm test && npm run coverage:check && npm run package:extension && npm run check:extension-zip && npm pack --dry-run",
     "prepublishOnly": "npm run lint && npm run typecheck && npm test && npm run coverage:check",
     "status": "node packages/agent-client/src/cli.js status",
     "daemon": "node packages/native-host/bin/bridge-daemon.js",

package/packages/agent-client/src/cli.js

@@ -128,15 +128,21 @@ if (command === 'install-skill') {
   const positional = rest.filter((a) => !a.startsWith('--'));
 
   if (positional.length === 0) {
-    // Parse scope flags without going through parseInstallAgentArgs.
-    let isGlobal = true;
-    if (rest.includes('--local')) isGlobal = false;
-    if (rest.includes('--global')) isGlobal = true;
+    let scopeOptions;
+    try {
+      scopeOptions = parseInstallAgentArgs(rest);
+    } catch (error) {
+      process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
+      process.exit(1);
+    }
+
+    const isGlobal = scopeOptions.global !== false;
+    const projectPath = isGlobal ? os.homedir() : scopeOptions.projectPath;
 
     const setupStatus = await collectSetupStatus({
       global: isGlobal,
       cwd: process.cwd(),
-      projectPath: isGlobal ? os.homedir() : process.cwd(),
+      projectPath,
       ...getSetupStatusTestOverrides(),
     });
     /** @type {import('./types.js').SupportedTarget[]} */
@@ -176,7 +182,6 @@ if (command === 'install-skill') {
       targets = /** @type {import('./types.js').SupportedTarget[]} */ (selected);
     }
 
-    const projectPath = isGlobal ? os.homedir() : process.cwd();
     if (selected !== null) {
       const deselectedTargets =
         /** @type {import('./types.js').SupportedTarget[]} */ (
@@ -226,20 +231,32 @@ if (command === 'install-skill') {
 }
 
 if (command === 'install-mcp') {
-  const argsLeft = [...rest];
   let isGlobal = true;
+  /** @type {string[]} */
+  const positionals = [];
 
-  const localIdx = argsLeft.indexOf('--local');
-  if (localIdx !== -1) {
-    isGlobal = false;
-    argsLeft.splice(localIdx, 1);
+  for (const arg of rest) {
+    if (arg === '--local') {
+      isGlobal = false;
+      continue;
+    }
+    if (arg === '--global') {
+      isGlobal = true;
+      continue;
+    }
+    if (arg.startsWith('--')) {
+      process.stderr.write(`Unknown install-mcp option "${arg}".\n`);
+      process.exit(1);
+    }
+    positionals.push(arg);
   }
-  const globalIdx = argsLeft.indexOf('--global');
-  if (globalIdx !== -1) {
-    argsLeft.splice(globalIdx, 1);
+
+  if (positionals.length > 1) {
+    process.stderr.write(`Unexpected extra argument "${positionals[1]}".\n`);
+    process.exit(1);
   }
 
-  const clientArg = argsLeft[0];
+  const clientArg = positionals[0];
 
   /** @type {import('./types.js').McpClientName[]} */
   let clients;
@@ -670,7 +687,7 @@ async function main() {
     process.exitCode = 1;
   } catch (error) {
     const message = error instanceof Error ? error.message : String(error);
-    const raw = error instanceof Error && 'code' in error ? /** @type {any} */ (error).code : '';
+    const raw = getErrorCode(error);
     let code = 'ERROR';
     if (raw === 'ENOENT' || raw === 'ECONNREFUSED' || raw === 'EINVAL') {
       code = 'DAEMON_OFFLINE';
@@ -692,6 +709,18 @@ async function main() {
   }
 }
 
+/**
+ * @param {unknown} error
+ * @returns {string}
+ */
+function getErrorCode(error) {
+  if (!(error instanceof Error) || !('code' in error)) {
+    return '';
+  }
+  const code = /** @type {{ code?: unknown }} */ (error).code;
+  return typeof code === 'string' ? code : '';
+}
+
 /**
  * Allow tests to shrink request timeouts without changing the shared default.
  *

package/packages/agent-client/src/client.js

@@ -15,6 +15,7 @@ import {
   getBridgeTransport,
   getSocketPath,
 } from '../../native-host/src/config.js';
+import { normalizeBridgeAuthToken, readBridgeAuthToken } from '../../native-host/src/auth-token.js';
 import { restartBridgeDaemon } from '../../native-host/src/daemon-process.js';
 
 /** @typedef {import('./types.js').BridgeMeta} BridgeMeta */
@@ -56,6 +57,22 @@ function createTimeoutError(method, timeoutMs) {
   return error;
 }
 
+/**
+ * @param {net.Socket} socket
+ * @param {string} line
+ * @returns {Promise<void>}
+ */
+async function writeSocketLine(socket, line) {
+  if (!socket.write(line)) {
+    await Promise.race([
+      once(socket, 'drain'),
+      once(socket, 'close').then(() => {
+        throw new Error('Bridge socket closed while writing.');
+      }),
+    ]);
+  }
+}
+
 export class BridgeClient extends EventEmitter {
   /**
    * @param {BridgeClientOptions} [options={}]
@@ -68,6 +85,7 @@ export class BridgeClient extends EventEmitter {
     autoReconnect = false,
     restartDaemonOnVersionMismatch = true,
     restartDaemonFn = restartBridgeDaemon,
+    authToken = undefined,
   } = {}) {
     super();
     this.transport = socketPath ? createSocketBridgeTransport(socketPath) : transport;
@@ -78,6 +96,7 @@ export class BridgeClient extends EventEmitter {
     this.autoReconnect = autoReconnect;
     this.restartDaemonOnVersionMismatch = restartDaemonOnVersionMismatch;
     this.restartDaemonFn = restartDaemonFn;
+    this.authToken = authToken;
     this.socket = null;
     this.connected = false;
     this.protocolCompatibility = null;
@@ -111,6 +130,18 @@ export class BridgeClient extends EventEmitter {
       throw error;
     }
 
+    const registrationPromise = new Promise((resolve, reject) => {
+      const timeoutId = setTimeout(() => {
+        this.waiting.delete('registered');
+        reject(createTimeoutError('register', this.defaultTimeoutMs));
+      }, this.defaultTimeoutMs);
+      this.waiting.set('registered', {
+        resolve,
+        reject,
+        timeoutId,
+      });
+    });
+
     parseJsonLines(socket, (raw) => {
       const message = /** @type {ClientMessage} */ (raw);
       if (message.type === 'registered') {
@@ -124,6 +155,16 @@ export class BridgeClient extends EventEmitter {
         return;
       }
 
+      if (message.type === 'registration_failed') {
+        const pending = this.waiting.get('registered');
+        if (pending) {
+          this.waiting.delete('registered');
+          clearTimeout(pending.timeoutId);
+          pending.reject(new Error(message.error?.message || 'Bridge daemon registration failed.'));
+        }
+        return;
+      }
+
       if (message.type === 'agent.response') {
         const pending = this.waiting.get(message.response.id);
         if (pending) {
@@ -148,20 +189,31 @@ export class BridgeClient extends EventEmitter {
       // 'close' fires after 'error'; reconnect is triggered there.
     });
 
-    this.socket.write(
-      `${JSON.stringify({ type: 'register', role: 'agent', clientId: this.clientId })}\n`
-    );
-    await new Promise((resolve, reject) => {
-      const timeoutId = setTimeout(() => {
+    const authToken =
+      this.authToken === undefined
+        ? this.transport.type === 'tcp'
+          ? await readBridgeAuthToken()
+          : null
+        : normalizeBridgeAuthToken(this.authToken);
+    try {
+      await writeSocketLine(
+        socket,
+        `${JSON.stringify({
+          type: 'register',
+          role: 'agent',
+          clientId: this.clientId,
+          ...(authToken ? { authToken } : {}),
+        })}\n`
+      );
+    } catch (error) {
+      const pending = this.waiting.get('registered');
+      if (pending) {
+        clearTimeout(pending.timeoutId);
         this.waiting.delete('registered');
-        reject(createTimeoutError('register', this.defaultTimeoutMs));
-      }, this.defaultTimeoutMs);
-      this.waiting.set('registered', {
-        resolve,
-        reject,
-        timeoutId,
-      });
-    });
+      }
+      throw error;
+    }
+    await registrationPromise;
 
     this.protocolCompatibility = null;
     this.protocolWarning = null;
@@ -244,13 +296,15 @@ export class BridgeClient extends EventEmitter {
       });
     });
 
-    if (!this.socket.write(`${JSON.stringify({ type: 'agent.request', request })}\n`)) {
-      await Promise.race([
-        once(this.socket, 'drain'),
-        once(this.socket, 'close').then(() => {
-          throw new Error('Bridge socket closed while writing.');
-        }),
-      ]);
+    try {
+      await writeSocketLine(this.socket, `${JSON.stringify({ type: 'agent.request', request })}\n`);
+    } catch (error) {
+      const pending = this.waiting.get(request.id);
+      if (pending) {
+        clearTimeout(pending.timeoutId);
+        this.waiting.delete(request.id);
+      }
+      throw error;
     }
     const response = /** @type {BridgeResponse} */ (await responsePromise);
     return this.attachProtocolWarning(response);

package/packages/agent-client/src/command-registry.js

@@ -237,11 +237,10 @@ export const CLI_HELP_SECTIONS = Object.freeze([
   {
     title: 'Setup',
     lines: [
-      'bbx install [--browser chrome|edge|brave|chromium|arc] [extension-id]  Install native messaging manifest',
+      'bbx install [extension-id] [--browser chrome|edge|brave|chromium|arc] [--all]  Install native messaging manifest',
       'bbx uninstall                                                      Remove native host manifests, Browser Bridge runtime files, and managed MCP/skill installs',
-      'bbx install [--all] [--browser <name>] [extension-id]              Install native host manifest (--all for all supported browsers)',
       'bbx install-skill [targets|all] [--global] [--project <path>]      Install/update the managed Browser Bridge CLI skill',
-      'bbx install-mcp [client|all] [--local]                             Write MCP config for codex|claude|cursor|copilot|opencode|antigravity|windsurf',
+      'bbx install-mcp [client|all] [--local]                             Write MCP config for codex|claude|cursor|copilot|opencode|antigravity|windsurf|agents',
       'bbx status                                                         Check bridge connection',
       'bbx doctor                                                         Diagnose install, daemon, extension, and access readiness',
       'bbx restart                                                        Restart the local Browser Bridge daemon',

package/packages/agent-client/src/mcp-config.js

@@ -94,29 +94,19 @@ export function getMcpConfigShape(clientName) {
  * }}
  */
 function createBaseServerConfig(clientName) {
-  const windowsCommand =
-    process.platform === 'win32'
-      ? {
-          command: process.execPath,
-          args: [mcpServerBinPath],
-          env: {},
-        }
-      : {
-          command: 'bbx',
-          args: ['mcp', 'serve'],
-          env: {},
-        };
+  const serverConfig = {
+    command: process.execPath,
+    args: [mcpServerBinPath],
+    env: {},
+  };
 
   if (clientName === 'opencode') {
     return {
       type: 'local',
-      command:
-        process.platform === 'win32'
-          ? [process.execPath, mcpServerBinPath]
-          : ['bbx', 'mcp', 'serve'],
+      command: [process.execPath, mcpServerBinPath],
     };
   }
-  return windowsCommand;
+  return serverConfig;
 }
 
 /** @type {Record<McpClientName, { key: string, includeType: boolean, legacyKeys?: string[], keepEmptyBlock?: boolean }>} */
@@ -142,13 +132,11 @@ const MCP_CONFIG_SHAPES = {
  */
 export function buildMcpConfig(clientName) {
   if (clientName === 'codex') {
-    const command = process.platform === 'win32' ? process.execPath : 'bbx';
-    const args = process.platform === 'win32' ? [mcpServerBinPath] : ['mcp', 'serve'];
     return {
       mcp_servers: {
         [BROWSER_BRIDGE_SERVER_NAME]: {
-          command,
-          args,
+          command: process.execPath,
+          args: [mcpServerBinPath],
         },
       },
     };
@@ -277,12 +265,10 @@ export async function getMcpConfigPaths(clientName, options) {
  * @returns {string}
  */
 function formatCodexServerBlock() {
-  const command = process.platform === 'win32' ? process.execPath : 'bbx';
-  const args = process.platform === 'win32' ? [mcpServerBinPath] : ['mcp', 'serve'];
   return [
     `[mcp_servers."${BROWSER_BRIDGE_SERVER_NAME}"]`,
-    `command = ${JSON.stringify(command)}`,
-    `args = ${JSON.stringify(args)}`,
+    `command = ${JSON.stringify(process.execPath)}`,
+    `args = ${JSON.stringify([mcpServerBinPath])}`,
     '',
   ].join('\n');
 }
@@ -523,8 +509,13 @@ async function installJsonMcpConfig(clientName, configPath, stdout) {
     if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
       existing = parsed;
     }
-  } catch {
-    // File missing or unparseable - start fresh.
+  } catch (error) {
+    if (!isMissingFileError(error)) {
+      throw new Error(
+        `Cannot update ${configPath}: existing MCP config is not valid JSON. Fix or remove it first.`
+      );
+    }
+    // File missing - start fresh.
   }
 
   const shape = getMcpConfigShape(clientName);
@@ -661,3 +652,15 @@ export function parseInstalledMcpConfig(clientName, raw) {
     return { configured: false };
   }
 }
+
+/**
+ * @param {unknown} error
+ * @returns {boolean}
+ */
+function isMissingFileError(error) {
+  return Boolean(
+    error &&
+    typeof error === 'object' &&
+    /** @type {{ code?: unknown }} */ (error).code === 'ENOENT'
+  );
+}

package/packages/agent-client/src/runtime.js

@@ -160,10 +160,10 @@ export async function checkBrowserManifests() {
 export async function getDoctorReport(options = {}) {
   const manifest = await (options.loadManifest || loadInstalledManifest)();
   const allowedOrigins = Array.isArray(manifest?.allowed_origins) ? manifest.allowed_origins : [];
-  const manifestInstalled = Boolean(manifest);
   const defaultExtensionId = options.defaultExtensionIdInfo || resolveDefaultExtensionId();
 
-  const browserManifests = await checkBrowserManifests();
+  const browserManifests = await (options.checkBrowserManifests || checkBrowserManifests)();
+  const manifestInstalled = Boolean(manifest) || browserManifests.some((b) => b.installed);
 
   /** @type {DoctorReport} */
   const report = {
@@ -214,8 +214,6 @@ export async function getDoctorReport(options = {}) {
     report.extensionConnected = false;
   }
 
-  const browsersWithoutManifest = browserManifests.filter((b) => !b.installed);
-
   if (!report.manifestInstalled) {
     report.issues.push('native_host_manifest_missing');
     report.nextSteps.push(
@@ -223,12 +221,6 @@ export async function getDoctorReport(options = {}) {
         ? 'Run `bbx install` (or `bbx install --all` for all browsers) to install the native host manifest.'
         : 'Run `bbx install <extension-id>` (or `bbx install --all`) to install the native host manifest.'
     );
-  } else if (browsersWithoutManifest.length > 0) {
-    report.issues.push('native_host_manifest_partial');
-    const missing = browsersWithoutManifest.map((b) => b.browser).join(', ');
-    report.nextSteps.push(
-      `Manifests missing for: ${missing}. Run \`bbx install --all\` to install for all supported browsers.`
-    );
   }
   if (!report.daemonReachable) {
     report.issues.push('daemon_offline');

package/packages/agent-client/src/types.ts

@@ -54,13 +54,20 @@ export type ClientMessage =
       role: 'agent' | 'extension';
       clientId?: string;
     }
+  | {
+      type: 'registration_failed';
+      error?: {
+        code?: string;
+        message?: string;
+      };
+    }
   | {
       type: 'agent.response';
       response: BridgeResponse;
     };
 
 export interface PendingRequest {
-  resolve: (value: any) => void;
+  resolve: (value: unknown) => void;
   reject: (error: Error) => void;
   timeoutId: NodeJS.Timeout;
 }
@@ -73,6 +80,7 @@ export interface BridgeClientOptions {
   autoReconnect?: boolean;
   restartDaemonOnVersionMismatch?: boolean;
   restartDaemonFn?: typeof restartBridgeDaemon;
+  authToken?: string | null;
 }
 
 export interface ShortcutCommand {
@@ -110,6 +118,7 @@ export interface DoctorReport {
 
 export interface DoctorReportOptions {
   loadManifest?: () => Promise<{ allowed_origins?: string[] } | null>;
+  checkBrowserManifests?: () => Promise<BrowserManifestStatus[]>;
   manifestPath?: string;
   defaultExtensionIdInfo?: { extensionId: string | null; source: string };
   bridgeClientRunner?: <T>(