chrome-devtools-mcp-for-extension 0.23.3 → 0.23.4

package/build/src/login-helper.js

@@ -3,6 +3,134 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
+/**
+ * Login status enum for state machine
+ */
+export var LoginStatus;
+(function (LoginStatus) {
+    LoginStatus["LOGGED_IN"] = "LOGGED_IN";
+    LoginStatus["NEEDS_LOGIN"] = "NEEDS_LOGIN";
+    LoginStatus["IN_PROGRESS"] = "IN_PROGRESS";
+})(LoginStatus || (LoginStatus = {}));
+/**
+ * Multi-language ARIA label patterns for Gemini profile button detection
+ */
+const GEMINI_PROFILE_PATTERNS = [
+    'Google Account', // English
+    'Google アカウント', // Japanese
+    'Compte Google', // French
+    'Google-Konto', // German
+    'Cuenta de Google', // Spanish
+    'Account Google', // Italian
+    '구글 계정', // Korean
+    '谷歌帐户', // Chinese Simplified
+    'Google 帳戶', // Chinese Traditional
+];
+/**
+ * Probe ChatGPT session via API endpoint (most reliable method)
+ * Based on ChatGPT's recommendation to use /api/auth/session
+ */
+export async function probeChatGPTSession(page) {
+    try {
+        const result = await page.evaluate(async () => {
+            try {
+                const r = await fetch('/api/auth/session', { credentials: 'include' });
+                const j = await r.json().catch(() => ({}));
+                return { ok: true, status: r.status, json: j };
+            }
+            catch (e) {
+                return { ok: false, error: String(e) };
+            }
+        });
+        if (!result?.ok) {
+            console.error('[login-helper] Session probe failed:', result);
+            return LoginStatus.IN_PROGRESS;
+        }
+        const j = result.json ?? {};
+        const loggedIn = j && typeof j === 'object' && Object.keys(j).length > 0;
+        console.error(`[login-helper] ChatGPT session probe: ${loggedIn ? 'LOGGED_IN' : 'NEEDS_LOGIN'}`);
+        return loggedIn ? LoginStatus.LOGGED_IN : LoginStatus.NEEDS_LOGIN;
+    }
+    catch (error) {
+        console.error(`[login-helper] Error probing ChatGPT session: ${error}`);
+        return LoginStatus.IN_PROGRESS;
+    }
+}
+/**
+ * Get Gemini login status using ARIA labels (multi-language support)
+ * Based on Gemini's recommendation to use aria-label patterns
+ */
+export async function getGeminiStatus(page) {
+    const url = page.url();
+    // URL-based check (fastest)
+    if (url.includes('accounts.google.com')) {
+        console.error('[login-helper] Gemini: On Google login page');
+        return LoginStatus.NEEDS_LOGIN;
+    }
+    try {
+        const profileFound = await page.evaluate((patterns) => {
+            for (const pattern of patterns) {
+                if (document.querySelector(`button[aria-label*="${pattern}"]`)) {
+                    return true;
+                }
+            }
+            // Fallback: check for nav with chat history (logged-in indicator)
+            if (document.querySelector('nav[aria-label*="Recent"]')) {
+                return true;
+            }
+            return false;
+        }, GEMINI_PROFILE_PATTERNS);
+        console.error(`[login-helper] Gemini ARIA check: ${profileFound ? 'LOGGED_IN' : 'NEEDS_LOGIN'}`);
+        return profileFound ? LoginStatus.LOGGED_IN : LoginStatus.NEEDS_LOGIN;
+    }
+    catch (error) {
+        console.error(`[login-helper] Error checking Gemini status: ${error}`);
+        return LoginStatus.IN_PROGRESS;
+    }
+}
+/**
+ * Get login status for a specific provider
+ */
+export async function getLoginStatus(page, provider) {
+    if (provider === 'chatgpt') {
+        // Try session probe first (most reliable)
+        const sessionStatus = await probeChatGPTSession(page);
+        if (sessionStatus !== LoginStatus.IN_PROGRESS) {
+            return sessionStatus;
+        }
+        // Fallback to DOM-based detection
+        const needsLogin = await isLoginRequired(page);
+        return needsLogin ? LoginStatus.NEEDS_LOGIN : LoginStatus.LOGGED_IN;
+    }
+    else {
+        return await getGeminiStatus(page);
+    }
+}
+/**
+ * Wait for login with auto-polling and backoff
+ * Returns when user logs in or timeout occurs
+ */
+export async function waitForLoginStatus(page, provider, timeoutMs = 120000, onStatusUpdate) {
+    const log = onStatusUpdate || console.error;
+    const start = Date.now();
+    let delay = 500;
+    log(`⏳ ログイン待機中（最大${Math.floor(timeoutMs / 1000)}秒）...`);
+    while (Date.now() - start < timeoutMs) {
+        const status = await getLoginStatus(page, provider);
+        if (status === LoginStatus.LOGGED_IN) {
+            log('✅ ログイン検出！続行します...');
+            return status;
+        }
+        const elapsed = Math.floor((Date.now() - start) / 1000);
+        if (elapsed % 10 === 0 && elapsed > 0) {
+            log(`⏳ まだ待機中... (${elapsed}秒経過)`);
+        }
+        await new Promise((r) => setTimeout(r, delay));
+        delay = Math.min(3000, Math.floor(delay * 1.5)); // backoff
+    }
+    log('❌ タイムアウト: 再度お試しください');
+    return LoginStatus.NEEDS_LOGIN;
+}
 /**
  * Check if the page requires login
  * More robust than just checking URL

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

@@ -10,7 +10,7 @@ import { ToolCategories } from './categories.js';
 import { defineTool } from './ToolDefinition.js';
 import { loadSelectors, getSelector } from '../selectors/loader.js';
 import { CHATGPT_CONFIG } from '../config.js';
-import { isLoginRequired } from '../login-helper.js';
+import { getLoginStatus, waitForLoginStatus, LoginStatus } from '../login-helper.js';
 /**
  * Navigate with retry logic for handling ERR_ABORTED and other network errors
  */
@@ -243,17 +243,30 @@ export const askChatGPTWeb = defineTool({
             else {
                 response.appendResponseLine('✅ 既存のChatGPTタブを再利用');
             }
-            // Step 2: Check if login is required (don't wait - stop immediately)
-            const needsLogin = await isLoginRequired(page);
-            if (needsLogin) {
+            // Step 2: Check login status using session probe (most reliable)
+            const loginStatus = await getLoginStatus(page, 'chatgpt');
+            if (loginStatus === LoginStatus.NEEDS_LOGIN) {
                 response.appendResponseLine('\n❌ ChatGPTへのログインが必要です');
                 response.appendResponseLine('');
                 response.appendResponseLine('📱 ブラウザウィンドウでChatGPTにログインしてください：');
                 response.appendResponseLine('   1. ブラウザウィンドウの「ログイン」ボタンをクリック');
                 response.appendResponseLine('   2. メールアドレスまたはGoogleアカウントでログイン');
-                response.appendResponseLine('   3. ログイン完了後、このツールを再実行してください');
                 response.appendResponseLine('');
-                return;
+                // Auto-poll for login completion (max 2 minutes)
+                const finalStatus = await waitForLoginStatus(page, 'chatgpt', 120000, (msg) => response.appendResponseLine(msg));
+                if (finalStatus !== LoginStatus.LOGGED_IN) {
+                    response.appendResponseLine('❌ ログインがタイムアウトしました。再度お試しください。');
+                    return;
+                }
+            }
+            else if (loginStatus === LoginStatus.IN_PROGRESS) {
+                // Wait a bit and retry
+                await new Promise(r => setTimeout(r, 2000));
+                const retryStatus = await getLoginStatus(page, 'chatgpt');
+                if (retryStatus !== LoginStatus.LOGGED_IN) {
+                    response.appendResponseLine('⚠️ ログイン状態を確認できませんでした。再試行してください。');
+                    return;
+                }
             }
             response.appendResponseLine('✅ ログイン確認完了');
             // Step 2: Load existing session or create new chat

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

@@ -9,7 +9,7 @@ import z from 'zod';
 import { ToolCategories } from './categories.js';
 import { defineTool } from './ToolDefinition.js';
 import { GEMINI_CONFIG } from '../config.js';
-import { isLoginRequired } from '../login-helper.js';
+import { getLoginStatus, waitForLoginStatus, LoginStatus } from '../login-helper.js';
 /**
  * Navigate with retry logic for handling ERR_ABORTED and other network errors
  */
@@ -210,18 +210,43 @@ export const askGeminiWeb = defineTool({
             // Navigate directly to target URL (skip intermediate navigation)
             response.appendResponseLine('Geminiに接続中...');
             await navigateWithRetry(page, targetUrl, { waitUntil: 'networkidle2' });
-            // Wait for Gemini SPA to fully render (networkidle2 is not enough for SPAs)
-            await new Promise(resolve => setTimeout(resolve, 1000));
-            // Check login only once after navigation
-            const needsLogin = await isLoginRequired(page);
-            if (needsLogin) {
+            // Wait for Gemini SPA to fully render using selector-based detection
+            // Instead of fixed 1000ms wait, wait for either profile button (logged in) or login link
+            try {
+                await Promise.race([
+                    page.waitForSelector('button[aria-label*="Account"], button[aria-label*="アカウント"]', { timeout: 10000 }),
+                    page.waitForSelector('a[href*="accounts.google.com"]', { timeout: 10000 }),
+                    page.waitForSelector('[role="textbox"]', { timeout: 10000 }),
+                ]);
+            }
+            catch {
+                // Timeout is acceptable - continue with login check
+                response.appendResponseLine('⚠️ UI安定化待機タイムアウト（続行）');
+            }
+            // Check login using ARIA-based detection (multi-language support)
+            const loginStatus = await getLoginStatus(page, 'gemini');
+            if (loginStatus === LoginStatus.NEEDS_LOGIN) {
                 response.appendResponseLine('\n❌ Geminiへのログインが必要です');
                 response.appendResponseLine('');
                 response.appendResponseLine('📱 ブラウザウィンドウでGeminiにログインしてください：');
                 response.appendResponseLine('   1. ブラウザウィンドウでGoogleアカウントを選択');
                 response.appendResponseLine('   2. パスワードを入力してログイン');
-                response.appendResponseLine('   3. ログイン完了後、このツールを再実行してください');
-                return;
+                response.appendResponseLine('');
+                // Auto-poll for login completion (max 2 minutes)
+                const finalStatus = await waitForLoginStatus(page, 'gemini', 120000, (msg) => response.appendResponseLine(msg));
+                if (finalStatus !== LoginStatus.LOGGED_IN) {
+                    response.appendResponseLine('❌ ログインがタイムアウトしました。再度お試しください。');
+                    return;
+                }
+            }
+            else if (loginStatus === LoginStatus.IN_PROGRESS) {
+                // Wait a bit and retry
+                await new Promise(r => setTimeout(r, 2000));
+                const retryStatus = await getLoginStatus(page, 'gemini');
+                if (retryStatus !== LoginStatus.LOGGED_IN) {
+                    response.appendResponseLine('⚠️ ログイン状態を確認できませんでした。再試行してください。');
+                    return;
+                }
             }
             response.appendResponseLine('✅ ログイン確認完了');
             response.appendResponseLine('質問を送信中...');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chrome-devtools-mcp-for-extension",
-  "version": "0.23.3",
+  "version": "0.23.4",
   "description": "MCP server for Chrome extension development with Web Store automation. Fork of chrome-devtools-mcp with extension-specific tools.",
   "type": "module",
   "bin": "./scripts/cli.mjs",