@steipete/oracle 0.9.0 → 0.10.0

package/dist/src/browser/actions/navigation.js

@@ -1,32 +1,32 @@
-import { CLOUDFLARE_SCRIPT_SELECTOR, CLOUDFLARE_TITLE, INPUT_SELECTORS, } from '../constants.js';
-import { delay } from '../utils.js';
-import { logDomFailure } from '../domDebug.js';
-import { BrowserAutomationError } from '../../oracle/errors.js';
+import { CLOUDFLARE_SCRIPT_SELECTOR, CLOUDFLARE_TITLE, INPUT_SELECTORS } from "../constants.js";
+import { delay } from "../utils.js";
+import { logDomFailure } from "../domDebug.js";
+import { BrowserAutomationError } from "../../oracle/errors.js";
 export function installJavaScriptDialogAutoDismissal(Page, logger) {
     const pageAny = Page;
-    if (typeof pageAny.on !== 'function' || typeof pageAny.handleJavaScriptDialog !== 'function') {
+    if (typeof pageAny.on !== "function" || typeof pageAny.handleJavaScriptDialog !== "function") {
         return () => { };
     }
     const handler = async (params) => {
-        const type = typeof params?.type === 'string' ? params.type : 'unknown';
-        const message = typeof params?.message === 'string' ? params.message : '';
-        logger(`[nav] dismissing JS dialog (${type})${message ? `: ${message.slice(0, 140)}` : ''}`);
+        const type = typeof params?.type === "string" ? params.type : "unknown";
+        const message = typeof params?.message === "string" ? params.message : "";
+        logger(`[nav] dismissing JS dialog (${type})${message ? `: ${message.slice(0, 140)}` : ""}`);
         try {
-            await pageAny.handleJavaScriptDialog?.({ accept: true, promptText: '' });
+            await pageAny.handleJavaScriptDialog?.({ accept: true, promptText: "" });
         }
         catch (error) {
             const msg = error instanceof Error ? error.message : String(error);
             logger(`[nav] failed to dismiss JS dialog: ${msg}`);
         }
     };
-    pageAny.on('javascriptDialogOpening', handler);
+    pageAny.on("javascriptDialogOpening", handler);
     return () => {
         try {
-            pageAny.off?.('javascriptDialogOpening', handler);
+            pageAny.off?.("javascriptDialogOpening", handler);
         }
         catch {
             try {
-                pageAny.removeListener?.('javascriptDialogOpening', handler);
+                pageAny.removeListener?.("javascriptDialogOpening", handler);
             }
             catch {
                 // ignore
@@ -92,13 +92,13 @@ async function dismissBlockingUi(Runtime, logger) {
     }).catch(() => null);
     const value = outcome?.result?.value;
     if (value?.dismissed) {
-        logger(`[nav] dismissed blocking UI (${value.action ?? 'unknown'})`);
+        logger(`[nav] dismissed blocking UI (${value.action ?? "unknown"})`);
         return true;
     }
     return false;
 }
 export async function navigateToPromptReadyWithFallback(Page, Runtime, options, deps = {}) {
-    const { url, fallbackUrl, timeoutMs, fallbackTimeoutMs, headless, logger, } = options;
+    const { url, fallbackUrl, timeoutMs, fallbackTimeoutMs, headless, logger } = options;
     const navigate = deps.navigateToChatGPT ?? navigateToChatGPT;
     const ensureBlocked = deps.ensureNotBlocked ?? ensureNotBlocked;
     const ensureReady = deps.ensurePromptReady ?? ensurePromptReady;
@@ -115,6 +115,8 @@ export async function navigateToPromptReadyWithFallback(Page, Runtime, options,
         }
         const fallbackTimeout = fallbackTimeoutMs ?? Math.max(timeoutMs * 2, 120_000);
         logger(`Prompt not ready after ${Math.round(timeoutMs / 1000)}s on ${url}; retrying ${fallbackUrl} with ${Math.round(fallbackTimeout / 1000)}s timeout.`);
+        await navigate(Page, Runtime, "about:blank", logger);
+        await delay(250);
         await navigate(Page, Runtime, fallbackUrl, logger);
         await ensureBlocked(Runtime, headless, logger);
         await dismissBlockingUi(Runtime, logger).catch(() => false);
@@ -125,10 +127,10 @@ export async function navigateToPromptReadyWithFallback(Page, Runtime, options,
 export async function ensureNotBlocked(Runtime, headless, logger) {
     if (await isCloudflareInterstitial(Runtime)) {
         const message = headless
-            ? 'Cloudflare challenge detected in headless mode. Re-run with --headful so you can solve the challenge.'
-            : 'Cloudflare challenge detected. Complete the “Just a moment…” check in the open browser, then rerun.';
-        logger('Cloudflare anti-bot page detected');
-        throw new BrowserAutomationError(message, { stage: 'cloudflare-challenge', headless });
+            ? "Cloudflare challenge detected in headless mode. Re-run with --headful so you can solve the challenge."
+            : "Cloudflare challenge detected. Complete the “Just a moment…” check in the open browser, then rerun.";
+        logger("Cloudflare anti-bot page detected");
+        throw new BrowserAutomationError(message, { stage: "cloudflare-challenge", headless });
     }
 }
 const LOGIN_CHECK_TIMEOUT_MS = 5_000;
@@ -157,98 +159,92 @@ export async function ensureLoggedIn(Runtime, logger, options = {}) {
         });
         const retryProbe = normalizeLoginProbe(retryOutcome.result?.value);
         if (retryProbe.ok) {
-            logger('Login restored via Welcome back account picker');
+            logger("Login restored via Welcome back account picker");
             return;
         }
         logger(`Login retry after Welcome back failed (status=${retryProbe.status}, domLoginCta=${Boolean(retryProbe.domLoginCta)})`);
     }
-    logger(`Login probe failed (status=${probe.status}, domLoginCta=${Boolean(probe.domLoginCta)}, onAuthPage=${Boolean(probe.onAuthPage)}, url=${probe.pageUrl ?? 'n/a'}, error=${probe.error ?? 'none'})`);
-    const domLabel = probe.domLoginCta ? ' Login button detected on page.' : '';
+    logger(`Login probe failed (status=${probe.status}, domLoginCta=${Boolean(probe.domLoginCta)}, onAuthPage=${Boolean(probe.onAuthPage)}, url=${probe.pageUrl ?? "n/a"}, error=${probe.error ?? "none"})`);
+    const domLabel = probe.domLoginCta ? " Login button detected on page." : "";
     const cookieHint = options.remoteSession
-        ? 'The remote Chrome session is not signed into ChatGPT. Sign in there, then rerun.'
+        ? "The remote Chrome session is not signed into ChatGPT. Sign in there, then rerun."
         : (options.appliedCookies ?? 0) === 0
-            ? 'No ChatGPT cookies were applied; sign in to chatgpt.com in Chrome or pass inline cookies (--browser-inline-cookies[(-file)] / ORACLE_BROWSER_COOKIES_JSON).'
-            : 'ChatGPT login appears missing; open chatgpt.com in Chrome to refresh the session or provide inline cookies (--browser-inline-cookies[(-file)] / ORACLE_BROWSER_COOKIES_JSON).';
+            ? "No ChatGPT cookies were applied; sign in to chatgpt.com in Chrome or pass inline cookies (--browser-inline-cookies[(-file)] / ORACLE_BROWSER_COOKIES_JSON)."
+            : "ChatGPT login appears missing; open chatgpt.com in Chrome to refresh the session or provide inline cookies (--browser-inline-cookies[(-file)] / ORACLE_BROWSER_COOKIES_JSON).";
     throw new Error(`ChatGPT session not detected.${domLabel} ${cookieHint}`);
 }
 async function attemptWelcomeBackLogin(Runtime, logger) {
-    const outcome = await Runtime.evaluate({
-        expression: `(() => {
-      // Learned: "Welcome back" shows as a modal with account chips; click the email chip.
-      const TIMEOUT_MS = 30000;
-      const getLabel = (node) =>
-        (node?.textContent || node?.getAttribute?.('aria-label') || '').trim();
-      const isAccount = (label) =>
-        Boolean(label) &&
-        label.includes('@') &&
-        !/log in|sign up|create account|another account/i.test(label);
-      const findAccount = () => {
-        const candidates = Array.from(document.querySelectorAll('[role="button"],button,a'));
-        return candidates.find((node) => isAccount(getLabel(node))) || null;
-      };
-      const clickAccount = () => {
-        const account = findAccount();
-        if (!account) return null;
+    const deadline = Date.now() + 30_000;
+    while (Date.now() < deadline) {
+        let outcome;
         try {
-          (account).click();
-        } catch (_error) {
-          return { clicked: false, reason: 'click-failed' };
-        }
-        return { clicked: true, label: getLabel(account) };
-      };
-      const immediate = clickAccount();
-      if (immediate) {
-        return immediate;
-      }
-      const root = document.documentElement || document.body;
-      if (!root) {
-        return { clicked: false, reason: 'no-root' };
-      }
-      return new Promise((resolve) => {
-        const timer = setTimeout(() => {
-          observer.disconnect();
-          resolve({ clicked: false, reason: 'timeout' });
-        }, TIMEOUT_MS);
-        const observer = new MutationObserver(() => {
-          const result = clickAccount();
-          if (result) {
-            clearTimeout(timer);
-            observer.disconnect();
-            resolve(result);
+            outcome = await Runtime.evaluate({
+                expression: `(() => {
+          // Learned: "Welcome back" shows as a modal with account chips; click the email chip.
+          const getLabel = (node) =>
+            (node?.textContent || node?.getAttribute?.('aria-label') || '').trim();
+          const isAccount = (label) =>
+            Boolean(label) &&
+            label.includes('@') &&
+            !/log in|sign up|create account|another account/i.test(label);
+          const candidates = Array.from(document.querySelectorAll('[role="button"],button,a'));
+          const account = candidates.find((node) => isAccount(getLabel(node))) || null;
+          if (!account) {
+            return { clicked: false, reason: 'not-found' };
           }
-        });
-        observer.observe(root, {
-          subtree: true,
-          childList: true,
-          characterData: true,
-        });
-      });
-    })()`,
-        awaitPromise: true,
-        returnByValue: true,
-    });
-    if (outcome.exceptionDetails) {
-        const details = outcome.exceptionDetails;
-        const description = (details.exception && typeof details.exception.description === 'string' && details.exception.description) ||
-            details.text ||
-            'unknown error';
-        logger(`Welcome back auto-select probe failed: ${description}`);
-    }
-    const result = outcome.result?.value;
-    if (!result) {
-        logger('Welcome back auto-select probe returned no result.');
-        return false;
-    }
-    if (result?.clicked) {
-        logger(`Welcome back modal detected; selected account ${result.label ?? '(unknown)'}`);
-        return true;
-    }
-    if (result?.reason && result.reason !== 'timeout') {
-        logger(`Welcome back modal present but auto-select failed (${result.reason}).`);
-    }
-    if (result?.reason === 'timeout') {
-        logger('Welcome back modal not detected after login probe failure.');
+          const label = getLabel(account);
+          setTimeout(() => {
+            try {
+              account.click();
+            } catch {
+              // ignore; caller will re-probe login state
+            }
+          }, 0);
+          return { clicked: true, label };
+        })()`,
+                awaitPromise: false,
+                returnByValue: true,
+            });
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            if (/navigated or closed|context was destroyed|target closed/i.test(message)) {
+                logger("Welcome back account click triggered navigation.");
+                return true;
+            }
+            logger(`Welcome back auto-select probe failed: ${message}`);
+            return false;
+        }
+        if (outcome.exceptionDetails) {
+            const details = outcome.exceptionDetails;
+            const description = (details.exception &&
+                typeof details.exception.description === "string" &&
+                details.exception.description) ||
+                details.text ||
+                "unknown error";
+            logger(`Welcome back auto-select probe failed: ${description}`);
+            return false;
+        }
+        const result = outcome.result?.value;
+        if (!result) {
+            logger("Welcome back auto-select probe returned no result.");
+            return false;
+        }
+        if (!("clicked" in result) && !("reason" in result)) {
+            logger("Welcome back auto-select probe returned an unexpected result.");
+            return false;
+        }
+        if (result.clicked) {
+            logger(`Welcome back modal detected; selected account ${result.label ?? "(unknown)"}`);
+            return true;
+        }
+        if (result.reason && result.reason !== "not-found") {
+            logger(`Welcome back modal present but auto-select failed (${result.reason}).`);
+            return false;
+        }
+        await delay(500);
     }
+    logger("Welcome back modal not detected after login probe failure.");
     return false;
 }
 export async function ensurePromptReady(Runtime, timeoutMs, logger) {
@@ -257,15 +253,15 @@ export async function ensurePromptReady(Runtime, timeoutMs, logger) {
         const authUrl = await currentUrl(Runtime);
         if (authUrl && isAuthLoginUrl(authUrl)) {
             // Learned: auth.openai.com/login can appear after cookies are copied; allow manual login window.
-            logger('Auth login page detected; waiting for manual login to complete...');
+            logger("Auth login page detected; waiting for manual login to complete...");
             const extended = Math.min(Math.max(timeoutMs, 60_000), 20 * 60_000);
             const loggedIn = await waitForPrompt(Runtime, extended);
             if (loggedIn) {
                 return;
             }
         }
-        await logDomFailure(Runtime, logger, 'prompt-textarea');
-        throw new Error('Prompt textarea did not appear before timeout');
+        await logDomFailure(Runtime, logger, "prompt-textarea");
+        throw new Error("Prompt textarea did not appear before timeout");
     }
 }
 async function waitForDocumentReady(Runtime, timeoutMs) {
@@ -275,24 +271,24 @@ async function waitForDocumentReady(Runtime, timeoutMs) {
             expression: `document.readyState`,
             returnByValue: true,
         });
-        if (result?.value === 'complete' || result?.value === 'interactive') {
+        if (result?.value === "complete" || result?.value === "interactive") {
             return;
         }
         await delay(100);
     }
-    throw new Error('Page did not reach ready state in time');
+    throw new Error("Page did not reach ready state in time");
 }
 async function currentUrl(Runtime) {
     const { result } = await Runtime.evaluate({
         expression: 'typeof location === "object" && location.href ? location.href : null',
         returnByValue: true,
     });
-    return typeof result?.value === 'string' ? result.value : null;
+    return typeof result?.value === "string" ? result.value : null;
 }
 function isAuthLoginUrl(url) {
     try {
         const parsed = new URL(url);
-        if (parsed.hostname.includes('auth.openai.com')) {
+        if (parsed.hostname.includes("auth.openai.com")) {
             return true;
         }
         return /^\/log-?in/i.test(parsed.pathname);
@@ -325,8 +321,11 @@ async function waitForPrompt(Runtime, timeoutMs) {
     return false;
 }
 async function isCloudflareInterstitial(Runtime) {
-    const { result: titleResult } = await Runtime.evaluate({ expression: 'document.title', returnByValue: true });
-    const title = typeof titleResult.value === 'string' ? titleResult.value : '';
+    const { result: titleResult } = await Runtime.evaluate({
+        expression: "document.title",
+        returnByValue: true,
+    });
+    const title = typeof titleResult.value === "string" ? titleResult.value : "";
     const challengeTitle = CLOUDFLARE_TITLE.toLowerCase();
     if (title.toLowerCase().includes(challengeTitle)) {
         return true;
@@ -341,7 +340,6 @@ function buildLoginProbeExpression(timeoutMs) {
     return `(async () => {
     // Learned: /backend-api/me is the most reliable "am I logged in" signal.
     // Some UIs render without a session; use DOM + network for a robust answer.
-    const timer = setTimeout(() => {}, ${timeoutMs});
     const pageUrl = typeof location === 'object' && location?.href ? location.href : null;
     const onAuthPage =
       typeof location === 'object' &&
@@ -367,12 +365,26 @@ function buildLoginProbeExpression(timeoutMs) {
       const textMatches = (text) => {
         if (!text) return false;
         const normalized = text.toLowerCase().trim();
-        return ['log in', 'login', 'sign in', 'signin', 'continue with'].some((needle) =>
-          normalized.startsWith(needle),
+        return (
+          ['log in', 'login', 'sign in', 'signin', 'continue with', 'sign up for free'].some(
+            (needle) => normalized.startsWith(needle),
+          ) ||
+          normalized.includes('get responses tailored to you') ||
+          normalized.includes('log in to get answers')
         );
       };
       for (const node of candidates) {
         if (!(node instanceof HTMLElement)) continue;
+        const rect = node.getBoundingClientRect();
+        const style = window.getComputedStyle(node);
+        if (
+          rect.width <= 0 ||
+          rect.height <= 0 ||
+          style.display === 'none' ||
+          style.visibility === 'hidden'
+        ) {
+          continue;
+        }
         const label =
           node.textContent?.trim() ||
           node.getAttribute('aria-label') ||
@@ -385,33 +397,45 @@ function buildLoginProbeExpression(timeoutMs) {
       return false;
     };
 
-    let status = 0;
-    let error = null;
-    try {
-      if (typeof fetch === 'function') {
-        const controller = new AbortController();
-        const timeout = setTimeout(() => controller.abort(), ${timeoutMs});
-        try {
-          // Credentials included so we see a 200 only when cookies are valid.
-          const response = await fetch('/backend-api/me', {
-            cache: 'no-store',
-            credentials: 'include',
-            signal: controller.signal,
-          });
-          status = response.status || 0;
-        } finally {
-          clearTimeout(timeout);
+    const readBackendStatus = async () => {
+      try {
+        if (typeof fetch === 'function') {
+          const controller = new AbortController();
+          const timeout = setTimeout(() => controller.abort(), ${timeoutMs});
+          try {
+            // Credentials included so we see a 200 only when cookies are valid.
+            const response = await fetch('/backend-api/me', {
+              cache: 'no-store',
+              credentials: 'include',
+              signal: controller.signal,
+            });
+            return { status: response.status || 0, error: null };
+          } finally {
+            clearTimeout(timeout);
+          }
         }
+      } catch (err) {
+        return { status: 0, error: err ? String(err) : 'unknown' };
+      }
+      return { status: 0, error: null };
+    };
+
+    let { status, error } = await readBackendStatus();
+    let domLoginCta = hasLoginCta();
+    const settleDeadline = Date.now() + Math.min(${timeoutMs}, 2500);
+    while (!domLoginCta && Date.now() < settleDeadline) {
+      await new Promise((resolve) => setTimeout(resolve, 100));
+      domLoginCta = hasLoginCta();
+      if (status === 0 || status === 401 || status === 403) {
+        const next = await readBackendStatus();
+        status = next.status;
+        error = next.error;
       }
-    } catch (err) {
-      error = err ? String(err) : 'unknown';
     }
 
-    const domLoginCta = hasLoginCta();
     const loginSignals = domLoginCta || onAuthPage;
-    clearTimeout(timer);
     return {
-      ok: !loginSignals && (status === 0 || status === 200),
+      ok: !loginSignals && status === 200,
       status,
       redirected: false,
       url: pageUrl,
@@ -423,23 +447,23 @@ function buildLoginProbeExpression(timeoutMs) {
   })()`;
 }
 function normalizeLoginProbe(raw) {
-    if (!raw || typeof raw !== 'object') {
+    if (!raw || typeof raw !== "object") {
         return { ok: false, status: 0 };
     }
     const value = raw;
     const statusRaw = value.status;
-    const status = typeof statusRaw === 'number'
+    const status = typeof statusRaw === "number"
         ? statusRaw
-        : typeof statusRaw === 'string' && !Number.isNaN(Number(statusRaw))
+        : typeof statusRaw === "string" && !Number.isNaN(Number(statusRaw))
             ? Number(statusRaw)
             : 0;
     return {
         ok: Boolean(value.ok),
         status: Number.isFinite(status) ? status : 0,
-        url: typeof value.url === 'string' ? value.url : null,
+        url: typeof value.url === "string" ? value.url : null,
         redirected: Boolean(value.redirected),
-        error: typeof value.error === 'string' ? value.error : null,
-        pageUrl: typeof value.pageUrl === 'string' ? value.pageUrl : null,
+        error: typeof value.error === "string" ? value.error : null,
+        pageUrl: typeof value.pageUrl === "string" ? value.pageUrl : null,
         domLoginCta: Boolean(value.domLoginCta),
         onAuthPage: Boolean(value.onAuthPage),
     };