chrome-ai-bridge 1.0.9 → 1.0.11

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

@@ -188,64 +188,71 @@ export const askGeminiImage = defineTool({
                 response.appendResponseLine('⚠️ 送信ボタンが見つかりません (Enterキーを試行)');
             }
             response.appendResponseLine('🎨 画像生成中... (1-2分かかることがあります)');
-            // Wait for image generation using MutationObserver for instant detection
+            // Wait for image generation using MutationObserver + polling hybrid approach
+            // MutationObserver provides instant detection, polling ensures we don't miss state
             const startTime = Date.now();
             const maxWaitTime = 180000; // 3 minutes
-            const imageFound = await page.evaluate((maxWait) => {
-                return new Promise(resolve => {
-                    // Check if image already exists (immediate return)
-                    const checkCompletion = () => {
-                        // Check for generated image
-                        const images = document.querySelectorAll('img[src*="blob:"], img[src*="generated"]');
-                        // Check for download button with various detection methods
-                        const buttons = Array.from(document.querySelectorAll('button, [role="menuitem"]'));
-                        const hasDownload = buttons.some(b => {
-                            const text = b.textContent || '';
-                            const ariaLabel = b.getAttribute('aria-label') || '';
-                            const describedBy = b.getAttribute('aria-describedby');
-                            let desc = '';
-                            if (describedBy) {
-                                const descEl = document.getElementById(describedBy);
-                                desc = descEl?.textContent || '';
-                            }
-                            return (text.includes('ダウンロード') ||
-                                text.includes('Download') ||
-                                text.includes('フルサイズ') ||
-                                ariaLabel.toLowerCase().includes('download') ||
-                                desc.includes('フルサイズ') ||
-                                desc.includes('ダウンロード'));
-                        });
-                        if (images.length > 0 || hasDownload) {
-                            return true;
-                        }
-                        return false;
-                    };
-                    // Initial check
-                    if (checkCompletion()) {
-                        resolve(true);
-                        return;
-                    }
-                    // Set up MutationObserver for instant detection
-                    const observer = new MutationObserver(() => {
-                        if (checkCompletion()) {
-                            observer.disconnect();
-                            clearTimeout(timeoutId);
-                            resolve(true);
+            // Set up MutationObserver in the page (stores result in window object)
+            await page.evaluate(() => {
+                // @ts-expect-error - window property
+                window.__geminiImageFound = false;
+                const checkCompletion = () => {
+                    const images = document.querySelectorAll('img[src*="blob:"], img[src*="generated"]');
+                    const buttons = Array.from(document.querySelectorAll('button, [role="menuitem"]'));
+                    const hasDownload = buttons.some(b => {
+                        const text = b.textContent || '';
+                        const ariaLabel = b.getAttribute('aria-label') || '';
+                        const describedBy = b.getAttribute('aria-describedby');
+                        let desc = '';
+                        if (describedBy) {
+                            const descEl = document.getElementById(describedBy);
+                            desc = descEl?.textContent || '';
                         }
+                        return (text.includes('ダウンロード') ||
+                            text.includes('Download') ||
+                            text.includes('フルサイズ') ||
+                            ariaLabel.toLowerCase().includes('download') ||
+                            desc.includes('フルサイズ') ||
+                            desc.includes('ダウンロード'));
                     });
-                    observer.observe(document.body, {
-                        childList: true,
-                        subtree: true,
-                        attributes: true,
-                        attributeFilter: ['src', 'aria-label', 'aria-describedby'],
-                    });
-                    // Timeout fallback
-                    const timeoutId = setTimeout(() => {
+                    return images.length > 0 || hasDownload;
+                };
+                // Initial check
+                if (checkCompletion()) {
+                    // @ts-expect-error - window property
+                    window.__geminiImageFound = true;
+                    return;
+                }
+                // Set up MutationObserver
+                const observer = new MutationObserver(() => {
+                    if (checkCompletion()) {
+                        // @ts-expect-error - window property
+                        window.__geminiImageFound = true;
                         observer.disconnect();
-                        resolve(false);
-                    }, maxWait);
+                    }
+                });
+                observer.observe(document.body, {
+                    childList: true,
+                    subtree: true,
+                    attributes: true,
+                    attributeFilter: ['src', 'aria-label', 'aria-describedby'],
+                });
+            });
+            // Poll for the result (short intervals to minimize latency)
+            let imageFound = false;
+            while (Date.now() - startTime < maxWaitTime) {
+                // Check if MutationObserver detected image
+                const found = await page.evaluate(() => {
+                    // @ts-expect-error - window property
+                    return window.__geminiImageFound === true;
                 });
-            }, maxWaitTime);
+                if (found) {
+                    imageFound = true;
+                    break;
+                }
+                // Short wait before next check (500ms for responsiveness)
+                await new Promise(resolve => setTimeout(resolve, 500));
+            }
             if (!imageFound) {
                 response.appendResponseLine('❌ 画像生成タイムアウト (3分)');
                 return;
@@ -275,6 +282,9 @@ export const askGeminiImage = defineTool({
                 downloadManager.on('started', (filename) => {
                     response.appendResponseLine(`📥 ダウンロード開始: ${filename}`);
                 });
+                // Get existing Gemini images BEFORE clicking download button
+                const existingFiles = await fs.promises.readdir(userDownloadsDir);
+                const existingGeminiImages = new Set(existingFiles.filter(f => f.startsWith('Gemini_Generated_Image_') && f.endsWith('.png')));
                 // Click download button - Gemini uses "フルサイズの画像をダウンロード" button
                 // Improved selector: prioritize aria-describedby for more reliable detection
                 const downloadClicked = await page.evaluate(() => {
@@ -318,25 +328,41 @@ export const askGeminiImage = defineTool({
                     response.appendResponseLine('ヒント: ブラウザで画像を右クリックして保存してください');
                     return;
                 }
-                // Wait for download to complete using CDP events (more reliable than file polling)
-                response.appendResponseLine('⏳ CDP経由でダウンロード完了を待機中...');
-                let downloadedPath;
-                try {
-                    downloadedPath = await downloadManager.waitForDownload(60000); // 60 seconds
-                    response.appendResponseLine(`✅ ダウンロード完了: ${path.basename(downloadedPath)}`);
-                }
-                catch (downloadError) {
-                    const errMsg = downloadError instanceof Error ? downloadError.message : String(downloadError);
-                    if (errMsg.includes('timeout')) {
-                        response.appendResponseLine('❌ ダウンロードタイムアウト (60秒)');
-                        response.appendResponseLine('💡 ヒント: ブラウザで画像を右クリックして「画像を保存」してください');
-                    }
-                    else if (errMsg.includes('canceled')) {
-                        response.appendResponseLine('❌ ダウンロードがキャンセルされました');
+                // Wait for download to complete using hybrid approach:
+                // 1. Try CDP events first (reliable for standard downloads)
+                // 2. Fall back to filesystem monitoring (for blob/JS downloads like Gemini)
+                response.appendResponseLine('⏳ ダウンロード完了を待機中...');
+                let downloadedPath = null;
+                const downloadStartTime = Date.now();
+                const downloadTimeout = 60000; // 60 seconds
+                // Try CDP-based detection with filesystem fallback
+                while (Date.now() - downloadStartTime < downloadTimeout) {
+                    // Check for new Gemini image files (filesystem fallback)
+                    const currentFiles = await fs.promises.readdir(userDownloadsDir);
+                    const newGeminiImages = currentFiles.filter(f => f.startsWith('Gemini_Generated_Image_') &&
+                        f.endsWith('.png') &&
+                        !existingGeminiImages.has(f));
+                    if (newGeminiImages.length > 0) {
+                        // Found new image file
+                        const newestImage = newGeminiImages.sort().pop();
+                        downloadedPath = path.join(userDownloadsDir, newestImage);
+                        // Wait a bit for file to be fully written
+                        await new Promise(resolve => setTimeout(resolve, 500));
+                        response.appendResponseLine(`✅ ダウンロード完了: ${newestImage}`);
+                        break;
                     }
-                    else {
-                        response.appendResponseLine(`❌ ダウンロードエラー: ${errMsg}`);
+                    // Also check CDP events (for standard downloads)
+                    const completedDownloads = Array.from(downloadManager.getPendingDownloads()).filter((d) => d.state === 'completed');
+                    if (completedDownloads.length > 0) {
+                        // CDP detected completion - but Gemini uses blob downloads so this rarely fires
+                        break;
                     }
+                    // Short wait before next check
+                    await new Promise(resolve => setTimeout(resolve, 500));
+                }
+                if (!downloadedPath) {
+                    response.appendResponseLine('❌ ダウンロードタイムアウト (60秒)');
+                    response.appendResponseLine('💡 ヒント: ブラウザで画像を右クリックして「画像を保存」してください');
                     return;
                 }
                 // Ensure output directory exists

package/package.json

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