@steipete/oracle 0.14.0 → 0.15.0

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

@@ -12,8 +12,7 @@ export async function ensureModelSelection(Runtime, desiredModel, logger, strate
     const result = outcome.result?.value;
     switch (result?.status) {
         case "already-selected":
-        case "switched":
-        case "switched-best-effort": {
+        case "switched": {
             const label = result.label?.trim() || (strategy === "current" ? null : desiredModel);
             if (strategy !== "current") {
                 assertResolvedModelSelection(desiredModel, label ?? desiredModel);
@@ -95,8 +94,8 @@ function buildModelSelectionExpression(targetModel, strategy) {
     const composerIncludesLiteral = JSON.stringify(composerSignalMatchers.includesAny);
     const composerExcludesLiteral = JSON.stringify(composerSignalMatchers.excludesAny);
     const composerAllowBlankLiteral = JSON.stringify(composerSignalMatchers.allowBlank);
-    const menuContainerLiteral = JSON.stringify(MENU_CONTAINER_SELECTOR);
-    const menuItemLiteral = JSON.stringify(MENU_ITEM_SELECTOR);
+    const menuContainerLiteral = JSON.stringify(`${MENU_CONTAINER_SELECTOR}, [role="listbox"], [role="dialog"]`);
+    const menuItemLiteral = JSON.stringify(`${MENU_ITEM_SELECTOR}, [role="option"], [role="radio"], [role="combobox"]`);
     return `(() => {
     ${buildClickDispatcher()}
     // Capture the selectors and matcher literals up front so the browser expression stays pure.
@@ -134,6 +133,8 @@ function buildModelSelectionExpression(targetModel, strategy) {
       ? '5-4'
       : normalizedTarget.includes('5 5')
         ? '5-5'
+        : normalizedTarget.includes('5 3')
+          ? '5-3'
         : normalizedTarget.includes('5 2')
         ? '5-2'
         : normalizedTarget.includes('5 1')
@@ -196,7 +197,19 @@ function buildModelSelectionExpression(targetModel, strategy) {
       );
       if (!label) return false;
       if (label.includes('click to remove')) return false;
-      const modelTokens = ['chatgpt', 'gpt', 'instant', 'thinking', 'pro', 'extended', 'standard', 'heavy', 'light'];
+      const modelTokens = [
+        'chatgpt',
+        'gpt',
+        'instant',
+        'thinking',
+        'pro',
+        'extended',
+        'standard',
+        'medium',
+        'high',
+        'heavy',
+        'light',
+      ];
       return modelTokens.some((token) => hasToken(label, token));
     };
     const findModelButton = () => {
@@ -206,6 +219,14 @@ function buildModelSelectionExpression(targetModel, strategy) {
     };
 
     const closeMenu = () => {
+      const dialogCloseButton = document.querySelector(
+        '[role="dialog"] [data-testid="close-button"]',
+      );
+      if (dialogCloseButton) {
+        try {
+          if (dispatchClickSequence(dialogCloseButton)) return;
+        } catch {}
+      }
       const button = findModelButton();
       if (!button) return;
       try {
@@ -231,6 +252,25 @@ function buildModelSelectionExpression(targetModel, strategy) {
     const getComposerModelLabel = () =>
       (document.querySelector(COMPOSER_MODEL_SIGNAL_SELECTOR)?.textContent ?? '').trim();
     const readComposerModelSignal = () => normalizeText(getComposerModelLabel());
+    const isIntelligenceEffortLabel = (label) =>
+      label === 'instant' ||
+      label === 'medium' ||
+      label === 'high' ||
+      label === 'extra high' ||
+      label === 'extended' ||
+      label === 'standard' ||
+      label === 'heavy' ||
+      label === 'light';
+    const formatModelOptionLabel = (label) => {
+      const normalized = normalizeText(label ?? '');
+      if (normalized === '5 5' || normalized === 'gpt 5 5') return 'GPT-5.5';
+      if (normalized === '5 4' || normalized === 'gpt 5 4') return 'GPT-5.4';
+      if (normalized === '5 3' || normalized === 'gpt 5 3') return 'GPT-5.3';
+      if (normalized === '5 2' || normalized === 'gpt 5 2') return 'GPT-5.2';
+      if (normalized === '5 1' || normalized === 'gpt 5 1') return 'GPT-5.1';
+      if (normalized === '5 0' || normalized === 'gpt 5 0') return 'GPT-5.0';
+      return label || '';
+    };
     const withProPillSignal = (label) => {
       const resolved = label || '';
       if (!wantsPro || !hasProComposerPill()) return resolved;
@@ -240,10 +280,84 @@ function buildModelSelectionExpression(targetModel, strategy) {
       if (normalized.includes('pro')) return resolved;
       return resolved + ' + Pro';
     };
-    const getResolvedLabel = (fallback) =>
-      withProPillSignal(getComposerModelLabel() || getButtonLabel() || fallback);
     const isThinkingEffortLabel = (label) =>
-      label === 'extended' || label === 'standard' || label === 'heavy' || label === 'light';
+      label === 'extended' ||
+      label === 'standard' ||
+      label === 'heavy' ||
+      label === 'light' ||
+      label === 'medium' ||
+      label === 'high' ||
+      label === 'extra high';
+    const isNonProIntelligenceThinkingLabel = (label) =>
+      label === 'medium' || label === 'high' || label === 'extra high';
+    const scoreNonProGpt55ThinkingLabel = (label) => {
+      if (label === 'extra high') return 1400;
+      if (label === 'high') return 1200;
+      return 1000;
+    };
+    const versionFromLabel = (label) => {
+      if (label === '5 5' || label === 'gpt 5 5') return '5-5';
+      if (label === '5 4' || label === 'gpt 5 4') return '5-4';
+      if (label === '5 3' || label === 'gpt 5 3') return '5-3';
+      if (label === '5 2' || label === 'gpt 5 2') return '5-2';
+      if (label === '5 1' || label === 'gpt 5 1') return '5-1';
+      if (label === '5 0' || label === 'gpt 5 0') return '5-0';
+      if (label === '4 5' || label === 'gpt 4 5') return '4-5';
+      return null;
+    };
+    const versionFromTestId = (testid) => {
+      const normalized = normalizeText(testid);
+      if (normalized.includes('5 5') || normalized.includes('gpt55')) return '5-5';
+      if (normalized.includes('5 4') || normalized.includes('gpt54')) return '5-4';
+      if (normalized.includes('5 3') || normalized.includes('gpt53')) return '5-3';
+      if (normalized.includes('5 2') || normalized.includes('gpt52')) return '5-2';
+      if (normalized.includes('5 1') || normalized.includes('gpt51')) return '5-1';
+      if (normalized.includes('5 0') || normalized.includes('gpt50')) return '5-0';
+      return null;
+    };
+    const getConfigurationDialog = () => document.querySelector('[role="dialog"]');
+    const getConfiguredVersionLabel = () =>
+      (getConfigurationDialog()
+        ?.querySelector?.('[role="combobox"][aria-labelledby="model-selection-label"]')
+        ?.textContent ?? '').trim();
+    const getConfiguredVariantLabel = () => {
+      const label =
+        (getConfigurationDialog()
+          ?.querySelector?.('[aria-label="Model options"] [role="radio"][aria-checked="true"]')
+          ?.textContent ?? '').trim();
+      const normalized = normalizeText(label);
+      if (normalized.startsWith('instant')) return 'Instant';
+      if (normalized.startsWith('thinking')) return 'Thinking';
+      if (normalized.startsWith('pro')) return 'Pro';
+      return label;
+    };
+    const configuredSelectionMatchesTarget = () => {
+      const configuredVersion = versionFromLabel(normalizeText(getConfiguredVersionLabel()));
+      if (!configuredVersion || configuredVersion !== desiredVersion) return false;
+      const configuredVariant = normalizeText(getConfiguredVariantLabel());
+      if (wantsPro) return labelHasProWord(configuredVariant);
+      if (wantsInstant) return configuredVariant.includes('instant');
+      if (wantsThinking) {
+        return configuredVariant.includes('thinking') && !labelHasProWord(configuredVariant);
+      }
+      return true;
+    };
+    const getResolvedLabel = (fallback) => {
+      if (configuredSelectionMatchesTarget()) {
+        const variant = getConfiguredVariantLabel();
+        const version = formatModelOptionLabel(getConfiguredVersionLabel());
+        return [variant, version].filter(Boolean).join(' ');
+      }
+      const composerLabel = getComposerModelLabel();
+      if (composerLabel) return withProPillSignal(composerLabel);
+      const buttonLabel = getButtonLabel();
+      const normalizedButton = normalizeText(buttonLabel);
+      const fallbackLabel = formatModelOptionLabel(fallback);
+      if (fallbackLabel && !wantsPro && isIntelligenceEffortLabel(normalizedButton)) {
+        return fallbackLabel;
+      }
+      return withProPillSignal(buttonLabel || fallbackLabel || fallback);
+    };
     if (MODEL_STRATEGY === 'current') {
       const currentLabel = getResolvedLabel('') || null;
       return {
@@ -257,15 +371,18 @@ function buildModelSelectionExpression(targetModel, strategy) {
       return { status: 'button-missing' };
     }
     const buttonMatchesTarget = () => {
+      if (configuredSelectionMatchesTarget()) return true;
       const normalizedLabel = normalizeText(getButtonLabel());
       if (!normalizedLabel) return false;
+      if (wantsThinking && !wantsPro && hasProComposerPill()) return false;
       if (isTargetGpt55VisibleAlias(normalizedLabel)) return true;
       if (
         wantsThinking &&
         desiredVersion === '5-5' &&
         !hasProComposerPill() &&
         isThinkingEffortLabel(normalizedLabel) &&
-        isTargetGpt55VisibleAlias(readComposerModelSignal())
+        (isNonProIntelligenceThinkingLabel(normalizedLabel) ||
+          isTargetGpt55VisibleAlias(readComposerModelSignal()))
       ) {
         return true;
       }
@@ -283,6 +400,7 @@ function buildModelSelectionExpression(targetModel, strategy) {
       if (desiredVersion) {
         if (desiredVersion === '5-5' && !normalizedLabel.includes('5 5')) return false;
         if (desiredVersion === '5-4' && !normalizedLabel.includes('5 4')) return false;
+        if (desiredVersion === '5-3' && !normalizedLabel.includes('5 3')) return false;
         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;
@@ -292,9 +410,9 @@ function buildModelSelectionExpression(targetModel, strategy) {
       if (wantsInstant && !normalizedLabel.includes('instant')) return false;
       if (
         wantsThinking &&
-        desiredVersion === '5-4' &&
-        !normalizedLabel.includes('pro') &&
-        !normalizedLabel.includes('instant')
+        desiredVersion &&
+        versionFromLabel(normalizedLabel) === desiredVersion &&
+        !labelHasProWord(normalizedLabel)
       ) {
         return true;
       }
@@ -359,10 +477,21 @@ function buildModelSelectionExpression(targetModel, strategy) {
     };
 
     const getOptionLabel = (node) => node?.textContent?.trim() ?? '';
-    const isThinkingEffortControl = (node) =>
+    const isDetachedProEffortMenu = (menu) => {
+      const text = normalizeText(menu?.textContent ?? '');
+      return (
+        menu?.getAttribute?.('data-testid') !== 'composer-intelligence-picker-content' &&
+        text.includes('pro standard') &&
+        text.includes('pro extended')
+      );
+    };
+    const isNestedEffortControl = (node, menu) =>
       node instanceof HTMLElement &&
       (node.getAttribute('data-model-picker-thinking-effort-action') === 'true' ||
-        Boolean(node.closest('[data-model-picker-thinking-effort-action="true"]')));
+        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"]')) ||
+        isDetachedProEffortMenu(menu));
     const optionIsSelected = (node) => {
       if (!(node instanceof HTMLElement)) {
         return false;
@@ -382,13 +511,28 @@ function buildModelSelectionExpression(targetModel, strategy) {
       return false;
     };
 
-    const scoreOption = (normalizedText, testid) => {
+    const scoreOption = (normalizedText, testid, node) => {
       // Assign a score to every node so we can pick the most likely match without brittle equality checks.
       if (!normalizedText && !testid) {
         return 0;
       }
       let score = 0;
       const normalizedTestId = (testid ?? '').toLowerCase();
+      const candidateTextVersion = versionFromLabel(normalizedText);
+      const candidateIsVersionCombobox =
+        node?.getAttribute?.('role') === 'combobox' &&
+        node?.getAttribute?.('aria-labelledby') === 'model-selection-label';
+      if (candidateIsVersionCombobox && candidateTextVersion === desiredVersion) {
+        return 0;
+      }
+      const candidateOpensConfiguration =
+        Boolean(desiredVersion) &&
+        desiredVersion !== '5-5' &&
+        (normalizedTestId === 'model-configure-modal' ||
+          (candidateIsVersionCombobox && node?.getAttribute?.('aria-expanded') !== 'true'));
+      if (candidateOpensConfiguration) {
+        return 2000;
+      }
       let exactTestIdMatch = false;
       if (normalizedTestId) {
         if (desiredVersion) {
@@ -411,6 +555,12 @@ function buildModelSelectionExpression(targetModel, strategy) {
             normalizedTestId.includes('gpt-5-4') ||
             normalizedTestId.includes('gpt-5.4') ||
             normalizedTestId.includes('gpt54');
+          const has53 =
+            normalizedTestId.includes('5-3') ||
+            normalizedTestId.includes('5.3') ||
+            normalizedTestId.includes('gpt-5-3') ||
+            normalizedTestId.includes('gpt-5.3') ||
+            normalizedTestId.includes('gpt53');
           const has51 =
             normalizedTestId.includes('5-1') ||
             normalizedTestId.includes('5.1') ||
@@ -423,7 +573,19 @@ function buildModelSelectionExpression(targetModel, strategy) {
             normalizedTestId.includes('gpt-5-0') ||
             normalizedTestId.includes('gpt-5.0') ||
             normalizedTestId.includes('gpt50');
-          const candidateVersion = has55 ? '5-5' : has54 ? '5-4' : has52 ? '5-2' : has51 ? '5-1' : has50 ? '5-0' : null;
+          const candidateVersion = has55
+            ? '5-5'
+            : has54
+              ? '5-4'
+              : has53
+                ? '5-3'
+                : 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;
@@ -452,10 +614,44 @@ function buildModelSelectionExpression(targetModel, strategy) {
         }
       }
       const candidateGpt55VisibleAlias = isTargetGpt55VisibleAlias(normalizedText);
+      const candidateIsNonProThinkingEffort =
+        isNonProIntelligenceThinkingLabel(normalizedText) && !normalizedTestId.includes('pro');
+      const hasActiveProPill = hasProComposerPill();
+      const candidateIsNonProGpt55Thinking =
+        wantsThinking && desiredVersion === '5-5' && candidateIsNonProThinkingEffort;
+      const candidateClearsProForThinking =
+        wantsThinking && !wantsPro && hasActiveProPill && candidateIsNonProThinkingEffort;
+      const candidateOpensVersionSubmenu =
+        wantsThinking &&
+        desiredVersion !== '5-5' &&
+        normalizedText === 'gpt 5 5' &&
+        !normalizedTestId.includes('pro');
+      const candidateSelectsDesiredVersion =
+        Boolean(desiredVersion) && candidateTextVersion === desiredVersion;
+      if (
+        desiredVersion &&
+        candidateTextVersion &&
+        candidateTextVersion !== desiredVersion &&
+        !candidateOpensVersionSubmenu
+      ) {
+        return 0;
+      }
+      const candidateIsGpt55ThinkingFamily =
+        wantsThinking &&
+        desiredVersion === '5-5' &&
+        (normalizedText === 'gpt 5 5' ||
+          normalizedText === '5 5' ||
+          normalizedTestId.includes('gpt-5-5') ||
+          normalizedTestId.includes('gpt-5.5') ||
+          normalizedTestId.includes('gpt55'));
       const candidateHasThinking =
         normalizedText.includes('thinking') ||
         normalizedTestId.includes('thinking') ||
-        (wantsThinking && desiredVersion === '5-4' && exactTestIdMatch);
+        candidateIsNonProGpt55Thinking ||
+        candidateClearsProForThinking ||
+        candidateOpensVersionSubmenu ||
+        candidateIsGpt55ThinkingFamily ||
+        (wantsThinking && desiredVersion && (exactTestIdMatch || candidateSelectsDesiredVersion));
       const candidateHasLegacyProVersion = labelHasLegacyProVersion(normalizedText);
       const candidateHasPro =
         labelHasProWord(normalizedText) ||
@@ -463,12 +659,29 @@ function buildModelSelectionExpression(targetModel, strategy) {
         normalizedTestId.includes('pro');
       const candidateHasInstant =
         normalizedText.includes('instant') || normalizedTestId.includes('instant');
+      const candidateSelectsConfiguredVersion =
+        Boolean(getConfigurationDialog()) &&
+        candidateSelectsDesiredVersion &&
+        (node?.getAttribute?.('role') === 'option' ||
+          node?.getAttribute?.('role') === 'menuitemradio');
+      const candidateOpensInstantSubmenu =
+        wantsInstant &&
+        candidateSelectsDesiredVersion &&
+        !candidateHasInstant &&
+        (normalizedTestId.includes('submenu') ||
+          node?.getAttribute?.('aria-haspopup') === 'menu' ||
+          node?.getAttribute?.('data-has-submenu') !== null);
       if (wantsPro && candidateHasThinking) return 0;
-      if (wantsPro && candidateHasLegacyProVersion) return 0;
-      if (wantsPro && !candidateHasPro) return 0;
-      if (wantsInstant && !candidateHasInstant) return 0;
+      if (wantsPro && candidateHasLegacyProVersion && !candidateSelectsDesiredVersion) return 0;
+      if (wantsPro && !candidateHasPro && !candidateSelectsDesiredVersion) return 0;
+      if (
+        wantsInstant &&
+        !candidateHasInstant &&
+        !candidateOpensInstantSubmenu &&
+        !candidateSelectsConfiguredVersion
+      ) return 0;
       if (wantsThinking && candidateHasPro) return 0;
-      if (wantsThinking && !candidateHasThinking) return 0;
+      if (wantsThinking && !candidateHasThinking && !candidateSelectsDesiredVersion) return 0;
       if (desiredVersion === '5-5' && normalizedText && !candidateGpt55VisibleAlias) {
         const candidateHasVersion =
           normalizedText.includes('5 5') ||
@@ -482,6 +695,43 @@ function buildModelSelectionExpression(targetModel, strategy) {
       if (candidateGpt55VisibleAlias) {
         score += 900;
       }
+      if (wantsPro && candidateHasPro && !candidateSelectsDesiredVersion) {
+        score += 900;
+      }
+      if (wantsInstant && candidateHasInstant && !candidateSelectsDesiredVersion) {
+        score += 900;
+      }
+      if (
+        wantsThinking &&
+        candidateHasThinking &&
+        !candidateSelectsDesiredVersion &&
+        !candidateOpensVersionSubmenu
+      ) {
+        score += 900;
+      }
+      if (candidateIsNonProGpt55Thinking) {
+        score += scoreNonProGpt55ThinkingLabel(normalizedText);
+      }
+      if (candidateClearsProForThinking) {
+        score += scoreNonProGpt55ThinkingLabel(normalizedText) + 600;
+      }
+      if (
+        desiredVersion &&
+        candidateTextVersion === desiredVersion &&
+        !candidateOpensInstantSubmenu &&
+        !(wantsThinking && desiredVersion === '5-5' && normalizedText === 'gpt 5 5')
+      ) {
+        score += 1200;
+      }
+      if (candidateOpensInstantSubmenu) {
+        score += 300;
+      }
+      if (candidateOpensVersionSubmenu) {
+        score += 500;
+      }
+      if (candidateIsGpt55ThinkingFamily) {
+        score += 260;
+      }
       if (normalizedText && normalizedTarget) {
         if (normalizedText === normalizedTarget) {
           score += 500;
@@ -517,7 +767,14 @@ function buildModelSelectionExpression(targetModel, strategy) {
       }
       // Similarly for Thinking variant
       if (wantsThinking) {
-        if (!normalizedText.includes('thinking') && !normalizedTestId.includes('thinking')) {
+        if (
+          !candidateIsGpt55ThinkingFamily &&
+          !candidateIsNonProGpt55Thinking &&
+          !candidateClearsProForThinking &&
+          !candidateOpensVersionSubmenu &&
+          !normalizedText.includes('thinking') &&
+          !normalizedTestId.includes('thinking')
+        ) {
           score -= 80;
         }
       } else if (normalizedText.includes('thinking') || normalizedTestId.includes('thinking')) {
@@ -558,6 +815,24 @@ function buildModelSelectionExpression(targetModel, strategy) {
       );
       return pickerMenus.concat(textFallbackMenus);
     };
+    const isSubmenuOption = (node, testid) =>
+      (testid ?? '').toLowerCase().includes('submenu') ||
+      (testid ?? '').toLowerCase() === 'model-configure-modal' ||
+      (node?.getAttribute?.('role') === 'combobox' &&
+        node?.getAttribute?.('aria-labelledby') === 'model-selection-label') ||
+      node?.getAttribute?.('aria-haspopup') === 'menu' ||
+      node?.getAttribute?.('data-has-submenu') !== null;
+    const canTrustSelectedOption = (node, normalizedText, testid) => {
+      if (!optionIsSelected(node)) return false;
+      if (getConfigurationDialog() && !configuredSelectionMatchesTarget()) return false;
+      const optionVersion = versionFromLabel(normalizedText) ?? versionFromTestId(testid);
+      if (desiredVersion && optionVersion !== desiredVersion) return false;
+      const currentButtonLabel = normalizeText(getButtonLabel());
+      return !labelHasProWord(currentButtonLabel) && !hasProComposerPill();
+    };
+    const openedSubmenuKeys = new Set();
+    const submenuKey = (normalizedText, testid) =>
+      normalizeText(testid ?? '') + '|' + normalizedText;
 
     const findBestOption = () => {
       // Walk through every menu item and keep whichever earns the highest score.
@@ -566,19 +841,33 @@ function buildModelSelectionExpression(targetModel, strategy) {
       for (const menu of menus) {
         const buttons = Array.from(menu.querySelectorAll(${menuItemLiteral}));
         for (const option of buttons) {
-          if (isThinkingEffortControl(option)) {
+          if (isNestedEffortControl(option, menu)) {
             continue;
           }
           const text = option.textContent ?? '';
           const normalizedText = normalizeText(text);
           const testid = option.getAttribute('data-testid') ?? '';
-          const score = scoreOption(normalizedText, testid);
+          const optionSubmenuKey = submenuKey(normalizedText, testid);
+          if (isSubmenuOption(option, testid) && openedSubmenuKeys.has(optionSubmenuKey)) {
+            continue;
+          }
+          let score = scoreOption(normalizedText, testid, option);
           if (score <= 0) {
             continue;
           }
+          if (canTrustSelectedOption(option, normalizedText, testid)) {
+            score += 1000;
+          }
           const label = getOptionLabel(option);
           if (!bestMatch || score > bestMatch.score) {
-            bestMatch = { node: option, label, score, testid, normalizedText };
+            bestMatch = {
+              node: option,
+              label,
+              score,
+              testid,
+              normalizedText,
+              submenuKey: optionSubmenuKey,
+            };
           }
         }
       }
@@ -613,6 +902,28 @@ function buildModelSelectionExpression(targetModel, strategy) {
       };
       check();
     });
+    const dispatchHoverSequence = (target) => {
+      if (!target || !(target instanceof EventTarget)) return false;
+      const types = ['pointerover', 'pointerenter', 'mouseover', 'mouseenter', 'pointermove', 'mousemove'];
+      for (const type of types) {
+        try {
+          const common = { bubbles: true, cancelable: true, view: window };
+          const event =
+            type.startsWith('pointer') && 'PointerEvent' in window
+              ? new PointerEvent(type, { ...common, pointerId: 1, pointerType: 'mouse' })
+              : new MouseEvent(type, common);
+          target.dispatchEvent(event);
+        } catch {}
+      }
+      try {
+        target.focus?.();
+      } catch {}
+      return true;
+    };
+    const openSubmenuOption = (node) => {
+      dispatchHoverSequence(node);
+      dispatchClickSequence(node);
+    };
 
     return new Promise((resolve) => {
       const start = performance.now();
@@ -648,6 +959,13 @@ function buildModelSelectionExpression(targetModel, strategy) {
       const openDelay = () => new Promise((r) => setTimeout(r, INITIAL_WAIT_MS));
       let initialized = false;
       const attempt = async () => {
+        if (performance.now() - start > MAX_WAIT_MS) {
+          resolve({
+            status: 'option-not-found',
+            hint: { temporaryChat: detectTemporaryChat(), availableOptions: collectAvailableOptions() },
+          });
+          return;
+        }
         if (!initialized) {
           initialized = true;
           await openDelay();
@@ -655,26 +973,33 @@ function buildModelSelectionExpression(targetModel, strategy) {
         ensureMenuOpen();
         const match = findBestOption();
         if (match) {
-          if (optionIsSelected(match.node) || activeSelectionMatchesTarget()) {
+          if (
+            activeSelectionMatchesTarget() ||
+            canTrustSelectedOption(match.node, match.normalizedText, match.testid)
+          ) {
+            const resolvedLabel = getResolvedLabel(match.label);
             closeMenu();
-            resolve({ status: 'already-selected', label: getResolvedLabel(match.label) });
+            resolve({ status: 'already-selected', label: resolvedLabel });
             return;
           }
           const previousButtonLabel = normalizeText(getButtonLabel());
           const previousComposerSignal = readComposerModelSignal();
-          dispatchClickSequence(match.node);
           // 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');
+          const isSubmenu = isSubmenuOption(match.node, match.testid);
           if (isSubmenu) {
+            openedSubmenuKeys.add(match.submenuKey);
+            openSubmenuOption(match.node);
             setTimeout(attempt, REOPEN_INTERVAL_MS / 2);
             return;
           }
+          dispatchClickSequence(match.node);
           // Wait for the selected model signal to settle before reopening the picker.
           waitForTargetSelection(previousButtonLabel, previousComposerSignal).then((selectionSettled) => {
             if (selectionSettled === 'target') {
+              const resolvedLabel = getResolvedLabel(match.label);
               closeMenu();
-              resolve({ status: 'switched', label: getResolvedLabel(match.label) });
+              resolve({ status: 'switched', label: resolvedLabel });
               return;
             }
             attempt();
@@ -783,6 +1108,34 @@ function buildModelMatchersLiteral(targetModel) {
         testIdTokens.add("gpt5-4");
         testIdTokens.add("gpt54");
     }
+    // Numeric variations (5.3 ↔ 53 ↔ gpt-5-3)
+    if (base.includes("5.3") || base.includes("5-3") || base.includes("53")) {
+        push("5.3", labelTokens);
+        push("gpt-5.3", labelTokens);
+        push("gpt5.3", labelTokens);
+        push("gpt-5-3", labelTokens);
+        push("gpt5-3", labelTokens);
+        push("gpt53", labelTokens);
+        push("chatgpt 5.3", labelTokens);
+        if (base.includes("thinking")) {
+            push("thinking", labelTokens);
+            testIdTokens.add("model-switcher-gpt-5-3-thinking");
+            testIdTokens.add("gpt-5-3-thinking");
+            testIdTokens.add("gpt-5.3-thinking");
+        }
+        if (base.includes("instant")) {
+            push("instant", labelTokens);
+            testIdTokens.add("model-switcher-gpt-5-3-instant");
+            testIdTokens.add("gpt-5-3-instant");
+            testIdTokens.add("gpt-5.3-instant");
+        }
+        if (!base.includes("pro") && !base.includes("thinking") && !base.includes("instant")) {
+            testIdTokens.add("model-switcher-gpt-5-3");
+        }
+        testIdTokens.add("gpt-5-3");
+        testIdTokens.add("gpt5-3");
+        testIdTokens.add("gpt53");
+    }
     // Numeric variations (5.1 ↔ 51 ↔ gpt-5-1)
     if (base.includes("5.1") || base.includes("5-1") || base.includes("51")) {
         push("5.1", labelTokens);
@@ -857,6 +1210,11 @@ function buildModelMatchersLiteral(targetModel) {
             testIdTokens.add("gpt-5-4-pro");
             testIdTokens.add("gpt54pro");
         }
+        if (base.includes("5.3") || base.includes("5-3") || base.includes("53")) {
+            testIdTokens.add("gpt-5.3-pro");
+            testIdTokens.add("gpt-5-3-pro");
+            testIdTokens.add("gpt53pro");
+        }
         if (base.includes("5.1") || base.includes("5-1") || base.includes("51")) {
             testIdTokens.add("gpt-5.1-pro");
             testIdTokens.add("gpt-5-1-pro");