chrome-ai-bridge 1.0.2 → 1.0.4

package/build/src/tools/chatgpt-web.js

@@ -238,19 +238,47 @@ export const askChatGPTWeb = defineTool({
         // Get or create a dedicated ChatGPT tab
         const { page, needsNavigation } = await getOrCreateChatGPTPage(context);
         try {
-            // Step 1: Navigate to ChatGPT (only if not already there)
+            // Step 1: Determine target URL (existing session or top page)
             response.appendResponseLine('ChatGPTに接続中...');
-            if (needsNavigation) {
-                await navigateWithRetry(page, CHATGPT_CONFIG.DEFAULT_URL, {
+            let isNewChat = false;
+            let sessionChatId;
+            let targetUrl = CHATGPT_CONFIG.DEFAULT_URL;
+            if (!createNewChat) {
+                // Check for existing session first
+                const sessions = await loadChatSessions();
+                const projectSessions = sessions[project] || [];
+                if (projectSessions.length > 0) {
+                    // Get the most recently used session
+                    const sortedSessions = [...projectSessions].sort((a, b) => new Date(b.lastUsed).getTime() - new Date(a.lastUsed).getTime());
+                    const latestSession = sortedSessions[0];
+                    sessionChatId = latestSession.chatId;
+                    targetUrl = latestSession.url;
+                    response.appendResponseLine(`既存のプロジェクトチャットを使用: ${latestSession.url}`);
+                }
+                else {
+                    response.appendResponseLine('既存チャットが見つかりませんでした。新規作成します。');
+                    isNewChat = true;
+                }
+            }
+            else {
+                isNewChat = true;
+            }
+            // Step 2: Navigate to target URL (skip if already there)
+            const currentUrl = page.url();
+            const isAlreadyOnTarget = sessionChatId
+                ? currentUrl.includes(sessionChatId)
+                : currentUrl.includes('chatgpt.com') && !needsNavigation;
+            if (!isAlreadyOnTarget) {
+                await navigateWithRetry(page, targetUrl, {
                     waitUntil: 'networkidle2',
                 });
-                // Wait for page to fully render (ChatGPT takes time to load UI)
+                // Wait for page to fully render
                 await new Promise(resolve => setTimeout(resolve, 2000));
             }
             else {
                 response.appendResponseLine('✅ 既存のChatGPTタブを再利用');
             }
-            // Step 2: Check login status using session probe (most reliable)
+            // Step 3: Check login status
             const loginStatus = await getLoginStatus(page, 'chatgpt');
             if (loginStatus === LoginStatus.NEEDS_LOGIN) {
                 response.appendResponseLine('\n❌ ChatGPTへのログインが必要です');
@@ -287,54 +315,27 @@ export const askChatGPTWeb = defineTool({
                 }
             }
             response.appendResponseLine('✅ ログイン確認完了');
-            // Step 2: Load existing session or create new chat
-            let isNewChat = false;
-            let sessionChatId;
-            if (!createNewChat) {
-                // Try to load existing session for this project
-                const sessions = await loadChatSessions();
-                const projectSessions = sessions[project] || [];
-                if (projectSessions.length > 0) {
-                    // Get the most recently used session
-                    const sortedSessions = [...projectSessions].sort((a, b) => new Date(b.lastUsed).getTime() - new Date(a.lastUsed).getTime());
-                    const latestSession = sortedSessions[0];
-                    response.appendResponseLine(`既存のプロジェクトチャットを使用: ${latestSession.url}`);
-                    sessionChatId = latestSession.chatId;
-                    // Skip navigation if already on the same chat
-                    const currentUrl = page.url();
-                    if (!currentUrl.includes(latestSession.chatId)) {
-                        await navigateWithRetry(page, latestSession.url, {
-                            waitUntil: 'networkidle2', // Wait for JS to finish loading
-                        });
+            // Step 4: Wait for input field (for existing sessions)
+            if (sessionChatId) {
+                let inputFieldReady = false;
+                for (let attempt = 0; attempt < 3; attempt++) {
+                    try {
+                        await page.waitForSelector('.ProseMirror[contenteditable="true"]', { timeout: 5000 });
+                        inputFieldReady = true;
+                        break;
                     }
-                    // Wait for input field to be ready with retry
-                    let inputFieldReady = false;
-                    for (let attempt = 0; attempt < 3; attempt++) {
-                        try {
-                            await page.waitForSelector('.ProseMirror[contenteditable="true"]', { timeout: 5000 });
-                            inputFieldReady = true;
-                            break;
-                        }
-                        catch {
-                            if (attempt < 2) {
-                                response.appendResponseLine(`⏳ 入力欄を待機中... (${attempt + 1}/3)`);
-                                await new Promise(r => setTimeout(r, 2000));
-                            }
+                    catch {
+                        if (attempt < 2) {
+                            response.appendResponseLine(`⏳ 入力欄を待機中... (${attempt + 1}/3)`);
+                            await new Promise(r => setTimeout(r, 2000));
                         }
                     }
-                    if (!inputFieldReady) {
-                        response.appendResponseLine('⚠️ 入力欄の準備に時間がかかっています。続行を試みます...');
-                    }
                 }
-                else {
-                    response.appendResponseLine('既存チャットが見つかりませんでした。新規作成します。');
-                    isNewChat = true;
+                if (!inputFieldReady) {
+                    response.appendResponseLine('⚠️ 入力欄の準備に時間がかかっています。続行を試みます...');
                 }
             }
-            else {
-                isNewChat = true;
-            }
-            // Step 3: Create new chat if needed
+            // Step 5: Create new chat if needed
             if (isNewChat) {
                 response.appendResponseLine('新規チャットを作成中...');
                 // Click "新しいチャット"
@@ -363,6 +364,18 @@ export const askChatGPTWeb = defineTool({
                     await new Promise(resolve => setTimeout(resolve, 200));
                 }
             }
+            // Capture initial message counts BEFORE sending
+            // This is critical to detect if our message was actually sent
+            const initialCounts = await page.evaluate(() => {
+                const userMessages = document.querySelectorAll('[data-message-author-role="user"]');
+                const assistantMessages = document.querySelectorAll('[data-message-author-role="assistant"]');
+                return {
+                    userCount: userMessages.length,
+                    assistantCount: assistantMessages.length,
+                };
+            });
+            const initialUserMsgCount = initialCounts.userCount;
+            const initialAssistantMsgCount = initialCounts.assistantCount;
             // Step 4: Send question with retry
             response.appendResponseLine('質問を送信中...');
             let questionSent = false;
@@ -403,11 +416,12 @@ export const askChatGPTWeb = defineTool({
                 response.appendResponseLine('❌ 送信ボタンが見つかりません');
                 return;
             }
-            // Wait for message to actually be sent (user message appears in DOM)
-            await page.waitForFunction(() => {
+            // Wait for message to actually be sent (user message count INCREASED)
+            // This ensures we detect our NEW message, not existing ones
+            await page.waitForFunction(initialCount => {
                 const messages = document.querySelectorAll('[data-message-author-role="user"]');
-                return messages.length > 0;
-            }, { timeout: 10000 });
+                return messages.length > initialCount;
+            }, { timeout: 10000 }, initialUserMsgCount);
             response.appendResponseLine('✅ 質問送信完了');
             // Step 5: Monitor streaming with progress updates
             response.appendResponseLine('ChatGPTの回答を待機中... (10秒ごとに進捗を表示)');
@@ -420,39 +434,45 @@ export const askChatGPTWeb = defineTool({
                     await new Promise(resolve => setTimeout(resolve, 500));
                 }
                 isFirstCheck = false;
-                const status = await page.evaluate(() => {
+                const status = await page.evaluate(initialAssistantCount => {
                     // Streaming detection - check for stop button by data-testid
                     // When ChatGPT is generating, send-button becomes stop-button
                     const stopButton = document.querySelector('button[data-testid="stop-button"]');
                     const isStreaming = !!stopButton;
                     if (!isStreaming) {
-                        // Get final response
+                        // Get final response - only look at NEW messages
                         const assistantMessages = document.querySelectorAll('[data-message-author-role="assistant"]');
-                        if (assistantMessages.length === 0)
+                        // Check if we have a NEW assistant message (not old ones)
+                        if (assistantMessages.length <= initialAssistantCount) {
                             return { completed: false };
-                        const latestMessage = assistantMessages[assistantMessages.length - 1];
-                        const thinkingButton = latestMessage.querySelector('button[aria-label*="思考時間"]');
+                        }
+                        // Get the NEW message (first one after initial count)
+                        const newMessage = assistantMessages[initialAssistantCount];
+                        const thinkingButton = newMessage.querySelector('button[aria-label*="思考時間"]');
                         const thinkingTime = thinkingButton
                             ? parseInt((thinkingButton.textContent || '').match(/\d+/)?.[0] || '0')
                             : undefined;
                         return {
                             completed: true,
-                            text: latestMessage.textContent || '',
+                            text: newMessage.textContent || '',
                             thinkingTime,
                         };
                     }
-                    // Get current text
+                    // Get current text from NEW message during streaming
                     const assistantMessages = document.querySelectorAll('[data-message-author-role="assistant"]');
-                    const latestMessage = assistantMessages[assistantMessages.length - 1];
-                    const currentText = latestMessage
-                        ? latestMessage.textContent?.substring(0, 200)
+                    // Only check new messages
+                    const newMessage = assistantMessages.length > initialAssistantCount
+                        ? assistantMessages[initialAssistantCount]
+                        : null;
+                    const currentText = newMessage
+                        ? newMessage.textContent?.substring(0, 200)
                         : '';
                     return {
                         completed: false,
                         streaming: true,
                         currentText,
                     };
-                });
+                }, initialAssistantMsgCount);
                 if (status.completed) {
                     response.appendResponseLine(`\n✅ 回答完了 (所要時間: ${Math.floor((Date.now() - startTime) / 1000)}秒)`);
                     if (status.thinkingTime) {
@@ -530,8 +550,26 @@ export const askChatGPTWeb = defineTool({
             }
         }
         catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            response.appendResponseLine(`❌ エラー: ${errorMessage}`);
+            const msg = error instanceof Error ? error.message : String(error);
+            // ケース分類：致命的エラーには明確なメッセージを表示
+            if (msg.includes('No page selected') || msg.includes('page is null')) {
+                response.appendResponseLine('❌ ブラウザタブがありません');
+                response.appendResponseLine('→ MCPサーバーを再起動してブラウザを開いてください');
+            }
+            else if (msg.includes('Target closed') ||
+                msg.includes('Session closed') ||
+                msg.includes('Connection closed')) {
+                response.appendResponseLine('❌ ブラウザ接続が切れました');
+                response.appendResponseLine('→ MCPサーバーを再起動してください');
+            }
+            else if (msg.includes('Protocol error') ||
+                msg.includes('Browser disconnected')) {
+                response.appendResponseLine('❌ ブラウザとの通信エラー');
+                response.appendResponseLine('→ MCPサーバーを再起動してください');
+            }
+            else {
+                response.appendResponseLine(`❌ エラー: ${msg}`);
+            }
         }
     },
 });

package/build/src/tools/gemini-web.js

@@ -468,23 +468,50 @@ export const askGeminiWeb = defineTool({
             response.appendResponseLine(`📝 会話ログ保存: ${logPath}`);
         }
         catch (error) {
-            const errorMessage = error instanceof Error ? error.message : String(error);
-            response.appendResponseLine(`❌ エラー: ${errorMessage}`);
-            // Error snapshot
-            try {
-                const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
-                const debugDir = path.join(process.cwd(), 'docs/ask/gemini/debug');
-                await fs.promises.mkdir(debugDir, { recursive: true });
-                const screenshotPath = path.join(debugDir, `error-${timestamp}.png`);
-                await page.screenshot({ path: screenshotPath });
-                response.appendResponseLine(`📸 エラー時のスクリーンショット: ${screenshotPath}`);
-                const htmlPath = path.join(debugDir, `error-${timestamp}.html`);
-                const html = await page.content();
-                await fs.promises.writeFile(htmlPath, html, 'utf-8');
-                response.appendResponseLine(`📄 エラー時のHTML: ${htmlPath}`);
+            const msg = error instanceof Error ? error.message : String(error);
+            // ケース分類：致命的エラーには明確なメッセージを表示
+            const isFatalError = msg.includes('No page selected') ||
+                msg.includes('page is null') ||
+                msg.includes('Target closed') ||
+                msg.includes('Session closed') ||
+                msg.includes('Connection closed') ||
+                msg.includes('Protocol error') ||
+                msg.includes('Browser disconnected');
+            if (msg.includes('No page selected') || msg.includes('page is null')) {
+                response.appendResponseLine('❌ ブラウザタブがありません');
+                response.appendResponseLine('→ MCPサーバーを再起動してブラウザを開いてください');
+            }
+            else if (msg.includes('Target closed') ||
+                msg.includes('Session closed') ||
+                msg.includes('Connection closed')) {
+                response.appendResponseLine('❌ ブラウザ接続が切れました');
+                response.appendResponseLine('→ MCPサーバーを再起動してください');
             }
-            catch (snapshotError) {
-                console.error('Failed to capture error snapshot:', snapshotError);
+            else if (msg.includes('Protocol error') ||
+                msg.includes('Browser disconnected')) {
+                response.appendResponseLine('❌ ブラウザとの通信エラー');
+                response.appendResponseLine('→ MCPサーバーを再起動してください');
+            }
+            else {
+                response.appendResponseLine(`❌ エラー: ${msg}`);
+            }
+            // Error snapshot（致命的エラーの場合はスキップ）
+            if (!isFatalError) {
+                try {
+                    const timestamp = new Date().toISOString().replace(/[:.]/g, '-');
+                    const debugDir = path.join(process.cwd(), 'docs/ask/gemini/debug');
+                    await fs.promises.mkdir(debugDir, { recursive: true });
+                    const screenshotPath = path.join(debugDir, `error-${timestamp}.png`);
+                    await page.screenshot({ path: screenshotPath });
+                    response.appendResponseLine(`📸 エラー時のスクリーンショット: ${screenshotPath}`);
+                    const htmlPath = path.join(debugDir, `error-${timestamp}.html`);
+                    const html = await page.content();
+                    await fs.promises.writeFile(htmlPath, html, 'utf-8');
+                    response.appendResponseLine(`📄 エラー時のHTML: ${htmlPath}`);
+                }
+                catch (snapshotError) {
+                    console.error('Failed to capture error snapshot:', snapshotError);
+                }
             }
         }
     },

package/build/src/tools/pages.js

@@ -129,7 +129,6 @@ export const resizePage = defineTool({
     },
     handler: async (request, response, context) => {
         const page = context.getSelectedPage();
-        // @ts-expect-error internal API for now.
         await page.resize({
             contentWidth: request.params.width,
             contentHeight: request.params.height,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chrome-ai-bridge",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "MCP server bridging Chrome browser and AI assistants (ChatGPT, Gemini). Browser automation + AI consultation.",
   "type": "module",
   "bin": "./scripts/cli.mjs",