@steipete/oracle 0.14.1 → 0.15.1

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

@@ -1,13 +1,14 @@
 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 { 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,
@@ -31,14 +32,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).
@@ -116,7 +151,10 @@ export async function waitForDeepResearchCompletion(Runtime, logger, timeoutMs =
         : -1;
     const scopedToNewTurns = minTurnLiteral >= 0;
     const ignoredTargetKeys = new Set(options?.ignoredTargetKeys ?? []);
-    const requireScopedTargetOwner = options?.requireScopedTargetOwner === true;
+    const requireScopedTargetOwner = options?.requireScopedTargetOwner === true ||
+        (scopedToNewTurns && options?.targetBaselineCaptured !== true);
+    let observedResearchEvidence = false;
+    let loggedIncompleteResult = false;
     logger(`Monitoring Deep Research (timeout: ${Math.round(timeoutMs / 60_000)}min)...`);
     while (Date.now() - start < timeoutMs) {
         const { result } = await Runtime.evaluate({
@@ -127,7 +165,6 @@ export async function waitForDeepResearchCompletion(Runtime, logger, timeoutMs =
         if (val?.accountBlocked) {
             throw new BrowserAutomationError("ChatGPT account security block detected during Deep Research. Open chatgpt.com in Chrome, secure the account, then rerun Oracle.", { stage: "chatgpt-account-blocked", code: "chatgpt-account-blocked" });
         }
-        const activeScopedResearch = Boolean(val?.hasActiveScopedResearch);
         // ChatGPT renders the Deep Research report inside an out-of-process,
         // sandboxed iframe (connector_openai_deep_research.*.oaiusercontent.com),
         // doubly nested and same-origin. That OOPIF does NOT appear in the main
@@ -136,24 +173,27 @@ export async function waitForDeepResearchCompletion(Runtime, logger, timeoutMs =
         // (readDeepResearchTargetResult) attaches to the iframe's own CDP target and
         // walks its nested frames, so it CAN read the report. Prefer the target path
         // and fall back to the in-page frame path for legacy/inline rendering.
-        const targetResult = client
+        const rawTargetResult = client
             ? ((await readDeepResearchTargetResult(client, ignoredTargetKeys, requireScopedTargetOwner ? minTurnLiteral : -1).catch(() => null))?.read ?? null)
             : null;
+        const targetResult = filterIncompleteDeepResearchRead(rawTargetResult);
         // A completed target read is authoritative. If the target read is missing or
         // only in-progress, still try the in-page frame path so an incomplete target
         // read does not suppress a completed report there (legacy/inline rendering).
-        const inPageResult = !targetResult?.completed && Page
-            ? await readDeepResearchFrameResult(Runtime, Page).catch(() => null)
+        const inPageScan = !targetResult?.completed && Page
+            ? await readDeepResearchFrameResult(Runtime, Page, client, scopedToNewTurns ? minTurnLiteral : -1).catch(() => null)
             : null;
+        const rawInPageResult = inPageScan?.read ?? null;
+        const inPageResult = filterIncompleteDeepResearchRead(rawInPageResult);
         const read = pickPreferredDeepResearchRead(targetResult, inPageResult);
-        // A target-confirmed completion read the live connector iframe directly, so
-        // it is authoritative even when the main DOM exposes no assistant turn (the
-        // report lives entirely in the OOPIF). The main-DOM hasActiveScopedResearch
-        // heuristic no longer holds in that case, so don't gate on it.
-        const completedFromTarget = Boolean(targetResult?.completed);
-        if (read?.completed &&
-            read.text &&
-            (completedFromTarget || !scopedToNewTurns || activeScopedResearch)) {
+        // Target keys captured before submission are ignored, so a target result is
+        // tied to this run. Main-page iframes are not: old reports can remain in the
+        // conversation and must never authorize a new normal-response fallback.
+        observedResearchEvidence ||= Boolean(rawTargetResult ||
+            (scopedToNewTurns && rawInPageResult) ||
+            val?.researchActivity ||
+            val?.hasActiveScopedResearch);
+        if (read?.completed && read.text) {
             logger(`Deep Research completed (${Math.round((Date.now() - start) / 1000)}s elapsed)`);
             return {
                 text: read.text,
@@ -163,9 +203,18 @@ export async function waitForDeepResearchCompletion(Runtime, logger, timeoutMs =
         }
         // Completion detected
         if (val?.finished) {
+            if (!observedResearchEvidence) {
+                throw new BrowserAutomationError("ChatGPT returned a completed response without starting Deep Research. The Deep Research selection may have silently fallen back to a normal response.", { stage: "deep-research-not-started", code: "deep-research-not-started" });
+            }
             logger(`Deep Research completed (${Math.round((Date.now() - start) / 1000)}s elapsed)`);
             return await extractDeepResearchResult(Runtime, logger, minTurnIndex ?? undefined);
         }
+        const incompleteFrameResult = Boolean((rawTargetResult?.completed && !targetResult?.completed) ||
+            (rawInPageResult?.completed && !inPageResult?.completed));
+        if ((val?.incompleteResult || incompleteFrameResult) && !loggedIncompleteResult) {
+            logger("Deep Research interim status detected; waiting for the final report");
+            loggedIncompleteResult = true;
+        }
         // Progress logging every 60 seconds
         const now = Date.now();
         if (now - lastLogTime >= 60_000) {
@@ -204,24 +253,26 @@ export async function extractDeepResearchResult(Runtime, logger, minTurnIndex) {
     };
     // Try the copy-button approach first for clean markdown
     const markdown = await captureAssistantMarkdown(Runtime, meta, logger);
-    if (markdown && !isDeepResearchPlaceholderText(markdown)) {
+    if (markdown && !isDeepResearchIncompleteText(markdown)) {
         return { text: markdown, html: snapshot?.html ?? undefined, meta };
     }
     // Fall back to snapshot text
-    if (snapshot?.text && !isDeepResearchPlaceholderText(snapshot.text)) {
+    if (snapshot?.text && !isDeepResearchIncompleteText(snapshot.text)) {
         return { text: snapshot.text, html: snapshot.html ?? undefined, meta };
     }
     throw new BrowserAutomationError("Deep Research completed but failed to extract the response text.", { stage: "deep-research-extract", code: "extraction-failed" });
 }
-function isDeepResearchPlaceholderText(text) {
-    const normalized = text.toLowerCase().replace(/\s+/g, " ").trim();
-    return (normalized === "called tool" ||
-        normalized === "used tool" ||
-        normalized === "użyto narzędzia" ||
-        normalized === "narzędzie wywołane");
-}
 export function isDeepResearchPlaceholderTextForTest(text) {
-    return isDeepResearchPlaceholderText(text);
+    return isDeepResearchIncompleteText(text);
+}
+function filterIncompleteDeepResearchRead(result) {
+    if (!result?.completed || !result.text || !isDeepResearchIncompleteText(result.text)) {
+        return result;
+    }
+    return { ...result, completed: false, inProgress: true };
+}
+export function filterIncompleteDeepResearchReadForTest(result) {
+    return filterIncompleteDeepResearchRead(result);
 }
 /**
  * Choose the authoritative Deep Research read between the target-attach result
@@ -243,37 +294,64 @@ function pickPreferredDeepResearchRead(targetResult, inPageResult) {
 export function pickPreferredDeepResearchReadForTest(targetResult, inPageResult) {
     return pickPreferredDeepResearchRead(targetResult, inPageResult);
 }
-async function readDeepResearchFrameResult(Runtime, Page) {
+async function readDeepResearchFrameResult(Runtime, Page, client, minTurnIndex = -1) {
     const pageWithFrames = Page;
     if (typeof pageWithFrames.getFrameTree !== "function" ||
         typeof pageWithFrames.createIsolatedWorld !== "function") {
         return null;
     }
     const frameTree = (await pageWithFrames.getFrameTree())?.frameTree;
-    const frameId = findDeepResearchFrameId(frameTree);
-    if (!frameId) {
+    const frameIds = collectPageDeepResearchFrameIds(frameTree);
+    if (frameIds.length === 0) {
         return null;
     }
-    const world = await pageWithFrames.createIsolatedWorld({
-        frameId,
-        worldName: "oracle-deep-research",
-        grantUniveralAccess: true,
-    });
-    if (typeof world.executionContextId !== "number") {
-        return null;
+    const rawClient = client;
+    if (minTurnIndex >= 0) {
+        if (typeof rawClient?.send !== "function") {
+            return null;
+        }
     }
-    const { result } = await Runtime.evaluate({
-        expression: buildDeepResearchFrameStatusExpression(),
-        contextId: world.executionContextId,
-        returnByValue: true,
-    });
-    return result?.value ?? null;
+    let best = null;
+    for (const frameId of frameIds) {
+        let ownerTurnIndex = null;
+        if (minTurnIndex >= 0 && rawClient?.send) {
+            ownerTurnIndex = await readDeepResearchTargetOwnerTurnIndex(rawClient, frameId, rawClient.oraclePageSessionId);
+            if (ownerTurnIndex === null || ownerTurnIndex < minTurnIndex) {
+                continue;
+            }
+        }
+        const world = await pageWithFrames.createIsolatedWorld({
+            frameId,
+            worldName: "oracle-deep-research",
+            grantUniveralAccess: true,
+        });
+        if (typeof world.executionContextId !== "number") {
+            continue;
+        }
+        const { result } = await Runtime.evaluate({
+            expression: buildDeepResearchFrameStatusExpression(),
+            contextId: world.executionContextId,
+            returnByValue: true,
+        });
+        const read = result?.value ?? null;
+        if (!read) {
+            continue;
+        }
+        best = { read, ownerTurnIndex };
+        if (read.completed) {
+            return best;
+        }
+    }
+    return best;
 }
 async function readDeepResearchTargetResult(client, ignoredTargetKeys = new Set(), minTurnIndex = -1) {
     const rawClient = client;
     if (typeof rawClient.send !== "function") {
         return null;
     }
+    if (typeof client.on !== "function") {
+        return null;
+    }
     // On the browser-WSEndpoint path, `client` is a session-bound wrapper whose
     // domain methods target the page session but whose raw `send` is the
     // browser-level send. We must therefore pass the page session id explicitly so
@@ -299,7 +377,7 @@ async function readDeepResearchTargetResult(client, ignoredTargetKeys = new Set(
             ownedSessionIds.add(eventSessionId);
         }
     };
-    client.on?.("Target.attachedToTarget", onAttached);
+    client.on("Target.attachedToTarget", onAttached);
     try {
         // Scope discovery to the current Oracle-controlled page. `client` is
         // connected to the conversation page target, so enabling auto-attach on this
@@ -311,13 +389,16 @@ async function readDeepResearchTargetResult(client, ignoredTargetKeys = new Set(
         // would surface another tab's completed Deep Research report and let it be
         // saved into the current session (cross-tab leak). Only auto-attached,
         // page-scoped sessions are treated as belonging to this run.
-        await rawClient
+        const autoAttachEnabled = await rawClient
             .send("Target.setAutoAttach", {
             autoAttach: true,
             waitForDebuggerOnStart: false,
             flatten: true,
         }, pageSessionId)
-            .catch(() => undefined);
+            .then(() => true, () => false);
+        if (!autoAttachEnabled) {
+            return null;
+        }
         await delay(100);
         if (minTurnIndex >= 0) {
             await rawClient.send("DOM.enable", {}, pageSessionId).catch(() => undefined);
@@ -374,7 +455,11 @@ async function readDeepResearchTargetResult(client, ignoredTargetKeys = new Set(
     }
 }
 export async function captureDeepResearchTargetKeys(client) {
-    return (await readDeepResearchTargetResult(client))?.targetKeys ?? [];
+    const scan = await readDeepResearchTargetResult(client);
+    if (!scan) {
+        throw new Error("Deep Research target baseline capture unavailable");
+    }
+    return scan.targetKeys;
 }
 async function readDeepResearchTargetOwnerTurnIndex(rawClient, frameId, pageSessionId) {
     const owner = (await rawClient
@@ -419,7 +504,7 @@ async function readDeepResearchTargetSession(rawClient, sessionId, targetUrl) {
     const frameTree = (await rawClient
         .send("Page.getFrameTree", {}, sessionId)
         .catch(() => null));
-    const frameId = frameTree?.frameTree?.frame?.id;
+    const ownerFrameId = frameTree?.frameTree?.frame?.id;
     if (!isConfirmedDeepResearchTarget(targetUrl, frameTree?.frameTree)) {
         return { confirmed: false, read: null };
     }
@@ -438,7 +523,7 @@ async function readDeepResearchTargetSession(rawClient, sessionId, targetUrl) {
         }
         const value = await evaluateDeepResearchFrameStatus(rawClient, sessionId, world.executionContextId);
         if (value?.completed) {
-            return { confirmed: true, read: value, frameId };
+            return { confirmed: true, read: value, frameId: ownerFrameId };
         }
         if ((value?.textLength ?? 0) > (best?.textLength ?? 0) || value?.inProgress) {
             best = value;
@@ -446,12 +531,12 @@ async function readDeepResearchTargetSession(rawClient, sessionId, targetUrl) {
     }
     const topFrameValue = await evaluateDeepResearchFrameStatus(rawClient, sessionId);
     if (topFrameValue?.completed) {
-        return { confirmed: true, read: topFrameValue, frameId };
+        return { confirmed: true, read: topFrameValue, frameId: ownerFrameId };
     }
     if ((topFrameValue?.textLength ?? 0) > (best?.textLength ?? 0) || topFrameValue?.inProgress) {
         best = topFrameValue;
     }
-    return { confirmed: true, read: best, frameId };
+    return { confirmed: true, read: best, frameId: ownerFrameId };
 }
 async function evaluateDeepResearchFrameStatus(rawClient, sessionId, contextId) {
     const response = (await rawClient
@@ -474,21 +559,20 @@ function isDeepResearchFrameDescriptor(url, name = "") {
     return (descriptor.includes("connector_openai_deep_research") || descriptor.includes("deep-research"));
 }
 function findDeepResearchFrameId(tree) {
+    return collectPageDeepResearchFrameIds(tree)[0] ?? null;
+}
+function collectPageDeepResearchFrameIds(tree) {
     if (!tree?.frame) {
-        return null;
+        return [];
     }
-    const url = tree.frame.url ?? "";
-    const name = tree.frame.name ?? "";
-    if (isDeepResearchFrameDescriptor(url, name)) {
-        return tree.frame.id ?? null;
+    const ids = [];
+    if (tree.frame.id && isDeepResearchFrameDescriptor(tree.frame.url ?? "", tree.frame.name ?? "")) {
+        ids.push(tree.frame.id);
     }
     for (const child of tree.childFrames ?? []) {
-        const match = findDeepResearchFrameId(child);
-        if (match) {
-            return match;
-        }
+        ids.push(...collectPageDeepResearchFrameIds(child));
     }
-    return null;
+    return ids;
 }
 function collectDeepResearchFrameIds(tree) {
     if (!tree?.frame) {
@@ -644,20 +728,41 @@ function buildDeepResearchCompletionPollExpression(minTurnIndex) {
     const text = (lastTurn?.textContent || '').trim();
     const normalized = text.toLowerCase().replace(/\\s+/g, ' ').trim();
     const textLength = text.length;
+    const lines = text.split(/\\n+/).map(line => line.trim()).filter(Boolean);
+    const tailIsPlanningPanel = text.length <= 1500 &&
+      lines.length >= 4 &&
+      lines.length <= 20 &&
+      /^update$/i.test(lines[1] || '') &&
+      /^stop research$/i.test(lines[lines.length - 1] || '') &&
+      /^determining steps for creating a report(?:\\.\\.\\.)?$/i.test(lines[lines.length - 2] || '');
     const isToolStub = normalized === 'called tool' ||
       normalized === 'used tool' ||
       normalized === 'użyto narzędzia' ||
       normalized === 'narzędzie wywołane';
+    const incompleteResult = isToolStub ||
+      normalized === 'planning' ||
+      normalized === 'researching' ||
+      normalized === 'searching the web' ||
+      (text.trimStart().startsWith('<system-reminder>') &&
+        /<system-reminder>[\\s\\S]*#\\s*plan mode\\b/i.test(text)) ||
+      tailIsPlanningPanel;
     const finished = Boolean(lastTurn?.querySelector(${finishedSelector})) &&
       textLength >= 40 &&
-      !isToolStub;
+      !incompleteResult;
     const hasIframe = Array.from(document.querySelectorAll('iframe')).some(f => {
       const rect = f.getBoundingClientRect();
       return rect.width > 200 && rect.height > 200;
     });
-    const hasActiveScopedResearch = scopedToNewTurns && Boolean(lastTurn) && hasIframe &&
-      (textLength < 40 || isToolStub || /chatgpt\\s+said:?$/i.test(text));
-    return { finished, stopVisible, textLength, hasIframe, isToolStub, hasActiveScopedResearch, accountBlocked };
+    const hasScopedDeepResearchIframe = Array.from(lastTurn?.querySelectorAll?.('iframe') || []).some(f => {
+      const rect = f.getBoundingClientRect();
+      const descriptor = String(f.getAttribute('src') || '') + ' ' + String(f.getAttribute('name') || '');
+      return rect.width > 200 && rect.height > 200 &&
+        /connector_openai_deep_research|deep-research/i.test(descriptor);
+    });
+    const hasActiveScopedResearch = scopedToNewTurns && Boolean(lastTurn) &&
+      hasScopedDeepResearchIframe &&
+      (textLength < 40 || isToolStub || tailIsPlanningPanel || /chatgpt\\s+said:?$/i.test(text));
+    return { finished, stopVisible, textLength, hasIframe, isToolStub, incompleteResult, researchActivity: tailIsPlanningPanel || (isToolStub && hasScopedDeepResearchIframe), hasActiveScopedResearch, accountBlocked };
   })()`;
 }
 export function buildDeepResearchStatusExpressionForTest() {
@@ -666,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;
@@ -703,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
@@ -728,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')
@@ -749,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);
@@ -764,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() {