@steipete/oracle 0.15.1 → 0.15.2

package/dist/scripts/test-browser.js

@@ -58,9 +58,9 @@ function firewallHint(host, devtoolsPort) {
         "Re-run ./runner pnpm test:browser after adding the rule.",
     ].join("\n");
 }
-async function fetchVersion(host, devtoolsPort) {
+async function fetchVersion(host, devtoolsPort, timeoutMs = 5000) {
     const controller = new AbortController();
-    const timer = setTimeout(() => controller.abort(), 5000);
+    const timer = setTimeout(() => controller.abort(), timeoutMs);
     try {
         const res = await fetch(`http://${host}:${devtoolsPort}/json/version`, {
             signal: controller.signal,
@@ -77,6 +77,16 @@ async function fetchVersion(host, devtoolsPort) {
         clearTimeout(timer);
     }
 }
+async function waitForDevToolsShutdown(host, devtoolsPort) {
+    const deadline = Date.now() + 5000;
+    while (Date.now() < deadline) {
+        if (!(await fetchVersion(host, devtoolsPort, 250))) {
+            return;
+        }
+        await sleep(100);
+    }
+    throw new Error(`DevTools did not stop listening at ${host}:${devtoolsPort}`);
+}
 async function main() {
     console.log(`[browser-test] launching Chrome on ${targetHost}:${port} (headful)…`);
     const chrome = await launch({
@@ -89,6 +99,7 @@ async function main() {
         ok = await fetchVersion(targetHost, chrome.port);
     }
     await chrome.kill();
+    await waitForDevToolsShutdown(targetHost, chrome.port);
     if (ok) {
         console.log(`[browser-test] PASS: DevTools responding on ${targetHost}:${chrome.port}`);
         process.exit(0);

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

@@ -1,9 +1,20 @@
 import { ANSWER_SELECTORS, ASSISTANT_ROLE_SELECTOR, CONVERSATION_TURN_SELECTOR, COPY_BUTTON_SELECTOR, FINISHED_ACTIONS_SELECTOR, STOP_BUTTON_SELECTORS, } from "../constants.js";
+import { buildConversationTurnListExpression } from "../conversationTurns.js";
 import { delay } from "../utils.js";
 import { logDomFailure, logConversationSnapshot, buildConversationDebugExpression, } from "../domDebug.js";
 import { buildClickDispatcher } from "./domEvents.js";
 const ASSISTANT_POLL_TIMEOUT_ERROR = "assistant-response-watchdog-timeout";
 const STOP_CONTROL_SELECTOR = STOP_BUTTON_SELECTORS.join(", ");
+const MIN_CONFIDENT_ANSWER_LENGTH = 16;
+function isImplausiblyShortAnswer(candidateLength) {
+    return candidateLength > 0 && candidateLength < MIN_CONFIDENT_ANSWER_LENGTH;
+}
+export function shouldConfirmAssistantCompletion(args) {
+    if (args.stopVisible || args.completionVisible) {
+        return true;
+    }
+    return isImplausiblyShortAnswer(args.candidateLength);
+}
 const THINKING_STATUS_LABELS = [
     "thinking",
     "pro thinking",
@@ -109,7 +120,9 @@ export async function waitForAssistantResponse(Runtime, timeoutMs, logger, minTu
             if (source === "poll" &&
                 error instanceof Error &&
                 error.message === ASSISTANT_POLL_TIMEOUT_ERROR) {
-                evaluation = await evaluationPromise;
+                evaluationPromise.catch(() => undefined);
+                await terminateRuntimeExecution(Runtime);
+                throw error;
             }
             else if (source === "poll") {
                 throw error;
@@ -162,6 +175,8 @@ export async function waitForAssistantResponse(Runtime, timeoutMs, logger, minTu
     // The evaluation path can race ahead of completion. If ChatGPT is still streaming, wait for the watchdog poller.
     const elapsedMs = Date.now() - start;
     const remainingMs = Math.max(0, timeoutMs - elapsedMs);
+    const candidateText = String(candidate?.text ?? "").trim();
+    const suspiciouslyShort = isImplausiblyShortAnswer(candidateText.length);
     if (remainingMs > 0) {
         const [stopVisible, completionVisible] = await Promise.all([
             isStopButtonVisible(Runtime),
@@ -170,17 +185,25 @@ export async function waitForAssistantResponse(Runtime, timeoutMs, logger, minTu
         // Completion controls can appear briefly while Pro is still replacing its thinking UI.
         // Confirm every capture from that transition with the stability-based watchdog; a
         // partial first paragraph can be arbitrarily long.
-        const candidateText = String(candidate?.text ?? "").trim();
-        if (stopVisible || completionVisible) {
+        if (shouldConfirmAssistantCompletion({
+            candidateLength: candidateText.length,
+            stopVisible,
+            completionVisible,
+        })) {
             logger(stopVisible
                 ? "Assistant still generating; waiting for completion"
-                : "Completion controls surfaced; confirming stable assistant response");
+                : completionVisible
+                    ? "Completion controls surfaced; confirming stable assistant response"
+                    : "Captured an implausibly short response; confirming it is not a mid-stream capture");
             const completed = await pollAssistantCompletion(Runtime, remainingMs, minTurnIndex, expectedConversationId);
             if (completed && String(completed.text ?? "").trim().length >= candidateText.length) {
                 return completed;
             }
         }
     }
+    if (suspiciouslyShort) {
+        throw new Error("assistant-response short capture could not be confirmed before timeout; refusing to finalize it");
+    }
     return candidate;
 }
 export async function readAssistantSnapshot(Runtime, minTurnIndex, expectedConversationId) {
@@ -243,11 +266,17 @@ async function recoverAssistantResponse(Runtime, timeoutMs, logger, minTurnIndex
     if (recoveryTimeoutMs === 0) {
         return null;
     }
+    const recoveryStartedAt = Date.now();
     const recovered = await waitForCondition(async () => {
         const snapshot = await readAssistantSnapshot(Runtime, minTurnIndex, expectedConversationId);
         return normalizeAssistantSnapshot(snapshot);
     }, recoveryTimeoutMs, 400);
     if (recovered) {
+        if (isImplausiblyShortAnswer(recovered.text.length)) {
+            logger("Recovered an implausibly short response; waiting for completion proof");
+            const remainingMs = Math.max(0, recoveryTimeoutMs - (Date.now() - recoveryStartedAt));
+            return pollAssistantCompletion(Runtime, remainingMs, minTurnIndex, expectedConversationId);
+        }
         logger("Recovered assistant response via polling fallback");
         return recovered;
     }
@@ -364,8 +393,8 @@ async function pollAssistantCompletion(Runtime, timeoutMs, minTurnIndex, expecte
             if (isGeneratedImageAssistantAnswer(normalized)) {
                 return normalized;
             }
-            const shortAnswer = currentLength > 0 && currentLength < 16;
-            const mediumAnswer = currentLength >= 16 && currentLength < 40;
+            const shortAnswer = isImplausiblyShortAnswer(currentLength);
+            const mediumAnswer = currentLength >= MIN_CONFIDENT_ANSWER_LENGTH && currentLength < 40;
             const longAnswer = currentLength >= 40 && currentLength < 500;
             // Learned: short answers need a longer stability window or they truncate.
             // Learned: long streaming responses (esp. thinking models) can pause mid-stream;
@@ -378,7 +407,7 @@ async function pollAssistantCompletion(Runtime, timeoutMs, minTurnIndex, expecte
             if (!stopVisible) {
                 const stableEnough = stableCycles >= requiredStableCycles && stableMs >= minStableMs;
                 const completionEnough = completionVisible && stableCycles >= completionStableTarget && stableMs >= minStableMs;
-                if (completionEnough || stableEnough) {
+                if (completionEnough || (!shortAnswer && stableEnough)) {
                     return normalized;
                 }
             }
@@ -445,7 +474,7 @@ async function isCompletionVisible(Runtime) {
           return Boolean(node.querySelector(ASSISTANT_SELECTOR) || node.querySelector('[data-testid*="assistant"]'));
         };
 
-        const turns = Array.from(document.querySelectorAll('${CONVERSATION_TURN_SELECTOR}'));
+        const turns = ${buildConversationTurnListExpression()};
         let lastAssistantTurn = null;
         for (let i = turns.length - 1; i >= 0; i--) {
           if (isAssistantTurn(turns[i])) {
@@ -557,7 +586,6 @@ function buildAssistantSnapshotExpression(minTurnIndex, expectedConversationId)
 }
 function buildResponseObserverExpression(timeoutMs, minTurnIndex, expectedConversationId) {
     const selectorsLiteral = JSON.stringify(ANSWER_SELECTORS);
-    const conversationLiteral = JSON.stringify(CONVERSATION_TURN_SELECTOR);
     const assistantLiteral = JSON.stringify(ASSISTANT_ROLE_SELECTOR);
     const minTurnLiteral = typeof minTurnIndex === "number" && Number.isFinite(minTurnIndex) && minTurnIndex >= 0
         ? Math.floor(minTurnIndex)
@@ -570,7 +598,6 @@ function buildResponseObserverExpression(timeoutMs, minTurnIndex, expectedConver
     const SELECTORS = ${selectorsLiteral};
     const STOP_SELECTOR = ${JSON.stringify(STOP_CONTROL_SELECTOR)};
     const FINISHED_SELECTOR = '${FINISHED_ACTIONS_SELECTOR}';
-    const CONVERSATION_SELECTOR = ${conversationLiteral};
     const ASSISTANT_SELECTOR = ${assistantLiteral};
     const EXPECTED_CONVERSATION_ID = ${expectedConversationLiteral};
     // Learned: settling avoids capturing mid-stream HTML; keep short.
@@ -693,7 +720,7 @@ function buildResponseObserverExpression(timeoutMs, minTurnIndex, expectedConver
 
     // Check if the last assistant turn has finished (scoped to avoid detecting old turns).
     const isLastAssistantTurnFinished = () => {
-      const turns = Array.from(document.querySelectorAll(CONVERSATION_SELECTOR));
+      const turns = ${buildConversationTurnListExpression()};
       let lastAssistantTurn = null;
       for (let i = turns.length - 1; i >= 0; i--) {
         if (isAssistantTurn(turns[i])) {
@@ -717,8 +744,8 @@ function buildResponseObserverExpression(timeoutMs, minTurnIndex, expectedConver
       // Learned: long streaming responses (esp. thinking models) can pause mid-stream;
       // use progressively longer windows to avoid truncation (#71).
       const initialLength = snapshot?.text?.length ?? 0;
-      const shortAnswer = initialLength > 0 && initialLength < 16;
-      const mediumAnswer = initialLength >= 16 && initialLength < 40;
+      const shortAnswer = initialLength > 0 && initialLength < ${MIN_CONFIDENT_ANSWER_LENGTH};
+      const mediumAnswer = initialLength >= ${MIN_CONFIDENT_ANSWER_LENGTH} && initialLength < 40;
       const longAnswer = initialLength >= 40 && initialLength < 500;
       const settleWindowMs = shortAnswer ? 12_000 : mediumAnswer ? 5_000 : longAnswer ? 8_000 : 10_000;
       const settleIntervalMs = 400;
@@ -792,11 +819,9 @@ function buildResponseObserverExpression(timeoutMs, minTurnIndex, expectedConver
   })()`;
 }
 function buildAssistantExtractor(functionName) {
-    const conversationLiteral = JSON.stringify(CONVERSATION_TURN_SELECTOR);
     const assistantLiteral = JSON.stringify(ASSISTANT_ROLE_SELECTOR);
     return `const ${functionName} = () => {
     ${buildClickDispatcher()}
-    const CONVERSATION_SELECTOR = ${conversationLiteral};
     const ASSISTANT_SELECTOR = ${assistantLiteral};
     const isAssistantTurn = (node) => {
       if (!(node instanceof HTMLElement)) return false;
@@ -832,7 +857,7 @@ function buildAssistantExtractor(functionName) {
       }
     };
 
-    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)) {
@@ -916,13 +941,10 @@ function buildMarkdownFallbackExtractor(minTurnLiteral) {
       }
     }
     if (!root) return null;
-    const CONVERSATION_SELECTOR = '${CONVERSATION_TURN_SELECTOR}';
-    const turnNodes = Array.from(document.querySelectorAll(CONVERSATION_SELECTOR));
+    const turnNodes = ${buildConversationTurnListExpression()};
     const hasTurns = turnNodes.length > 0;
     const resolveTurnIndex = (node) => {
-      const turn = node?.closest?.(CONVERSATION_SELECTOR);
-      if (!turn) return null;
-      const idx = turnNodes.indexOf(turn);
+      const idx = turnNodes.findIndex((turn) => turn === node || turn.contains?.(node));
       return idx >= 0 ? idx : null;
     };
     const isAfterMinTurn = (node) => {
@@ -1050,7 +1072,7 @@ function buildCopyExpression(meta) {
         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 i = turns.length - 1; i >= 0; i -= 1) {
         const turn = turns[i];
         if (!isAssistantTurn(turn)) continue;

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

@@ -1,5 +1,6 @@
 import path from "node:path";
-import { CONVERSATION_TURN_SELECTOR, INPUT_SELECTORS, SEND_BUTTON_SELECTORS, UPLOAD_STATUS_SELECTORS, } from "../constants.js";
+import { INPUT_SELECTORS, SEND_BUTTON_SELECTORS, UPLOAD_STATUS_SELECTORS } from "../constants.js";
+import { buildConversationTurnListExpression } from "../conversationTurns.js";
 import { delay } from "../utils.js";
 import { logDomFailure } from "../domDebug.js";
 import { transferAttachmentViaDataTransfer } from "./attachmentDataTransfer.js";
@@ -1594,14 +1595,12 @@ export async function waitForUserTurnAttachments(Runtime, expectedNames, timeout
     throw new Error("Attachment was not present on the sent user message.");
 }
 function buildUserTurnAttachmentExpression(options) {
-    const conversationSelectorLiteral = JSON.stringify(CONVERSATION_TURN_SELECTOR);
     const minTurnLiteral = options.minTurnIndex === null ? "null" : String(options.minTurnIndex);
     const expectedPromptLiteral = JSON.stringify(options.expectedPromptPrefix);
     const expectedConversationLiteral = options.expectedConversationId
         ? JSON.stringify(options.expectedConversationId)
         : "null";
     return `(() => {
-    const CONVERSATION_SELECTOR = ${conversationSelectorLiteral};
     const MIN_TURN_INDEX = ${minTurnLiteral};
     const EXPECTED_PROMPT_PREFIX = ${expectedPromptLiteral};
     const EXPECTED_CONVERSATION_ID = ${expectedConversationLiteral};
@@ -1614,7 +1613,7 @@ function buildUserTurnAttachmentExpression(options) {
     ) {
       return { ok: false, conversationMismatch: true };
     }
-    const turns = Array.from(document.querySelectorAll(CONVERSATION_SELECTOR));
+    const turns = ${buildConversationTurnListExpression()};
     const userTurns = turns.map((node, index) => ({ node, index })).filter(({ node }) => {
       const attr = (node.getAttribute('data-message-author-role') || node.getAttribute('data-turn') || node.dataset?.turn || '').toLowerCase();
       if (attr === 'user') return true;

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

@@ -1,4 +1,5 @@
-import { DEEP_RESEARCH_PLUS_BUTTON, DEEP_RESEARCH_DROPDOWN_ITEM_TEXT, DEEP_RESEARCH_PILL_LABEL, DEEP_RESEARCH_POLL_INTERVAL_MS, DEEP_RESEARCH_AUTO_CONFIRM_WAIT_MS, DEEP_RESEARCH_DEFAULT_TIMEOUT_MS, FINISHED_ACTIONS_SELECTOR, STOP_BUTTON_SELECTOR, CONVERSATION_TURN_SELECTOR, } from "../constants.js";
+import { DEEP_RESEARCH_PLUS_BUTTON, DEEP_RESEARCH_DROPDOWN_ITEM_TEXT, DEEP_RESEARCH_PILL_LABEL, DEEP_RESEARCH_POLL_INTERVAL_MS, DEEP_RESEARCH_AUTO_CONFIRM_WAIT_MS, DEEP_RESEARCH_DEFAULT_TIMEOUT_MS, FINISHED_ACTIONS_SELECTOR, STOP_BUTTON_SELECTOR, } from "../constants.js";
+import { buildConversationTurnListExpression } from "../conversationTurns.js";
 import { delay } from "../utils.js";
 import { isDeepResearchIncompleteText } from "../deepResearchResult.js";
 import { buildClickDispatcher } from "./domEvents.js";
@@ -480,9 +481,9 @@ async function readDeepResearchTargetOwnerTurnIndex(rawClient, frameId, pageSess
             .send("Runtime.callFunctionOn", {
             objectId,
             functionDeclaration: `function() {
-            const selector = ${JSON.stringify(CONVERSATION_TURN_SELECTOR)};
-            const turn = this.closest(selector);
-            return turn ? Array.from(document.querySelectorAll(selector)).indexOf(turn) : null;
+            const turns = ${buildConversationTurnListExpression()};
+            const index = turns.findIndex((turn) => turn === this || turn.contains?.(this));
+            return index >= 0 ? index : null;
           }`,
             returnByValue: true,
         }, pageSessionId)
@@ -703,7 +704,6 @@ function buildDeepResearchStatusExpression() {
 function buildDeepResearchCompletionPollExpression(minTurnIndex) {
     const finishedSelector = JSON.stringify(FINISHED_ACTIONS_SELECTOR);
     const stopSelector = JSON.stringify(STOP_BUTTON_SELECTOR);
-    const turnSelector = JSON.stringify(CONVERSATION_TURN_SELECTOR);
     return `(() => {
     const MIN_TURN_INDEX = ${minTurnIndex};
     const stopVisible = Boolean(document.querySelector(${stopSelector}));
@@ -719,7 +719,7 @@ function buildDeepResearchCompletionPollExpression(minTurnIndex) {
         String(node.getAttribute('data-testid') || '').toLowerCase().includes('conversation-turn') &&
           /chatgpt\\s+said/i.test(node.innerText || node.textContent || '');
     };
-    const conversationTurns = Array.from(document.querySelectorAll(${turnSelector}));
+    const conversationTurns = ${buildConversationTurnListExpression()};
     const allAssistantTurns = Array.from(document.querySelectorAll('[data-message-author-role="assistant"], [data-turn="assistant"]'));
     const scopedTurns = scopedToNewTurns
       ? conversationTurns.slice(MIN_TURN_INDEX).filter(isAssistantTurn)

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

@@ -1,4 +1,5 @@
-import { INPUT_SELECTORS, PROMPT_PRIMARY_SELECTOR, PROMPT_FALLBACK_SELECTOR, SEND_BUTTON_SELECTORS, CONVERSATION_TURN_SELECTOR, STOP_BUTTON_SELECTOR, ASSISTANT_ROLE_SELECTOR, } from "../constants.js";
+import { INPUT_SELECTORS, PROMPT_PRIMARY_SELECTOR, PROMPT_FALLBACK_SELECTOR, SEND_BUTTON_SELECTORS, STOP_BUTTON_SELECTOR, ASSISTANT_ROLE_SELECTOR, } from "../constants.js";
+import { buildConversationTurnCountExpression, buildConversationTurnListExpression, } from "../conversationTurns.js";
 import { delay } from "../utils.js";
 import { logDomFailure } from "../domDebug.js";
 import { buildClickDispatcher } from "./domEvents.js";
@@ -691,14 +692,13 @@ async function verifyPromptCommitted(Runtime, prompt, timeoutMs, logger, baselin
     const inputSelectorsLiteral = JSON.stringify(INPUT_SELECTORS);
     const stopSelectorLiteral = JSON.stringify(STOP_BUTTON_SELECTOR);
     const assistantSelectorLiteral = JSON.stringify(ASSISTANT_ROLE_SELECTOR);
-    const turnSelectorLiteral = JSON.stringify(CONVERSATION_TURN_SELECTOR);
     let baseline = typeof baselineTurns === "number" && Number.isFinite(baselineTurns) && baselineTurns >= 0
         ? Math.floor(baselineTurns)
         : null;
     if (baseline === null) {
         try {
             const { result } = await Runtime.evaluate({
-                expression: `document.querySelectorAll(${turnSelectorLiteral}).length`,
+                expression: buildConversationTurnCountExpression(),
                 returnByValue: true,
             });
             const raw = typeof result?.value === "number" ? result.value : Number(result?.value);
@@ -726,8 +726,7 @@ async function verifyPromptCommitted(Runtime, prompt, timeoutMs, logger, baselin
 	    };
 	    const normalizedPrompt = normalize(${encodedPrompt});
 	    const normalizedPromptPrefix = normalizedPrompt.slice(0, 120);
-	    const CONVERSATION_SELECTOR = ${JSON.stringify(CONVERSATION_TURN_SELECTOR)};
-	    const articles = Array.from(document.querySelectorAll(CONVERSATION_SELECTOR));
+	    const articles = ${buildConversationTurnListExpression()};
 	    const normalizedTurns = articles.map((node) => normalize(node?.innerText));
 	    const readValue = (node) => {
 	      if (!node) return '';

package/dist/src/browser/chatgptFiles.js

@@ -1,6 +1,7 @@
 import fs from "node:fs/promises";
 import path from "node:path";
-import { ASSISTANT_ROLE_SELECTOR, CONVERSATION_TURN_SELECTOR } from "./constants.js";
+import { ASSISTANT_ROLE_SELECTOR } from "./constants.js";
+import { buildConversationTurnListExpression } from "./conversationTurns.js";
 import { computeFileSha256, resolveSessionArtifactsDir, sanitizeArtifactFilename, validateArtifactFile, writeBinaryBrowserArtifact, } from "./artifacts.js";
 const CHATGPT_DOWNLOAD_BASE_URL = "https://chatgpt.com/";
 const DOWNLOAD_BUTTON_WAIT_MS = 15_000;
@@ -272,11 +273,9 @@ function buildAssistantDownloadableFilesExpression(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 isAssistantTurn = (node) => {
       if (!(node instanceof HTMLElement)) return false;
@@ -385,7 +384,7 @@ function buildAssistantDownloadableFilesExpression(minTurnIndex) {
       ].join(',')))
         .map(serializeCandidate)
         .filter(Boolean);
-    const turns = Array.from(document.querySelectorAll(CONVERSATION_SELECTOR));
+    const turns = ${buildConversationTurnListExpression()};
     const files = [];
     for (let index = turns.length - 1; index >= 0; index -= 1) {
       const turn = turns[index];
@@ -626,7 +625,6 @@ function buildClickAssistantDownloadButtonsExpression(minTurnIndex, expectedLabe
     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);
     const expectedLabelsLiteral = JSON.stringify(expectedLabels);
     const allowGenericDownloadLabelsLiteral = JSON.stringify(allowGenericDownloadLabels);
@@ -639,7 +637,6 @@ function buildClickAssistantDownloadButtonsExpression(minTurnIndex, expectedLabe
         : 0;
     return `(() => {
     const MIN_TURN_INDEX = ${minTurnLiteral};
-    const CONVERSATION_SELECTOR = ${conversationLiteral};
     const ASSISTANT_SELECTOR = ${assistantLiteral};
     const EXPECTED_LABELS = ${expectedLabelsLiteral};
     const ALLOW_GENERIC_DOWNLOAD_LABELS = ${allowGenericDownloadLabelsLiteral};
@@ -762,7 +759,7 @@ function buildClickAssistantDownloadButtonsExpression(minTurnIndex, expectedLabe
     const genericBehaviorButton = (info) =>
       ALLOW_GENERIC_DOWNLOAD_LABELS && info.className.includes('behavior-btn') && hasDownloadIntent(info);
     const genericFallbackButton = (info) => ALLOW_GENERIC_DOWNLOAD_LABELS && hasDownloadIntent(info);
-    const turns = Array.from(document.querySelectorAll(CONVERSATION_SELECTOR));
+    const turns = ${buildConversationTurnListExpression()};
     const expectedMatches = new Set();
     const genericBehaviorMatches = new Set();
     const genericFallbackMatches = new Set();

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";

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";
@@ -560,6 +562,7 @@ export async function runBrowserMode(options) {
     let promptSubmitted = false;
     let modelSelectionEvidence;
     let tabLease = null;
+    let conversationUrlMonitor = null;
     const emitRuntimeHint = async () => {
         if (!chrome?.port) {
             return;
@@ -596,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({
@@ -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) {
@@ -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();
@@ -2086,6 +2073,7 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
     let modelSelectionEvidence;
     let attachedExistingTab = false;
     let ownsTarget = true;
+    let conversationUrlMonitor = null;
     const runtimeHintCb = options.runtimeHintCb;
     const emitRuntimeHint = async () => {
         if (!runtimeHintCb)
@@ -2120,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 = "";
@@ -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);
         }
@@ -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,

package/dist/src/browser/reattach.js

@@ -5,8 +5,9 @@ import { mkdtemp, mkdir, rm } from "node:fs/promises";
 import { waitForAssistantResponse, captureAssistantMarkdown, navigateToChatGPT, ensureNotBlocked, ensureLoggedIn, ensurePromptReady, } from "./pageActions.js";
 import { launchChrome, connectToChrome, hideChromeWindow, connectToRemoteChromeTarget, listRemoteChromeTargets, } from "./chromeLifecycle.js";
 import { resolveBrowserConfig } from "./config.js";
-import { syncCookies } from "./cookies.js";
-import { CHATGPT_URL, CONVERSATION_TURN_SELECTOR } from "./constants.js";
+import { clearStaleChatGptConversationCookies, syncCookies } from "./cookies.js";
+import { CHATGPT_URL } from "./constants.js";
+import { buildConversationTurnListExpression } from "./conversationTurns.js";
 import { cleanupStaleProfileState } from "./profileState.js";
 import { readDevToolsActivePortInfo } from "./detect.js";
 import { pickTarget, extractConversationIdFromUrl, buildConversationUrl, withTimeout, openConversationFromSidebar, openConversationFromSidebarWithRetry, waitForLocationChange, readConversationTurnIndex, buildPromptEchoMatcher, recoverPromptEcho, alignPromptEchoMarkdown, } from "./reattachHelpers.js";
@@ -14,6 +15,12 @@ import { waitForDeepResearchCompletion } from "./actions/deepResearch.js";
 export async function resumeBrowserSession(runtime, config, logger, deps = {}) {
     const recoverSession = deps.recoverSession ??
         (async (runtimeMeta, configMeta) => resumeBrowserSessionViaNewChrome(runtimeMeta, configMeta, logger, deps));
+    let closeAttachedConnection = null;
+    const closeAttached = async () => {
+        const close = closeAttachedConnection;
+        closeAttachedConnection = null;
+        await close?.().catch(() => undefined);
+    };
     if (!runtime.chromePort && !runtime.chromeBrowserWSEndpoint) {
         logger("No running Chrome detected; reopening browser to locate the session.");
         return recoverSession(runtime, config);
@@ -37,8 +44,8 @@ export async function resumeBrowserSession(runtime, config, logger, deps = {}) {
                 targetId: target?.targetId ?? target?.id,
                 closeTargetOnDispose: false,
             })
-            : {
-                client: (await (deps.connect ?? ((options) => CDP(options)))(browserWSEndpoint
+            : await (async () => {
+                const client = (await (deps.connect ?? ((options) => CDP(options)))(browserWSEndpoint
                     ? {
                         target: browserWSEndpoint,
                         local: true,
@@ -48,9 +55,10 @@ export async function resumeBrowserSession(runtime, config, logger, deps = {}) {
                         host,
                         port,
                         target: target?.targetId ?? target?.id,
-                    })),
-                close: async () => undefined,
-            };
+                    }));
+                return { client, close: () => client.close() };
+            })();
+        closeAttachedConnection = () => connection.close();
         const client = connection.client;
         const { Runtime, DOM, Page } = client;
         if (Runtime?.enable) {
@@ -97,7 +105,7 @@ 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");
-            await connection.close().catch(() => undefined);
+            await closeAttached();
             return {
                 answerText: researchResult.text,
                 answerMarkdown: researchResult.text,
@@ -108,10 +116,11 @@ 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);
-        await connection.close().catch(() => undefined);
+        await closeAttached();
         return { answerText: aligned.answerText, answerMarkdown: aligned.answerMarkdown };
     }
     catch (error) {
+        await closeAttached();
         const message = error instanceof Error ? error.message : String(error);
         logger(`Existing Chrome reattach failed (${message}); reopening browser to locate the session.`);
         return recoverSession(runtime, config);
@@ -163,7 +172,7 @@ async function resumeBrowserSessionViaNewChrome(runtime, config, logger, deps) {
     const chrome = await launchChrome(resolved, userDataDir, logger);
     const chromeHost = chrome.host ?? "127.0.0.1";
     const client = await connectToChrome(chrome.port, logger, chromeHost);
-    const { Network, Page, Runtime, DOM } = client;
+    const { Network, Page, Runtime, DOM, Target } = client;
     if (Runtime?.enable) {
         await Runtime.enable();
     }
@@ -183,6 +192,13 @@ async function resumeBrowserSessionViaNewChrome(runtime, config, logger, deps) {
             waitMs: resolved.cookieSyncWaitMs ?? 0,
         });
     }
+    await clearStaleChatGptConversationCookies(Network, Target, logger, {
+        preserveConversationIds: [
+            runtime.conversationId,
+            extractConversationIdFromUrl(runtime.tabUrl ?? ""),
+            extractConversationIdFromUrl(resolved.url),
+        ],
+    });
     await navigateToChatGPT(Page, Runtime, CHATGPT_URL, logger);
     await ensureNotBlocked(Runtime, resolved.headless, logger);
     await ensureLoggedIn(Runtime, logger, { appliedCookies });
@@ -268,7 +284,7 @@ async function readPromptPreviewTurnIndex(Runtime, promptPreview) {
       const needle = ${JSON.stringify(preview.toLowerCase().replace(/\s+/g, " ").slice(0, 120))};
       if (!needle) return null;
       const normalize = (value) => String(value || '').toLowerCase().replace(/\\s+/g, ' ').trim();
-      const turns = Array.from(document.querySelectorAll(${JSON.stringify(CONVERSATION_TURN_SELECTOR)}));
+      const turns = ${buildConversationTurnListExpression()};
       let matched = null;
       for (const [index, node] of turns.entries()) {
         const attr = (node.getAttribute('data-message-author-role') || node.getAttribute('data-turn') || node.dataset?.turn || '').toLowerCase();

package/dist/src/browser/reattachHelpers.js

@@ -1,15 +1,25 @@
 import { CONVERSATION_TURN_SELECTOR } from "./constants.js";
+import { buildConversationTurnCountExpression } from "./conversationTurns.js";
 import { delay } from "./utils.js";
 import { readAssistantSnapshot } from "./pageActions.js";
 export function pickTarget(targets, runtime) {
     if (!Array.isArray(targets) || targets.length === 0) {
         return undefined;
     }
-    if (runtime.chromeTargetId) {
-        const byId = targets.find((t) => (t.targetId ?? t.id) === runtime.chromeTargetId);
-        if (byId)
+    const conversationId = runtime.conversationId ?? extractConversationIdFromUrl(runtime.tabUrl ?? "");
+    const byId = runtime.chromeTargetId
+        ? targets.find((target) => (target.targetId ?? target.id) === runtime.chromeTargetId)
+        : undefined;
+    if (conversationId) {
+        if (byId && extractConversationIdFromUrl(byId.url ?? "") === conversationId) {
             return byId;
+        }
+        const byConversation = targets.find((target) => extractConversationIdFromUrl(target.url ?? "") === conversationId);
+        if (byConversation)
+            return byConversation;
     }
+    if (byId)
+        return byId;
     if (runtime.tabUrl) {
         const byUrl = targets.find((t) => t.url?.startsWith(runtime.tabUrl)) ||
             targets.find((t) => runtime.tabUrl.startsWith(t.url || ""));
@@ -253,10 +263,9 @@ export async function waitForLocationChange(Runtime, timeoutMs) {
     }
 }
 export async function readConversationTurnIndex(Runtime, logger) {
-    const selectorLiteral = JSON.stringify(CONVERSATION_TURN_SELECTOR);
     try {
         const { result } = await Runtime.evaluate({
-            expression: `document.querySelectorAll(${selectorLiteral}).length`,
+            expression: buildConversationTurnCountExpression(),
             returnByValue: true,
         });
         const raw = typeof result?.value === "number" ? result.value : Number(result?.value);

package/dist/src/oracle/oscProgress.js

@@ -1,6 +1,6 @@
 import process from "node:process";
 import { startOscProgress as startOscProgressShared, supportsOscProgress as supportsOscProgressShared, } from "osc-progress";
-export function supportsOscProgress(env = process.env, isTty = process.stdout.isTTY) {
+export function supportsOscProgress(env = process.env, isTty = process.stdout.isTTY === true) {
     if (env.CODEX_MANAGED_BY_NPM === "1" && env.ORACLE_FORCE_OSC_PROGRESS !== "1") {
         return false;
     }
@@ -16,8 +16,9 @@ export function startOscProgress(options = {}) {
     }
     return startOscProgressShared({
         ...options,
-        // Preserve Oracle's previous default: progress emits to stdout.
+        // Preserve Oracle's previous defaults: progress emits to and checks stdout.
         write: options.write ?? ((text) => process.stdout.write(text)),
+        isTty: options.isTty ?? process.stdout.isTTY === true,
         disableEnvVar: "ORACLE_NO_OSC_PROGRESS",
         forceEnvVar: "ORACLE_FORCE_OSC_PROGRESS",
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steipete/oracle",
-  "version": "0.15.1",
+  "version": "0.15.2",
   "description": "CLI wrapper around OpenAI Responses API with GPT-5.5 Pro, GPT-5.5, GPT-5.4, GPT-5.2, GPT-5.1, and GPT-5.1 Codex high reasoning modes.",
   "keywords": [],
   "homepage": "https://askoracle.sh",
@@ -58,7 +58,7 @@
   },
   "dependencies": {
     "@anthropic-ai/tokenizer": "^0.0.4",
-    "@google/genai": "^2.9.0",
+    "@google/genai": "^2.10.0",
     "@google/generative-ai": "^0.24.1",
     "@modelcontextprotocol/sdk": "^1.29.0",
     "@steipete/sweet-cookie": "^0.4.0",
@@ -73,31 +73,31 @@
     "inquirer": "14.0.2",
     "json5": "^2.2.3",
     "kleur": "^4.1.5",
-    "markdansi": "0.3.1",
-    "openai": "^6.44.0",
-    "osc-progress": "^0.3.1",
-    "qs": "^6.15.2",
-    "shiki": "^4.2.0",
+    "markdansi": "0.3.2",
+    "openai": "^6.45.0",
+    "osc-progress": "^0.3.2",
+    "qs": "^6.15.3",
+    "shiki": "^4.3.1",
     "toasted-notifier": "^10.1.0",
-    "tokentally": "^0.1.1",
+    "tokentally": "^0.1.2",
     "zod": "^4.4.3"
   },
   "devDependencies": {
     "@anthropic-ai/tokenizer": "^0.0.4",
     "@types/chrome-remote-interface": "^0.34.0",
     "@types/inquirer": "^9.0.10",
-    "@types/node": "^26.0.0",
-    "@typescript/native-preview": "7.0.0-dev.20260623.1",
-    "@vitest/coverage-v8": "4.1.9",
-    "devtools-protocol": "0.0.1648812",
-    "es-toolkit": "^1.48.1",
+    "@types/node": "^26.1.0",
+    "@typescript/native-preview": "7.0.0-dev.20260706.1",
+    "@vitest/coverage-v8": "4.1.10",
+    "devtools-protocol": "0.0.1656784",
+    "es-toolkit": "^1.49.0",
     "esbuild": "^0.28.1",
-    "oxfmt": "0.56.0",
-    "oxlint": "^1.71.0",
-    "puppeteer-core": "^25.2.0",
-    "tsx": "^4.22.4",
+    "oxfmt": "0.57.0",
+    "oxlint": "^1.72.0",
+    "puppeteer-core": "^25.3.0",
+    "tsx": "^4.23.0",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.9"
+    "vitest": "^4.1.10"
   },
   "devEngines": {
     "runtime": [