@steipete/oracle 0.6.1 → 0.7.1

package/dist/src/browser/constants.js

@@ -1,5 +1,5 @@
 export const CHATGPT_URL = 'https://chatgpt.com/';
-export const DEFAULT_MODEL_TARGET = 'ChatGPT 5.2';
+export const DEFAULT_MODEL_TARGET = 'GPT-5.2 Pro';
 export const COOKIE_URLS = ['https://chatgpt.com', 'https://chat.openai.com', 'https://atlas.openai.com'];
 export const INPUT_SELECTORS = [
     'textarea[data-id="prompt-textarea"]',
@@ -13,13 +13,17 @@ export const INPUT_SELECTORS = [
 ];
 export const ANSWER_SELECTORS = [
     'article[data-testid^="conversation-turn"][data-message-author-role="assistant"]',
+    'article[data-testid^="conversation-turn"][data-turn="assistant"]',
     'article[data-testid^="conversation-turn"] [data-message-author-role="assistant"]',
+    'article[data-testid^="conversation-turn"] [data-turn="assistant"]',
     'article[data-testid^="conversation-turn"] .markdown',
     '[data-message-author-role="assistant"] .markdown',
+    '[data-turn="assistant"] .markdown',
     '[data-message-author-role="assistant"]',
+    '[data-turn="assistant"]',
 ];
 export const CONVERSATION_TURN_SELECTOR = 'article[data-testid^="conversation-turn"]';
-export const ASSISTANT_ROLE_SELECTOR = '[data-message-author-role="assistant"]';
+export const ASSISTANT_ROLE_SELECTOR = '[data-message-author-role="assistant"], [data-turn="assistant"]';
 export const CLOUDFLARE_SCRIPT_SELECTOR = 'script[src*="/challenge-platform/"]';
 export const CLOUDFLARE_TITLE = 'just a moment';
 export const PROMPT_PRIMARY_SELECTOR = '#prompt-textarea';

package/dist/src/browser/index.js

@@ -285,7 +285,10 @@ export async function runBrowserMode(options) {
                     logger(`Uploading attachment: ${attachment.displayPath}`);
                     await uploadAttachmentFile({ runtime: Runtime, dom: DOM }, attachment, logger);
                 }
-                const waitBudget = Math.max(config.inputTimeoutMs ?? 30_000, 30_000);
+                // Scale timeout based on number of files: base 30s + 15s per additional file
+                const baseTimeout = config.inputTimeoutMs ?? 30_000;
+                const perFileTimeout = 15_000;
+                const waitBudget = Math.max(baseTimeout, 30_000) + (submissionAttachments.length - 1) * perFileTimeout;
                 await waitForAttachmentCompletion(Runtime, waitBudget, attachmentNames, logger);
                 logger('All attachments uploaded');
             }
@@ -327,10 +330,13 @@ export async function runBrowserMode(options) {
             },
         })).catch(() => null);
         answerMarkdown = copiedMarkdown ?? answerText;
+        // Helper to normalize text for echo detection (collapse whitespace, lowercase)
+        const normalizeForComparison = (text) => text.toLowerCase().replace(/\s+/g, ' ').trim();
         // Final sanity check: ensure we didn't accidentally capture the user prompt instead of the assistant turn.
         const finalSnapshot = await readAssistantSnapshot(Runtime).catch(() => null);
         const finalText = typeof finalSnapshot?.text === 'string' ? finalSnapshot.text.trim() : '';
-        if (finalText &&
+        if (!copiedMarkdown &&
+            finalText &&
             finalText !== answerMarkdown.trim() &&
             finalText !== promptText.trim() &&
             finalText.length >= answerMarkdown.trim().length) {
@@ -338,14 +344,26 @@ export async function runBrowserMode(options) {
             answerText = finalText;
             answerMarkdown = finalText;
         }
-        if (answerMarkdown.trim() === promptText.trim()) {
+        // Detect prompt echo using normalized comparison (whitespace-insensitive)
+        const normalizedAnswer = normalizeForComparison(answerMarkdown);
+        const normalizedPrompt = normalizeForComparison(promptText);
+        const promptPrefix = normalizedPrompt.length >= 80
+            ? normalizedPrompt.slice(0, Math.min(200, normalizedPrompt.length))
+            : '';
+        const isPromptEcho = normalizedAnswer === normalizedPrompt || (promptPrefix.length > 0 && normalizedAnswer.startsWith(promptPrefix));
+        if (isPromptEcho) {
+            logger('Detected prompt echo in response; waiting for actual assistant response...');
             const deadline = Date.now() + 8_000;
             let bestText = null;
             let stableCount = 0;
             while (Date.now() < deadline) {
                 const snapshot = await readAssistantSnapshot(Runtime).catch(() => null);
                 const text = typeof snapshot?.text === 'string' ? snapshot.text.trim() : '';
-                if (text && text !== promptText.trim()) {
+                const normalizedText = normalizeForComparison(text);
+                const isStillEcho = !text ||
+                    normalizedText === normalizedPrompt ||
+                    (promptPrefix.length > 0 && normalizedText.startsWith(promptPrefix));
+                if (!isStillEcho) {
                     if (!bestText || text.length > bestText.length) {
                         bestText = text;
                         stableCount = 0;
@@ -661,7 +679,10 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
                     logger(`Uploading attachment: ${attachment.displayPath}`);
                     await uploadAttachmentViaDataTransfer({ runtime: Runtime, dom: DOM }, attachment, logger);
                 }
-                const waitBudget = Math.max(config.inputTimeoutMs ?? 30_000, 30_000);
+                // Scale timeout based on number of files: base 30s + 15s per additional file
+                const baseTimeout = config.inputTimeoutMs ?? 30_000;
+                const perFileTimeout = 15_000;
+                const waitBudget = Math.max(baseTimeout, 30_000) + (submissionAttachments.length - 1) * perFileTimeout;
                 await waitForAttachmentCompletion(Runtime, waitBudget, attachmentNames, logger);
                 logger('All attachments uploaded');
             }
@@ -703,6 +724,58 @@ async function runRemoteBrowserMode(promptText, attachments, config, logger, opt
             },
         }).catch(() => null);
         answerMarkdown = copiedMarkdown ?? answerText;
+        // Helper to normalize text for echo detection (collapse whitespace, lowercase)
+        const normalizeForComparison = (text) => text.toLowerCase().replace(/\s+/g, ' ').trim();
+        // Final sanity check: ensure we didn't accidentally capture the user prompt instead of the assistant turn.
+        const finalSnapshot = await readAssistantSnapshot(Runtime).catch(() => null);
+        const finalText = typeof finalSnapshot?.text === 'string' ? finalSnapshot.text.trim() : '';
+        if (finalText &&
+            finalText !== answerMarkdown.trim() &&
+            finalText !== promptText.trim() &&
+            finalText.length >= answerMarkdown.trim().length) {
+            logger('Refreshed assistant response via final DOM snapshot');
+            answerText = finalText;
+            answerMarkdown = finalText;
+        }
+        // Detect prompt echo using normalized comparison (whitespace-insensitive)
+        const normalizedAnswer = normalizeForComparison(answerMarkdown);
+        const normalizedPrompt = normalizeForComparison(promptText);
+        const promptPrefix = normalizedPrompt.length >= 80
+            ? normalizedPrompt.slice(0, Math.min(200, normalizedPrompt.length))
+            : '';
+        const isPromptEcho = normalizedAnswer === normalizedPrompt || (promptPrefix.length > 0 && normalizedAnswer.startsWith(promptPrefix));
+        if (isPromptEcho) {
+            logger('Detected prompt echo in response; waiting for actual assistant response...');
+            const deadline = Date.now() + 8_000;
+            let bestText = null;
+            let stableCount = 0;
+            while (Date.now() < deadline) {
+                const snapshot = await readAssistantSnapshot(Runtime).catch(() => null);
+                const text = typeof snapshot?.text === 'string' ? snapshot.text.trim() : '';
+                const normalizedText = normalizeForComparison(text);
+                const isStillEcho = !text ||
+                    normalizedText === normalizedPrompt ||
+                    (promptPrefix.length > 0 && normalizedText.startsWith(promptPrefix));
+                if (!isStillEcho) {
+                    if (!bestText || text.length > bestText.length) {
+                        bestText = text;
+                        stableCount = 0;
+                    }
+                    else if (text === bestText) {
+                        stableCount += 1;
+                    }
+                    if (stableCount >= 2) {
+                        break;
+                    }
+                }
+                await new Promise((resolve) => setTimeout(resolve, 300));
+            }
+            if (bestText) {
+                logger('Recovered assistant response after detecting prompt echo');
+                answerText = bestText;
+                answerMarkdown = bestText;
+            }
+        }
         stopThinkingMonitor?.();
         const durationMs = Date.now() - startedAt;
         const answerChars = answerText.length;

package/dist/src/browser/prompt.js

@@ -6,10 +6,32 @@ import { isKnownModel } from '../oracle/modelResolver.js';
 import { buildPromptMarkdown } from '../oracle/promptAssembly.js';
 import { buildAttachmentPlan } from './policies.js';
 const DEFAULT_BROWSER_INLINE_CHAR_BUDGET = 60_000;
+const MEDIA_EXTENSIONS = new Set([
+    '.mp4', '.mov', '.avi', '.mkv', '.webm', '.m4v',
+    '.mp3', '.wav', '.aac', '.flac', '.ogg', '.m4a',
+    '.jpg', '.jpeg', '.png', '.gif', '.webp', '.bmp', '.svg', '.heic', '.heif',
+    '.pdf',
+]);
+export function isMediaFile(filePath) {
+    const ext = path.extname(filePath).toLowerCase();
+    return MEDIA_EXTENSIONS.has(ext);
+}
 export async function assembleBrowserPrompt(runOptions, deps = {}) {
     const cwd = deps.cwd ?? process.cwd();
     const readFilesFn = deps.readFilesImpl ?? readFiles;
-    const files = await readFilesFn(runOptions.file ?? [], { cwd });
+    const allFilePaths = runOptions.file ?? [];
+    const textFilePaths = allFilePaths.filter((f) => !isMediaFile(f));
+    const mediaFilePaths = allFilePaths.filter((f) => isMediaFile(f));
+    const mediaAttachments = await Promise.all(mediaFilePaths.map(async (filePath) => {
+        const resolvedPath = path.isAbsolute(filePath) ? filePath : path.resolve(cwd, filePath);
+        const stats = await fs.stat(resolvedPath);
+        return {
+            path: resolvedPath,
+            displayPath: path.relative(cwd, resolvedPath) || path.basename(resolvedPath),
+            sizeBytes: stats.size,
+        };
+    }));
+    const files = await readFilesFn(textFilePaths, { cwd });
     const basePrompt = (runOptions.prompt ?? '').trim();
     const userPrompt = basePrompt;
     const systemPrompt = runOptions.system?.trim() || '';
@@ -40,9 +62,10 @@ export async function assembleBrowserPrompt(runOptions, deps = {}) {
         .filter(Boolean)
         .join('\n\n')
         .trim();
-    const attachments = selectedPlan.attachments.slice();
+    const attachments = [...selectedPlan.attachments, ...mediaAttachments];
     const shouldBundle = selectedPlan.shouldBundle;
     let bundleText = null;
+    let bundled = null;
     if (shouldBundle) {
         const bundleDir = await fs.mkdtemp(path.join(os.tmpdir(), 'oracle-browser-bundle-'));
         const bundlePath = path.join(bundleDir, 'attachments-bundle.txt');
@@ -59,6 +82,8 @@ export async function assembleBrowserPrompt(runOptions, deps = {}) {
             displayPath: bundlePath,
             sizeBytes: Buffer.byteLength(bundleText, 'utf8'),
         });
+        attachments.push(...mediaAttachments);
+        bundled = { originalCount: sections.length, bundlePath };
     }
     const inlineFileCount = selectedPlan.inlineFileCount;
     const modelConfig = isKnownModel(runOptions.model) ? MODEL_CONFIGS[runOptions.model] : MODEL_CONFIGS['gpt-5.1'];
@@ -85,7 +110,7 @@ export async function assembleBrowserPrompt(runOptions, deps = {}) {
     let fallback = null;
     if (attachmentsPolicy === 'auto' && selectedPlan.mode === 'inline' && sections.length > 0) {
         const fallbackComposerText = baseComposerSections.join('\n\n').trim();
-        const fallbackAttachments = uploadPlan.attachments.slice();
+        const fallbackAttachments = [...uploadPlan.attachments, ...mediaAttachments];
         let fallbackBundled = null;
         if (uploadPlan.shouldBundle) {
             const bundleDir = await fs.mkdtemp(path.join(os.tmpdir(), 'oracle-browser-bundle-'));
@@ -103,6 +128,7 @@ export async function assembleBrowserPrompt(runOptions, deps = {}) {
                 displayPath: bundlePath,
                 sizeBytes: Buffer.byteLength(fallbackBundleText, 'utf8'),
             });
+            fallbackAttachments.push(...mediaAttachments);
             fallbackBundled = { originalCount: sections.length, bundlePath };
         }
         fallback = {
@@ -121,8 +147,6 @@ export async function assembleBrowserPrompt(runOptions, deps = {}) {
         attachmentsPolicy,
         attachmentMode: selectedPlan.mode,
         fallback,
-        bundled: shouldBundle && attachments.length === 1 && attachments[0]?.displayPath
-            ? { originalCount: sections.length, bundlePath: attachments[0].displayPath }
-            : null,
+        bundled,
     };
 }

package/dist/src/browser/sessionRunner.js

@@ -5,11 +5,6 @@ import { runBrowserMode } from '../browserMode.js';
 import { assembleBrowserPrompt } from './prompt.js';
 import { BrowserAutomationError } from '../oracle/errors.js';
 export async function runBrowserSessionExecution({ runOptions, browserConfig, cwd, log }, deps = {}) {
-    if (runOptions.model.startsWith('gemini')) {
-        throw new BrowserAutomationError('Gemini models are not available in browser mode. Re-run with --engine api.', {
-            stage: 'preflight',
-        });
-    }
     const assemblePrompt = deps.assemblePrompt ?? assembleBrowserPrompt;
     const executeBrowser = deps.executeBrowser ?? runBrowserMode;
     const promptArtifacts = await assemblePrompt(runOptions, { cwd });

package/dist/src/cli/browserConfig.js

@@ -6,19 +6,40 @@ const DEFAULT_BROWSER_TIMEOUT_MS = 1_200_000;
 const DEFAULT_BROWSER_INPUT_TIMEOUT_MS = 30_000;
 const DEFAULT_CHROME_PROFILE = 'Default';
 const BROWSER_MODEL_LABELS = {
-    'gpt-5-pro': 'GPT-5 Pro',
-    'gpt-5.1-pro': 'GPT-5.1 Pro',
-    'gpt-5.1': 'GPT-5.1',
-    'gpt-5.2': 'GPT-5.2 Thinking',
-    'gpt-5.2-instant': 'GPT-5.2 Instant',
+    // Browser engine supports GPT-5.2 and GPT-5.2 Pro (legacy/Pro aliases normalize to those targets).
+    'gpt-5-pro': 'GPT-5.2 Pro',
+    'gpt-5.1-pro': 'GPT-5.2 Pro',
+    'gpt-5.1': 'GPT-5.2',
+    'gpt-5.2': 'GPT-5.2',
+    // ChatGPT UI doesn't expose "instant" as a separate picker option; treat it as GPT-5.2 for browser automation.
+    'gpt-5.2-instant': 'GPT-5.2',
     'gpt-5.2-pro': 'GPT-5.2 Pro',
     'gemini-3-pro': 'Gemini 3 Pro',
 };
+export function normalizeChatGptModelForBrowser(model) {
+    const normalized = model.toLowerCase();
+    if (!normalized.startsWith('gpt-') || normalized.includes('codex')) {
+        return model;
+    }
+    // Pro variants: always resolve to the latest Pro model in ChatGPT.
+    if (normalized === 'gpt-5-pro' || normalized === 'gpt-5.1-pro' || normalized.endsWith('-pro')) {
+        return 'gpt-5.2-pro';
+    }
+    // Legacy / UI-mismatch variants: map to the closest ChatGPT picker target.
+    if (normalized === 'gpt-5.2-instant') {
+        return 'gpt-5.2';
+    }
+    if (normalized === 'gpt-5.1') {
+        return 'gpt-5.2';
+    }
+    return model;
+}
 export async function buildBrowserConfig(options) {
     const desiredModelOverride = options.browserModelLabel?.trim();
     const normalizedOverride = desiredModelOverride?.toLowerCase() ?? '';
     const baseModel = options.model.toLowerCase();
-    const shouldUseOverride = normalizedOverride.length > 0 && normalizedOverride !== baseModel;
+    const isChatGptModel = baseModel.startsWith('gpt-') && !baseModel.includes('codex');
+    const shouldUseOverride = !isChatGptModel && normalizedOverride.length > 0 && normalizedOverride !== baseModel;
     const cookieNames = parseCookieNames(options.browserCookieNames ?? process.env.ORACLE_BROWSER_COOKIE_NAMES);
     const inline = await resolveInlineCookies({
         inlineArg: options.browserInlineCookies,
@@ -51,7 +72,11 @@ export async function buildBrowserConfig(options) {
         keepBrowser: options.browserKeepBrowser ? true : undefined,
         manualLogin: options.browserManualLogin ? true : undefined,
         hideWindow: options.browserHideWindow ? true : undefined,
-        desiredModel: shouldUseOverride ? desiredModelOverride : mapModelToBrowserLabel(options.model),
+        desiredModel: isChatGptModel
+            ? mapModelToBrowserLabel(options.model)
+            : shouldUseOverride
+                ? desiredModelOverride
+                : mapModelToBrowserLabel(options.model),
         debug: options.verbose ? true : undefined,
         // Allow cookie failures by default so runs can continue without Chrome/Keychain secrets.
         allowCookieErrors: options.browserAllowCookieErrors ?? true,
@@ -69,7 +94,8 @@ function selectBrowserPort(options) {
     return candidate;
 }
 export function mapModelToBrowserLabel(model) {
-    return BROWSER_MODEL_LABELS[model] ?? DEFAULT_MODEL_TARGET;
+    const normalized = normalizeChatGptModelForBrowser(model);
+    return BROWSER_MODEL_LABELS[normalized] ?? DEFAULT_MODEL_TARGET;
 }
 export function resolveBrowserModelLabel(input, model) {
     const trimmed = input?.trim?.() ?? '';

package/dist/src/cli/help.js

@@ -38,7 +38,7 @@ export function applyHelpStyling(program, version, isTty) {
     program.addHelpText('after', () => renderHelpFooter(program, colors));
 }
 function renderHelpBanner(version, colors) {
-    const subtitle = 'Prompt + files required — GPT-5.1 Pro/GPT-5.1 for tough questions with code/file context.';
+    const subtitle = 'Prompt + files required — GPT-5.2 Pro/GPT-5.2 for tough questions with code/file context.';
     return `${colors.banner(`Oracle CLI v${version}`)} ${colors.subtitle(`— ${subtitle}`)}\n`;
 }
 function renderHelpFooter(program, colors) {
@@ -51,7 +51,7 @@ function renderHelpFooter(program, colors) {
         `${colors.bullet('•')} Best results: 6–30 sentences plus key source files; very short prompts often yield generic answers.`,
         `${colors.bullet('•')} Oracle is one-shot: it does not remember prior runs, so start fresh each time with full context.`,
         `${colors.bullet('•')} Run ${colors.accent('--files-report')} to inspect token spend before hitting the API.`,
-        `${colors.bullet('•')} Non-preview runs spawn detached sessions (especially gpt-5.1-pro API). If the CLI times out, do not re-run — reattach with ${colors.accent('oracle session <slug>')} to resume/inspect the existing run.`,
+        `${colors.bullet('•')} Non-preview runs spawn detached sessions (especially gpt-5.2-pro API). If the CLI times out, do not re-run — reattach with ${colors.accent('oracle session <slug>')} to resume/inspect the existing run.`,
         `${colors.bullet('•')} Set a memorable 3–5 word slug via ${colors.accent('--slug "<words>"')} to keep session IDs tidy.`,
         `${colors.bullet('•')} Finished sessions auto-hide preamble logs when reattached; raw timestamps remain in the saved log file.`,
         `${colors.bullet('•')} Need hidden flags? Run ${colors.accent(`${program.name()} --help --verbose`)} to list search/token/browser overrides.`,
@@ -61,7 +61,7 @@ function renderHelpFooter(program, colors) {
     const formatExample = (command, description) => `${colors.command(`  ${command}`)}\n${colors.muted(`    ${description}`)}`;
     const examples = [
         formatExample(`${program.name()} --render --copy --prompt "Review the TS data layer for schema drift" --file "src/**/*.ts,*/*.test.ts"`, 'Build the bundle, print it, and copy it for manual paste into ChatGPT.'),
-        formatExample(`${program.name()} --prompt "Cross-check the data layer assumptions" --models gpt-5.1-pro,gemini-3-pro --file "src/**/*.ts"`, 'Run multiple API models in one go and aggregate cost/usage.'),
+        formatExample(`${program.name()} --prompt "Cross-check the data layer assumptions" --models gpt-5.2-pro,gemini-3-pro --file "src/**/*.ts"`, 'Run multiple API models in one go and aggregate cost/usage.'),
         formatExample(`${program.name()} status --hours 72 --limit 50`, 'Show sessions from the last 72h (capped at 50 entries).'),
         formatExample(`${program.name()} session <sessionId>`, 'Attach to a running/completed session and stream the saved transcript.'),
         formatExample(`${program.name()} --prompt "Ship review" --slug "release-readiness-audit"`, 'Encourage the model to hand you a 3–5 word slug and pass it along with --slug.'),

package/dist/src/cli/options.js

@@ -137,6 +137,9 @@ export function resolveApiModel(modelValue) {
     if (normalized.includes('5-pro') && !normalized.includes('5.1')) {
         return 'gpt-5-pro';
     }
+    if (normalized.includes('5.2') && normalized.includes('pro')) {
+        return 'gpt-5.2-pro';
+    }
     if (normalized.includes('5.1') && normalized.includes('pro')) {
         return 'gpt-5.1-pro';
     }
@@ -149,6 +152,9 @@ export function resolveApiModel(modelValue) {
     if (normalized.includes('gemini')) {
         return 'gemini-3-pro';
     }
+    if (normalized.includes('pro')) {
+        return 'gpt-5.2-pro';
+    }
     // Passthrough for custom/OpenRouter model IDs.
     return normalized;
 }
@@ -169,12 +175,6 @@ export function inferModelFromLabel(modelValue) {
     if (normalized.includes('claude') && normalized.includes('opus')) {
         return 'claude-4.1-opus';
     }
-    if (normalized.includes('5.0') || normalized.includes('5-pro')) {
-        return 'gpt-5-pro';
-    }
-    if (normalized.includes('gpt-5') && normalized.includes('pro') && !normalized.includes('5.1')) {
-        return 'gpt-5-pro';
-    }
     if (normalized.includes('codex')) {
         return 'gpt-5.1-codex';
     }
@@ -182,13 +182,25 @@ export function inferModelFromLabel(modelValue) {
         return 'gemini-3-pro';
     }
     if (normalized.includes('classic')) {
-        return 'gpt-5.1-pro';
+        return 'gpt-5-pro';
+    }
+    if ((normalized.includes('5.2') || normalized.includes('5_2')) && normalized.includes('pro')) {
+        return 'gpt-5.2-pro';
+    }
+    if (normalized.includes('5.0') || normalized.includes('5-pro')) {
+        return 'gpt-5-pro';
+    }
+    if (normalized.includes('gpt-5') &&
+        normalized.includes('pro') &&
+        !normalized.includes('5.1') &&
+        !normalized.includes('5.2')) {
+        return 'gpt-5-pro';
     }
     if ((normalized.includes('5.1') || normalized.includes('5_1')) && normalized.includes('pro')) {
         return 'gpt-5.1-pro';
     }
     if (normalized.includes('pro')) {
-        return 'gpt-5.1-pro';
+        return 'gpt-5.2-pro';
     }
     if (normalized.includes('5.1') || normalized.includes('5_1')) {
         return 'gpt-5.1';

package/dist/src/cli/runOptions.js

@@ -3,6 +3,7 @@ import { resolveEngine } from './engine.js';
 import { normalizeModelOption, inferModelFromLabel, resolveApiModel, normalizeBaseUrl } from './options.js';
 import { resolveGeminiModelId } from '../oracle/gemini.js';
 import { PromptValidationError } from '../oracle/errors.js';
+import { normalizeChatGptModelForBrowser } from './browserConfig.js';
 export function resolveRunOptionsFromConfig({ prompt, files = [], model, models, engine, userConfig, env = process.env, }) {
     const resolvedEngine = resolveEngineWithConfig({ engine, configEngine: userConfig?.engine, env });
     const browserRequested = engine === 'browser';
@@ -10,10 +11,11 @@ export function resolveRunOptionsFromConfig({ prompt, files = [], model, models,
     const requestedModelList = Array.isArray(models) ? models : [];
     const normalizedRequestedModels = requestedModelList.map((entry) => normalizeModelOption(entry)).filter(Boolean);
     const cliModelArg = normalizeModelOption(model ?? userConfig?.model) || DEFAULT_MODEL;
-    const resolvedModel = resolvedEngine === 'browser' && normalizedRequestedModels.length === 0
+    const inferredModel = resolvedEngine === 'browser' && normalizedRequestedModels.length === 0
         ? inferModelFromLabel(cliModelArg)
         : resolveApiModel(cliModelArg);
-    const isGemini = resolvedModel.startsWith('gemini');
+    // Browser engine maps Pro/legacy aliases to the latest ChatGPT picker targets (GPT-5.2 / GPT-5.2 Pro).
+    const resolvedModel = resolvedEngine === 'browser' ? normalizeChatGptModelForBrowser(inferredModel) : inferredModel;
     const isCodex = resolvedModel.startsWith('gpt-5.1-codex');
     const isClaude = resolvedModel.startsWith('claude');
     const isGrok = resolvedModel.startsWith('grok');
@@ -21,13 +23,13 @@ export function resolveRunOptionsFromConfig({ prompt, files = [], model, models,
     const allModels = normalizedRequestedModels.length > 0
         ? Array.from(new Set(normalizedRequestedModels.map((entry) => resolveApiModel(entry))))
         : [resolvedModel];
-    const hasNonGptBrowserTarget = (browserRequested || browserConfigured) && allModels.some((m) => !m.startsWith('gpt-'));
-    if (hasNonGptBrowserTarget) {
-        throw new PromptValidationError('Browser engine only supports GPT-series ChatGPT models. Re-run with --engine api for Grok, Claude, Gemini, or other non-GPT models.', { engine: 'browser', models: allModels });
+    const isBrowserCompatible = (m) => m.startsWith('gpt-') || m.startsWith('gemini');
+    const hasNonBrowserCompatibleTarget = (browserRequested || browserConfigured) && allModels.some((m) => !isBrowserCompatible(m));
+    if (hasNonBrowserCompatibleTarget) {
+        throw new PromptValidationError('Browser engine only supports GPT and Gemini models. Re-run with --engine api for Grok, Claude, or other models.', { engine: 'browser', models: allModels });
     }
-    const engineCoercedToApi = engineWasBrowser && (isGemini || isCodex || isClaude || isGrok);
-    // When Gemini, Claude, or Grok is selected, force API engine for auto-browser detection; codex also forces API.
-    const fixedEngine = isGemini || isCodex || isClaude || isGrok || normalizedRequestedModels.length > 0 ? 'api' : resolvedEngine;
+    const engineCoercedToApi = engineWasBrowser && (isCodex || isClaude || isGrok);
+    const fixedEngine = isCodex || isClaude || isGrok || normalizedRequestedModels.length > 0 ? 'api' : resolvedEngine;
     const promptWithSuffix = userConfig?.promptSuffix && userConfig.promptSuffix.trim().length > 0
         ? `${prompt.trim()}\n${userConfig.promptSuffix}`
         : prompt;

package/dist/src/cli/sessionRunner.js

@@ -38,9 +38,6 @@ export async function performSessionRun({ sessionMeta, runOptions, mode, browser
     const modelForStatus = runOptions.model ?? sessionMeta.model;
     try {
         if (mode === 'browser') {
-            if (runOptions.model.startsWith('gemini')) {
-                throw new Error('Gemini models are not available in browser mode. Re-run with --engine api.');
-            }
             if (!browserConfig) {
                 throw new Error('Missing browser configuration for session.');
             }