@steipete/oracle 0.7.6 → 0.8.1

package/dist/src/browser/modelStrategy.js

@@ -0,0 +1,13 @@
+export function normalizeBrowserModelStrategy(value) {
+    if (value == null) {
+        return undefined;
+    }
+    const normalized = value.trim().toLowerCase();
+    if (!normalized) {
+        return undefined;
+    }
+    if (normalized === 'select' || normalized === 'current' || normalized === 'ignore') {
+        return normalized;
+    }
+    throw new Error(`Invalid browser model strategy: "${value}". Expected "select", "current", or "ignore".`);
+}

package/dist/src/browser/pageActions.js

@@ -1,5 +1,5 @@
 export { navigateToChatGPT, ensureNotBlocked, ensureLoggedIn, ensurePromptReady } from './actions/navigation.js';
 export { ensureModelSelection } from './actions/modelSelection.js';
 export { submitPrompt, clearPromptComposer } from './actions/promptComposer.js';
-export { uploadAttachmentFile, waitForAttachmentCompletion, waitForUserTurnAttachments } from './actions/attachments.js';
-export { waitForAssistantResponse, readAssistantSnapshot, captureAssistantMarkdown, buildAssistantExtractorForTest, buildConversationDebugExpressionForTest, } from './actions/assistantResponse.js';
+export { clearComposerAttachments, uploadAttachmentFile, waitForAttachmentCompletion, waitForUserTurnAttachments, } from './actions/attachments.js';
+export { waitForAssistantResponse, readAssistantSnapshot, captureAssistantMarkdown, buildAssistantExtractorForTest, buildConversationDebugExpressionForTest, buildMarkdownFallbackExtractorForTest, buildCopyExpressionForTest, } from './actions/assistantResponse.js';

package/dist/src/browser/profileState.js

@@ -105,6 +105,22 @@ export async function verifyDevToolsReachable({ port, host = '127.0.0.1', attemp
     }
     return { ok: false, error: 'unreachable' };
 }
+export async function shouldCleanupManualLoginProfileState(userDataDir, logger, options = {}) {
+    if (!options.connectionClosedUnexpectedly) {
+        return true;
+    }
+    const port = await readDevToolsPort(userDataDir);
+    if (!port) {
+        return true;
+    }
+    const probe = await (options.probe ?? verifyDevToolsReachable)({ port, host: options.host });
+    if (probe.ok) {
+        logger?.(`DevTools port ${port} still reachable; preserving manual-login profile state`);
+        return false;
+    }
+    logger?.(`DevTools port ${port} unreachable (${probe.error}); clearing stale profile state`);
+    return true;
+}
 export async function cleanupStaleProfileState(userDataDir, logger, options = {}) {
     for (const candidate of getDevToolsActivePortPaths(userDataDir)) {
         try {

package/dist/src/browser/reattach.js

@@ -7,24 +7,8 @@ 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 { cleanupStaleProfileState } from './profileState.js';
+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 +42,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 +63,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 +77,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 +134,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 +146,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();
@@ -164,169 +160,21 @@ async function resumeBrowserSessionViaNewChrome(runtime, config, logger, deps) {
             // ignore
         }
     }
-    if (!resolved.keepBrowser && !manualLogin) {
+    if (!resolved.keepBrowser) {
         try {
             await chrome.kill();
         }
         catch {
             // ignore
         }
-        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();
+        if (manualLogin) {
+            await cleanupStaleProfileState(userDataDir, logger, { lockRemovalMode: 'never' }).catch(() => undefined);
         }
-      }
-      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;
+        else {
+            await rm(userDataDir, { recursive: true, force: true }).catch(() => undefined);
         }
-        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__ = {