ask-pro 0.1.44 → 0.1.48

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

@@ -100,6 +100,8 @@ async function waitForAssistantResponseOnce(Runtime, timeoutMs, logger, minTurnI
         const winner = await Promise.race([raceReadyEvaluation, pollerPromise]);
         if (winner.kind === "poll") {
             if (!winner.value) {
+                evaluationPromise.catch(() => undefined);
+                await terminateRuntimeExecution(Runtime);
                 throw { source: "poll", error: new Error(ASSISTANT_POLL_TIMEOUT_ERROR) };
             }
             logger("Captured assistant response via snapshot watchdog");
@@ -120,7 +122,7 @@ async function waitForAssistantResponseOnce(Runtime, timeoutMs, logger, minTurnI
             if (source === "poll" &&
                 error instanceof Error &&
                 error.message === ASSISTANT_POLL_TIMEOUT_ERROR) {
-                evaluation = await evaluationPromise;
+                throw new Error("Timed out waiting for assistant response");
             }
             else if (source === "poll") {
                 pollerAbort.abort();
@@ -385,7 +387,7 @@ async function pollAssistantCompletion(Runtime, timeoutMs, minTurnIndex, expecte
 async function isStopButtonVisible(Runtime) {
     try {
         const { result } = await Runtime.evaluate({
-            expression: `Boolean(document.querySelector('${STOP_BUTTON_SELECTOR}'))`,
+            expression: visibleStopButtonExpression(JSON.stringify(STOP_BUTTON_SELECTOR)),
             returnByValue: true,
         });
         return Boolean(result?.value);
@@ -394,6 +396,13 @@ async function isStopButtonVisible(Runtime) {
         return false;
     }
 }
+function visibleStopButtonExpression(selector) {
+    return `Array.from(document.querySelectorAll(${selector})).some((node) => {
+    const style = getComputedStyle(node);
+    const rect = node.getBoundingClientRect();
+    return rect.width > 0 && rect.height > 0 && style.visibility !== 'hidden' && style.display !== 'none' && style.opacity !== '0';
+  })`;
+}
 async function isCompletionVisible(Runtime) {
     try {
         const { result } = await Runtime.evaluate({
@@ -676,7 +685,7 @@ function buildResponseObserverExpression(timeoutMs, minTurnIndex, expectedConver
         } else {
           stableCycles += 1;
         }
-        const stopVisible = Boolean(document.querySelector(STOP_SELECTOR));
+        const stopVisible = ${visibleStopButtonExpression("STOP_SELECTOR")};
         const finishedVisible = isLastAssistantTurnFinished();
 
         if (finishedVisible || (!stopVisible && stableCycles >= stableTarget)) {
@@ -772,7 +781,7 @@ function buildAssistantExtractor(functionName) {
         button => (button.textContent || '').trim().toLowerCase() === 'stopped thinking',
       );
       if (index === turns.length - 1 && stopped && turnText.toLowerCase() === 'stopped thinking' &&
-          !document.querySelector('${STOP_BUTTON_SELECTOR}')) {
+          !(${visibleStopButtonExpression(JSON.stringify(STOP_BUTTON_SELECTOR))})) {
         return { text: '', stoppedWithoutAnswer: true, turnIndex: index };
       }
       expandCollapsibles(messageRoot);
@@ -868,7 +877,7 @@ function buildMarkdownFallbackExtractor(minTurnLiteral) {
       document.querySelector('[role="main"]'),
     ].filter(Boolean);
     if (roots.length === 0) return null;
-    const markdownSelector = '.markdown,[data-message-content],[data-testid*="message"],.prose,[class*="markdown"]';
+    const markdownSelector = 'div[class*="MarkdownRoot-"],.markdown,[data-message-content],[data-testid*="message"],.prose,[class*="markdown"]';
     const isExcluded = (node) =>
       Boolean(
         node?.querySelector?.('[data-streaming-response-status]') || node?.closest?.(
@@ -923,6 +932,7 @@ function buildMarkdownFallbackExtractor(minTurnLiteral) {
     };
     const markdowns = Array.from(root.querySelectorAll(markdownSelector))
       .filter((node) => !isExcluded(node))
+      .filter((node) => !node.closest('div[class*="MarkdownRoot-"]') || node.matches('div[class*="MarkdownRoot-"]'))
       .filter((node) => {
         const container = node.closest('[data-message-author-role], [data-turn]');
         if (!container) return true;
@@ -942,6 +952,7 @@ function buildMarkdownFallbackExtractor(minTurnLiteral) {
       if (!container || container === root || container === document.body) continue;
       const scoped = Array.from(container.querySelectorAll(markdownSelector))
         .filter((node) => !isExcluded(node))
+        .filter((node) => !node.closest('div[class*="MarkdownRoot-"]') || node.matches('div[class*="MarkdownRoot-"]'))
         .filter((node) => {
           const roleNode = node.closest('[data-message-author-role], [data-turn]');
           if (!roleNode) return true;
@@ -1242,4 +1253,5 @@ function cleanAssistantText(text) {
 export const __test__ = {
     buildResponseObserverExpression,
     recoverAssistantResponse,
+    visibleStopButtonExpression,
 };

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

@@ -281,6 +281,7 @@ function buildThinkingTimeExpression(level) {
         const text = normalize(menu.textContent ?? '');
         const testId = normalize(menu.getAttribute?.('data-testid') ?? '');
         return (
+          Boolean(menu.querySelector('[data-reasoning-slider="true"] [role="slider"][aria-valuemax]')) ||
           testId.includes('composer intelligence picker content') ||
           (
             text.includes('intelligence') &&
@@ -297,22 +298,21 @@ function buildThinkingTimeExpression(level) {
       if (!menu) return null;
       const target = findOptionInMenu(menu, { currentIntelligence: true });
       if (!target) {
-        const slider = menu.querySelector(
-          '[data-model-reasoning-effort-slider] [role="slider"][aria-valuemax]'
-        );
+        const slider = menu.querySelector('[role="slider"][aria-valuemax]');
         if (TARGET_LEVEL !== 'pro' || !slider) return null;
         const max = Number(slider.getAttribute('aria-valuemax'));
         const before = Number(slider.getAttribute('aria-valuenow'));
         if (!Number.isFinite(max) || !Number.isFinite(before)) return null;
         if (before < max) {
-          slider.focus?.();
-          slider.dispatchEvent(new KeyboardEvent('keydown', { key: 'End', code: 'End', bubbles: true }));
-          slider.dispatchEvent(new KeyboardEvent('keyup', { key: 'End', code: 'End', bubbles: true }));
-          await sleep(STEP_WAIT_MS);
-          const updated = findCurrentIntelligenceMenu()?.querySelector(
-            '[data-model-reasoning-effort-slider] [role="slider"][aria-valuemax]'
-          ) ?? slider;
-          if (Number(updated.getAttribute('aria-valuenow')) < max) return null;
+          const control = slider.closest?.('[data-reasoning-slider="true"]') ?? slider;
+          control.focus?.();
+          for (let step = 0; step < 5; step++) {
+            if (Number(menu.querySelector('[role="slider"][aria-valuemax]')?.getAttribute('aria-valuenow')) >= max) break;
+            control.dispatchEvent(new KeyboardEvent('keydown', { key: 'ArrowRight', code: 'ArrowRight', bubbles: true }));
+            control.dispatchEvent(new KeyboardEvent('keyup', { key: 'ArrowRight', code: 'ArrowRight', bubbles: true }));
+            await sleep(STEP_WAIT_MS);
+          }
+          if (Number(menu.querySelector('[role="slider"][aria-valuemax]')?.getAttribute('aria-valuenow')) < max) return null;
         }
         return { status: before >= max ? 'already-selected' : 'switched', label: 'Pro' };
       }

package/dist/src/browser/constants.js

@@ -63,7 +63,7 @@ export const UPLOAD_STATUS_SELECTORS = [
     '[aria-live="polite"]',
     '[aria-live="assertive"]',
 ];
-export const STOP_BUTTON_SELECTOR = '[data-testid="stop-button"]';
+export const STOP_BUTTON_SELECTOR = '[data-testid="stop-button"], button[aria-label="Stop"]';
 export const SEND_BUTTON_SELECTORS = [
     'button[data-testid="send-button"]',
     'button[data-testid*="composer-send"]',
@@ -72,7 +72,7 @@ export const SEND_BUTTON_SELECTORS = [
     'button[aria-label*="Send"]',
 ];
 export const SEND_BUTTON_SELECTOR = SEND_BUTTON_SELECTORS[0];
-export const MODEL_BUTTON_SELECTOR = '[data-testid="model-switcher-dropdown-button"], button.__composer-pill[aria-haspopup="menu"], button.__composer-pill';
+export const MODEL_BUTTON_SELECTOR = 'button[aria-label="Select ChatGPT model"], [data-testid="model-switcher-dropdown-button"], button.__composer-pill[aria-haspopup="menu"], button.__composer-pill';
 export const COPY_BUTTON_SELECTORS = [
     'button[data-testid="copy-turn-action-button"]',
     'button[aria-label="Copy response"]',

package/dist/src/browser/index.js

@@ -20,7 +20,7 @@ import { CHATGPT_URL, CONVERSATION_TURN_SELECTOR, DEFAULT_MODEL_STRATEGY } from
 import { AssistantStoppedError, BrowserAutomationError } from "./errors.js";
 import { defaultAskProBrowserProfileDir } from "./profilePaths.js";
 import { applyPageLanguageOverrides, seedChromeProfileLanguage } from "./language.js";
-import { alignPromptEchoPair, buildPromptEchoMatcher, withTimeout } from "./reattachHelpers.js";
+import { alignPromptEchoPair, buildPromptEchoMatcher, extractConversationIdFromUrl, withTimeout, } from "./reattachHelpers.js";
 import { cleanupStaleProfileState, acquireProfileRunLock, createManagedChromeRunLease, releaseManagedChromeRunLeaseAndCountPeers, readDevToolsPort, shouldCleanupManualLoginProfileState, verifyDevToolsReachable, writeChromePid, writeDevToolsActivePort, } from "./profileState.js";
 import { runProviderSubmissionFlow } from "./providerDomFlow.js";
 import { chatgptDomProvider } from "./providers/chatgptDomProvider.js";
@@ -851,13 +851,7 @@ export async function runBrowserMode(options) {
                         logger(`[retry] Model picker attempt ${attempt + 1}: ${error instanceof Error ? error.message : error}`);
                     }
                 },
-            })).catch((error) => {
-                const base = error instanceof Error ? error.message : String(error);
-                const hint = appliedCookies === 0
-                    ? " No cookies were applied; sign in to ChatGPT in the opened browser, then resume."
-                    : "";
-                throw new Error(`${base}${hint}`);
-            });
+            }));
             await raceWithDisconnect(ensurePromptReady(Runtime, config.inputTimeoutMs, logger));
             logger(`Prompt textarea ready (after model switch, ${promptText.length.toLocaleString()} chars queued)`);
         }
@@ -2375,7 +2369,9 @@ export const __test__ = {
     isLoginRecoveryUrl,
     isEligibleManualLoginRecoveryTarget,
     isRecoveredTargetOwned,
+    isConversationUrl,
     waitForLogin,
+    waitForAssistantResponseWithReload,
 };
 export { syncCookies } from "./cookies.js";
 export { navigateToChatGPT, ensureNotBlocked, ensurePromptReady, ensureModelSelection, submitPrompt, waitForAssistantResponse, captureAssistantMarkdown, uploadAttachmentFile, waitForAttachmentCompletion, } from "./pageActions.js";
@@ -2388,6 +2384,7 @@ export function isWebSocketClosureError(error) {
         message.includes("target closed"));
 }
 async function waitForAssistantResponseWithReload(Runtime, Page, timeoutMs, logger, minTurnIndex, expectedConversationUrl, expectedConversationId, continueResponse) {
+    const deadline = Date.now() + timeoutMs;
     try {
         return await waitForAssistantResponse(Runtime, timeoutMs, logger, minTurnIndex, expectedConversationId, continueResponse);
     }
@@ -2399,10 +2396,13 @@ async function waitForAssistantResponseWithReload(Runtime, Page, timeoutMs, logg
         if (!conversationUrl || !isConversationUrl(conversationUrl)) {
             throw error;
         }
+        const remainingMs = deadline - Date.now();
+        if (remainingMs <= 0)
+            throw error;
         logger("Assistant response stalled; reloading conversation and retrying once");
         await Page.navigate({ url: conversationUrl });
         await delay(1000);
-        return await waitForAssistantResponse(Runtime, timeoutMs, logger, minTurnIndex, expectedConversationId, continueResponse);
+        return await waitForAssistantResponse(Runtime, Math.max(1, deadline - Date.now()), logger, minTurnIndex, expectedConversationId, continueResponse);
     }
 }
 function shouldReloadAfterAssistantError(error) {
@@ -2567,7 +2567,7 @@ async function readConversationTurnCount(Runtime, logger) {
     return null;
 }
 function isConversationUrl(url) {
-    return /\/c\/[a-z0-9-]+/i.test(url);
+    return Boolean(extractConversationIdFromUrl(url));
 }
 function describeDevtoolsFirewallHint(host, port) {
     if (!isWsl())
@@ -2589,10 +2589,6 @@ function isWsl() {
         return true;
     return os.release().toLowerCase().includes("microsoft");
 }
-function extractConversationIdFromUrl(url) {
-    const match = url.match(/\/c\/([a-zA-Z0-9-]+)/);
-    return match?.[1];
-}
 async function resolveUserDataBaseDir() {
     // On WSL, Chrome launched via Windows can choke on UNC paths; prefer a Windows-backed temp folder.
     if (isWsl()) {

package/dist/src/browser/reattach.js

@@ -89,6 +89,9 @@ async function closeManagedChromeIfUnused(chrome, userDataDir, inspectRemainingP
     await cleanupStaleProfileState(userDataDir, logger, { lockRemovalMode: "never" }).catch(() => undefined);
 }
 export async function resumeBrowserSession(runtime, config, logger, deps = {}) {
+    if (runtime.conversationId === "WEB" && runtime.tabUrl?.includes("/c/WEB:")) {
+        runtime = { ...runtime, conversationId: undefined, tabUrl: undefined };
+    }
     deps = { ...deps, continuationState: deps.continuationState ?? { used: false } };
     const recoverSession = deps.recoverSession ??
         (async (runtimeMeta, configMeta) => resumeBrowserSessionViaNewChrome(runtimeMeta, configMeta, logger, deps));

package/dist/src/browser/reattachHelpers.js

@@ -21,12 +21,12 @@ export function pickTarget(targets, runtime) {
 export function extractConversationIdFromUrl(url) {
     if (!url)
         return undefined;
-    const match = url.match(/\/c\/([a-zA-Z0-9-]+)/);
+    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/")) {
+        if (extractConversationIdFromUrl(runtime.tabUrl)) {
             return runtime.tabUrl;
         }
         return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ask-pro",
-  "version": "0.1.44",
+  "version": "0.1.48",
   "description": "Browser-backed ChatGPT Pro escalation for hard engineering questions.",
   "keywords": [
     "agents",