@steipete/oracle 0.9.0 → 0.11.0

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

@@ -1,7 +1,7 @@
-import { MENU_CONTAINER_SELECTOR, MENU_ITEM_SELECTOR, MODEL_BUTTON_SELECTOR, } from '../constants.js';
-import { logDomFailure } from '../domDebug.js';
-import { buildClickDispatcher } from './domEvents.js';
-export async function ensureModelSelection(Runtime, desiredModel, logger, strategy = 'select') {
+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";
+export async function ensureModelSelection(Runtime, desiredModel, logger, strategy = "select") {
     const outcome = await Runtime.evaluate({
         expression: buildModelSelectionExpression(desiredModel, strategy),
         awaitPromise: true,
@@ -9,52 +9,88 @@ 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 "already-selected":
+        case "switched":
+        case "switched-best-effort": {
             const label = result.label ?? desiredModel;
+            if (strategy !== "current") {
+                assertResolvedModelSelection(desiredModel, label);
+            }
             logger(`Model picker: ${label}`);
             return;
         }
-        case 'option-not-found': {
-            await logDomFailure(Runtime, logger, 'model-switcher-option');
+        case "option-not-found": {
+            await logDomFailure(Runtime, logger, "model-switcher-option");
             const isTemporary = result.hint?.temporaryChat ?? false;
             const available = (result.hint?.availableOptions ?? []).filter(Boolean);
-            const availableHint = available.length > 0 ? ` Available: ${available.join(', ')}.` : '';
+            const availableHint = available.length > 0 ? ` Available: ${available.join(", ")}.` : "";
             const tempHint = isTemporary && /\bpro\b/i.test(desiredModel)
                 ? ' You are in Temporary Chat mode; Pro models are not available there. Remove "temporary-chat=true" from --chatgpt-url or use a non-Pro model (e.g. gpt-5.2).'
-                : '';
+                : "";
             throw new Error(`Unable to find model option matching "${desiredModel}" in the model switcher.${availableHint}${tempHint}`);
         }
         default: {
-            await logDomFailure(Runtime, logger, 'model-switcher-button');
-            throw new Error('Unable to locate the ChatGPT model selector button.');
+            await logDomFailure(Runtime, logger, "model-switcher-button");
+            throw new Error("Unable to locate the ChatGPT model selector button.");
         }
     }
 }
+function assertResolvedModelSelection(desiredModel, resolvedLabel) {
+    const desired = desiredModel.toLowerCase();
+    const resolved = resolvedLabel.toLowerCase();
+    const wantsGpt55Pro = desired === "gpt-5.5-pro" ||
+        desired.includes("5.5 pro") ||
+        desired.includes("5-5 pro") ||
+        (desired.includes("pro") && desired.includes("extended"));
+    if (!wantsGpt55Pro || !resolved) {
+        return;
+    }
+    const hasProSignal = resolved.includes(" pro") ||
+        resolved.endsWith("pro") ||
+        resolved.includes("pro ") ||
+        resolved.includes("extended") ||
+        resolved.includes("gpt-5.5-pro") ||
+        resolved.includes("gpt 5 5 pro");
+    if (!hasProSignal || (resolved.includes("thinking") && !resolved.includes("pro"))) {
+        throw new Error(`Model picker selected "${resolvedLabel}" while "${desiredModel}" requires GPT-5.5 Pro Extended. Use model "gpt-5.5" with browser thinking time "heavy" for Thinking Heavy.`);
+    }
+}
+export function assertResolvedModelSelectionForTest(desiredModel, resolvedLabel) {
+    assertResolvedModelSelection(desiredModel, resolvedLabel);
+}
 /**
  * Builds the DOM expression that runs inside the ChatGPT tab to select a model.
  * The string is evaluated inside Chrome, so keep it self-contained and well-commented.
  */
 function buildModelSelectionExpression(targetModel, strategy) {
     const matchers = buildModelMatchersLiteral(targetModel);
+    const composerSignalMatchers = buildComposerSignalMatchers(targetModel);
     const labelLiteral = JSON.stringify(matchers.labelTokens);
     const idLiteral = JSON.stringify(matchers.testIdTokens);
     const primaryLabelLiteral = JSON.stringify(targetModel);
     const strategyLiteral = JSON.stringify(strategy);
+    const composerSignalSelectorLiteral = JSON.stringify(COMPOSER_MODEL_SIGNAL_SELECTOR);
+    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);
     return `(() => {
     ${buildClickDispatcher()}
     // Capture the selectors and matcher literals up front so the browser expression stays pure.
     const BUTTON_SELECTOR = '${MODEL_BUTTON_SELECTOR}';
+    const COMPOSER_MODEL_SIGNAL_SELECTOR = ${composerSignalSelectorLiteral};
     const LABEL_TOKENS = ${labelLiteral};
     const TEST_IDS = ${idLiteral};
     const PRIMARY_LABEL = ${primaryLabelLiteral};
     const MODEL_STRATEGY = ${strategyLiteral};
+    const COMPOSER_SIGNAL_INCLUDES = ${composerIncludesLiteral};
+    const COMPOSER_SIGNAL_EXCLUDES = ${composerExcludesLiteral};
+    const COMPOSER_SIGNAL_ALLOW_BLANK = ${composerAllowBlankLiteral};
     const INITIAL_WAIT_MS = 150;
     const REOPEN_INTERVAL_MS = 400;
     const MAX_WAIT_MS = 20000;
+    const SETTLE_WAIT_MS = 1500;
     const normalizeText = (value) => {
       if (!value) {
         return '';
@@ -73,16 +109,32 @@ function buildModelSelectionExpression(targetModel, strategy) {
     const targetWords = normalizedTarget.split(' ').filter(Boolean);
     const desiredVersion = normalizedTarget.includes('5 4')
       ? '5-4'
-      : normalizedTarget.includes('5 2')
+      : normalizedTarget.includes('5 5')
+        ? '5-5'
+        : normalizedTarget.includes('5 2')
         ? '5-2'
         : normalizedTarget.includes('5 1')
           ? '5-1'
           : normalizedTarget.includes('5 0')
             ? '5-0'
-            : null;
+          : null;
     const wantsPro = normalizedTarget.includes(' pro') || normalizedTarget.endsWith(' pro') || normalizedTokens.includes('pro');
     const wantsInstant = normalizedTarget.includes('instant');
     const wantsThinking = normalizedTarget.includes('thinking');
+    const isTargetGpt55VisibleAlias = (value) => {
+      if (desiredVersion !== '5-5') return false;
+      const label = normalizeText(value);
+      if (wantsPro) {
+        return label.includes('pro') && label.includes('extended') && !label.includes('thinking');
+      }
+      if (wantsThinking) {
+        return label.includes('thinking') && label.includes('heavy') && !label.includes('pro');
+      }
+      return false;
+    };
+    const hasProComposerPill = () => Boolean(
+      document.querySelector('button.__composer-pill, button[aria-label="Pro, click to remove"]')
+    );
 
     const button = document.querySelector(BUTTON_SELECTOR);
     if (!button) {
@@ -110,13 +162,34 @@ function buildModelSelectionExpression(targetModel, strategy) {
     };
 
     const getButtonLabel = () => (button.textContent ?? '').trim();
+    const getComposerModelLabel = () =>
+      (document.querySelector(COMPOSER_MODEL_SIGNAL_SELECTOR)?.textContent ?? '').trim();
+    const readComposerModelSignal = () => normalizeText(getComposerModelLabel());
+    const withProPillSignal = (label) => {
+      const resolved = label || '';
+      if (!wantsPro || !hasProComposerPill()) return resolved;
+      const normalized = normalizeText(resolved);
+      if (!normalized || normalized.includes('pro')) return resolved;
+      return resolved + ' + Pro';
+    };
+    const getResolvedLabel = (fallback) =>
+      withProPillSignal(getComposerModelLabel() || getButtonLabel() || fallback);
     if (MODEL_STRATEGY === 'current') {
-      return { status: 'already-selected', label: getButtonLabel() };
+      const currentLabel = getResolvedLabel(PRIMARY_LABEL);
+      return {
+        status: 'already-selected',
+        label: currentLabel,
+      };
     }
     const buttonMatchesTarget = () => {
       const normalizedLabel = normalizeText(getButtonLabel());
       if (!normalizedLabel) return false;
+      if (isTargetGpt55VisibleAlias(normalizedLabel)) return true;
+      if (wantsPro && normalizedLabel === 'chatgpt' && hasProComposerPill()) {
+        return true;
+      }
       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-2' && !normalizedLabel.includes('5 2')) return false;
         if (desiredVersion === '5-1' && !normalizedLabel.includes('5 1')) return false;
@@ -131,9 +204,47 @@ function buildModelSelectionExpression(targetModel, strategy) {
       if (!wantsThinking && normalizedLabel.includes('thinking')) return false;
       return true;
     };
+    const buttonHasGenericLabel = () => {
+      const normalizedLabel = normalizeText(getButtonLabel());
+      return !normalizedLabel || normalizedLabel === 'chatgpt';
+    };
+    const composerSignalMatchesTarget = () => {
+      const signal = readComposerModelSignal();
+      if (!signal) {
+        return COMPOSER_SIGNAL_ALLOW_BLANK;
+      }
+      if (COMPOSER_SIGNAL_EXCLUDES.some((token) => token && signal.includes(token))) {
+        return false;
+      }
+      if (COMPOSER_SIGNAL_INCLUDES.length === 0) {
+        return true;
+      }
+      return COMPOSER_SIGNAL_INCLUDES.some((token) => token && signal.includes(token));
+    };
+    const activeSelectionMatchesTarget = () => {
+      if (buttonMatchesTarget()) {
+        return true;
+      }
+      if (!buttonHasGenericLabel()) {
+        return false;
+      }
+      return composerSignalMatchesTarget();
+    };
+    const selectionStateChanged = (previousButtonLabel, previousComposerSignal) => {
+      const currentButtonLabel = normalizeText(getButtonLabel());
+      const currentComposerSignal = readComposerModelSignal();
+      if (
+        currentButtonLabel &&
+        currentButtonLabel !== previousButtonLabel &&
+        !buttonHasGenericLabel()
+      ) {
+        return true;
+      }
+      return currentComposerSignal !== previousComposerSignal;
+    };
 
-    if (buttonMatchesTarget()) {
-      return { status: 'already-selected', label: getButtonLabel() };
+    if (activeSelectionMatchesTarget()) {
+      return { status: 'already-selected', label: getResolvedLabel(PRIMARY_LABEL) };
     }
 
     let lastPointerClick = 0;
@@ -144,6 +255,10 @@ function buildModelSelectionExpression(targetModel, strategy) {
     };
 
     const getOptionLabel = (node) => node?.textContent?.trim() ?? '';
+    const isThinkingEffortControl = (node) =>
+      node instanceof HTMLElement &&
+      (node.getAttribute('data-model-picker-thinking-effort-action') === 'true' ||
+        Boolean(node.closest('[data-model-picker-thinking-effort-action="true"]')));
     const optionIsSelected = (node) => {
       if (!(node instanceof HTMLElement)) {
         return false;
@@ -160,7 +275,7 @@ function buildModelSelectionExpression(targetModel, strategy) {
       if (dataSelected === 'true' || selectedStates.includes(dataState)) {
         return true;
       }
-      if (node.querySelector('[data-testid*="check"], [role="img"][data-icon="check"], svg[data-icon="check"]')) {
+      if (node.querySelector('[data-testid*="check"], [role="img"][data-icon="check"], svg[data-icon="check"], .trailing svg')) {
         return true;
       }
       return false;
@@ -182,6 +297,12 @@ function buildModelSelectionExpression(targetModel, strategy) {
             normalizedTestId.includes('gpt-5-2') ||
             normalizedTestId.includes('gpt-5.2') ||
             normalizedTestId.includes('gpt52');
+          const has55 =
+            normalizedTestId.includes('5-5') ||
+            normalizedTestId.includes('5.5') ||
+            normalizedTestId.includes('gpt-5-5') ||
+            normalizedTestId.includes('gpt-5.5') ||
+            normalizedTestId.includes('gpt55');
           const has54 =
             normalizedTestId.includes('5-4') ||
             normalizedTestId.includes('5.4') ||
@@ -200,7 +321,7 @@ function buildModelSelectionExpression(targetModel, strategy) {
             normalizedTestId.includes('gpt-5-0') ||
             normalizedTestId.includes('gpt-5.0') ||
             normalizedTestId.includes('gpt50');
-          const candidateVersion = has54 ? '5-4' : has52 ? '5-2' : has51 ? '5-1' : has50 ? '5-0' : null;
+          const candidateVersion = has55 ? '5-5' : has54 ? '5-4' : 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;
@@ -227,6 +348,33 @@ function buildModelSelectionExpression(targetModel, strategy) {
           }
         }
       }
+      const candidateGpt55VisibleAlias = isTargetGpt55VisibleAlias(normalizedText);
+      const candidateHasThinking =
+        normalizedText.includes('thinking') || normalizedTestId.includes('thinking');
+      const candidateHasPro =
+        candidateGpt55VisibleAlias ||
+        normalizedText === 'pro' ||
+        normalizedText.startsWith('pro ') ||
+        normalizedText.includes(' pro ') ||
+        normalizedText.endsWith(' pro') ||
+        normalizedText.includes('proresearch') ||
+        normalizedTestId.includes('pro');
+      if (wantsPro && candidateHasThinking) return 0;
+      if (wantsPro && !candidateHasPro) return 0;
+      if (wantsThinking && candidateHasPro) return 0;
+      if (desiredVersion === '5-5' && normalizedText && !candidateGpt55VisibleAlias) {
+        const candidateHasVersion =
+          normalizedText.includes('5 5') ||
+          normalizedText.includes('gpt55') ||
+          normalizedText.includes('gpt 5 5');
+        const versionLikeLabel = /(?:^|\\s)5\\s+[0-9](?:\\s|$)/.test(normalizedText) || normalizedText.includes('gpt');
+        if (versionLikeLabel && !candidateHasVersion) {
+          return 0;
+        }
+      }
+      if (candidateGpt55VisibleAlias) {
+        score += 900;
+      }
       if (normalizedText && normalizedTarget) {
         if (normalizedText === normalizedTarget) {
           score += 500;
@@ -286,6 +434,9 @@ function buildModelSelectionExpression(targetModel, strategy) {
       for (const menu of menus) {
         const buttons = Array.from(menu.querySelectorAll(${menuItemLiteral}));
         for (const option of buttons) {
+          if (isThinkingEffortControl(option)) {
+            continue;
+          }
           const text = option.textContent ?? '';
           const normalizedText = normalizeText(text);
           const testid = option.getAttribute('data-testid') ?? '';
@@ -301,6 +452,25 @@ function buildModelSelectionExpression(targetModel, strategy) {
       }
       return bestMatch;
     };
+    const waitForTargetSelection = (previousButtonLabel, previousComposerSignal) => new Promise((resolve) => {
+      const waitStart = performance.now();
+      const check = () => {
+        if (activeSelectionMatchesTarget()) {
+          resolve('target');
+          return;
+        }
+        if (selectionStateChanged(previousButtonLabel, previousComposerSignal)) {
+          resolve('changed');
+          return;
+        }
+        if (performance.now() - waitStart > SETTLE_WAIT_MS) {
+          resolve('timeout');
+          return;
+        }
+        setTimeout(check, 100);
+      };
+      check();
+    });
 
     return new Promise((resolve) => {
       const start = performance.now();
@@ -345,11 +515,13 @@ function buildModelSelectionExpression(targetModel, strategy) {
         ensureMenuOpen();
         const match = findBestOption();
         if (match) {
-          if (optionIsSelected(match.node)) {
+          if (activeSelectionMatchesTarget()) {
             closeMenu();
-            resolve({ status: 'already-selected', label: getButtonLabel() || match.label });
+            resolve({ status: 'already-selected', label: getResolvedLabel(match.label) });
             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.
@@ -358,15 +530,15 @@ function buildModelSelectionExpression(targetModel, strategy) {
             setTimeout(attempt, REOPEN_INTERVAL_MS / 2);
             return;
           }
-          // Wait for the top bar label to reflect the requested model; otherwise keep scanning.
-          setTimeout(() => {
-            if (buttonMatchesTarget()) {
+          // Wait for the selected model signal to settle before reopening the picker.
+          waitForTargetSelection(previousButtonLabel, previousComposerSignal).then((selectionSettled) => {
+            if (selectionSettled === 'target') {
               closeMenu();
-              resolve({ status: 'switched', label: getButtonLabel() || match.label });
+              resolve({ status: 'switched', label: getResolvedLabel(match.label) });
               return;
             }
             attempt();
-          }, Math.max(120, INITIAL_WAIT_MS));
+          });
           return;
         }
         if (performance.now() - start > MAX_WAIT_MS) {
@@ -385,6 +557,27 @@ function buildModelSelectionExpression(targetModel, strategy) {
 export function buildModelMatchersLiteralForTest(targetModel) {
     return buildModelMatchersLiteral(targetModel);
 }
+function buildComposerSignalMatchers(targetModel) {
+    const normalized = targetModel
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, " ")
+        .replace(/\s+/g, " ")
+        .trim();
+    if (normalized.includes("pro")) {
+        return { includesAny: ["pro"], excludesAny: ["thinking"], allowBlank: false };
+    }
+    if (normalized.includes("thinking")) {
+        return { includesAny: ["thinking"], excludesAny: ["pro"], allowBlank: false };
+    }
+    if (normalized.includes("instant")) {
+        return { includesAny: [], excludesAny: ["thinking", "pro"], allowBlank: true };
+    }
+    return { includesAny: [], excludesAny: ["thinking", "pro"], allowBlank: true };
+}
+export function buildComposerSignalMatchersForTest(targetModel) {
+    return buildComposerSignalMatchers(targetModel);
+}
 function buildModelMatchersLiteral(targetModel) {
     const base = targetModel.trim().toLowerCase();
     const labelTokens = new Set();
@@ -396,115 +589,145 @@ function buildModelMatchersLiteral(targetModel) {
         }
     };
     push(base, labelTokens);
-    push(base.replace(/\s+/g, ' '), labelTokens);
-    const collapsed = base.replace(/\s+/g, '');
+    push(base.replace(/\s+/g, " "), labelTokens);
+    const collapsed = base.replace(/\s+/g, "");
     push(collapsed, labelTokens);
-    const dotless = base.replace(/[.]/g, '');
+    const dotless = base.replace(/[.]/g, "");
     push(dotless, labelTokens);
     push(`chatgpt ${base}`, labelTokens);
     push(`chatgpt ${dotless}`, labelTokens);
     push(`gpt ${base}`, labelTokens);
     push(`gpt ${dotless}`, 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);
+        push("gpt-5.5", labelTokens);
+        push("gpt5.5", labelTokens);
+        push("gpt-5-5", labelTokens);
+        push("gpt5-5", labelTokens);
+        push("gpt55", labelTokens);
+        push("chatgpt 5.5", labelTokens);
+        if (base.includes("thinking")) {
+            push("thinking heavy", labelTokens);
+            push("heavy thinking", labelTokens);
+            testIdTokens.add("model-switcher-gpt-5-5-thinking");
+            testIdTokens.add("gpt-5-5-thinking");
+            testIdTokens.add("gpt-5.5-thinking");
+        }
+        if (!base.includes("pro") && !base.includes("thinking")) {
+            testIdTokens.add("model-switcher-gpt-5-5");
+        }
+        testIdTokens.add("gpt-5-5");
+        testIdTokens.add("gpt5-5");
+        testIdTokens.add("gpt55");
+    }
     // Numeric variations (5.4 ↔ 54 ↔ gpt-5-4)
-    if (base.includes('5.4') || base.includes('5-4') || base.includes('54')) {
-        push('5.4', labelTokens);
-        push('gpt-5.4', labelTokens);
-        push('gpt5.4', labelTokens);
-        push('gpt-5-4', labelTokens);
-        push('gpt5-4', labelTokens);
-        push('gpt54', labelTokens);
-        push('chatgpt 5.4', labelTokens);
-        if (!base.includes('pro')) {
-            testIdTokens.add('model-switcher-gpt-5-4');
-        }
-        testIdTokens.add('gpt-5-4');
-        testIdTokens.add('gpt5-4');
-        testIdTokens.add('gpt54');
+    if (base.includes("5.4") || base.includes("5-4") || base.includes("54")) {
+        push("5.4", labelTokens);
+        push("gpt-5.4", labelTokens);
+        push("gpt5.4", labelTokens);
+        push("gpt-5-4", labelTokens);
+        push("gpt5-4", labelTokens);
+        push("gpt54", labelTokens);
+        push("chatgpt 5.4", labelTokens);
+        if (!base.includes("pro")) {
+            testIdTokens.add("model-switcher-gpt-5-4");
+        }
+        testIdTokens.add("gpt-5-4");
+        testIdTokens.add("gpt5-4");
+        testIdTokens.add("gpt54");
     }
     // Numeric variations (5.1 ↔ 51 ↔ gpt-5-1)
-    if (base.includes('5.1') || base.includes('5-1') || base.includes('51')) {
-        push('5.1', labelTokens);
-        push('gpt-5.1', labelTokens);
-        push('gpt5.1', labelTokens);
-        push('gpt-5-1', labelTokens);
-        push('gpt5-1', labelTokens);
-        push('gpt51', labelTokens);
-        push('chatgpt 5.1', labelTokens);
-        testIdTokens.add('gpt-5-1');
-        testIdTokens.add('gpt5-1');
-        testIdTokens.add('gpt51');
+    if (base.includes("5.1") || base.includes("5-1") || base.includes("51")) {
+        push("5.1", labelTokens);
+        push("gpt-5.1", labelTokens);
+        push("gpt5.1", labelTokens);
+        push("gpt-5-1", labelTokens);
+        push("gpt5-1", labelTokens);
+        push("gpt51", labelTokens);
+        push("chatgpt 5.1", labelTokens);
+        testIdTokens.add("gpt-5-1");
+        testIdTokens.add("gpt5-1");
+        testIdTokens.add("gpt51");
     }
     // Numeric variations (5.0 ↔ 50 ↔ gpt-5-0)
-    if (base.includes('5.0') || base.includes('5-0') || base.includes('50')) {
-        push('5.0', labelTokens);
-        push('gpt-5.0', labelTokens);
-        push('gpt5.0', labelTokens);
-        push('gpt-5-0', labelTokens);
-        push('gpt5-0', labelTokens);
-        push('gpt50', labelTokens);
-        push('chatgpt 5.0', labelTokens);
-        testIdTokens.add('gpt-5-0');
-        testIdTokens.add('gpt5-0');
-        testIdTokens.add('gpt50');
+    if (base.includes("5.0") || base.includes("5-0") || base.includes("50")) {
+        push("5.0", labelTokens);
+        push("gpt-5.0", labelTokens);
+        push("gpt5.0", labelTokens);
+        push("gpt-5-0", labelTokens);
+        push("gpt5-0", labelTokens);
+        push("gpt50", labelTokens);
+        push("chatgpt 5.0", labelTokens);
+        testIdTokens.add("gpt-5-0");
+        testIdTokens.add("gpt5-0");
+        testIdTokens.add("gpt50");
     }
     // Numeric variations (5.2 ↔ 52 ↔ gpt-5-2)
-    if (base.includes('5.2') || base.includes('5-2') || base.includes('52')) {
-        push('5.2', labelTokens);
-        push('gpt-5.2', labelTokens);
-        push('gpt5.2', labelTokens);
-        push('gpt-5-2', labelTokens);
-        push('gpt5-2', labelTokens);
-        push('gpt52', labelTokens);
-        push('chatgpt 5.2', labelTokens);
+    if (base.includes("5.2") || base.includes("5-2") || base.includes("52")) {
+        push("5.2", labelTokens);
+        push("gpt-5.2", labelTokens);
+        push("gpt5.2", labelTokens);
+        push("gpt-5-2", labelTokens);
+        push("gpt5-2", labelTokens);
+        push("gpt52", labelTokens);
+        push("chatgpt 5.2", labelTokens);
         // Thinking variant: explicit testid for "Thinking" picker option
-        if (base.includes('thinking')) {
-            push('thinking', labelTokens);
-            testIdTokens.add('model-switcher-gpt-5-2-thinking');
-            testIdTokens.add('gpt-5-2-thinking');
-            testIdTokens.add('gpt-5.2-thinking');
+        if (base.includes("thinking")) {
+            push("thinking", labelTokens);
+            testIdTokens.add("model-switcher-gpt-5-2-thinking");
+            testIdTokens.add("gpt-5-2-thinking");
+            testIdTokens.add("gpt-5.2-thinking");
         }
         // Instant variant: explicit testid for "Instant" picker option
-        if (base.includes('instant')) {
-            push('instant', labelTokens);
-            testIdTokens.add('model-switcher-gpt-5-2-instant');
-            testIdTokens.add('gpt-5-2-instant');
-            testIdTokens.add('gpt-5.2-instant');
+        if (base.includes("instant")) {
+            push("instant", labelTokens);
+            testIdTokens.add("model-switcher-gpt-5-2-instant");
+            testIdTokens.add("gpt-5-2-instant");
+            testIdTokens.add("gpt-5.2-instant");
         }
         // Base 5.2 testids (for "Auto" mode when no suffix specified)
-        if (!base.includes('thinking') && !base.includes('instant') && !base.includes('pro')) {
-            testIdTokens.add('model-switcher-gpt-5-2');
+        if (!base.includes("thinking") && !base.includes("instant") && !base.includes("pro")) {
+            testIdTokens.add("model-switcher-gpt-5-2");
         }
-        testIdTokens.add('gpt-5-2');
-        testIdTokens.add('gpt5-2');
-        testIdTokens.add('gpt52');
+        testIdTokens.add("gpt-5-2");
+        testIdTokens.add("gpt5-2");
+        testIdTokens.add("gpt52");
     }
     // Pro / research variants
-    if (base.includes('pro')) {
-        push('proresearch', labelTokens);
-        push('research grade', labelTokens);
-        push('advanced reasoning', labelTokens);
-        if (base.includes('5.4') || base.includes('5-4') || base.includes('54')) {
-            testIdTokens.add('gpt-5.4-pro');
-            testIdTokens.add('gpt-5-4-pro');
-            testIdTokens.add('gpt54pro');
-        }
-        if (base.includes('5.1') || base.includes('5-1') || base.includes('51')) {
-            testIdTokens.add('gpt-5.1-pro');
-            testIdTokens.add('gpt-5-1-pro');
-            testIdTokens.add('gpt51pro');
-        }
-        if (base.includes('5.0') || base.includes('5-0') || base.includes('50')) {
-            testIdTokens.add('gpt-5.0-pro');
-            testIdTokens.add('gpt-5-0-pro');
-            testIdTokens.add('gpt50pro');
-        }
-        if (base.includes('5.2') || base.includes('5-2') || base.includes('52')) {
-            testIdTokens.add('gpt-5.2-pro');
-            testIdTokens.add('gpt-5-2-pro');
-            testIdTokens.add('gpt52pro');
-        }
-        testIdTokens.add('pro');
-        testIdTokens.add('proresearch');
+    if (base.includes("pro")) {
+        push("proresearch", labelTokens);
+        push("research grade", labelTokens);
+        push("advanced reasoning", labelTokens);
+        if (base.includes("5.5") || base.includes("5-5") || base.includes("55")) {
+            push("pro extended", labelTokens);
+            push("extended pro", labelTokens);
+            testIdTokens.add("gpt-5.5-pro");
+            testIdTokens.add("gpt-5-5-pro");
+            testIdTokens.add("gpt55pro");
+        }
+        if (base.includes("5.4") || base.includes("5-4") || base.includes("54")) {
+            testIdTokens.add("gpt-5.4-pro");
+            testIdTokens.add("gpt-5-4-pro");
+            testIdTokens.add("gpt54pro");
+        }
+        if (base.includes("5.1") || base.includes("5-1") || base.includes("51")) {
+            testIdTokens.add("gpt-5.1-pro");
+            testIdTokens.add("gpt-5-1-pro");
+            testIdTokens.add("gpt51pro");
+        }
+        if (base.includes("5.0") || base.includes("5-0") || base.includes("50")) {
+            testIdTokens.add("gpt-5.0-pro");
+            testIdTokens.add("gpt-5-0-pro");
+            testIdTokens.add("gpt50pro");
+        }
+        if (base.includes("5.2") || base.includes("5-2") || base.includes("52")) {
+            testIdTokens.add("gpt-5.2-pro");
+            testIdTokens.add("gpt-5-2-pro");
+            testIdTokens.add("gpt52pro");
+        }
+        testIdTokens.add("pro");
+        testIdTokens.add("proresearch");
     }
     base
         .split(/\s+/)
@@ -513,7 +736,7 @@ function buildModelMatchersLiteral(targetModel) {
         .forEach((token) => {
         push(token, labelTokens);
     });
-    const hyphenated = base.replace(/\s+/g, '-');
+    const hyphenated = base.replace(/\s+/g, "-");
     push(hyphenated, testIdTokens);
     push(collapsed, testIdTokens);
     push(dotless, testIdTokens);
@@ -525,13 +748,13 @@ function buildModelMatchersLiteral(targetModel) {
         labelTokens.add(base);
     }
     if (!testIdTokens.size) {
-        testIdTokens.add(base.replace(/\s+/g, '-'));
+        testIdTokens.add(base.replace(/\s+/g, "-"));
     }
     return {
         labelTokens: Array.from(labelTokens).filter(Boolean),
         testIdTokens: Array.from(testIdTokens).filter(Boolean),
     };
 }
-export function buildModelSelectionExpressionForTest(targetModel) {
-    return buildModelSelectionExpression(targetModel, 'select');
+export function buildModelSelectionExpressionForTest(targetModel, strategy = "select") {
+    return buildModelSelectionExpression(targetModel, strategy);
 }