@steipete/oracle 0.9.0 → 0.10.0

package/dist/src/gemini-web/client.js

@@ -1,39 +1,39 @@
-import { mkdir, readFile, writeFile } from 'node:fs/promises';
-import path from 'node:path';
-const USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36';
-const MODEL_HEADER_NAME = 'x-goog-ext-525001261-jspb';
+import { mkdir, readFile, writeFile } from "node:fs/promises";
+import path from "node:path";
+const USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36";
+const MODEL_HEADER_NAME = "x-goog-ext-525001261-jspb";
 const MODEL_HEADERS = {
-    'gemini-3-pro': '[1,null,null,null,"9d8ca3786ebdfbea",null,null,0,[4]]',
-    'gemini-3-pro-deep-think': '[1,null,null,null,"e6fa609c3fa255c0",null,null,0,[4],null,null,3]',
-    'gemini-2.5-pro': '[1,null,null,null,"4af6c7f5da75d65d",null,null,0,[4]]',
-    'gemini-2.5-flash': '[1,null,null,null,"9ec249fc9ad08861",null,null,0,[4]]',
+    "gemini-3-pro": '[1,null,null,null,"9d8ca3786ebdfbea",null,null,0,[4]]',
+    "gemini-3-pro-deep-think": '[1,null,null,null,"e6fa609c3fa255c0",null,null,0,[4],null,null,3]',
+    "gemini-2.5-pro": '[1,null,null,null,"4af6c7f5da75d65d",null,null,0,[4]]',
+    "gemini-2.5-flash": '[1,null,null,null,"9ec249fc9ad08861",null,null,0,[4]]',
 };
-const GEMINI_APP_URL = 'https://gemini.google.com/app';
-const GEMINI_STREAM_GENERATE_URL = 'https://gemini.google.com/_/BardChatUi/data/assistant.lamda.BardFrontendService/StreamGenerate';
-const GEMINI_UPLOAD_URL = 'https://content-push.googleapis.com/upload';
-const GEMINI_UPLOAD_PUSH_ID = 'feeds/mcudyrk2a4khkz';
+const GEMINI_APP_URL = "https://gemini.google.com/app";
+const GEMINI_STREAM_GENERATE_URL = "https://gemini.google.com/_/BardChatUi/data/assistant.lamda.BardFrontendService/StreamGenerate";
+const GEMINI_UPLOAD_URL = "https://content-push.googleapis.com/upload";
+const GEMINI_UPLOAD_PUSH_ID = "feeds/mcudyrk2a4khkz";
 const GEMINI_UPLOAD_MIME_TYPES = {
-    '.bmp': 'image/bmp',
-    '.gif': 'image/gif',
-    '.jpeg': 'image/jpeg',
-    '.jpg': 'image/jpeg',
-    '.pdf': 'application/pdf',
-    '.png': 'image/png',
-    '.svg': 'image/svg+xml',
-    '.webp': 'image/webp',
+    ".bmp": "image/bmp",
+    ".gif": "image/gif",
+    ".jpeg": "image/jpeg",
+    ".jpg": "image/jpeg",
+    ".pdf": "application/pdf",
+    ".png": "image/png",
+    ".svg": "image/svg+xml",
+    ".webp": "image/webp",
 };
 function getNestedValue(value, pathParts, fallback) {
     let current = value;
     for (const part of pathParts) {
         if (current == null)
             return fallback;
-        if (typeof part === 'number') {
+        if (typeof part === "number") {
             if (!Array.isArray(current))
                 return fallback;
             current = current[part];
         }
         else {
-            if (typeof current !== 'object')
+            if (typeof current !== "object")
                 return fallback;
             current = current[part];
         }
@@ -42,40 +42,40 @@ function getNestedValue(value, pathParts, fallback) {
 }
 function buildCookieHeader(cookieMap) {
     return Object.entries(cookieMap)
-        .filter(([, value]) => typeof value === 'string' && value.length > 0)
+        .filter(([, value]) => typeof value === "string" && value.length > 0)
         .map(([name, value]) => `${name}=${value}`)
-        .join('; ');
+        .join("; ");
 }
 export async function fetchGeminiAccessToken(cookieMap, signal) {
     const cookieHeader = buildCookieHeader(cookieMap);
     const res = await fetch(GEMINI_APP_URL, {
-        redirect: 'follow',
+        redirect: "follow",
         signal,
         headers: {
             cookie: cookieHeader,
-            'user-agent': USER_AGENT,
+            "user-agent": USER_AGENT,
         },
     });
     const html = await res.text();
-    const tokens = ['SNlM0e', 'thykhd'];
+    const tokens = ["SNlM0e", "thykhd"];
     for (const key of tokens) {
         const match = html.match(new RegExp(`"${key}":"(.*?)"`));
         if (match?.[1])
             return match[1];
     }
-    throw new Error('Unable to locate Gemini access token on gemini.google.com/app (missing SNlM0e/thykhd).');
+    throw new Error("Unable to locate Gemini access token on gemini.google.com/app (missing SNlM0e/thykhd).");
 }
 function trimGeminiJsonEnvelope(text) {
-    const start = text.indexOf('[');
-    const end = text.lastIndexOf(']');
+    const start = text.indexOf("[");
+    const end = text.lastIndexOf("]");
     if (start === -1 || end === -1 || end <= start) {
-        throw new Error('Gemini response did not contain a JSON payload.');
+        throw new Error("Gemini response did not contain a JSON payload.");
     }
     return text.slice(start, end + 1);
 }
 function extractErrorCode(responseJson) {
     const code = getNestedValue(responseJson, [0, 5, 2, 0, 1, 0], -1);
-    return typeof code === 'number' && code >= 0 ? code : undefined;
+    return typeof code === "number" && code >= 0 ? code : undefined;
 }
 function extractGgdlUrls(rawText) {
     const matches = rawText.match(/https:\/\/lh3\.googleusercontent\.com\/gg-dl\/[^\s"']+/g) ?? [];
@@ -90,18 +90,18 @@ function extractGgdlUrls(rawText) {
     return urls;
 }
 function ensureFullSizeImageUrl(url) {
-    if (url.includes('=s2048'))
+    if (url.includes("=s2048"))
         return url;
-    if (url.includes('=s'))
+    if (url.includes("=s"))
         return url;
     return `${url}=s2048`;
 }
 async function fetchWithCookiePreservingRedirects(url, init, signal, maxRedirects = 10) {
     let current = url;
     for (let i = 0; i <= maxRedirects; i += 1) {
-        const res = await fetch(current, { ...init, redirect: 'manual', signal });
+        const res = await fetch(current, { ...init, redirect: "manual", signal });
         if (res.status >= 300 && res.status < 400) {
-            const location = res.headers.get('location');
+            const location = res.headers.get("location");
             if (!location)
                 return res;
             current = new URL(location, current).toString();
@@ -116,7 +116,7 @@ async function downloadGeminiImage(url, cookieMap, outputPath, signal) {
     const res = await fetchWithCookiePreservingRedirects(ensureFullSizeImageUrl(url), {
         headers: {
             cookie: cookieHeader,
-            'user-agent': USER_AGENT,
+            "user-agent": USER_AGENT,
         },
     }, signal);
     if (!res.ok) {
@@ -130,16 +130,16 @@ async function uploadGeminiFile(filePath, signal) {
     const absPath = path.resolve(process.cwd(), filePath);
     const data = await readFile(absPath);
     const fileName = path.basename(absPath);
-    const mimeType = GEMINI_UPLOAD_MIME_TYPES[path.extname(absPath).toLowerCase()] ?? 'application/octet-stream';
+    const mimeType = GEMINI_UPLOAD_MIME_TYPES[path.extname(absPath).toLowerCase()] ?? "application/octet-stream";
     const form = new FormData();
-    form.append('file', new Blob([data], { type: mimeType }), fileName);
+    form.append("file", new Blob([data], { type: mimeType }), fileName);
     const res = await fetch(GEMINI_UPLOAD_URL, {
-        method: 'POST',
-        redirect: 'follow',
+        method: "POST",
+        redirect: "follow",
         signal,
         headers: {
-            'push-id': GEMINI_UPLOAD_PUSH_ID,
-            'user-agent': USER_AGENT,
+            "push-id": GEMINI_UPLOAD_PUSH_ID,
+            "user-agent": USER_AGENT,
         },
         body: form,
     });
@@ -176,9 +176,15 @@ export function parseGeminiStreamGenerateResponse(rawText) {
             const parsed = JSON.parse(partBody);
             const candidateList = getNestedValue(parsed, [4], []);
             if (Array.isArray(candidateList) && candidateList.length > 0) {
-                bodyIndex = i;
-                body = parsed;
-                break;
+                const candidateText = getNestedValue(candidateList[0], [1, 0], "");
+                const hasText = typeof candidateText === "string" && candidateText.length > 0;
+                if (body === null) {
+                    bodyIndex = i;
+                    body = parsed;
+                }
+                else if (hasText) {
+                    body = parsed;
+                }
             }
         }
         catch {
@@ -187,7 +193,7 @@ export function parseGeminiStreamGenerateResponse(rawText) {
     }
     const candidateList = getNestedValue(body, [4], []);
     const firstCandidate = candidateList[0];
-    const textRaw = getNestedValue(firstCandidate, [1, 0], '');
+    const textRaw = getNestedValue(firstCandidate, [1, 0], "");
     const cardContent = /^http:\/\/googleusercontent\.com\/card_content\/\d+/.test(textRaw);
     const text = cardContent
         ? (getNestedValue(firstCandidate, [22, 0], null) ?? textRaw)
@@ -201,7 +207,7 @@ export function parseGeminiStreamGenerateResponse(rawText) {
         if (!url)
             continue;
         images.push({
-            kind: 'web',
+            kind: "web",
             url,
             title: getNestedValue(webImage, [7, 0], undefined),
             alt: getNestedValue(webImage, [0, 4], undefined),
@@ -233,10 +239,10 @@ export function parseGeminiStreamGenerateResponse(rawText) {
             if (!url)
                 continue;
             images.push({
-                kind: 'generated',
+                kind: "generated",
                 url,
-                title: '[Generated Image]',
-                alt: '',
+                title: "[Generated Image]",
+                alt: "",
             });
         }
     }
@@ -251,24 +257,24 @@ export async function runGeminiWebOnce(input) {
     const uploaded = [];
     for (const file of input.files ?? []) {
         if (input.signal?.aborted) {
-            throw new Error('Gemini web run aborted before upload.');
+            throw new Error("Gemini web run aborted before upload.");
         }
         uploaded.push(await uploadGeminiFile(file, input.signal));
     }
     const fReq = buildGeminiFReqPayload(input.prompt, uploaded, input.chatMetadata ?? null);
     const params = new URLSearchParams();
-    params.set('at', at);
-    params.set('f.req', fReq);
+    params.set("at", at);
+    params.set("f.req", fReq);
     const res = await fetch(GEMINI_STREAM_GENERATE_URL, {
-        method: 'POST',
-        redirect: 'follow',
+        method: "POST",
+        redirect: "follow",
         signal: input.signal,
         headers: {
-            'content-type': 'application/x-www-form-urlencoded;charset=utf-8',
-            origin: 'https://gemini.google.com',
-            referer: 'https://gemini.google.com/',
-            'x-same-domain': '1',
-            'user-agent': USER_AGENT,
+            "content-type": "application/x-www-form-urlencoded;charset=utf-8",
+            origin: "https://gemini.google.com",
+            referer: "https://gemini.google.com/",
+            "x-same-domain": "1",
+            "user-agent": USER_AGENT,
             cookie: cookieHeader,
             [MODEL_HEADER_NAME]: MODEL_HEADERS[input.model],
         },
@@ -278,7 +284,7 @@ export async function runGeminiWebOnce(input) {
     if (!res.ok) {
         return {
             rawResponseText,
-            text: '',
+            text: "",
             thoughts: null,
             metadata: input.chatMetadata ?? null,
             images: [],
@@ -289,7 +295,7 @@ export async function runGeminiWebOnce(input) {
         const parsed = parseGeminiStreamGenerateResponse(rawResponseText);
         return {
             rawResponseText,
-            text: parsed.text ?? '',
+            text: parsed.text ?? "",
             thoughts: parsed.thoughts,
             metadata: parsed.metadata,
             images: parsed.images,
@@ -307,25 +313,25 @@ export async function runGeminiWebOnce(input) {
         const errorCode = extractErrorCode(responseJson);
         return {
             rawResponseText,
-            text: '',
+            text: "",
             thoughts: null,
             metadata: input.chatMetadata ?? null,
             images: [],
-            errorCode: typeof errorCode === 'number' ? errorCode : undefined,
-            errorMessage: error instanceof Error ? error.message : String(error ?? ''),
+            errorCode: typeof errorCode === "number" ? errorCode : undefined,
+            errorMessage: error instanceof Error ? error.message : String(error ?? ""),
         };
     }
 }
 export async function runGeminiWebWithFallback(input) {
     const attempt = await runGeminiWebOnce(input);
-    if (isGeminiModelUnavailable(attempt.errorCode) && input.model !== 'gemini-2.5-flash') {
-        const fallback = await runGeminiWebOnce({ ...input, model: 'gemini-2.5-flash' });
-        return { ...fallback, effectiveModel: 'gemini-2.5-flash' };
+    if (isGeminiModelUnavailable(attempt.errorCode) && input.model !== "gemini-2.5-flash") {
+        const fallback = await runGeminiWebOnce({ ...input, model: "gemini-2.5-flash" });
+        return { ...fallback, effectiveModel: "gemini-2.5-flash" };
     }
     return { ...attempt, effectiveModel: input.model };
 }
 export async function saveFirstGeminiImageFromOutput(output, cookieMap, outputPath, signal) {
-    const generatedOrWeb = output.images.find((img) => img.kind === 'generated') ?? output.images[0];
+    const generatedOrWeb = output.images.find((img) => img.kind === "generated") ?? output.images[0];
     if (generatedOrWeb?.url) {
         await downloadGeminiImage(generatedOrWeb.url, cookieMap, outputPath, signal);
         return { saved: true, imageCount: output.images.length };

package/dist/src/gemini-web/executionMode.js

@@ -1,18 +1,16 @@
 export function selectGeminiExecutionMode(input) {
     const reasons = [];
-    if (input.model !== 'gemini-3-pro-deep-think') {
-        return { mode: 'http', reasons: ['model'] };
+    if (input.model !== "gemini-3-pro-deep-think") {
+        return { mode: "http", reasons: ["model"] };
     }
     if (input.attachmentPaths.length > 0) {
-        reasons.push('attachments');
+        reasons.push("attachments");
     }
     if (input.generateImagePath) {
-        reasons.push('image-generation');
+        reasons.push("image-generation");
     }
     if (input.editImagePath) {
-        reasons.push('image-edit');
+        reasons.push("image-edit");
     }
-    return reasons.length === 0
-        ? { mode: 'dom', reasons: [] }
-        : { mode: 'http', reasons };
+    return reasons.length === 0 ? { mode: "dom", reasons: [] } : { mode: "http", reasons };
 }