@steipete/oracle 0.15.0 → 0.15.2

package/dist/src/browser/chatgptImages.js

@@ -1,7 +1,8 @@
 import fs from "node:fs/promises";
 import path from "node:path";
 import { randomUUID } from "node:crypto";
-import { ASSISTANT_ROLE_SELECTOR, CONVERSATION_TURN_SELECTOR } from "./constants.js";
+import { ASSISTANT_ROLE_SELECTOR } from "./constants.js";
+import { buildConversationTurnListExpression } from "./conversationTurns.js";
 import { delay } from "./utils.js";
 import { readAssistantSnapshot } from "./pageActions.js";
 import { getOracleHomeDir } from "../oracleHome.js";
@@ -61,11 +62,9 @@ function buildAssistantImageExpression(minTurnIndex) {
     const minTurnLiteral = typeof minTurnIndex === "number" && Number.isFinite(minTurnIndex) && minTurnIndex >= 0
         ? Math.floor(minTurnIndex)
         : -1;
-    const conversationLiteral = JSON.stringify(CONVERSATION_TURN_SELECTOR);
     const assistantLiteral = JSON.stringify(ASSISTANT_ROLE_SELECTOR);
     return `(() => {
     const MIN_TURN_INDEX = ${minTurnLiteral};
-    const CONVERSATION_SELECTOR = ${conversationLiteral};
     const ASSISTANT_SELECTOR = ${assistantLiteral};
     const isGeneratedImage = (img) => {
       const url = new URL(img?.src || '', location.origin || 'https://chatgpt.com');
@@ -101,7 +100,7 @@ function buildAssistantImageExpression(minTurnIndex) {
       if (testId.includes('assistant')) return true;
       return Boolean(node.querySelector(ASSISTANT_SELECTOR) || node.querySelector('[data-testid*="assistant"]'));
     };
-    const turns = Array.from(document.querySelectorAll(CONVERSATION_SELECTOR));
+    const turns = ${buildConversationTurnListExpression()};
     for (let index = turns.length - 1; index >= 0; index -= 1) {
       const turn = turns[index];
       if (!isAssistantTurn(turn)) continue;

package/dist/src/browser/chromeLifecycle.js

@@ -367,6 +367,7 @@ function createSessionBoundChromeClient(browser, sessionId) {
         Runtime: bindDomain("Runtime"),
         Input: bindDomain("Input"),
         DOM: bindDomain("DOM"),
+        Emulation: bindDomain("Emulation"),
         on: browserWithEvents.on.bind(browserWithEvents),
         once: browserWithEvents.once.bind(browserWithEvents),
         off: browserWithEvents.off?.bind(browserWithEvents) ??

package/dist/src/browser/constants.js

@@ -32,6 +32,7 @@ export const ANSWER_SELECTORS = [
 export const CONVERSATION_TURN_SELECTOR = 'article[data-testid^="conversation-turn"], div[data-testid^="conversation-turn"], section[data-testid^="conversation-turn"], ' +
     "article[data-message-author-role], div[data-message-author-role], section[data-message-author-role], " +
     "article[data-turn], div[data-turn], section[data-turn]";
+export const CONVERSATION_TURN_CONTAINER_SELECTOR = '[data-testid^="conversation-turn"]';
 export const ASSISTANT_ROLE_SELECTOR = '[data-message-author-role="assistant"], [data-turn="assistant"]';
 export const CLOUDFLARE_SCRIPT_SELECTOR = 'script[src*="/challenge-platform/"]';
 export const CLOUDFLARE_TITLE = "just a moment";
@@ -63,6 +64,11 @@ export const UPLOAD_STATUS_SELECTORS = [
     '[aria-live="assertive"]',
 ];
 export const STOP_BUTTON_SELECTOR = '[data-testid="stop-button"]';
+export const STOP_BUTTON_SELECTORS = [
+    STOP_BUTTON_SELECTOR,
+    '[data-testid="composer-stop-button"]',
+    'button[aria-label*="stop" i]',
+];
 export const SEND_BUTTON_SELECTORS = [
     'button[data-testid="send-button"]',
     'button[data-testid*="composer-send"]',

package/dist/src/browser/conversationTurns.js

@@ -0,0 +1,16 @@
+import { CONVERSATION_TURN_CONTAINER_SELECTOR, CONVERSATION_TURN_SELECTOR } from "./constants.js";
+/** Build a browser-context expression that returns one DOM node per conversation turn. */
+export function buildConversationTurnListExpression(rootExpression = "document") {
+    const containerSelector = JSON.stringify(CONVERSATION_TURN_CONTAINER_SELECTOR);
+    const fallbackSelector = JSON.stringify(CONVERSATION_TURN_SELECTOR);
+    return `(() => {
+    const root = ${rootExpression};
+    const containers = Array.from(root.querySelectorAll(${containerSelector}));
+    return containers.length > 0
+      ? containers
+      : Array.from(root.querySelectorAll(${fallbackSelector}));
+  })()`;
+}
+export function buildConversationTurnCountExpression(rootExpression = "document") {
+    return `(${buildConversationTurnListExpression(rootExpression)}).length`;
+}

package/dist/src/browser/conversationUrlMonitor.js

@@ -0,0 +1,64 @@
+import { delay } from "./utils.js";
+export function createConversationUrlMonitor(options) {
+    const pollIntervalMs = options.pollIntervalMs ?? 250;
+    const wait = options.wait ?? delay;
+    const now = options.now ?? Date.now;
+    let inFlight = null;
+    let stopped = false;
+    const activePersists = new Set();
+    const update = async (label, timeoutMs = 10_000) => {
+        const startedAt = now();
+        while (!stopped && now() - startedAt < timeoutMs) {
+            try {
+                const url = await options.readUrl();
+                if (stopped) {
+                    return false;
+                }
+                if (url && isConversationUrl(url)) {
+                    options.logger(`[browser] conversation url (${label}) = ${url}`);
+                    const persist = options.persistUrl(url);
+                    activePersists.add(persist);
+                    try {
+                        await persist;
+                    }
+                    finally {
+                        activePersists.delete(persist);
+                    }
+                    return true;
+                }
+            }
+            catch {
+                // The page can navigate or disconnect between polls; keep trying until timeout.
+            }
+            await wait(pollIntervalMs);
+        }
+        return false;
+    };
+    const schedule = (label, timeoutMs) => {
+        if (stopped) {
+            return Promise.resolve(false);
+        }
+        if (inFlight) {
+            return inFlight;
+        }
+        // The /c/ URL can appear after submit. Persist it without blocking response capture.
+        inFlight = update(label, timeoutMs)
+            .catch(() => false)
+            .finally(() => {
+            inFlight = null;
+        });
+        return inFlight;
+    };
+    return {
+        update,
+        schedule,
+        isInFlight: () => inFlight !== null,
+        stop: async () => {
+            stopped = true;
+            await Promise.allSettled(activePersists);
+        },
+    };
+}
+function isConversationUrl(url) {
+    return /\/c\/[a-z0-9-]+/i.test(url);
+}

package/dist/src/browser/cookies.js

@@ -3,6 +3,56 @@ import { delay } from "./utils.js";
 import { getCookies } from "@steipete/sweet-cookie";
 export class ChromeCookieSyncError extends Error {
 }
+export async function clearStaleChatGptConversationCookies(Network, Target, logger, options = {}) {
+    try {
+        const preservedNames = new Set((options.preserveConversationIds ?? [])
+            .filter((id) => Boolean(id))
+            .map((id) => `conv_key_${id}`));
+        try {
+            const { targetInfos = [] } = await Target.getTargets();
+            for (const target of targetInfos) {
+                const conversationId = extractChatGptConversationId(target.url ?? "");
+                if (conversationId) {
+                    preservedNames.add(`conv_key_${conversationId}`);
+                }
+            }
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            logger(`[cookies] Failed to inspect active ChatGPT conversations; skipping stale cookie cleanup: ${message}`);
+            return 0;
+        }
+        const { cookies = [] } = await Network.getAllCookies();
+        const targets = cookies.filter((cookie) => isChatGptConversationCookie(cookie) && !preservedNames.has(String(cookie.name ?? "")));
+        if (targets.length === 0) {
+            return 0;
+        }
+        let deleted = 0;
+        for (const cookie of targets) {
+            try {
+                await Network.deleteCookies({
+                    name: cookie.name,
+                    domain: cookie.domain,
+                    path: cookie.path ?? "/",
+                });
+                deleted += 1;
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : String(error);
+                logger(`[cookies] Failed to clear a stale ChatGPT conversation cookie: ${message}`);
+            }
+        }
+        if (deleted > 0) {
+            logger(`[cookies] Cleared ${deleted} stale ChatGPT conversation cookie${deleted === 1 ? "" : "s"}.`);
+        }
+        return deleted;
+    }
+    catch (error) {
+        const message = error instanceof Error ? error.message : String(error);
+        logger(`[cookies] Failed to inspect ChatGPT conversation cookies: ${message}`);
+        return 0;
+    }
+}
 export async function syncCookies(Network, url, profile, logger, options = {}) {
     const { allowErrors = false, filterNames, inlineCookies, cookiePath, waitMs = 0 } = options;
     try {
@@ -94,6 +144,28 @@ async function readChromeCookies(url, profile, filterNames, cookiePath) {
     }
     return Array.from(merged.values());
 }
+function isChatGptConversationCookie(cookie) {
+    if (!cookie.name?.startsWith("conv_key_")) {
+        return false;
+    }
+    const domain = String(cookie.domain ?? "")
+        .replace(/^\./, "")
+        .toLowerCase();
+    return domain === "chatgpt.com" || domain === "chat.openai.com";
+}
+function extractChatGptConversationId(url) {
+    try {
+        const parsed = new URL(url);
+        const domain = parsed.hostname.toLowerCase();
+        if (domain !== "chatgpt.com" && domain !== "chat.openai.com") {
+            return undefined;
+        }
+        return parsed.pathname.match(/\/c\/([a-zA-Z0-9-]+)/)?.[1];
+    }
+    catch {
+        return undefined;
+    }
+}
 function normalizeInlineCookies(rawCookies, fallbackHost) {
     const merged = new Map();
     for (const cookie of rawCookies) {

package/dist/src/browser/index.js

@@ -5,7 +5,7 @@ import net from "node:net";
 import { resolveBrowserConfig } from "./config.js";
 import { copyChromeProfile } from "./profileCopy.js";
 import { launchChrome, registerTerminationHooks, hideChromeWindow, connectToRemoteChrome, connectWithNewTab, closeTab, closeRemoteChromeTarget, closeBlankChromeTabs, } from "./chromeLifecycle.js";
-import { syncCookies } from "./cookies.js";
+import { clearStaleChatGptConversationCookies, syncCookies } from "./cookies.js";
 import { navigateToChatGPT, navigateToPromptReadyWithFallback, ensureNotBlocked, ensureLoggedIn, ensurePromptReady, waitForResumedConversationHydration, installJavaScriptDialogAutoDismissal, ensureModelSelection, clearPromptComposer, waitForAssistantResponse, captureAssistantMarkdown, clearComposerAttachments, uploadAttachmentFile, waitForAttachmentCompletion, waitForUserTurnAttachments, readAssistantSnapshot, } from "./pageActions.js";
 import { INPUT_SELECTORS } from "./constants.js";
 import { uploadAttachmentViaDataTransfer } from "./actions/remoteFileTransfer.js";
@@ -14,9 +14,10 @@ import { startThinkingStatusMonitor } from "./actions/thinkingStatus.js";
 import { activateDeepResearch, captureDeepResearchTargetKeys, waitForDeepResearchCompletion, waitForResearchPlanAutoConfirm, } from "./actions/deepResearch.js";
 import { estimateTokenCount, withRetries, delay } from "./utils.js";
 import { formatElapsed } from "../oracle/format.js";
-import { CHATGPT_URL, CONVERSATION_TURN_SELECTOR, DEFAULT_MODEL_STRATEGY } from "./constants.js";
+import { CHATGPT_URL, DEFAULT_MODEL_STRATEGY } from "./constants.js";
 import { BrowserAutomationError } from "../oracle/errors.js";
 import { alignPromptEchoPair, buildPromptEchoMatcher } from "./reattachHelpers.js";
+import { buildConversationTurnCountExpression } from "./conversationTurns.js";
 import { cleanupStaleProfileState, acquireProfileRunLock, findRunningChromeDebugTargetForProfile, readChromePid, readDevToolsPort, shouldCleanupManualLoginProfileState, terminateRecordedChromeForProfile, verifyDevToolsReachable, writeChromePid, writeDevToolsActivePort, } from "./profileState.js";
 import { acquireBrowserTabLease, hasOtherActiveBrowserTabLeases, } from "./tabLeaseRegistry.js";
 import { appendArtifacts, saveBrowserTranscriptArtifact, saveDeepResearchReportArtifact, } from "./artifacts.js";
@@ -30,6 +31,7 @@ import { captureBrowserDiagnostics } from "./domDebug.js";
 import { archiveChatGptConversation, resolveBrowserArchiveDecision, } from "./actions/archiveConversation.js";
 import { assertManualLoginProfileReadyForRun, defaultManualLoginProfileDir, formatManualLoginSetupCommand, isManualLoginProfileInitialized, resolveManualLoginWaitMs, } from "./manualLoginProfile.js";
 import { describeBrowserControlPlan, formatBrowserControlPlan } from "./controlPlan.js";
+import { createConversationUrlMonitor, } from "./conversationUrlMonitor.js";
 export { CHATGPT_URL, DEFAULT_MODEL_STRATEGY, DEFAULT_MODEL_TARGET } from "./constants.js";
 export { parseDuration, delay, normalizeChatgptUrl, isTemporaryChatUrl } from "./utils.js";
 export { formatThinkingLog, formatThinkingWaitingLog, buildThinkingStatusExpressionForTest, readThinkingStatusForTest, sanitizeThinkingText, startThinkingStatusMonitorForTest, } from "./actions/thinkingStatus.js";
@@ -558,7 +560,9 @@ export async function runBrowserMode(options) {
     let lastTargetId;
     let lastUrl;
     let promptSubmitted = false;
+    let modelSelectionEvidence;
     let tabLease = null;
+    let conversationUrlMonitor = null;
     const emitRuntimeHint = async () => {
         if (!chrome?.port) {
             return;
@@ -576,7 +580,7 @@ export async function runBrowserMode(options) {
             controllerPid: process.pid,
         };
         try {
-            await runtimeHintCb?.(hint);
+            await runtimeHintCb?.(hint, modelSelectionEvidence);
             await tabLease?.update({
                 chromeHost,
                 chromePort: chrome.port,
@@ -595,6 +599,7 @@ export async function runBrowserMode(options) {
         }
         promptSubmitted = true;
         await emitRuntimeHint();
+        void conversationUrlMonitor?.schedule("post-submit", config.timeoutMs ?? 120_000);
     };
     if (config.debug || process.env.CHATGPT_DEVTOOLS_TRACE === "1") {
         logger(`[browser-mode] config: ${JSON.stringify({
@@ -722,7 +727,6 @@ export async function runBrowserMode(options) {
     let answerMarkdown = "";
     let answerHtml = "";
     let runStatus = "attempted";
-    let modelSelectionEvidence;
     let connectionClosedUnexpectedly = false;
     let stopThinkingMonitor = null;
     let removeDialogHandler = null;
@@ -746,7 +750,7 @@ export async function runBrowserMode(options) {
             else {
                 const strictTabIsolation = Boolean(manualLogin && reusedChrome);
                 const devtoolsRetries = manualLogin ? 6 : 0;
-                const connection = await connectWithNewTab(chrome.port, logger, config.url, chromeHost, {
+                const connection = await connectWithNewTab(chrome.port, logger, "about:blank", chromeHost, {
                     fallbackToDefault: !strictTabIsolation,
                     retries: devtoolsRetries,
                     retryDelayMs: 500,
@@ -778,7 +782,7 @@ export async function runBrowserMode(options) {
             });
         });
         const raceWithDisconnect = (promise) => Promise.race([promise, disconnectPromise]);
-        const { Network, Page, Runtime, Input, DOM } = client;
+        const { Network, Page, Runtime, Input, DOM, Target } = client;
         if (!config.headless && config.hideWindow) {
             await hideChromeWindow(chrome, logger);
         }
@@ -828,6 +832,12 @@ export async function runBrowserMode(options) {
                 ? "Skipping Chrome cookie sync (--browser-manual-login enabled); reuse the opened profile after signing in."
                 : "Skipping Chrome cookie sync (--browser-no-cookie-sync)");
         }
+        await clearStaleChatGptConversationCookies(Network, Target, logger, {
+            preserveConversationIds: [
+                extractConversationIdFromUrl(config.resumeConversationUrl ?? ""),
+                extractConversationIdFromUrl(lastUrl ?? ""),
+            ],
+        });
         if (cookieSyncEnabled && !manualLogin && (appliedCookies ?? 0) === 0 && !config.inlineCookies) {
             // Learned: if the profile has no ChatGPT cookies, browser mode will just bounce to login.
             // Fail early so the user knows to sign in.
@@ -939,44 +949,22 @@ export async function runBrowserMode(options) {
                 await emitRuntimeHint();
             }
         };
-        let conversationHintInFlight = null;
-        const updateConversationHint = async (label, timeoutMs = 10_000) => {
-            if (!chrome?.port) {
-                return false;
-            }
-            const start = Date.now();
-            while (Date.now() - start < timeoutMs) {
-                try {
-                    const { result } = await Runtime.evaluate({
-                        expression: "location.href",
-                        returnByValue: true,
-                    });
-                    if (typeof result?.value === "string" && result.value.includes("/c/")) {
-                        lastUrl = result.value;
-                        logger(`[browser] conversation url (${label}) = ${lastUrl}`);
-                        await emitRuntimeHint();
-                        return true;
-                    }
-                }
-                catch {
-                    // ignore; keep polling until timeout
-                }
-                await delay(250);
-            }
-            return false;
-        };
-        const scheduleConversationHint = (label, timeoutMs) => {
-            if (conversationHintInFlight) {
-                return;
-            }
-            // Learned: the /c/ URL can update after the answer; emit hints in the background.
-            // Run in the background so prompt submission/streaming isn't blocked by slow URL updates.
-            conversationHintInFlight = updateConversationHint(label, timeoutMs)
-                .catch(() => false)
-                .finally(() => {
-                conversationHintInFlight = null;
-            });
-        };
+        const activeConversationUrlMonitor = createConversationUrlMonitor({
+            readUrl: async () => {
+                const { result } = await Runtime.evaluate({
+                    expression: "location.href",
+                    returnByValue: true,
+                });
+                return typeof result?.value === "string" ? result.value : null;
+            },
+            persistUrl: async (url) => {
+                lastUrl = url;
+                await emitRuntimeHint();
+            },
+            logger,
+        });
+        conversationUrlMonitor = activeConversationUrlMonitor;
+        const updateConversationHint = conversationUrlMonitor.update;
         await captureRuntimeSnapshot();
         const modelStrategy = config.modelStrategy ?? DEFAULT_MODEL_STRATEGY;
         if (config.desiredModel && modelStrategy !== "ignore" && !isResumingConversation) {
@@ -1019,19 +1007,6 @@ export async function runBrowserMode(options) {
                 },
             }));
         }
-        if (deepResearch) {
-            await raceWithDisconnect(withRetries(() => activateDeepResearch(Runtime, Input, logger), {
-                retries: 2,
-                delayMs: 500,
-                onRetry: (attempt, error) => {
-                    if (options.verbose) {
-                        logger(`[retry] Deep Research activation attempt ${attempt + 1}: ${error instanceof Error ? error.message : error}`);
-                    }
-                },
-            }));
-            await raceWithDisconnect(ensurePromptReady(Runtime, config.inputTimeoutMs, logger));
-            logger(`Prompt textarea ready (after Deep Research activation, ${promptText.length.toLocaleString()} chars queued)`);
-        }
         const profileLockTimeoutMs = manualLogin ? (config.profileLockTimeoutMs ?? 0) : 0;
         let profileLock = null;
         const acquireProfileLockIfNeeded = async () => {
@@ -1082,6 +1057,19 @@ export async function runBrowserMode(options) {
                 await waitForAttachmentCompletion(Runtime, attachmentWaitBudget, attachmentNames, logger);
                 logger("All attachments uploaded");
             }
+            if (deepResearch) {
+                await raceWithDisconnect(withRetries(() => activateDeepResearch(Runtime, Input, logger), {
+                    retries: 2,
+                    delayMs: 500,
+                    onRetry: (attempt, error) => {
+                        if (options.verbose) {
+                            logger(`[retry] Deep Research activation attempt ${attempt + 1}: ${error instanceof Error ? error.message : error}`);
+                        }
+                    },
+                }));
+                await raceWithDisconnect(ensurePromptReady(Runtime, config.inputTimeoutMs, logger));
+                logger(`Prompt textarea ready (after Deep Research activation, ${prompt.length.toLocaleString()} chars queued)`);
+            }
             let baselineTurns = await readConversationTurnCount(Runtime, logger);
             // Learned: return baselineTurns so assistant polling can ignore earlier content.
             const providerState = {
@@ -1128,8 +1116,6 @@ export async function runBrowserMode(options) {
                     }
                 }
             }
-            // Reattach needs a /c/ URL; ChatGPT can update it late, so poll in the background.
-            scheduleConversationHint("post-submit", config.timeoutMs ?? 120_000);
             return {
                 baselineTurns,
                 baselineAssistantText,
@@ -1725,6 +1711,7 @@ export async function runBrowserMode(options) {
         }, normalizedError);
     }
     finally {
+        await conversationUrlMonitor?.stop();
         try {
             if (!connectionClosedUnexpectedly) {
                 await client?.close();
@@ -2083,8 +2070,10 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
     let tabLease = null;
     let lastUrl;
     let promptSubmitted = false;
+    let modelSelectionEvidence;
     let attachedExistingTab = false;
     let ownsTarget = true;
+    let conversationUrlMonitor = null;
     const runtimeHintCb = options.runtimeHintCb;
     const emitRuntimeHint = async () => {
         if (!runtimeHintCb)
@@ -2100,7 +2089,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                 conversationId: lastUrl ? extractConversationIdFromUrl(lastUrl) : undefined,
                 promptSubmitted,
                 controllerPid: process.pid,
-            });
+            }, modelSelectionEvidence);
             await tabLease?.update({
                 chromeHost: host,
                 chromePort: port,
@@ -2119,6 +2108,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
         }
         promptSubmitted = true;
         await emitRuntimeHint();
+        void conversationUrlMonitor?.schedule("post-submit", config.timeoutMs ?? 120_000);
     };
     const startedAt = Date.now();
     let answerText = "";
@@ -2126,7 +2116,6 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
     let answerHtml = "";
     let connectionClosedUnexpectedly = false;
     let runStatus = "attempted";
-    let modelSelectionEvidence;
     let stopThinkingMonitor = null;
     let removeDialogHandler = null;
     let connection = null;
@@ -2161,7 +2150,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
             logger(`Attached to existing remote ChatGPT tab ${attached.targetId}${attached.tab.url ? ` (${attached.tab.url})` : ""}`);
         }
         else {
-            connection = await connectToRemoteChrome(host, port, logger, config.url, browserWSEndpoint, {
+            connection = await connectToRemoteChrome(host, port, logger, "about:blank", browserWSEndpoint, {
                 approvalWaitMs: config.attachRunning && browserWSEndpoint ? 20_000 : undefined,
             });
             client = connection.client;
@@ -2180,15 +2169,44 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
             connectionClosedUnexpectedly = true;
         };
         client.on("disconnect", markConnectionLost);
-        const { Network, Page, Runtime, Input, DOM } = client;
+        const { Network, Page, Runtime, Input, DOM, Target } = client;
         const domainEnablers = [Network.enable({}), Page.enable(), Runtime.enable()];
         if (DOM && typeof DOM.enable === "function") {
             domainEnablers.push(DOM.enable());
         }
         await Promise.all(domainEnablers);
         removeDialogHandler = installJavaScriptDialogAutoDismissal(Page, logger);
+        try {
+            await client.Emulation.setFocusEmulationEnabled({ enabled: true });
+            logger("[browser] Focus emulation enabled for remote target");
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            logger(`[browser] Focus emulation unavailable: ${message}`);
+        }
+        const activeConversationUrlMonitor = createConversationUrlMonitor({
+            readUrl: async () => {
+                const { result } = await Runtime.evaluate({
+                    expression: "location.href",
+                    returnByValue: true,
+                });
+                return typeof result?.value === "string" ? result.value : null;
+            },
+            persistUrl: async (url) => {
+                lastUrl = url;
+                await emitRuntimeHint();
+            },
+            logger,
+        });
+        conversationUrlMonitor = activeConversationUrlMonitor;
         // Skip cookie sync for remote Chrome - it already has cookies
         logger("Skipping cookie sync for remote Chrome (using existing session)");
+        await clearStaleChatGptConversationCookies(Network, Target, logger, {
+            preserveConversationIds: [
+                extractConversationIdFromUrl(config.resumeConversationUrl ?? ""),
+                extractConversationIdFromUrl(lastUrl ?? ""),
+            ],
+        });
         if (config.resumeConversationUrl) {
             await navigateToChatGPT(Page, Runtime, config.resumeConversationUrl, logger);
         }
@@ -2253,19 +2271,6 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                 },
             });
         }
-        if (deepResearch) {
-            await withRetries(() => activateDeepResearch(Runtime, Input, logger), {
-                retries: 2,
-                delayMs: 500,
-                onRetry: (attempt, error) => {
-                    if (options.verbose) {
-                        logger(`[retry] Deep Research activation attempt ${attempt + 1}: ${error instanceof Error ? error.message : error}`);
-                    }
-                },
-            });
-            await ensurePromptReady(Runtime, config.inputTimeoutMs, logger);
-            logger(`Prompt textarea ready (after Deep Research activation, ${promptText.length.toLocaleString()} chars queued)`);
-        }
         const submitOnce = async (prompt, submissionAttachments) => {
             const baselineSnapshot = await readAssistantSnapshot(Runtime).catch(() => null);
             const baselineAssistantText = typeof baselineSnapshot?.text === "string" ? baselineSnapshot.text.trim() : "";
@@ -2295,6 +2300,19 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                 await waitForAttachmentCompletion(Runtime, attachmentWaitBudget, attachmentNames, logger);
                 logger("All attachments uploaded");
             }
+            if (deepResearch) {
+                await withRetries(() => activateDeepResearch(Runtime, Input, logger), {
+                    retries: 2,
+                    delayMs: 500,
+                    onRetry: (attempt, error) => {
+                        if (options.verbose) {
+                            logger(`[retry] Deep Research activation attempt ${attempt + 1}: ${error instanceof Error ? error.message : error}`);
+                        }
+                    },
+                });
+                await ensurePromptReady(Runtime, config.inputTimeoutMs, logger);
+                logger(`Prompt textarea ready (after Deep Research activation, ${prompt.length.toLocaleString()} chars queued)`);
+            }
             let baselineTurns = await readConversationTurnCount(Runtime, logger);
             const providerState = {
                 runtime: Runtime,
@@ -2361,7 +2379,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                 ignoredTargetKeys: deepResearchTargetKeys,
                 targetBaselineCaptured: deepResearchTargetBaselineCaptured,
             });
-            await emitRuntimeHint();
+            await activeConversationUrlMonitor.update("post-deep-research", 15_000).catch(() => false);
             const durationMs = Date.now() - startedAt;
             const tokens = estimateTokenCount(researchResult.text);
             const reportArtifact = await saveOptionalArtifact(() => saveDeepResearchReportArtifact({
@@ -2512,11 +2530,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
         const captureAssistantTurn = async (turnPrompt, label) => {
             let turnAnswer;
             try {
-                const conversationUrl = await readConversationUrl(Runtime).catch(() => null);
-                if (conversationUrl && isConversationUrl(conversationUrl)) {
-                    lastUrl = conversationUrl;
-                    await emitRuntimeHint();
-                }
+                await activeConversationUrlMonitor.update("assistant-wait", 15_000).catch(() => false);
                 turnAnswer = await waitWithThinkingMonitor(() => waitForAssistantOrGeneratedImageResponse({
                     Runtime,
                     waitForText: () => waitForAssistantResponseWithReload(Runtime, Page, config.timeoutMs, logger, baselineTurns ?? undefined, expectedConversationId()),
@@ -2534,16 +2548,9 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                         turnAnswer = rechecked;
                     }
                     else {
-                        try {
-                            const conversationUrl = await readConversationUrl(Runtime);
-                            if (conversationUrl) {
-                                lastUrl = conversationUrl;
-                            }
-                        }
-                        catch {
-                            // ignore
-                        }
-                        await emitRuntimeHint();
+                        await activeConversationUrlMonitor
+                            .update("assistant-timeout", 15_000)
+                            .catch(() => false);
                         const diagnostics = await captureBrowserDiagnostics(Runtime, logger, "assistant-timeout", {
                             Page,
                             sessionId: options.sessionId,
@@ -2572,6 +2579,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                     throw error;
                 }
             }
+            await activeConversationUrlMonitor.update("post-response", 15_000).catch(() => false);
             const baselineNormalized = baselineAssistantText
                 ? normalizeForComparison(baselineAssistantText)
                 : "";
@@ -2836,6 +2844,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
         });
     }
     finally {
+        await conversationUrlMonitor?.stop();
         try {
             await closeRemoteConnectionAfterRun({
                 connectionClosedUnexpectedly,
@@ -3053,12 +3062,12 @@ function buildSessionValidationExpression() {
   })()`;
 }
 async function readConversationTurnCount(Runtime, logger) {
-    const selectorLiteral = JSON.stringify(CONVERSATION_TURN_SELECTOR);
+    const expression = buildConversationTurnCountExpression();
     const attempts = 4;
     for (let attempt = 0; attempt < attempts; attempt += 1) {
         try {
             const { result } = await Runtime.evaluate({
-                expression: `document.querySelectorAll(${selectorLiteral}).length`,
+                expression,
                 returnByValue: true,
             });
             const raw = typeof result?.value === "number" ? result.value : Number(result?.value);

package/dist/src/browser/projectSourcesRunner.js

@@ -3,7 +3,7 @@ import os from "node:os";
 import path from "node:path";
 import { closeTab, connectWithNewTab, hideChromeWindow, launchChrome, registerTerminationHooks, } from "./chromeLifecycle.js";
 import { resolveBrowserConfig } from "./config.js";
-import { syncCookies } from "./cookies.js";
+import { clearStaleChatGptConversationCookies, syncCookies } from "./cookies.js";
 import { installJavaScriptDialogAutoDismissal, navigateToChatGPT, ensureLoggedIn, } from "./pageActions.js";
 import { acquireBrowserTabLease, hasOtherActiveBrowserTabLeases, } from "./tabLeaseRegistry.js";
 import { acquireProfileRunLock, cleanupStaleProfileState, findRunningChromeDebugTargetForProfile, readChromePid, readDevToolsPort, shouldCleanupManualLoginProfileState, verifyDevToolsReachable, writeChromePid, writeDevToolsActivePort, } from "./profileState.js";
@@ -120,7 +120,7 @@ export async function runBrowserProjectSources(request) {
             });
         });
         const raceWithDisconnect = (promise) => Promise.race([promise, disconnectPromise]);
-        const { Network, Page, Runtime, Input, DOM } = client;
+        const { Network, Page, Runtime, Input, DOM, Target } = client;
         if (!config.headless && config.hideWindow) {
             await hideChromeWindow(chrome, logger);
         }
@@ -139,6 +139,7 @@ export async function runBrowserProjectSources(request) {
             manualLogin,
             logger,
         });
+        await clearStaleChatGptConversationCookies(Network, Target, logger);
         await raceWithDisconnect(navigateToChatGPT(Page, Runtime, CHATGPT_URL, logger));
         await raceWithDisconnect(waitForProjectSourcesLogin({
             runtime: Runtime,