chrome-ai-bridge 2.3.4 → 2.3.5

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

@@ -92,7 +92,13 @@ export class RelayServer extends EventEmitter {
         ws.on('message', (data) => {
             this.handleMessage(data.toString());
         });
+        // Guard: only update state if this socket is still the current one.
+        // Prevents a stale socket's close event from corrupting a newer connection.
         ws.on('close', () => {
+            if (this.ws !== ws) {
+                debugLog('[RelayServer] Stale socket closed (ignored — already replaced)');
+                return;
+            }
             debugLog('[RelayServer] Extension disconnected');
             this.stopKeepAlive();
             this.rejectPendingRequests(new Error('RELAY_DISCONNECTED: Extension socket closed before request completion'));
@@ -330,10 +336,18 @@ export class RelayServer extends EventEmitter {
      * Stop server
      */
     async stop() {
+        this.stopKeepAlive();
         if (this.ws) {
-            this.ws.close();
+            try {
+                this.ws.close();
+            }
+            catch {
+                // ignore close errors
+            }
             this.ws = null;
         }
+        this.ready = false;
+        this.tabId = null;
         this.rejectPendingRequests(new Error('RELAY_STOPPED: Relay stopped before request completion'));
         if (this.discoveryServer) {
             this.discoveryServer.close();
@@ -343,6 +357,7 @@ export class RelayServer extends EventEmitter {
         if (this.wss) {
             return new Promise((resolve) => {
                 this.wss.close(() => {
+                    this.wss = null;
                     debugLog('[RelayServer] Server stopped');
                     resolve();
                 });

package/build/src/fast-cdp/fast-chat.js

@@ -166,22 +166,52 @@ async function rotateHistoryIfNeeded() {
 }
 /**
  * キャッシュされたGeminiクライアントをクリア（リトライ用）
+ * @deprecated Use resetConnection('gemini') instead
  */
-export function clearGeminiClient() {
-    const client = getClientFromAgent('gemini');
-    const relay = getRelayFromAgent('gemini');
+export async function clearGeminiClient() {
+    await resetConnection('gemini');
+}
+/**
+ * 指定 kind の接続を協調的にクリーンアップする。
+ * RelayServer・CdpClient・SessionManager・CDP リスナーを一括リセット。
+ * 接続失敗時のリトライ前に呼ぶことで「スティッキーな障害状態」を防ぐ。
+ */
+export async function resetConnection(kind) {
+    const label = kind === 'chatgpt' ? 'ChatGPT' : 'Gemini';
+    console.error(`[fast-cdp] resetConnection(${kind}) — coordinated cleanup start`);
+    // 1. CdpClient: all CDP event listeners removed
+    const client = getClientFromAgent(kind);
     if (client) {
-        console.error('[Gemini] Cached client cleared');
+        try {
+            client.removeAllCdpListeners();
+        }
+        catch {
+            // ignore
+        }
+        console.error(`[${label}] CdpClient listeners removed`);
     }
+    // 2. RelayServer: stop + reference clear (await to ensure port is released)
+    const relay = getRelayFromAgent(kind);
     if (relay) {
         try {
-            relay.stop();
+            await relay.stop();
         }
         catch {
             // ignore stop errors
         }
+        console.error(`[${label}] RelayServer stopped`);
     }
-    setClientForAgent('gemini', null, null);
+    // 3. Agent connection reference clear
+    setClientForAgent(kind, null, null);
+    console.error(`[${label}] Agent connection references cleared`);
+    // 4. Session info clear (await to prevent write race on retry)
+    try {
+        await clearAgentSession(kind);
+    }
+    catch {
+        // ignore session clear errors
+    }
+    console.error(`[fast-cdp] resetConnection(${kind}) — cleanup complete`);
 }
 /**
  * 全接続をクリーンアップ（プロセス終了時用）
@@ -367,7 +397,9 @@ async function createConnection(kind) {
             logWarn('fast-chat', `${kind} existing tab not found`, {
                 error: error instanceof Error ? error.message : String(error),
             });
-            console.error(`[fast-cdp] ${kind} existing tab not found, will create new tab`);
+            console.error(`[fast-cdp] ${kind} existing tab not found, resetting before new tab`);
+            // 再利用失敗 → stale 参照をクリアしてから新規タブへ
+            await resetConnection(kind);
         }
     }
     // 新しいタブを作成
@@ -422,7 +454,9 @@ async function createConnection(kind) {
             });
             console.error(`[fast-cdp] ${kind} new tab attempt ${attempt + 1} failed:`, lastError.message);
             if (attempt < 1) {
-                console.error(`[fast-cdp] Retrying in 1s...`);
+                // リトライ前に協調クリーンアップして stale 状態を排除
+                console.error(`[fast-cdp] Resetting ${kind} connection before retry...`);
+                await resetConnection(kind);
                 await new Promise(r => setTimeout(r, 1000));
             }
         }
@@ -446,22 +480,10 @@ export async function getClient(kind) {
             console.error(`[fast-cdp] Reusing healthy ${kind} connection`);
             return existing;
         }
-        // 接続が切れている → 古いRelayServerをクリーンアップ
+        // 接続が切れている → 協調クリーンアップして再接続
         logConnectionState(kind, 'reconnecting');
-        console.error(`[fast-cdp] ${kind} connection lost, reconnecting...`);
-        // 古いRelayServerを停止
-        const oldRelay = getRelayFromAgent(kind);
-        if (oldRelay) {
-            logInfo('fast-chat', `Stopping stale ${kind} RelayServer`);
-            console.error(`[fast-cdp] Stopping stale ${kind} RelayServer`);
-            await oldRelay.stop().catch((err) => {
-                logWarn('fast-chat', `Failed to stop stale ${kind} RelayServer`, {
-                    error: err instanceof Error ? err.message : String(err),
-                });
-            });
-        }
-        // キャッシュをクリア
-        setClientForAgent(kind, null, null);
+        console.error(`[fast-cdp] ${kind} connection lost, performing coordinated reset...`);
+        await resetConnection(kind);
     }
     // 新しい接続を作成
     return await createConnection(kind);
@@ -2205,9 +2227,8 @@ async function askGeminiFastInternal(question, debug) {
             const stuckCheckResult = await checkGeminiStuckState(client);
             if (stuckCheckResult.isStuck) {
                 console.error(`[Gemini] Existing chat appears stuck (stop button detected for ${stuckCheckResult.waitedMs}ms). Clearing session and retrying.`);
-                // セッションとクライアントをクリア
-                await clearAgentSession('gemini');
-                clearGeminiClient();
+                // 協調クリーンアップ（RelayServer + Client + Session を一括リセット）
+                await resetConnection('gemini');
                 // エラーを投げて、呼び出し元でリトライを促す
                 throw new Error('GEMINI_STUCK_EXISTING_CHAT: Previous chat appears stuck (stop button visible). Session cleared, please retry.');
             }
@@ -2475,9 +2496,8 @@ async function askGeminiFastInternal(question, debug) {
         // 30秒以上停止ボタンが検出され続けている場合、セッションをクリアして新規チャットに切り替え
         if (stopButtonConsecutiveCount >= forceNewChatThreshold) {
             console.error(`[Gemini] Stop button detected for ${forceNewChatThreshold * 0.5}s - clearing session and forcing new chat`);
-            // セッションとクライアントをクリアして新規チャットを強制
-            await clearAgentSession('gemini');
-            clearGeminiClient();
+            // 協調クリーンアップ（RelayServer + Client + Session を一括リセット）
+            await resetConnection('gemini');
             // エラーを投げて再試行を促す
             throw new Error('GEMINI_STUCK_STOP_BUTTON: Previous response appears stuck. Session cleared, please retry.');
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chrome-ai-bridge",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "description": "MCP server bridging Chrome extension and AI assistants (ChatGPT, Gemini). Extension-only mode - no Puppeteer.",
   "type": "module",
   "bin": "./scripts/cli.mjs",