@steipete/oracle 0.17.3 → 0.19.0

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

@@ -3,7 +3,7 @@ import { buildConversationTurnListExpression } from "../conversationTurns.js";
 import { delay } from "../utils.js";
 import { isDeepResearchIncompleteText } from "../deepResearchResult.js";
 import { buildClickDispatcher } from "./domEvents.js";
-import { captureAssistantMarkdown, readAssistantSnapshot } from "./assistantResponse.js";
+import { captureAssistantMarkdown, readAssistantSnapshot, throwIfAssistantUiError, } from "./assistantResponse.js";
 import { BrowserAutomationError } from "../../oracle/errors.js";
 /**
  * Activates Deep Research mode through ChatGPT's composer tools menu and
@@ -248,6 +248,7 @@ export async function waitForDeepResearchCompletion(Runtime, logger, timeoutMs =
  */
 export async function extractDeepResearchResult(Runtime, logger, minTurnIndex) {
     const snapshot = await readAssistantSnapshot(Runtime, minTurnIndex);
+    throwIfAssistantUiError(snapshot);
     const meta = {
         turnId: snapshot?.turnId ?? null,
         messageId: snapshot?.messageId ?? null,

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

@@ -1,6 +1,7 @@
 import { COMPOSER_MODEL_SIGNAL_SELECTOR, MENU_CONTAINER_SELECTOR, MENU_ITEM_SELECTOR, MODEL_BUTTON_SELECTOR, } from "../constants.js";
 import { logDomFailure } from "../domDebug.js";
 import { buildClickDispatcher } from "./domEvents.js";
+import { throwIfThrottled } from "../chatgptThrottle.js";
 import { delay } from "../utils.js";
 const LEGACY_PRO_VERSION_WORD_TOKENS = ["5 4", "5 2", "5 1", "5 0", "gpt 5 pro"];
 const LEGACY_PRO_VERSION_COMPACT_TOKENS = ["gpt54", "gpt52", "gpt51", "gpt50"];
@@ -55,6 +56,11 @@ export async function ensureModelSelection(Runtime, desiredModel, logger, strate
         }
         case "option-not-found": {
             await logDomFailure(Runtime, logger, "model-switcher-option");
+            // Check for a rate-limit notice before blaming the model name. The notice
+            // is a plain dialog, so its "Got it" button reads as an available option to
+            // the menu scrape — which turns "wait a few minutes" into "your model does
+            // not exist", and sends the reader after the wrong bug.
+            await throwIfThrottled(Runtime, { stage: "model-selection" }, logger);
             const isTemporary = result.hint?.temporaryChat ?? false;
             const available = (result.hint?.availableOptions ?? []).filter(Boolean);
             const availableHint = available.length > 0 ? ` Available: ${available.join(", ")}.` : "";
@@ -65,6 +71,7 @@ export async function ensureModelSelection(Runtime, desiredModel, logger, strate
         }
         default: {
             await logDomFailure(Runtime, logger, "model-switcher-button");
+            await throwIfThrottled(Runtime, { stage: "model-selection" }, logger);
             throw new Error("Unable to locate the ChatGPT model selector button. If the desired model is already selected in the browser, retry with --browser-model-strategy current; otherwise retry with --browser-model-strategy ignore to skip model selection.");
         }
     }
@@ -406,10 +413,10 @@ function buildModelSelectionExpression(targetModel, strategy) {
     const ADVANCED_VIEW_SELECTOR = '[data-testid="composer-model-picker-slider-advanced-view"]';
     const INTELLIGENCE_PICKER_SELECTOR = '[data-testid="composer-intelligence-picker-content"]';
     const SUBMENU_OPENER_SELECTOR = '[role="menuitem"][aria-haspopup="menu"]';
-    const ADVANCED_WORDS = ['advanced', 'erweitert', '高级', 'avanzado', 'avancado', 'avance'];
-    const MODEL_WORDS = ['model', 'modell', '模型', 'modelo', 'modello', 'modele'];
+    const ADVANCED_WORDS = ['advanced', 'erweitert', '高级', '고급', 'avanzado', 'avancado', 'avance'];
+    const MODEL_WORDS = ['model', 'modell', '模型', '모델', 'modelo', 'modello', 'modele'];
     const EFFORT_WORDS = [
-      'effort', 'aufwand', '强度', '努力',
+      'effort', 'aufwand', '强度', '努力', '추론 수준',
       'esfuerzo', 'esforco', 'sforzo', 'inspanning', 'wysilek',
     ];
     const pickerNodeLabel = (node) => {
@@ -420,6 +427,7 @@ function buildModelSelectionExpression(targetModel, strategy) {
           .toLowerCase()
           .normalize('NFD')
           .replace(/[\u0300-\u036f]/g, '')
+          .normalize('NFC')
           .replace(/\\s+/g, ' ')
           .trim();
       } catch {
@@ -686,6 +694,8 @@ function buildModelSelectionExpression(targetModel, strategy) {
         node.getAttribute('data-composer-intelligence-pro-effort-action') === 'true' ||
         Boolean(node.closest('[data-model-picker-thinking-effort-action="true"]')) ||
         Boolean(node.closest('[data-composer-intelligence-pro-effort-action="true"]')) ||
+        (isUnifiedPickerMenu(menu) && isSubmenuOpener(node) &&
+          containsPickerWord(pickerNodeLabel(node), EFFORT_WORDS)) ||
         isDetachedProEffortMenu(menu));
     const optionIsSelected = (node) => {
       if (!(node instanceof HTMLElement)) {

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

@@ -483,7 +483,7 @@ export async function ensurePromptReady(Runtime, timeoutMs, logger) {
         throw new Error("Prompt textarea did not appear before timeout");
     }
 }
-function conversationIdFromUrl(value) {
+export function conversationIdFromUrl(value) {
     if (!value)
         return null;
     try {