fix(browser): handle Extended Pro fresh-chat selector

Author: ninjaa

src/browser/actions/domEvents.ts

@@ -6,10 +6,28 @@ export function buildClickDispatcher(functionName = "dispatchClickSequence"): st
     if(!target || !(target instanceof EventTarget)) return false;
     const types = ${typesLiteral};
     for (const type of types) {
-      const common = { bubbles: true, cancelable: true, view: window };
+      const common = {
+        bubbles: true,
+        cancelable: true,
+        composed: true,
+        view: window,
+        button: 0,
+        buttons: 1,
+        clientX: 10,
+        clientY: 10,
+        screenX: 10,
+        screenY: 10,
+        detail: 1,
+      };
       let event;
       if (type.startsWith('pointer') && 'PointerEvent' in window) {
-        event = new PointerEvent(type, { ...common, pointerId: 1, pointerType: 'mouse' });
+        event = new PointerEvent(type, {
+          ...common,
+          pointerId: 1,
+          pointerType: 'mouse',
+          isPrimary: true,
+          pressure: type === 'pointerup' ? 0 : 0.5,
+        });
       } else {
         event = new MouseEvent(type, common);
       }

src/browser/actions/modelSelection.ts

@@ -139,31 +139,57 @@ function buildModelSelectionExpression(
     };
 
     const getButtonLabel = () => (button.textContent ?? '').trim();
-    if (MODEL_STRATEGY === 'current') {
-      return { status: 'already-selected', label: getButtonLabel() };
-    }
-    const buttonMatchesTarget = () => {
-      const normalizedLabel = normalizeText(getButtonLabel());
+    const getSelectedModelLabels = () => {
+      const labels = new Set();
+      const push = (value) => {
+        const normalized = (value ?? '').trim();
+        if (normalized) {
+          labels.add(normalized);
+        }
+      };
+      push(getButtonLabel());
+      const chipSelectors = [
+        '[aria-label*="click to remove"]',
+        '[class*="composer-pill"]',
+        '[data-testid*="composer-pill"]',
+      ];
+      for (const selector of chipSelectors) {
+        const nodes = Array.from(document.querySelectorAll(selector));
+        for (const node of nodes) {
+          push(node.getAttribute?.('aria-label')?.replace(/,\\s*click to remove$/i, ''));
+          push(node.textContent);
+        }
+      }
+      return Array.from(labels);
+    };
+    const labelMatchesTarget = (label) => {
+      const normalizedLabel = normalizeText(label);
       if (!normalizedLabel) return false;
       if (desiredVersion) {
         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;
         if (desiredVersion === '5-0' && !normalizedLabel.includes('5 0')) return false;
       }
-      if (wantsPro && !normalizedLabel.includes(' pro')) return false;
+      if (wantsPro && !normalizedLabel.includes('pro')) return false;
       if (wantsInstant && !normalizedLabel.includes('instant')) return false;
       if (wantsThinking && !normalizedLabel.includes('thinking')) return false;
-      // Also reject if button has variants we DON'T want
       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()) {
+    if (MODEL_STRATEGY === 'current') {
       return { status: 'already-selected', label: getButtonLabel() };
     }
+    const currentSelectionMatchesTarget = () => {
+      const labels = getSelectedModelLabels();
+      return labels.some((label) => labelMatchesTarget(label));
+    };
+
+    if (currentSelectionMatchesTarget()) {
+      return { status: 'already-selected', label: getSelectedModelLabels()[0] || getButtonLabel() };
+    }
 
     let lastPointerClick = 0;
     const pointerClick = () => {
@@ -389,9 +415,9 @@ function buildModelSelectionExpression(
           }
           // Wait for the top bar label to reflect the requested model; otherwise keep scanning.
           setTimeout(() => {
-            if (buttonMatchesTarget()) {
+            if (currentSelectionMatchesTarget()) {
               closeMenu();
-              resolve({ status: 'switched', label: getButtonLabel() || match.label });
+              resolve({ status: 'switched', label: getSelectedModelLabels()[0] || getButtonLabel() || match.label });
               return;
             }
             attempt();

src/browser/constants.ts

@@ -1,7 +1,7 @@
 import type { BrowserModelStrategy } from "./types.js";
 
 export const CHATGPT_URL = "https://chatgpt.com/";
-export const DEFAULT_MODEL_TARGET = "GPT-5.4 Pro";
+export const DEFAULT_MODEL_TARGET = "Extended Pro";
 export const DEFAULT_MODEL_STRATEGY: BrowserModelStrategy = "select";
 export const COOKIE_URLS = [
   "https://chatgpt.com",
@@ -78,7 +78,8 @@ export const SEND_BUTTON_SELECTORS = [
   'button[aria-label*="Send"]',
 ];
 export const SEND_BUTTON_SELECTOR = SEND_BUTTON_SELECTORS[0];
-export const MODEL_BUTTON_SELECTOR = '[data-testid="model-switcher-dropdown-button"]';
+export const MODEL_BUTTON_SELECTOR =
+  '[data-testid="model-switcher-dropdown-button"], button[aria-label="Switch model"], [aria-label="Switch model"]';
 export const COPY_BUTTON_SELECTOR = 'button[data-testid="copy-turn-action-button"]';
 // Action buttons that only appear once a turn has finished rendering.
 export const FINISHED_ACTIONS_SELECTOR =

src/cli/browserConfig.ts

@@ -25,12 +25,12 @@ const DEFAULT_CHROME_PROFILE = "Default";
 // The browser label is passed to the model picker which fuzzy-matches against ChatGPT's UI.
 const BROWSER_MODEL_LABELS: [ModelName, string][] = [
   // Most specific first (e.g., "gpt-5.2-thinking" before "gpt-5.2")
-  ["gpt-5.4-pro", "GPT-5.4 Pro"],
+  ["gpt-5.4-pro", "Extended Pro"],
   ["gpt-5.2-thinking", "GPT-5.2 Thinking"],
   ["gpt-5.2-instant", "GPT-5.2 Instant"],
-  ["gpt-5.2-pro", "GPT-5.4 Pro"],
-  ["gpt-5.1-pro", "GPT-5.4 Pro"],
-  ["gpt-5-pro", "GPT-5.4 Pro"],
+  ["gpt-5.2-pro", "Extended Pro"],
+  ["gpt-5.1-pro", "Extended Pro"],
+  ["gpt-5-pro", "Extended Pro"],
   // Base models last (least specific)
   ["gpt-5.4", "Thinking 5.4"],
   ["gpt-5.2", "GPT-5.2"], // Selects "Auto" in ChatGPT UI

tests/browser/modelSelection.test.ts

@@ -70,4 +70,11 @@ describe("browser model selection matchers", () => {
     expect(expression).toContain("key: 'Escape'");
     expect(expression).toContain("closeMenu();");
   });
+
+  it("checks composer pills when the top-left selector stays generic", () => {
+    const expression = buildModelSelectionExpressionForTest("Extended Pro");
+    expect(expression).toContain('[aria-label*="click to remove"]');
+    expect(expression).toContain('[class*="composer-pill"]');
+    expect(expression).toContain("currentSelectionMatchesTarget");
+  });
 });

tests/cli/browserConfig.test.ts

@@ -15,7 +15,7 @@ describe("buildBrowserConfig", () => {
       headless: undefined,
       keepBrowser: undefined,
       hideWindow: undefined,
-      desiredModel: "GPT-5.4 Pro",
+      desiredModel: "Extended Pro",
       debug: undefined,
       allowCookieErrors: true,
     });
@@ -76,7 +76,7 @@ describe("buildBrowserConfig", () => {
       model: "gpt-5.2-pro",
       browserModelLabel: "Instant",
     });
-    expect(config.desiredModel).toBe("GPT-5.4 Pro");
+    expect(config.desiredModel).toBe("Extended Pro");
   });
 
   test("falls back to canonical label when override matches base model", async () => {
@@ -200,11 +200,11 @@ describe("buildBrowserConfig", () => {
 
 describe("resolveBrowserModelLabel", () => {
   test("returns canonical ChatGPT label when CLI value matches API model", () => {
-    expect(resolveBrowserModelLabel("gpt-5.4-pro", "gpt-5.4-pro")).toBe("GPT-5.4 Pro");
+    expect(resolveBrowserModelLabel("gpt-5.4-pro", "gpt-5.4-pro")).toBe("Extended Pro");
     expect(resolveBrowserModelLabel("gpt-5.4", "gpt-5.4")).toBe("Thinking 5.4");
-    expect(resolveBrowserModelLabel("gpt-5-pro", "gpt-5-pro")).toBe("GPT-5.4 Pro");
-    expect(resolveBrowserModelLabel("gpt-5.2-pro", "gpt-5.2-pro")).toBe("GPT-5.4 Pro");
-    expect(resolveBrowserModelLabel("gpt-5.1-pro", "gpt-5.1-pro")).toBe("GPT-5.4 Pro");
+    expect(resolveBrowserModelLabel("gpt-5-pro", "gpt-5-pro")).toBe("Extended Pro");
+    expect(resolveBrowserModelLabel("gpt-5.2-pro", "gpt-5.2-pro")).toBe("Extended Pro");
+    expect(resolveBrowserModelLabel("gpt-5.1-pro", "gpt-5.1-pro")).toBe("Extended Pro");
     expect(resolveBrowserModelLabel("GPT-5.1", "gpt-5.1")).toBe("GPT-5.2");
   });
 
@@ -217,7 +217,7 @@ describe("resolveBrowserModelLabel", () => {
   });
 
   test("supports undefined or whitespace-only input", () => {
-    expect(resolveBrowserModelLabel(undefined, "gpt-5.2-pro")).toBe("GPT-5.4 Pro");
+    expect(resolveBrowserModelLabel(undefined, "gpt-5.2-pro")).toBe("Extended Pro");
     expect(resolveBrowserModelLabel("   ", "gpt-5.1")).toBe("GPT-5.2");
   });