chrome-ai-bridge 2.3.10 → 2.5.1

package/build/extension/relay-server.ts

@@ -55,6 +55,12 @@ export class RelayServer extends EventEmitter {
   private discoveryServer: http.Server | null = null;
   private discoveryPort: number | null = null;
   private keepAliveTimer: ReturnType<typeof setInterval> | null = null;
+  private _lastDiscoveryOptions: {
+    tabUrl?: string;
+    tabId?: number;
+    newTab?: boolean;
+    allowTabTakeover?: boolean;
+  } = {};
 
   constructor(options: RelayServerOptions = {}) {
     super();
@@ -219,6 +225,9 @@ export class RelayServer extends EventEmitter {
           this.ready = true;
           debugLog(`[RelayServer] Connection ready for tab ${this.tabId}`);
           this.emit('ready', this.tabId);
+          // Release discovery port after WebSocket is established.
+          // 1-second grace period lets Extension finish processing the response.
+          setTimeout(() => this.stopDiscoveryServer(), 1000);
           break;
         case 'pong':
           debugLog('[RelayServer] Received keep-alive pong');
@@ -333,6 +342,7 @@ export class RelayServer extends EventEmitter {
     newTab?: boolean;
     allowTabTakeover?: boolean;
   } = {}): Promise<number | null> {
+    this._lastDiscoveryOptions = options;
     const ports = [38765, 38766, 38767, 38768, 38769, 38770, 38771, 38772, 38773, 38774, 38775];
     const wsUrl = this.getConnectionURL();
 
@@ -404,6 +414,34 @@ export class RelayServer extends EventEmitter {
     return null;
   }
 
+  /**
+   * Release the discovery HTTP server (port).
+   * Called automatically after the Extension WebSocket connects (ready event).
+   * The port becomes available for other sessions.
+   */
+  stopDiscoveryServer(): void {
+    if (this.discoveryServer) {
+      this.discoveryServer.close();
+      debugLog(`[RelayServer] Discovery server released (port ${this.discoveryPort})`);
+      this.discoveryServer = null;
+      this.discoveryPort = null;
+    }
+  }
+
+  /**
+   * Re-acquire a discovery port (e.g. after WebSocket disconnect for reconnection).
+   * Uses the same options as the last startDiscoveryServer() call.
+   */
+  async restartDiscoveryServer(options?: {
+    tabUrl?: string;
+    tabId?: number;
+    newTab?: boolean;
+    allowTabTakeover?: boolean;
+  }): Promise<number | null> {
+    this.stopDiscoveryServer();
+    return this.startDiscoveryServer(options || this._lastDiscoveryOptions);
+  }
+
   /**
    * Stop server
    */
@@ -425,16 +463,26 @@ export class RelayServer extends EventEmitter {
       new Error('RELAY_STOPPED: Relay stopped before request completion'),
     );
 
-    if (this.discoveryServer) {
-      this.discoveryServer.close();
-      this.discoveryServer = null;
-      this.discoveryPort = null;
-    }
+    this.stopDiscoveryServer();
 
     if (this.wss) {
+      // Capture ref before nulling so isReady() returns false immediately
+      const wss = this.wss;
+      this.wss = null;
+
       return new Promise((resolve) => {
-        this.wss!.close(() => {
-          this.wss = null;
+        const timeout = setTimeout(() => {
+          debugLog('[RelayServer] stop() timed out after 5s — force-terminating remaining clients');
+          for (const client of wss.clients) {
+            try { client.terminate(); } catch { /* ignore */ }
+          }
+          try { wss.close(); } catch { /* ignore */ }
+          debugLog('[RelayServer] Server stopped (forced)');
+          resolve();
+        }, 5000);
+
+        wss.close(() => {
+          clearTimeout(timeout);
           debugLog('[RelayServer] Server stopped');
           resolve();
         });

package/build/extension/ui/connect.html

@@ -382,7 +382,7 @@
     </div>
 
     <div id="tab-selection" class="hidden">
-      <div class="section-label">Select page to expose to MCP server:</div>
+      <div class="section-label">Select page to expose to Chrome AI Bridge:</div>
       <div class="tabs-list" id="tabs-list"></div>
     </div>
 

package/build/extension/ui/connect.js

@@ -1,7 +1,7 @@
 /**
  * chrome-ai-bridge Connect UI
  * Extension2-style simple flow:
- * 1. MCP server opens connect.html?mcpRelayUrl=ws://...
+ * 1. Chrome AI Bridge opens connect.html?relayUrl=ws://...
  * 2. Tab list is displayed
  * 3. User selects tab -> Click "Connect"
  * 4. Done
@@ -9,7 +9,7 @@
 
 class ConnectUI {
   constructor() {
-    this.mcpRelayUrl = null;
+    this.relayUrl = null;
     this.sessionId = null;
     this.allowTabTakeover = false;
     this.autoMode = false;
@@ -50,7 +50,7 @@ class ConnectUI {
     try {
       // Parse URL parameters (Extension2 style: parameters are always provided)
       const params = new URLSearchParams(window.location.search);
-      this.mcpRelayUrl = params.get('mcpRelayUrl');
+      this.relayUrl = params.get('relayUrl');
       this.sessionId = params.get('sessionId');
       this.allowTabTakeover = params.get('allowTabTakeover') === 'true';
       this.autoMode = params.get('auto') === 'true';
@@ -61,8 +61,8 @@ class ConnectUI {
         rawTabId && /^\d+$/.test(rawTabId) ? Number(rawTabId) : null;
 
       // Validate relay URL
-      if (!this.mcpRelayUrl) {
-        this.showError('Missing mcpRelayUrl parameter. Make sure the MCP server is running.');
+      if (!this.relayUrl) {
+        this.showError('Missing relayUrl parameter. Make sure Chrome AI Bridge is running.');
         return;
       }
 
@@ -87,7 +87,7 @@ class ConnectUI {
 
   validateRelayUrl() {
     try {
-      const url = new URL(this.mcpRelayUrl);
+      const url = new URL(this.relayUrl);
       if (!['127.0.0.1', 'localhost', '::1'].includes(url.hostname)) {
         this.showError('Invalid relay URL: must be loopback address (127.0.0.1)');
         return false;
@@ -109,7 +109,7 @@ class ConnectUI {
 
       const relayResponse = await chrome.runtime.sendMessage({
         type: 'connectToRelay',
-        mcpRelayUrl: this.mcpRelayUrl,
+        relayUrl: this.relayUrl,
         sessionId: this.sessionId,
       });
       if (!relayResponse || !relayResponse.success) {
@@ -118,7 +118,7 @@ class ConnectUI {
 
       const connectResponse = await chrome.runtime.sendMessage({
         type: 'connectToTab',
-        mcpRelayUrl: this.mcpRelayUrl,
+        relayUrl: this.relayUrl,
         tabId: this.autoTabId,
         tabUrl: this.autoTabUrl,
         newTab: this.autoNewTab,
@@ -263,7 +263,7 @@ class ConnectUI {
       // Step 1: Connect to relay
       const relayResponse = await chrome.runtime.sendMessage({
         type: 'connectToRelay',
-        mcpRelayUrl: this.mcpRelayUrl,
+        relayUrl: this.relayUrl,
         sessionId: this.sessionId,
       });
 
@@ -274,7 +274,7 @@ class ConnectUI {
       // Step 2: Connect to tab
       const connectResponse = await chrome.runtime.sendMessage({
         type: 'connectToTab',
-        mcpRelayUrl: this.mcpRelayUrl,
+        relayUrl: this.relayUrl,
         tabId: tab.id,
         windowId: tab.windowId,
         sessionId: this.sessionId,
@@ -340,6 +340,18 @@ class ConnectUI {
     return div.innerHTML;
   }
 
+  formatDiscoverySummary(summary) {
+    if (!summary || typeof summary !== 'object') {
+      return 'n/a';
+    }
+    return [
+      `new=${summary.newRelayCount ?? 0}`,
+      `ok=${summary.successCount ?? 0}`,
+      `fail=${summary.failureCount ?? 0}`,
+      `cooldown=${Boolean(summary.skippedCooldown)}`,
+    ].join(', ');
+  }
+
   // ========== Debug Panel Methods ==========
 
   initDebugPanel() {
@@ -398,11 +410,35 @@ class ConnectUI {
       // Update stats
       const stats = response.stats;
       const state = response.state;
+      const discovery = state.discovery || {};
       this.debugStatsEl.innerHTML = `
         <strong>Total Logs:</strong> ${stats.total} |
         <strong>Active Connections:</strong> ${state.activeConnections?.length || 0} |
         <strong>Pending:</strong> ${state.pendingTabSelection?.length || 0}
         <br>
+        <strong>Discovery:</strong>
+        mode=${discovery.mode || 'n/a'},
+        running=${Boolean(discovery.isRunning)},
+        scheduled=${Boolean(discovery.hasScheduledTick)},
+        interval=${discovery.intervalMs ?? 'n/a'}ms,
+        streak=${discovery.emptyDiscoveryStreak ?? 'n/a'},
+        lastPort=${discovery.lastSuccessfulPort ?? 'n/a'}
+        <br>
+        <strong>Last Tick:</strong>
+        started=${discovery.lastTickStartedAt || 'n/a'},
+        done=${discovery.lastTickFinishedAt || 'n/a'},
+        dur=${discovery.lastTickDurationMs ?? 'n/a'}ms,
+        result=${this.formatDiscoverySummary(discovery.lastSummary)},
+        error=${discovery.lastError || 'none'}
+        <br>
+        <strong>Last Probe:</strong>
+        at=${discovery.lastRelayProbeAt || 'n/a'},
+        port=${discovery.lastRelayProbePort ?? 'n/a'},
+        status=${discovery.lastRelayProbeStatus || 'n/a'},
+        error=${discovery.lastRelayProbeError || 'none'},
+        keepAlive=${Boolean(discovery.keepAliveActive)},
+        alarm=${discovery.lastKeepAliveAlarmAt || 'n/a'}
+        <br>
         <strong>By Category:</strong>
         ${Object.entries(stats.byCategory || {}).map(([cat, count]) => `${cat}: ${count}`).join(', ') || 'none'}
       `;

package/build/src/cli.js

@@ -21,13 +21,18 @@ export const cliOptions = {
         description: 'Port for Extension Bridge WebSocket relay server. Default: 0 (auto-assign).',
         default: 0,
     },
+    daemon: {
+        type: 'boolean',
+        description: 'Run as HTTP-only daemon. Used by cab CLI.',
+        default: true,
+    },
 };
 export function parseArguments(version, argv = process.argv) {
     const yargsInstance = yargs(hideBin(argv))
         .scriptName('npx chrome-ai-bridge@latest')
         .options(cliOptions)
         .example([
-        ['$0', 'Start MCP server (requires chrome-ai-bridge extension)'],
+        ['$0', 'Start Chrome AI Bridge daemon (requires chrome-ai-bridge extension)'],
         ['$0 --logFile /tmp/log.txt', 'Save logs to a file'],
         ['$0 --help', 'Print CLI options'],
     ]);

package/build/src/config.js

@@ -37,15 +37,13 @@ export const GEMINI_CONFIG = {
     BASE_URL: 'https://gemini.google.com/',
 };
 /**
- * IPC configuration for multi-client MCP support.
- * The Primary instance exposes an HTTP endpoint on this port;
- * Secondary instances connect as stdio-to-HTTP proxies.
+ * HTTP server configuration for the daemon.
+ * The Primary instance exposes an HTTP endpoint on this port.
  */
 export const IPC_CONFIG = {
     port: Number(process.env.CAI_IPC_PORT) || 9321,
     host: '127.0.0.1',
     healthPath: '/health',
-    mcpPath: '/mcp',
 };
 /**
  * Get session configuration from environment variables or defaults.

package/build/src/extension/relay-server.js

@@ -29,6 +29,7 @@ export class RelayServer extends EventEmitter {
     discoveryServer = null;
     discoveryPort = null;
     keepAliveTimer = null;
+    _lastDiscoveryOptions = {};
     constructor(options = {}) {
         super();
         this.host = options.host || '127.0.0.1';
@@ -172,6 +173,9 @@ export class RelayServer extends EventEmitter {
                     this.ready = true;
                     debugLog(`[RelayServer] Connection ready for tab ${this.tabId}`);
                     this.emit('ready', this.tabId);
+                    // Release discovery port after WebSocket is established.
+                    // 1-second grace period lets Extension finish processing the response.
+                    setTimeout(() => this.stopDiscoveryServer(), 1000);
                     break;
                 case 'pong':
                     debugLog('[RelayServer] Received keep-alive pong');
@@ -269,6 +273,7 @@ export class RelayServer extends EventEmitter {
      * Extension polls this endpoint when user clicks the extension icon.
      */
     async startDiscoveryServer(options = {}) {
+        this._lastDiscoveryOptions = options;
         const ports = [38765, 38766, 38767, 38768, 38769, 38770, 38771, 38772, 38773, 38774, 38775];
         const wsUrl = this.getConnectionURL();
         for (const port of ports) {
@@ -332,6 +337,27 @@ export class RelayServer extends EventEmitter {
         debugLog('[RelayServer] Could not start discovery server on any port');
         return null;
     }
+    /**
+     * Release the discovery HTTP server (port).
+     * Called automatically after the Extension WebSocket connects (ready event).
+     * The port becomes available for other sessions.
+     */
+    stopDiscoveryServer() {
+        if (this.discoveryServer) {
+            this.discoveryServer.close();
+            debugLog(`[RelayServer] Discovery server released (port ${this.discoveryPort})`);
+            this.discoveryServer = null;
+            this.discoveryPort = null;
+        }
+    }
+    /**
+     * Re-acquire a discovery port (e.g. after WebSocket disconnect for reconnection).
+     * Uses the same options as the last startDiscoveryServer() call.
+     */
+    async restartDiscoveryServer(options) {
+        this.stopDiscoveryServer();
+        return this.startDiscoveryServer(options || this._lastDiscoveryOptions);
+    }
     /**
      * Stop server
      */
@@ -349,15 +375,29 @@ export class RelayServer extends EventEmitter {
         this.ready = false;
         this.tabId = null;
         this.rejectPendingRequests(new Error('RELAY_STOPPED: Relay stopped before request completion'));
-        if (this.discoveryServer) {
-            this.discoveryServer.close();
-            this.discoveryServer = null;
-            this.discoveryPort = null;
-        }
+        this.stopDiscoveryServer();
         if (this.wss) {
+            // Capture ref before nulling so isReady() returns false immediately
+            const wss = this.wss;
+            this.wss = null;
             return new Promise((resolve) => {
-                this.wss.close(() => {
-                    this.wss = null;
+                const timeout = setTimeout(() => {
+                    debugLog('[RelayServer] stop() timed out after 5s — force-terminating remaining clients');
+                    for (const client of wss.clients) {
+                        try {
+                            client.terminate();
+                        }
+                        catch { /* ignore */ }
+                    }
+                    try {
+                        wss.close();
+                    }
+                    catch { /* ignore */ }
+                    debugLog('[RelayServer] Server stopped (forced)');
+                    resolve();
+                }, 5000);
+                wss.close(() => {
+                    clearTimeout(timeout);
                     debugLog('[RelayServer] Server stopped');
                     resolve();
                 });

package/build/src/fast-cdp/agent-context.js

@@ -18,7 +18,7 @@ let currentAgentId = null;
  * 1. If CAI_AGENT_ID environment variable is set, use it + PID
  * 2. Otherwise, generate from PID + timestamp
  *
- * @param clientName Optional client name from MCP initialize (e.g., "claude-code")
+ * @param clientName Optional client name (e.g., "claude-code")
  * @returns Unique agent ID
  */
 export function generateAgentId(clientName) {
@@ -28,7 +28,7 @@ export function generateAgentId(clientName) {
         return `${envAgentId}-${process.pid}`;
     }
     if (clientName) {
-        // Use client name if available (from MCP initialize)
+        // Use client name if available
         return `${clientName}-${process.pid}`;
     }
     // Fallback: generate from PID + timestamp

package/build/src/fast-cdp/{mcp-logger.js → debug-logger.js}

@@ -1,6 +1,6 @@
 /**
- * MCP Debug Logger
- * Outputs logs to stderr and appends to .local/mcp-debug.log
+ * Debug Logger
+ * Outputs logs to stderr and appends to .local/debug.log
  */
 import fs from 'node:fs';
 import path from 'node:path';
@@ -21,7 +21,7 @@ const LOG_LEVEL_NAMES = {
 let currentLogLevel = LogLevel.DEBUG;
 // Log file path
 function getLogFilePath() {
-    return path.join(process.cwd(), '.local', 'mcp-debug.log');
+    return path.join(process.cwd(), '.local', 'debug.log');
 }
 // Max log file size (5MB)
 const MAX_LOG_SIZE = 5 * 1024 * 1024;
@@ -52,7 +52,7 @@ function rotateLogIfNeeded(logPath) {
 /**
  * Main logging function
  */
-export function mcpLog(level, category, message, data) {
+export function debugLog(level, category, message, data) {
     if (level < currentLogLevel)
         return;
     const timestamp = new Date().toISOString();
@@ -76,35 +76,35 @@ export function mcpLog(level, category, message, data) {
 }
 // Convenience methods
 export function logDebug(category, message, data) {
-    mcpLog(LogLevel.DEBUG, category, message, data);
+    debugLog(LogLevel.DEBUG, category, message, data);
 }
 export function logInfo(category, message, data) {
-    mcpLog(LogLevel.INFO, category, message, data);
+    debugLog(LogLevel.INFO, category, message, data);
 }
 export function logWarn(category, message, data) {
-    mcpLog(LogLevel.WARN, category, message, data);
+    debugLog(LogLevel.WARN, category, message, data);
 }
 export function logError(category, message, data) {
-    mcpLog(LogLevel.ERROR, category, message, data);
+    debugLog(LogLevel.ERROR, category, message, data);
 }
 /**
  * Log connection state changes
  */
 export function logConnectionState(kind, state, details) {
     const level = state === 'disconnected' || state === 'unhealthy' ? LogLevel.WARN : LogLevel.INFO;
-    mcpLog(level, 'connection', `${kind} ${state}`, details);
+    debugLog(level, 'connection', `${kind} ${state}`, details);
 }
 /**
  * Log relay server events
  */
 export function logRelay(event, details) {
     const level = event === 'error' || event === 'timeout' ? LogLevel.ERROR : LogLevel.INFO;
-    mcpLog(level, 'relay', event, details);
+    debugLog(level, 'relay', event, details);
 }
 /**
  * Log extension communication
  */
 export function logExtension(event, details) {
     const level = event === 'timeout' ? LogLevel.ERROR : LogLevel.INFO;
-    mcpLog(level, 'extension', event, details);
+    debugLog(level, 'extension', event, details);
 }

package/build/src/fast-cdp/extension-raw.js

@@ -1,11 +1,59 @@
 import { spawn } from 'node:child_process';
+import crypto from 'node:crypto';
 import fs from 'node:fs';
 import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
 import { RelayServer } from '../extension/relay-server.js';
-import { logRelay, logExtension, logInfo, logError } from './mcp-logger.js';
-// Stable extension ID (from manifest.json key)
-const EXTENSION_ID = 'ibjplbopgmcacpmfpnaeoloepdhenlbm';
-const ENABLE_WAKE_CONNECT_PAGE = process.env.CAI_ENABLE_WAKE_CONNECT_PAGE !== '0';
+import { logRelay, logExtension, logInfo, logError } from './debug-logger.js';
+// Wake connect page disabled by default — it opens a chrome-extension:// URL
+// that gets ERR_BLOCKED_BY_CLIENT and annoys users. Discovery polling is the
+// primary mechanism; wake is only useful in rare edge cases.
+const ENABLE_WAKE_CONNECT_PAGE = process.env.CAI_ENABLE_WAKE_CONNECT_PAGE === '1';
+const EXTENSION_ID_ALPHABET = 'abcdefghijklmnop';
+const EXTENSION_ID_PATTERN = /^[a-p]{32}$/;
+const MANIFEST_FILE_URL = new URL('../../extension/manifest.json', import.meta.url);
+let cachedExtensionId = null;
+function deriveExtensionIdFromManifestKey(manifestKey) {
+    const derKey = Buffer.from(manifestKey, 'base64');
+    if (derKey.length === 0) {
+        throw new Error('EXT_CONFIG_ERROR: manifest key is empty or invalid base64');
+    }
+    const hash = crypto.createHash('sha256').update(derKey).digest();
+    let extensionId = '';
+    for (const byte of hash.subarray(0, 16)) {
+        extensionId += EXTENSION_ID_ALPHABET[byte >> 4];
+        extensionId += EXTENSION_ID_ALPHABET[byte & 0x0f];
+    }
+    return extensionId;
+}
+function resolveExtensionId() {
+    if (cachedExtensionId) {
+        return cachedExtensionId;
+    }
+    const envId = process.env.CAI_EXTENSION_ID?.trim();
+    if (envId) {
+        if (!EXTENSION_ID_PATTERN.test(envId)) {
+            throw new Error(`EXT_CONFIG_ERROR: CAI_EXTENSION_ID must match ${EXTENSION_ID_PATTERN.source}, got "${envId}"`);
+        }
+        cachedExtensionId = envId;
+        return cachedExtensionId;
+    }
+    const manifestPath = fileURLToPath(MANIFEST_FILE_URL);
+    try {
+        const manifestRaw = fs.readFileSync(manifestPath, 'utf8');
+        const manifest = JSON.parse(manifestRaw);
+        if (!manifest.key) {
+            throw new Error('manifest key is missing');
+        }
+        cachedExtensionId = deriveExtensionIdFromManifestKey(manifest.key);
+        return cachedExtensionId;
+    }
+    catch (error) {
+        const relativePath = path.relative(process.cwd(), manifestPath);
+        throw new Error(`EXT_CONFIG_ERROR: failed to resolve extension ID from ${relativePath}: ${error instanceof Error ? error.message : String(error)}`);
+    }
+}
 /**
  * Get Chrome executable path for current platform
  */
@@ -93,8 +141,9 @@ function spawnChromeWithConnectUrl(connectUrl) {
     }
 }
 function buildConnectUrl(options) {
+    const extensionId = resolveExtensionId();
     const params = new URLSearchParams();
-    params.set('mcpRelayUrl', options.wsUrl);
+    params.set('relayUrl', options.wsUrl);
     params.set('sessionId', options.sessionId);
     if (options.tabUrl)
         params.set('tabUrl', options.tabUrl);
@@ -106,7 +155,7 @@ function buildConnectUrl(options) {
         params.set('allowTabTakeover', 'true');
     if (options.auto)
         params.set('auto', 'true');
-    return `chrome-extension://${EXTENSION_ID}/ui/connect.html?${params.toString()}`;
+    return `chrome-extension://${extensionId}/ui/connect.html?${params.toString()}`;
 }
 export async function connectViaExtensionRaw(options) {
     const startTime = Date.now();