@steipete/oracle 0.18.0 → 0.20.0

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

@@ -3,7 +3,7 @@ import { buildConversationTurnListExpression } from "../conversationTurns.js";
 import { delay } from "../utils.js";
 import { isDeepResearchIncompleteText } from "../deepResearchResult.js";
 import { buildClickDispatcher } from "./domEvents.js";
-import { captureAssistantMarkdown, readAssistantSnapshot } from "./assistantResponse.js";
+import { captureAssistantMarkdown, readAssistantSnapshot, throwIfAssistantUiError, } from "./assistantResponse.js";
 import { BrowserAutomationError } from "../../oracle/errors.js";
 /**
  * Activates Deep Research mode through ChatGPT's composer tools menu and
@@ -79,65 +79,131 @@ async function waitForDeepResearchPill(Runtime, timeoutMs = 5000) {
  * After prompt submission, waits for the research plan to appear and
  * auto-confirm (~60s countdown + 10s safety margin).
  */
-export async function waitForResearchPlanAutoConfirm(Runtime, logger, autoConfirmWaitMs = DEEP_RESEARCH_AUTO_CONFIRM_WAIT_MS) {
+export async function waitForResearchPlanAutoConfirm(Runtime, logger, autoConfirmWaitMs = DEEP_RESEARCH_AUTO_CONFIRM_WAIT_MS, options) {
+    const ignoredTargetKeys = new Set(options?.ignoredTargetKeys ?? []);
+    const minTurnIndex = typeof options?.minTurnIndex === "number" && Number.isFinite(options.minTurnIndex)
+        ? Math.floor(options.minTurnIndex)
+        : -1;
+    let capturedPlan = null;
+    let loggedPlan = false;
+    const targetOwnerMinTurnIndex = minTurnIndex >= 0 && options?.targetBaselineCaptured !== true ? minTurnIndex : -1;
+    const readPlanStatus = async () => {
+        const targetRead = options?.client
+            ? ((await readDeepResearchTargetResult(options.client, ignoredTargetKeys, targetOwnerMinTurnIndex).catch(() => null))?.read ?? null)
+            : null;
+        if (targetRead?.planTitle || targetRead?.researchStarted) {
+            return targetRead;
+        }
+        const inPageRead = options?.Page
+            ? await readDeepResearchFrameResult(Runtime, options.Page, options.client, minTurnIndex).catch(() => null)
+            : null;
+        return inPageRead?.read ?? targetRead;
+    };
+    const capturePlan = async (status) => {
+        if (!status.planTitle || !status.planSteps || status.planSteps.length === 0) {
+            return capturedPlan;
+        }
+        const next = {
+            title: status.planTitle,
+            steps: status.planSteps,
+            phase: status.researchStarted ? "researching" : "planning",
+            ...(status.planActionText ? { actionText: status.planActionText } : {}),
+            capturedAt: capturedPlan?.capturedAt ?? new Date().toISOString(),
+        };
+        const changed = !capturedPlan ||
+            capturedPlan.phase !== next.phase ||
+            capturedPlan.title !== next.title ||
+            capturedPlan.steps.join("\n") !== next.steps.join("\n") ||
+            capturedPlan.actionText !== next.actionText;
+        capturedPlan = next;
+        if (!loggedPlan) {
+            logger(`[browser] Deep Research plan detected:\n${[next.title, ...next.steps.map((step, index) => `${index + 1}. ${step}`)].join("\n")}`);
+            loggedPlan = true;
+        }
+        if (changed) {
+            await options?.onPlan?.(next);
+        }
+        return next;
+    };
+    const reportResearchStarted = async () => {
+        if (capturedPlan?.phase === "planning") {
+            capturedPlan = { ...capturedPlan, phase: "researching" };
+            await options?.onPlan?.(capturedPlan);
+        }
+        logger("[browser] Deep Research execution started; plan countdown is complete.");
+        return capturedPlan;
+    };
     // Phase A: Detect research plan appearance (up to 60s)
     const planDeadline = Date.now() + 60_000;
     let planDetected = false;
     while (Date.now() < planDeadline) {
+        const frameStatus = await readPlanStatus();
+        if (frameStatus) {
+            await capturePlan(frameStatus);
+            if (frameStatus.researchStarted) {
+                return reportResearchStarted();
+            }
+            if (capturedPlan) {
+                planDetected = true;
+                break;
+            }
+        }
+        // Legacy/inline fallback. Do not treat an arbitrary large iframe as a plan:
+        // ChatGPT projects, attachments, and other tools also render large iframes.
         const { result } = await Runtime.evaluate({
             expression: `(() => {
-        const iframes = document.querySelectorAll('iframe');
-        const hasResearchIframe = Array.from(iframes).some(f => {
-          const rect = f.getBoundingClientRect();
-          return rect.width > 200 && rect.height > 200;
-        });
-        const assistantText = (document.querySelector('[data-message-author-role="assistant"]')?.textContent || '').toLowerCase();
+        const turns = Array.from(document.querySelectorAll('[data-message-author-role="assistant"]'));
+        const assistantText = String(turns.at(-1)?.textContent || '').toLowerCase();
         const hasResearchText = assistantText.includes('researching') ||
           assistantText.includes('research plan') ||
-          assistantText.includes('survey') ||
-          assistantText.includes('analyze');
-        return { hasResearchIframe, hasResearchText };
+          assistantText.includes('正在研究') ||
+          assistantText.includes('研究计划');
+        return { hasResearchText };
       })()`,
             returnByValue: true,
         });
         const val = result?.value;
-        if (val?.hasResearchIframe || val?.hasResearchText) {
+        if (val?.hasResearchText) {
             planDetected = true;
-            logger("Research plan detected, waiting for auto-confirm countdown...");
+            logger("[browser] Deep Research activity detected; waiting for plan auto-confirm...");
             break;
         }
         await delay(2_000);
     }
     if (!planDetected) {
         logger("Warning: Research plan not detected within 60s; continuing (may have auto-confirmed already)");
-        return;
+        return capturedPlan;
     }
-    // Phase B: Wait for auto-confirm countdown
+    // Phase B: Wait for the OOPIF's real execution state instead of sleeping for
+    // the full countdown. The main page cannot see this sandboxed iframe's text.
     const confirmStart = Date.now();
     while (Date.now() - confirmStart < autoConfirmWaitMs) {
+        const frameStatus = await readPlanStatus();
+        if (frameStatus) {
+            await capturePlan(frameStatus);
+            if (frameStatus.researchStarted) {
+                return reportResearchStarted();
+            }
+        }
         const { result } = await Runtime.evaluate({
             expression: `(() => {
-        const iframes = document.querySelectorAll('iframe');
-        const hasLargeIframe = Array.from(iframes).some(f => {
-          const rect = f.getBoundingClientRect();
-          return rect.width > 200 && rect.height > 200;
-        });
         const text = (document.body?.innerText || '').toLowerCase();
         const isResearching = text.includes('researching...') ||
           text.includes('reading sources') ||
-          text.includes('considering');
-        return { hasLargeIframe, isResearching };
+          text.includes('正在研究') ||
+          text.includes('正在阅读来源');
+        return { isResearching };
       })()`,
             returnByValue: true,
         });
         const val = result?.value;
         if (val?.isResearching) {
-            logger("Research plan confirmed, execution started");
-            return;
+            return reportResearchStarted();
         }
-        await delay(5_000);
+        await delay(2_000);
     }
-    logger("Auto-confirm wait complete, proceeding to monitor research progress");
+    logger("[browser] Deep Research plan wait elapsed; proceeding to monitor research progress.");
+    return capturedPlan;
 }
 /**
  * Polls for Deep Research completion over 5-30+ minutes.
@@ -248,6 +314,7 @@ export async function waitForDeepResearchCompletion(Runtime, logger, timeoutMs =
  */
 export async function extractDeepResearchResult(Runtime, logger, minTurnIndex) {
     const snapshot = await readAssistantSnapshot(Runtime, minTurnIndex);
+    throwIfAssistantUiError(snapshot);
     const meta = {
         turnId: snapshot?.turnId ?? null,
         messageId: snapshot?.messageId ?? null,
@@ -599,6 +666,44 @@ function buildDeepResearchFrameStatusExpression() {
     return `(() => {
     const rawText = document.body?.innerText || '';
     const html = document.body?.innerHTML || '';
+    const cleanText = (value) => String(value || '').replace(/\\s+/g, ' ').trim();
+    const sections = typeof document.querySelectorAll === 'function'
+      ? Array.from(document.querySelectorAll('section'))
+      : [];
+    const planSection = sections.find((section) => {
+      if (typeof section.querySelector !== 'function' ||
+          typeof section.querySelectorAll !== 'function' ||
+          !cleanText(section.querySelector('h2')?.textContent) ||
+          section.querySelectorAll('ul li').length === 0) {
+        return false;
+      }
+      const buttons = Array.from(section.querySelectorAll('button'));
+      const hasPlanAction = buttons.some((button) =>
+        /^(edit|update|编辑|更新)$/i.test(cleanText(button.textContent))
+      );
+      const hasResearchStatus = Boolean(section.querySelector('p.loading-shimmer')) ||
+        buttons.some((button) =>
+          /stop research|停止研究/i.test(cleanText(button.getAttribute?.('aria-label')))
+        );
+      return hasPlanAction || hasResearchStatus;
+    });
+    const planTitle = cleanText(planSection?.querySelector?.('h2')?.textContent);
+    const planSteps = planSection && typeof planSection.querySelectorAll === 'function'
+      ? Array.from(planSection.querySelectorAll('ul li'))
+          .map((item) => cleanText(item.textContent))
+          .filter(Boolean)
+      : [];
+    const planActionText = planSection && typeof planSection.querySelectorAll === 'function'
+      ? Array.from(planSection.querySelectorAll('button'))
+          .map((button) => cleanText(button.textContent))
+          .find((text) => /^(edit|update|编辑|更新)$/i.test(text)) || ''
+      : '';
+    const hasResearchShimmer = Boolean(planSection?.querySelector?.('p.loading-shimmer'));
+    const hasStopResearchControl = typeof planSection?.querySelectorAll === 'function' &&
+      Array.from(planSection.querySelectorAll('button')).some((button) =>
+        /stop research|停止研究/i.test(cleanText(button.getAttribute?.('aria-label')))
+      );
+    const researchStarted = planSteps.length > 0 && (hasResearchShimmer || hasStopResearchControl);
     const isPlaceholder = (line) => /^(called tool|used tool|użyto narzędzia|narzędzie wywołane)$/i.test(line);
     const isCompletionLine = (line) =>
       /^(research completed|badanie ukończone)\\b/i.test(line);
@@ -640,6 +745,10 @@ function buildDeepResearchFrameStatusExpression() {
     return {
       completed,
       inProgress,
+      researchStarted,
+      planTitle: planTitle || undefined,
+      planSteps: planSteps.length > 0 ? planSteps : undefined,
+      planActionText: planActionText || undefined,
       textLength: reportText.length || rawText.trim().length,
       text: completed ? reportText : undefined,
       html: completed ? html : undefined,
@@ -772,9 +881,9 @@ export function buildDeepResearchCompletionPollExpressionForTest(minTurnIndex =
     return buildDeepResearchCompletionPollExpression(minTurnIndex);
 }
 function buildFindDeepResearchPillExpression(functionName = "findDeepResearchPill") {
-    const pillLabel = JSON.stringify(DEEP_RESEARCH_PILL_LABEL);
+    const pillLabels = JSON.stringify([DEEP_RESEARCH_PILL_LABEL, "深度研究"]);
     return `const ${functionName} = () => {
-      const label = ${pillLabel}.toLowerCase();
+      const labels = ${pillLabels}.map(label => label.toLowerCase());
       const selectors = [
         '.__composer-pill-composite',
         '.__composer-pill',
@@ -797,7 +906,7 @@ function buildFindDeepResearchPillExpression(functionName = "findDeepResearchPil
           pill.querySelector('button')?.getAttribute('aria-label') ||
           ''
         ).toLowerCase();
-        if (text.includes(label) || aria.includes(label)) {
+        if (labels.some(label => text.includes(label) || aria.includes(label))) {
           return pill;
         }
       }
@@ -818,6 +927,18 @@ function buildWaitForDeepResearchPillExpression(timeoutMs) {
 function buildActivateDeepResearchExpression() {
     const plusBtnSelector = JSON.stringify(DEEP_RESEARCH_PLUS_BUTTON);
     const targetText = JSON.stringify(DEEP_RESEARCH_DROPDOWN_ITEM_TEXT);
+    const targetLabels = JSON.stringify([DEEP_RESEARCH_DROPDOWN_ITEM_TEXT, "深度研究"]);
+    const descriptionLabels = JSON.stringify(["Get a detailed report", "获取详细报告"]);
+    const addFilesLabels = JSON.stringify(["add files", "添加文件"]);
+    const dropdownReadyLabels = JSON.stringify([
+        "add photos",
+        "create image",
+        "web search",
+        "deep research",
+        "get a detailed report",
+        "深度研究",
+        "获取详细报告",
+    ]);
     return `(async () => {
     ${buildClickDispatcher()}
     ${buildFindDeepResearchPillExpression()}
@@ -863,8 +984,12 @@ function buildActivateDeepResearchExpression() {
       '[data-radix-popper-content-wrapper]',
       '[data-floating-ui-portal]',
     ].join(',');
-    const target = ${targetText}.toLowerCase();
     const normalizeText = (value) => String(value || '').replace(/\\s+/g, ' ').trim().toLowerCase();
+    const compactText = (value) => normalizeText(value).replace(/\\s+/g, '');
+    const targetLabels = ${targetLabels}.map(normalizeText);
+    const descriptionLabels = ${descriptionLabels}.map(normalizeText);
+    const addFilesLabels = ${addFilesLabels}.map(normalizeText);
+    const dropdownReadyLabels = ${dropdownReadyLabels}.map(normalizeText);
     const getText = (item) => normalizeText(item.textContent || item.getAttribute?.('aria-label') || '');
     const isInPopover = (item) => Boolean(item.closest?.(popoverSelector));
     const isVisible = (item) => {
@@ -890,14 +1015,16 @@ function buildActivateDeepResearchExpression() {
       input.dispatchEvent(new InputEvent('input', { bubbles: true, inputType: 'insertText', data: text }));
       input.dispatchEvent(new Event('change', { bubbles: true }));
     };
-    const isDeepResearchText = (text) => (
-      text === target ||
-      text.startsWith(target + ' ') ||
-      text === 'get a detailed report' ||
-      text.startsWith('get a detailed report ') ||
-      (text.includes(target) && text.includes('detailed report')) ||
-      text.replace(/\\s+/g, '').startsWith('deepresearch')
-    );
+    const isDeepResearchText = (text) => {
+      const compact = compactText(text);
+      const exactLabel = targetLabels.some(label => compact === compactText(label) || text.startsWith(label + ' '));
+      const exactDescription = descriptionLabels.some(
+        label => text === label || text.startsWith(label + ' ')
+      );
+      const combinedLabel = targetLabels.some(label => compact.startsWith(compactText(label))) &&
+        descriptionLabels.some(label => compact.includes(compactText(label)));
+      return exactLabel || exactDescription || combinedLabel;
+    };
     const getClickableItem = (item) => item.closest?.(
       '[data-radix-collection-item], [role="option"], [cmdk-item], button, [role="menuitem"], [role="menuitemradio"], .__menu-item, [class*="__menu-item"], [class*="menu-item"]'
     ) || item;
@@ -914,7 +1041,7 @@ function buildActivateDeepResearchExpression() {
         .map(item => {
           const text = getText(item);
           const clickable = getClickableItem(item);
-          const exact = text === target ? 0 : 1;
+          const exact = targetLabels.includes(text) ? 0 : 1;
           const menuRow = /(^|\\s)__menu-item(\\s|$)/.test(clickable.className || '') ? 0 : 1;
           return { item: clickable, score: exact + menuRow, textLength: text.length };
         })
@@ -945,7 +1072,9 @@ function buildActivateDeepResearchExpression() {
     // mutate the main composer and can be submitted as normal prompt text.
     const plusBtn = document.querySelector(${plusBtnSelector}) ||
       Array.from(document.querySelectorAll('button')).find(
-        b => (b.getAttribute('aria-label') || '').toLowerCase().includes('add files')
+        b => addFilesLabels.some(label =>
+          normalizeText(b.getAttribute('aria-label') || '').includes(label)
+        )
       );
     if (!plusBtn) return { status: 'plus-button-missing' };
     dispatchClickSequence(plusBtn);
@@ -957,11 +1086,7 @@ function buildActivateDeepResearchExpression() {
         const items = collectAvailableItems({ requirePopover: true });
         if (findDeepResearchItem({ requirePopover: true }) || items.some(text => {
           const normalized = normalizeText(text);
-          return normalized.includes('add photos') ||
-            normalized.includes('create image') ||
-            normalized.includes('web search') ||
-            normalized.includes('deep research') ||
-            normalized.includes('get a detailed report');
+          return dropdownReadyLabels.some(label => normalized.includes(label));
         })) { resolve(items); return; }
         elapsed += 150;
         if (elapsed > 3000) { resolve(items.length ? items : null); return; }

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

@@ -1,6 +1,7 @@
 import { COMPOSER_MODEL_SIGNAL_SELECTOR, MENU_CONTAINER_SELECTOR, MENU_ITEM_SELECTOR, MODEL_BUTTON_SELECTOR, } from "../constants.js";
 import { logDomFailure } from "../domDebug.js";
 import { buildClickDispatcher } from "./domEvents.js";
+import { throwIfThrottled } from "../chatgptThrottle.js";
 import { delay } from "../utils.js";
 const LEGACY_PRO_VERSION_WORD_TOKENS = ["5 4", "5 2", "5 1", "5 0", "gpt 5 pro"];
 const LEGACY_PRO_VERSION_COMPACT_TOKENS = ["gpt54", "gpt52", "gpt51", "gpt50"];
@@ -55,6 +56,11 @@ export async function ensureModelSelection(Runtime, desiredModel, logger, strate
         }
         case "option-not-found": {
             await logDomFailure(Runtime, logger, "model-switcher-option");
+            // Check for a rate-limit notice before blaming the model name. The notice
+            // is a plain dialog, so its "Got it" button reads as an available option to
+            // the menu scrape — which turns "wait a few minutes" into "your model does
+            // not exist", and sends the reader after the wrong bug.
+            await throwIfThrottled(Runtime, { stage: "model-selection" }, logger);
             const isTemporary = result.hint?.temporaryChat ?? false;
             const available = (result.hint?.availableOptions ?? []).filter(Boolean);
             const availableHint = available.length > 0 ? ` Available: ${available.join(", ")}.` : "";
@@ -65,6 +71,7 @@ export async function ensureModelSelection(Runtime, desiredModel, logger, strate
         }
         default: {
             await logDomFailure(Runtime, logger, "model-switcher-button");
+            await throwIfThrottled(Runtime, { stage: "model-selection" }, logger);
             throw new Error("Unable to locate the ChatGPT model selector button. If the desired model is already selected in the browser, retry with --browser-model-strategy current; otherwise retry with --browser-model-strategy ignore to skip model selection.");
         }
     }
@@ -74,6 +81,15 @@ function assertResolvedModelSelection(desiredModel, resolvedLabel) {
     const resolved = resolvedLabel.toLowerCase();
     const normalizedDesired = normalizeResolvedModelLabel(desired);
     const normalizedResolved = normalizeResolvedModelLabel(resolved);
+    if (desired === "latest") {
+        // The advanced radio is localized, but only the documented exact labels are
+        // evidence of GPT-6 Astra. Do not let a generic picker result verify Latest.
+        if (resolvedLabel.normalize("NFC").trim() === "Latest" ||
+            resolvedLabel.normalize("NFC").trim() === "最新") {
+            return;
+        }
+        throw new Error(`Model picker selected "${resolvedLabel}" while "${desiredModel}" requires GPT-6 Astra (Latest).`);
+    }
     const wantsGpt56Sol = /(?:^| )5 6(?: |$)/.test(normalizedDesired) && normalizedDesired.split(" ").includes("sol");
     if (wantsGpt56Sol) {
         const resolvedTokens = normalizedResolved.split(" ");
@@ -162,6 +178,17 @@ function buildModelSelectionExpression(targetModel, strategy) {
     const hasToken = (value, token) => normalizeText(value).split(' ').includes(token);
     // Normalize every candidate token to keep fuzzy matching deterministic.
     const normalizedTarget = normalizeText(PRIMARY_LABEL);
+    // "Latest" (GPT-6 since 2026-09) is a radio in the advanced view whose composer pill reads
+    // "6 Pro" / "6 High"…, while GPT-5.6 Sol's reads "5.6 Pro". Declared up front: getResolvedLabel
+    // runs on the picker-less path before the selection helpers below are initialized.
+    const targetIsLatest = normalizedTarget === 'latest';
+    // ChatGPT localizes the Latest radio itself (for example, Japanese "最新") but
+    // keeps the GPT-6 composer pill numeric. Keep this allow-list exact so GPT-5.6
+    // Sol or an arbitrary localized menu row can never satisfy a Latest request.
+    const isLatestModelLabel = (value) => {
+      const label = String(value ?? '').normalize('NFC').trim();
+      return label === 'Latest' || label === '最新';
+    };
     const normalizedTokens = Array.from(new Set([normalizedTarget, ...LABEL_TOKENS]))
       .map((token) => normalizeText(token))
       .filter(Boolean);
@@ -303,6 +330,14 @@ function buildModelSelectionExpression(targetModel, strategy) {
     };
 
     const getButtonLabel = () => (findModelButton()?.textContent ?? '').trim();
+    // With the picker closed the only evidence for "Latest" is the composer pill, so a version-less
+    // "latest" target must be decided on it: the blank composer signal would otherwise pass as
+    // "already selected" while GPT-5.6 Sol is active. Defined here, before getResolvedLabel, because
+    // the "current" strategy resolves the label before the selection helpers further down exist.
+    const latestButtonSelected = () => {
+      const label = normalizeText(getButtonLabel());
+      return /^(chatgpt |gpt )?6(?![0-9 .]*[0-9])/.test(label) && !/(^| )5 6/.test(label);
+    };
     const getComposerModelLabel = () =>
       (document.querySelector(COMPOSER_MODEL_SIGNAL_SELECTOR)?.textContent ?? '').trim();
     const readComposerModelSignal = () => normalizeText(getComposerModelLabel());
@@ -406,10 +441,10 @@ function buildModelSelectionExpression(targetModel, strategy) {
     const ADVANCED_VIEW_SELECTOR = '[data-testid="composer-model-picker-slider-advanced-view"]';
     const INTELLIGENCE_PICKER_SELECTOR = '[data-testid="composer-intelligence-picker-content"]';
     const SUBMENU_OPENER_SELECTOR = '[role="menuitem"][aria-haspopup="menu"]';
-    const ADVANCED_WORDS = ['advanced', 'erweitert', '高级', 'avanzado', 'avancado', 'avance'];
-    const MODEL_WORDS = ['model', 'modell', '模型', 'modelo', 'modello', 'modele'];
+    const ADVANCED_WORDS = ['advanced', 'erweitert', '高级', '고급', 'avanzado', 'avancado', 'avance'];
+    const MODEL_WORDS = ['model', 'modell', '模型', '모델', 'modelo', 'modello', 'modele'];
     const EFFORT_WORDS = [
-      'effort', 'aufwand', '强度', '努力',
+      'effort', 'aufwand', '强度', '努力', '추론 수준',
       'esfuerzo', 'esforco', 'sforzo', 'inspanning', 'wysilek',
     ];
     const pickerNodeLabel = (node) => {
@@ -420,6 +455,7 @@ function buildModelSelectionExpression(targetModel, strategy) {
           .toLowerCase()
           .normalize('NFD')
           .replace(/[\u0300-\u036f]/g, '')
+          .normalize('NFC')
           .replace(/\\s+/g, ' ')
           .trim();
       } catch {
@@ -473,15 +509,37 @@ function buildModelSelectionExpression(targetModel, strategy) {
       if (wantsInstant) return label.includes('instant');
       if (wantsThinking) return Boolean(desiredVersion) && !labelHasProWord(label);
       if (desiredVersion) return true;
+      // A version-less target ("Latest") must match the radio that is actually checked in the
+      // advanced view: the opener's text lists every radio label, so a substring test would
+      // report "Latest" as selected while GPT-5.6 Sol is the checked model.
+      const checkedAdvancedRadio = findCheckedAdvancedModelRadio(parentMenu);
+      if (checkedAdvancedRadio) {
+        const checkedLabel = checkedAdvancedRadio.textContent ?? '';
+        return targetIsLatest
+          ? isLatestModelLabel(checkedLabel)
+          : normalizedTokens.some((token) => token && normalizeText(checkedLabel) === token);
+      }
       return normalizedTokens.some((token) => token && label.includes(token));
     };
+    const findCheckedAdvancedModelRadio = (menu = null) => {
+      const scope = menu || findUnifiedPickerMenu() || document;
+      return (
+        scope?.querySelector?.(
+          '[data-testid="composer-model-picker-slider-advanced-view"] [role="menuitemradio"][aria-checked="true"]',
+        ) ?? null
+      );
+    };
     const getAdvancedModelLabel = () => {
       const opener = findModelSubmenuOpener(findUnifiedPickerMenu());
       if (!opener) return '';
       const raw = (opener.textContent ?? '').trim();
       const normalized = normalizeText(pickerNodeLabel(opener));
       const version = versionFromLabel(normalized);
-      if (!version) return raw;
+      if (!version) {
+        const checkedAdvancedRadio = findCheckedAdvancedModelRadio(findUnifiedPickerMenu());
+        const checkedLabel = (checkedAdvancedRadio?.textContent ?? '').trim();
+        return checkedLabel || raw;
+      }
       const [major, minor] = version.split('-');
       const suffix = normalized.split(' ').includes('sol') ? ' Sol' : '';
       return 'GPT-' + major + '.' + minor + suffix;
@@ -495,6 +553,17 @@ function buildModelSelectionExpression(targetModel, strategy) {
       );
     };
     const getResolvedLabel = (observedOptionLabel = '') => {
+      if (targetIsLatest) {
+        const checkedAdvancedRadio = findCheckedAdvancedModelRadio();
+        if (checkedAdvancedRadio) return (checkedAdvancedRadio.textContent ?? '').trim();
+        // Picker closed: the pill ("6 Pro") is the evidence; report the radio's name so callers
+        // can compare against the requested target instead of the tier-suffixed pill text.
+        if (latestButtonSelected()) return 'Latest';
+        const currentButtonLabel = getButtonLabel();
+        if (currentButtonLabel) return currentButtonLabel;
+        // No picker button at all (e.g. the "current" strategy on a page that hides it): fall back
+        // to the generic composer/observed label resolution below.
+      }
       if (configuredSelectionMatchesTarget()) {
         const variant = getConfiguredVariantLabel();
         const version = formatModelOptionLabel(getConfiguredVersionLabel());
@@ -636,6 +705,13 @@ function buildModelSelectionExpression(targetModel, strategy) {
       return COMPOSER_SIGNAL_INCLUDES.some((token) => token && signal.includes(token));
     };
     const activeSelectionMatchesTarget = () => {
+      if (targetIsLatest) {
+        const checkedAdvancedRadio = findCheckedAdvancedModelRadio();
+        if (checkedAdvancedRadio) {
+          return isLatestModelLabel(checkedAdvancedRadio.textContent ?? '');
+        }
+        return latestButtonSelected();
+      }
       if (advancedModelSignalMatchesTarget()) {
         return true;
       }
@@ -686,6 +762,8 @@ function buildModelSelectionExpression(targetModel, strategy) {
         node.getAttribute('data-composer-intelligence-pro-effort-action') === 'true' ||
         Boolean(node.closest('[data-model-picker-thinking-effort-action="true"]')) ||
         Boolean(node.closest('[data-composer-intelligence-pro-effort-action="true"]')) ||
+        (isUnifiedPickerMenu(menu) && isSubmenuOpener(node) &&
+          containsPickerWord(pickerNodeLabel(node), EFFORT_WORDS)) ||
         isDetachedProEffortMenu(menu));
     const optionIsSelected = (node) => {
       if (!(node instanceof HTMLElement)) {
@@ -708,6 +786,11 @@ function buildModelSelectionExpression(targetModel, strategy) {
 
     const scoreOption = (normalizedText, testid, node) => {
       // Assign a score to every node so we can pick the most likely match without brittle equality checks.
+      // Latest is localized in the advanced radio list. Match the documented labels
+      // exactly instead of falling through to generic scoring, which could select Sol.
+      if (targetIsLatest) {
+        return isLatestModelLabel(node?.textContent ?? '') ? 2000 : 0;
+      }
       if (!normalizedText && !testid) {
         return 0;
       }
@@ -1358,6 +1441,10 @@ function buildModelMatchersLiteral(targetModel) {
         testIdTokens.add("gpt5-6");
         testIdTokens.add("gpt56");
     }
+    if (base === "latest") {
+        // ChatGPT's Japanese advanced-model radio is named exactly "最新".
+        push("最新", labelTokens);
+    }
     // Numeric variations (5.5 <-> 55 <-> gpt-5-5)
     if (base.includes("5.5") || base.includes("5-5") || base.includes("55")) {
         push("5.5", labelTokens);

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

@@ -483,7 +483,7 @@ export async function ensurePromptReady(Runtime, timeoutMs, logger) {
         throw new Error("Prompt textarea did not appear before timeout");
     }
 }
-function conversationIdFromUrl(value) {
+export function conversationIdFromUrl(value) {
     if (!value)
         return null;
     try {