chrome-ai-bridge 2.4.0 → 2.5.1

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

@@ -2,7 +2,7 @@ import fs from 'node:fs/promises';
 import path from 'node:path';
 import { connectViaExtensionRaw } from './extension-raw.js';
 import { CdpClient } from './cdp-client.js';
-import { logConnectionState, logInfo, logError, logWarn } from './mcp-logger.js';
+import { logConnectionState, logInfo, logError, logWarn } from './debug-logger.js';
 import { DOM_UTILS_CODE } from './utils/index.js';
 import { getDriver } from './drivers/index.js';
 import { NetworkInterceptor } from './network-interceptor.js';
@@ -49,18 +49,29 @@ function setClientForAgent(kind, client, relay) {
         conn.geminiRelay = relay;
     }
 }
-const CONNECT_REUSE_TIMEOUT_MS = Number(process.env.MCP_CONNECT_REUSE_TIMEOUT_MS || '12000');
-const CONNECT_NEWTAB_TIMEOUT_MS = Number(process.env.MCP_CONNECT_NEWTAB_TIMEOUT_MS || '20000');
-const MCP_TOOL_BUDGET_MS = Number(process.env.CAI_MCP_TOOL_BUDGET_MS || '50000');
+// Env var deprecation helpers
+function envWithFallback(newName, oldName, defaultVal) {
+    if (process.env[newName])
+        return process.env[newName];
+    if (process.env[oldName]) {
+        console.error(`[deprecation] ${oldName} is deprecated, use ${newName} instead`);
+        return process.env[oldName];
+    }
+    return defaultVal;
+}
+const CONNECT_REUSE_TIMEOUT_MS = Number(envWithFallback('CAI_CONNECT_REUSE_TIMEOUT_MS', 'MCP_CONNECT_REUSE_TIMEOUT_MS', '12000'));
+const CONNECT_NEWTAB_TIMEOUT_MS = Number(envWithFallback('CAI_CONNECT_NEWTAB_TIMEOUT_MS', 'MCP_CONNECT_NEWTAB_TIMEOUT_MS', '20000'));
+const TOOL_BUDGET_MS = Number(envWithFallback('CAI_TOOL_BUDGET_MS', 'CAI_MCP_TOOL_BUDGET_MS', '50000'));
 const RESPONSE_WAIT_MAX_MS = Number(process.env.CAI_RESPONSE_WAIT_MAX_MS || '40000');
-const BUDGET_RESERVE_MS = Number(process.env.CAI_MCP_BUDGET_RESERVE_MS || '3000');
-function getRemainingBudgetMs(startMs) {
-    return MCP_TOOL_BUDGET_MS - (nowMs() - startMs) - BUDGET_RESERVE_MS;
+const BUDGET_RESERVE_MS = Number(envWithFallback('CAI_BUDGET_RESERVE_MS', 'CAI_MCP_BUDGET_RESERVE_MS', '3000'));
+function getRemainingBudgetMs(startMs, overrideBudgetMs) {
+    return (overrideBudgetMs ?? TOOL_BUDGET_MS) - (nowMs() - startMs) - BUDGET_RESERVE_MS;
 }
-function getResponseWaitBudgetMs(startMs, ceilingMs, stage) {
-    const remaining = getRemainingBudgetMs(startMs);
+function getResponseWaitBudgetMs(startMs, ceilingMs, stage, overrideBudgetMs) {
+    const effectiveBudget = overrideBudgetMs ?? TOOL_BUDGET_MS;
+    const remaining = getRemainingBudgetMs(startMs, overrideBudgetMs);
     if (remaining <= 1000) {
-        throw new Error(`MCP_TOOL_BUDGET_EXCEEDED: stage=${stage} budgetMs=${MCP_TOOL_BUDGET_MS} reserveMs=${BUDGET_RESERVE_MS}`);
+        throw new Error(`TOOL_BUDGET_EXCEEDED: stage=${stage} budgetMs=${effectiveBudget} reserveMs=${BUDGET_RESERVE_MS}`);
     }
     return Math.max(1000, Math.min(ceilingMs, remaining));
 }
@@ -72,6 +83,14 @@ function nowMs() {
  * 軽量なevaluateコマンドで接続が生きているかチェック
  */
 async function isConnectionHealthy(client, kind) {
+    // Fast-path: if relay is already disconnected, skip the expensive evaluate call
+    if (kind) {
+        const relay = getRelayFromAgent(kind);
+        if (relay && !relay.isReady()) {
+            logConnectionState(kind, 'unhealthy', { elapsed: 0, error: 'relay not ready (fast-path)' });
+            return false;
+        }
+    }
     const startTime = Date.now();
     try {
         // 4秒タイムアウトで簡単なコマンドを実行（2秒では不十分な場合があった）
@@ -228,7 +247,7 @@ export async function resetConnection(kind) {
 }
 /**
  * 全接続をクリーンアップ（プロセス終了時用）
- * MCPサーバー終了時にゾンビプロセスを防ぐために使用
+ * サーバー終了時にゾンビプロセスを防ぐために使用
  */
 export async function cleanupAllConnections() {
     // Snapshot entries before clearing to avoid mutation during iteration
@@ -505,7 +524,17 @@ async function navigate(client, url) {
     await client.send('Page.navigate', { url });
     await client.waitForFunction(`document.readyState === 'complete'`, 30000);
 }
-async function askChatGPTFastInternal(question, debug) {
+/** Strip conversation-specific paths (/c/<id>, /app/<id>) to prevent chat pollution on reuse */
+function getBaseUrl(kind, url) {
+    if (kind === 'chatgpt') {
+        return url.replace(/\/c\/[a-zA-Z0-9_-]+.*$/, '/');
+    }
+    if (kind === 'gemini') {
+        return url.replace(/\/app\/[a-zA-Z0-9_-]+.*$/, '/');
+    }
+    return url;
+}
+async function askChatGPTFastInternal(question, debug, budgetMs) {
     const t0 = nowMs();
     const timings = {};
     logInfo('chatgpt', 'askChatGPTFast started', { questionLength: question.length });
@@ -523,16 +552,14 @@ async function askChatGPTFastInternal(question, debug) {
     // SPA描画安定化のため追加待機
     await new Promise(r => setTimeout(r, 500));
     console.error('[ChatGPT] Waited 500ms for SPA rendering');
-    // 既存チャット（/c/を含むURL）の場合、メッセージが描画されるまで待機
+    // 既存チャット（/c/を含むURL）の場合、新規チャットへ遷移
+    // 同じ会話に質問を投入すると前回のコンテキストが応答に影響するため
     const currentUrl = await client.evaluate('location.href');
     if (currentUrl.includes('/c/')) {
-        try {
-            await client.waitForFunction(`document.querySelectorAll('[data-message-author-role="assistant"]').length > 0`, 5000);
-            console.error('[ChatGPT] Existing chat messages loaded');
-        }
-        catch {
-            console.error('[ChatGPT] No existing messages found, continuing as new chat');
-        }
+        console.error('[ChatGPT] Existing conversation detected, navigating to new chat...');
+        await navigate(client, 'https://chatgpt.com/');
+        await new Promise(r => setTimeout(r, 500));
+        console.error('[ChatGPT] New chat page loaded');
     }
     // 入力欄が表示されるまで待機してから取得
     const tWaitInput = nowMs();
@@ -1008,12 +1035,14 @@ async function askChatGPTFastInternal(question, debug) {
     const tWaitResp = nowMs();
     console.error('[ChatGPT] Waiting for response (using stop button detection)...');
     // 60秒 caller deadline を超えないよう、残り予算内で待機する。
-    const maxWaitMs = getResponseWaitBudgetMs(t0, RESPONSE_WAIT_MAX_MS, 'chatgpt-response');
+    const maxWaitMs = getResponseWaitBudgetMs(t0, RESPONSE_WAIT_MAX_MS, 'chatgpt-response', budgetMs);
     const pollIntervalMs = 1000;
     const startWait = Date.now();
     let lastLoggedState = '';
     let sawStopButton = false; // 生成中状態を検出したかどうか
     let streamingText = ''; // ストリーミング中に取得したテキスト（完了後に折りたたまれる対策）
+    let textStableCount = 0; // テキスト長が安定した回数（2-poll confirmation）
+    let lastTextLength = -1; // 前回のテキスト長
     while (Date.now() - startWait < maxWaitMs) {
         const state = await client.evaluate(`
         (() => {
@@ -1288,46 +1317,65 @@ async function askChatGPTFastInternal(question, debug) {
         // 2. AND 入力欄が空
         // 3. AND 新しいアシスタントメッセージが増えた
         // 注: hasResponseText は CDP でテキスト取得できない場合があるため必須条件から外す
+        // テキスト安定性チェック（全完了条件で共通使用）
+        const currentTextLen = state.debug_lastAssistantInnerTextLen;
+        if (currentTextLen === lastTextLength && currentTextLen > 0) {
+            textStableCount++;
+        }
+        else {
+            textStableCount = 0;
+            lastTextLength = currentTextLen;
+        }
         if (sawStopButton && !state.hasStopButton && !state.inputBoxHasText &&
             state.assistantMsgCount > initialAssistantCount) {
-            console.error(`[ChatGPT] Response complete - stop button disappeared, input empty, assistant count increased (${initialAssistantCount} -> ${state.assistantMsgCount})`);
-            // ChatGPT 5.2 Thinking: 完了直後にストリーミング中のテキストをキャプチャ
-            // （完了後は折りたたまれてしまうため、この時点で取得）
-            streamingText = await client.evaluate(`
-          (() => {
-            const msgs = document.querySelectorAll('[data-message-author-role="assistant"]');
-            if (msgs.length === 0) return '';
-            const last = msgs[msgs.length - 1];
-            // .markdown, .result-thinking, または直接テキストを試す
-            const md = last.querySelector('.markdown');
-            if (md) {
-              const t = (md.innerText || md.textContent || '').trim();
-              if (t.length > 0) return t;
-            }
-            const rt = last.querySelector('.result-thinking');
-            if (rt) {
-              const t = (rt.innerText || rt.textContent || '').trim();
-              if (t.length > 0) return t;
+            // 2-poll confirmation: テキスト長が2回連続安定してから完了とする
+            if (textStableCount >= 2) {
+                console.error(`[ChatGPT] Response complete - stop gone, text stable for ${textStableCount} polls (len=${currentTextLen})`);
+                streamingText = await client.evaluate(`
+            (() => {
+              const msgs = document.querySelectorAll('[data-message-author-role="assistant"]');
+              if (msgs.length === 0) return '';
+              const last = msgs[msgs.length - 1];
+              const md = last.querySelector('.markdown');
+              if (md) {
+                const t = (md.innerText || md.textContent || '').trim();
+                if (t.length > 0) return t;
+              }
+              const rt = last.querySelector('.result-thinking');
+              if (rt) {
+                const t = (rt.innerText || rt.textContent || '').trim();
+                if (t.length > 0) return t;
+              }
+              return (last.innerText || last.textContent || '').trim();
+            })()
+          `);
+                break;
             }
-            return (last.innerText || last.textContent || '').trim();
-          })()
-        `);
-            break;
+            // まだ安定していない — 次のポールまで待機
+            console.error(`[ChatGPT] Stop button gone but text not stable yet (len=${currentTextLen}, stableCount=${textStableCount})`);
+            await new Promise(r => setTimeout(r, pollIntervalMs));
+            continue;
         }
         // フォールバック: 5秒以上待って、stopボタンなし、入力欄空、新しいアシスタントメッセージが増えた
         // （stopボタンを見逃した場合の救済）
         const elapsed = Date.now() - startWait;
         if (elapsed > 5000 && !state.hasStopButton && !state.inputBoxHasText &&
             state.assistantMsgCount > initialAssistantCount && !state.isStillGenerating) {
-            console.error(`[ChatGPT] Response complete - fallback after 5s (no stop button, input empty, assistant count increased ${initialAssistantCount} -> ${state.assistantMsgCount})`);
-            break;
+            if (textStableCount >= 2) {
+                console.error(`[ChatGPT] Response complete - fallback after 5s, text stable (len=${currentTextLen}, stableCount=${textStableCount})`);
+                break;
+            }
+            console.error(`[ChatGPT] Fallback conditions met but text not stable yet (len=${currentTextLen}, stableCount=${textStableCount})`);
         }
         // Thinkingモード専用フォールバック: stopボタンなしでも、生成完了していれば完了
         // 重要: 「今すぐ回答」ボタンがある間は、まだThinking中なので待機を継続
         if (elapsed > 10000 && !state.isStillGenerating && !state.hasSkipThinkingButton &&
             state.assistantMsgCount > initialAssistantCount && !state.inputBoxHasText) {
-            console.error(`[ChatGPT] Response complete - Thinking mode fallback after 10s (generating complete, no skip button)`);
-            break;
+            if (textStableCount >= 2) {
+                console.error(`[ChatGPT] Response complete - Thinking mode fallback after 10s, text stable (len=${currentTextLen}, stableCount=${textStableCount})`);
+                break;
+            }
+            console.error(`[ChatGPT] Thinking fallback conditions met but text not stable yet (len=${currentTextLen}, stableCount=${textStableCount})`);
         }
         await new Promise(r => setTimeout(r, pollIntervalMs));
     }
@@ -1401,7 +1449,7 @@ async function askChatGPTFastInternal(question, debug) {
     // 回答完了後、DOM安定化のための追加待機
     // ChatGPT Thinkingモードでは、停止ボタン消失後も最終回答がレンダリングされるまで遅延がある
     // 回答テキストが存在するまでポーリングで待機
-    const maxWaitForText = getResponseWaitBudgetMs(t0, 15000, 'chatgpt-finalize');
+    const maxWaitForText = getResponseWaitBudgetMs(t0, 15000, 'chatgpt-finalize', budgetMs);
     const pollInterval = 200;
     const waitStart = Date.now();
     let hasResponseText = false;
@@ -1941,7 +1989,7 @@ async function askChatGPTFastInternal(question, debug) {
     console.error(`[ChatGPT] Response extracted: ${finalAnswer.slice(0, 100)}...`);
     const finalUrl = await client.evaluate('location.href');
     if (finalUrl && finalUrl.includes('chatgpt.com')) {
-        await saveAgentSession('chatgpt', finalUrl);
+        await saveAgentSession('chatgpt', getBaseUrl('chatgpt', finalUrl));
     }
     timings.waitResponseMs = nowMs() - tWaitResp;
     timings.totalMs = nowMs() - t0;
@@ -2053,7 +2101,7 @@ async function askChatGPTFastInternal(question, debug) {
  * Driver経由でChatGPTに質問（実験的）
  * 環境変数 CAI_USE_DRIVERS=1 で有効化
  */
-async function askChatGPTViaDriver(question, debug) {
+async function askChatGPTViaDriver(question, debug, budgetMs) {
     const t0 = nowMs();
     const timings = {};
     // 接続
@@ -2082,7 +2130,7 @@ async function askChatGPTViaDriver(question, debug) {
     timings.sendMs = nowMs() - tSend;
     // 応答待機
     const tWaitResp = nowMs();
-    const driverWaitBudgetMs = getResponseWaitBudgetMs(t0, RESPONSE_WAIT_MAX_MS, 'chatgpt-driver-response');
+    const driverWaitBudgetMs = getResponseWaitBudgetMs(t0, RESPONSE_WAIT_MAX_MS, 'chatgpt-driver-response', budgetMs);
     await driver.waitForResponse({ maxWaitMs: driverWaitBudgetMs });
     timings.waitResponseMs = nowMs() - tWaitResp;
     // 応答抽出
@@ -2096,7 +2144,7 @@ async function askChatGPTViaDriver(question, debug) {
     // セッション保存
     const finalUrl = await driver.getCurrentUrl();
     if (finalUrl.includes('chatgpt.com')) {
-        await saveAgentSession('chatgpt', finalUrl);
+        await saveAgentSession('chatgpt', getBaseUrl('chatgpt', finalUrl));
     }
     timings.totalMs = nowMs() - t0;
     // 履歴保存
@@ -2120,7 +2168,7 @@ async function askChatGPTViaDriver(question, debug) {
 /**
  * Driver経由でGeminiに質問（実験的）
  */
-async function askGeminiViaDriver(question, debug) {
+async function askGeminiViaDriver(question, debug, budgetMs) {
     const t0 = nowMs();
     const timings = {};
     // 接続
@@ -2150,7 +2198,7 @@ async function askGeminiViaDriver(question, debug) {
     timings.sendMs = nowMs() - tSend;
     // 応答待機
     const tWaitResp = nowMs();
-    const driverWaitBudgetMs = getResponseWaitBudgetMs(t0, RESPONSE_WAIT_MAX_MS, 'gemini-driver-response');
+    const driverWaitBudgetMs = getResponseWaitBudgetMs(t0, RESPONSE_WAIT_MAX_MS, 'gemini-driver-response', budgetMs);
     await driver.waitForResponse({ maxWaitMs: driverWaitBudgetMs });
     timings.waitResponseMs = nowMs() - tWaitResp;
     // 応答抽出
@@ -2164,7 +2212,7 @@ async function askGeminiViaDriver(question, debug) {
     // セッション保存
     const finalUrl = await driver.getCurrentUrl();
     if (finalUrl.includes('gemini.google.com')) {
-        await saveAgentSession('gemini', finalUrl);
+        await saveAgentSession('gemini', getBaseUrl('gemini', finalUrl));
     }
     timings.totalMs = nowMs() - t0;
     // 履歴保存
@@ -2190,24 +2238,24 @@ const USE_DRIVERS = process.env.CAI_USE_DRIVERS === '1';
 /**
  * ChatGPTに質問して回答を取得（後方互換用）
  */
-export async function askChatGPTFast(question, debug) {
+export async function askChatGPTFast(question, debug, budgetMs) {
     if (USE_DRIVERS) {
-        const result = await askChatGPTViaDriver(question, debug);
+        const result = await askChatGPTViaDriver(question, debug, budgetMs);
         return result.answer;
     }
-    const result = await askChatGPTFastInternal(question, debug);
+    const result = await askChatGPTFastInternal(question, debug, budgetMs);
     return result.answer;
 }
 /**
  * ChatGPTに質問して回答とタイミング情報を取得
  */
-export async function askChatGPTFastWithTimings(question, debug) {
+export async function askChatGPTFastWithTimings(question, debug, budgetMs) {
     if (USE_DRIVERS) {
-        return askChatGPTViaDriver(question, debug);
+        return askChatGPTViaDriver(question, debug, budgetMs);
     }
-    return askChatGPTFastInternal(question, debug);
+    return askChatGPTFastInternal(question, debug, budgetMs);
 }
-async function askGeminiFastInternal(question, debug) {
+async function askGeminiFastInternal(question, debug, budgetMs) {
     const t0 = nowMs();
     const timings = {};
     const client = await getClient('gemini');
@@ -2234,31 +2282,15 @@ async function askGeminiFastInternal(question, debug) {
     // SPA描画安定化のため追加待機
     await new Promise(r => setTimeout(r, 500));
     console.error('[Gemini] Waited 500ms for SPA rendering');
-    // 既存チャット（URLにチャットIDが含まれる）の場合、メッセージが描画されるまで待機
+    // 既存チャット（URLにチャットIDが含まれる）の場合、新規チャットへ遷移
+    // 同じ会話に質問を投入すると前回のコンテキストが応答に影響するため
     const geminiCurrentUrl = await client.evaluate('location.href');
-    // 既存チャットのURLパターン: /app/xxxxx (チャットID)
     const isExistingGeminiChat = /\/app\/[a-zA-Z0-9]+/.test(geminiCurrentUrl);
     if (isExistingGeminiChat) {
-        try {
-            await client.waitForFunction(`document.querySelectorAll('model-response, .model-response').length > 0`, 5000);
-            console.error('[Gemini] Existing chat messages loaded');
-            // 既存チャットの状態をチェック（停止ボタンがスタックしていないか）
-            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.`);
-                // 協調クリーンアップ（RelayServer + Client + Session を一括リセット）
-                await resetConnection('gemini');
-                // エラーを投げて、呼び出し元でリトライを促す
-                throw new Error('GEMINI_STUCK_EXISTING_CHAT: Previous chat appears stuck (stop button visible). Session cleared, please retry.');
-            }
-        }
-        catch (error) {
-            // GEMINI_STUCK_* エラーは再スロー（リトライ用）
-            if (error instanceof Error && error.message.includes('GEMINI_STUCK_')) {
-                throw error;
-            }
-            console.error('[Gemini] No existing messages found, continuing as new chat');
-        }
+        console.error('[Gemini] Existing conversation detected, navigating to new chat...');
+        await navigate(client, 'https://gemini.google.com/');
+        await new Promise(r => setTimeout(r, 500));
+        console.error('[Gemini] New chat page loaded');
     }
     const tWaitInput = nowMs();
     await client.waitForFunction(`!!document.querySelector('[role="textbox"], div[contenteditable="true"], textarea') || !!document.querySelector('a[href*="accounts.google.com"]')`, 15000);
@@ -2680,7 +2712,7 @@ async function askGeminiFastInternal(question, debug) {
     const tWaitResp = nowMs();
     console.error('[Gemini] Waiting for response completion (polling with diagnostics)...');
     // ChatGPT側と同様のポーリングループで応答完了を検出
-    const maxWaitMs = getResponseWaitBudgetMs(t0, RESPONSE_WAIT_MAX_MS, 'gemini-response');
+    const maxWaitMs = getResponseWaitBudgetMs(t0, RESPONSE_WAIT_MAX_MS, 'gemini-response', budgetMs);
     const pollIntervalMs = 1000;
     const startWait = Date.now();
     let lastLoggedState = '';
@@ -2953,7 +2985,7 @@ async function askGeminiFastInternal(question, debug) {
     console.error(`[Gemini] Response extracted: ${normalized.slice(0, 100)}...`);
     const finalUrl = await client.evaluate('location.href');
     if (finalUrl && finalUrl.includes('gemini.google.com')) {
-        await saveAgentSession('gemini', finalUrl);
+        await saveAgentSession('gemini', getBaseUrl('gemini', finalUrl));
     }
     timings.waitResponseMs = nowMs() - tWaitResp;
     timings.totalMs = nowMs() - t0;
@@ -3054,22 +3086,22 @@ async function askGeminiFastInternal(question, debug) {
 /**
  * Geminiに質問して回答を取得（後方互換用）
  */
-export async function askGeminiFast(question, debug) {
+export async function askGeminiFast(question, debug, budgetMs) {
     if (USE_DRIVERS) {
-        const result = await askGeminiViaDriver(question, debug);
+        const result = await askGeminiViaDriver(question, debug, budgetMs);
         return result.answer;
     }
-    const result = await askGeminiFastInternal(question, debug);
+    const result = await askGeminiFastInternal(question, debug, budgetMs);
     return result.answer;
 }
 /**
  * Geminiに質問して回答とタイミング情報を取得
  */
-export async function askGeminiFastWithTimings(question, debug) {
+export async function askGeminiFastWithTimings(question, debug, budgetMs) {
     if (USE_DRIVERS) {
-        return askGeminiViaDriver(question, debug);
+        return askGeminiViaDriver(question, debug, budgetMs);
     }
-    return askGeminiFastInternal(question, debug);
+    return askGeminiFastInternal(question, debug, budgetMs);
 }
 export async function takeCdpSnapshot(kind, options) {
     const result = {

package/build/src/logger.js

@@ -5,9 +5,9 @@
  */
 import fs from 'node:fs';
 import debug from 'debug';
-const mcpDebugNamespace = 'mcp:log';
+const cabDebugNamespace = 'cab:log';
 const namespacesToEnable = [
-    mcpDebugNamespace,
+    cabDebugNamespace,
     ...(process.env['DEBUG'] ? [process.env['DEBUG']] : []),
 ];
 export function saveLogsToFile(fileName) {
@@ -24,4 +24,4 @@ export function saveLogsToFile(fileName) {
     });
     return logFile;
 }
-export const logger = debug(mcpDebugNamespace);
+export const logger = debug(cabDebugNamespace);