@steipete/oracle 0.12.1 → 0.14.0

package/dist/src/browser/chatgptImages.js

@@ -1,10 +1,12 @@
 import fs from "node:fs/promises";
 import path from "node:path";
+import { randomUUID } from "node:crypto";
 import { ASSISTANT_ROLE_SELECTOR, CONVERSATION_TURN_SELECTOR } from "./constants.js";
 import { delay } from "./utils.js";
 import { readAssistantSnapshot } from "./pageActions.js";
 import { getOracleHomeDir } from "../oracleHome.js";
 import { resolveSessionArtifactsDir } from "./artifacts.js";
+import { saveAssistantDownloadButtonArtifacts } from "./chatgptFiles.js";
 const GENERATED_IMAGE_WAIT_MIN_MS = 15_000;
 const GENERATED_IMAGE_WAIT_MAX_MS = 15 * 60_000;
 function extractFileId(url) {
@@ -150,6 +152,29 @@ function contentTypeToExtension(contentType) {
         return "svg";
     return "bin";
 }
+function detectImageFile(buffer) {
+    if (buffer.length >= 8 &&
+        buffer.subarray(0, 8).equals(Buffer.from([0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a]))) {
+        return { extension: "png", mimeType: "image/png" };
+    }
+    if (buffer.length >= 3 && buffer[0] === 0xff && buffer[1] === 0xd8 && buffer[2] === 0xff) {
+        return { extension: "jpg", mimeType: "image/jpeg" };
+    }
+    if (buffer.length >= 12 &&
+        buffer.subarray(0, 4).toString("ascii") === "RIFF" &&
+        buffer.subarray(8, 12).toString("ascii") === "WEBP") {
+        return { extension: "webp", mimeType: "image/webp" };
+    }
+    const signature = buffer.subarray(0, 6).toString("ascii");
+    if (signature === "GIF87a" || signature === "GIF89a") {
+        return { extension: "gif", mimeType: "image/gif" };
+    }
+    const text = buffer.subarray(0, Math.min(buffer.length, 1024)).toString("utf8").trimStart();
+    if (/^(?:<\?xml[^>]*>\s*)?<svg[\s>]/i.test(text)) {
+        return { extension: "svg", mimeType: "image/svg+xml" };
+    }
+    return null;
+}
 function resolveSiblingImagePath(basePath, index, extension) {
     const ext = path.extname(basePath);
     const dir = path.dirname(basePath);
@@ -169,12 +194,13 @@ function sanitizeGeneratedImageStem(value) {
 }
 function resolveDefaultGeneratedImagePath(images, sessionId) {
     const primary = images[0];
-    const stemSource = primary?.fileId || primary?.alt || primary?.url || `generated-${Date.now().toString(36)}`;
-    const stem = sanitizeGeneratedImageStem(stemSource) || `generated-${Date.now().toString(36)}`;
+    const stemSource = primary?.fileId || primary?.alt || primary?.url || "generated";
+    const stem = sanitizeGeneratedImageStem(stemSource) || "generated";
     const baseDir = sessionId
         ? resolveSessionArtifactsDir(sessionId)
         : path.join(getOracleHomeDir(), ".temp");
-    return path.join(baseDir, `${stem}.png`);
+    const uniqueSuffix = sessionId ? "" : `-${Date.now().toString(36)}-${randomUUID().slice(0, 8)}`;
+    return path.join(baseDir, `${stem}${uniqueSuffix}.png`);
 }
 async function buildCookieHeader(Network) {
     const response = await Network.getCookies({ urls: ["https://chatgpt.com/"] });
@@ -245,11 +271,84 @@ export async function saveChatGptGeneratedImages(params) {
         errors,
     };
 }
+async function saveGeneratedImageButtonArtifacts(params) {
+    const buttonDownloads = await saveAssistantDownloadButtonArtifacts({
+        Browser: params.Browser,
+        Client: params.Client,
+        Page: params.Page,
+        Runtime: params.Runtime,
+        logger: params.logger,
+        files: [],
+        allowGenericDownloadLabels: true,
+        downloadPath: path.dirname(params.targetPath),
+        minTurnIndex: params.minTurnIndex,
+    });
+    const buttonImages = [];
+    for (const download of buttonDownloads) {
+        const contents = await fs.readFile(download.path);
+        const detected = detectImageFile(contents);
+        if (!detected) {
+            await fs.unlink(download.path).catch(() => undefined);
+            params.logger?.(`[browser] Ignored non-image assistant download: ${download.label}`);
+            continue;
+        }
+        const index = buttonImages.length;
+        const resolvedPath = resolveSiblingImagePath(params.targetPath, index, detected.extension);
+        if (path.resolve(download.path) !== resolvedPath) {
+            await fs.copyFile(download.path, resolvedPath);
+            await fs.unlink(download.path);
+        }
+        const stat = await fs.stat(resolvedPath);
+        buttonImages.push({
+            kind: "image",
+            path: resolvedPath,
+            label: index === 0 ? "Generated image" : `Generated image ${index + 1}`,
+            mimeType: detected.mimeType,
+            sizeBytes: stat.size,
+            sourceUrl: "browser-download",
+            url: "browser-download",
+            finalUrl: "browser-download",
+            alt: download.label,
+        });
+    }
+    if (buttonImages.length > 0) {
+        params.logger?.(`[browser] Saved ${buttonImages.length} generated image download artifact(s).`);
+    }
+    return buttonImages;
+}
+function formatButtonImageArtifacts(buttonImages, answerText) {
+    const primaryPath = buttonImages[0]?.path ?? "";
+    return {
+        generatedImages: buttonImages.map((image) => ({
+            url: image.url,
+            alt: image.alt,
+        })),
+        savedImages: buttonImages,
+        imageCount: buttonImages.length,
+        markdownSuffix: buttonImages.length > 1
+            ? `\n\n*Generated ${buttonImages.length} image(s). Saved ${buttonImages.length} file(s) starting at: ${primaryPath}*`
+            : `\n\n*Generated 1 image(s). Saved to: ${primaryPath}*`,
+        answerText,
+    };
+}
 export async function collectGeneratedImageArtifacts(params) {
     const explicitTargetPath = params.generateImagePath ?? params.outputPath;
     let generatedImages = await readAssistantGeneratedImagesWithFallback(params.Runtime, params.minTurnIndex ?? undefined);
     let latestAnswerText = params.answerText;
     if (explicitTargetPath && generatedImages.length === 0) {
+        const targetPath = path.resolve(explicitTargetPath);
+        const buttonImages = await saveGeneratedImageButtonArtifacts({
+            Browser: params.Browser,
+            Client: params.Client,
+            Page: params.Page,
+            Runtime: params.Runtime,
+            logger: params.logger,
+            minTurnIndex: params.minTurnIndex,
+            targetPath,
+        });
+        if (buttonImages.length > 0) {
+            return formatButtonImageArtifacts(buttonImages, latestAnswerText);
+        }
         const deadline = Date.now() + resolveGeneratedImageWaitTimeoutMs(params.waitTimeoutMs);
         while (Date.now() < deadline) {
             await delay(1500);
@@ -263,6 +362,20 @@ export async function collectGeneratedImageArtifacts(params) {
                 latestAnswerText = snapshotText;
             }
         }
+        if (generatedImages.length === 0) {
+            const delayedButtonImages = await saveGeneratedImageButtonArtifacts({
+                Browser: params.Browser,
+                Client: params.Client,
+                Page: params.Page,
+                Runtime: params.Runtime,
+                logger: params.logger,
+                minTurnIndex: params.minTurnIndex,
+                targetPath,
+            });
+            if (delayedButtonImages.length > 0) {
+                return formatButtonImageArtifacts(delayedButtonImages, latestAnswerText);
+            }
+        }
     }
     const imageCount = generatedImages.length;
     if (explicitTargetPath && imageCount === 0) {
@@ -288,6 +401,20 @@ export async function collectGeneratedImageArtifacts(params) {
         logger: params.logger,
     });
     if (!saved.saved) {
+        if (explicitTargetPath) {
+            const buttonImages = await saveGeneratedImageButtonArtifacts({
+                Browser: params.Browser,
+                Client: params.Client,
+                Page: params.Page,
+                Runtime: params.Runtime,
+                logger: params.logger,
+                minTurnIndex: params.minTurnIndex,
+                targetPath: path.resolve(explicitTargetPath),
+            });
+            if (buttonImages.length > 0) {
+                return formatButtonImageArtifacts(buttonImages, latestAnswerText);
+            }
+        }
         const detail = saved.errors.length > 0 ? `\n${saved.errors.join("\n")}` : "";
         if (explicitTargetPath) {
             throw new Error(`No images generated. Response text:\n${latestAnswerText || "(empty response)"}${detail}`);

package/dist/src/browser/chromeLifecycle.js

@@ -340,6 +340,10 @@ function createSessionBoundChromeClient(browser, sessionId) {
     };
     return {
         ...browser,
+        // Raw `send` here is the browser-level send (not session-bound), so callers
+        // that issue Target.* via `send` must pass this page session id explicitly to
+        // stay scoped to this tab (e.g. Deep Research OOPIF auto-attach).
+        oraclePageSessionId: sessionId,
         Network: bindDomain("Network"),
         Page: bindDomain("Page"),
         Runtime: bindDomain("Runtime"),

package/dist/src/browser/config.js

@@ -26,6 +26,7 @@ export const DEFAULT_BROWSER_CONFIG = {
     timeoutMs: 1_200_000,
     debugPort: null,
     inputTimeoutMs: 60_000,
+    attachmentTimeoutMs: 45_000,
     assistantRecheckDelayMs: 0,
     assistantRecheckTimeoutMs: 120_000,
     reuseChromeWaitMs: 10_000,
@@ -54,6 +55,7 @@ export const DEFAULT_BROWSER_CONFIG = {
     manualLoginCookieSync: false,
     researchMode: "off",
     archiveConversations: "auto",
+    resumeConversationUrl: null,
 };
 export function resolveBrowserConfig(config) {
     const debugPortEnv = parseDebugPort(process.env.ORACLE_BROWSER_PORT ?? process.env.ORACLE_BROWSER_DEBUG_PORT);
@@ -80,6 +82,7 @@ export function resolveBrowserConfig(config) {
         timeoutMs: config?.timeoutMs ?? defaultTimeoutMs,
         debugPort: config?.debugPort ?? debugPortEnv ?? DEFAULT_BROWSER_CONFIG.debugPort,
         inputTimeoutMs: config?.inputTimeoutMs ?? DEFAULT_BROWSER_CONFIG.inputTimeoutMs,
+        attachmentTimeoutMs: config?.attachmentTimeoutMs ?? DEFAULT_BROWSER_CONFIG.attachmentTimeoutMs,
         assistantRecheckDelayMs: config?.assistantRecheckDelayMs ?? DEFAULT_BROWSER_CONFIG.assistantRecheckDelayMs,
         assistantRecheckTimeoutMs: config?.assistantRecheckTimeoutMs ?? DEFAULT_BROWSER_CONFIG.assistantRecheckTimeoutMs,
         reuseChromeWaitMs: config?.reuseChromeWaitMs ?? DEFAULT_BROWSER_CONFIG.reuseChromeWaitMs,
@@ -110,6 +113,7 @@ export function resolveBrowserConfig(config) {
         thinkingTime: config?.thinkingTime,
         researchMode,
         archiveConversations,
+        resumeConversationUrl: config?.resumeConversationUrl ?? DEFAULT_BROWSER_CONFIG.resumeConversationUrl,
         manualLogin,
         manualLoginProfileDir: manualLogin ? resolvedProfileDir : null,
         manualLoginCookieSync: config?.manualLoginCookieSync ?? DEFAULT_BROWSER_CONFIG.manualLoginCookieSync,