@steipete/oracle 0.14.1 → 0.15.0

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

@@ -1,5 +1,6 @@
 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";
@@ -116,7 +117,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 +131,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 +139,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 +169,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 +219,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 +260,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 +343,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 +355,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 +421,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 +470,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 +489,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 +497,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 +525,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 +694,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() {

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

@@ -659,10 +659,27 @@ function buildModelSelectionExpression(targetModel, strategy) {
         normalizedTestId.includes('pro');
       const candidateHasInstant =
         normalizedText.includes('instant') || normalizedTestId.includes('instant');
+      const candidateSelectsConfiguredVersion =
+        Boolean(getConfigurationDialog()) &&
+        candidateSelectsDesiredVersion &&
+        (node?.getAttribute?.('role') === 'option' ||
+          node?.getAttribute?.('role') === 'menuitemradio');
+      const candidateOpensInstantSubmenu =
+        wantsInstant &&
+        candidateSelectsDesiredVersion &&
+        !candidateHasInstant &&
+        (normalizedTestId.includes('submenu') ||
+          node?.getAttribute?.('aria-haspopup') === 'menu' ||
+          node?.getAttribute?.('data-has-submenu') !== null);
       if (wantsPro && candidateHasThinking) return 0;
       if (wantsPro && candidateHasLegacyProVersion && !candidateSelectsDesiredVersion) return 0;
       if (wantsPro && !candidateHasPro && !candidateSelectsDesiredVersion) return 0;
-      if (wantsInstant && !candidateHasInstant && !candidateSelectsDesiredVersion) return 0;
+      if (
+        wantsInstant &&
+        !candidateHasInstant &&
+        !candidateOpensInstantSubmenu &&
+        !candidateSelectsConfiguredVersion
+      ) return 0;
       if (wantsThinking && candidateHasPro) return 0;
       if (wantsThinking && !candidateHasThinking && !candidateSelectsDesiredVersion) return 0;
       if (desiredVersion === '5-5' && normalizedText && !candidateGpt55VisibleAlias) {
@@ -701,10 +718,14 @@ function buildModelSelectionExpression(targetModel, strategy) {
       if (
         desiredVersion &&
         candidateTextVersion === desiredVersion &&
+        !candidateOpensInstantSubmenu &&
         !(wantsThinking && desiredVersion === '5-5' && normalizedText === 'gpt 5 5')
       ) {
         score += 1200;
       }
+      if (candidateOpensInstantSubmenu) {
+        score += 300;
+      }
       if (candidateOpensVersionSubmenu) {
         score += 500;
       }
@@ -809,6 +830,9 @@ function buildModelSelectionExpression(targetModel, strategy) {
       const currentButtonLabel = normalizeText(getButtonLabel());
       return !labelHasProWord(currentButtonLabel) && !hasProComposerPill();
     };
+    const openedSubmenuKeys = new Set();
+    const submenuKey = (normalizedText, testid) =>
+      normalizeText(testid ?? '') + '|' + normalizedText;
 
     const findBestOption = () => {
       // Walk through every menu item and keep whichever earns the highest score.
@@ -823,6 +847,10 @@ function buildModelSelectionExpression(targetModel, strategy) {
           const text = option.textContent ?? '';
           const normalizedText = normalizeText(text);
           const testid = option.getAttribute('data-testid') ?? '';
+          const optionSubmenuKey = submenuKey(normalizedText, testid);
+          if (isSubmenuOption(option, testid) && openedSubmenuKeys.has(optionSubmenuKey)) {
+            continue;
+          }
           let score = scoreOption(normalizedText, testid, option);
           if (score <= 0) {
             continue;
@@ -832,7 +860,14 @@ function buildModelSelectionExpression(targetModel, strategy) {
           }
           const label = getOptionLabel(option);
           if (!bestMatch || score > bestMatch.score) {
-            bestMatch = { node: option, label, score, testid, normalizedText };
+            bestMatch = {
+              node: option,
+              label,
+              score,
+              testid,
+              normalizedText,
+              submenuKey: optionSubmenuKey,
+            };
           }
         }
       }
@@ -924,6 +959,13 @@ function buildModelSelectionExpression(targetModel, strategy) {
       const openDelay = () => new Promise((r) => setTimeout(r, INITIAL_WAIT_MS));
       let initialized = false;
       const attempt = async () => {
+        if (performance.now() - start > MAX_WAIT_MS) {
+          resolve({
+            status: 'option-not-found',
+            hint: { temporaryChat: detectTemporaryChat(), availableOptions: collectAvailableOptions() },
+          });
+          return;
+        }
         if (!initialized) {
           initialized = true;
           await openDelay();
@@ -946,6 +988,7 @@ function buildModelSelectionExpression(targetModel, strategy) {
           // Keep scanning once the submenu opens instead of treating the submenu click as a final switch.
           const isSubmenu = isSubmenuOption(match.node, match.testid);
           if (isSubmenu) {
+            openedSubmenuKeys.add(match.submenuKey);
             openSubmenuOption(match.node);
             setTimeout(attempt, REOPEN_INTERVAL_MS / 2);
             return;

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

@@ -578,9 +578,62 @@ function buildThinkingTimeExpression(level, desiredModel) {
       }
       return null;
     };
-
-    const composerEffortPill = findComposerEffortPill();
+    let composerEffortPill = findComposerEffortPill();
+    let modelBtn = findModelButton();
+    const modelKindFromLegacyTrailing = (trailing) => {
+      const row = trailing.closest?.(
+        '[role="menuitem"], [role="menuitemradio"], [data-radix-collection-item]',
+      );
+      const idText = normalize(
+        (row?.getAttribute?.('data-testid') ?? '') + ' ' +
+        (trailing.getAttribute?.('data-testid') ?? '')
+      );
+      if (!idText.includes('model switcher')) return null;
+      const modelPart = normalize(idText.replace(/\\bthinking effort\\b.*$/, ''));
+      if (hasToken(modelPart, 'pro')) return 'pro';
+      if (hasToken(modelPart, 'thinking')) return 'thinking';
+      if (hasToken(modelPart, 'instant')) return 'instant';
+      return null;
+    };
+    const legacyEffortOwnerIsReady = () => {
+      if (
+        TARGET_MODEL_KIND === 'pro' &&
+        TARGET_LEVEL === 'extended' &&
+        isVisible(document.querySelector(INTELLIGENCE_MENU_SELECTOR))
+      ) {
+        return true;
+      }
+      const expectedKind = TARGET_MODEL_KIND || modelKindFromNode(modelBtn);
+      return Boolean(
+        expectedKind &&
+        findTrailingButtons().some(
+          (button) => isVisible(button) && modelKindFromLegacyTrailing(button) === expectedKind,
+        ),
+      );
+    };
+    let attemptedModelButton =
+      modelBtn?.getAttribute?.('aria-expanded') === 'true' ? modelBtn : null;
+    const effortOwnerDeadline = performance.now() + MAX_WAIT_MS;
+    while (!composerEffortPill && performance.now() < effortOwnerDeadline) {
+      if (
+        modelBtn &&
+        attemptedModelButton !== modelBtn &&
+        modelBtn.getAttribute?.('aria-expanded') !== 'true'
+      ) {
+        dispatchClickSequence(modelBtn);
+        attemptedModelButton = modelBtn;
+        await sleep(INITIAL_WAIT_MS);
+      }
+      if (modelBtn && legacyEffortOwnerIsReady()) break;
+      await sleep(100);
+      composerEffortPill = findComposerEffortPill();
+      modelBtn = findModelButton();
+      if (modelBtn?.getAttribute?.('aria-expanded') === 'true') {
+        attemptedModelButton = modelBtn;
+      }
+    }
     if (composerEffortPill) {
+      if (attemptedModelButton && attemptedModelButton !== composerEffortPill) closeOpenMenus();
       const composerModelKind = TARGET_MODEL_KIND || modelKindFromNode(composerEffortPill);
       if (composerEffortPill.getAttribute?.('aria-expanded') !== 'true') {
         dispatchClickSequence(composerEffortPill);
@@ -646,22 +699,7 @@ function buildThinkingTimeExpression(level, desiredModel) {
         (trailing.getAttribute?.('data-testid') ?? '')
       );
     };
-    const testIdTextForTrailing = (trailing) => {
-      const row = rowForTrailing(trailing) || findEffortRow(trailing);
-      return normalize(
-        (row?.getAttribute?.('data-testid') ?? '') + ' ' +
-        (trailing.getAttribute?.('data-testid') ?? '')
-      );
-    };
-    const modelKindFromTrailing = (trailing) => {
-      const idText = testIdTextForTrailing(trailing);
-      if (!idText.includes('model switcher')) return null;
-      const modelPart = normalize(idText.replace(/\\bthinking effort\\b.*$/, ''));
-      if (hasToken(modelPart, 'pro')) return 'pro';
-      if (hasToken(modelPart, 'thinking')) return 'thinking';
-      if (hasToken(modelPart, 'instant')) return 'instant';
-      return null;
-    };
+    const modelKindFromTrailing = modelKindFromLegacyTrailing;
     const trailingMatchesTargetModelKind = (trailing) => {
       if (!TARGET_MODEL_KIND) return false;
       const idKind = modelKindFromTrailing(trailing);
@@ -698,12 +736,19 @@ function buildThinkingTimeExpression(level, desiredModel) {
       return null;
     };
 
-    const modelBtn = findModelButton();
+    const modelButtonDeadline = performance.now() + MAX_WAIT_MS;
+    while (!modelBtn && performance.now() < modelButtonDeadline) {
+      await sleep(100);
+      modelBtn = findModelButton();
+    }
     if (!modelBtn) {
       return failure('chip-not-found');
     }
     // Open model menu (idempotent — leaves it open if already open).
-    if (modelBtn.getAttribute('aria-expanded') !== 'true') {
+    if (
+      modelBtn.getAttribute('aria-expanded') !== 'true' &&
+      !legacyEffortOwnerIsReady()
+    ) {
       dispatchClickSequence(modelBtn);
       await sleep(INITIAL_WAIT_MS);
     }

package/dist/src/browser/artifacts.js

@@ -1,6 +1,7 @@
 import fs from "node:fs/promises";
 import path from "node:path";
 import { getOracleHomeDir } from "../oracleHome.js";
+import { isDeepResearchIncompleteText } from "./deepResearchResult.js";
 const ARTIFACTS_DIRNAME = "artifacts";
 function sanitizePathSegment(value, fallback) {
     const sanitized = value
@@ -85,16 +86,9 @@ export async function writeBinaryBrowserArtifact(params) {
         sourceUrl: params.sourceUrl,
     };
 }
-function isToolOnlyPlaceholder(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 async function saveDeepResearchReportArtifact(params) {
     const report = params.reportMarkdown.trim();
-    if (report.length < 40 || isToolOnlyPlaceholder(report)) {
+    if (report.length < 40 || isDeepResearchIncompleteText(report)) {
         return null;
     }
     return writeTextBrowserArtifact({