@steipete/oracle 0.15.1 → 0.16.0

package/dist/src/browser/liveTabs.js

@@ -1,7 +1,8 @@
 import CDP from "chrome-remote-interface";
 import { createHash } from "node:crypto";
-import { ANSWER_SELECTORS, ASSISTANT_ROLE_SELECTOR, CONVERSATION_TURN_SELECTOR, INPUT_SELECTORS, MODEL_BUTTON_SELECTOR, SEND_BUTTON_SELECTORS, STOP_BUTTON_SELECTOR, } from "./constants.js";
+import { ANSWER_SELECTORS, ASSISTANT_ROLE_SELECTOR, INPUT_SELECTORS, MODEL_BUTTON_SELECTOR, SEND_BUTTON_SELECTORS, STOP_BUTTON_SELECTOR, } from "./constants.js";
 import { captureAssistantMarkdown, readAssistantSnapshot } from "./actions/assistantResponse.js";
+import { buildConversationTurnListExpression } from "./conversationTurns.js";
 import { delay } from "./utils.js";
 export const DEFAULT_REMOTE_CHROME_HOST = "127.0.0.1";
 export const DEFAULT_REMOTE_CHROME_PORT = 9222;
@@ -58,7 +59,6 @@ function buildTabInspectionExpression() {
     const inputSelectorsLiteral = JSON.stringify(INPUT_SELECTORS);
     const sendSelectorsLiteral = JSON.stringify(SEND_BUTTON_SELECTORS);
     const answerSelectorsLiteral = JSON.stringify(ANSWER_SELECTORS);
-    const turnSelectorLiteral = escapeLiteral(CONVERSATION_TURN_SELECTOR);
     const assistantRoleLiteral = escapeLiteral(ASSISTANT_ROLE_SELECTOR);
     const modelButtonSelectorLiteral = escapeLiteral(MODEL_BUTTON_SELECTOR);
     const stopSelectorLiteral = escapeLiteral(STOP_BUTTON_SELECTOR);
@@ -66,7 +66,6 @@ function buildTabInspectionExpression() {
       const INPUT_SELECTORS = ${inputSelectorsLiteral};
       const SEND_SELECTORS = ${sendSelectorsLiteral};
       const ANSWER_SELECTORS = ${answerSelectorsLiteral};
-      const TURN_SELECTOR = ${turnSelectorLiteral};
       const ASSISTANT_ROLE_SELECTOR = ${assistantRoleLiteral};
       const MODEL_BUTTON_SELECTOR = ${modelButtonSelectorLiteral};
       const STOP_BUTTON_SELECTOR = ${stopSelectorLiteral};
@@ -97,15 +96,21 @@ function buildTabInspectionExpression() {
       const sendExists = Boolean(sendButton);
       const promptNode = firstVisible(INPUT_SELECTORS);
       const promptReady = Boolean(promptNode);
-      const turns = Array.from(document.querySelectorAll(TURN_SELECTOR));
+      const turns = ${buildConversationTurnListExpression()};
       const assistantTurns = turns.filter((turn) => {
         const role = normalize(turn.getAttribute('data-message-author-role') || turn.getAttribute('data-turn')).toLowerCase();
         if (role === 'assistant') return true;
         return Boolean(turn.querySelector(ASSISTANT_ROLE_SELECTOR));
       });
+      const fallbackUserTurns = Array.from(
+        document.querySelectorAll('[data-message-author-role="user"], [data-turn="user"]'),
+      );
       const userTurns = turns.filter((turn) => {
         const role = normalize(turn.getAttribute('data-message-author-role') || turn.getAttribute('data-turn')).toLowerCase();
-        return role === 'user';
+        if (role === 'user') return true;
+        return Boolean(
+          turn.querySelector('[data-message-author-role="user"], [data-turn="user"]'),
+        );
       });
       const answerNode = ANSWER_SELECTORS
         .map((selector) => document.querySelectorAll(selector))
@@ -116,16 +121,47 @@ function buildTabInspectionExpression() {
       if (currentModelLabel === 'ChatGPT' && hasProPill) {
         currentModelLabel = 'ChatGPT + Pro';
       }
-      const assistantTexts = assistantTurns
-        .map((node) => normalize(node.textContent))
-        .filter(Boolean);
-      const userTexts = userTurns
-        .map((node) => normalize(node.textContent))
-        .filter(Boolean);
-      const answerTexts = Array.from(answerNode || []).map((node) => normalize(node.textContent)).filter(Boolean);
-      const assistantCount = assistantTurns.length > 0 ? assistantTurns.length : answerTexts.length;
-      const lastAssistantText = assistantTexts[assistantTexts.length - 1] || answerTexts[answerTexts.length - 1] || '';
-      const lastUserText = userTexts[userTexts.length - 1] || '';
+      const rawAnswerNodes = Array.from(answerNode || []);
+      const userCandidates = Array.from(new Set([...userTurns, ...fallbackUserTurns]));
+      const lastUserTurn = userCandidates.reduce((latest, candidate) => {
+        if (!latest) return candidate;
+        return latest.compareDocumentPosition(candidate) & 4 ? candidate : latest;
+      }, null);
+      const lastUserContainer = lastUserTurn
+        ? turns.find((turn) => turn === lastUserTurn || turn.contains?.(lastUserTurn))
+        : null;
+      const answerNodes = rawAnswerNodes.filter(
+        (node) =>
+          !lastUserTurn ||
+          (node !== lastUserTurn &&
+            !lastUserTurn.contains?.(node) &&
+            !node.contains?.(lastUserTurn)),
+      );
+      const answerTexts = answerNodes.map((node) => normalize(node.textContent)).filter(Boolean);
+      const assistantCandidates = Array.from(new Set([...assistantTurns, ...answerNodes]));
+      const lastAssistantNode = assistantCandidates.reduce((latest, candidate) => {
+        if (!latest) return candidate;
+        return latest.compareDocumentPosition(candidate) & 4 ? candidate : latest;
+      }, null);
+      const lastAssistantContainer = lastAssistantNode
+        ? turns.find((turn) => turn === lastAssistantNode || turn.contains?.(lastAssistantNode))
+        : null;
+      const assistantFollowsLatestUser = Boolean(
+        lastAssistantNode &&
+        lastUserTurn &&
+        lastAssistantNode !== lastUserTurn &&
+        (lastUserTurn.compareDocumentPosition(lastAssistantNode) & 4),
+      );
+      const lastAssistantTurnIndex = lastAssistantContainer
+        ? turns.indexOf(lastAssistantContainer)
+        : -1;
+      const lastUserTurnIndex = lastUserContainer ? turns.indexOf(lastUserContainer) : -1;
+      const assistantOwners = assistantCandidates.map(
+        (node) => turns.find((turn) => turn === node || turn.contains?.(node)) || node,
+      );
+      const assistantCount = new Set(assistantOwners).size;
+      const lastAssistantText = normalize(lastAssistantNode?.textContent);
+      const lastUserText = normalize(lastUserTurn?.textContent);
       const authenticated = !loginButtonExists && (promptReady || sendExists || stopExists || assistantCount > 0);
       return {
         title: normalize(document.title),
@@ -138,12 +174,18 @@ function buildTabInspectionExpression() {
         authenticated,
         assistantCount,
         lastAssistantText,
+        assistantFollowsLatestUser,
+        lastAssistantTurnIndex,
+        lastUserTurnIndex,
         lastUserText,
         visibilityState: document.visibilityState,
         focused: Boolean(document.hasFocus?.()),
       };
     })()`;
 }
+export function buildTabInspectionExpressionForTest() {
+    return buildTabInspectionExpression();
+}
 export async function listChatGptTargets(options = {}) {
     const { host, port } = normalizeHostPort(options);
     const targets = (await CDP.List({ host, port }));
@@ -183,7 +225,20 @@ export async function inspectChatGptTab(options) {
         });
         const info = (evaluation.result?.value ?? {});
         const snapshot = await readAssistantSnapshot(Runtime).catch(() => null);
-        const lastAssistantText = typeof snapshot?.text === "string" && snapshot.text.trim().length > 0
+        const inspectedAssistantTurnIndex = typeof info.lastAssistantTurnIndex === "number" && info.lastAssistantTurnIndex >= 0
+            ? info.lastAssistantTurnIndex
+            : undefined;
+        const normalizedSnapshotText = normalizeTitle(snapshot?.text ?? "").toLowerCase();
+        const normalizedInspectedText = normalizeTitle(info.lastAssistantText ?? "").toLowerCase();
+        const snapshotMatchesInspectedTurn = (typeof snapshot?.turnIndex === "number" &&
+            snapshot.turnIndex === inspectedAssistantTurnIndex) ||
+            (snapshot?.turnIndex == null &&
+                inspectedAssistantTurnIndex === undefined &&
+                normalizedSnapshotText.length > 0 &&
+                normalizedSnapshotText === normalizedInspectedText);
+        const lastAssistantText = snapshotMatchesInspectedTurn &&
+            typeof snapshot?.text === "string" &&
+            snapshot.text.trim().length > 0
             ? snapshot.text.trim()
             : String(info.lastAssistantText ?? "").trim();
         const lastUserText = String(info.lastUserText ?? "").trim();
@@ -201,6 +256,11 @@ export async function inspectChatGptTab(options) {
             authenticated: Boolean(info.authenticated),
             assistantCount: Number.isFinite(info.assistantCount) ? Number(info.assistantCount) : 0,
             lastAssistantText,
+            assistantFollowsLatestUser: Boolean(info.assistantFollowsLatestUser),
+            lastAssistantTurnIndex: inspectedAssistantTurnIndex,
+            lastUserTurnIndex: typeof info.lastUserTurnIndex === "number" && info.lastUserTurnIndex >= 0
+                ? info.lastUserTurnIndex
+                : undefined,
             lastAssistantSnippet: trimToSnippet(lastAssistantText),
             lastUserText,
             lastUserSnippet: trimToSnippet(lastUserText),
@@ -210,8 +270,12 @@ export async function inspectChatGptTab(options) {
             fingerprint: "",
             state: "detached",
             lastAssistantMarkdown: null,
-            lastAssistantMessageId: typeof snapshot?.messageId === "string" ? snapshot.messageId : undefined,
-            lastAssistantTurnId: typeof snapshot?.turnId === "string" ? snapshot.turnId : undefined,
+            lastAssistantMessageId: snapshotMatchesInspectedTurn && typeof snapshot?.messageId === "string"
+                ? snapshot.messageId
+                : undefined,
+            lastAssistantTurnId: snapshotMatchesInspectedTurn && typeof snapshot?.turnId === "string"
+                ? snapshot.turnId
+                : undefined,
         };
         summary.state = classifyTabState(summary);
         summary.fingerprint = buildTargetFingerprint(summary);
@@ -292,6 +356,10 @@ function resolveChatGptTabFromSummaries(summaries, ref) {
     if (exactUrl) {
         return exactUrl;
     }
+    const exactConversationId = summaries.find((tab) => tab.conversationId === trimmedRef);
+    if (exactConversationId) {
+        return exactConversationId;
+    }
     const lower = trimmedRef.toLowerCase();
     const titleMatches = summaries.filter((tab) => tab.title.toLowerCase().includes(lower));
     if (titleMatches.length === 1) {
@@ -328,17 +396,6 @@ export async function harvestChatGptTab(options = {}) {
     try {
         const { Runtime } = client;
         const snapshot = await readAssistantSnapshot(Runtime).catch(() => null);
-        let assistantMarkdown = null;
-        if (snapshot?.messageId || snapshot?.turnId) {
-            assistantMarkdown = await captureAssistantMarkdown(Runtime, {
-                messageId: snapshot.messageId,
-                turnId: snapshot.turnId,
-            }, noopLogger).catch(() => null);
-        }
-        const latestText = typeof snapshot?.text === "string" && snapshot.text.trim().length > 0
-            ? snapshot.text.trim()
-            : resolved.lastAssistantText;
-        const lastAssistantText = latestText ?? "";
         const nowSummary = await inspectChatGptTab({
             host,
             port,
@@ -349,15 +406,37 @@ export async function harvestChatGptTab(options = {}) {
                 type: "page",
             },
         });
+        const normalizedSnapshotText = normalizeTitle(snapshot?.text ?? "").toLowerCase();
+        const normalizedInspectedText = normalizeTitle(nowSummary.lastAssistantText).toLowerCase();
+        const snapshotMatchesLatestTurn = (typeof snapshot?.turnIndex === "number" &&
+            snapshot.turnIndex === nowSummary.lastAssistantTurnIndex) ||
+            (snapshot?.turnIndex == null &&
+                nowSummary.lastAssistantTurnIndex === undefined &&
+                normalizedSnapshotText.length > 0 &&
+                normalizedSnapshotText === normalizedInspectedText);
+        let assistantMarkdown = null;
+        if (snapshotMatchesLatestTurn && (snapshot?.messageId || snapshot?.turnId)) {
+            assistantMarkdown = await captureAssistantMarkdown(Runtime, {
+                messageId: snapshot.messageId,
+                turnId: snapshot.turnId,
+            }, noopLogger).catch(() => null);
+        }
+        const lastAssistantText = snapshotMatchesLatestTurn &&
+            typeof snapshot?.text === "string" &&
+            snapshot.text.trim().length > 0
+            ? snapshot.text.trim()
+            : nowSummary.lastAssistantText;
         const harvested = {
             ...nowSummary,
             lastAssistantText,
             lastAssistantSnippet: trimToSnippet(lastAssistantText),
             lastAssistantMarkdown: assistantMarkdown ?? (lastAssistantText || null),
-            lastAssistantMessageId: typeof snapshot?.messageId === "string"
+            lastAssistantMessageId: snapshotMatchesLatestTurn && typeof snapshot?.messageId === "string"
                 ? snapshot.messageId
                 : nowSummary.lastAssistantMessageId,
-            lastAssistantTurnId: typeof snapshot?.turnId === "string" ? snapshot.turnId : nowSummary.lastAssistantTurnId,
+            lastAssistantTurnId: snapshotMatchesLatestTurn && typeof snapshot?.turnId === "string"
+                ? snapshot.turnId
+                : nowSummary.lastAssistantTurnId,
         };
         if (harvested.stopExists && options.stallWindowMs && options.stallWindowMs > 0) {
             const firstFingerprint = harvested.fingerprint;
@@ -383,6 +462,9 @@ export async function harvestChatGptTab(options = {}) {
             harvested.loginButtonExists = followup.loginButtonExists;
             harvested.lastUserText = followup.lastUserText;
             harvested.lastUserSnippet = followup.lastUserSnippet;
+            harvested.assistantFollowsLatestUser = followup.assistantFollowsLatestUser;
+            harvested.lastAssistantTurnIndex = followup.lastAssistantTurnIndex;
+            harvested.lastUserTurnIndex = followup.lastUserTurnIndex;
             harvested.fingerprint = followup.fingerprint;
             harvested.state =
                 harvested.stopExists && firstFingerprint === followup.fingerprint

package/dist/src/browser/pageActions.js

@@ -1,4 +1,4 @@
-export { navigateToChatGPT, navigateToPromptReadyWithFallback, ensureNotBlocked, ensureLoggedIn, ensurePromptReady, waitForResumedConversationHydration, installJavaScriptDialogAutoDismissal, } from "./actions/navigation.js";
+export { navigateToChatGPT, navigateToPromptReadyWithFallback, ensureNotBlocked, ensureLoggedIn, ensurePromptReady, ensureChatMode, waitForResumedConversationHydration, installJavaScriptDialogAutoDismissal, } from "./actions/navigation.js";
 export { ensureModelSelection } from "./actions/modelSelection.js";
 export { submitPrompt, clearPromptComposer } from "./actions/promptComposer.js";
 export { clearComposerAttachments, uploadAttachmentFile, waitForAttachmentCompletion, waitForUserTurnAttachments, buildUserTurnAttachmentExpressionForTest, } from "./actions/attachments.js";

package/dist/src/browser/projectSourcesRunner.js

@@ -1,9 +1,9 @@
 import { mkdtemp, mkdir, rm } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
-import { closeTab, connectWithNewTab, hideChromeWindow, launchChrome, registerTerminationHooks, } from "./chromeLifecycle.js";
+import { closeTab, connectWithNewTab, launchChrome, positionChromeWindowOffscreen, 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,15 +120,15 @@ export async function runBrowserProjectSources(request) {
             });
         });
         const raceWithDisconnect = (promise) => Promise.race([promise, disconnectPromise]);
-        const { Network, Page, Runtime, Input, DOM } = client;
-        if (!config.headless && config.hideWindow) {
-            await hideChromeWindow(chrome, logger);
-        }
+        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);
+        if (!config.headless && config.hideWindow) {
+            await positionChromeWindowOffscreen(client, logger);
+        }
         removeDialogHandler = installJavaScriptDialogAutoDismissal(Page, logger);
         if (!manualLogin) {
             await Network.clearBrowserCookies();
@@ -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

@@ -3,10 +3,11 @@ import os from "node:os";
 import path from "node:path";
 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 { launchChrome, connectToChrome, positionChromeWindowOffscreen, 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();
     }
@@ -171,7 +180,7 @@ async function resumeBrowserSessionViaNewChrome(runtime, config, logger, deps) {
         await DOM.enable();
     }
     if (!resolved.headless && resolved.hideWindow) {
-        await hideChromeWindow(chrome, logger);
+        await positionChromeWindowOffscreen(client, logger);
     }
     let appliedCookies = 0;
     if (!manualLogin && resolved.cookieSync) {
@@ -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/browser/recoverConversation.js

@@ -1,7 +1,10 @@
-import { launch } from "chrome-launcher";
-import { defaultManualLoginProfileDir } from "./manualLoginProfile.js";
+import { isAnswerNowPlaceholderText } from "./actions/assistantResponse.js";
+import { resolveBrowserConfig } from "./config.js";
+import { acquireManualLoginChromeForRun, isImageOnlyUiChromeText } from "./index.js";
 import { isRecoverableChatGptConversationUrl } from "./reattachability.js";
-const DEFAULT_HYDRATION_DELAY_MS = 3_000;
+import { harvestChatGptTab, openChatGptTarget } from "./liveTabs.js";
+const DEFAULT_READY_TIMEOUT_MS = 30_000;
+const READY_POLL_MS = 1_000;
 /**
  * Picks the URL to navigate the recovered Chrome tab to.
  *
@@ -23,12 +26,54 @@ export function resolveRecoveryUrl(meta) {
     }
     return null;
 }
-function resolveProfileDir(meta) {
-    const fromMeta = meta?.browser?.config?.manualLoginProfileDir;
-    if (typeof fromMeta === "string" && fromMeta.length > 0) {
-        return fromMeta;
+export function resolveRecoveryProfileDir(meta) {
+    const config = meta?.browser?.config;
+    const resolved = resolveBrowserConfig(config);
+    if (!resolved.manualLogin) {
+        throw new Error("Cannot recover conversation: session was not run with a manual-login browser profile.");
     }
-    return defaultManualLoginProfileDir();
+    const runtime = meta?.browser?.runtime;
+    const profileDir = runtime?.userDataDir ?? resolved.manualLoginProfileDir;
+    if (typeof profileDir !== "string" || profileDir.trim().length === 0) {
+        throw new Error("Cannot recover conversation: session metadata has no recorded manual-login profile directory.");
+    }
+    return profileDir;
+}
+async function waitForRecoveredConversationReady(endpoint, ref, timeoutMs) {
+    const deadline = Date.now() + timeoutMs;
+    let lastError = null;
+    while (Date.now() < deadline) {
+        try {
+            const harvested = await harvestChatGptTab({ ...endpoint, ref });
+            if (isRecoveredConversationHarvestReady(harvested)) {
+                return;
+            }
+            lastError = new Error(`recovered tab is still ${harvested.state}`);
+        }
+        catch (error) {
+            lastError = error;
+        }
+        await new Promise((resolve) => setTimeout(resolve, READY_POLL_MS));
+    }
+    const suffix = lastError instanceof Error ? ` Last error: ${lastError.message}` : "";
+    throw new Error(`Recovered ChatGPT conversation did not become ready in time.${suffix}`);
+}
+export function isRecoveredConversationHarvestReady(harvested) {
+    const latestAssistant = harvested.lastAssistantText ??
+        harvested.lastAssistantMarkdown ??
+        harvested.lastAssistantSnippet ??
+        "";
+    const assistantFollowsLatestUser = harvested.assistantFollowsLatestUser === true ||
+        (typeof harvested.lastAssistantTurnIndex === "number" &&
+            typeof harvested.lastUserTurnIndex === "number" &&
+            harvested.lastAssistantTurnIndex > harvested.lastUserTurnIndex);
+    return (harvested.stopExists === true ||
+        ((harvested.assistantCount ?? 0) > 0 &&
+            assistantFollowsLatestUser &&
+            latestAssistant.trim().length > 0 &&
+            !isImageOnlyUiChromeText(latestAssistant) &&
+            !isAnswerNowPlaceholderText(latestAssistant) &&
+            !/^answer now$/i.test(latestAssistant.trim())));
 }
 /**
  * Re-open a previously-harvested ChatGPT conversation by relaunching Chrome
@@ -46,28 +91,44 @@ export async function recoverConversationTab(meta, logger, options = {}) {
         throw new Error("Cannot recover conversation: session metadata has no recoverable ChatGPT conversation URL " +
             "(expected browser.harvest.url or browser.runtime.tabUrl to be a chatgpt.com/c/<id> URL).");
     }
-    const userDataDir = resolveProfileDir(meta);
+    const readyTimeoutMs = options.readyTimeoutMs ?? DEFAULT_READY_TIMEOUT_MS;
+    const waitForReady = options.waitForReady !== false;
+    if (options.existingEndpoint) {
+        try {
+            logger(`[browser] Recovery: opening saved conversation in existing Chrome at ` +
+                `${options.existingEndpoint.host}:${options.existingEndpoint.port}`);
+            const targetId = await openChatGptTarget({ ...options.existingEndpoint, url });
+            if (waitForReady) {
+                await waitForRecoveredConversationReady(options.existingEndpoint, targetId, readyTimeoutMs);
+            }
+            return { ...options.existingEndpoint, url, ref: targetId, chrome: null };
+        }
+        catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            logger(`[browser] Recovery: existing Chrome could not reopen the conversation (${message}).`);
+        }
+    }
+    const userDataDir = resolveRecoveryProfileDir(meta);
+    const config = resolveBrowserConfig(meta.browser?.config);
     logger(`[browser] Recovery: relaunching Chrome with profile ${userDataDir} and navigating to ${url}`);
-    const chrome = await launch({
-        chromeFlags: [
-            "--no-first-run",
-            "--no-default-browser-check",
-            "--disable-features=AutomationControlled,TranslateUI",
-            "--disable-sync",
-            "--password-store=basic",
-            "--use-mock-keychain",
-            "--lang=en-US",
-            url,
-        ],
-        userDataDir,
-        handleSIGINT: false,
-    });
-    const host = "127.0.0.1";
+    const { chrome } = await acquireManualLoginChromeForRun(userDataDir, config, logger, meta.id, {});
+    const host = chrome.host ?? "127.0.0.1";
     const port = chrome.port;
-    const hydrationDelayMs = options.hydrationDelayMs ?? DEFAULT_HYDRATION_DELAY_MS;
-    if (hydrationDelayMs > 0) {
-        await new Promise((resolve) => setTimeout(resolve, hydrationDelayMs));
+    try {
+        const targetId = await openChatGptTarget({ host, port, url });
+        if (waitForReady) {
+            await waitForRecoveredConversationReady({ host, port }, targetId, readyTimeoutMs);
+        }
+        logger(`[browser] Recovery: Chrome listening on ${host}:${port}; tab loaded.`);
+        return { host, port, url, ref: targetId, chrome };
+    }
+    catch (error) {
+        try {
+            chrome.kill();
+        }
+        catch {
+            // best-effort cleanup
+        }
+        throw error;
     }
-    logger(`[browser] Recovery: Chrome listening on ${host}:${port}; tab loaded.`);
-    return { host, port, url, chrome };
 }

package/dist/src/cli/browserConfig.js

@@ -16,6 +16,8 @@ const DEFAULT_CHROME_PROFILE = "Default";
 // The browser label is passed to the model picker which fuzzy-matches against ChatGPT's UI.
 const BROWSER_MODEL_LABELS = [
     // Most specific first (e.g., "gpt-5.2-thinking" before "gpt-5.2")
+    ["gpt-5.6-sol", "GPT-5.6 Sol"],
+    ["gpt-5.6", "GPT-5.6 Sol"],
     ["gpt-5.5-pro", "Pro"],
     ["gpt-5.5-instant", "GPT-5.5 Instant"],
     ["gpt-5.5", "Thinking 5.5"],
@@ -40,7 +42,9 @@ export function normalizeChatGptModelForBrowser(model) {
     if (!normalized.startsWith("gpt-") || normalized.includes("codex")) {
         return model;
     }
-    if (normalized === "gpt-5.5-pro" ||
+    if (normalized === "gpt-5.6-sol" ||
+        normalized === "gpt-5.6" ||
+        normalized === "gpt-5.5-pro" ||
         normalized === "gpt-5.5-instant" ||
         normalized === "gpt-5.5" ||
         normalized === "gpt-5.4") {