chrome-ai-bridge 2.3.4 → 2.3.6

package/build/src/Mutex.js

@@ -7,22 +7,31 @@ export class Mutex {
     static Guard = class Guard {
         #mutex;
         #onRelease;
+        #released = false;
         constructor(mutex, onRelease) {
             this.#mutex = mutex;
             this.#onRelease = onRelease;
         }
         dispose() {
+            if (this.#released) {
+                return;
+            }
+            this.#released = true;
             this.#onRelease?.();
             return this.#mutex.release();
         }
     };
-    #locked = false;
+    #maxConcurrency;
+    #active = 0;
     #acquirers = [];
+    constructor(maxConcurrency = 1) {
+        this.#maxConcurrency = Math.max(1, Math.floor(maxConcurrency));
+    }
     // This is FIFO.
     async acquire(onRelease) {
-        if (!this.#locked) {
-            this.#locked = true;
-            return new Mutex.Guard(this);
+        if (this.#active < this.#maxConcurrency) {
+            this.#active += 1;
+            return new Mutex.Guard(this, onRelease);
         }
         const { resolve, promise } = Promise.withResolvers();
         this.#acquirers.push(resolve);
@@ -32,9 +41,10 @@ export class Mutex {
     release() {
         const resolve = this.#acquirers.shift();
         if (!resolve) {
-            this.#locked = false;
+            this.#active = Math.max(0, this.#active - 1);
             return;
         }
+        // Hand the same concurrency slot to the next waiter.
         resolve();
     }
 }

package/build/src/config.js

@@ -68,22 +68,26 @@ export function getSessionConfig() {
 export function getIpcGuardConfig() {
     const raw = {
         maxSessions: Number(process.env.CAI_IPC_MAX_SESSIONS),
+        reservedInitSlots: Number(process.env.CAI_IPC_RESERVED_INIT_SLOTS),
         maxQueue: Number(process.env.CAI_IPC_MAX_QUEUE),
         queueWaitTimeoutMs: Number(process.env.CAI_IPC_QUEUE_WAIT_TIMEOUT_MS),
         sessionIdleMs: Number(process.env.CAI_IPC_SESSION_IDLE_MS),
         startupDelayJitterMs: Number(process.env.CAI_STARTUP_DELAY_JITTER_MS),
         startupProcessThreshold: Number(process.env.CAI_STARTUP_PROCESS_THRESHOLD),
         primaryIdleMs: Number(process.env.CAI_PRIMARY_IDLE_MS),
+        execMaxConcurrency: Number(process.env.CAI_EXEC_MAX_CONCURRENCY),
     };
     return {
-        maxSessions: raw.maxSessions > 0 ? Math.floor(raw.maxSessions) : 6,
+        maxSessions: raw.maxSessions > 0 ? Math.floor(raw.maxSessions) : 20,
+        reservedInitSlots: raw.reservedInitSlots >= 0 ? Math.floor(raw.reservedInitSlots) : 2,
         maxQueue: raw.maxQueue > 0 ? Math.floor(raw.maxQueue) : 64,
-        queueWaitTimeoutMs: raw.queueWaitTimeoutMs > 0 ? Math.floor(raw.queueWaitTimeoutMs) : 10_000,
-        sessionIdleMs: raw.sessionIdleMs > 0 ? Math.floor(raw.sessionIdleMs) : 300_000,
+        queueWaitTimeoutMs: raw.queueWaitTimeoutMs > 0 ? Math.floor(raw.queueWaitTimeoutMs) : 45_000,
+        sessionIdleMs: raw.sessionIdleMs > 0 ? Math.floor(raw.sessionIdleMs) : 120_000,
         startupDelayJitterMs: raw.startupDelayJitterMs > 0 ? Math.floor(raw.startupDelayJitterMs) : 1_500,
         startupProcessThreshold: raw.startupProcessThreshold > 0
             ? Math.floor(raw.startupProcessThreshold)
             : 8,
         primaryIdleMs: raw.primaryIdleMs > 0 ? Math.floor(raw.primaryIdleMs) : 300_000,
+        execMaxConcurrency: raw.execMaxConcurrency > 0 ? Math.floor(raw.execMaxConcurrency) : 3,
     };
 }

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/build/src/main.js

@@ -68,6 +68,8 @@ const HEALTH_CHECK_INTERVAL_MS = 500;
 const ipcGuardConfig = getIpcGuardConfig();
 const instanceId = randomUUID();
 let becamePrimary = false;
+let stdinClosed = false;
+let getActiveIpcSessionCount = () => 0;
 function countLocalBridgeInstances() {
     try {
         const output = execFileSync('ps', ['-axo', 'command'], {
@@ -170,7 +172,7 @@ const logDisclaimers = () => {
 Make sure the chrome-ai-bridge extension is installed and Chrome is running.
 Available tools: ask_chatgpt_web, ask_gemini_web, ask_chatgpt_gemini_web, take_cdp_snapshot, get_page_dom, ask_gemini_image`);
 };
-const toolMutex = new Mutex();
+const toolMutex = new Mutex(ipcGuardConfig.execMaxConcurrency);
 function registerTool(tool) {
     server.registerTool(tool.name, {
         description: tool.description,
@@ -260,7 +262,9 @@ logDisclaimers();
     const ipcSessionLastActivity = new Map();
     const initQueue = [];
     let initializingCount = 0;
-    const getSessionLoad = () => Object.keys(ipcTransports).length + initializingCount;
+    const getActiveSessionCount = () => Object.keys(ipcTransports).length;
+    getActiveIpcSessionCount = getActiveSessionCount;
+    const getSessionLoad = () => getActiveSessionCount() + initializingCount;
     const touchIpcSession = (sessionId) => {
         ipcSessionLastActivity.set(sessionId, Date.now());
     };
@@ -270,6 +274,7 @@ logDisclaimers();
         }
         ipcSessionLastActivity.delete(sessionId);
         drainInitQueue();
+        maybeShutdownAfterStdinClose('ipc session cleanup');
     };
     function sendJsonRpcError(res, code, message, id = null, statusCode = 400) {
         res.writeHead(statusCode).end(JSON.stringify({
@@ -291,6 +296,10 @@ logDisclaimers();
         if (getSessionLoad() < ipcGuardConfig.maxSessions) {
             return;
         }
+        const initWaiterLimit = Math.max(0, Math.min(ipcGuardConfig.reservedInitSlots, ipcGuardConfig.maxQueue));
+        if (initQueue.length >= initWaiterLimit) {
+            throw new Error('SERVER_CAPACITY_EXCEEDED');
+        }
         if (initQueue.length >= ipcGuardConfig.maxQueue) {
             throw new Error('SERVER_QUEUE_FULL');
         }
@@ -339,9 +348,11 @@ logDisclaimers();
                 pid: process.pid,
                 version,
                 instanceId,
-                activeSessions: Object.keys(ipcTransports).length,
+                activeSessions: getActiveSessionCount(),
                 queuedInitializations: initQueue.length,
                 sessionCapacity: ipcGuardConfig.maxSessions,
+                reservedInitSlots: ipcGuardConfig.reservedInitSlots,
+                execMaxConcurrency: ipcGuardConfig.execMaxConcurrency,
             }));
             return;
         }
@@ -385,7 +396,10 @@ logDisclaimers();
                     }
                     catch (error) {
                         const message = error instanceof Error ? error.message : 'SERVER_BUSY_TIMEOUT';
-                        if (message === 'SERVER_QUEUE_FULL') {
+                        if (message === 'SERVER_CAPACITY_EXCEEDED') {
+                            sendJsonRpcError(res, -32003, message, null, 503);
+                        }
+                        else if (message === 'SERVER_QUEUE_FULL') {
                             sendJsonRpcError(res, -32002, message, null, 503);
                         }
                         else {
@@ -491,7 +505,7 @@ logDisclaimers();
     ipcServer.listen(IPC_CONFIG.port, IPC_CONFIG.host, onListening);
     // Primary idle auto-exit: exit when no activity and no active IPC sessions
     const primaryIdleCheckTimer = setInterval(() => {
-        const activeSessionCount = Object.keys(ipcTransports).length;
+        const activeSessionCount = getActiveSessionCount();
         if (Date.now() - primaryLastActivityAt > ipcGuardConfig.primaryIdleMs &&
             activeSessionCount === 0) {
             logger(`[main] Primary idle for ${Math.round((Date.now() - primaryLastActivityAt) / 1000)}s with 0 active sessions. Auto-exiting.`);
@@ -540,9 +554,32 @@ async function shutdown(reason) {
     clearTimeout(forceExitTimer);
     process.exit(0);
 }
+function maybeShutdownAfterStdinClose(trigger) {
+    if (!stdinClosed || isShuttingDown) {
+        return;
+    }
+    const activeSessionCount = getActiveIpcSessionCount();
+    if (activeSessionCount > 0) {
+        return;
+    }
+    logger(`[main] ${trigger}: stdin already closed and all IPC sessions drained. Shutting down.`);
+    void shutdown('stdin closed (all IPC sessions drained)');
+}
+function handleStdinClosed(reason) {
+    stdinClosed = true;
+    if (isShuttingDown) {
+        return;
+    }
+    const activeSessionCount = getActiveIpcSessionCount();
+    if (activeSessionCount > 0) {
+        logger(`[main] ${reason}: deferring shutdown while ${activeSessionCount} IPC session(s) remain.`);
+        return;
+    }
+    void shutdown(reason);
+}
 // stdin close = Claude Code disconnected (most reliable on Windows too)
-process.stdin.on('end', () => shutdown('stdin ended'));
-process.stdin.on('close', () => shutdown('stdin closed'));
+process.stdin.on('end', () => handleStdinClosed('stdin ended'));
+process.stdin.on('close', () => handleStdinClosed('stdin closed'));
 // Signal handlers
 process.on('SIGTERM', () => shutdown('SIGTERM'));
 process.on('SIGINT', () => shutdown('SIGINT'));

package/package.json

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

package/scripts/cli.mjs

@@ -2,24 +2,49 @@
 /**
  * CLI Entry Point for chrome-ai-bridge
  *
- * This entrypoint runs the MCP server in-process to avoid spawning an extra
- * wrapper process per client (important for multi-pane usage).
+ * Launches the MCP server with browser-globals mock in a child process.
+ *
+ * Why child process:
+ * - main.js may intentionally enter a never-returning proxy path.
+ * - awaiting dynamic import(main.js) in-process can trigger unsettled
+ *   top-level-await warnings and startup failure in that path.
  */
 
 import path from 'node:path';
 import process from 'node:process';
-import {fileURLToPath, pathToFileURL} from 'node:url';
+import {spawn} from 'node:child_process';
+import {fileURLToPath} from 'node:url';
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const mockPath = path.join(__dirname, 'browser-globals-mock.mjs');
 const mainPath = path.join(__dirname, '..', 'build', 'src', 'main.js');
 
-try {
-  // Ensure browser globals are defined before loading main server modules.
-  await import(pathToFileURL(mockPath).href);
-  await import(pathToFileURL(mainPath).href);
-} catch (error) {
-  const message = error instanceof Error ? error.stack || error.message : String(error);
-  console.error(`[cli] Failed to start chrome-ai-bridge: ${message}`);
-  process.exit(1);
-}
+const child = spawn(
+  process.execPath,
+  [
+    '--import',
+    mockPath,
+    mainPath,
+    ...process.argv.slice(2),
+  ],
+  {
+    stdio: 'inherit',
+    env: process.env,
+  },
+);
+
+child.on('exit', (code, signal) => {
+  if (signal) {
+    process.exit(1);
+  }
+  process.exit(code ?? 0);
+});
+
+process.on('exit', () => {
+  if (!child.killed) {
+    child.kill('SIGTERM');
+  }
+});
+
+process.on('SIGTERM', () => child?.kill('SIGTERM'));
+process.on('SIGINT', () => child?.kill('SIGINT'));