@steipete/oracle 0.7.6 → 0.8.0

package/dist/src/browser/reattach.js

@@ -7,24 +7,7 @@ import { launchChrome, connectToChrome, hideChromeWindow } from './chromeLifecyc
 import { resolveBrowserConfig } from './config.js';
 import { syncCookies } from './cookies.js';
 import { CHATGPT_URL } from './constants.js';
-import { delay } from './utils.js';
-function pickTarget(targets, runtime) {
-    if (!Array.isArray(targets) || targets.length === 0) {
-        return undefined;
-    }
-    if (runtime.chromeTargetId) {
-        const byId = targets.find((t) => t.targetId === runtime.chromeTargetId);
-        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 || ''));
-        if (byUrl)
-            return byUrl;
-    }
-    return targets.find((t) => t.type === 'page') ?? targets[0];
-}
+import { pickTarget, extractConversationIdFromUrl, buildConversationUrl, withTimeout, openConversationFromSidebar, openConversationFromSidebarWithRetry, waitForLocationChange, readConversationTurnIndex, buildPromptEchoMatcher, recoverPromptEcho, alignPromptEchoMarkdown, } from './reattachHelpers.js';
 export async function resumeBrowserSession(runtime, config, logger, deps = {}) {
     const recoverSession = deps.recoverSession ??
         (async (runtimeMeta, configMeta) => resumeBrowserSessionViaNewChrome(runtimeMeta, configMeta, logger, deps));
@@ -58,7 +41,10 @@ export async function resumeBrowserSession(runtime, config, logger, deps = {}) {
             const { result } = await Runtime.evaluate({ expression: 'location.href', returnByValue: true });
             const href = typeof result?.value === 'string' ? result.value : '';
             if (href.includes('/c/')) {
-                return;
+                const currentId = extractConversationIdFromUrl(href);
+                if (!runtime.conversationId || (currentId && currentId === runtime.conversationId)) {
+                    return;
+                }
             }
             const opened = await openConversationFromSidebarWithRetry(Runtime, {
                 conversationId: runtime.conversationId ?? extractConversationIdFromUrl(runtime.tabUrl ?? ''),
@@ -76,8 +62,12 @@ export async function resumeBrowserSession(runtime, config, logger, deps = {}) {
         const pingTimeoutMs = Math.min(5_000, Math.max(1_500, Math.floor(timeoutMs * 0.05)));
         await withTimeout(Runtime.evaluate({ expression: '1+1', returnByValue: true }), pingTimeoutMs, 'Reattach target did not respond');
         await ensureConversationOpen();
-        const answer = await withTimeout(waitForResponse(Runtime, timeoutMs, logger), timeoutMs + 5_000, 'Reattach response timed out');
-        const markdown = (await withTimeout(captureMarkdown(Runtime, answer.meta, logger), 15_000, 'Reattach markdown capture timed out')) ?? answer.text;
+        const minTurnIndex = await readConversationTurnIndex(Runtime, logger);
+        const promptEcho = buildPromptEchoMatcher(deps.promptPreview);
+        const answer = await withTimeout(waitForResponse(Runtime, timeoutMs, logger, minTurnIndex ?? undefined), timeoutMs + 5_000, 'Reattach response timed out');
+        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);
         if (client && typeof client.close === 'function') {
             try {
                 await client.close();
@@ -86,7 +76,7 @@ export async function resumeBrowserSession(runtime, config, logger, deps = {}) {
                 // ignore
             }
         }
-        return { answerText: answer.text, answerMarkdown: markdown };
+        return { answerText: aligned.answerText, answerMarkdown: aligned.answerMarkdown };
     }
     catch (error) {
         const message = error instanceof Error ? error.message : String(error);
@@ -143,7 +133,8 @@ async function resumeBrowserSessionViaNewChrome(runtime, config, logger, deps) {
     else {
         const opened = await openConversationFromSidebarWithRetry(Runtime, {
             conversationId: runtime.conversationId ?? extractConversationIdFromUrl(runtime.tabUrl ?? ''),
-            preferProjects: resolved.url !== CHATGPT_URL,
+            preferProjects: resolved.url !== CHATGPT_URL ||
+                Boolean(runtime.tabUrl && (/\/g\//.test(runtime.tabUrl) || runtime.tabUrl.includes('/project'))),
             promptPreview: deps.promptPreview,
         }, 15_000);
         if (!opened) {
@@ -154,8 +145,12 @@ async function resumeBrowserSessionViaNewChrome(runtime, config, logger, deps) {
     const waitForResponse = deps.waitForAssistantResponse ?? waitForAssistantResponse;
     const captureMarkdown = deps.captureAssistantMarkdown ?? captureAssistantMarkdown;
     const timeoutMs = resolved.timeoutMs ?? 120_000;
-    const answer = await waitForResponse(Runtime, timeoutMs, logger);
-    const markdown = (await captureMarkdown(Runtime, answer.meta, logger)) ?? answer.text;
+    const minTurnIndex = await readConversationTurnIndex(Runtime, logger);
+    const promptEcho = buildPromptEchoMatcher(deps.promptPreview);
+    const answer = await waitForResponse(Runtime, timeoutMs, logger, minTurnIndex ?? undefined);
+    const recovered = await recoverPromptEcho(Runtime, answer, promptEcho, logger, minTurnIndex, timeoutMs);
+    const markdown = (await captureMarkdown(Runtime, recovered.meta, logger)) ?? recovered.text;
+    const aligned = alignPromptEchoMarkdown(recovered.text, markdown, promptEcho, logger);
     if (client && typeof client.close === 'function') {
         try {
             await client.close();
@@ -173,160 +168,7 @@ async function resumeBrowserSessionViaNewChrome(runtime, config, logger, deps) {
         }
         await rm(userDataDir, { recursive: true, force: true }).catch(() => undefined);
     }
-    return { answerText: answer.text, answerMarkdown: markdown };
-}
-function extractConversationIdFromUrl(url) {
-    if (!url)
-        return undefined;
-    const match = url.match(/\/c\/([a-zA-Z0-9-]+)/);
-    return match?.[1];
-}
-function buildConversationUrl(runtime, baseUrl) {
-    if (runtime.tabUrl) {
-        if (runtime.tabUrl.includes('/c/')) {
-            return runtime.tabUrl;
-        }
-        return null;
-    }
-    const conversationId = runtime.conversationId;
-    if (!conversationId) {
-        return null;
-    }
-    try {
-        const base = new URL(baseUrl);
-        return `${base.origin}/c/${conversationId}`;
-    }
-    catch {
-        return null;
-    }
-}
-async function withTimeout(task, ms, label) {
-    let timeoutId;
-    const timeout = new Promise((_, reject) => {
-        timeoutId = setTimeout(() => reject(new Error(label)), ms);
-    });
-    return Promise.race([task, timeout]).finally(() => {
-        if (timeoutId) {
-            clearTimeout(timeoutId);
-        }
-    });
-}
-async function openConversationFromSidebar(Runtime, options) {
-    const response = await Runtime.evaluate({
-        expression: `(() => {
-      const conversationId = ${JSON.stringify(options.conversationId ?? null)};
-      const preferProjects = ${JSON.stringify(Boolean(options.preferProjects))};
-      const promptPreview = ${JSON.stringify(options.promptPreview ?? null)};
-      const promptNeedle = promptPreview ? promptPreview.trim().toLowerCase().slice(0, 100) : '';
-      const nav = document.querySelector('nav') || document.querySelector('aside') || document.body;
-      if (preferProjects) {
-        const projectLink = Array.from(nav.querySelectorAll('a,button'))
-          .find((el) => (el.textContent || '').trim().toLowerCase() === 'projects');
-        if (projectLink) {
-          projectLink.click();
-        }
-      }
-      const allElements = Array.from(
-        document.querySelectorAll(
-          'a,button,[role="link"],[role="button"],[data-href],[data-url],[data-conversation-id],[data-testid*="conversation"],[data-testid*="history"]',
-        ),
-      );
-      const getHref = (el) =>
-        el.getAttribute('href') ||
-        el.getAttribute('data-href') ||
-        el.getAttribute('data-url') ||
-        el.dataset?.href ||
-        el.dataset?.url ||
-        '';
-      const toCandidate = (el) => {
-        const clickable = el.closest('a,button,[role="link"],[role="button"]') || el;
-        const rawText = (el.textContent || clickable.textContent || '').trim();
-        return {
-          el,
-          clickable,
-          href: getHref(clickable) || getHref(el),
-          conversationId:
-            clickable.getAttribute('data-conversation-id') ||
-            el.getAttribute('data-conversation-id') ||
-            clickable.dataset?.conversationId ||
-            el.dataset?.conversationId ||
-            '',
-          testId: clickable.getAttribute('data-testid') || el.getAttribute('data-testid') || '',
-          text: rawText.replace(/\\s+/g, ' ').slice(0, 400),
-          inNav: Boolean(clickable.closest('nav,aside')),
-        };
-      };
-      const candidates = allElements.map(toCandidate);
-      const mainCandidates = candidates.filter((item) => !item.inNav);
-      const navCandidates = candidates.filter((item) => item.inNav);
-      const visible = (item) => {
-        const rect = item.clickable.getBoundingClientRect();
-        return rect.width > 0 && rect.height > 0;
-      };
-      const pick = (items) => (items.find(visible) || items[0] || null);
-      let target = null;
-      if (conversationId) {
-        const byId = (item) =>
-          (item.href && item.href.includes('/c/' + conversationId)) ||
-          (item.conversationId && item.conversationId === conversationId);
-        target = pick(mainCandidates.filter(byId)) || pick(navCandidates.filter(byId));
-      }
-      if (!target && promptNeedle) {
-        const byPrompt = (item) => item.text && item.text.toLowerCase().includes(promptNeedle);
-        target = pick(mainCandidates.filter(byPrompt)) || pick(navCandidates.filter(byPrompt));
-      }
-      if (!target) {
-        const byHref = (item) => item.href && item.href.includes('/c/');
-        target = pick(mainCandidates.filter(byHref)) || pick(navCandidates.filter(byHref));
-      }
-      if (!target) {
-        const byTestId = (item) => /conversation|history/i.test(item.testId || '');
-        target = pick(mainCandidates.filter(byTestId)) || pick(navCandidates.filter(byTestId));
-      }
-      if (target) {
-        target.clickable.scrollIntoView({ block: 'center' });
-        target.clickable.dispatchEvent(
-          new MouseEvent('click', { bubbles: true, cancelable: true, view: window }),
-        );
-        return {
-          ok: true,
-          href: target.href || '',
-          count: candidates.length,
-          scope: target.inNav ? 'nav' : 'main',
-        };
-      }
-      return { ok: false, count: candidates.length };
-    })()`,
-        returnByValue: true,
-    });
-    return Boolean(response.result?.value?.ok);
-}
-async function openConversationFromSidebarWithRetry(Runtime, options, timeoutMs) {
-    const start = Date.now();
-    let attempt = 0;
-    while (Date.now() - start < timeoutMs) {
-        // Retry because project list can hydrate after initial navigation.
-        const opened = await openConversationFromSidebar(Runtime, options);
-        if (opened) {
-            return true;
-        }
-        attempt += 1;
-        await delay(attempt < 5 ? 250 : 500);
-    }
-    return false;
-}
-async function waitForLocationChange(Runtime, timeoutMs) {
-    const start = Date.now();
-    let lastHref = '';
-    while (Date.now() - start < timeoutMs) {
-        const { result } = await Runtime.evaluate({ expression: 'location.href', returnByValue: true });
-        const href = typeof result?.value === 'string' ? result.value : '';
-        if (lastHref && href !== lastHref) {
-            return;
-        }
-        lastHref = href;
-        await delay(200);
-    }
+    return { answerText: aligned.answerText, answerMarkdown: aligned.answerMarkdown };
 }
 // biome-ignore lint/style/useNamingConvention: test-only export used in vitest suite
 export const __test__ = {

package/dist/src/browser/reattachHelpers.js

@@ -0,0 +1,382 @@
+import { CONVERSATION_TURN_SELECTOR } from './constants.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 === runtime.chromeTargetId);
+        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 || ''));
+        if (byUrl)
+            return byUrl;
+    }
+    return targets.find((t) => t.type === 'page') ?? targets[0];
+}
+export function extractConversationIdFromUrl(url) {
+    if (!url)
+        return undefined;
+    const match = url.match(/\/c\/([a-zA-Z0-9-]+)/);
+    return match?.[1];
+}
+export function buildConversationUrl(runtime, baseUrl) {
+    if (runtime.tabUrl) {
+        if (runtime.tabUrl.includes('/c/')) {
+            return runtime.tabUrl;
+        }
+        return null;
+    }
+    const conversationId = runtime.conversationId;
+    if (!conversationId) {
+        return null;
+    }
+    try {
+        const base = new URL(baseUrl);
+        const pathRoot = base.pathname.replace(/\/$/, '');
+        const prefix = pathRoot === '/' ? '' : pathRoot;
+        return `${base.origin}${prefix}/c/${conversationId}`;
+    }
+    catch {
+        return null;
+    }
+}
+export async function withTimeout(task, ms, label) {
+    let timeoutId;
+    const timeout = new Promise((_, reject) => {
+        timeoutId = setTimeout(() => reject(new Error(label)), ms);
+    });
+    return Promise.race([task, timeout]).finally(() => {
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
+    });
+}
+export async function openConversationFromSidebar(Runtime, options, attempt = 0) {
+    const response = await Runtime.evaluate({
+        expression: `(() => {
+      const conversationId = ${JSON.stringify(options.conversationId ?? null)};
+      const preferProjects = ${JSON.stringify(Boolean(options.preferProjects))};
+      const promptPreview = ${JSON.stringify(options.promptPreview ?? null)};
+      const attemptIndex = ${Math.max(0, attempt)};
+      const promptNeedleFull = promptPreview ? promptPreview.trim().toLowerCase().slice(0, 100) : '';
+      const promptNeedleShort = promptNeedleFull.replace(/\\s*\\d{4,}\\s*$/, '').trim();
+      const promptNeedles = Array.from(new Set([promptNeedleFull, promptNeedleShort].filter(Boolean)));
+      const nav = document.querySelector('nav') || document.querySelector('aside') || document.body;
+      if (preferProjects) {
+        const projectLink = Array.from(nav.querySelectorAll('a,button'))
+          .find((el) => (el.textContent || '').trim().toLowerCase() === 'projects');
+        if (projectLink) {
+          projectLink.click();
+        }
+      }
+      const allElements = Array.from(
+        document.querySelectorAll(
+          'a,button,[role="link"],[role="button"],[data-href],[data-url],[data-conversation-id],[data-testid*="conversation"],[data-testid*="history"]',
+        ),
+      );
+      const getHref = (el) =>
+        el.getAttribute('href') ||
+        el.getAttribute('data-href') ||
+        el.getAttribute('data-url') ||
+        el.dataset?.href ||
+        el.dataset?.url ||
+        '';
+      const toCandidate = (el) => {
+        const clickable = el.closest('a,button,[role="link"],[role="button"]') || el;
+        const rawText = (el.textContent || clickable.textContent || '').trim();
+        return {
+          el,
+          clickable,
+          href: getHref(clickable) || getHref(el),
+          conversationId:
+            clickable.getAttribute('data-conversation-id') ||
+            el.getAttribute('data-conversation-id') ||
+            clickable.dataset?.conversationId ||
+            el.dataset?.conversationId ||
+            '',
+          testId: clickable.getAttribute('data-testid') || el.getAttribute('data-testid') || '',
+          text: rawText.replace(/\\s+/g, ' ').slice(0, 400),
+          inNav: Boolean(clickable.closest('nav,aside')),
+        };
+      };
+      const candidates = allElements.map(toCandidate);
+      const mainCandidates = candidates.filter((item) => !item.inNav);
+      const navCandidates = candidates.filter((item) => item.inNav);
+      const visible = (item) => {
+        const rect = item.clickable.getBoundingClientRect();
+        return rect.width > 0 && rect.height > 0;
+      };
+      const pick = (items) => (items.find(visible) || items[0] || null);
+      const pickWithAttempt = (items) => {
+        if (!items.length) return null;
+        const visibleItems = items.filter(visible);
+        const pool = visibleItems.length > 0 ? visibleItems : items;
+        const index = Math.min(attemptIndex, pool.length - 1);
+        return pool[index] ?? null;
+      };
+      let target = null;
+      if (conversationId) {
+        const byId = (item) =>
+          (item.href && item.href.includes('/c/' + conversationId)) ||
+          (item.conversationId && item.conversationId === conversationId);
+        target = pick(mainCandidates.filter(byId)) || pick(navCandidates.filter(byId));
+      }
+      if (!target && promptNeedles.length > 0) {
+        const byPrompt = (item) => promptNeedles.some((needle) => item.text && item.text.toLowerCase().includes(needle));
+        const sortBySpecificity = (items) =>
+          items
+            .filter(byPrompt)
+            .sort((a, b) => (a.text?.length ?? 0) - (b.text?.length ?? 0));
+        target = pickWithAttempt(sortBySpecificity(mainCandidates)) || pickWithAttempt(sortBySpecificity(navCandidates));
+      }
+      if (!target) {
+        const byHref = (item) => item.href && item.href.includes('/c/');
+        target = pickWithAttempt(mainCandidates.filter(byHref)) || pickWithAttempt(navCandidates.filter(byHref));
+      }
+      if (!target) {
+        const byTestId = (item) => /conversation|history/i.test(item.testId || '');
+        target = pickWithAttempt(mainCandidates.filter(byTestId)) || pickWithAttempt(navCandidates.filter(byTestId));
+      }
+      if (target) {
+        target.clickable.scrollIntoView({ block: 'center' });
+        target.clickable.dispatchEvent(
+          new MouseEvent('click', { bubbles: true, cancelable: true, view: window }),
+        );
+        // Fallback: some project-sidebar items don't navigate on click, force the URL.
+        if (target.href && target.href.includes('/c/')) {
+          const targetUrl = target.href.startsWith('http')
+            ? target.href
+            : new URL(target.href, location.origin).toString();
+          if (targetUrl && targetUrl !== location.href) {
+            location.href = targetUrl;
+          }
+        }
+        return {
+          ok: true,
+          href: target.href || '',
+          count: candidates.length,
+          scope: target.inNav ? 'nav' : 'main',
+        };
+      }
+      return { ok: false, count: candidates.length };
+    })()`,
+        returnByValue: true,
+    });
+    return Boolean(response.result?.value?.ok);
+}
+export async function openConversationFromSidebarWithRetry(Runtime, options, timeoutMs) {
+    const start = Date.now();
+    let attempt = 0;
+    while (Date.now() - start < timeoutMs) {
+        // Retry because project list can hydrate after initial navigation.
+        const opened = await openConversationFromSidebar(Runtime, options, attempt);
+        if (opened) {
+            if (options.promptPreview) {
+                const matched = await waitForPromptPreview(Runtime, options.promptPreview, 10_000);
+                if (matched) {
+                    return true;
+                }
+            }
+            else {
+                return true;
+            }
+        }
+        attempt += 1;
+        await delay(attempt < 5 ? 250 : 500);
+    }
+    return false;
+}
+export async function waitForPromptPreview(Runtime, promptPreview, timeoutMs) {
+    const needleFull = promptPreview.trim().toLowerCase().slice(0, 120);
+    const needleShort = needleFull.replace(/\\s*\\d{4,}\\s*$/, '').trim();
+    const needles = Array.from(new Set([needleFull, needleShort].filter(Boolean)));
+    if (needles.length === 0)
+        return false;
+    const selectorLiteral = JSON.stringify(CONVERSATION_TURN_SELECTOR);
+    const expression = `(() => {
+    const needles = ${JSON.stringify(needles)};
+    const root =
+      document.querySelector('section[data-testid="screen-threadFlyOut"]') ||
+      document.querySelector('[data-testid="chat-thread"]') ||
+      document.querySelector('main') ||
+      document.querySelector('[role="main"]');
+    if (!root) return false;
+    const userTurns = Array.from(root.querySelectorAll('[data-message-author-role="user"], [data-turn="user"]'));
+    const collectText = (nodes) =>
+      nodes
+        .map((node) => (node.innerText || node.textContent || ''))
+        .join(' ')
+        .toLowerCase();
+    let text = collectText(userTurns);
+    let hasTurns = userTurns.length > 0;
+    if (!text) {
+      const turns = Array.from(root.querySelectorAll(${selectorLiteral}));
+      hasTurns = hasTurns || turns.length > 0;
+      text = collectText(turns);
+    }
+    if (!text) {
+      text = (root.innerText || root.textContent || '').toLowerCase();
+    }
+    return needles.some((needle) => text.includes(needle));
+  })()`;
+    const start = Date.now();
+    while (Date.now() - start < timeoutMs) {
+        try {
+            const { result } = await Runtime.evaluate({ expression, returnByValue: true });
+            if (result?.value === true) {
+                return true;
+            }
+        }
+        catch {
+            // ignore
+        }
+        await delay(300);
+    }
+    return false;
+}
+export async function waitForLocationChange(Runtime, timeoutMs) {
+    const start = Date.now();
+    let lastHref = '';
+    while (Date.now() - start < timeoutMs) {
+        const { result } = await Runtime.evaluate({ expression: 'location.href', returnByValue: true });
+        const href = typeof result?.value === 'string' ? result.value : '';
+        if (lastHref && href !== lastHref) {
+            return;
+        }
+        lastHref = href;
+        await delay(200);
+    }
+}
+export async function readConversationTurnIndex(Runtime, logger) {
+    const selectorLiteral = JSON.stringify(CONVERSATION_TURN_SELECTOR);
+    try {
+        const { result } = await Runtime.evaluate({
+            expression: `document.querySelectorAll(${selectorLiteral}).length`,
+            returnByValue: true,
+        });
+        const raw = typeof result?.value === 'number' ? result.value : Number(result?.value);
+        if (!Number.isFinite(raw)) {
+            throw new Error('Turn count not numeric');
+        }
+        return Math.max(0, Math.floor(raw) - 1);
+    }
+    catch (error) {
+        if (logger?.verbose) {
+            logger(`Failed to read conversation turn index: ${error instanceof Error ? error.message : String(error)}`);
+        }
+        return null;
+    }
+}
+function normalizeForComparison(text) {
+    return String(text || '').toLowerCase().replace(/\\s+/g, ' ').trim();
+}
+export function buildPromptEchoMatcher(promptPreview) {
+    const normalizedPrompt = normalizeForComparison(promptPreview ?? '');
+    if (!normalizedPrompt) {
+        return null;
+    }
+    const promptPrefix = normalizedPrompt.length >= 80 ? normalizedPrompt.slice(0, Math.min(200, normalizedPrompt.length)) : '';
+    const minFragment = Math.min(40, normalizedPrompt.length);
+    return {
+        isEcho: (text) => {
+            const normalized = normalizeForComparison(text);
+            if (!normalized)
+                return false;
+            if (normalized === normalizedPrompt)
+                return true;
+            if (promptPrefix.length > 0 && normalized.startsWith(promptPrefix))
+                return true;
+            if (normalized.length >= minFragment && normalizedPrompt.startsWith(normalized)) {
+                return true;
+            }
+            if (normalized.includes('…') || normalized.includes('...')) {
+                const marker = normalized.includes('…') ? '…' : '...';
+                const [prefixRaw, suffixRaw] = normalized.split(marker);
+                const prefix = prefixRaw?.trim() ?? '';
+                const suffix = suffixRaw?.trim() ?? '';
+                if (!prefix && !suffix)
+                    return false;
+                if (prefix && !normalizedPrompt.includes(prefix))
+                    return false;
+                if (suffix && !normalizedPrompt.includes(suffix))
+                    return false;
+                const fragmentLength = prefix.length + suffix.length;
+                return fragmentLength >= minFragment;
+            }
+            return false;
+        },
+    };
+}
+export async function recoverPromptEcho(Runtime, answer, matcher, logger, minTurnIndex, timeoutMs) {
+    if (!matcher || !matcher.isEcho(answer.text)) {
+        return answer;
+    }
+    logger('Detected prompt echo while reattaching; waiting for assistant response...');
+    const deadline = Date.now() + Math.min(timeoutMs, 15_000);
+    let bestText = null;
+    let stableCount = 0;
+    while (Date.now() < deadline) {
+        const snapshot = await readAssistantSnapshot(Runtime, minTurnIndex ?? undefined).catch(() => null);
+        const text = typeof snapshot?.text === 'string' ? snapshot.text.trim() : '';
+        if (!text || matcher.isEcho(text)) {
+            await delay(300);
+            continue;
+        }
+        if (!bestText || text.length > bestText.length) {
+            bestText = text;
+            stableCount = 0;
+        }
+        else if (text === bestText) {
+            stableCount += 1;
+        }
+        if (stableCount >= 2) {
+            break;
+        }
+        await delay(300);
+    }
+    if (bestText) {
+        logger('Recovered assistant response after prompt echo during reattach');
+        return { ...answer, text: bestText };
+    }
+    return answer;
+}
+export function alignPromptEchoPair(answerText, answerMarkdown, matcher, logger, messages) {
+    if (!matcher) {
+        return { answerText, answerMarkdown, textEcho: false, markdownEcho: false, isEcho: false };
+    }
+    let textEcho = matcher.isEcho(answerText);
+    let markdownEcho = matcher.isEcho(answerMarkdown);
+    if (textEcho && !markdownEcho && answerMarkdown) {
+        if (logger && messages?.text) {
+            logger(messages.text);
+        }
+        answerText = answerMarkdown;
+        textEcho = false;
+    }
+    if (markdownEcho && !textEcho && answerText) {
+        if (logger && messages?.markdown) {
+            logger(messages.markdown);
+        }
+        answerMarkdown = answerText;
+        markdownEcho = false;
+    }
+    return {
+        answerText,
+        answerMarkdown,
+        textEcho,
+        markdownEcho,
+        isEcho: textEcho || markdownEcho,
+    };
+}
+export function alignPromptEchoMarkdown(answerText, answerMarkdown, matcher, logger) {
+    const aligned = alignPromptEchoPair(answerText, answerMarkdown, matcher, logger, {
+        text: 'Aligned prompt-echo text to copied markdown during reattach',
+        markdown: 'Aligned prompt-echo markdown to response text during reattach',
+    });
+    return { answerText: aligned.answerText, answerMarkdown: aligned.answerMarkdown };
+}

package/dist/src/browserMode.js

@@ -1 +1 @@
-export { runBrowserMode, CHATGPT_URL, DEFAULT_MODEL_TARGET, parseDuration, normalizeChatgptUrl, isTemporaryChatUrl, } from './browser/index.js';
+export { runBrowserMode, CHATGPT_URL, DEFAULT_MODEL_STRATEGY, DEFAULT_MODEL_TARGET, parseDuration, normalizeChatgptUrl, isTemporaryChatUrl, } from './browser/index.js';

package/dist/src/cli/browserConfig.js

@@ -1,9 +1,10 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
-import { CHATGPT_URL, DEFAULT_MODEL_TARGET, isTemporaryChatUrl, normalizeChatgptUrl, parseDuration } from '../browserMode.js';
+import { CHATGPT_URL, DEFAULT_MODEL_STRATEGY, DEFAULT_MODEL_TARGET, isTemporaryChatUrl, normalizeChatgptUrl, parseDuration } from '../browserMode.js';
+import { normalizeBrowserModelStrategy } from '../browser/modelStrategy.js';
 import { getOracleHomeDir } from '../oracleHome.js';
 const DEFAULT_BROWSER_TIMEOUT_MS = 1_200_000;
-const DEFAULT_BROWSER_INPUT_TIMEOUT_MS = 30_000;
+const DEFAULT_BROWSER_INPUT_TIMEOUT_MS = 60_000;
 const DEFAULT_CHROME_PROFILE = 'Default';
 // Ordered array: most specific models first to ensure correct selection.
 // The browser label is passed to the model picker which fuzzy-matches against ChatGPT's UI.
@@ -44,14 +45,18 @@ export async function buildBrowserConfig(options) {
     const baseModel = options.model.toLowerCase();
     const isChatGptModel = baseModel.startsWith('gpt-') && !baseModel.includes('codex');
     const shouldUseOverride = !isChatGptModel && normalizedOverride.length > 0 && normalizedOverride !== baseModel;
+    const modelStrategy = normalizeBrowserModelStrategy(options.browserModelStrategy) ?? DEFAULT_MODEL_STRATEGY;
     const cookieNames = parseCookieNames(options.browserCookieNames ?? process.env.ORACLE_BROWSER_COOKIE_NAMES);
-    const inline = await resolveInlineCookies({
+    let inline = await resolveInlineCookies({
         inlineArg: options.browserInlineCookies,
         inlineFileArg: options.browserInlineCookiesFile,
         envPayload: process.env.ORACLE_BROWSER_COOKIES_JSON,
         envFile: process.env.ORACLE_BROWSER_COOKIES_FILE,
         cwd: process.cwd(),
     });
+    if (inline?.source?.startsWith('home:') && options.browserNoCookieSync !== true) {
+        inline = undefined;
+    }
     let remoteChrome;
     if (options.remoteChrome) {
         remoteChrome = parseRemoteChromeTarget(options.remoteChrome);
@@ -63,7 +68,7 @@ export async function buildBrowserConfig(options) {
         : shouldUseOverride
             ? desiredModelOverride
             : mapModelToBrowserLabel(options.model);
-    if (url && isTemporaryChatUrl(url) && /\bpro\b/i.test(desiredModel ?? '')) {
+    if (modelStrategy === 'select' && url && isTemporaryChatUrl(url) && /\bpro\b/i.test(desiredModel ?? '')) {
         throw new Error('Temporary Chat mode does not expose Pro models in the ChatGPT model picker. ' +
             'Remove "temporary-chat=true" from --chatgpt-url (or omit --chatgpt-url), or use a non-Pro model (e.g. --model gpt-5.2).');
     }
@@ -86,6 +91,7 @@ export async function buildBrowserConfig(options) {
         manualLogin: options.browserManualLogin ? true : undefined,
         hideWindow: options.browserHideWindow ? true : undefined,
         desiredModel,
+        modelStrategy,
         debug: options.verbose ? true : undefined,
         // Allow cookie failures by default so runs can continue without Chrome/Keychain secrets.
         allowCookieErrors: options.browserAllowCookieErrors ?? true,