@steipete/oracle 0.19.0 → 0.20.0

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

@@ -0,0 +1,96 @@
+import { BrowserAutomationError } from "../../oracle/errors.js";
+import { INPUT_SELECTORS } from "../constants.js";
+import { delay } from "../utils.js";
+import { activateComposerPlus, captureComposerNavigationUrl, assertComposerPlusStayedInPlace, } from "./attachments.js";
+import { buildComposerNavigationValidationExpression } from "./attachmentContext.js";
+import { buildClickDispatcher } from "./domEvents.js";
+export function matchesWebSearchMenuLabel(value) {
+    return [
+        "search",
+        "searchfindontheweb",
+        "websearch",
+        "websearchfindreal-timenewsandinfo",
+    ].includes(value.replace(/\s+/g, "").toLowerCase());
+}
+export function buildWebSearchVerificationExpression(prompt) {
+    return `(() => {
+    const visible = node => node instanceof HTMLElement && node.getBoundingClientRect().width > 0 && node.getBoundingClientRect().height > 0;
+    const editor = ${JSON.stringify(INPUT_SELECTORS)}.flatMap(selector => Array.from(document.querySelectorAll(selector))).find(visible);
+    if (!editor) return { selected: false, promptMatches: false };
+    const chip = editor.querySelector('[data-inline-selection-pill][data-id="search"][data-system-hint-type="search"]');
+    const copy = editor.cloneNode(true);
+    copy.querySelectorAll('[data-inline-selection-pill], [data-inline-selection-pill-cursor-target]').forEach(node => node.remove());
+    const readText = node => {
+      if (node.nodeType === 3) return node.textContent ?? '';
+      const text = Array.from(node.childNodes).map(readText).join('');
+      return text + (['P', 'DIV', 'BR', 'LI', 'PRE'].includes(node.nodeName) ? '\\n' : '');
+    };
+    const normalize = text => String(text ?? '').replace(/[\\u200b\\ufeff]/g, '').replace(/\\s+/g, ' ').trim();
+    return { selected: Boolean(chip && visible(chip)), promptMatches: normalize(readText(copy)) === normalize(${JSON.stringify(prompt)}) };
+  })()`;
+}
+export function buildWebSearchSelectionExpression(navigationUrl) {
+    return `(() => {
+    ${buildClickDispatcher()}
+    const matchesLabel = ${matchesWebSearchMenuLabel.toString()};
+    const navigation = ${buildComposerNavigationValidationExpression(navigationUrl)};
+    if (!navigation.contextMatches || navigation.workSelected || navigation.modeUnverified) return 'context-changed';
+    const visible = node => node instanceof HTMLElement && node.getBoundingClientRect().width > 0 && node.getBoundingClientRect().height > 0;
+    const roots = Array.from(document.querySelectorAll('main .popover, [data-radix-popper-content-wrapper], [data-floating-ui-portal], [role="menu"], [role="listbox"]')).filter(visible);
+    const candidates = roots.flatMap(root => Array.from(root.querySelectorAll('[data-radix-collection-item], [role="menuitem"], [role="option"], .__menu-item, [class*="menu-item"]')));
+    const match = candidates.find(node => {
+      if (!visible(node) || node.hasAttribute('disabled') || node.getAttribute('aria-disabled') === 'true') return false;
+      return matchesLabel(node.textContent ?? '');
+    });
+    if (!match) return 'missing';
+    dispatchClickSequence(match);
+    return 'clicked';
+  })()`;
+}
+/** Web Search is an inline editor hint, so activate it after staging text/attachments. */
+export async function activateWebSearch(runtime, input, prompt, logger) {
+    const navigationUrl = await captureComposerNavigationUrl(runtime);
+    const verify = async () => {
+        const { result, exceptionDetails } = await runtime.evaluate({
+            expression: buildWebSearchVerificationExpression(prompt),
+            returnByValue: true,
+        });
+        if (exceptionDetails)
+            return false;
+        return result?.value?.selected === true && result?.value?.promptMatches === true;
+    };
+    if (await verify())
+        return;
+    const activated = await activateComposerPlus(runtime, input, navigationUrl);
+    if (activated.method === "unavailable")
+        throw new BrowserAutomationError("Web Search requires the ChatGPT composer tools menu.", {
+            stage: "web-search-activate",
+        });
+    const deadline = Date.now() + 5_000;
+    let clicked = false;
+    while (Date.now() < deadline) {
+        const outcome = await runtime.evaluate({
+            expression: buildWebSearchSelectionExpression(navigationUrl),
+            returnByValue: true,
+        });
+        if (outcome.result?.value === "clicked") {
+            clicked = true;
+            break;
+        }
+        if (outcome.exceptionDetails || outcome.result?.value !== "missing")
+            break;
+        await delay(100);
+    }
+    if (clicked) {
+        const confirmationDeadline = Date.now() + 3_000;
+        do {
+            await assertComposerPlusStayedInPlace(runtime, navigationUrl);
+            if (await verify()) {
+                logger("Web Search selected; inline search hint and staged prompt verified.");
+                return;
+            }
+            await delay(100);
+        } while (Date.now() < confirmationDeadline);
+    }
+    throw new BrowserAutomationError("Web Search selection could not be verified; the prompt was not submitted. This pilot supports the English ChatGPT Web search control.", { stage: "web-search-activate" });
+}

package/dist/src/browser/chromeLifecycle.js

@@ -352,9 +352,10 @@ export async function connectToRemoteChrome(host, port, logger, targetUrl, brows
             return {
                 client: targetConnection.client,
                 targetId: targetConnection.targetId,
-                close: async () => {
+                close: async (closeOptions) => {
                     await targetConnection.client.close().catch(() => undefined);
-                    await closeRemoteChromeTarget(host, port, targetConnection.targetId, logger);
+                    if (!closeOptions?.preserveTarget)
+                        await closeRemoteChromeTarget(host, port, targetConnection.targetId, logger);
                 },
             };
         }
@@ -431,9 +432,9 @@ export async function connectToRemoteChromeTarget(host, port, logger, options) {
             client,
             targetId,
             browserWSEndpoint: options.browserWSEndpoint,
-            close: async () => {
+            close: async (closeOptions) => {
                 await browser.Target.detachFromTarget({ sessionId: attached.sessionId }).catch(() => undefined);
-                if (options.closeTargetOnDispose && targetId) {
+                if (options.closeTargetOnDispose && targetId && !closeOptions?.preserveTarget) {
                     await browser.Target.closeTarget({ targetId }).catch(() => undefined);
                 }
                 await browser.close().catch(() => undefined);

package/dist/src/browser/config.js

@@ -123,7 +123,7 @@ export function resolveBrowserConfig(config) {
     };
 }
 function normalizeResearchMode(value) {
-    return value === "deep" ? "deep" : "off";
+    return value === "deep" || value === "search" ? value : "off";
 }
 function normalizeArchiveMode(value) {
     return value === "always" || value === "never" ? value : "auto";

package/dist/src/browser/index.js

@@ -2,6 +2,8 @@ import { mkdtemp, rm, mkdir } from "node:fs/promises";
 import path from "node:path";
 import os from "node:os";
 import net from "node:net";
+import { randomUUID } from "node:crypto";
+import { claimBrowserTarget } from "./targetClaim.js";
 import { resolveBrowserConfig } from "./config.js";
 import { copyChromeProfile } from "./profileCopy.js";
 import { BrowserCancellation, withoutBrowserCancellation } from "./cancellation.js";
@@ -554,19 +556,13 @@ export function isLocalChromeHostForTest(host) {
     return isLocalChromeHost(host);
 }
 async function closeRemoteConnectionAfterRun(options) {
-    if (options.connectionClosedUnexpectedly) {
-        return;
-    }
     if (!options.connection) {
         await options.client?.close();
         return;
     }
-    if (options.runStatus === "complete") {
-        await options.connection.close();
-    }
-    else {
-        await options.client?.close();
-    }
+    await options.connection.close({
+        preserveTarget: options.connectionClosedUnexpectedly || options.preserveTarget,
+    });
 }
 function shouldCloseOwnedRunTargetAfterRun(options) {
     return (options.ownsTarget &&
@@ -712,8 +708,11 @@ async function runBrowserModeInternal(options, cancellation) {
     let lastTargetId;
     let lastUrl;
     let promptSubmitted = false;
+    let ownedRecoveryTarget;
+    const targetClaimId = randomUUID();
     let modelSelectionEvidence;
     let thinkingSelectionEvidence;
+    let researchPlan;
     let tabLease = null;
     let conversationUrlMonitor = null;
     const emitRuntimeHint = async () => {
@@ -729,8 +728,10 @@ async function runBrowserModeInternal(options, cancellation) {
             tabUrl: lastUrl,
             conversationId,
             promptSubmitted,
+            ownedRecoveryTarget,
             userDataDir,
             controllerPid: process.pid,
+            researchPlan,
         };
         try {
             await runtimeHintCb?.(hint, modelSelectionEvidence);
@@ -929,7 +930,15 @@ async function runBrowserModeInternal(options, cancellation) {
                 });
                 client = cancellation.client(connection.client);
                 isolatedTargetId = connection.targetId ?? null;
-                ownsTarget = true;
+                ownsTarget = Boolean(connection.targetId);
+                if (connection.targetId && (!config.keepBrowser || options.closeOwnedTabOnComplete)) {
+                    ownedRecoveryTarget = {
+                        host: chromeHost,
+                        port: chrome.port,
+                        targetId: connection.targetId,
+                        claimId: targetClaimId,
+                    };
+                }
             }
             if (tabLease && isolatedTargetId) {
                 await tabLease.update({
@@ -977,7 +986,9 @@ async function runBrowserModeInternal(options, cancellation) {
                                 ? extractConversationIdFromUrl(liveness.matchedUrl ?? lastUrl ?? "")
                                 : undefined,
                             promptSubmitted,
+                            ownedRecoveryTarget,
                             controllerPid: process.pid,
+                            researchPlan,
                         },
                     }));
                 })();
@@ -990,6 +1001,8 @@ async function runBrowserModeInternal(options, cancellation) {
             domainEnablers.push(DOM.enable());
         }
         await Promise.all(domainEnablers);
+        if (config.browserTabRef)
+            await claimBrowserTarget(Runtime, targetClaimId);
         if (!config.headless && config.hideWindow) {
             await positionChromeWindowOffscreen(client, userDataDir, logger);
         }
@@ -1251,6 +1264,7 @@ async function runBrowserModeInternal(options, cancellation) {
             await withoutBrowserCancellation(() => handle.release()).catch(() => undefined);
         };
         const submitOnce = async (prompt, submissionAttachments) => {
+            await claimBrowserTarget(Runtime, targetClaimId);
             const baselineSnapshot = await readAssistantSnapshot(Runtime).catch(() => null);
             const baselineAssistantText = typeof baselineSnapshot?.text === "string" ? baselineSnapshot.text.trim() : "";
             const attachmentNames = submissionAttachments.map((a) => path.basename(a.path));
@@ -1313,6 +1327,7 @@ async function runBrowserModeInternal(options, cancellation) {
                 attachmentNames: attachmentExpectations,
                 attachmentNavigationUrl,
                 onPromptSubmitted: markPromptSubmitted,
+                webSearch: config.researchMode === "search",
             };
             const deepResearchTargetBaseline = deepResearch && client
                 ? await captureDeepResearchTargetBaseline(client, logger)
@@ -1387,7 +1402,17 @@ async function runBrowserModeInternal(options, cancellation) {
         }
         const imageArtifactMinTurnIndex = baselineTurns;
         if (deepResearch) {
-            await raceWithDisconnect(waitForResearchPlanAutoConfirm(Runtime, logger));
+            await raceWithDisconnect(waitForResearchPlanAutoConfirm(Runtime, logger, undefined, {
+                Page,
+                client,
+                ignoredTargetKeys: deepResearchTargetKeys,
+                targetBaselineCaptured: deepResearchTargetBaselineCaptured,
+                minTurnIndex: baselineTurns,
+                onPlan: async (plan) => {
+                    researchPlan = plan;
+                    await emitRuntimeHint();
+                },
+            }));
             const researchResult = await raceWithDisconnect(waitForDeepResearchCompletion(Runtime, logger, config.timeoutMs, baselineTurns, Page, client, {
                 ignoredTargetKeys: deepResearchTargetKeys,
                 targetBaselineCaptured: deepResearchTargetBaselineCaptured,
@@ -1438,7 +1463,9 @@ async function runBrowserModeInternal(options, cancellation) {
                 tabUrl: lastUrl,
                 conversationId: lastUrl ? extractConversationIdFromUrl(lastUrl) : undefined,
                 promptSubmitted,
+                ownedRecoveryTarget,
                 controllerPid: process.pid,
+                researchPlan,
             };
         }
         // Helper to normalize text for echo detection (collapse whitespace, lowercase)
@@ -1528,6 +1555,7 @@ async function runBrowserModeInternal(options, cancellation) {
                         tabUrl: lastUrl,
                         conversationId: lastUrl ? extractConversationIdFromUrl(lastUrl) : undefined,
                         promptSubmitted,
+                        ownedRecoveryTarget,
                         controllerPid: process.pid,
                     },
                 });
@@ -1584,6 +1612,7 @@ async function runBrowserModeInternal(options, cancellation) {
                             tabUrl: lastUrl,
                             conversationId: lastUrl ? extractConversationIdFromUrl(lastUrl) : undefined,
                             promptSubmitted,
+                            ownedRecoveryTarget,
                             controllerPid: process.pid,
                         };
                         throw await createAssistantTimeoutError({
@@ -1809,6 +1838,7 @@ async function runBrowserModeInternal(options, cancellation) {
                     tabUrl: lastUrl,
                     conversationId: lastUrl ? extractConversationIdFromUrl(lastUrl) : undefined,
                     promptSubmitted,
+                    ownedRecoveryTarget,
                     controllerPid: process.pid,
                 },
             }),
@@ -1876,6 +1906,7 @@ async function runBrowserModeInternal(options, cancellation) {
             tabUrl: lastUrl,
             conversationId: lastUrl ? extractConversationIdFromUrl(lastUrl) : undefined,
             promptSubmitted,
+            ownedRecoveryTarget,
             controllerPid: process.pid,
         };
     }
@@ -1902,6 +1933,7 @@ async function runBrowserModeInternal(options, cancellation) {
                 chromeTargetId: lastTargetId,
                 tabUrl: lastUrl,
                 promptSubmitted,
+                ownedRecoveryTarget,
                 controllerPid: process.pid,
             };
             const reuseProfileHint = `oracle --engine browser --browser-manual-login ` +
@@ -1965,7 +1997,9 @@ async function runBrowserModeInternal(options, cancellation) {
                     ? extractConversationIdFromUrl(liveness.matchedUrl ?? lastUrl ?? "")
                     : undefined,
                 promptSubmitted,
+                ownedRecoveryTarget,
                 controllerPid: process.pid,
+                researchPlan,
             },
         }, normalizedError);
     }
@@ -2363,8 +2397,11 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
     let tabLease = null;
     let lastUrl;
     let promptSubmitted = false;
+    let ownedRecoveryTarget;
+    const targetClaimId = randomUUID();
     let modelSelectionEvidence;
     let thinkingSelectionEvidence;
+    let researchPlan;
     let attachedExistingTab = false;
     let ownsTarget = true;
     let conversationUrlMonitor = null;
@@ -2382,7 +2419,9 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                 tabUrl: lastUrl,
                 conversationId: lastUrl ? extractConversationIdFromUrl(lastUrl) : undefined,
                 promptSubmitted,
+                ownedRecoveryTarget,
                 controllerPid: process.pid,
+                researchPlan,
             }, modelSelectionEvidence);
             await tabLease?.update({
                 chromeHost: host,
@@ -2452,7 +2491,16 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
             }), (connection) => connection.close());
             client = cancellation.client(connection.client);
             remoteTargetId = connection.targetId ?? null;
-            ownsTarget = true;
+            ownsTarget = Boolean(connection.targetId);
+            if (connection.targetId && (!config.keepBrowser || options.closeOwnedTabOnComplete)) {
+                ownedRecoveryTarget = {
+                    host,
+                    port,
+                    targetId: connection.targetId,
+                    browserWSEndpoint,
+                    claimId: targetClaimId,
+                };
+            }
         }
         if (tabLease && remoteTargetId) {
             await tabLease.update({
@@ -2472,6 +2520,8 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
             domainEnablers.push(DOM.enable());
         }
         await Promise.all(domainEnablers);
+        if (config.browserTabRef)
+            await claimBrowserTarget(Runtime, targetClaimId);
         removeDialogHandler = installJavaScriptDialogAutoDismissal(Page, logger);
         await enableFocusEmulation(client, logger, "remote target");
         const activeConversationUrlMonitor = createConversationUrlMonitor({
@@ -2572,6 +2622,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
             });
         }
         const submitOnce = async (prompt, submissionAttachments) => {
+            await claimBrowserTarget(Runtime, targetClaimId);
             const baselineSnapshot = await readAssistantSnapshot(Runtime).catch(() => null);
             const baselineAssistantText = typeof baselineSnapshot?.text === "string" ? baselineSnapshot.text.trim() : "";
             const attachmentNames = submissionAttachments.map((a) => path.basename(a.path));
@@ -2629,6 +2680,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                 attachmentNames: attachmentExpectations,
                 attachmentNavigationUrl,
                 onPromptSubmitted: markPromptSubmitted,
+                webSearch: config.researchMode === "search",
             };
             const deepResearchTargetBaseline = deepResearch && client
                 ? await captureDeepResearchTargetBaseline(client, logger)
@@ -2679,7 +2731,17 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
         deepResearchTargetBaselineCaptured = submission.deepResearchTargetBaselineCaptured ?? false;
         const imageArtifactMinTurnIndex = baselineTurns;
         if (deepResearch) {
-            await waitForResearchPlanAutoConfirm(Runtime, logger);
+            await waitForResearchPlanAutoConfirm(Runtime, logger, undefined, {
+                Page,
+                client,
+                ignoredTargetKeys: deepResearchTargetKeys,
+                targetBaselineCaptured: deepResearchTargetBaselineCaptured,
+                minTurnIndex: baselineTurns,
+                onPlan: async (plan) => {
+                    researchPlan = plan;
+                    await emitRuntimeHint();
+                },
+            });
             const researchResult = await waitForDeepResearchCompletion(Runtime, logger, config.timeoutMs, baselineTurns, Page, client, {
                 ignoredTargetKeys: deepResearchTargetKeys,
                 targetBaselineCaptured: deepResearchTargetBaselineCaptured,
@@ -2728,7 +2790,9 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                 tabUrl: lastUrl,
                 conversationId: lastUrl ? extractConversationIdFromUrl(lastUrl) : undefined,
                 promptSubmitted,
+                ownedRecoveryTarget,
                 controllerPid: process.pid,
+                researchPlan,
             };
         }
         // Helper to normalize text for echo detection (collapse whitespace, lowercase)
@@ -2817,6 +2881,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                         tabUrl: lastUrl,
                         conversationId: lastUrl ? extractConversationIdFromUrl(lastUrl) : undefined,
                         promptSubmitted,
+                        ownedRecoveryTarget,
                         controllerPid: process.pid,
                     },
                 });
@@ -2875,6 +2940,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                             tabUrl: lastUrl,
                             conversationId: lastUrl ? extractConversationIdFromUrl(lastUrl) : undefined,
                             promptSubmitted,
+                            ownedRecoveryTarget,
                             controllerPid: process.pid,
                         };
                         throw await createAssistantTimeoutError({
@@ -3058,6 +3124,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                     tabUrl: lastUrl,
                     conversationId: lastUrl ? extractConversationIdFromUrl(lastUrl) : undefined,
                     promptSubmitted,
+                    ownedRecoveryTarget,
                     controllerPid: process.pid,
                 },
             }),
@@ -3120,6 +3187,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
             tabUrl: lastUrl,
             conversationId: lastUrl ? extractConversationIdFromUrl(lastUrl) : undefined,
             promptSubmitted,
+            ownedRecoveryTarget,
             artifacts: savedArtifacts,
             generatedImages: imageArtifacts.generatedImages,
             savedImages: imageArtifacts.savedImages,
@@ -3168,7 +3236,9 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                     ? extractConversationIdFromUrl(liveness.matchedUrl ?? lastUrl ?? "")
                     : undefined,
                 promptSubmitted,
+                ownedRecoveryTarget,
                 controllerPid: process.pid,
+                researchPlan,
             },
         });
     }
@@ -3176,17 +3246,6 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
         await withoutBrowserCancellation(async () => {
             stopThinkingMonitor?.();
             await conversationUrlMonitor?.stop();
-            try {
-                await closeRemoteConnectionAfterRun({
-                    connectionClosedUnexpectedly,
-                    connection,
-                    client,
-                    runStatus,
-                });
-            }
-            catch {
-                // ignore
-            }
             removeDialogHandler?.();
             const keepRemoteBrowser = Boolean(config.keepBrowser);
             const shouldCloseOwnedRemoteTarget = shouldCloseOwnedRunTargetAfterRun({
@@ -3196,33 +3255,42 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                 closeOwnedTabOnComplete: options.closeOwnedTabOnComplete,
                 closeOwnedTabOnCancel: options.closeOwnedTabOnCancel,
             });
-            const closeOwnedRemoteTarget = async () => {
-                if (!shouldCloseOwnedRemoteTarget || !remoteTargetId) {
-                    return;
-                }
-                const safeToClose = !keepRemoteBrowser ||
-                    Boolean(await ensureChromePageTargetAfterClose(port, remoteTargetId, logger, host));
-                if (!safeToClose) {
-                    logger(`[browser] Leaving completed remote browser tab open because Chrome has no replacement page target.`);
-                    return;
-                }
-                const closeConfirmed = await closeTab(port, remoteTargetId, logger, host);
-                if (!closeConfirmed && keepRemoteBrowser) {
-                    const replacementTargetId = await createChromePageTarget(port, logger, host);
-                    if (!replacementTargetId) {
-                        logger(`[browser] Remote Chrome page retention could not be verified after closing ${remoteTargetId}.`);
+            const closeConnection = async () => {
+                let preserveTarget = !shouldCloseOwnedRemoteTarget;
+                if (!preserveTarget && keepRemoteBrowser && client && remoteTargetId) {
+                    try {
+                        const { targetInfos } = await client.Target.getTargets();
+                        if (!targetInfos.some((target) => target.type === "page" && target.targetId !== remoteTargetId)) {
+                            const replacement = await client.Target.createTarget({ url: "about:blank" });
+                            if (!replacement.targetId)
+                                preserveTarget = true;
+                        }
+                    }
+                    catch {
+                        preserveTarget = true;
                     }
                 }
+                await closeRemoteConnectionAfterRun({
+                    connectionClosedUnexpectedly,
+                    connection,
+                    client,
+                    preserveTarget,
+                });
             };
             if (tabLease) {
                 const handle = tabLease;
                 tabLease = null;
-                await handle
-                    .release({ onRelease: async () => closeOwnedRemoteTarget() })
-                    .catch(() => undefined);
+                await handle.release({ onRelease: closeConnection }).catch(async () => {
+                    await closeRemoteConnectionAfterRun({
+                        connectionClosedUnexpectedly,
+                        connection,
+                        client,
+                        preserveTarget: true,
+                    }).catch(() => undefined);
+                });
             }
             else {
-                await closeOwnedRemoteTarget();
+                await closeConnection().catch(() => undefined);
             }
             // Don't kill remote Chrome - it's not ours to manage
             const totalSeconds = (Date.now() - startedAt) / 1000;

package/dist/src/browser/liveTabs.js

@@ -1,6 +1,6 @@
 import CDP from "chrome-remote-interface";
 import { createHash } from "node:crypto";
-import { ANSWER_SELECTORS, ASSISTANT_ROLE_SELECTOR, INPUT_SELECTORS, MODEL_BUTTON_SELECTOR, SEND_BUTTON_SELECTORS, STOP_BUTTON_SELECTOR, } from "./constants.js";
+import { ANSWER_SELECTORS, ASSISTANT_ROLE_SELECTOR, INPUT_SELECTORS, MODEL_BUTTON_SELECTOR, SEND_BUTTON_SELECTORS, STOP_BUTTON_SELECTORS, } from "./constants.js";
 import { captureAssistantMarkdown, readAssistantSnapshot } from "./actions/assistantResponse.js";
 import { buildConversationTurnListExpression } from "./conversationTurns.js";
 import { extractStableConversationIdFromUrl } from "./conversationUrl.js";
@@ -62,7 +62,7 @@ function buildTabInspectionExpression() {
     const answerSelectorsLiteral = JSON.stringify(ANSWER_SELECTORS);
     const assistantRoleLiteral = escapeLiteral(ASSISTANT_ROLE_SELECTOR);
     const modelButtonSelectorLiteral = escapeLiteral(MODEL_BUTTON_SELECTOR);
-    const stopSelectorLiteral = escapeLiteral(STOP_BUTTON_SELECTOR);
+    const stopSelectorLiteral = escapeLiteral(STOP_BUTTON_SELECTORS.join(","));
     return `(() => {
       const INPUT_SELECTORS = ${inputSelectorsLiteral};
       const SEND_SELECTORS = ${sendSelectorsLiteral};
@@ -91,8 +91,7 @@ function buildTabInspectionExpression() {
         const label = normalize(node.textContent || node.getAttribute('aria-label') || node.getAttribute('title'));
         return LOGIN_CTA.test(label);
       });
-      const stopButton = document.querySelector(STOP_BUTTON_SELECTOR);
-      const stopExists = Boolean(stopButton && isVisible(stopButton));
+      const stopExists = Array.from(document.querySelectorAll(STOP_BUTTON_SELECTOR)).some(isVisible);
       const sendButton = firstVisible(SEND_SELECTORS);
       const sendExists = Boolean(sendButton);
       const promptNode = firstVisible(INPUT_SELECTORS);

package/dist/src/browser/providers/chatgptDomProvider.js

@@ -27,6 +27,7 @@ async function submitPromptViaAdapter(ctx) {
         inputTimeoutMs: state.inputTimeoutMs ?? undefined,
         attachmentTimeoutMs: state.attachmentTimeoutMs ?? undefined,
         onPromptSubmitted: state.onPromptSubmitted,
+        webSearch: state.webSearch,
     }, ctx.prompt, state.logger);
     state.committedTurns =
         typeof committedTurns === "number" && Number.isFinite(committedTurns) ? committedTurns : null;

package/dist/src/browser/reattach.js

@@ -66,6 +66,19 @@ export async function resumeBrowserSession(runtime, config, logger, deps = {}) {
         closeAttachedConnection = () => connection.close();
         const client = connection.client;
         const { Runtime, DOM, Page } = client;
+        const captureIdentity = async () => {
+            const targetId = target?.targetId ?? target?.id;
+            if (!targetId || !port)
+                return undefined;
+            const { result } = await withTimeout(Runtime.evaluate({ expression: "location.href", returnByValue: true }), 2_000, "Recovery target identity unavailable");
+            return {
+                host,
+                port,
+                targetId,
+                browserWSEndpoint,
+                conversationId: extractConversationIdFromUrl(typeof result?.value === "string" ? result.value : ""),
+            };
+        };
         if (Runtime?.enable) {
             await Runtime.enable();
         }
@@ -117,10 +130,12 @@ export async function resumeBrowserSession(runtime, config, logger, deps = {}) {
             const researchResult = await withTimeout(waitForDeepResearch(Runtime, logger, timeoutMs, minTurnIndex ?? undefined, Page, client, {
                 requireScopedTargetOwner: true,
             }), timeoutMs + 5_000, "Reattach Deep Research response timed out");
+            const captureTarget = await captureIdentity().catch(() => undefined);
             await closeAttached();
             return {
                 answerText: researchResult.text,
                 answerMarkdown: researchResult.text,
+                captureTarget,
             };
         }
         const promptEcho = buildPromptEchoMatcher(deps.promptPreview);
@@ -128,8 +143,13 @@ export async function resumeBrowserSession(runtime, config, logger, deps = {}) {
         const recovered = await recoverPromptEcho(Runtime, answer, promptEcho, logger, minTurnIndex, timeoutMs);
         const markdown = (await withTimeout(captureMarkdown(Runtime, recovered.meta, logger), 15_000, "Reattach markdown capture timed out")) ?? recovered.text;
         const aligned = alignPromptEchoMarkdown(recovered.text, markdown, promptEcho, logger);
+        const captureTarget = await captureIdentity().catch(() => undefined);
         await closeAttached();
-        return { answerText: aligned.answerText, answerMarkdown: aligned.answerMarkdown };
+        return {
+            answerText: aligned.answerText,
+            answerMarkdown: aligned.answerMarkdown,
+            captureTarget,
+        };
     }
     catch (error) {
         await closeAttached();