@steipete/oracle 0.15.0 → 0.15.2

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

@@ -1,14 +1,15 @@
-import { DEEP_RESEARCH_PLUS_BUTTON, DEEP_RESEARCH_DROPDOWN_ITEM_TEXT, DEEP_RESEARCH_PILL_LABEL, DEEP_RESEARCH_POLL_INTERVAL_MS, DEEP_RESEARCH_AUTO_CONFIRM_WAIT_MS, DEEP_RESEARCH_DEFAULT_TIMEOUT_MS, FINISHED_ACTIONS_SELECTOR, STOP_BUTTON_SELECTOR, CONVERSATION_TURN_SELECTOR, } from "../constants.js";
+import { DEEP_RESEARCH_PLUS_BUTTON, DEEP_RESEARCH_DROPDOWN_ITEM_TEXT, DEEP_RESEARCH_PILL_LABEL, DEEP_RESEARCH_POLL_INTERVAL_MS, DEEP_RESEARCH_AUTO_CONFIRM_WAIT_MS, DEEP_RESEARCH_DEFAULT_TIMEOUT_MS, FINISHED_ACTIONS_SELECTOR, STOP_BUTTON_SELECTOR, } from "../constants.js";
+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 { BrowserAutomationError } from "../../oracle/errors.js";
 /**
- * Activates Deep Research mode through ChatGPT's slash command, with the
- * composer tools menu as a fallback for older UI variants.
+ * Activates Deep Research mode through ChatGPT's composer tools menu and
+ * verifies the selected tool pill before prompt submission.
  */
-export async function activateDeepResearch(Runtime, _Input, logger) {
+export async function activateDeepResearch(Runtime, Input, logger) {
     const expression = buildActivateDeepResearchExpression();
     const outcome = await Runtime.evaluate({
         expression,
@@ -32,14 +33,48 @@ export async function activateDeepResearch(Runtime, _Input, logger) {
             throw new BrowserAutomationError(`"Deep research" option not found in composer dropdown.${hint} ` +
                 "This feature may require a ChatGPT Plus or Pro subscription.", { stage: "deep-research-activate", code: "dropdown-item-missing" });
         }
-        case "pill-not-confirmed":
+        case "pill-not-confirmed": {
+            const point = result.clickPoint;
+            if (typeof point?.x === "number" && typeof point.y === "number") {
+                await clickTrustedPoint(Runtime, Input, point.x, point.y);
+                if (await waitForDeepResearchPill(Runtime)) {
+                    logger("Deep Research mode activated");
+                    return;
+                }
+            }
             throw new BrowserAutomationError("Deep Research pill did not appear after selection. The UI may have changed.", { stage: "deep-research-activate", code: "pill-not-confirmed" });
+        }
         default:
             throw new BrowserAutomationError("Unexpected result from Deep Research activation.", {
                 stage: "deep-research-activate",
             });
     }
 }
+async function clickTrustedPoint(Runtime, Input, x, y) {
+    if (Input && typeof Input.dispatchMouseEvent === "function") {
+        await Input.dispatchMouseEvent({ type: "mouseMoved", x, y });
+        await Input.dispatchMouseEvent({ type: "mousePressed", x, y, button: "left", clickCount: 1 });
+        await Input.dispatchMouseEvent({ type: "mouseReleased", x, y, button: "left", clickCount: 1 });
+        return;
+    }
+    await Runtime.evaluate({
+        expression: `(() => {
+      const el = document.elementFromPoint(${JSON.stringify(x)}, ${JSON.stringify(y)});
+      if (!(el instanceof HTMLElement)) return false;
+      el.click();
+      return true;
+    })()`,
+        returnByValue: true,
+    });
+}
+async function waitForDeepResearchPill(Runtime, timeoutMs = 5000) {
+    const { result } = await Runtime.evaluate({
+        expression: buildWaitForDeepResearchPillExpression(timeoutMs),
+        awaitPromise: true,
+        returnByValue: true,
+    });
+    return Boolean(result?.value);
+}
 /**
  * After prompt submission, waits for the research plan to appear and
  * auto-confirm (~60s countdown + 10s safety margin).
@@ -446,9 +481,9 @@ async function readDeepResearchTargetOwnerTurnIndex(rawClient, frameId, pageSess
             .send("Runtime.callFunctionOn", {
             objectId,
             functionDeclaration: `function() {
-            const selector = ${JSON.stringify(CONVERSATION_TURN_SELECTOR)};
-            const turn = this.closest(selector);
-            return turn ? Array.from(document.querySelectorAll(selector)).indexOf(turn) : null;
+            const turns = ${buildConversationTurnListExpression()};
+            const index = turns.findIndex((turn) => turn === this || turn.contains?.(this));
+            return index >= 0 ? index : null;
           }`,
             returnByValue: true,
         }, pageSessionId)
@@ -669,7 +704,6 @@ function buildDeepResearchStatusExpression() {
 function buildDeepResearchCompletionPollExpression(minTurnIndex) {
     const finishedSelector = JSON.stringify(FINISHED_ACTIONS_SELECTOR);
     const stopSelector = JSON.stringify(STOP_BUTTON_SELECTOR);
-    const turnSelector = JSON.stringify(CONVERSATION_TURN_SELECTOR);
     return `(() => {
     const MIN_TURN_INDEX = ${minTurnIndex};
     const stopVisible = Boolean(document.querySelector(${stopSelector}));
@@ -685,7 +719,7 @@ function buildDeepResearchCompletionPollExpression(minTurnIndex) {
         String(node.getAttribute('data-testid') || '').toLowerCase().includes('conversation-turn') &&
           /chatgpt\\s+said/i.test(node.innerText || node.textContent || '');
     };
-    const conversationTurns = Array.from(document.querySelectorAll(${turnSelector}));
+    const conversationTurns = ${buildConversationTurnListExpression()};
     const allAssistantTurns = Array.from(document.querySelectorAll('[data-message-author-role="assistant"], [data-turn="assistant"]'));
     const scopedTurns = scopedToNewTurns
       ? conversationTurns.slice(MIN_TURN_INDEX).filter(isAssistantTurn)
@@ -737,29 +771,56 @@ export function buildDeepResearchStatusExpressionForTest() {
 export function buildDeepResearchCompletionPollExpressionForTest(minTurnIndex = -1) {
     return buildDeepResearchCompletionPollExpression(minTurnIndex);
 }
-function buildActivateDeepResearchExpression() {
-    const plusBtnSelector = JSON.stringify(DEEP_RESEARCH_PLUS_BUTTON);
-    const targetText = JSON.stringify(DEEP_RESEARCH_DROPDOWN_ITEM_TEXT);
+function buildFindDeepResearchPillExpression(functionName = "findDeepResearchPill") {
     const pillLabel = JSON.stringify(DEEP_RESEARCH_PILL_LABEL);
-    // pillLabel is used inside the expression for verification
-    void pillLabel;
-    return `(async () => {
-    ${buildClickDispatcher()}
-
-    const findDeepResearchPill = () => {
-      const pills = document.querySelectorAll('.__composer-pill-composite, .__composer-pill, [class*="composer-pill"]');
-      for (const pill of pills) {
-        const text = pill.textContent?.trim() || '';
-        const aria = pill.getAttribute('aria-label') ||
+    return `const ${functionName} = () => {
+      const label = ${pillLabel}.toLowerCase();
+      const selectors = [
+        '.__composer-pill-composite',
+        '.__composer-pill',
+        '[class*="composer-pill"]',
+      ].join(',');
+      const candidates = Array.from(document.querySelectorAll(selectors));
+      const composerRoots = Array.from(document.querySelectorAll('[data-testid="composer"], form, [class*="composer"]'));
+      for (const root of composerRoots) {
+        candidates.push(...Array.from(root.querySelectorAll('button, [role="button"], [class*="pill"], [class*="composer-pill"]')));
+      }
+      const seen = new Set();
+      for (const pill of candidates) {
+        if (!(pill instanceof Element) || seen.has(pill)) continue;
+        seen.add(pill);
+        const rect = pill.getBoundingClientRect?.();
+        if (!rect || rect.width <= 0 || rect.height <= 0) continue;
+        const text = (pill.textContent || '').replace(/\\s+/g, ' ').trim().toLowerCase();
+        const aria = (
+          pill.getAttribute('aria-label') ||
           pill.querySelector('button')?.getAttribute('aria-label') ||
-          '';
-        if (text.toLowerCase().includes('deep research') ||
-            aria.toLowerCase().includes('deep research')) {
+          ''
+        ).toLowerCase();
+        if (text.includes(label) || aria.includes(label)) {
           return pill;
         }
       }
       return null;
-    };
+    };`;
+}
+function buildWaitForDeepResearchPillExpression(timeoutMs) {
+    return `(async () => {
+    ${buildFindDeepResearchPillExpression()}
+    const deadline = Date.now() + ${JSON.stringify(Math.max(timeoutMs, 0))};
+    while (Date.now() < deadline) {
+      if (findDeepResearchPill()) return true;
+      await new Promise(resolve => setTimeout(resolve, 200));
+    }
+    return Boolean(findDeepResearchPill());
+  })()`;
+}
+function buildActivateDeepResearchExpression() {
+    const plusBtnSelector = JSON.stringify(DEEP_RESEARCH_PLUS_BUTTON);
+    const targetText = JSON.stringify(DEEP_RESEARCH_DROPDOWN_ITEM_TEXT);
+    return `(async () => {
+    ${buildClickDispatcher()}
+    ${buildFindDeepResearchPillExpression()}
 
     const waitForPill = () => new Promise((resolve) => {
       let elapsed = 0;
@@ -774,24 +835,105 @@ function buildActivateDeepResearchExpression() {
       setTimeout(tick, 200);
     });
 
-    const clearComposer = (composer) => {
-      if (!composer) return;
-      if ('value' in composer) composer.value = '';
-      else composer.textContent = '';
-      composer.dispatchEvent(new InputEvent('input', { bubbles: true, inputType: 'deleteContentBackward', data: null }));
+    const menuItemSelector = [
+      '[data-radix-collection-item]',
+      '[role="option"]',
+      '[cmdk-item]',
+      'button',
+      '[role="menuitem"]',
+      '[role="menuitemradio"]',
+      '.__menu-item',
+      '[class*="__menu-item"]',
+      '[class*="menu-item"]',
+    ].join(',');
+    const dropdownItemSelector = [
+      '[data-radix-collection-item]',
+      '[role="menuitem"]',
+      '[role="menuitemradio"]',
+      '[role="option"]',
+      '[cmdk-item]',
+      'button',
+      '.__menu-item',
+      '[class*="__menu-item"]',
+      '[class*="menu-item"]',
+    ].join(',');
+    const popoverSelector = [
+      '.popover',
+      '[class*="popover"]',
+      '[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 getText = (item) => normalizeText(item.textContent || item.getAttribute?.('aria-label') || '');
+    const isInPopover = (item) => Boolean(item.closest?.(popoverSelector));
+    const isVisible = (item) => {
+      const rect = item.getBoundingClientRect?.();
+      if (!rect || rect.width <= 0 || rect.height <= 0) return false;
+      const style = window.getComputedStyle?.(item);
+      return !style || (style.visibility !== 'hidden' && style.display !== 'none');
     };
-
-    const setComposerText = (composer, text) => {
-      composer.focus?.();
-      if ('value' in composer) composer.value = text;
-      else composer.textContent = text;
-      composer.dispatchEvent(new InputEvent('input', { bubbles: true, inputType: 'insertText', data: text }));
+    const findPopoverSearchInput = () => Array.from(
+      document.querySelectorAll('input, textarea, [contenteditable="true"]')
+    ).find(item => {
+      const type = (item.getAttribute?.('type') || '').toLowerCase();
+      const testId = (item.getAttribute?.('data-testid') || '').toLowerCase();
+      return isInPopover(item) &&
+        isVisible(item) &&
+        type !== 'file' &&
+        testId !== 'upload-photos-input';
+    }) || null;
+    const setSearchText = (input, text) => {
+      input.focus?.();
+      if ('value' in input) input.value = text;
+      else input.textContent = text;
+      input.dispatchEvent(new InputEvent('input', { bubbles: true, inputType: 'insertText', data: text }));
+      input.dispatchEvent(new Event('change', { bubbles: true }));
     };
-
-    const findDeepResearchItem = () => {
-      const target = ${targetText}.toLowerCase();
-      const candidates = Array.from(document.querySelectorAll('[data-radix-collection-item], [role="option"], [cmdk-item], button, [role="menuitem"], [role="menuitemradio"]'));
-      return candidates.find(item => (item.textContent || '').trim().toLowerCase() === target) || null;
+    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 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;
+    const findDeepResearchItem = (options = {}) => {
+      const matches = Array.from(document.querySelectorAll(menuItemSelector))
+        .filter(item => {
+          const text = getText(item);
+          return text &&
+            text.length <= 180 &&
+            isVisible(item) &&
+            (!options.requirePopover || isInPopover(item)) &&
+            isDeepResearchText(text);
+        })
+        .map(item => {
+          const text = getText(item);
+          const clickable = getClickableItem(item);
+          const exact = text === target ? 0 : 1;
+          const menuRow = /(^|\\s)__menu-item(\\s|$)/.test(clickable.className || '') ? 0 : 1;
+          return { item: clickable, score: exact + menuRow, textLength: text.length };
+        })
+        .sort((a, b) => a.score - b.score || a.textLength - b.textLength);
+      return matches[0]?.item || null;
+    };
+    const collectAvailableItems = (options = {}) => {
+      const seen = new Set();
+      return Array.from(document.querySelectorAll(dropdownItemSelector))
+        .filter(item => !options.requirePopover || isInPopover(item))
+        .filter(item => isVisible(item))
+        .map(item => (item.textContent || '').replace(/\\s+/g, ' ').trim())
+        .filter(text => text && text.length <= 180)
+        .filter(text => {
+          const key = text.toLowerCase();
+          if (seen.has(key)) return false;
+          seen.add(key);
+          return true;
+        });
     };
 
     // Step 0: Check if already active
@@ -799,20 +941,8 @@ function buildActivateDeepResearchExpression() {
       return { status: 'already-active' };
     }
 
-    // Step 1: Prefer the official slash command flow.
-    const composer = document.querySelector('[contenteditable="true"], textarea');
-    if (composer) {
-      setComposerText(composer, '/Deepresearch');
-      await new Promise(resolve => setTimeout(resolve, 600));
-      const slashItem = findDeepResearchItem();
-      if (slashItem) {
-        dispatchClickSequence(slashItem);
-        if (await waitForPill()) return { status: 'activated' };
-      }
-      clearComposer(composer);
-    }
-
-    // Step 2: Fall back to the composer tools menu.
+    // Step 1: Open the composer tools menu. Avoid slash commands because they
+    // 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')
@@ -820,14 +950,21 @@ function buildActivateDeepResearchExpression() {
     if (!plusBtn) return { status: 'plus-button-missing' };
     dispatchClickSequence(plusBtn);
 
-    // Step 3: Wait for dropdown
+    // Step 2: Wait for dropdown
     const waitForDropdown = () => new Promise((resolve) => {
       let elapsed = 0;
       const tick = () => {
-        const items = document.querySelectorAll('[data-radix-collection-item], [role="menuitem"], [role="menuitemradio"], [role="option"], [cmdk-item]');
-        if (items.length > 0) { resolve(items); return; }
+        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');
+        })) { resolve(items); return; }
         elapsed += 150;
-        if (elapsed > 3000) { resolve(null); return; }
+        if (elapsed > 3000) { resolve(items.length ? items : null); return; }
         setTimeout(tick, 150);
       };
       setTimeout(tick, 150);
@@ -835,25 +972,33 @@ function buildActivateDeepResearchExpression() {
     const items = await waitForDropdown();
     if (!items) return { status: 'dropdown-item-missing', available: [] };
 
-    // Step 4: Find "Deep research" item
-    const target = ${targetText}.toLowerCase();
-    let match = null;
-    const available = [];
-    for (const item of items) {
-      const text = (item.textContent || '').trim();
-      available.push(text);
-      if (text.toLowerCase() === target) {
-        match = item;
+    // Step 3: Find "Deep research" item. Some ChatGPT variants only reveal it
+    // after typing in the tools menu search field.
+    let match = findDeepResearchItem({ requirePopover: true });
+    let available = Array.isArray(items) ? items : collectAvailableItems({ requirePopover: true });
+    if (!match) {
+      const searchInput = findPopoverSearchInput();
+      if (searchInput) {
+        setSearchText(searchInput, ${targetText});
+        await new Promise(resolve => setTimeout(resolve, 600));
+        match = findDeepResearchItem({ requirePopover: true });
+        available = collectAvailableItems({ requirePopover: true });
       }
     }
     if (!match) return { status: 'dropdown-item-missing', available };
 
-    // Step 5: Click it
+    // Step 4: Click it
+    match.scrollIntoView?.({ block: 'center', inline: 'center' });
+    await new Promise(resolve => setTimeout(resolve, 100));
+    const rect = match.getBoundingClientRect();
+    const clickPoint = rect && rect.width > 0 && rect.height > 0
+      ? { x: rect.left + rect.width / 2, y: rect.top + rect.height / 2 }
+      : undefined;
     dispatchClickSequence(match);
 
-    // Step 6: Verify pill appeared
+    // Step 5: Verify pill appeared
     const pillConfirmed = await waitForPill();
-    return pillConfirmed ? { status: 'activated' } : { status: 'pill-not-confirmed' };
+    return pillConfirmed ? { status: 'activated' } : { status: 'pill-not-confirmed', clickPoint };
   })()`;
 }
 export function buildActivateDeepResearchExpressionForTest() {

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

@@ -1,15 +1,38 @@
 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 { 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"];
-export async function ensureModelSelection(Runtime, desiredModel, logger, strategy = "select") {
-    const outcome = await Runtime.evaluate({
-        expression: buildModelSelectionExpression(desiredModel, strategy),
-        awaitPromise: true,
-        returnByValue: true,
-    });
-    const result = outcome.result?.value;
+// The model/effort picker is a composer pill that React mounts a beat after the page
+// becomes interactive (~1-4s on a cold profile, e.g. cookie-sync's throwaway Chrome).
+// Re-evaluate while it is still missing, up to a bounded deadline, so selection does not
+// give up before the pill renders. Only "button-missing" waits; a genuine
+// "option-not-found" surfaces immediately.
+const MODEL_BUTTON_WAIT_MS = 8000;
+const MODEL_BUTTON_POLL_MS = 250;
+export async function ensureModelSelection(Runtime, desiredModel, logger, strategy = "select", options = {}) {
+    const buttonWaitMs = options.buttonWaitMs ?? MODEL_BUTTON_WAIT_MS;
+    const buttonPollMs = options.buttonPollMs ?? MODEL_BUTTON_POLL_MS;
+    const deadline = Date.now() + Math.max(0, buttonWaitMs);
+    let result;
+    let announcedWait = false;
+    for (;;) {
+        const outcome = await Runtime.evaluate({
+            expression: buildModelSelectionExpression(desiredModel, strategy),
+            awaitPromise: true,
+            returnByValue: true,
+        });
+        result = outcome.result?.value;
+        if (result?.status !== "button-missing" || Date.now() >= deadline) {
+            break;
+        }
+        if (!announcedWait) {
+            announcedWait = true;
+            logger(`Model picker button not mounted yet; waiting up to ${Math.round(buttonWaitMs / 1000)}s for the composer pill to render.`);
+        }
+        await delay(buttonPollMs);
+    }
     switch (result?.status) {
         case "already-selected":
         case "switched": {

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

@@ -1,4 +1,5 @@
-import { INPUT_SELECTORS, PROMPT_PRIMARY_SELECTOR, PROMPT_FALLBACK_SELECTOR, SEND_BUTTON_SELECTORS, CONVERSATION_TURN_SELECTOR, STOP_BUTTON_SELECTOR, ASSISTANT_ROLE_SELECTOR, } from "../constants.js";
+import { INPUT_SELECTORS, PROMPT_PRIMARY_SELECTOR, PROMPT_FALLBACK_SELECTOR, SEND_BUTTON_SELECTORS, STOP_BUTTON_SELECTOR, ASSISTANT_ROLE_SELECTOR, } from "../constants.js";
+import { buildConversationTurnCountExpression, buildConversationTurnListExpression, } from "../conversationTurns.js";
 import { delay } from "../utils.js";
 import { logDomFailure } from "../domDebug.js";
 import { buildClickDispatcher } from "./domEvents.js";
@@ -166,7 +167,7 @@ export async function submitPrompt(deps, prompt, logger) {
             observedLength,
         });
     }
-    const clicked = await attemptSendButton(runtime, logger, deps?.attachmentNames, deps?.attachmentTimeoutMs);
+    const clicked = await attemptSendButton(runtime, input, logger, deps?.attachmentNames, deps?.attachmentTimeoutMs);
     if (!clicked) {
         await input.dispatchKeyEvent({
             type: "keyDown",
@@ -575,7 +576,7 @@ function buildAttachmentReadyExpression(attachmentNames) {
 export function buildAttachmentReadyExpressionForTest(attachmentNames) {
     return buildAttachmentReadyExpression(attachmentNames);
 }
-async function attemptSendButton(Runtime, _logger, attachmentNames, attachmentTimeoutMs) {
+async function attemptSendButton(Runtime, Input, _logger, attachmentNames, attachmentTimeoutMs) {
     const needAttachment = Array.isArray(attachmentNames) && attachmentNames.length > 0;
     const script = `(() => {
     ${buildClickDispatcher()}
@@ -604,10 +605,15 @@ async function attemptSendButton(Runtime, _logger, attachmentNames, attachmentTi
       candidates.push(...Array.from(document.querySelectorAll(selector)));
     }
     const button = candidates.find((node) => isVisible(node) && isEnabled(node)) || null;
-    if (!button) return 'missing';
-    // Use unified pointer/mouse sequence to satisfy React handlers.
+    if (!button) return { status: 'missing' };
+    button.scrollIntoView({ block: 'center', inline: 'center' });
+    const rect = button.getBoundingClientRect();
+    if (rect.width > 0 && rect.height > 0) {
+      return { status: 'point', x: rect.left + rect.width / 2, y: rect.top + rect.height / 2 };
+    }
+    // Last-resort fallback for unusual DOMs where the button is visible but has no useful rect.
     dispatchClickSequence(button);
-    return 'clicked';
+    return { status: 'clicked' };
   })()`;
     // Give attachment-bearing submissions more headroom. ChatGPT's chip render can
     // settle slowly for multi-file uploads, but plain text sends should keep the
@@ -626,10 +632,19 @@ async function attemptSendButton(Runtime, _logger, attachmentNames, attachmentTi
             }
         }
         const { result } = await Runtime.evaluate({ expression: script, returnByValue: true });
-        if (result.value === "clicked") {
+        const value = result.value;
+        const status = typeof value === "string" ? value : value?.status;
+        if (status === "point" &&
+            typeof value === "object" &&
+            typeof value.x === "number" &&
+            typeof value.y === "number") {
+            await clickTrustedPoint(Runtime, Input, value.x, value.y);
+            return true;
+        }
+        if (status === "clicked") {
             return true;
         }
-        if (result.value === "missing") {
+        if (status === "missing") {
             break;
         }
         await delay(100);
@@ -644,6 +659,23 @@ async function attemptSendButton(Runtime, _logger, attachmentNames, attachmentTi
     }
     return false;
 }
+async function clickTrustedPoint(Runtime, Input, x, y) {
+    if (Input && typeof Input.dispatchMouseEvent === "function") {
+        await Input.dispatchMouseEvent({ type: "mouseMoved", x, y });
+        await Input.dispatchMouseEvent({ type: "mousePressed", x, y, button: "left", clickCount: 1 });
+        await Input.dispatchMouseEvent({ type: "mouseReleased", x, y, button: "left", clickCount: 1 });
+        return;
+    }
+    await Runtime.evaluate({
+        expression: `(() => {
+      const el = document.elementFromPoint(${JSON.stringify(x)}, ${JSON.stringify(y)});
+      if (!(el instanceof HTMLElement)) return false;
+      el.click();
+      return true;
+    })()`,
+        returnByValue: true,
+    });
+}
 function sendButtonTimeoutMs(attachmentNames, attachmentTimeoutMs) {
     if (!Array.isArray(attachmentNames) || attachmentNames.length === 0) {
         return 20_000;
@@ -660,14 +692,13 @@ async function verifyPromptCommitted(Runtime, prompt, timeoutMs, logger, baselin
     const inputSelectorsLiteral = JSON.stringify(INPUT_SELECTORS);
     const stopSelectorLiteral = JSON.stringify(STOP_BUTTON_SELECTOR);
     const assistantSelectorLiteral = JSON.stringify(ASSISTANT_ROLE_SELECTOR);
-    const turnSelectorLiteral = JSON.stringify(CONVERSATION_TURN_SELECTOR);
     let baseline = typeof baselineTurns === "number" && Number.isFinite(baselineTurns) && baselineTurns >= 0
         ? Math.floor(baselineTurns)
         : null;
     if (baseline === null) {
         try {
             const { result } = await Runtime.evaluate({
-                expression: `document.querySelectorAll(${turnSelectorLiteral}).length`,
+                expression: buildConversationTurnCountExpression(),
                 returnByValue: true,
             });
             const raw = typeof result?.value === "number" ? result.value : Number(result?.value);
@@ -695,8 +726,7 @@ async function verifyPromptCommitted(Runtime, prompt, timeoutMs, logger, baselin
 	    };
 	    const normalizedPrompt = normalize(${encodedPrompt});
 	    const normalizedPromptPrefix = normalizedPrompt.slice(0, 120);
-	    const CONVERSATION_SELECTOR = ${JSON.stringify(CONVERSATION_TURN_SELECTOR)};
-	    const articles = Array.from(document.querySelectorAll(CONVERSATION_SELECTOR));
+	    const articles = ${buildConversationTurnListExpression()};
 	    const normalizedTurns = articles.map((node) => normalize(node?.innerText));
 	    const readValue = (node) => {
 	      if (!node) return '';
@@ -755,9 +785,13 @@ async function verifyPromptCommitted(Runtime, prompt, timeoutMs, logger, baselin
       turnsCount: normalizedTurns.length,
     };
   })()`;
+    let lastProbe;
     while (Date.now() < deadline) {
         const { result } = await Runtime.evaluate({ expression: script, returnByValue: true });
         const info = result.value;
+        if (info && typeof info === "object") {
+            lastProbe = info;
+        }
         const turnsCount = result.value?.turnsCount;
         const matchesPrompt = Boolean(info?.lastMatched || info?.userMatched || info?.prefixMatched);
         const baselineUnknown = typeof info?.baseline === "number" ? info.baseline < 0 : baselineLiteral < 0;
@@ -772,13 +806,12 @@ async function verifyPromptCommitted(Runtime, prompt, timeoutMs, logger, baselin
         }
         await delay(100);
     }
+    const finalProbe = await Runtime.evaluate({ expression: script, returnByValue: true })
+        .then((res) => res?.result?.value)
+        .catch(() => undefined);
+    const probe = finalProbe && typeof finalProbe === "object" ? finalProbe : lastProbe;
     if (logger) {
-        logger(`Prompt commit check failed; latest state: ${await Runtime.evaluate({
-            expression: script,
-            returnByValue: true,
-        })
-            .then((res) => JSON.stringify(res?.result?.value))
-            .catch(() => "unavailable")}`);
+        logger(`Prompt commit check failed; latest state: ${probe ? JSON.stringify(probe) : "unavailable"}`);
         await logDomFailure(Runtime, logger, "prompt-commit");
     }
     if (prompt.trim().length >= 50_000) {
@@ -789,7 +822,30 @@ async function verifyPromptCommitted(Runtime, prompt, timeoutMs, logger, baselin
             timeoutMs,
         });
     }
-    throw new Error("Prompt did not appear in conversation before timeout (send may have failed)");
+    throw new BrowserAutomationError("Prompt did not appear in conversation before timeout (send may have failed)", {
+        stage: "submit-prompt",
+        code: "prompt-commit-timeout",
+        promptLength: prompt.trim().length,
+        timeoutMs,
+        commitProbe: probe ? summarizeCommitProbe(probe) : undefined,
+    });
+}
+// Keep booleans/counts but replace free text with lengths so session metadata stays lean.
+function summarizeCommitProbe(probe) {
+    return {
+        baseline: probe.baseline,
+        turnsCount: probe.turnsCount,
+        userMatched: probe.userMatched,
+        prefixMatched: probe.prefixMatched,
+        lastMatched: probe.lastMatched,
+        hasNewTurn: probe.hasNewTurn,
+        stopVisible: probe.stopVisible,
+        assistantVisible: probe.assistantVisible,
+        composerCleared: probe.composerCleared,
+        inConversation: probe.inConversation,
+        editorLength: typeof probe.editorValue === "string" ? probe.editorValue.length : undefined,
+        lastTurnLength: typeof probe.lastTurn === "string" ? probe.lastTurn.length : undefined,
+    };
 }
 // biome-ignore lint/style/useNamingConvention: test-only export used in vitest suite
 export const __test__ = {