@steipete/oracle 0.7.0 → 0.7.2

package/dist/bin/oracle-cli.js

@@ -87,7 +87,7 @@ program.hook('preAction', (thisCommand) => {
 });
 program
     .name('oracle')
-    .description('One-shot GPT-5.1 Pro / GPT-5.1 / GPT-5.1 Codex tool for hard questions that benefit from large file context and server-side search.')
+    .description('One-shot GPT-5.2 Pro / GPT-5.2 / GPT-5.1 Codex tool for hard questions that benefit from large file context and server-side search.')
     .version(VERSION)
     .argument('[prompt]', 'Prompt text (shorthand for --prompt).')
     .option('-p, --prompt <text>', 'User prompt to send to the model.')
@@ -112,8 +112,8 @@ program
     .addOption(new Option('--copy-markdown', 'Copy the assembled markdown bundle to the clipboard; pair with --render to print it too.').default(false))
     .addOption(new Option('--copy').hideHelp().default(false))
     .option('-s, --slug <words>', 'Custom session slug (3-5 words).')
-    .option('-m, --model <model>', 'Model to target (gpt-5.1-pro default; aliases to gpt-5.2-pro on API. Also gpt-5-pro, gpt-5.1, gpt-5.1-codex API-only, gpt-5.2, gpt-5.2-instant, gpt-5.2-pro, gemini-3-pro, claude-4.5-sonnet, claude-4.1-opus, or ChatGPT labels like "5.2 Thinking" for browser runs).', normalizeModelOption)
-    .addOption(new Option('--models <models>', 'Comma-separated API model list to query in parallel (e.g., "gpt-5.1-pro,gemini-3-pro").')
+    .option('-m, --model <model>', 'Model to target (gpt-5.2-pro default; also supports gpt-5.1-pro alias). Also gpt-5-pro, gpt-5.1, gpt-5.1-codex API-only, gpt-5.2, gpt-5.2-instant, gpt-5.2-pro, gemini-3-pro, claude-4.5-sonnet, claude-4.1-opus, or ChatGPT labels like "5.2 Thinking" for browser runs).', normalizeModelOption)
+    .addOption(new Option('--models <models>', 'Comma-separated API model list to query in parallel (e.g., "gpt-5.2-pro,gemini-3-pro").')
     .argParser(collectModelList)
     .default([]))
     .addOption(new Option('-e, --engine <mode>', 'Execution engine (api | browser). Browser engine: GPT models automate ChatGPT; Gemini models use a cookie-based client for gemini.google.com. If omitted, oracle picks api when OPENAI_API_KEY is set, otherwise browser.').choices(['api', 'browser']))
@@ -123,7 +123,7 @@ program
     .addOption(new Option('--[no-]notify', 'Desktop notification when a session finishes (default on unless CI/SSH).')
     .default(undefined))
     .addOption(new Option('--[no-]notify-sound', 'Play a notification sound on completion (default off).').default(undefined))
-    .addOption(new Option('--timeout <seconds|auto>', 'Overall timeout before aborting the API call (auto = 60m for gpt-5.1-pro, 120s otherwise).')
+    .addOption(new Option('--timeout <seconds|auto>', 'Overall timeout before aborting the API call (auto = 60m for gpt-5.2-pro, 120s otherwise).')
     .argParser(parseTimeoutOption)
     .default('auto'))
     .addOption(new Option('--preview [mode]', '(alias) Preview the request without calling the model (summary | json | full). Deprecated: use --dry-run instead.')

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) {
@@ -218,6 +239,8 @@ async function isCompletionVisible(Runtime) {
         const ASSISTANT_SELECTOR = '${ASSISTANT_ROLE_SELECTOR}';
         const isAssistantTurn = (node) => {
           if (!(node instanceof HTMLElement)) return false;
+          const turnAttr = (node.getAttribute('data-turn') || node.dataset?.turn || '').toLowerCase();
+          if (turnAttr === 'assistant') return true;
           const role = (node.getAttribute('data-message-author-role') || node.dataset?.messageAuthorRole || '').toLowerCase();
           if (role === 'assistant') return true;
           const testId = (node.getAttribute('data-testid') || '').toLowerCase();
@@ -257,6 +280,12 @@ function normalizeAssistantSnapshot(snapshot) {
     if (!text.trim()) {
         return null;
     }
+    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 for the real assistant text.
+    if (normalized.includes('answer now') && (normalized.includes('pro thinking') || normalized.includes('chatgpt said'))) {
+        return null;
+    }
     return {
         text,
         html: snapshot?.html ?? undefined,
@@ -295,10 +324,16 @@ function buildResponseObserverExpression(timeoutMs) {
     const CONVERSATION_SELECTOR = ${conversationLiteral};
     const ASSISTANT_SELECTOR = ${assistantLiteral};
     const settleDelayMs = 800;
+    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) => {
       if (!(node instanceof HTMLElement)) return false;
+      const turnAttr = (node.getAttribute('data-turn') || node.dataset?.turn || '').toLowerCase();
+      if (turnAttr === 'assistant') return true;
       const role = (node.getAttribute('data-message-author-role') || node.dataset?.messageAuthorRole || '').toLowerCase();
       if (role === 'assistant') return true;
       const testId = (node.getAttribute('data-testid') || '').toLowerCase();
@@ -313,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) {
@@ -371,27 +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 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 || 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);
     }
@@ -407,6 +444,10 @@ function buildAssistantExtractor(functionName) {
     const ASSISTANT_SELECTOR = ${assistantLiteral};
     const isAssistantTurn = (node) => {
       if (!(node instanceof HTMLElement)) return false;
+      const turnAttr = (node.getAttribute('data-turn') || node.dataset?.turn || '').toLowerCase();
+      if (turnAttr === 'assistant') {
+        return true;
+      }
       const role = (node.getAttribute('data-message-author-role') || node.dataset?.messageAuthorRole || '').toLowerCase();
       if (role === 'assistant') {
         return true;
@@ -443,11 +484,13 @@ function buildAssistantExtractor(functionName) {
       }
       const messageRoot = turn.querySelector(ASSISTANT_SELECTOR) ?? turn;
       expandCollapsibles(messageRoot);
-      const preferred =
-        messageRoot.querySelector('.markdown') ||
-        messageRoot.querySelector('[data-message-content]') ||
-        messageRoot;
-      const text = preferred?.innerText ?? '';
+      const preferred = messageRoot.querySelector('.markdown') || messageRoot.querySelector('[data-message-content]');
+      if (!preferred) {
+        continue;
+      }
+      const innerText = preferred?.innerText ?? '';
+      const textContent = preferred?.textContent ?? '';
+      const text = innerText.trim().length > 0 ? innerText : textContent;
       const html = preferred?.innerHTML ?? '';
       const messageId = messageRoot.getAttribute('data-message-id');
       const turnId = messageRoot.getAttribute('data-testid');
@@ -462,7 +505,7 @@ function buildCopyExpression(meta) {
     return `(() => {
     ${buildClickDispatcher()}
     const BUTTON_SELECTOR = '${COPY_BUTTON_SELECTOR}';
-    const TIMEOUT_MS = 5000;
+    const TIMEOUT_MS = 10000;
 
     const locateButton = () => {
       const hint = ${JSON.stringify(meta ?? {})};
@@ -526,53 +569,62 @@ function buildCopyExpression(meta) {
     };
 
     return new Promise((resolve) => {
-      const button = locateButton();
-      if (!button) {
-        resolve({ success: false, status: 'missing-button' });
-        return;
-      }
-      const interception = interceptClipboard();
-      let settled = false;
-      let pollId = null;
-      let timeoutId = null;
-      const finish = (payload) => {
-        if (settled) {
+      const deadline = Date.now() + TIMEOUT_MS;
+      const waitForButton = () => {
+        const button = locateButton();
+        if (button) {
+          const interception = interceptClipboard();
+          let settled = false;
+          let pollId = null;
+          let timeoutId = null;
+          const finish = (payload) => {
+            if (settled) {
+              return;
+            }
+            settled = true;
+            if (pollId) {
+              clearInterval(pollId);
+            }
+            if (timeoutId) {
+              clearTimeout(timeoutId);
+            }
+            button.removeEventListener('copy', handleCopy, true);
+            interception.restore?.();
+            resolve(payload);
+          };
+
+          const readIntercepted = () => {
+            const markdown = interception.state.text ?? '';
+            return { success: Boolean(markdown.trim()), markdown };
+          };
+
+          const handleCopy = () => {
+            finish(readIntercepted());
+          };
+
+          button.addEventListener('copy', handleCopy, true);
+          button.scrollIntoView({ block: 'center', behavior: 'instant' });
+          dispatchClickSequence(button);
+          pollId = setInterval(() => {
+            const payload = readIntercepted();
+            if (payload.success) {
+              finish(payload);
+            }
+          }, 100);
+          timeoutId = setTimeout(() => {
+            button.removeEventListener('copy', handleCopy, true);
+            finish({ success: false, status: 'timeout' });
+          }, TIMEOUT_MS);
           return;
         }
-        settled = true;
-        if (pollId) {
-          clearInterval(pollId);
-        }
-        if (timeoutId) {
-          clearTimeout(timeoutId);
+        if (Date.now() > deadline) {
+          resolve({ success: false, status: 'missing-button' });
+          return;
         }
-        button.removeEventListener('copy', handleCopy, true);
-        interception.restore?.();
-        resolve(payload);
+        setTimeout(waitForButton, 120);
       };
 
-      const readIntercepted = () => {
-        const markdown = interception.state.text ?? '';
-        return { success: Boolean(markdown.trim()), markdown };
-      };
-
-      const handleCopy = () => {
-        finish(readIntercepted());
-      };
-
-      button.addEventListener('copy', handleCopy, true);
-      button.scrollIntoView({ block: 'center', behavior: 'instant' });
-      dispatchClickSequence(button);
-      pollId = setInterval(() => {
-        const payload = readIntercepted();
-        if (payload.success) {
-          finish(payload);
-        }
-      }, 100);
-      timeoutId = setTimeout(() => {
-        button.removeEventListener('copy', handleCopy, true);
-        finish({ success: false, status: 'timeout' });
-      }, TIMEOUT_MS);
+      waitForButton();
     });
   })()`;
 }