chrome-ai-bridge 2.3.10 → 2.5.1

package/README.md

@@ -3,7 +3,7 @@
 [![npm](https://img.shields.io/npm/v/chrome-ai-bridge.svg)](https://npmjs.org/package/chrome-ai-bridge)
 [![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](LICENSE)
 
-> **⚠️ Requires Chrome Extension** — This MCP server controls ChatGPT/Gemini tabs via a browser extension.
+> **Requires Chrome Extension** — This CLI tool controls ChatGPT/Gemini tabs via a browser extension.
 
 Let your AI assistant (Claude Code, Cursor, etc.) consult ChatGPT and Gemini for second opinions.
 
@@ -12,20 +12,20 @@ Let your AI assistant (Claude Code, Cursor, etc.) consult ChatGPT and Gemini for
 ## How it works
 
 ```
-Your AI Assistant → MCP Server → Chrome Extension → ChatGPT/Gemini tabs
+Your AI Assistant → cab CLI / daemon → Chrome Extension → ChatGPT/Gemini tabs
 ```
 
-1. **Chrome Extension** (you install) bridges MCP server and browser
-2. **MCP Server** (npm package) receives requests from your AI assistant
+1. **Chrome Extension** (you install) bridges the daemon and browser
+2. **`cab` CLI / daemon** (npm package) receives requests from your AI assistant via REST API
 3. **Extension** controls ChatGPT/Gemini tabs via CDP (Chrome DevTools Protocol)
 
-**Why an extension?** ChatGPT and Gemini don't have public APIs. The extension automates the web UI while you stay logged in.
+**Why an extension?** ChatGPT and Gemini don't have free public APIs. The extension automates the web UI while you stay logged in.
 
 ---
 
 ## What is this?
 
-chrome-ai-bridge is a [Model Context Protocol](https://modelcontextprotocol.io/) server that gives AI assistants the ability to:
+chrome-ai-bridge is a CLI tool and daemon that gives AI assistants the ability to:
 
 - **Consult other AIs**: Ask ChatGPT and Gemini questions via browser
 - **Get multiple perspectives**: Query both AIs in parallel for second opinions
@@ -71,7 +71,7 @@ Network extraction is the primary path. DOM extraction remains as an automatic f
 
 ## Quick Start
 
-> **⚠️ Both steps are required** — The extension and MCP server work together.
+> **Both steps are required** — The extension and daemon work together.
 
 ### Step 1: Install Chrome Extension
 
@@ -95,30 +95,23 @@ Then load the extension in Chrome:
 
 You should see "Chrome AI Bridge" appear in your extensions list.
 
-### Step 2: Configure your MCP client
+### Step 2: Install the `cab` CLI
 
-**For Claude Code** (`~/.claude.json`):
-
-```json
-{
-  "mcpServers": {
-    "chrome-ai-bridge": {
-      "command": "npx",
-      "args": ["chrome-ai-bridge@latest"]
-    }
-  }
-}
+```bash
+npm install -g chrome-ai-bridge
 ```
 
 ### Step 3: Connect the Extension
 
 1. Open ChatGPT (https://chatgpt.com) or Gemini (https://gemini.google.com) in Chrome
 2. Log in to both services
-3. The extension will automatically connect when the MCP server starts
+3. The extension will automatically connect when the daemon starts
 
 ### Step 4: Verify it works
 
-Restart your AI client and try: `"Ask ChatGPT how to implement OAuth in Node.js"`
+```bash
+cab ask chatgpt "How do I implement OAuth in Node.js?"
+```
 
 ---
 
@@ -187,7 +180,7 @@ User: "Ask ChatGPT specifically about this"
 
 | Variable | Description |
 |----------|-------------|
-| `MCP_DISABLE_WEB_LLM` | Set `true` to disable ChatGPT/Gemini tools |
+| `CAI_DISABLE_WEB_LLM` | Set `true` to disable ChatGPT/Gemini tools |
 
 ---
 
@@ -201,17 +194,10 @@ cd chrome-ai-bridge
 npm install && npm run build
 ```
 
-Configure `~/.claude.json` to use local build:
-
-```json
-{
-  "mcpServers": {
-    "chrome-ai-bridge": {
-      "command": "node",
-      "args": ["/path/to/chrome-ai-bridge/scripts/cli.mjs"]
-    }
-  }
-}
+For local development, run the daemon directly:
+
+```bash
+node /path/to/chrome-ai-bridge/scripts/cli.mjs
 ```
 
 ### Commands
@@ -230,7 +216,7 @@ chrome-ai-bridge/
 ├── src/
 │   ├── fast-cdp/        # CDP client and AI chat logic
 │   ├── extension/       # Chrome extension source
-│   ├── main.ts          # MCP server entry point
+│   ├── main.ts          # Daemon entry point
 │   └── index.ts         # Main exports
 ├── scripts/
 │   └── cli.mjs          # CLI entry point
@@ -261,7 +247,7 @@ npm run cdp:gemini
 | Guide | Description |
 |-------|-------------|
 | [Technical Spec](docs/SPEC.md) | Detailed architecture and implementation |
-| [Setup Guide](docs/user/setup.md) | Detailed MCP configuration |
+| [Setup Guide](docs/user/setup.md) | Detailed setup and configuration |
 | [Troubleshooting](docs/user/troubleshooting.md) | Problem solving |
 | [CI Policy](docs/ci-policy.md) | Required checks and browser E2E lane policy |
 | [Technical Spec - Architecture](docs/SPEC.md#1-architecture-overview) | Extension architecture |
@@ -276,10 +262,12 @@ npm run cdp:gemini
 2. Verify ChatGPT/Gemini tabs are open and logged in
 3. Check the extension popup for connection status
 
-### MCP server not responding
+### Daemon not responding
 
 ```bash
-npx clear-npx-cache && npx chrome-ai-bridge@latest
+cab status
+# or restart:
+cab daemon restart
 ```
 
 ### ChatGPT/Gemini not responding
@@ -295,9 +283,9 @@ npx clear-npx-cache && npx chrome-ai-bridge@latest
 ## Architecture (v2.0.0)
 
 ```
-┌─────────────────┐         MCP         ┌──────────────────┐
-│  Claude Code    │ ◀──────────────────▶│   MCP Server     │
-│  (MCP Client)   │                     │  (Node.js)       │
+┌─────────────────┐       REST API      ┌──────────────────┐
+│  Claude Code    │ ◀──────────────────▶│  Chrome AI Bridge│
+│  (cab CLI)      │                     │  (Node.js)       │
 └─────────────────┘                     └────────┬─────────┘
                                                  │
                                                  ▼

package/build/extension/README.md

@@ -1,17 +1,17 @@
 # chrome-ai-bridge Extension
 
-このChrome拡張機能は、chrome-ai-bridge MCPサーバーとChromeブラウザのタブを接続します。
+このChrome拡張機能は、chrome-ai-bridge サーバーとChromeブラウザのタブを接続します。
 
 ## アーキテクチャ
 
 ```
-chrome-ai-bridge MCPサーバー (プロセス1)
+chrome-ai-bridge サーバー (プロセス1)
   ↓ WebSocket
 Extension (TabShareExtension)
   ↓ chrome.debugger API
 Chrome Tab #101 (ChatGPT)
 
-chrome-ai-bridge MCPサーバー (プロセス2)
+chrome-ai-bridge サーバー (プロセス2)
   ↓ WebSocket
 Extension (TabShareExtension)
   ↓ chrome.debugger API
@@ -66,10 +66,10 @@ npm run build
 }
 ```
 
-### MCPサーバー起動
+### サーバー起動
 
 1. Claude Codeを起動
-2. MCPサーバーが自動的に起動し、WebSocket Relayサーバーが立ち上がります
+2. サーバーが自動的に起動し、WebSocket Relayサーバーが立ち上がります
 3. ログに以下のようなメッセージが表示されます:
 
 ```
@@ -112,7 +112,7 @@ chrome-extension://[EXTENSION_ID]/ui/connect.html?mcpRelayUrl=ws://127.0.0.1:123
 
 ### 接続確認
 
-MCPサーバーのログに以下のメッセージが表示されれば成功:
+サーバーのログに以下のメッセージが表示されれば成功:
 
 ```
 [Extension Bridge] Extension connected to tab 101
@@ -128,8 +128,8 @@ src/extension/
 ├── ui/
 │   ├── connect.html       # タブ選択UI
 │   └── connect.js         # UIロジック
-├── relay-server.ts        # WebSocketサーバー (MCPサーバー側)
-└── extension-transport.ts # Puppeteer Transport実装 (MCPサーバー側)
+├── relay-server.ts        # WebSocketサーバー (サーバー側)
+└── extension-transport.ts # Puppeteer Transport実装 (サーバー側)
 ```
 
 ## トラブルシューティング
@@ -144,10 +144,10 @@ src/extension/
 
 ### Invalid token
 
-**原因**: MCPサーバーのトークンが一致しない
+**原因**: サーバーのトークンが一致しない
 
 **解決策**:
-1. MCPサーバーのログからトークンを確認
+1. サーバーのログからトークンを確認
 2. URLパラメータに正しいトークンを含める
 
 ### Tab not found

package/build/extension/background.mjs

@@ -170,6 +170,8 @@ class RelayConnection {
     }
     if (message.method === 'reloadExtension') {
       logInfo('reload', 'reloadExtension command received');
+      // Set flag so the reloaded service worker skips cooldown
+      chrome.storage.local.set({ _reloadTriggered: Date.now() }).catch(() => {});
       // Delay reload to allow response to be sent first
       setTimeout(() => {
         logInfo('reload', 'Calling chrome.runtime.reload()');
@@ -267,7 +269,7 @@ class TabShareExtension {
       case 'connectToRelay':
         this._connectToRelay(
           sender.tab?.id,
-          message.mcpRelayUrl,
+          message.relayUrl,
           message.sessionId,
         ).then(
           () => sendResponse({success: true}),
@@ -290,7 +292,7 @@ class TabShareExtension {
           sender.tab?.id,
           message.tabId || sender.tab?.id,
           message.windowId || sender.tab?.windowId,
-          message.mcpRelayUrl,
+          message.relayUrl,
           message.tabUrl,
           message.newTab,
           message.sessionId,
@@ -329,8 +331,8 @@ class TabShareExtension {
     return `selector:${selectorTabId}`;
   }
 
-  async _connectToRelay(selectorTabId, mcpRelayUrl, sessionId) {
-    if (!mcpRelayUrl) {
+  async _connectToRelay(selectorTabId, relayUrl, sessionId) {
+    if (!relayUrl) {
       logError('relay', 'Missing relay URL');
       throw new Error('Missing relay URL');
     }
@@ -342,10 +344,10 @@ class TabShareExtension {
       this._pendingTabSelection.delete(pendingKey);
       ensureKeepAliveAlarm('replace-stale-pending');
     }
-    logInfo('relay', 'Connecting to relay', {mcpRelayUrl, selectorTabId, sessionId, pendingKey});
+    logInfo('relay', 'Connecting to relay', {relayUrl, selectorTabId, sessionId, pendingKey});
 
     const openSocket = async attempt => {
-      const socket = new WebSocket(mcpRelayUrl);
+      const socket = new WebSocket(relayUrl);
       await new Promise((resolve, reject) => {
         let settled = false;
         const finish = (handler) => {
@@ -391,7 +393,7 @@ class TabShareExtension {
     let lastError;
     const maxAttempts = 5;
     for (let attempt = 0; attempt < maxAttempts; attempt += 1) {
-      logDebug('relay', `WebSocket attempt ${attempt + 1}/${maxAttempts}`, {mcpRelayUrl});
+      logDebug('relay', `WebSocket attempt ${attempt + 1}/${maxAttempts}`, {relayUrl});
       try {
         socket = await openSocket(attempt);
         logInfo('relay', 'WebSocket connected', {attempt: attempt + 1});
@@ -426,7 +428,7 @@ class TabShareExtension {
     selectorTabId,
     tabId,
     windowId,
-    mcpRelayUrl,
+    relayUrl,
     tabUrl,
     newTab,
     sessionId,
@@ -480,14 +482,14 @@ class TabShareExtension {
 
     const pending = this._pendingTabSelection.get(pendingKey);
     if (!pending) {
-      logDebug('connect', 'No pending connection, creating relay', {selectorTabId, sessionId, mcpRelayUrl});
+      logDebug('connect', 'No pending connection, creating relay', {selectorTabId, sessionId, relayUrl});
       // If no pending connection, create one now.
-      await this._connectToRelay(selectorTabId, mcpRelayUrl, sessionId);
+      await this._connectToRelay(selectorTabId, relayUrl, sessionId);
     }
     const newPending = this._pendingTabSelection.get(pendingKey);
     if (!newPending) {
-      logError('connect', 'No active MCP relay connection');
-      throw new Error('No active MCP relay connection');
+      logError('connect', 'No active relay connection');
+      throw new Error('No active relay connection');
     }
 
     if (
@@ -519,7 +521,7 @@ class TabShareExtension {
     this._tabSessionOwners.set(tabId, sessionId || `selector:${selectorTabId}`);
     logInfo('connect', 'Tab connected successfully', {tabId, windowId, sessionId});
     ensureKeepAliveAlarm('tab-connected');
-    // バッジのみ設定（フォーカスはMCPサーバー側が必要に応じて制御）
+    // バッジのみ設定（フォーカスはサーバー側が必要に応じて制御）
     await this._setConnectedTab(tabId, true);
   }
 
@@ -599,6 +601,9 @@ class TabShareExtension {
   async _getDebugLogs(filter, limit) {
     const result = await chrome.storage.local.get('logs');
     const rawLogs = Array.isArray(result.logs) ? result.logs : [];
+    const toIso = value => (typeof value === 'number' && value > 0
+      ? new Date(value).toISOString()
+      : null);
     const normalized = rawLogs.map(logEntry => ({
       ts: logEntry.timestamp || logEntry.ts || new Date().toISOString(),
       category: logEntry.category || 'unknown',
@@ -626,6 +631,25 @@ class TabShareExtension {
         activeConnections: Array.from(this._activeConnections.keys()),
         pendingTabSelection: Array.from(this._pendingTabSelection.keys()),
         tabSessionOwners: Object.fromEntries(this._tabSessionOwners.entries()),
+        discovery: {
+          mode: discoveryMode,
+          intervalMs: getDiscoveryIntervalMs(),
+          isRunning: isDiscoveryRunning,
+          hasScheduledTick: discoveryIntervalId !== null,
+          emptyDiscoveryStreak,
+          lastSuccessfulPort,
+          lastTickStartedAt: toIso(lastDiscoveryTickStartedAt),
+          lastTickFinishedAt: toIso(lastDiscoveryTickFinishedAt),
+          lastTickDurationMs: lastDiscoveryTickDurationMs,
+          lastSummary: lastDiscoverySummary,
+          lastError: lastDiscoveryError,
+          lastRelayProbeAt: toIso(lastRelayProbeAt),
+          lastRelayProbePort,
+          lastRelayProbeStatus,
+          lastRelayProbeError,
+          keepAliveActive,
+          lastKeepAliveAlarmAt: toIso(lastKeepAliveAlarmAt),
+        },
       },
     };
   }
@@ -715,7 +739,7 @@ class TabShareExtension {
 
 const tabShareExtension = new TabShareExtension();
 
-const DISCOVERY_ALARM = 'mcp-relay-discovery';
+const DISCOVERY_ALARM = 'cab-relay-discovery';
 const KEEPALIVE_ALARM = 'keepAlive';
 const KEEPALIVE_PERIOD_MINUTES = 0.5;
 const DISCOVERY_PORTS = [38765, 38766, 38767, 38768, 38769, 38770, 38771, 38772, 38773, 38774, 38775];
@@ -731,7 +755,7 @@ const DISCOVERY_INTERVAL_MS = {
 };
 const FAST_TO_NORMAL_EMPTY_STREAK = 5;
 const NORMAL_TO_IDLE_EMPTY_STREAK = 20;
-const ACTIVE_TO_IDLE_EMPTY_STREAK = 3;
+const ACTIVE_TO_IDLE_EMPTY_STREAK = 10;
 let lastSuccessfulPort = null;
 const lastRelayByPort = new Map();
 
@@ -743,10 +767,35 @@ let isDiscoveryRunning = false;
 let discoveryMode = DISCOVERY_MODE.FAST;
 let emptyDiscoveryStreak = 0;
 let keepAliveActive = false;
+let lastDiscoveryTickStartedAt = 0;
+let lastDiscoveryTickFinishedAt = 0;
+let lastDiscoveryTickDurationMs = null;
+let lastDiscoverySummary = null;
+let lastDiscoveryError = null;
+let lastRelayProbeAt = 0;
+let lastRelayProbePort = null;
+let lastRelayProbeStatus = null;
+let lastRelayProbeError = null;
+let lastKeepAliveAlarmAt = 0;
 
 // リロード時クールダウン: 5秒間は「新しいrelay」検出をスキップ
+// ただし reloadExtension コマンド経由のリロード時はスキップしない
 const extensionStartTime = Date.now();
 const COOLDOWN_MS = 5000;
+let cooldownDisabled = false;
+
+// Check if this is a reload triggered by reloadExtension command
+chrome.storage.local.get('_reloadTriggered').then(result => {
+  if (result._reloadTriggered) {
+    const age = Date.now() - result._reloadTriggered;
+    if (age < 10000) {  // Within 10 seconds of reload trigger
+      cooldownDisabled = true;
+      logInfo('discovery', 'Cooldown disabled (reloadExtension triggered)', {age});
+    }
+    // Clear the flag
+    chrome.storage.local.remove('_reloadTriggered').catch(() => {});
+  }
+}).catch(() => {});
 
 // ユーザー操作によるDiscoveryかどうかのフラグ
 // Chrome起動時やService Worker再起動時はfalse、アイコンクリック時のみtrue
@@ -838,7 +887,7 @@ function buildConnectUrl(
   sessionId,
   allowTabTakeover = false,
 ) {
-  const params = new URLSearchParams({mcpRelayUrl: wsUrl});
+  const params = new URLSearchParams({relayUrl: wsUrl});
   if (tabUrl) params.set('tabUrl', tabUrl);
   if (newTab) params.set('newTab', 'true');
   if (autoMode) params.set('auto', 'true');
@@ -898,16 +947,34 @@ async function ensureConnectUiTab(
 async function fetchRelayInfo(port, timeoutMs = 800) {
   const discoveryUrl = `http://127.0.0.1:${port}/relay-info`;
   let timer = null;
+  lastRelayProbeAt = Date.now();
+  lastRelayProbePort = port;
   try {
     const controller = new AbortController();
     timer = setTimeout(() => controller.abort(), timeoutMs);
     const res = await fetch(discoveryUrl, {signal: controller.signal});
-    if (!res.ok) return null;
+    if (!res.ok) {
+      lastRelayProbeStatus = `http-${res.status}`;
+      lastRelayProbeError = null;
+      return null;
+    }
     const data = await res.json();
-    if (!data?.wsUrl) return null;
+    if (!data?.wsUrl) {
+      lastRelayProbeStatus = 'invalid-payload';
+      lastRelayProbeError = null;
+      return null;
+    }
+    lastRelayProbeStatus = 'ok';
+    lastRelayProbeError = null;
     lastSuccessfulPort = port;
     return data;
-  } catch {
+  } catch (error) {
+    const message =
+      error && typeof error === 'object' && 'message' in error
+        ? String(error.message)
+        : String(error);
+    lastRelayProbeStatus = 'fetch-error';
+    lastRelayProbeError = message;
     return null;
   } finally {
     if (timer) {
@@ -937,15 +1004,15 @@ async function autoConnectRelay(best) {
 
   // tabUrl があれば、connect.html を開かずに直接接続
   // preferredTabId があれば優先的に使用
+  const requestedNewTab = Boolean(best?.data?.newTab);
   let targetTabId;
   try {
     // autoConnectRelay経由の場合はフォーカスしない（active: false）
-    // リロード時に勝手にタブがフォーカスされる問題を防ぐ
-    // newTab: false に固定 - 自動接続では既存タブを優先してタブスパムを防止
+    // newTab: relay の要求を尊重する（サーバーが newTab: true を指定した場合は新規タブ作成を許可）
     targetTabId = await tabShareExtension._resolveTabId(
       tabUrl,
       preferredTabId,
-      false,  // newTab: false - always prefer existing tabs in auto-connect
+      requestedNewTab,
       false,  // active: false - 自動接続時はタブをフォーカスしない
     );
   } catch (error) {
@@ -957,8 +1024,23 @@ async function autoConnectRelay(best) {
     return false;
   }
   if (tabShareExtension._activeConnections?.has(targetTabId)) {
-    logInfo('auto-connect', 'Tab already connected', {targetTabId});
-    return true; // 既に接続済み
+    const existingSessionId = tabShareExtension._tabSessionOwners?.get(targetTabId);
+    const newSessionId = best?.data?.sessionId;
+    if (existingSessionId && newSessionId && existingSessionId !== newSessionId) {
+      // Different session wants the same tab — replace the old connection
+      logInfo('auto-connect', 'Replacing stale connection with newer session', {
+        targetTabId, oldSession: existingSessionId, newSession: newSessionId,
+      });
+      const oldConn = tabShareExtension._activeConnections.get(targetTabId);
+      if (oldConn) {
+        oldConn.close('Replaced by newer session');
+        tabShareExtension._activeConnections.delete(targetTabId);
+        tabShareExtension._tabSessionOwners.delete(targetTabId);
+      }
+    } else {
+      logInfo('auto-connect', 'Tab already connected', {targetTabId});
+      return true; // 同じセッションで接続済み
+    }
   }
 
   const targetTab = await chrome.tabs.get(targetTabId).catch(() => null);
@@ -1008,9 +1090,10 @@ async function autoOpenConnectUi() {
     failureCount: 0,
   };
 
-  // リロード直後はタブを開かない（既存MCPサーバーとの再接続を防ぐ）
+  // リロード直後はタブを開かない（既存サーバーとの再接続を防ぐ）
+  // ただし reloadExtension コマンド経由の場合はスキップしない
   const elapsed = Date.now() - extensionStartTime;
-  if (elapsed < COOLDOWN_MS) {
+  if (elapsed < COOLDOWN_MS && !cooldownDisabled) {
     logDebug('discovery', `Cooldown active (${elapsed}ms < ${COOLDOWN_MS}ms), skipping`);
     result.skippedCooldown = true;
     return result;
@@ -1038,7 +1121,7 @@ async function autoOpenConnectUi() {
       continue;
     }
 
-    logInfo('discovery', 'New relay detected', {port, tabUrl: data.tabUrl, wsUrl: data.wsUrl});
+    logInfo('discovery', 'New relay detected', {port, tabUrl: data.tabUrl, wsUrl: data.wsUrl, startedAt});
     lastRelayByPort.set(port, {
       wsUrl: data.wsUrl,
       startedAt,
@@ -1047,14 +1130,34 @@ async function autoOpenConnectUi() {
     newRelays.push({port, data});
   }
 
-  result.newRelayCount = newRelays.length;
+  // Deduplicate: when multiple relays serve the same tabUrl, prefer the newest (by startedAt)
+  // This prevents stale servers from stealing connections from active ones
+  const bestByTabUrl = new Map();
+  for (const relay of newRelays) {
+    const tabUrl = relay.data?.tabUrl || '';
+    const existing = bestByTabUrl.get(tabUrl);
+    const relayStartedAt = relay.data?.startedAt || 0;
+    if (!existing || relayStartedAt > (existing.data?.startedAt || 0)) {
+      bestByTabUrl.set(tabUrl, relay);
+    }
+  }
+  const dedupedRelays = [...bestByTabUrl.values()];
+  if (dedupedRelays.length < newRelays.length) {
+    logInfo('discovery', 'Deduped relays by tabUrl (preferring newest)', {
+      before: newRelays.length,
+      after: dedupedRelays.length,
+      dropped: newRelays.filter(r => !dedupedRelays.includes(r)).map(r => ({port: r.port, tabUrl: r.data?.tabUrl, startedAt: r.data?.startedAt})),
+    });
+  }
 
-  if (newRelays.length > 0) {
-    logInfo('discovery', `Processing ${newRelays.length} new relay(s)`);
+  result.newRelayCount = dedupedRelays.length;
+
+  if (dedupedRelays.length > 0) {
+    logInfo('discovery', `Processing ${dedupedRelays.length} new relay(s)`);
   }
 
   // 全ての新しい relay を処理（並列ではなく順次）
-  for (const relay of newRelays) {
+  for (const relay of dedupedRelays) {
     logInfo('discovery', 'Processing relay', {port: relay.port, tabUrl: relay.data.tabUrl});
     debugLog('Processing new relay:', relay.port, relay.data.tabUrl);
     let ok = false;
@@ -1104,9 +1207,9 @@ async function autoOpenConnectUi() {
   return result;
 }
 
-// Discovery is now passive - only triggered by MCP server requests
+// Discovery is now passive - only triggered by Chrome AI Bridge requests
 // The extension no longer auto-opens tabs on install/startup
-// MCPサーバーからの明示的な接続要求時のみ動作する
+// サーバーからの明示的な接続要求時のみ動作する
 
 // Clear any existing discovery alarms from previous sessions
 // This prevents leftover alarms from auto-opening tabs
@@ -1170,21 +1273,38 @@ function scheduleDiscoveryTick(delayMs) {
     }
 
     isDiscoveryRunning = true;
+    lastDiscoveryTickStartedAt = Date.now();
+    lastDiscoveryError = null;
+    lastDiscoverySummary = null;
     try {
       const result = await autoOpenConnectUi();
+      lastDiscoverySummary = {
+        ...result,
+        mode: discoveryMode,
+        intervalMs: getDiscoveryIntervalMs(),
+      };
       updateDiscoveryMode(result);
     } catch (error) {
+      lastDiscoveryError =
+        error && typeof error === 'object' && 'message' in error
+          ? String(error.message)
+          : String(error);
       logWarn('discovery', 'Discovery cycle failed', {
-        error: error?.message || String(error),
+        error: lastDiscoveryError,
       });
       emptyDiscoveryStreak = 0;
       setDiscoveryMode(DISCOVERY_MODE.FAST, 'cycle-error');
     } finally {
+      lastDiscoveryTickFinishedAt = Date.now();
+      lastDiscoveryTickDurationMs =
+        lastDiscoveryTickFinishedAt - lastDiscoveryTickStartedAt;
       isDiscoveryRunning = false;
-      ensureKeepAliveAlarm('discovery-cycle');
     }
 
     scheduleDiscoveryTick(getDiscoveryIntervalMs());
+    // Must run AFTER scheduleDiscoveryTick so discoveryIntervalId is set,
+    // otherwise shouldKeepAlive() returns false and clears the alarm.
+    ensureKeepAliveAlarm('discovery-cycle');
   }, Math.max(0, delayMs));
 }
 
@@ -1217,6 +1337,7 @@ function kickDiscovery(reason) {
 
 chrome.alarms.onAlarm.addListener((alarm) => {
   if (alarm.name === KEEPALIVE_ALARM) {
+    lastKeepAliveAlarmAt = Date.now();
     const {activeCount, pendingCount} = getConnectionCounts();
     if (activeCount > 0 || pendingCount > 0) {
       logDebug('keepalive', 'Alarm triggered', {activeCount, pendingCount});
@@ -1235,7 +1356,7 @@ chrome.alarms.onAlarm.addListener((alarm) => {
 });
 
 // Note: We no longer register an onAlarm listener for DISCOVERY_ALARM
-// The scheduleDiscovery function is only called on explicit MCP requests
+// The scheduleDiscovery function is only called on explicit server requests
 
 // Discovery auto-starts on Chrome startup
 // connect.html only opens when user clicks the extension icon
@@ -1259,5 +1380,7 @@ chrome.runtime.onStartup.addListener(() => {
   scheduleDiscovery();
 });
 scheduleDiscovery();  // Start immediately
+// Ensure keepAlive is active from the start to prevent SW termination during discovery
+ensureKeepAliveAlarm('startup');
 
 logInfo('background', 'Extension loaded (discovery active)');

package/build/extension/manifest.json

@@ -1,9 +1,9 @@
 {
   "manifest_version": 3,
   "name": "chrome-ai-bridge Extension",
-  "version": "2.0.23",
+  "version": "2.0.30",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqDLiSB+b/gbnQ4zWRP65jnd27KmzpjJyR1JAQIjCD/dNORzTgk6+G0TjYEDZLIDceKHzGJudqnwq4q9g3T1eJ0SECZNXnaoE00WkgXfAUSQn6cmmXR3aQGFky/zbCmxnkRa0vYupxszlhw0yrlSZrIJd/weWF75Byh0zJfZ84kqDDhaj7TlB5laHICnoSLmPTif4mQcUW9oOKmAJPriPw4CWATKZsrQ4X46djxefSmfbqYfb9rttAqJVst40gO0Gsl6GOGxMHMds5Cl9GELc0dI3Gpobw07hQldZb8TeyilI/SnOaeS3HPtrp+KyEgRu8SgRdlrvuq6DeEZsP+kK7wIDAQAB",
-  "description": "Bridge between Chrome tabs and chrome-ai-bridge MCP server",
+  "description": "Bridge between Chrome tabs and Chrome AI Bridge",
   "permissions": ["debugger", "activeTab", "tabs", "storage", "alarms"],
   "host_permissions": ["<all_urls>"],
   "background": {