@steipete/oracle 0.19.0 → 0.20.1

package/dist/bin/oracle-cli.js

@@ -13,9 +13,10 @@ import { CHATGPT_URL } from "../src/browser/constants.js";
 import { applyHelpStyling } from "../src/cli/help.js";
 import { collectPaths, collectModelList, collectTextValues, parseFloatOption, parseIntOption, parseSearchOption, parseThinkingTimeOption, usesDefaultStatusFilters, resolvePreviewMode, normalizeModelOption, normalizeBaseUrl, resolveApiModel, inferModelFromLabel, parseHeartbeatOption, parseTimeoutOption, parseDurationOption, mergePathLikeOptions, dedupePathInputs, } from "../src/cli/options.js";
 import { copyToClipboard } from "../src/cli/clipboard.js";
+import { isGpt6ProAlias } from "../src/cli/browserConfig.js";
 import { buildMarkdownBundle } from "../src/cli/markdownBundle.js";
-import { shouldDetachSession, stopDetachedWorker } from "../src/cli/detach.js";
-import { launchDetachedSession } from "../src/cli/detachedSession.js";
+import { detachedCancellationExitCode, shouldDetachSession, shouldExitAfterTopLevelSigint, stopDetachedWorker, } from "../src/cli/detach.js";
+import { clearDetachedSessionCancellation, detachedSessionCancellationPath, launchDetachedSession, requestDetachedSessionCancellation, waitForDetachedSessionCancellation, } from "../src/cli/detachedSession.js";
 import { applyHiddenAliases } from "../src/cli/hiddenAliases.js";
 import { isMediaFile } from "../src/browser/prompt.js";
 import { formatCompactNumber } from "../src/cli/format.js";
@@ -36,6 +37,7 @@ import { isAzureOpenAICandidateModel, validateProviderRouting, } from "../src/or
 import { buildSessionLifecycle, formatSessionLifecycleBlock } from "../src/cli/sessionLifecycle.js";
 import { buildDetachedPerfTraceEnv, createPerfTrace, isTraceValueFlag, } from "../src/cli/perfTrace.js";
 import { resolveBrowserFollowupReference } from "../src/cli/followup.js";
+import { BrowserRunCancelledError } from "../src/oracle/errors.js";
 const VERSION = getCliVersion();
 const CLI_ENTRYPOINT = fileURLToPath(import.meta.url);
 const LEGACY_FLAG_ALIASES = new Map([
@@ -225,15 +227,8 @@ program
     .addOption(new Option("--models <models>", 'Comma-separated API model list to query in parallel (e.g., "gpt-5.5-pro,gemini-3-pro").')
     .argParser(collectModelList)
     .default([]))
-    .addOption(new Option("--reasoning-effort <effort>", "Reasoning effort for GPT-5.6 API models.").choices([
-    "none",
-    "low",
-    "medium",
-    "high",
-    "xhigh",
-    "max",
-]))
-    .addOption(new Option("--reasoning-mode <mode>", 'Responses API reasoning execution mode for GPT-5.6 models ("standard" or "pro").').choices(["standard", "pro"]))
+    .addOption(new Option("--reasoning-effort <effort>", "Reasoning effort for GPT-6 Astra and GPT-5.6 API models (Astra requires low or higher).").choices(["none", "low", "medium", "high", "xhigh", "max"]))
+    .addOption(new Option("--reasoning-mode <mode>", 'Responses API reasoning execution mode for GPT-6 Astra and GPT-5.6 models ("standard" or "pro").').choices(["standard", "pro"]))
     .addOption(new Option("-e, --engine <mode>", "Execution engine (api | browser). Browser engine: GPT models automate ChatGPT; Gemini models use a cookie-based client for gemini.google.com. If omitted, oracle picks api when OPENAI_API_KEY is set, otherwise browser.").choices(["api", "browser"]))
     .addOption(new Option("--mode <mode>", "Alias for --engine (api | browser).")
     .choices(["api", "browser"])
@@ -339,7 +334,7 @@ program
     .addOption(new Option("--browser-thinking-time <level>", "Thinking time intensity for Thinking/Pro models: light, standard, extended, extra-high (Extra High), pro (Pro tier of the active model), heavy, or ChatGPT UI aliases.")
     .argParser(parseThinkingTimeOption)
     .hideHelp())
-    .addOption(new Option("--browser-research <mode>", "Browser research mode: deep activates ChatGPT Deep Research.").choices(["off", "deep"]))
+    .addOption(new Option("--browser-research <mode>", "Browser research mode: search activates Web Search; deep activates Deep Research.").choices(["off", "search", "deep"]))
     .addOption(new Option("--browser-archive <mode>", "Archive completed ChatGPT browser conversations after local artifacts are saved (auto archives successful non-project one-shots only).").choices(["auto", "always", "never"]))
     .addOption(new Option("--browser-follow-up <prompt>", "Submit an additional prompt in the same ChatGPT browser conversation after the initial answer; repeat for multi-turn consults.")
     .argParser(collectTextValues)
@@ -1064,9 +1059,13 @@ async function runRootCommand(options) {
         options.baseUrl = userConfig.apiBaseUrl;
     }
     const providerMode = resolveApiProviderMode(options);
-    const engineModels = multiModelProvided
-        ? Array.from(new Set(options.models.map((entry) => resolveApiModel(entry))))
-        : [resolveApiModel(normalizeModelOption(options.model) || DEFAULT_MODEL)];
+    // Engine discovery must not apply API-only validation to browser aliases.
+    const engineModelInputs = multiModelProvided
+        ? options.models
+        : [normalizeModelOption(options.model) || DEFAULT_MODEL];
+    const engineModels = Array.from(new Set(engineModelInputs.map((entry) => isGpt6ProAlias(entry) && !options.route && !options.preflight
+        ? "gpt-6-pro"
+        : resolveApiModel(entry))));
     if (options.route || options.preflight) {
         const routeAzureEndpoint = firstNonEmpty(options.azureEndpoint, process.env.AZURE_OPENAI_ENDPOINT, userConfig.azure?.endpoint);
         const configuredAzureForRoute = routeAzureEndpoint
@@ -1675,18 +1674,28 @@ async function waitForDetachedStartGate() {
     }
 }
 async function attachToDetachedSession(sessionId, workerPid) {
+    const cancellationMarker = sessionStore
+        .getPaths(sessionId)
+        .then((paths) => detachedSessionCancellationPath(paths.dir, workerPid));
     let cancelled = false;
+    let cancellationRequest;
     const cancelWorker = () => {
         cancelled = true;
-        try {
-            stopDetachedWorker(workerPid);
-        }
-        catch (error) {
+        cancellationRequest ??= cancellationMarker
+            .then((markerPath) => requestDetachedSessionCancellation(markerPath))
+            .catch((error) => {
             const message = error instanceof Error ? error.message : String(error);
-            console.error(chalk.red(`Unable to stop detached worker ${workerPid}: ${message}`));
-        }
+            console.error(chalk.red(`Unable to request cancellation from worker ${workerPid}: ${message}`));
+            try {
+                stopDetachedWorker(workerPid);
+            }
+            catch (stopError) {
+                const stopMessage = stopError instanceof Error ? stopError.message : String(stopError);
+                console.error(chalk.red(`Unable to stop detached worker ${workerPid}: ${stopMessage}`));
+            }
+        });
     };
-    process.once("SIGINT", cancelWorker);
+    process.on("SIGINT", cancelWorker);
     try {
         const { attachSession } = await import("../src/cli/sessionDisplay.js");
         await attachSession(sessionId, {
@@ -1697,9 +1706,15 @@ async function attachToDetachedSession(sessionId, workerPid) {
     }
     finally {
         process.off("SIGINT", cancelWorker);
-        if (cancelled) {
-            process.exitCode = 130;
+        await cancellationRequest;
+        const finalStatus = (await sessionStore.readSession(sessionId).catch(() => null))?.status;
+        if (cancellationRequest &&
+            finalStatus &&
+            ["completed", "partial", "cancelled", "error"].includes(finalStatus)) {
+            // The parent may publish its request after the worker's final cleanup.
+            await clearDetachedSessionCancellation(await cancellationMarker);
         }
+        process.exitCode = detachedCancellationExitCode(cancelled, finalStatus, process.exitCode);
     }
 }
 async function restartSession(sessionId, options) {
@@ -1881,6 +1896,10 @@ async function restartSession(sessionId, options) {
 async function executeSession(sessionId) {
     let metadata = null;
     let writer = null;
+    const cancellation = new AbortController();
+    const stopCancellationMonitor = new AbortController();
+    let cancellationMarker;
+    let cancellationMonitor;
     try {
         metadata = await sessionStore.readSession(sessionId);
         if (!metadata) {
@@ -1894,6 +1913,18 @@ async function executeSession(sessionId) {
         const sessionMode = getSessionMode(metadata);
         const browserConfig = getBrowserConfigFromMetadata(metadata);
         writer = sessionStore.createLogWriter(sessionId);
+        if (sessionMode === "browser") {
+            const paths = await sessionStore.getPaths(sessionId);
+            cancellationMarker = detachedSessionCancellationPath(paths.dir, process.pid);
+            cancellationMonitor = waitForDetachedSessionCancellation({
+                markerPath: cancellationMarker,
+                signal: stopCancellationMonitor.signal,
+            }).then((requested) => {
+                if (requested) {
+                    cancellation.abort(new BrowserRunCancelledError("Browser run cancelled by the user."));
+                }
+            });
+        }
         const userConfig = (await loadUserConfig()).config;
         const notifications = deriveNotificationSettingsFromMetadata(metadata, process.env, userConfig.notify);
         const { performSessionRun } = await import("../src/cli/sessionRunner.js");
@@ -1907,18 +1938,22 @@ async function executeSession(sessionId) {
             write: writer.writeChunk,
             version: VERSION,
             notifications,
+            signal: sessionMode === "browser" ? cancellation.signal : undefined,
         });
     }
     catch (error) {
-        process.exitCode = 1;
+        const cancelled = error instanceof BrowserRunCancelledError;
+        process.exitCode = cancelled ? 130 : 1;
         const message = error instanceof Error ? error.message : String(error);
         if (!metadata) {
-            console.error(chalk.red(message));
+            if (!cancelled)
+                console.error(chalk.red(message));
             return;
         }
-        writer?.logLine(`ERROR: Detached session worker failed: ${message}`);
+        if (!cancelled)
+            writer?.logLine(`ERROR: Detached session worker failed: ${message}`);
         const latest = await sessionStore.readSession(sessionId).catch(() => null);
-        if (latest && !["completed", "partial", "error"].includes(latest.status)) {
+        if (latest && !["completed", "partial", "error", "cancelled"].includes(latest.status)) {
             await sessionStore.updateSession(sessionId, {
                 status: "error",
                 completedAt: new Date().toISOString(),
@@ -1932,6 +1967,14 @@ async function executeSession(sessionId) {
         }
     }
     finally {
+        stopCancellationMonitor.abort();
+        await cancellationMonitor?.catch((error) => {
+            const message = error instanceof Error ? error.message : String(error);
+            writer?.logLine(`ERROR: Detached cancellation monitor failed: ${message}`);
+        });
+        if (cancellationMarker) {
+            await clearDetachedSessionCancellation(cancellationMarker).catch(() => undefined);
+        }
         writer?.stream.end();
     }
 }
@@ -2050,7 +2093,7 @@ async function main() {
         console.log(chalk.yellow("\nCancelled."));
         process.exitCode = 130;
         // Browser/serve modes install their own SIGINT cleanup after this top-level handler.
-        if (process.listenerCount("SIGINT") <= 1) {
+        if (shouldExitAfterTopLevelSigint(process.listenerCount("SIGINT"))) {
             process.exit(130);
         }
     };

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

@@ -79,65 +79,131 @@ async function waitForDeepResearchPill(Runtime, timeoutMs = 5000) {
  * After prompt submission, waits for the research plan to appear and
  * auto-confirm (~60s countdown + 10s safety margin).
  */
-export async function waitForResearchPlanAutoConfirm(Runtime, logger, autoConfirmWaitMs = DEEP_RESEARCH_AUTO_CONFIRM_WAIT_MS) {
+export async function waitForResearchPlanAutoConfirm(Runtime, logger, autoConfirmWaitMs = DEEP_RESEARCH_AUTO_CONFIRM_WAIT_MS, options) {
+    const ignoredTargetKeys = new Set(options?.ignoredTargetKeys ?? []);
+    const minTurnIndex = typeof options?.minTurnIndex === "number" && Number.isFinite(options.minTurnIndex)
+        ? Math.floor(options.minTurnIndex)
+        : -1;
+    let capturedPlan = null;
+    let loggedPlan = false;
+    const targetOwnerMinTurnIndex = minTurnIndex >= 0 && options?.targetBaselineCaptured !== true ? minTurnIndex : -1;
+    const readPlanStatus = async () => {
+        const targetRead = options?.client
+            ? ((await readDeepResearchTargetResult(options.client, ignoredTargetKeys, targetOwnerMinTurnIndex).catch(() => null))?.read ?? null)
+            : null;
+        if (targetRead?.planTitle || targetRead?.researchStarted) {
+            return targetRead;
+        }
+        const inPageRead = options?.Page
+            ? await readDeepResearchFrameResult(Runtime, options.Page, options.client, minTurnIndex).catch(() => null)
+            : null;
+        return inPageRead?.read ?? targetRead;
+    };
+    const capturePlan = async (status) => {
+        if (!status.planTitle || !status.planSteps || status.planSteps.length === 0) {
+            return capturedPlan;
+        }
+        const next = {
+            title: status.planTitle,
+            steps: status.planSteps,
+            phase: status.researchStarted ? "researching" : "planning",
+            ...(status.planActionText ? { actionText: status.planActionText } : {}),
+            capturedAt: capturedPlan?.capturedAt ?? new Date().toISOString(),
+        };
+        const changed = !capturedPlan ||
+            capturedPlan.phase !== next.phase ||
+            capturedPlan.title !== next.title ||
+            capturedPlan.steps.join("\n") !== next.steps.join("\n") ||
+            capturedPlan.actionText !== next.actionText;
+        capturedPlan = next;
+        if (!loggedPlan) {
+            logger(`[browser] Deep Research plan detected:\n${[next.title, ...next.steps.map((step, index) => `${index + 1}. ${step}`)].join("\n")}`);
+            loggedPlan = true;
+        }
+        if (changed) {
+            await options?.onPlan?.(next);
+        }
+        return next;
+    };
+    const reportResearchStarted = async () => {
+        if (capturedPlan?.phase === "planning") {
+            capturedPlan = { ...capturedPlan, phase: "researching" };
+            await options?.onPlan?.(capturedPlan);
+        }
+        logger("[browser] Deep Research execution started; plan countdown is complete.");
+        return capturedPlan;
+    };
     // Phase A: Detect research plan appearance (up to 60s)
     const planDeadline = Date.now() + 60_000;
     let planDetected = false;
     while (Date.now() < planDeadline) {
+        const frameStatus = await readPlanStatus();
+        if (frameStatus) {
+            await capturePlan(frameStatus);
+            if (frameStatus.researchStarted) {
+                return reportResearchStarted();
+            }
+            if (capturedPlan) {
+                planDetected = true;
+                break;
+            }
+        }
+        // Legacy/inline fallback. Do not treat an arbitrary large iframe as a plan:
+        // ChatGPT projects, attachments, and other tools also render large iframes.
         const { result } = await Runtime.evaluate({
             expression: `(() => {
-        const iframes = document.querySelectorAll('iframe');
-        const hasResearchIframe = Array.from(iframes).some(f => {
-          const rect = f.getBoundingClientRect();
-          return rect.width > 200 && rect.height > 200;
-        });
-        const assistantText = (document.querySelector('[data-message-author-role="assistant"]')?.textContent || '').toLowerCase();
+        const turns = Array.from(document.querySelectorAll('[data-message-author-role="assistant"]'));
+        const assistantText = String(turns.at(-1)?.textContent || '').toLowerCase();
         const hasResearchText = assistantText.includes('researching') ||
           assistantText.includes('research plan') ||
-          assistantText.includes('survey') ||
-          assistantText.includes('analyze');
-        return { hasResearchIframe, hasResearchText };
+          assistantText.includes('正在研究') ||
+          assistantText.includes('研究计划');
+        return { hasResearchText };
       })()`,
             returnByValue: true,
         });
         const val = result?.value;
-        if (val?.hasResearchIframe || val?.hasResearchText) {
+        if (val?.hasResearchText) {
             planDetected = true;
-            logger("Research plan detected, waiting for auto-confirm countdown...");
+            logger("[browser] Deep Research activity detected; waiting for plan auto-confirm...");
             break;
         }
         await delay(2_000);
     }
     if (!planDetected) {
         logger("Warning: Research plan not detected within 60s; continuing (may have auto-confirmed already)");
-        return;
+        return capturedPlan;
     }
-    // Phase B: Wait for auto-confirm countdown
+    // Phase B: Wait for the OOPIF's real execution state instead of sleeping for
+    // the full countdown. The main page cannot see this sandboxed iframe's text.
     const confirmStart = Date.now();
     while (Date.now() - confirmStart < autoConfirmWaitMs) {
+        const frameStatus = await readPlanStatus();
+        if (frameStatus) {
+            await capturePlan(frameStatus);
+            if (frameStatus.researchStarted) {
+                return reportResearchStarted();
+            }
+        }
         const { result } = await Runtime.evaluate({
             expression: `(() => {
-        const iframes = document.querySelectorAll('iframe');
-        const hasLargeIframe = Array.from(iframes).some(f => {
-          const rect = f.getBoundingClientRect();
-          return rect.width > 200 && rect.height > 200;
-        });
         const text = (document.body?.innerText || '').toLowerCase();
         const isResearching = text.includes('researching...') ||
           text.includes('reading sources') ||
-          text.includes('considering');
-        return { hasLargeIframe, isResearching };
+          text.includes('正在研究') ||
+          text.includes('正在阅读来源');
+        return { isResearching };
       })()`,
             returnByValue: true,
         });
         const val = result?.value;
         if (val?.isResearching) {
-            logger("Research plan confirmed, execution started");
-            return;
+            return reportResearchStarted();
         }
-        await delay(5_000);
+        await delay(2_000);
     }
-    logger("Auto-confirm wait complete, proceeding to monitor research progress");
+    logger("[browser] Deep Research plan wait elapsed; proceeding to monitor research progress.");
+    return capturedPlan;
 }
 /**
  * Polls for Deep Research completion over 5-30+ minutes.
@@ -600,6 +666,44 @@ function buildDeepResearchFrameStatusExpression() {
     return `(() => {
     const rawText = document.body?.innerText || '';
     const html = document.body?.innerHTML || '';
+    const cleanText = (value) => String(value || '').replace(/\\s+/g, ' ').trim();
+    const sections = typeof document.querySelectorAll === 'function'
+      ? Array.from(document.querySelectorAll('section'))
+      : [];
+    const planSection = sections.find((section) => {
+      if (typeof section.querySelector !== 'function' ||
+          typeof section.querySelectorAll !== 'function' ||
+          !cleanText(section.querySelector('h2')?.textContent) ||
+          section.querySelectorAll('ul li').length === 0) {
+        return false;
+      }
+      const buttons = Array.from(section.querySelectorAll('button'));
+      const hasPlanAction = buttons.some((button) =>
+        /^(edit|update|编辑|更新)$/i.test(cleanText(button.textContent))
+      );
+      const hasResearchStatus = Boolean(section.querySelector('p.loading-shimmer')) ||
+        buttons.some((button) =>
+          /stop research|停止研究/i.test(cleanText(button.getAttribute?.('aria-label')))
+        );
+      return hasPlanAction || hasResearchStatus;
+    });
+    const planTitle = cleanText(planSection?.querySelector?.('h2')?.textContent);
+    const planSteps = planSection && typeof planSection.querySelectorAll === 'function'
+      ? Array.from(planSection.querySelectorAll('ul li'))
+          .map((item) => cleanText(item.textContent))
+          .filter(Boolean)
+      : [];
+    const planActionText = planSection && typeof planSection.querySelectorAll === 'function'
+      ? Array.from(planSection.querySelectorAll('button'))
+          .map((button) => cleanText(button.textContent))
+          .find((text) => /^(edit|update|编辑|更新)$/i.test(text)) || ''
+      : '';
+    const hasResearchShimmer = Boolean(planSection?.querySelector?.('p.loading-shimmer'));
+    const hasStopResearchControl = typeof planSection?.querySelectorAll === 'function' &&
+      Array.from(planSection.querySelectorAll('button')).some((button) =>
+        /stop research|停止研究/i.test(cleanText(button.getAttribute?.('aria-label')))
+      );
+    const researchStarted = planSteps.length > 0 && (hasResearchShimmer || hasStopResearchControl);
     const isPlaceholder = (line) => /^(called tool|used tool|użyto narzędzia|narzędzie wywołane)$/i.test(line);
     const isCompletionLine = (line) =>
       /^(research completed|badanie ukończone)\\b/i.test(line);
@@ -641,6 +745,10 @@ function buildDeepResearchFrameStatusExpression() {
     return {
       completed,
       inProgress,
+      researchStarted,
+      planTitle: planTitle || undefined,
+      planSteps: planSteps.length > 0 ? planSteps : undefined,
+      planActionText: planActionText || undefined,
       textLength: reportText.length || rawText.trim().length,
       text: completed ? reportText : undefined,
       html: completed ? html : undefined,
@@ -773,9 +881,9 @@ export function buildDeepResearchCompletionPollExpressionForTest(minTurnIndex =
     return buildDeepResearchCompletionPollExpression(minTurnIndex);
 }
 function buildFindDeepResearchPillExpression(functionName = "findDeepResearchPill") {
-    const pillLabel = JSON.stringify(DEEP_RESEARCH_PILL_LABEL);
+    const pillLabels = JSON.stringify([DEEP_RESEARCH_PILL_LABEL, "深度研究"]);
     return `const ${functionName} = () => {
-      const label = ${pillLabel}.toLowerCase();
+      const labels = ${pillLabels}.map(label => label.toLowerCase());
       const selectors = [
         '.__composer-pill-composite',
         '.__composer-pill',
@@ -798,7 +906,7 @@ function buildFindDeepResearchPillExpression(functionName = "findDeepResearchPil
           pill.querySelector('button')?.getAttribute('aria-label') ||
           ''
         ).toLowerCase();
-        if (text.includes(label) || aria.includes(label)) {
+        if (labels.some(label => text.includes(label) || aria.includes(label))) {
           return pill;
         }
       }
@@ -819,6 +927,18 @@ function buildWaitForDeepResearchPillExpression(timeoutMs) {
 function buildActivateDeepResearchExpression() {
     const plusBtnSelector = JSON.stringify(DEEP_RESEARCH_PLUS_BUTTON);
     const targetText = JSON.stringify(DEEP_RESEARCH_DROPDOWN_ITEM_TEXT);
+    const targetLabels = JSON.stringify([DEEP_RESEARCH_DROPDOWN_ITEM_TEXT, "深度研究"]);
+    const descriptionLabels = JSON.stringify(["Get a detailed report", "获取详细报告"]);
+    const addFilesLabels = JSON.stringify(["add files", "添加文件"]);
+    const dropdownReadyLabels = JSON.stringify([
+        "add photos",
+        "create image",
+        "web search",
+        "deep research",
+        "get a detailed report",
+        "深度研究",
+        "获取详细报告",
+    ]);
     return `(async () => {
     ${buildClickDispatcher()}
     ${buildFindDeepResearchPillExpression()}
@@ -864,8 +984,12 @@ function buildActivateDeepResearchExpression() {
       '[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 compactText = (value) => normalizeText(value).replace(/\\s+/g, '');
+    const targetLabels = ${targetLabels}.map(normalizeText);
+    const descriptionLabels = ${descriptionLabels}.map(normalizeText);
+    const addFilesLabels = ${addFilesLabels}.map(normalizeText);
+    const dropdownReadyLabels = ${dropdownReadyLabels}.map(normalizeText);
     const getText = (item) => normalizeText(item.textContent || item.getAttribute?.('aria-label') || '');
     const isInPopover = (item) => Boolean(item.closest?.(popoverSelector));
     const isVisible = (item) => {
@@ -891,14 +1015,16 @@ function buildActivateDeepResearchExpression() {
       input.dispatchEvent(new InputEvent('input', { bubbles: true, inputType: 'insertText', data: text }));
       input.dispatchEvent(new Event('change', { bubbles: true }));
     };
-    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 isDeepResearchText = (text) => {
+      const compact = compactText(text);
+      const exactLabel = targetLabels.some(label => compact === compactText(label) || text.startsWith(label + ' '));
+      const exactDescription = descriptionLabels.some(
+        label => text === label || text.startsWith(label + ' ')
+      );
+      const combinedLabel = targetLabels.some(label => compact.startsWith(compactText(label))) &&
+        descriptionLabels.some(label => compact.includes(compactText(label)));
+      return exactLabel || exactDescription || combinedLabel;
+    };
     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;
@@ -915,7 +1041,7 @@ function buildActivateDeepResearchExpression() {
         .map(item => {
           const text = getText(item);
           const clickable = getClickableItem(item);
-          const exact = text === target ? 0 : 1;
+          const exact = targetLabels.includes(text) ? 0 : 1;
           const menuRow = /(^|\\s)__menu-item(\\s|$)/.test(clickable.className || '') ? 0 : 1;
           return { item: clickable, score: exact + menuRow, textLength: text.length };
         })
@@ -946,7 +1072,9 @@ function buildActivateDeepResearchExpression() {
     // 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')
+        b => addFilesLabels.some(label =>
+          normalizeText(b.getAttribute('aria-label') || '').includes(label)
+        )
       );
     if (!plusBtn) return { status: 'plus-button-missing' };
     dispatchClickSequence(plusBtn);
@@ -958,11 +1086,7 @@ function buildActivateDeepResearchExpression() {
         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');
+          return dropdownReadyLabels.some(label => normalized.includes(label));
         })) { resolve(items); return; }
         elapsed += 150;
         if (elapsed > 3000) { resolve(items.length ? items : null); return; }