@steipete/oracle 0.18.0 → 0.19.0

package/README.md

@@ -82,7 +82,7 @@ oracle --dry-run summary --files-report \
   --file "!**/*.test.ts"
 ```
 
-Generated text bundles include stable line numbers so answers can cite `path:line`. Binary and large browser inputs can be uploaded or bundled without converting their contents. The [CLI reference](docs/cli-reference.md) lists the file, size, output, and browser controls.
+Generated text bundles include stable line numbers so answers can cite `path:line`. In browser mode, one uploaded text/source file stays native and multiple text/source files are packed into one bundle: flattened text for text-only `auto` uploads, or a ZIP when raw files are present or `--browser-bundle-format zip` is set. Native images and documents remain direct attachments when possible. The [CLI reference](docs/cli-reference.md) lists the file, size, output, and browser controls.
 
 ## Sessions and follow-ups
 

package/dist/bin/oracle-cli.js

@@ -1,14 +1,7 @@
 #!/usr/bin/env node
 import "dotenv/config";
-import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { Command, Option } from "commander";
-// Allow `npx @steipete/oracle oracle-mcp` to resolve the MCP server even though npx runs the default binary.
-if (process.argv[2] === "oracle-mcp") {
-    const { startMcpServer } = await import("../src/mcp/server.js");
-    await startMcpServer();
-    process.exit(0);
-}
 import { resolveEngine, defaultWaitPreference } from "../src/cli/engine.js";
 import { shouldRequirePrompt } from "../src/cli/promptRequirement.js";
 import { resolveDashPrompt } from "../src/cli/stdin.js";
@@ -22,6 +15,7 @@ import { collectPaths, collectModelList, collectTextValues, parseFloatOption, pa
 import { copyToClipboard } from "../src/cli/clipboard.js";
 import { buildMarkdownBundle } from "../src/cli/markdownBundle.js";
 import { shouldDetachSession, stopDetachedWorker } from "../src/cli/detach.js";
+import { launchDetachedSession } from "../src/cli/detachedSession.js";
 import { applyHiddenAliases } from "../src/cli/hiddenAliases.js";
 import { isMediaFile } from "../src/browser/prompt.js";
 import { formatCompactNumber } from "../src/cli/format.js";
@@ -283,6 +277,7 @@ program
     .option("--render", "Alias for --render-markdown.", false)
     .option("--render-plain", "Render markdown without ANSI/highlighting (use plain text even in a TTY).", false)
     .option("--write-output <path>", "Write only the final assistant message to this file (overwrites; multi-model appends .<model> before the extension).")
+    .option("--write-artifacts", "Also export captured browser files beside --write-output without overwriting existing files (browser runs only).", false)
     .option("--allow-partial", "Exit 0 for multi-model runs when at least one model succeeds.", false)
     .addOption(new Option("--partial <mode>", "Multi-model failure policy (fail | ok).")
     .choices(["fail", "ok"])
@@ -314,6 +309,7 @@ program
     .addOption(new Option("--browser-url <url>", `Alias for --chatgpt-url (default ${CHATGPT_URL}).`).hideHelp())
     .addOption(new Option("--browser-timeout <ms|s|m>", "Maximum time to wait for an answer (default 1200s / 20m).").hideHelp())
     .addOption(new Option("--browser-input-timeout <ms|s|m>", "Maximum time to wait for the prompt textarea (default 60s).").hideHelp())
+    .addOption(new Option("--browser-approval-wait <duration>", "Wait for each Chrome remote-debugging approval prompt (default 20s; e.g. 5m).").env("ORACLE_BROWSER_APPROVAL_WAIT"))
     .addOption(new Option("--browser-attachment-timeout <ms|s|m>", "Maximum time to wait for attachment upload/readiness before clicking send (default 45s).").hideHelp())
     .addOption(new Option("--browser-recheck-delay <ms|s|m|h>", "After an assistant timeout, wait this long then revisit the conversation to retry capture.").hideHelp())
     .addOption(new Option("--browser-recheck-timeout <ms|s|m|h>", "Time budget for the delayed recheck attempt (default 120s).").hideHelp())
@@ -357,8 +353,8 @@ program
     .addOption(new Option("--remote-host <host:port>", "Delegate browser runs to a remote `oracle serve` instance."))
     .addOption(new Option("--remote-token <token>", "Access token for the remote `oracle serve` instance."))
     .addOption(new Option("--browser-inline-files", "Alias for --browser-attachments never (force pasting file contents inline).").default(false))
-    .addOption(new Option("--browser-bundle-files", "Bundle all attachments into a single archive before uploading.").default(false))
-    .addOption(new Option("--browser-bundle-format <format>", "Bundle format for browser uploads when files are bundled: auto (default), text, or zip.")
+    .addOption(new Option("--browser-bundle-files", "Force one browser upload bundle; auto/zip includes all resolved files. Multi-file text/source uploads already bundle by default (flattened text unless ZIP is selected).").default(false))
+    .addOption(new Option("--browser-bundle-format <format>", "Bundle format for browser uploads: auto (flattened text for text-only, ZIP when raw files are present), text, or zip.")
     .choices(["auto", "text", "zip"])
     .default("auto"))
     .addOption(new Option("--youtube <url>", "YouTube video URL to analyze (Gemini web/cookie mode only; uses your signed-in Chrome cookies for gemini.google.com)."))
@@ -367,6 +363,7 @@ program
     .addOption(new Option("--output <file>", "Output file path for image operations."))
     .addOption(new Option("--aspect <ratio>", "Aspect ratio for image generation: 16:9, 1:1, 4:3, 3:4 (Gemini web/cookie mode only)."))
     .addOption(new Option("--gemini-show-thoughts", "Display Gemini thinking process (Gemini web/cookie mode only).").default(false))
+    .option("--no-gemini-fallback", "Fail if the requested Gemini web model is unavailable instead of using Flash-Lite.")
     .option("--retain-hours <hours>", "Prune stored sessions older than this many hours before running (set 0 to disable).", parseFloatOption)
     .option("--force", "Force start a new session even if an identical prompt is already running.", false)
     .option("--debug-help", "Show the advanced/debug option set and exit.", false)
@@ -392,15 +389,26 @@ program
     .option("--host <address>", "Interface to bind (default 0.0.0.0).")
     .option("--port <number>", "Port to listen on (default random).", parseIntOption)
     .option("--token <value>", "Access token clients must provide (random if omitted).")
+    .option("--max-concurrent-runs <count>", "Opt into concurrent runs and FIFO queueing; clamped to the host browser tab cap (default remains single-flight HTTP 409).")
+    .option("--max-queued-runs <count>", "Waiting requests in opt-in queue mode (default 8; 0 disables waiting).")
     .option("--manual-login", "Use a dedicated Chrome profile for manual login (recommended when cookie sync is unavailable).", false)
     .option("--manual-login-profile-dir <path>", "Chrome profile directory for manual login (default ~/.oracle/browser-profile).")
     .option("--browser-cookie-sync", "Copy cookies from this host's live Chrome profile instead of using the dedicated profile.", false)
     .action(async (commandOptions) => {
     const { serveRemote } = await import("../src/remote/server.js");
+    const { buildServeBrowserConfig } = await import("../src/cli/serveBrowserConfig.js");
+    const { config } = await loadUserConfig();
     await serveRemote({
+        browserConfig: buildServeBrowserConfig(program.opts(), config),
         host: commandOptions.host,
         port: commandOptions.port,
         token: commandOptions.token,
+        maxConcurrentRuns: commandOptions.maxConcurrentRuns === undefined
+            ? undefined
+            : Number(commandOptions.maxConcurrentRuns),
+        maxQueuedRuns: commandOptions.maxQueuedRuns === undefined
+            ? undefined
+            : Number(commandOptions.maxQueuedRuns),
         manualLoginDefault: commandOptions.manualLogin,
         manualLoginProfileDir: commandOptions.manualLoginProfileDir,
         cookieSyncDefault: commandOptions.browserCookieSync,
@@ -713,6 +721,7 @@ function buildRunOptions(options, overrides = {}) {
         background: overrides.background ?? undefined,
         renderPlain: overrides.renderPlain ?? options.renderPlain ?? false,
         writeOutputPath: overrides.writeOutputPath ?? options.writeOutputPath,
+        writeArtifacts: overrides.writeArtifacts ?? options.writeArtifacts ?? false,
     };
 }
 function resolveApiProviderMode(options) {
@@ -952,6 +961,7 @@ function buildRunOptionsFromMetadata(metadata) {
         background: stored.background,
         renderPlain: stored.renderPlain,
         writeOutputPath: stored.writeOutputPath,
+        writeArtifacts: stored.writeArtifacts,
     };
 }
 function getSessionMode(metadata) {
@@ -1080,8 +1090,10 @@ async function runRootCommand(options) {
         return;
     }
     const retentionHours = typeof options.retainHours === "number" ? options.retainHours : undefined;
-    await sessionStore.ensureStorage();
-    await pruneOldSessions(retentionHours, (message) => console.log(chalk.dim(message)));
+    if (!previewMode) {
+        await sessionStore.ensureStorage();
+        await pruneOldSessions(retentionHours, (message) => console.log(chalk.dim(message)));
+    }
     if (providerMode === "openai") {
         if (hasExplicitAzureOption(optionUsesDefault)) {
             throw new Error("--provider openai/--no-azure cannot be combined with Azure options.");
@@ -1316,6 +1328,12 @@ async function runRootCommand(options) {
         }
     }
     const activeModel = resolvedOptions.model;
+    if (options.writeArtifacts && engine !== "browser") {
+        throw new Error("--write-artifacts requires --engine browser.");
+    }
+    if (options.writeArtifacts && !resolvedOptions.writeOutputPath) {
+        throw new Error("--write-artifacts requires --write-output <path>.");
+    }
     if (options.reasoningMode && engine !== "api") {
         throw new Error("--reasoning-mode requires --engine api.");
     }
@@ -1447,6 +1465,7 @@ async function runRootCommand(options) {
                 outputPath: options.output,
                 aspectRatio: options.aspect,
                 showThoughts: options.geminiShowThoughts,
+                allowModelFallback: options.geminiFallback,
             }),
         };
         console.log(chalk.dim("Using Gemini web client for browser automation"));
@@ -1516,6 +1535,7 @@ async function runRootCommand(options) {
         outputPath: options.output,
         aspectRatio: options.aspect,
         geminiShowThoughts: options.geminiShowThoughts,
+        geminiAllowModelFallback: options.geminiFallback,
     }, process.cwd(), notifications);
     const liveRunOptions = {
         ...baseRunOptions,
@@ -1539,14 +1559,19 @@ async function runRootCommand(options) {
     });
     const workerPid = !detachAllowed
         ? undefined
-        : await launchDetachedSession(sessionMeta.id, async (pid) => {
-            lifecycle = buildSessionLifecycle({
-                engine,
-                detached: true,
-                workerPid: pid,
-                reattachCommand: `oracle session ${sessionMeta.id}`,
-            });
-            await sessionStore.updateSession(sessionMeta.id, { lifecycle });
+        : await launchDetachedSession({
+            sessionId: sessionMeta.id,
+            cliEntrypoint: CLI_ENTRYPOINT,
+            env: buildDetachedPerfTraceEnv(process.env, perfTraceArgs.value, sessionMeta.id),
+            prepare: async (pid) => {
+                lifecycle = buildSessionLifecycle({
+                    engine,
+                    detached: true,
+                    workerPid: pid,
+                    reattachCommand: `oracle session ${sessionMeta.id}`,
+                });
+                await sessionStore.updateSession(sessionMeta.id, { lifecycle });
+            },
         }).catch((error) => {
             const message = error instanceof Error ? error.message : String(error);
             console.log(chalk.yellow(`Unable to detach session runner (${message}). Running inline...`));
@@ -1634,42 +1659,6 @@ async function runInteractiveSession(sessionMeta, runOptions, mode, browserConfi
         stream.end();
     }
 }
-async function launchDetachedSession(sessionId, prepare) {
-    return new Promise((resolve, reject) => {
-        try {
-            const args = ["--", CLI_ENTRYPOINT, "--exec-session", sessionId];
-            const env = {
-                ...buildDetachedPerfTraceEnv(process.env, perfTraceArgs.value, sessionId),
-                ORACLE_DETACHED_START_GATE: "1",
-            };
-            const child = spawn(process.execPath, args, {
-                detached: true,
-                stdio: ["pipe", "ignore", "ignore"],
-                env,
-            });
-            child.once("error", reject);
-            child.once("spawn", async () => {
-                if (child.pid === undefined) {
-                    reject(new Error("Detached session worker started without a process ID."));
-                    return;
-                }
-                try {
-                    await prepare(child.pid);
-                    child.stdin.end("ready\n");
-                    child.unref();
-                    resolve(child.pid);
-                }
-                catch (error) {
-                    child.kill();
-                    reject(error);
-                }
-            });
-        }
-        catch (error) {
-            reject(error);
-        }
-    });
-}
 async function waitForDetachedStartGate() {
     if (process.env.ORACLE_DETACHED_START_GATE !== "1") {
         return;
@@ -1794,6 +1783,7 @@ async function restartSession(sessionId, options) {
                 outputPath: storedOptions.outputPath,
                 aspectRatio: storedOptions.aspectRatio,
                 showThoughts: storedOptions.geminiShowThoughts,
+                allowModelFallback: storedOptions.geminiAllowModelFallback,
             }),
         };
         console.log(chalk.dim("Using Gemini web client for browser automation"));
@@ -1820,6 +1810,7 @@ async function restartSession(sessionId, options) {
         outputPath: storedOptions.outputPath,
         aspectRatio: storedOptions.aspectRatio,
         geminiShowThoughts: storedOptions.geminiShowThoughts,
+        geminiAllowModelFallback: storedOptions.geminiAllowModelFallback,
     }, cwd, notifications, sessionId);
     const liveRunOptions = {
         ...runOptions,
@@ -1843,14 +1834,19 @@ async function restartSession(sessionId, options) {
     });
     const workerPid = !detachAllowed
         ? undefined
-        : await launchDetachedSession(sessionMeta.id, async (pid) => {
-            lifecycle = buildSessionLifecycle({
-                engine,
-                detached: true,
-                workerPid: pid,
-                reattachCommand: `oracle session ${sessionMeta.id}`,
-            });
-            await sessionStore.updateSession(sessionMeta.id, { lifecycle });
+        : await launchDetachedSession({
+            sessionId: sessionMeta.id,
+            cliEntrypoint: CLI_ENTRYPOINT,
+            env: buildDetachedPerfTraceEnv(process.env, perfTraceArgs.value, sessionMeta.id),
+            prepare: async (pid) => {
+                lifecycle = buildSessionLifecycle({
+                    engine,
+                    detached: true,
+                    workerPid: pid,
+                    reattachCommand: `oracle session ${sessionMeta.id}`,
+                });
+                await sessionStore.updateSession(sessionMeta.id, { lifecycle });
+            },
         }).catch((error) => {
             const message = error instanceof Error ? error.message : String(error);
             console.log(chalk.yellow(`Unable to detach session runner (${message}). Running inline...`));
@@ -2038,6 +2034,12 @@ program.action(async function () {
     await runRootCommand(options);
 });
 async function main() {
+    // npx runs the default binary; let the MCP transport own the alias lifetime.
+    if (process.argv[2] === "oracle-mcp") {
+        const { startMcpServer } = await import("../src/mcp/server.js");
+        await startMcpServer();
+        return;
+    }
     if (perfTraceArgs.error) {
         console.error(`error: ${perfTraceArgs.error}`);
         console.error("(use --help for usage)");

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

@@ -124,7 +124,9 @@ function buildArchiveConversationExpression() {
           label.includes('conversation options') ||
           label.includes('open menu') ||
           label.includes('więcej') ||
-          label.includes('opcje')
+          label.includes('opcje') ||
+          label === 'その他' ||
+          label.includes('会話オプション')
         );
       const headerCandidates = labelled
         .filter(({ rect }) => rect.top < 180 && rect.right > window.innerWidth - 420)
@@ -144,8 +146,17 @@ function buildArchiveConversationExpression() {
 	      return candidates.find((element) => {
 	        const label = labelFor(element);
 	        if (!label) return false;
-	        if (label.includes('unarchive') || label.includes('restore')) return false;
-	        return label.includes('archive') || label.includes('archiwizuj');
+	        if (
+	          label.includes('unarchive') ||
+	          label.includes('restore') ||
+	          label.includes('アーカイブを解除')
+	        ) return false;
+	        return (
+	          label.includes('archive') ||
+	          label.includes('archiwizuj') ||
+	          label === 'アーカイブ' ||
+	          label.includes('アーカイブする')
+	        );
 	      }) ?? null;
 	    };
 	    const findArchiveConfirmationButton = () => {
@@ -154,8 +165,18 @@ function buildArchiveConversationExpression() {
 	      return candidates.find((element) => {
 	        const label = labelFor(element);
 	        if (!label) return false;
-	        if (label.includes('unarchive') || label.includes('restore')) return false;
-	        return label === 'archive' || label === 'archiwizuj' || label.includes('archive conversation');
+	        if (
+	          label.includes('unarchive') ||
+	          label.includes('restore') ||
+	          label.includes('アーカイブを解除')
+	        ) return false;
+	        return (
+	          label === 'archive' ||
+	          label === 'archiwizuj' ||
+	          label.includes('archive conversation') ||
+	          label === 'アーカイブ' ||
+	          label.includes('アーカイブする')
+	        );
 	      }) ?? null;
 	    };
 	    const hasUnarchiveMenuItem = () => {
@@ -166,7 +187,8 @@ function buildArchiveConversationExpression() {
 	          label.includes('unarchive') ||
 	          label.includes('restore') ||
 	          label.includes('przywróć') ||
-	          label.includes('przywroc')
+	          label.includes('przywroc') ||
+	          label.includes('アーカイブを解除')
 	        );
 	      });
 	    };
@@ -180,7 +202,9 @@ function buildArchiveConversationExpression() {
 	        visibleText.includes('conversation archived') ||
 	        visibleText.includes('chat archived') ||
 	        visibleText.includes('zarchiwizowano') ||
-	        visibleText.includes('archiwum')
+	        visibleText.includes('archiwum') ||
+	        visibleText.includes('アーカイブしました') ||
+	        visibleText.includes('アーカイブされました')
 	      );
 	    };
 	    const waitForArchiveConfirmation = async () => {

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

@@ -1,9 +1,10 @@
 import { ANSWER_SELECTORS, ASSISTANT_ROLE_SELECTOR, CONVERSATION_TURN_SELECTOR, COPY_BUTTON_SELECTOR, FINISHED_ACTIONS_SELECTOR, STOP_BUTTON_SELECTORS, } from "../constants.js";
 import { buildConversationTurnListExpression } from "../conversationTurns.js";
-import { buildThinkingActivePredicateJs, readThinkingActivity } from "./thinkingStatus.js";
+import { buildThinkingActivePredicateJs, buildThinkingActivityDetailsPredicateJs, readThinkingActivity, } from "./thinkingStatus.js";
 import { delay } from "../utils.js";
 import { logDomFailure, logConversationSnapshot, buildConversationDebugExpression, } from "../domDebug.js";
 import { buildClickDispatcher } from "./domEvents.js";
+import { BrowserAutomationError } from "../../oracle/errors.js";
 const ASSISTANT_POLL_TIMEOUT_ERROR = "assistant-response-watchdog-timeout";
 const STOP_CONTROL_SELECTOR = STOP_BUTTON_SELECTORS.join(", ");
 // Still used by the in-page settle heuristic's length buckets (see buildResponseObserverExpression).
@@ -148,6 +149,14 @@ export function isAnswerNowPlaceholderText(value) {
     }
     return sawGate && sawOwner;
 }
+export function isRetryAssistantUiErrorText(value, retryVisible) {
+    if (!retryVisible || typeof value !== "string")
+        return false;
+    const text = value.toLowerCase().replace(/\s+/g, " ").trim();
+    return (text.includes("something went wrong") ||
+        text.includes("failed to generate") ||
+        text.includes("try again later"));
+}
 // Exported: the two page expressions below and the tests all consume this one builder,
 // so the predicate cannot drift between the node side and the renderer.
 export function buildAnswerNowPlaceholderPredicateJs(fnName) {
@@ -227,6 +236,8 @@ export async function waitForAssistantResponse(Runtime, timeoutMs, logger, minTu
                 throw error;
             }
             else if (source === "poll") {
+                evaluationPromise.catch(() => undefined);
+                await terminateRuntimeExecution(Runtime);
                 throw error;
             }
             else if (source === "evaluation") {
@@ -399,6 +410,7 @@ async function parseAssistantEvaluationResult(_Runtime, evaluation, _logger) {
         result.value &&
         typeof result.value === "object" &&
         "text" in result.value) {
+        throwIfAssistantUiError(result.value);
         const html = typeof result.value.html === "string"
             ? (result.value.html ?? undefined)
             : undefined;
@@ -631,6 +643,7 @@ export function hasScopedCompletionProof(meta) {
 }
 export const buildCompletionVisibilityExpressionForTest = buildCompletionVisibilityExpression;
 function normalizeAssistantSnapshot(snapshot) {
+    throwIfAssistantUiError(snapshot);
     const text = snapshot?.text ? cleanAssistantText(snapshot.text) : "";
     if (!text.trim()) {
         return null;
@@ -655,6 +668,19 @@ function normalizeAssistantSnapshot(snapshot) {
         },
     };
 }
+export function throwIfAssistantUiError(snapshot) {
+    if (snapshot?.uiError !== "temporary_unavailable")
+        return;
+    throw new BrowserAutomationError("ChatGPT could not generate the submitted assistant turn and offered Retry.", {
+        stage: "assistant-ui-error",
+        code: "chatgpt-ui-warning",
+        uiWarning: {
+            type: "temporary_unavailable",
+            message: "ChatGPT offered Retry for the submitted assistant turn.",
+            source: "assistant-turn",
+        },
+    });
+}
 function isGeneratedImageAssistantAnswer(answer) {
     return Boolean(answer?.html?.includes("/backend-api/estuary/content?id=file_"));
 }
@@ -949,6 +975,8 @@ function buildAssistantExtractor(functionName) {
     const assistantLiteral = JSON.stringify(ASSISTANT_ROLE_SELECTOR);
     return `const ${functionName} = () => {
     ${buildClickDispatcher()}
+    ${buildThinkingActivityDetailsPredicateJs("readRetryThinkingActivity")}
+    const isRetryAssistantUiError = ${isRetryAssistantUiErrorText.toString()};
     const ASSISTANT_SELECTOR = ${assistantLiteral};
     const isAssistantTurn = (node) => {
       if (!(node instanceof HTMLElement)) return false;
@@ -1014,6 +1042,20 @@ function buildAssistantExtractor(functionName) {
         String(img?.src || '').includes('/backend-api/estuary/content?id=file_')
       );
       const normalizedText = String(text || '').toLowerCase().replace(/\\s+/g, ' ').trim();
+      const retryVisible = Array.from(turn.querySelectorAll('button, [role="button"]')).some((button) => {
+        const label = String(button.innerText || button.textContent || button.getAttribute?.('aria-label') || '')
+          .toLowerCase()
+          .replace(/\\s+/g, ' ')
+          .trim();
+        if (label !== 'retry' || !(button instanceof HTMLElement)) return false;
+        const rect = button.getBoundingClientRect();
+        const style = window.getComputedStyle(button);
+        return rect.width > 0 && rect.height > 0 && style.display !== 'none' && style.visibility !== 'hidden' &&
+          !(style.opacity !== '' && Number(style.opacity) === 0);
+      });
+      if (isRetryAssistantUiError(text, retryVisible) && !readRetryThinkingActivity().strong) {
+        return { text, html, messageId, turnId, turnIndex: index, uiError: 'temporary_unavailable' };
+      }
       const imageOnlyChrome =
         !normalizedText ||
         normalizedText === 'edit' ||