chrome-ai-bridge 1.0.2 → 1.0.3

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

@@ -363,6 +363,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 +415,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 +433,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) {

package/package.json

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