@steipete/oracle 0.7.1 → 0.7.3

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

@@ -4,6 +4,7 @@ import { logDomFailure, logConversationSnapshot, buildConversationDebugExpressio
 import { buildClickDispatcher } from './domEvents.js';
 const ASSISTANT_POLL_TIMEOUT_ERROR = 'assistant-response-watchdog-timeout';
 export async function waitForAssistantResponse(Runtime, timeoutMs, logger) {
+    const start = Date.now();
     logger('Waiting for ChatGPT response');
     const expression = buildResponseObserverExpression(timeoutMs);
     const evaluationPromise = Runtime.evaluate({ expression, awaitPromise: true, returnByValue: true });
@@ -61,7 +62,24 @@ export async function waitForAssistantResponse(Runtime, timeoutMs, logger) {
         throw new Error('Unable to capture assistant response');
     }
     const refreshed = await refreshAssistantSnapshot(Runtime, parsed, logger);
-    return refreshed ?? parsed;
+    const candidate = refreshed ?? parsed;
+    // The evaluation path can race ahead of completion. If ChatGPT is still streaming, wait for the watchdog poller.
+    const elapsedMs = Date.now() - start;
+    const remainingMs = Math.max(0, timeoutMs - elapsedMs);
+    if (remainingMs > 0) {
+        const [stopVisible, completionVisible] = await Promise.all([
+            isStopButtonVisible(Runtime),
+            isCompletionVisible(Runtime),
+        ]);
+        if (stopVisible && !completionVisible) {
+            logger('Assistant still generating; waiting for completion');
+            const completed = await pollAssistantCompletion(Runtime, remainingMs);
+            if (completed) {
+                return completed;
+            }
+        }
+    }
+    return candidate;
 }
 export async function readAssistantSnapshot(Runtime) {
     const { result } = await Runtime.evaluate({ expression: buildAssistantSnapshotExpression(), returnByValue: true });
@@ -118,11 +136,14 @@ async function parseAssistantEvaluationResult(Runtime, evaluation, timeoutMs, lo
         const messageId = typeof result.value.messageId === 'string'
             ? (result.value.messageId ?? undefined)
             : undefined;
-        return {
-            text: cleanAssistantText(String(result.value.text ?? '')),
-            html,
-            meta: { turnId, messageId },
-        };
+        const text = cleanAssistantText(String(result.value.text ?? ''));
+        const normalized = text.toLowerCase();
+        if (normalized.includes('answer now') &&
+            (normalized.includes('pro thinking') || normalized.includes('chatgpt said'))) {
+            const recovered = await recoverAssistantResponse(Runtime, Math.min(timeoutMs, 10_000), logger);
+            return recovered ?? null;
+        }
+        return { text, html, meta: { turnId, messageId } };
     }
     const fallbackText = typeof result.value === 'string' ? cleanAssistantText(result.value) : '';
     if (!fallbackText) {
@@ -261,7 +282,7 @@ function normalizeAssistantSnapshot(snapshot) {
     }
     const normalized = text.toLowerCase();
     // "Pro thinking" often renders a placeholder turn containing an "Answer now" gate.
-    // Treat it as incomplete so browser mode keeps waiting (and can click the gate).
+    // Treat it as incomplete so browser mode keeps waiting for the real assistant text.
     if (normalized.includes('answer now') && (normalized.includes('pro thinking') || normalized.includes('chatgpt said'))) {
         return null;
     }
@@ -303,7 +324,10 @@ function buildResponseObserverExpression(timeoutMs) {
     const CONVERSATION_SELECTOR = ${conversationLiteral};
     const ASSISTANT_SELECTOR = ${assistantLiteral};
     const settleDelayMs = 800;
-    const ANSWER_NOW_LABEL = 'answer now';
+    const isAnswerNowPlaceholder = (snapshot) => {
+      const normalized = String(snapshot?.text ?? '').toLowerCase();
+      return normalized.includes('answer now') && (normalized.includes('pro thinking') || normalized.includes('chatgpt said'));
+    };
 
     // Helper to detect assistant turns - matches buildAssistantExtractor logic
     const isAssistantTurn = (node) => {
@@ -324,7 +348,8 @@ function buildResponseObserverExpression(timeoutMs) {
         const deadline = Date.now() + ${timeoutMs};
         let stopInterval = null;
         const observer = new MutationObserver(() => {
-          const extracted = extractFromTurns();
+          const extractedRaw = extractFromTurns();
+          const extracted = extractedRaw && !isAnswerNowPlaceholder(extractedRaw) ? extractedRaw : null;
           if (extracted) {
             observer.disconnect();
             if (stopInterval) {
@@ -341,11 +366,6 @@ function buildResponseObserverExpression(timeoutMs) {
         });
         observer.observe(document.body, { childList: true, subtree: true, characterData: true });
         stopInterval = setInterval(() => {
-          // Pro thinking can gate the response behind an "Answer now" button. Keep clicking it while present.
-          const answerNow = Array.from(document.querySelectorAll('button,span')).find((el) => (el?.textContent || '').trim().toLowerCase() === ANSWER_NOW_LABEL);
-          if (answerNow) {
-            dispatchClickSequence(answerNow.closest('button') ?? answerNow);
-          }
           const stop = document.querySelector(STOP_SELECTOR);
           if (!stop) {
             return;
@@ -387,28 +407,28 @@ function buildResponseObserverExpression(timeoutMs) {
     const waitForSettle = async (snapshot) => {
       const settleWindowMs = 5000;
       const settleIntervalMs = 400;
-      const deadline = Date.now() + settleWindowMs;
-      let latest = snapshot;
-      let lastLength = snapshot?.text?.length ?? 0;
-      while (Date.now() < deadline) {
-        await new Promise((resolve) => setTimeout(resolve, settleIntervalMs));
-        const refreshed = extractFromTurns();
-        if (refreshed && (refreshed.text?.length ?? 0) >= lastLength) {
-          latest = refreshed;
-          lastLength = refreshed.text?.length ?? lastLength;
-        }
-        const stopVisible = Boolean(document.querySelector(STOP_SELECTOR));
-        const answerNowVisible = Boolean(Array.from(document.querySelectorAll('button,span')).find((el) => (el?.textContent || '').trim().toLowerCase() === ANSWER_NOW_LABEL));
-        const finishedVisible = isLastAssistantTurnFinished();
+        const deadline = Date.now() + settleWindowMs;
+        let latest = snapshot;
+        let lastLength = snapshot?.text?.length ?? 0;
+        while (Date.now() < deadline) {
+          await new Promise((resolve) => setTimeout(resolve, settleIntervalMs));
+          const refreshed = extractFromTurns();
+          if (refreshed && !isAnswerNowPlaceholder(refreshed) && (refreshed.text?.length ?? 0) >= lastLength) {
+            latest = refreshed;
+            lastLength = refreshed.text?.length ?? lastLength;
+          }
+          const stopVisible = Boolean(document.querySelector(STOP_SELECTOR));
+          const finishedVisible = isLastAssistantTurnFinished();
 
-        if ((!stopVisible && !answerNowVisible) || finishedVisible) {
-          break;
+          if (!stopVisible || finishedVisible) {
+            break;
+          }
         }
-      }
-      return latest ?? snapshot;
-    };
+        return latest ?? snapshot;
+      };
 
-    const extracted = extractFromTurns();
+    const extractedRaw = extractFromTurns();
+    const extracted = extractedRaw && !isAnswerNowPlaceholder(extractedRaw) ? extractedRaw : null;
     if (extracted) {
       return waitForSettle(extracted);
     }