surf-cli 2.16.0 → 2.16.1

package/native/chatgpt-client-selection.cjs

@@ -50,12 +50,16 @@ function modelCandidateMatches(item, targetModel) {
 }
 
 function effortCandidateMatches(item, targetEffort) {
-  const variants = new Set(
-    [item?.label, item?.testId]
-      .flatMap((value) => normalizedWords(value))
-      .filter((word) => CHATGPT_EFFORT_CHOICES.includes(word)),
+  const labelVariants = new Set(
+    normalizedWords(item?.label).filter((word) => CHATGPT_EFFORT_CHOICES.includes(word)),
   );
-  return variants.size === 1 && variants.has(targetEffort);
+  if (labelVariants.size > 0) {
+    return labelVariants.size === 1 && labelVariants.has(targetEffort);
+  }
+  const testIdVariants = new Set(
+    normalizedWords(item?.testId).filter((word) => CHATGPT_EFFORT_CHOICES.includes(word)),
+  );
+  return testIdVariants.size === 1 && testIdVariants.has(targetEffort);
 }
 
 function uniqueMatch(items, matches) {

package/native/chatgpt-client-ui.cjs

@@ -191,14 +191,33 @@ async function readPicker(cdp, kind, click = false) {
     `(() => {
       ${buildClickDispatcher()}
       const kind = ${JSON.stringify(kind)};
+      const effortChoices = new Set(${JSON.stringify(CHATGPT_EFFORT_CHOICES)});
+      const effortOwnerLabels = new Set([...effortChoices, 'thinking']);
+      const normalize = (value) => String(value || '').toLowerCase().replace(/[^a-z0-9]+/g, ' ').trim();
+      const labelFor = (node) => {
+        const labelledBy = String(node.getAttribute?.('aria-labelledby') || '')
+          .split(/\s+/)
+          .map((id) => document.getElementById(id)?.textContent || '')
+          .join(' ');
+        const text = (node.innerText || node.textContent || '').replace(/\s+/g, ' ').trim();
+        const aria = (node.getAttribute?.('aria-label') || '').replace(/\s+/g, ' ').trim();
+        const title = (node.getAttribute?.('title') || '').replace(/\s+/g, ' ').trim();
+        return [text, aria, labelledBy, title].filter(Boolean).join(' | ');
+      };
       let nodes = Array.from(document.querySelectorAll(${JSON.stringify(selector)})).filter((node) => {
-        const value = ((node.getAttribute?.('aria-label') || '') + ' ' + (node.textContent || '')).toLowerCase();
-        if (kind !== 'model') return value.includes('thinking') || value.includes('pro');
+        const value = normalize(labelFor(node));
+        if (kind !== 'model') {
+          const words = value.split(/\s+/).filter(Boolean);
+          const hasEffort = words.some((word) => effortOwnerLabels.has(word));
+          const looksLikeModel = node.getAttribute?.('data-testid') === 'model-switcher-dropdown-button' ||
+            value.includes('current model') || value.includes('gpt') || value.includes('instant');
+          return hasEffort && !looksLikeModel;
+        }
         return value.includes('gpt') || value.includes('thinking') || value.includes('instant');
       });
       if (kind === 'model' && nodes.length === 0) {
         nodes = Array.from(document.querySelectorAll(${JSON.stringify(selector)})).filter((node) => {
-          const value = ((node.getAttribute?.('aria-label') || '') + ' ' + (node.textContent || '')).toLowerCase();
+          const value = normalize(labelFor(node));
           return value.includes('pro');
         });
       }
@@ -208,13 +227,19 @@ async function readPicker(cdp, kind, click = false) {
         );
       }
       const items = nodes.map((node) => {
-        const text = (node.textContent || '').replace(/\\s+/g, ' ').trim();
+        const text = (node.innerText || node.textContent || '').replace(/\\s+/g, ' ').trim();
         const aria = (node.getAttribute?.('aria-label') || '').replace(/\\s+/g, ' ').trim();
+        const labelledBy = String(node.getAttribute?.('aria-labelledby') || '')
+          .split(/\\s+/)
+          .map((id) => document.getElementById(id)?.textContent || '')
+          .join(' ')
+          .replace(/\\s+/g, ' ')
+          .trim();
         const title = (node.getAttribute?.('title') || '').replace(/\\s+/g, ' ').trim();
         return {
           role: node.getAttribute?.('role') || (node.tagName === 'BUTTON' ? 'button' : null),
-          label: [text, aria, title].filter(Boolean).join(' | ').slice(0, 240),
-          displayLabel: (text || aria || title).slice(0, 80),
+          label: [text, aria, labelledBy, title].filter(Boolean).join(' | ').slice(0, 240),
+          displayLabel: (text || aria || labelledBy || title).slice(0, 80),
           testId: node.getAttribute?.('data-testid') || null,
         };
       });
@@ -370,6 +395,10 @@ async function selectEffort(cdp, desiredEffort, timeoutMs = 8000, signal) {
   throwIfAborted(signal);
   const normalizedEffort = normalizeChatGPTEffortChoice(desiredEffort);
   if (!normalizedEffort) throw verificationError("effort", desiredEffort, [], true);
+  const current = await readPicker(cdp, "effort");
+  const currentVerified = verifyChatGPTEffortSelection(current?.items, normalizedEffort);
+  if (currentVerified) return currentVerified.displayLabel || currentVerified.label;
+
   const picker = await readPicker(cdp, "effort", true);
   if (picker?.items?.length !== 1) throw verificationError("effort", desiredEffort);
   await delay(300, signal);
@@ -407,6 +436,13 @@ async function typePrompt(cdp, inputCdp, prompt, signal) {
         const node = document.querySelector(selector);
         if (!node) continue;
         dispatchClickSequence(node);
+        if ('value' in node) {
+          node.value = '';
+          node.dispatchEvent(new InputEvent('input', { bubbles: true, inputType: 'deleteContentBackward' }));
+        } else {
+          node.textContent = '';
+          node.dispatchEvent(new InputEvent('input', { bubbles: true, inputType: 'deleteContentBackward' }));
+        }
         if (typeof node.focus === 'function') node.focus();
         const doc = node.ownerDocument;
         const selection = doc?.getSelection?.();

package/native/chatgpt-client.cjs

@@ -152,10 +152,6 @@ async function dispatch(options) {
       modelVerified = await selectModel(cdp, model, 8000, signal);
       log(`Verified model: ${modelVerified}`);
     }
-    if (effort) {
-      effortVerified = await selectEffort(cdp, effort, 8000, signal);
-      log(`Verified effort: ${effortVerified}`);
-    }
     if (file) {
       if (!uploadFile) {
         throw new Error(
@@ -177,6 +173,10 @@ async function dispatch(options) {
     }
     await typePrompt(cdp, inputCdp, prompt, signal);
     log("Prompt typed");
+    if (effort) {
+      effortVerified = await selectEffort(cdp, effort, 8000, signal);
+      log(`Verified effort: ${effortVerified}`);
+    }
     const baseline = normalizeResponseSnapshot(await readChatGPTResponseSnapshot(cdp));
     if (beforeSubmit) await raceAbort(beforeSubmit, signal);
     await clickSend(cdp, inputCdp, signal);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "surf-cli",
-  "version": "2.16.0",
+  "version": "2.16.1",
   "description": "CLI for AI agents to control Chrome. Zero config, agent-agnostic, battle-tested.",
   "keywords": [
     "chrome",
@@ -71,7 +71,7 @@
     "@vitest/coverage-v8": "^4.1.9",
     "@vitest/ui": "^4.1.9",
     "pi-subagents": "^0.52.0",
-    "puppeteer": "25.6.0",
+    "puppeteer": "25.8.0",
     "typebox": "^1.3.11",
     "typescript": "^7.0.2",
     "vite": "^8.1.4",