@steipete/oracle 0.7.0 → 0.7.1

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

@@ -218,6 +218,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 +259,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 (and can click the gate).
+    if (normalized.includes('answer now') && (normalized.includes('pro thinking') || normalized.includes('chatgpt said'))) {
+        return null;
+    }
     return {
         text,
         html: snapshot?.html ?? undefined,
@@ -295,10 +303,13 @@ function buildResponseObserverExpression(timeoutMs) {
     const CONVERSATION_SELECTOR = ${conversationLiteral};
     const ASSISTANT_SELECTOR = ${assistantLiteral};
     const settleDelayMs = 800;
+    const ANSWER_NOW_LABEL = 'answer now';
 
     // 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();
@@ -330,6 +341,11 @@ 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;
@@ -382,9 +398,10 @@ function buildResponseObserverExpression(timeoutMs) {
           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();
 
-        if (!stopVisible || finishedVisible) {
+        if ((!stopVisible && !answerNowVisible) || finishedVisible) {
           break;
         }
       }
@@ -407,6 +424,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 +464,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 +485,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 +549,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);
-      };
-
-      const readIntercepted = () => {
-        const markdown = interception.state.text ?? '';
-        return { success: Boolean(markdown.trim()), markdown };
+        setTimeout(waitForButton, 120);
       };
 
-      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();
     });
   })()`;
 }

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

@@ -214,8 +214,33 @@ export async function waitForAttachmentCompletion(Runtime, timeoutMs, expectedNa
         const { result } = await Runtime.evaluate({ expression, returnByValue: true });
         const value = result?.value;
         if (value && !value.uploading) {
-            const attached = new Set((value.attachedNames ?? []).map((name) => name.toLowerCase()));
-            const missing = expectedNormalized.filter((name) => !attached.has(name));
+            const attachedNames = (value.attachedNames ?? [])
+                .map((name) => name.toLowerCase().replace(/\s+/g, ' ').trim())
+                .filter(Boolean);
+            const matchesExpected = (expected) => {
+                const baseName = expected.split('/').pop()?.split('\\').pop() ?? expected;
+                const normalizedExpected = baseName.toLowerCase().replace(/\s+/g, ' ').trim();
+                const expectedNoExt = normalizedExpected.replace(/\.[a-z0-9]{1,10}$/i, '');
+                return attachedNames.some((raw) => {
+                    if (raw.includes(normalizedExpected))
+                        return true;
+                    if (expectedNoExt.length >= 6 && raw.includes(expectedNoExt))
+                        return true;
+                    if (raw.includes('…') || raw.includes('...')) {
+                        const escaped = raw.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+                        const pattern = escaped.replace(/\\…|\\\.\\\.\\\./g, '.*');
+                        try {
+                            const re = new RegExp(pattern);
+                            return re.test(normalizedExpected) || (expectedNoExt.length >= 6 && re.test(expectedNoExt));
+                        }
+                        catch {
+                            return false;
+                        }
+                    }
+                    return false;
+                });
+            };
+            const missing = expectedNormalized.filter((expected) => !matchesExpected(expected));
             if (missing.length === 0) {
                 if (value.state === 'ready') {
                     return;
@@ -223,6 +248,11 @@ export async function waitForAttachmentCompletion(Runtime, timeoutMs, expectedNa
                 if (value.state === 'missing' && value.filesAttached) {
                     return;
                 }
+                // If files are attached but button isn't ready yet, give it more time but don't fail immediately
+                if (value.filesAttached) {
+                    await delay(500);
+                    continue;
+                }
             }
         }
         await delay(250);
@@ -249,7 +279,11 @@ export async function waitForAttachmentVisible(Runtime, expectedName, timeoutMs,
     };
 
     const turns = Array.from(document.querySelectorAll('article[data-testid^="conversation-turn"]'));
-    const userTurns = turns.filter((node) => node.querySelector('[data-message-author-role="user"]'));
+    const userTurns = turns.filter((node) => {
+      const turnAttr = (node.getAttribute('data-turn') || node.dataset?.turn || '').toLowerCase();
+      if (turnAttr === 'user') return true;
+      return Boolean(node.querySelector('[data-message-author-role="user"]'));
+    });
     const lastUser = userTurns[userTurns.length - 1];
     if (lastUser) {
       const turnMatch = Array.from(lastUser.querySelectorAll('*')).some(matchNode);

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

@@ -63,12 +63,41 @@ function buildModelSelectionExpression(targetModel) {
       .map((token) => normalizeText(token))
       .filter(Boolean);
     const targetWords = normalizedTarget.split(' ').filter(Boolean);
+    const desiredVersion = normalizedTarget.includes('5 2')
+      ? '5-2'
+      : normalizedTarget.includes('5 1')
+        ? '5-1'
+        : normalizedTarget.includes('5 0')
+          ? '5-0'
+          : null;
+    const wantsPro = normalizedTarget.includes(' pro') || normalizedTarget.endsWith(' pro') || normalizedTokens.includes('pro');
+    const wantsInstant = normalizedTarget.includes('instant');
+    const wantsThinking = normalizedTarget.includes('thinking');
 
     const button = document.querySelector(BUTTON_SELECTOR);
     if (!button) {
       return { status: 'button-missing' };
     }
 
+    const getButtonLabel = () => (button.textContent ?? '').trim();
+    const buttonMatchesTarget = () => {
+      const normalizedLabel = normalizeText(getButtonLabel());
+      if (!normalizedLabel) return false;
+      if (desiredVersion) {
+        if (desiredVersion === '5-2' && !normalizedLabel.includes('5 2')) return false;
+        if (desiredVersion === '5-1' && !normalizedLabel.includes('5 1')) return false;
+        if (desiredVersion === '5-0' && !normalizedLabel.includes('5 0')) return false;
+      }
+      if (wantsPro && !normalizedLabel.includes(' pro')) return false;
+      if (wantsInstant && !normalizedLabel.includes('instant')) return false;
+      if (wantsThinking && !normalizedLabel.includes('thinking')) return false;
+      return true;
+    };
+
+    if (buttonMatchesTarget()) {
+      return { status: 'already-selected', label: getButtonLabel() };
+    }
+
     let lastPointerClick = 0;
     const pointerClick = () => {
       if (dispatchClickSequence(button)) {
@@ -106,8 +135,46 @@ function buildModelSelectionExpression(targetModel) {
       }
       let score = 0;
       const normalizedTestId = (testid ?? '').toLowerCase();
-      if (normalizedTestId && TEST_IDS.some((id) => normalizedTestId.includes(id))) {
-        score += 1000;
+      if (normalizedTestId) {
+        if (desiredVersion) {
+          // data-testid strings have been observed with both dotted and dashed versions (e.g. gpt-5.2-pro vs gpt-5-2-pro).
+          const has52 =
+            normalizedTestId.includes('5-2') ||
+            normalizedTestId.includes('5.2') ||
+            normalizedTestId.includes('gpt-5-2') ||
+            normalizedTestId.includes('gpt-5.2') ||
+            normalizedTestId.includes('gpt52');
+          const has51 =
+            normalizedTestId.includes('5-1') ||
+            normalizedTestId.includes('5.1') ||
+            normalizedTestId.includes('gpt-5-1') ||
+            normalizedTestId.includes('gpt-5.1') ||
+            normalizedTestId.includes('gpt51');
+          const has50 =
+            normalizedTestId.includes('5-0') ||
+            normalizedTestId.includes('5.0') ||
+            normalizedTestId.includes('gpt-5-0') ||
+            normalizedTestId.includes('gpt-5.0') ||
+            normalizedTestId.includes('gpt50');
+          const candidateVersion = has52 ? '5-2' : has51 ? '5-1' : has50 ? '5-0' : null;
+          // If a candidate advertises a different version, ignore it entirely.
+          if (candidateVersion && candidateVersion !== desiredVersion) {
+            return 0;
+          }
+          // When targeting an explicit version, avoid selecting submenu wrappers that can contain legacy models.
+          if (normalizedTestId.includes('submenu') && candidateVersion === null) {
+            return 0;
+          }
+        }
+        const matches = TEST_IDS.filter((id) => id && normalizedTestId.includes(id));
+        if (matches.length > 0) {
+          // Prefer the most specific match (longest token) instead of treating any hit as equal.
+          // This prevents generic tokens (e.g. "pro") from outweighing version-specific targets.
+          const best = matches.reduce((acc, token) => (token.length > acc.length ? token : acc), '');
+          score += 200 + Math.min(900, best.length * 25);
+          if (best.startsWith('model-switcher-')) score += 120;
+          if (best.includes('gpt-')) score += 60;
+        }
       }
       if (normalizedText && normalizedTarget) {
         if (normalizedText === normalizedTarget) {
@@ -134,6 +201,14 @@ function buildModelSelectionExpression(targetModel) {
         }
         score -= missing * 12;
       }
+      // If the caller didn't explicitly ask for Pro, prefer non-Pro options when both exist.
+      if (wantsPro) {
+        if (!normalizedText.includes(' pro')) {
+          score -= 80;
+        }
+      } else if (normalizedText.includes(' pro')) {
+        score -= 40;
+      }
       return Math.max(score, 0);
     };
 
@@ -153,7 +228,7 @@ function buildModelSelectionExpression(targetModel) {
           }
           const label = getOptionLabel(option);
           if (!bestMatch || score > bestMatch.score) {
-            bestMatch = { node: option, label, score };
+            bestMatch = { node: option, label, score, testid, normalizedText };
           }
         }
       }
@@ -182,11 +257,25 @@ function buildModelSelectionExpression(targetModel) {
         const match = findBestOption();
         if (match) {
           if (optionIsSelected(match.node)) {
-            resolve({ status: 'already-selected', label: match.label });
+            resolve({ status: 'already-selected', label: getButtonLabel() || match.label });
             return;
           }
           dispatchClickSequence(match.node);
-          resolve({ status: 'switched', label: match.label });
+          // Submenus (e.g. "Legacy models") need a second pass to pick the actual model option.
+          // Keep scanning once the submenu opens instead of treating the submenu click as a final switch.
+          const isSubmenu = (match.testid ?? '').toLowerCase().includes('submenu');
+          if (isSubmenu) {
+            setTimeout(attempt, REOPEN_INTERVAL_MS / 2);
+            return;
+          }
+          // Wait for the top bar label to reflect the requested model; otherwise keep scanning.
+          setTimeout(() => {
+            if (buttonMatchesTarget()) {
+              resolve({ status: 'switched', label: getButtonLabel() || match.label });
+              return;
+            }
+            attempt();
+          }, Math.max(120, INITIAL_WAIT_MS));
           return;
         }
         if (performance.now() - start > MAX_WAIT_MS) {

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

@@ -283,20 +283,28 @@ async function verifyPromptCommitted(Runtime, prompt, timeoutMs, logger) {
     const primarySelectorLiteral = JSON.stringify(PROMPT_PRIMARY_SELECTOR);
     const fallbackSelectorLiteral = JSON.stringify(PROMPT_FALLBACK_SELECTOR);
     const script = `(() => {
-    const editor = document.querySelector(${primarySelectorLiteral});
-    const fallback = document.querySelector(${fallbackSelectorLiteral});
-    const normalize = (value) => value?.toLowerCase?.().replace(/\\s+/g, ' ').trim() ?? '';
-    const normalizedPrompt = normalize(${encodedPrompt});
-    const normalizedPromptPrefix = normalizedPrompt.slice(0, 120);
-    const CONVERSATION_SELECTOR = ${JSON.stringify(CONVERSATION_TURN_SELECTOR)};
-    const articles = Array.from(document.querySelectorAll(CONVERSATION_SELECTOR));
-    const normalizedTurns = articles.map((node) => normalize(node?.innerText));
-    const userMatched = normalizedTurns.some((text) => text.includes(normalizedPrompt));
-    const prefixMatched =
-      normalizedPromptPrefix.length > 30 &&
-      normalizedTurns.some((text) => text.includes(normalizedPromptPrefix));
-    const lastTurn = normalizedTurns[normalizedTurns.length - 1] ?? '';
-    return {
+	    const editor = document.querySelector(${primarySelectorLiteral});
+	    const fallback = document.querySelector(${fallbackSelectorLiteral});
+	    const normalize = (value) => {
+	      let text = value?.toLowerCase?.() ?? '';
+	      // Strip markdown *markers* but keep content (ChatGPT renders fence markers differently).
+	      text = text.replace(/\`\`\`[^\\n]*\\n([\\s\\S]*?)\`\`\`/g, ' $1 ');
+	      text = text.replace(/\`\`\`/g, ' ');
+	      text = text.replace(/\`([^\`]*)\`/g, '$1');
+	      return text.replace(/\\s+/g, ' ').trim();
+	    };
+	    const normalizedPrompt = normalize(${encodedPrompt});
+	    const normalizedPromptPrefix = normalizedPrompt.slice(0, 120);
+	    const CONVERSATION_SELECTOR = ${JSON.stringify(CONVERSATION_TURN_SELECTOR)};
+	    const articles = Array.from(document.querySelectorAll(CONVERSATION_SELECTOR));
+	    const normalizedTurns = articles.map((node) => normalize(node?.innerText));
+	    const userMatched =
+	      normalizedPrompt.length > 0 && normalizedTurns.some((text) => text.includes(normalizedPrompt));
+	    const prefixMatched =
+	      normalizedPromptPrefix.length > 30 &&
+	      normalizedTurns.some((text) => text.includes(normalizedPromptPrefix));
+	    const lastTurn = normalizedTurns[normalizedTurns.length - 1] ?? '';
+	    return {
       userMatched,
       prefixMatched,
       fallbackValue: fallback?.value ?? '',

package/dist/src/browser/constants.js

@@ -1,5 +1,5 @@
 export const CHATGPT_URL = 'https://chatgpt.com/';
-export const DEFAULT_MODEL_TARGET = 'ChatGPT 5.2';
+export const DEFAULT_MODEL_TARGET = 'GPT-5.2 Pro';
 export const COOKIE_URLS = ['https://chatgpt.com', 'https://chat.openai.com', 'https://atlas.openai.com'];
 export const INPUT_SELECTORS = [
     'textarea[data-id="prompt-textarea"]',
@@ -13,13 +13,17 @@ export const INPUT_SELECTORS = [
 ];
 export const ANSWER_SELECTORS = [
     'article[data-testid^="conversation-turn"][data-message-author-role="assistant"]',
+    'article[data-testid^="conversation-turn"][data-turn="assistant"]',
     'article[data-testid^="conversation-turn"] [data-message-author-role="assistant"]',
+    'article[data-testid^="conversation-turn"] [data-turn="assistant"]',
     'article[data-testid^="conversation-turn"] .markdown',
     '[data-message-author-role="assistant"] .markdown',
+    '[data-turn="assistant"] .markdown',
     '[data-message-author-role="assistant"]',
+    '[data-turn="assistant"]',
 ];
 export const CONVERSATION_TURN_SELECTOR = 'article[data-testid^="conversation-turn"]';
-export const ASSISTANT_ROLE_SELECTOR = '[data-message-author-role="assistant"]';
+export const ASSISTANT_ROLE_SELECTOR = '[data-message-author-role="assistant"], [data-turn="assistant"]';
 export const CLOUDFLARE_SCRIPT_SELECTOR = 'script[src*="/challenge-platform/"]';
 export const CLOUDFLARE_TITLE = 'just a moment';
 export const PROMPT_PRIMARY_SELECTOR = '#prompt-textarea';

package/dist/src/browser/index.js

@@ -285,7 +285,10 @@ export async function runBrowserMode(options) {
                     logger(`Uploading attachment: ${attachment.displayPath}`);
                     await uploadAttachmentFile({ runtime: Runtime, dom: DOM }, attachment, logger);
                 }
-                const waitBudget = Math.max(config.inputTimeoutMs ?? 30_000, 30_000);
+                // Scale timeout based on number of files: base 30s + 15s per additional file
+                const baseTimeout = config.inputTimeoutMs ?? 30_000;
+                const perFileTimeout = 15_000;
+                const waitBudget = Math.max(baseTimeout, 30_000) + (submissionAttachments.length - 1) * perFileTimeout;
                 await waitForAttachmentCompletion(Runtime, waitBudget, attachmentNames, logger);
                 logger('All attachments uploaded');
             }
@@ -327,10 +330,13 @@ export async function runBrowserMode(options) {
             },
         })).catch(() => null);
         answerMarkdown = copiedMarkdown ?? answerText;
+        // Helper to normalize text for echo detection (collapse whitespace, lowercase)
+        const normalizeForComparison = (text) => text.toLowerCase().replace(/\s+/g, ' ').trim();
         // Final sanity check: ensure we didn't accidentally capture the user prompt instead of the assistant turn.
         const finalSnapshot = await readAssistantSnapshot(Runtime).catch(() => null);
         const finalText = typeof finalSnapshot?.text === 'string' ? finalSnapshot.text.trim() : '';
-        if (finalText &&
+        if (!copiedMarkdown &&
+            finalText &&
             finalText !== answerMarkdown.trim() &&
             finalText !== promptText.trim() &&
             finalText.length >= answerMarkdown.trim().length) {
@@ -338,14 +344,26 @@ export async function runBrowserMode(options) {
             answerText = finalText;
             answerMarkdown = finalText;
         }
-        if (answerMarkdown.trim() === promptText.trim()) {
+        // Detect prompt echo using normalized comparison (whitespace-insensitive)
+        const normalizedAnswer = normalizeForComparison(answerMarkdown);
+        const normalizedPrompt = normalizeForComparison(promptText);
+        const promptPrefix = normalizedPrompt.length >= 80
+            ? normalizedPrompt.slice(0, Math.min(200, normalizedPrompt.length))
+            : '';
+        const isPromptEcho = normalizedAnswer === normalizedPrompt || (promptPrefix.length > 0 && normalizedAnswer.startsWith(promptPrefix));
+        if (isPromptEcho) {
+            logger('Detected prompt echo in response; waiting for actual assistant response...');
             const deadline = Date.now() + 8_000;
             let bestText = null;
             let stableCount = 0;
             while (Date.now() < deadline) {
                 const snapshot = await readAssistantSnapshot(Runtime).catch(() => null);
                 const text = typeof snapshot?.text === 'string' ? snapshot.text.trim() : '';
-                if (text && text !== promptText.trim()) {
+                const normalizedText = normalizeForComparison(text);
+                const isStillEcho = !text ||
+                    normalizedText === normalizedPrompt ||
+                    (promptPrefix.length > 0 && normalizedText.startsWith(promptPrefix));
+                if (!isStillEcho) {
                     if (!bestText || text.length > bestText.length) {
                         bestText = text;
                         stableCount = 0;
@@ -661,7 +679,10 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                     logger(`Uploading attachment: ${attachment.displayPath}`);
                     await uploadAttachmentViaDataTransfer({ runtime: Runtime, dom: DOM }, attachment, logger);
                 }
-                const waitBudget = Math.max(config.inputTimeoutMs ?? 30_000, 30_000);
+                // Scale timeout based on number of files: base 30s + 15s per additional file
+                const baseTimeout = config.inputTimeoutMs ?? 30_000;
+                const perFileTimeout = 15_000;
+                const waitBudget = Math.max(baseTimeout, 30_000) + (submissionAttachments.length - 1) * perFileTimeout;
                 await waitForAttachmentCompletion(Runtime, waitBudget, attachmentNames, logger);
                 logger('All attachments uploaded');
             }
@@ -703,6 +724,58 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
             },
         }).catch(() => null);
         answerMarkdown = copiedMarkdown ?? answerText;
+        // Helper to normalize text for echo detection (collapse whitespace, lowercase)
+        const normalizeForComparison = (text) => text.toLowerCase().replace(/\s+/g, ' ').trim();
+        // Final sanity check: ensure we didn't accidentally capture the user prompt instead of the assistant turn.
+        const finalSnapshot = await readAssistantSnapshot(Runtime).catch(() => null);
+        const finalText = typeof finalSnapshot?.text === 'string' ? finalSnapshot.text.trim() : '';
+        if (finalText &&
+            finalText !== answerMarkdown.trim() &&
+            finalText !== promptText.trim() &&
+            finalText.length >= answerMarkdown.trim().length) {
+            logger('Refreshed assistant response via final DOM snapshot');
+            answerText = finalText;
+            answerMarkdown = finalText;
+        }
+        // Detect prompt echo using normalized comparison (whitespace-insensitive)
+        const normalizedAnswer = normalizeForComparison(answerMarkdown);
+        const normalizedPrompt = normalizeForComparison(promptText);
+        const promptPrefix = normalizedPrompt.length >= 80
+            ? normalizedPrompt.slice(0, Math.min(200, normalizedPrompt.length))
+            : '';
+        const isPromptEcho = normalizedAnswer === normalizedPrompt || (promptPrefix.length > 0 && normalizedAnswer.startsWith(promptPrefix));
+        if (isPromptEcho) {
+            logger('Detected prompt echo in response; waiting for actual assistant response...');
+            const deadline = Date.now() + 8_000;
+            let bestText = null;
+            let stableCount = 0;
+            while (Date.now() < deadline) {
+                const snapshot = await readAssistantSnapshot(Runtime).catch(() => null);
+                const text = typeof snapshot?.text === 'string' ? snapshot.text.trim() : '';
+                const normalizedText = normalizeForComparison(text);
+                const isStillEcho = !text ||
+                    normalizedText === normalizedPrompt ||
+                    (promptPrefix.length > 0 && normalizedText.startsWith(promptPrefix));
+                if (!isStillEcho) {
+                    if (!bestText || text.length > bestText.length) {
+                        bestText = text;
+                        stableCount = 0;
+                    }
+                    else if (text === bestText) {
+                        stableCount += 1;
+                    }
+                    if (stableCount >= 2) {
+                        break;
+                    }
+                }
+                await new Promise((resolve) => setTimeout(resolve, 300));
+            }
+            if (bestText) {
+                logger('Recovered assistant response after detecting prompt echo');
+                answerText = bestText;
+                answerMarkdown = bestText;
+            }
+        }
         stopThinkingMonitor?.();
         const durationMs = Date.now() - startedAt;
         const answerChars = answerText.length;

package/dist/src/cli/browserConfig.js

@@ -6,19 +6,40 @@ const DEFAULT_BROWSER_TIMEOUT_MS = 1_200_000;
 const DEFAULT_BROWSER_INPUT_TIMEOUT_MS = 30_000;
 const DEFAULT_CHROME_PROFILE = 'Default';
 const BROWSER_MODEL_LABELS = {
-    'gpt-5-pro': 'GPT-5 Pro',
-    'gpt-5.1-pro': 'GPT-5.1 Pro',
-    'gpt-5.1': 'GPT-5.1',
-    'gpt-5.2': 'GPT-5.2 Thinking',
-    'gpt-5.2-instant': 'GPT-5.2 Instant',
+    // Browser engine supports GPT-5.2 and GPT-5.2 Pro (legacy/Pro aliases normalize to those targets).
+    'gpt-5-pro': 'GPT-5.2 Pro',
+    'gpt-5.1-pro': 'GPT-5.2 Pro',
+    'gpt-5.1': 'GPT-5.2',
+    'gpt-5.2': 'GPT-5.2',
+    // ChatGPT UI doesn't expose "instant" as a separate picker option; treat it as GPT-5.2 for browser automation.
+    'gpt-5.2-instant': 'GPT-5.2',
     'gpt-5.2-pro': 'GPT-5.2 Pro',
     'gemini-3-pro': 'Gemini 3 Pro',
 };
+export function normalizeChatGptModelForBrowser(model) {
+    const normalized = model.toLowerCase();
+    if (!normalized.startsWith('gpt-') || normalized.includes('codex')) {
+        return model;
+    }
+    // Pro variants: always resolve to the latest Pro model in ChatGPT.
+    if (normalized === 'gpt-5-pro' || normalized === 'gpt-5.1-pro' || normalized.endsWith('-pro')) {
+        return 'gpt-5.2-pro';
+    }
+    // Legacy / UI-mismatch variants: map to the closest ChatGPT picker target.
+    if (normalized === 'gpt-5.2-instant') {
+        return 'gpt-5.2';
+    }
+    if (normalized === 'gpt-5.1') {
+        return 'gpt-5.2';
+    }
+    return model;
+}
 export async function buildBrowserConfig(options) {
     const desiredModelOverride = options.browserModelLabel?.trim();
     const normalizedOverride = desiredModelOverride?.toLowerCase() ?? '';
     const baseModel = options.model.toLowerCase();
-    const shouldUseOverride = normalizedOverride.length > 0 && normalizedOverride !== baseModel;
+    const isChatGptModel = baseModel.startsWith('gpt-') && !baseModel.includes('codex');
+    const shouldUseOverride = !isChatGptModel && normalizedOverride.length > 0 && normalizedOverride !== baseModel;
     const cookieNames = parseCookieNames(options.browserCookieNames ?? process.env.ORACLE_BROWSER_COOKIE_NAMES);
     const inline = await resolveInlineCookies({
         inlineArg: options.browserInlineCookies,
@@ -51,7 +72,11 @@ export async function buildBrowserConfig(options) {
         keepBrowser: options.browserKeepBrowser ? true : undefined,
         manualLogin: options.browserManualLogin ? true : undefined,
         hideWindow: options.browserHideWindow ? true : undefined,
-        desiredModel: shouldUseOverride ? desiredModelOverride : mapModelToBrowserLabel(options.model),
+        desiredModel: isChatGptModel
+            ? mapModelToBrowserLabel(options.model)
+            : shouldUseOverride
+                ? desiredModelOverride
+                : mapModelToBrowserLabel(options.model),
         debug: options.verbose ? true : undefined,
         // Allow cookie failures by default so runs can continue without Chrome/Keychain secrets.
         allowCookieErrors: options.browserAllowCookieErrors ?? true,
@@ -69,7 +94,8 @@ function selectBrowserPort(options) {
     return candidate;
 }
 export function mapModelToBrowserLabel(model) {
-    return BROWSER_MODEL_LABELS[model] ?? DEFAULT_MODEL_TARGET;
+    const normalized = normalizeChatGptModelForBrowser(model);
+    return BROWSER_MODEL_LABELS[normalized] ?? DEFAULT_MODEL_TARGET;
 }
 export function resolveBrowserModelLabel(input, model) {
     const trimmed = input?.trim?.() ?? '';

package/dist/src/cli/help.js

@@ -38,7 +38,7 @@ export function applyHelpStyling(program, version, isTty) {
     program.addHelpText('after', () => renderHelpFooter(program, colors));
 }
 function renderHelpBanner(version, colors) {
-    const subtitle = 'Prompt + files required — GPT-5.1 Pro/GPT-5.1 for tough questions with code/file context.';
+    const subtitle = 'Prompt + files required — GPT-5.2 Pro/GPT-5.2 for tough questions with code/file context.';
     return `${colors.banner(`Oracle CLI v${version}`)} ${colors.subtitle(`— ${subtitle}`)}\n`;
 }
 function renderHelpFooter(program, colors) {
@@ -51,7 +51,7 @@ function renderHelpFooter(program, colors) {
         `${colors.bullet('•')} Best results: 6–30 sentences plus key source files; very short prompts often yield generic answers.`,
         `${colors.bullet('•')} Oracle is one-shot: it does not remember prior runs, so start fresh each time with full context.`,
         `${colors.bullet('•')} Run ${colors.accent('--files-report')} to inspect token spend before hitting the API.`,
-        `${colors.bullet('•')} Non-preview runs spawn detached sessions (especially gpt-5.1-pro API). If the CLI times out, do not re-run — reattach with ${colors.accent('oracle session <slug>')} to resume/inspect the existing run.`,
+        `${colors.bullet('•')} Non-preview runs spawn detached sessions (especially gpt-5.2-pro API). If the CLI times out, do not re-run — reattach with ${colors.accent('oracle session <slug>')} to resume/inspect the existing run.`,
         `${colors.bullet('•')} Set a memorable 3–5 word slug via ${colors.accent('--slug "<words>"')} to keep session IDs tidy.`,
         `${colors.bullet('•')} Finished sessions auto-hide preamble logs when reattached; raw timestamps remain in the saved log file.`,
         `${colors.bullet('•')} Need hidden flags? Run ${colors.accent(`${program.name()} --help --verbose`)} to list search/token/browser overrides.`,
@@ -61,7 +61,7 @@ function renderHelpFooter(program, colors) {
     const formatExample = (command, description) => `${colors.command(`  ${command}`)}\n${colors.muted(`    ${description}`)}`;
     const examples = [
         formatExample(`${program.name()} --render --copy --prompt "Review the TS data layer for schema drift" --file "src/**/*.ts,*/*.test.ts"`, 'Build the bundle, print it, and copy it for manual paste into ChatGPT.'),
-        formatExample(`${program.name()} --prompt "Cross-check the data layer assumptions" --models gpt-5.1-pro,gemini-3-pro --file "src/**/*.ts"`, 'Run multiple API models in one go and aggregate cost/usage.'),
+        formatExample(`${program.name()} --prompt "Cross-check the data layer assumptions" --models gpt-5.2-pro,gemini-3-pro --file "src/**/*.ts"`, 'Run multiple API models in one go and aggregate cost/usage.'),
         formatExample(`${program.name()} status --hours 72 --limit 50`, 'Show sessions from the last 72h (capped at 50 entries).'),
         formatExample(`${program.name()} session <sessionId>`, 'Attach to a running/completed session and stream the saved transcript.'),
         formatExample(`${program.name()} --prompt "Ship review" --slug "release-readiness-audit"`, 'Encourage the model to hand you a 3–5 word slug and pass it along with --slug.'),

package/dist/src/cli/options.js

@@ -137,6 +137,9 @@ export function resolveApiModel(modelValue) {
     if (normalized.includes('5-pro') && !normalized.includes('5.1')) {
         return 'gpt-5-pro';
     }
+    if (normalized.includes('5.2') && normalized.includes('pro')) {
+        return 'gpt-5.2-pro';
+    }
     if (normalized.includes('5.1') && normalized.includes('pro')) {
         return 'gpt-5.1-pro';
     }
@@ -149,6 +152,9 @@ export function resolveApiModel(modelValue) {
     if (normalized.includes('gemini')) {
         return 'gemini-3-pro';
     }
+    if (normalized.includes('pro')) {
+        return 'gpt-5.2-pro';
+    }
     // Passthrough for custom/OpenRouter model IDs.
     return normalized;
 }
@@ -169,12 +175,6 @@ export function inferModelFromLabel(modelValue) {
     if (normalized.includes('claude') && normalized.includes('opus')) {
         return 'claude-4.1-opus';
     }
-    if (normalized.includes('5.0') || normalized.includes('5-pro')) {
-        return 'gpt-5-pro';
-    }
-    if (normalized.includes('gpt-5') && normalized.includes('pro') && !normalized.includes('5.1')) {
-        return 'gpt-5-pro';
-    }
     if (normalized.includes('codex')) {
         return 'gpt-5.1-codex';
     }
@@ -182,13 +182,25 @@ export function inferModelFromLabel(modelValue) {
         return 'gemini-3-pro';
     }
     if (normalized.includes('classic')) {
-        return 'gpt-5.1-pro';
+        return 'gpt-5-pro';
+    }
+    if ((normalized.includes('5.2') || normalized.includes('5_2')) && normalized.includes('pro')) {
+        return 'gpt-5.2-pro';
+    }
+    if (normalized.includes('5.0') || normalized.includes('5-pro')) {
+        return 'gpt-5-pro';
+    }
+    if (normalized.includes('gpt-5') &&
+        normalized.includes('pro') &&
+        !normalized.includes('5.1') &&
+        !normalized.includes('5.2')) {
+        return 'gpt-5-pro';
     }
     if ((normalized.includes('5.1') || normalized.includes('5_1')) && normalized.includes('pro')) {
         return 'gpt-5.1-pro';
     }
     if (normalized.includes('pro')) {
-        return 'gpt-5.1-pro';
+        return 'gpt-5.2-pro';
     }
     if (normalized.includes('5.1') || normalized.includes('5_1')) {
         return 'gpt-5.1';

package/dist/src/cli/runOptions.js

@@ -3,6 +3,7 @@ import { resolveEngine } from './engine.js';
 import { normalizeModelOption, inferModelFromLabel, resolveApiModel, normalizeBaseUrl } from './options.js';
 import { resolveGeminiModelId } from '../oracle/gemini.js';
 import { PromptValidationError } from '../oracle/errors.js';
+import { normalizeChatGptModelForBrowser } from './browserConfig.js';
 export function resolveRunOptionsFromConfig({ prompt, files = [], model, models, engine, userConfig, env = process.env, }) {
     const resolvedEngine = resolveEngineWithConfig({ engine, configEngine: userConfig?.engine, env });
     const browserRequested = engine === 'browser';
@@ -10,9 +11,11 @@ export function resolveRunOptionsFromConfig({ prompt, files = [], model, models,
     const requestedModelList = Array.isArray(models) ? models : [];
     const normalizedRequestedModels = requestedModelList.map((entry) => normalizeModelOption(entry)).filter(Boolean);
     const cliModelArg = normalizeModelOption(model ?? userConfig?.model) || DEFAULT_MODEL;
-    const resolvedModel = resolvedEngine === 'browser' && normalizedRequestedModels.length === 0
+    const inferredModel = resolvedEngine === 'browser' && normalizedRequestedModels.length === 0
         ? inferModelFromLabel(cliModelArg)
         : resolveApiModel(cliModelArg);
+    // Browser engine maps Pro/legacy aliases to the latest ChatGPT picker targets (GPT-5.2 / GPT-5.2 Pro).
+    const resolvedModel = resolvedEngine === 'browser' ? normalizeChatGptModelForBrowser(inferredModel) : inferredModel;
     const isCodex = resolvedModel.startsWith('gpt-5.1-codex');
     const isClaude = resolvedModel.startsWith('claude');
     const isGrok = resolvedModel.startsWith('grok');

package/dist/src/gemini-web/client.js

@@ -35,10 +35,11 @@ function buildCookieHeader(cookieMap) {
         .map(([name, value]) => `${name}=${value}`)
         .join('; ');
 }
-export async function fetchGeminiAccessToken(cookieMap) {
+export async function fetchGeminiAccessToken(cookieMap, signal) {
     const cookieHeader = buildCookieHeader(cookieMap);
     const res = await fetch(GEMINI_APP_URL, {
         redirect: 'follow',
+        signal,
         headers: {
             cookie: cookieHeader,
             'user-agent': USER_AGENT,
@@ -84,10 +85,10 @@ function ensureFullSizeImageUrl(url) {
         return url;
     return `${url}=s2048`;
 }
-async function fetchWithCookiePreservingRedirects(url, init, maxRedirects = 10) {
+async function fetchWithCookiePreservingRedirects(url, init, signal, maxRedirects = 10) {
     let current = url;
     for (let i = 0; i <= maxRedirects; i += 1) {
-        const res = await fetch(current, { ...init, redirect: 'manual' });
+        const res = await fetch(current, { ...init, redirect: 'manual', signal });
         if (res.status >= 300 && res.status < 400) {
             const location = res.headers.get('location');
             if (!location)
@@ -99,14 +100,14 @@ async function fetchWithCookiePreservingRedirects(url, init, maxRedirects = 10)
     }
     throw new Error(`Too many redirects while downloading image (>${maxRedirects}).`);
 }
-async function downloadGeminiImage(url, cookieMap, outputPath) {
+async function downloadGeminiImage(url, cookieMap, outputPath, signal) {
     const cookieHeader = buildCookieHeader(cookieMap);
     const res = await fetchWithCookiePreservingRedirects(ensureFullSizeImageUrl(url), {
         headers: {
             cookie: cookieHeader,
             'user-agent': USER_AGENT,
         },
-    });
+    }, signal);
     if (!res.ok) {
         throw new Error(`Failed to download image: ${res.status} ${res.statusText} (${res.url})`);
     }
@@ -114,7 +115,7 @@ async function downloadGeminiImage(url, cookieMap, outputPath) {
     await mkdir(path.dirname(outputPath), { recursive: true });
     await writeFile(outputPath, data);
 }
-async function uploadGeminiFile(filePath) {
+async function uploadGeminiFile(filePath, signal) {
     const absPath = path.resolve(process.cwd(), filePath);
     const data = await readFile(absPath);
     const fileName = path.basename(absPath);
@@ -123,6 +124,7 @@ async function uploadGeminiFile(filePath) {
     const res = await fetch(GEMINI_UPLOAD_URL, {
         method: 'POST',
         redirect: 'follow',
+        signal,
         headers: {
             'push-id': GEMINI_UPLOAD_PUSH_ID,
             'user-agent': USER_AGENT,
@@ -234,10 +236,13 @@ export function isGeminiModelUnavailable(errorCode) {
 }
 export async function runGeminiWebOnce(input) {
     const cookieHeader = buildCookieHeader(input.cookieMap);
-    const at = await fetchGeminiAccessToken(input.cookieMap);
+    const at = await fetchGeminiAccessToken(input.cookieMap, input.signal);
     const uploaded = [];
     for (const file of input.files ?? []) {
-        uploaded.push(await uploadGeminiFile(file));
+        if (input.signal?.aborted) {
+            throw new Error('Gemini web run aborted before upload.');
+        }
+        uploaded.push(await uploadGeminiFile(file, input.signal));
     }
     const fReq = buildGeminiFReqPayload(input.prompt, uploaded, input.chatMetadata ?? null);
     const params = new URLSearchParams();
@@ -246,6 +251,7 @@ export async function runGeminiWebOnce(input) {
     const res = await fetch(GEMINI_STREAM_GENERATE_URL, {
         method: 'POST',
         redirect: 'follow',
+        signal: input.signal,
         headers: {
             'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
             origin: 'https://gemini.google.com',
@@ -307,15 +313,15 @@ export async function runGeminiWebWithFallback(input) {
     }
     return { ...attempt, effectiveModel: input.model };
 }
-export async function saveFirstGeminiImageFromOutput(output, cookieMap, outputPath) {
+export async function saveFirstGeminiImageFromOutput(output, cookieMap, outputPath, signal) {
     const generatedOrWeb = output.images.find((img) => img.kind === 'generated') ?? output.images[0];
     if (generatedOrWeb?.url) {
-        await downloadGeminiImage(generatedOrWeb.url, cookieMap, outputPath);
+        await downloadGeminiImage(generatedOrWeb.url, cookieMap, outputPath, signal);
         return { saved: true, imageCount: output.images.length };
     }
     const ggdl = extractGgdlUrls(output.rawResponseText);
     if (ggdl[0]) {
-        await downloadGeminiImage(ggdl[0], cookieMap, outputPath);
+        await downloadGeminiImage(ggdl[0], cookieMap, outputPath, signal);
         return { saved: true, imageCount: ggdl.length };
     }
     return { saved: false, imageCount: 0 };

package/dist/src/gemini-web/executor.js

@@ -100,6 +100,17 @@ export function createGeminiWebExecutor(geminiOptions) {
         if (!cookieMap['__Secure-1PSID'] || !cookieMap['__Secure-1PSIDTS']) {
             throw new Error('Gemini browser mode requires Chrome cookies for google.com (missing __Secure-1PSID/__Secure-1PSIDTS).');
         }
+        const configTimeout = typeof runOptions.config?.timeoutMs === 'number' && Number.isFinite(runOptions.config.timeoutMs)
+            ? Math.max(1_000, runOptions.config.timeoutMs)
+            : null;
+        const defaultTimeoutMs = geminiOptions.youtube
+            ? 240_000
+            : geminiOptions.generateImage || geminiOptions.editImage
+                ? 300_000
+                : 120_000;
+        const timeoutMs = Math.min(configTimeout ?? defaultTimeoutMs, 600_000);
+        const controller = new AbortController();
+        const timeout = setTimeout(() => controller.abort(), timeoutMs);
         const generateImagePath = resolveInvocationPath(geminiOptions.generateImage);
         const editImagePath = resolveInvocationPath(geminiOptions.editImage);
         const outputPath = resolveInvocationPath(geminiOptions.outputPath);
@@ -116,71 +127,80 @@ export function createGeminiWebExecutor(geminiOptions) {
         }
         const model = resolveGeminiWebModel(runOptions.config?.desiredModel, log);
         let response;
-        if (editImagePath) {
-            const intro = await runGeminiWebWithFallback({
-                prompt: 'Here is an image to edit',
-                files: [editImagePath],
-                model,
-                cookieMap,
-                chatMetadata: null,
-            });
-            const editPrompt = `Use image generation tool to ${prompt}`;
-            const out = await runGeminiWebWithFallback({
-                prompt: editPrompt,
-                files: attachmentPaths,
-                model,
-                cookieMap,
-                chatMetadata: intro.metadata,
-            });
-            response = {
-                text: out.text ?? null,
-                thoughts: geminiOptions.showThoughts ? out.thoughts : null,
-                has_images: false,
-                image_count: 0,
-            };
-            const resolvedOutputPath = outputPath ?? generateImagePath ?? 'generated.png';
-            const imageSave = await saveFirstGeminiImageFromOutput(out, cookieMap, resolvedOutputPath);
-            response.has_images = imageSave.saved;
-            response.image_count = imageSave.imageCount;
-            if (!imageSave.saved) {
-                throw new Error(`No images generated. Response text:\n${out.text || '(empty response)'}`);
+        try {
+            if (editImagePath) {
+                const intro = await runGeminiWebWithFallback({
+                    prompt: 'Here is an image to edit',
+                    files: [editImagePath],
+                    model,
+                    cookieMap,
+                    chatMetadata: null,
+                    signal: controller.signal,
+                });
+                const editPrompt = `Use image generation tool to ${prompt}`;
+                const out = await runGeminiWebWithFallback({
+                    prompt: editPrompt,
+                    files: attachmentPaths,
+                    model,
+                    cookieMap,
+                    chatMetadata: intro.metadata,
+                    signal: controller.signal,
+                });
+                response = {
+                    text: out.text ?? null,
+                    thoughts: geminiOptions.showThoughts ? out.thoughts : null,
+                    has_images: false,
+                    image_count: 0,
+                };
+                const resolvedOutputPath = outputPath ?? generateImagePath ?? 'generated.png';
+                const imageSave = await saveFirstGeminiImageFromOutput(out, cookieMap, resolvedOutputPath, controller.signal);
+                response.has_images = imageSave.saved;
+                response.image_count = imageSave.imageCount;
+                if (!imageSave.saved) {
+                    throw new Error(`No images generated. Response text:\n${out.text || '(empty response)'}`);
+                }
             }
-        }
-        else if (generateImagePath) {
-            const out = await runGeminiWebWithFallback({
-                prompt,
-                files: attachmentPaths,
-                model,
-                cookieMap,
-                chatMetadata: null,
-            });
-            response = {
-                text: out.text ?? null,
-                thoughts: geminiOptions.showThoughts ? out.thoughts : null,
-                has_images: false,
-                image_count: 0,
-            };
-            const imageSave = await saveFirstGeminiImageFromOutput(out, cookieMap, generateImagePath);
-            response.has_images = imageSave.saved;
-            response.image_count = imageSave.imageCount;
-            if (!imageSave.saved) {
-                throw new Error(`No images generated. Response text:\n${out.text || '(empty response)'}`);
+            else if (generateImagePath) {
+                const out = await runGeminiWebWithFallback({
+                    prompt,
+                    files: attachmentPaths,
+                    model,
+                    cookieMap,
+                    chatMetadata: null,
+                    signal: controller.signal,
+                });
+                response = {
+                    text: out.text ?? null,
+                    thoughts: geminiOptions.showThoughts ? out.thoughts : null,
+                    has_images: false,
+                    image_count: 0,
+                };
+                const imageSave = await saveFirstGeminiImageFromOutput(out, cookieMap, generateImagePath, controller.signal);
+                response.has_images = imageSave.saved;
+                response.image_count = imageSave.imageCount;
+                if (!imageSave.saved) {
+                    throw new Error(`No images generated. Response text:\n${out.text || '(empty response)'}`);
+                }
+            }
+            else {
+                const out = await runGeminiWebWithFallback({
+                    prompt,
+                    files: attachmentPaths,
+                    model,
+                    cookieMap,
+                    chatMetadata: null,
+                    signal: controller.signal,
+                });
+                response = {
+                    text: out.text ?? null,
+                    thoughts: geminiOptions.showThoughts ? out.thoughts : null,
+                    has_images: out.images.length > 0,
+                    image_count: out.images.length,
+                };
             }
         }
-        else {
-            const out = await runGeminiWebWithFallback({
-                prompt,
-                files: attachmentPaths,
-                model,
-                cookieMap,
-                chatMetadata: null,
-            });
-            response = {
-                text: out.text ?? null,
-                thoughts: geminiOptions.showThoughts ? out.thoughts : null,
-                has_images: out.images.length > 0,
-                image_count: out.images.length,
-            };
+        finally {
+            clearTimeout(timeout);
         }
         const answerText = response.text ?? '';
         let answerMarkdown = answerText;

package/dist/src/mcp/tools/consult.js

@@ -129,7 +129,10 @@ export function registerConsultTool(server) {
         let browserConfig;
         if (resolvedEngine === 'browser') {
             const preferredLabel = (browserModelLabel ?? model)?.trim();
-            const desiredModelLabel = resolveBrowserModelLabel(preferredLabel, runOptions.model);
+            const isChatGptModel = runOptions.model.startsWith('gpt-') && !runOptions.model.includes('codex');
+            const desiredModelLabel = isChatGptModel
+                ? mapModelToBrowserLabel(runOptions.model)
+                : resolveBrowserModelLabel(preferredLabel, runOptions.model);
             // Keep the browser path minimal; only forward a desired model label for the ChatGPT picker.
             browserConfig = {
                 url: CHATGPT_URL,

package/dist/src/oracle/config.js

@@ -2,7 +2,7 @@ import { countTokens as countTokensGpt5 } from 'gpt-tokenizer/model/gpt-5';
 import { countTokens as countTokensGpt5Pro } from 'gpt-tokenizer/model/gpt-5-pro';
 import { countTokens as countTokensAnthropicRaw } from '@anthropic-ai/tokenizer';
 import { stringifyTokenizerInput } from './tokenStringifier.js';
-export const DEFAULT_MODEL = 'gpt-5.1-pro';
+export const DEFAULT_MODEL = 'gpt-5.2-pro';
 export const PRO_MODELS = new Set(['gpt-5.1-pro', 'gpt-5-pro', 'gpt-5.2-pro', 'claude-4.5-sonnet', 'claude-4.1-opus']);
 const countTokensAnthropic = (input) => countTokensAnthropicRaw(stringifyTokenizerInput(input));
 export const MODEL_CONFIGS = {

package/dist/src/oracle/run.js

@@ -191,7 +191,6 @@ export async function runOracle(options, deps = {}) {
         (options.model.startsWith('gemini')
             ? resolveGeminiModelId(options.model)
             : (modelConfig.apiModel ?? modelConfig.model));
-    const headerModelLabel = richTty ? chalk.cyan(modelConfig.model) : modelConfig.model;
     const requestBody = buildRequestBody({
         modelConfig,
         systemPrompt,
@@ -205,7 +204,13 @@ export async function runOracle(options, deps = {}) {
     const tokenLabel = formatTokenEstimate(estimatedInputTokens, (text) => (richTty ? chalk.green(text) : text));
     const fileLabel = richTty ? chalk.magenta(fileCount.toString()) : fileCount.toString();
     const filesPhrase = fileCount === 0 ? 'no files' : `${fileLabel} files`;
-    const headerLine = `Calling ${headerModelLabel} — ${tokenLabel} tokens, ${filesPhrase}.`;
+    const headerModelLabelBase = richTty ? chalk.cyan(modelConfig.model) : modelConfig.model;
+    const headerModelSuffix = effectiveModelId !== modelConfig.model
+        ? richTty
+            ? chalk.gray(` (API: ${effectiveModelId})`)
+            : ` (API: ${effectiveModelId})`
+        : '';
+    const headerLine = `Calling ${headerModelLabelBase}${headerModelSuffix} — ${tokenLabel} tokens, ${filesPhrase}.`;
     const shouldReportFiles = (options.filesReport || fileTokenInfo.totalTokens > inputTokenBudget) && fileTokenInfo.stats.length > 0;
     if (!isPreview) {
         if (!options.suppressHeader) {
@@ -213,9 +218,14 @@ export async function runOracle(options, deps = {}) {
         }
         const maskedKey = maskApiKey(apiKey);
         if (maskedKey && options.verbose) {
-            const resolvedSuffix = effectiveModelId !== modelConfig.model ? ` (resolved: ${effectiveModelId})` : '';
+            const resolvedSuffix = effectiveModelId !== modelConfig.model ? ` (API: ${effectiveModelId})` : '';
             log(dim(`Using ${envVar}=${maskedKey} for model ${modelConfig.model}${resolvedSuffix}`));
         }
+        if (!options.suppressHeader &&
+            modelConfig.model === 'gpt-5.1-pro' &&
+            effectiveModelId === 'gpt-5.2-pro') {
+            log(dim('Note: `gpt-5.1-pro` is a stable CLI alias; OpenAI API uses `gpt-5.2-pro`.'));
+        }
         if (baseUrl) {
             log(dim(`Base URL: ${formatBaseUrlForLog(baseUrl)}`));
         }
@@ -442,10 +452,11 @@ export async function runOracle(options, deps = {}) {
         if (response.id && response.status === 'in_progress') {
             const polishingStart = now();
             const pollIntervalMs = 2_000;
-            const maxWaitMs = 60_000;
+            const maxWaitMs = 180_000;
             log(chalk.dim('Response still in_progress; polling until completion...'));
             // Short polling loop — we don't want to hang forever, just catch late finalization.
             while (now() - polishingStart < maxWaitMs) {
+                throwIfTimedOut();
                 await wait(pollIntervalMs);
                 const refreshed = await clientInstance.responses.retrieve(response.id);
                 if (refreshed.status === 'completed') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steipete/oracle",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "CLI wrapper around OpenAI Responses API with GPT-5.2 Pro (via gpt-5.1-pro alias), GPT-5.2, GPT-5.1, and GPT-5.1 Codex high reasoning modes.",
   "type": "module",
   "main": "dist/bin/oracle-cli.js",
@@ -41,44 +41,44 @@
   "homepage": "https://github.com/steipete/oracle#readme",
   "dependencies": {
     "@anthropic-ai/tokenizer": "^0.0.4",
-    "@google/genai": "^1.31.0",
+    "@google/genai": "^1.34.0",
     "@google/generative-ai": "^0.24.1",
-    "@modelcontextprotocol/sdk": "^1.24.3",
+    "@modelcontextprotocol/sdk": "^1.25.1",
     "chalk": "^5.6.2",
     "chrome-cookies-secure": "3.0.0",
     "chrome-launcher": "^1.2.1",
     "chrome-remote-interface": "^0.33.3",
-    "clipboardy": "^5.0.1",
+    "clipboardy": "^5.0.2",
     "commander": "^14.0.2",
     "dotenv": "^17.2.3",
     "fast-glob": "^3.3.3",
     "gpt-tokenizer": "^3.4.0",
-    "inquirer": "13.0.2",
+    "inquirer": "13.1.0",
     "json5": "^2.2.3",
     "keytar": "^7.9.0",
     "kleur": "^4.1.5",
     "markdansi": "^0.1.3",
-    "openai": "^6.10.0",
-    "shiki": "^3.19.0",
+    "openai": "^6.14.0",
+    "shiki": "^3.20.0",
     "sqlite3": "^5.1.7",
     "toasted-notifier": "^10.1.0",
-    "zod": "^4.1.13"
+    "zod": "^4.2.1"
   },
   "devDependencies": {
     "@anthropic-ai/tokenizer": "^0.0.4",
-    "@biomejs/biome": "^2.3.8",
+    "@biomejs/biome": "^2.3.9",
     "@cdktf/node-pty-prebuilt-multiarch": "0.10.2",
     "@types/chrome-remote-interface": "^0.33.0",
     "@types/inquirer": "^9.0.9",
-    "@types/node": "^24.10.1",
-    "@vitest/coverage-v8": "4.0.15",
-    "devtools-protocol": "^0.0.1551306",
-    "es-toolkit": "^1.42.0",
-    "esbuild": "^0.27.1",
-    "puppeteer-core": "^24.32.0",
+    "@types/node": "^25.0.3",
+    "@vitest/coverage-v8": "4.0.16",
+    "devtools-protocol": "0.0.1559729",
+    "es-toolkit": "^1.43.0",
+    "esbuild": "^0.27.2",
+    "puppeteer-core": "^24.33.0",
     "tsx": "^4.21.0",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.15"
+    "vitest": "^4.0.16"
   },
   "optionalDependencies": {
     "win-dpapi": "npm:@primno/dpapi@2.0.1"