magpie-gemini-web 0.6.0 → 0.8.0

package/lib/backend.mjs

@@ -2,6 +2,7 @@ import { citeStream, citeJSON } from './cite.mjs';
 import { validateProxyURL } from './setup.mjs';
 
 export const DEFAULT_BASE = 'http://127.0.0.1:8083/v1';
+export const PLUGIN_ICON = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIj48ZGVmcz48bGluZWFyR3JhZGllbnQgaWQ9ImEiIHgxPSIyIiB5MT0iMyIgeDI9IjIwIiB5Mj0iMjEiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjMDZCNkQ0Ii8+PHN0b3Agb2Zmc2V0PSI1MCUiIHN0b3AtY29sb3I9IiMzQjgyRjYiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM4QjVDRjYiLz48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBpZD0iYiIgeDE9IjE0IiB5MT0iMiIgeDI9IjIyIiB5Mj0iMTAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjOEI1Q0Y2Ii8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjRUM0ODk5Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHBhdGggZD0iTTEwIDMuMkMxMC4zNSAzLjIgMTAuNjIgMy40NSAxMC43MiAzLjhDMTEuNDUgNi44NSAxMy4xNSA4LjU1IDE2LjIgOS4yOEMxNi41NSA5LjM4IDE2LjggOS42NSAxNi44IDEwQzE2LjggMTAuMzUgMTYuNTUgMTAuNjIgMTYuMiAxMC43MkMxMy4xNSAxMS40NSAxMS40NSAxMy4xNSAxMC43MiAxNi4yQzEwLjYyIDE2LjU1IDEwLjM1IDE2LjggMTAgMTYuOEM5LjY1IDE2LjggOS4zOCAxNi41NSA5LjI4IDE2LjJDOC41NSAxMy4xNSA2Ljg1IDExLjQ1IDMuOCAxMC43MkMzLjQ1IDEwLjYyIDMuMiAxMC4zNSAzLjIgMTBDMy4yIDkuNjUgMy40NSA5LjM4IDMuOCA5LjI4QzYuODUgOC41NSA4LjU1IDYuODUgOS4yOCAzLjhDOS4zOCAzLjQ1IDkuNjUgMy4yIDEwIDMuMloiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0wLjUgMi41KSBzY2FsZSgxLjEyKSIgZmlsbD0idXJsKCNhKSIvPjxwYXRoIGQ9Ik0xOC4yIDEuOEMxOC40MiAxLjggMTguNiAxLjk1IDE4LjY2IDIuMTZDMTkuMDggMy44MiAyMC4wMiA0Ljc2IDIxLjY4IDUuMThDMjEuODkgNS4yNCAyMi4wNCA1LjQyIDIyLjA0IDUuNjRDMjIuMDQgNS44NiAyMS44OSA2LjA0IDIxLjY4IDYuMUMyMC4wMiA2LjUyIDE5LjA4IDcuNDYgMTguNjYgOS4xMkMxOC42IDkuMzMgMTguNDIgOS40OCAxOC4yIDkuNDhDMTcuOTggOS40OCAxNy44IDkuMzMgMTcuNzQgOS4xMkMxNy4zMiA3LjQ2IDE2LjM4IDYuNTIgMTQuNzIgNi4xQzE0LjUxIDYuMDQgMTQuMzYgNS44NiAxNC4zNiA1LjY0QzE0LjM2IDUuNDIgMTQuNTEgNS4yNCAxNC43MiA1LjE4QzE2LjM4IDQuNzYgMTcuMzIgMy44MiAxNy43NCAyLjE2QzE3LjggMS45NSAxNy45OCAxLjggMTguMiAxLjhaIiBmaWxsPSJ1cmwoI2IpIi8+PGNpcmNsZSBjeD0iMTcuOCIgY3k9IjE4LjIiIHI9IjEuMzUiIGZpbGw9IiM2MzY2RjEiLz48L3N2Zz4=';
 
 const MEDIA_SPECIAL = /(?:^|[-_])(image|music|canvas|video|research)(?:[-_]|$)/i;
 const CONTROL_CHARS = /[\x00-\x1f\x7f]/;
@@ -425,6 +426,68 @@ function timedBody(body, timer) {
   });
 }
 
+// keyRefused says whether an error on Gemini's own API is the AI Studio service refusing the key.
+// From 0.2.18 it says so as Gemini does: 400 API_KEY_INVALID for a wrong key, 403 for none. A 403
+// from Google itself ("The caller does not have permission") is about the account, not the key.
+function keyRefused(status, text) {
+  let error;
+  try {
+    const body = JSON.parse(text);
+    error = (Array.isArray(body) ? body[0] : body)?.error;
+  } catch {
+    return false;
+  }
+  if (status === 400) return Array.isArray(error?.details) && error.details.some(detail => detail?.reason === 'API_KEY_INVALID');
+  return error?.status === 'PERMISSION_DENIED' && /unregistered callers/.test(error.message);
+}
+
+const GEMINI_CALL = /^\/models\/([^/:]+):(generateContent|streamGenerateContent)$/;
+
+// geminiTarget is where a call on Gemini's own API goes at the AI Studio service, with the model
+// it names: the service's /v1beta, beside the /v1 that baseURL always ends in. Magpie draws with
+// an image model there (the model's npm is @ai-sdk/google, see listStudioModels), asking
+// <baseURL>/models/<id>:streamGenerateContent?alt=sse. null for any other request, and for one
+// with any other query.
+function geminiTarget(url, baseURL) {
+  const base = new URL(baseURL);
+  if (url.origin !== base.origin || !url.pathname.startsWith(base.pathname + '/')) return null;
+  const m = GEMINI_CALL.exec(url.pathname.slice(base.pathname.length));
+  if (!m || url.hash || (url.search && url.search !== '?alt=sse')) return null;
+  let model;
+  try {
+    model = decodeURIComponent(m[1]);
+  } catch {
+    return null;
+  }
+  return { url: `${baseURL}beta/models/${m[1]}:${m[2]}${url.search}`, model };
+}
+
+// The line Magpie ends a drawing's prompt with when a size is asked for (drawPrompt): a ratio
+// given as one, or the nearest of its usual ones to a WIDTHxHEIGHT size.
+const ASPECT_LINE = /\n\nAspect ratio: (\d+(?:\.\d+)?):(\d+(?:\.\d+)?)\./;
+
+// aspectRatio moves the aspect ratio a generateContent request's prompt names to
+// imageConfig.aspectRatio, as one of aspects, the model's: the one named when the model takes it,
+// else the nearest. With the line in its prompt, gemini-3.1-flash-lite-image (seen on
+// AIStudio2API 0.2.17) answered with no image at all, each of three times; with imageConfig it
+// drew. A request that names a ratio in imageConfig already is left as it is.
+function aspectRatio(body, aspects) {
+  const config = body.generationConfig && typeof body.generationConfig === 'object' ? body.generationConfig : {};
+  if (config.imageConfig?.aspectRatio) return;
+  const contents = Array.isArray(body.contents) ? body.contents : [];
+  const content = contents.findLast(c => c?.role === 'user' && Array.isArray(c.parts));
+  const part = content?.parts.find(p => typeof p?.text === 'string' && ASPECT_LINE.test(p.text));
+  if (!part) return;
+  const [, w, h] = ASPECT_LINE.exec(part.text);
+  const asked = `${w}:${h}`;
+  const log = r => Math.log(Number(r.split(':')[0]) / Number(r.split(':')[1]));
+  const nearest = aspects.includes(asked)
+    ? asked
+    : aspects.reduce((best, r) => Math.abs(log(r) - log(asked)) < Math.abs(log(best) - log(asked)) ? r : best);
+  part.text = part.text.replace(ASPECT_LINE, '');
+  body.generationConfig = { ...config, imageConfig: { ...config.imageConfig, aspectRatio: nearest } };
+}
+
 export async function forward(input, init, getAuth, opts) {
   const req = new Request(input, init);
 
@@ -453,7 +516,11 @@ export async function forward(input, init, getAuth, opts) {
     return makeOpenAIError(400, 'Invalid request URL');
   }
 
-  if (reqUrl.search || reqUrl.hash) {
+  // AI Studio's image models are asked on Gemini's own API (opts.imageModel, see imageModelOf)
+  const gemini = opts.imageModel ? geminiTarget(reqUrl, c.baseURL) : null;
+  const geminiUrl = gemini?.url;
+
+  if ((reqUrl.search || reqUrl.hash) && !geminiUrl) {
     return makeOpenAIError(400, 'Query parameters and fragments are not allowed');
   }
 
@@ -461,13 +528,16 @@ export async function forward(input, init, getAuth, opts) {
   const modelsUrl = `${c.baseURL}/models`;
   const incomingUrl = `${reqUrl.origin}${reqUrl.pathname}`;
 
-  if (incomingUrl !== chatUrl && incomingUrl !== modelsUrl) {
+  if (incomingUrl !== chatUrl && incomingUrl !== modelsUrl && !geminiUrl) {
     return makeOpenAIError(404, 'Endpoint not found');
   }
 
   if (incomingUrl === chatUrl && req.method !== 'POST') {
     return makeOpenAIError(400, 'Method not allowed: /chat/completions requires POST');
   }
+  if (geminiUrl && req.method !== 'POST') {
+    return makeOpenAIError(400, 'Method not allowed: generateContent requires POST');
+  }
   if (incomingUrl === modelsUrl && req.method !== 'GET') {
     return makeOpenAIError(400, 'Method not allowed: /models requires GET');
   }
@@ -549,6 +619,47 @@ export async function forward(input, init, getAuth, opts) {
       body.model = twin;
       rawBody = JSON.stringify(body);
     }
+  } else if (geminiUrl) {
+    try {
+      rawBody = await req.text();
+    } catch {
+      return makeOpenAIError(400, 'Failed to read request body');
+    }
+
+    let body;
+    try {
+      body = JSON.parse(rawBody);
+    } catch {
+      return makeOpenAIError(400, 'Invalid JSON body');
+    }
+    if (!body || typeof body !== 'object' || Array.isArray(body)) {
+      return makeOpenAIError(400, 'Request body must be a JSON object');
+    }
+
+    if (!opts.allowTools && Array.isArray(body.tools) && body.tools.length > 0) {
+      return makeOpenAIError(400, `Tool calls are turned off for magpie-gemini-web. Turn them on with: magpie plugin options magpie-gemini-web '{"allowTools":true}'`);
+    }
+
+    // A text model is asked on chat completions, where allowImages holds. One the service's list
+    // can't tell of goes no further: an unreachable service is answered as one, for a managed one
+    // to be started again (forwardManagedStudio).
+    let aspects;
+    try {
+      aspects = await opts.imageModel(c, gemini.model);
+    } catch (err) {
+      if (err?.unreachable) {
+        return makeOpenAIError(502, 'Bad gateway: failed to reach backend service', { [UNREACHABLE_HEADER]: 'unreachable' });
+      }
+      if (err?.signIn === 'expired') {
+        return makeOpenAIError(401, 'Unauthorized: AI Studio refused the key');
+      }
+      return makeOpenAIError(503, `Can't tell whether ${gemini.model} is one of AI Studio's image models: ${err?.message || err}`);
+    }
+    if (!aspects) {
+      return makeOpenAIError(400, `${gemini.model} isn't one of AI Studio's image models: generateContent here is for those alone, and a text model is asked on /chat/completions`);
+    }
+    aspectRatio(body, aspects);
+    rawBody = JSON.stringify(body);
   }
 
   // requestTimeoutMs bounds each wait on the backend, for the response headers and then for each
@@ -560,7 +671,7 @@ export async function forward(input, init, getAuth, opts) {
   timer.start();
   try {
     // Bun's fetch drops a connection idle for 300 s; the timer sets the deadline instead.
-    upstreamRes = await fetch(incomingUrl, {
+    upstreamRes = await fetch(geminiUrl || incomingUrl, {
       method: req.method,
       headers,
       body: rawBody,
@@ -592,6 +703,13 @@ export async function forward(input, init, getAuth, opts) {
 
   // Gemini's citation markers come out of a chat reply, streamed or whole (see cite.mjs).
   let respBody = upstreamRes.body && timedBody(upstreamRes.body, timer);
+  if (geminiUrl && (upstreamRes.status === 400 || upstreamRes.status === 403) && respBody) {
+    const text = await new Response(respBody).text();
+    if (keyRefused(upstreamRes.status, text)) {
+      return makeOpenAIError(401, 'Unauthorized: AI Studio refused the key');
+    }
+    respBody = text;
+  }
   if (opts.stripCitations && incomingUrl === chatUrl && upstreamRes.ok && respBody) {
     const type = upstreamRes.headers.get('content-type') || '';
     if (type.includes('text/event-stream')) respBody = citeStream(respBody);

package/lib/studio-native.mjs

@@ -197,7 +197,8 @@ const ENV_KEYS = [
   'ROUTING_STRATEGY', 'UPSTREAM_CHANNELS', 'MODEL_MAPPING', 'MODEL_CHANNELS', 'TEMPORARY_CHAT', 'WAA_BACKEND',
   'MEDIA_OUTPUT', 'MEDIA_BASE_URL', 'AUTO_START', 'REQUEST_BODY_LOG', 'LOG_FILE', 'LOG_MAX_TOTAL_MB',
   'ADMIN_AUTH_ENABLED', 'ADMIN_USERNAME', 'ADMIN_PASSWORD', 'BUILD_NATIVE_NONSTREAM',
-  'NONSTREAM_KEEPALIVE', 'FAKE_STREAM', 'YOUTUBE_LINKS'
+  'NONSTREAM_KEEPALIVE', 'FAKE_STREAM', 'YOUTUBE_LINKS', 'SEARCH_MODEL_ALIASES', 'GOOGLE_SEARCH',
+  'FIRST_EVENT_HEDGE', 'CONTINUATION_REWRITE', 'CONTINUATION_PROMPT'
 ];
 
 // PROXY_ENV are the proxy variables the service would fall back to with no PROXY of its own.
@@ -216,7 +217,10 @@ const SETTING_DEFAULTS = {
   ROUTING_STRATEGY: 'fill-first',
   REQUEST_TIMEOUT: '30m',
   INIT_TIMEOUT: '2m',
-  NONSTREAM_KEEPALIVE: 'false'
+  NONSTREAM_KEEPALIVE: 'false',
+  // Upstream lists each chat model that can search Google again as <id>-search (0.2.18), which
+  // would list most of Magpie's AI Studio models twice.
+  SEARCH_MODEL_ALIASES: 'false'
 };
 
 // pluginEnv is the settings this plugin depends on to reach, trust and drive the service. The
@@ -235,7 +239,7 @@ function pluginEnv(dataDir, config) {
     ADMIN_USERNAME: config.adminUsername,
     ADMIN_PASSWORD: config.adminPassword,
     AUTO_START: 'true',
-    WAA_BACKEND: 'go',
+    WAA_BACKEND: 'spidermonkey',
     UPSTREAM_CHANNELS: 'playground',
     BUILD_NATIVE_NONSTREAM: 'false'
   };

package/lib/studio-release.json

@@ -1,39 +1,93 @@
 {
-  "version": "0.2.16-magpie.1",
+  "version": "0.2.18-magpie.1",
   "repository": "BUKOWSKIREAL/magpie-gemini-web",
-  "tag": "studio-v0.2.16-magpie.1",
+  "tag": "studio-v0.2.18-magpie.1",
   "goVersion": "1.27.1",
+  "toolchains": {
+    "zig": "0.16.0",
+    "xcode": {
+      "version": "26.3",
+      "build": "17C529"
+    },
+    "llvmMingw": {
+      "version": "20261020",
+      "clang": "clang version 23.1.4 (https://github.com/llvm/llvm-project.git 7a941dfb2877a0b8cf30323fefa85ad019e0b0f5)",
+      "hosts": {
+        "darwin": {
+          "asset": "llvm-mingw-20261020-ucrt-macos-universal.tar.xz",
+          "sha256": "e9c13e4ede38e715003ffc674d4d00a1088df8235439d1f0c16188ff0704c17e"
+        },
+        "linux-x64": {
+          "asset": "llvm-mingw-20261020-ucrt-ubuntu-22.04-x86_64.tar.xz",
+          "sha256": "55064b60b991a1e1e8090b8c2f84e82b22cfe5903d12c159d65064cf5e8ae335"
+        },
+        "win32-x64": {
+          "asset": "llvm-mingw-20261020-ucrt-x86_64.zip",
+          "sha256": "fd5462b7f5d93b2ff981fcd3f9c7e427e47f3203c64ea91c27bcc444eebd74cd"
+        }
+      }
+    },
+    "spidermonkey": {
+      "release": "v152.0.4-aistudio2api.1",
+      "repository": "Mag1cFall/firefox",
+      "targets": {
+        "darwin-arm64": {
+          "asset": "spidermonkey-v152.0.4-aistudio2api.1-darwin-arm64.tar.gz",
+          "sha256": "19f690d52ce2cfe7dbaedcc9771976145fff0dbd81f24e89a2dd094a1424b673"
+        },
+        "darwin-x64": {
+          "asset": "spidermonkey-v152.0.4-aistudio2api.1-darwin-amd64.tar.gz",
+          "sha256": "8063d69f56711c72b1244c8415b6c5096aa64ae8b022f555722667531acfe659"
+        },
+        "linux-x64": {
+          "asset": "spidermonkey-v152.0.4-aistudio2api.1-linux-amd64.tar.gz",
+          "sha256": "d3ecebf1890355426ad261ab8723038849a524b348af53e1bb440ca53cc2cacb"
+        },
+        "linux-arm64": {
+          "asset": "spidermonkey-v152.0.4-aistudio2api.1-linux-arm64.tar.gz",
+          "sha256": "b3c9539b8d8378d99f86b267e0e3d007dd01ff80acebf4f52f3e1d6ac04d9d00"
+        },
+        "win32-x64": {
+          "asset": "spidermonkey-v152.0.4-aistudio2api.1-windows-amd64.tar.gz",
+          "sha256": "942a3b57b202f899d799cac678b7471d01d0b34714070f0810c18fca37ffd721"
+        }
+      }
+    }
+  },
   "upstream": {
-    "version": "0.2.16",
+    "version": "0.2.18",
     "repository": "https://github.com/Mag1cFall/AIStudio2API.git",
-    "commit": "fd6aab611b52fbfe179fbfc1bf830c4343066e32",
+    "commit": "9b694a6b7c6439db1767a577994dfcc87a3cf588",
     "camoufox": "152.0.4-beta.29"
   },
+  "patches": [
+    "studio-0.2.17-preserve-request-bodies.patch"
+  ],
   "binaries": {
     "darwin-arm64": {
-      "asset": "aistudio2api-v0.2.16-magpie.1-darwin-arm64.tar.gz",
-      "sha256": "3dd83c7c7fef6bbf96dc7d8eb6dd7257955af6c274c0fc67ad2ecb24a7df9992",
-      "binarySha256": "6f07122038587514bebe9f15ba0b00f7d9916d4db130028669380729b2e97c97"
+      "asset": "aistudio2api-v0.2.18-magpie.1-darwin-arm64.tar.gz",
+      "sha256": "9f70596a5b95f4bcf5347a52b88ad41e26106cd6e2a79304183a73d58d8a7a29",
+      "binarySha256": "d41e9d4c950efb479ad19727bdf496f8de05c01451110fd9eb7425a9054f5c66"
     },
     "darwin-x64": {
-      "asset": "aistudio2api-v0.2.16-magpie.1-darwin-amd64.tar.gz",
-      "sha256": "4152cbb37d83680c903d1bb3e72e7eaebd80e5e0df617c20e3ba7fbffd160868",
-      "binarySha256": "a0ad46091dd4ec20f0d82ffa3f14673ac3b5c70dc4a8a0e4cc8aac658525d050"
+      "asset": "aistudio2api-v0.2.18-magpie.1-darwin-amd64.tar.gz",
+      "sha256": "b118733750a3f882fe13754b2079f9cc89b2645d3cd3bce4bab26aaee24b54e5",
+      "binarySha256": "6a1017195809a881614032be647faf25754ebfe060e3301424dcdacefba32469"
     },
     "linux-x64": {
-      "asset": "aistudio2api-v0.2.16-magpie.1-linux-amd64.tar.gz",
-      "sha256": "7f97398ea29c2413d3c3e12aca9525213bc80b97c6667a68429ccd3e8dc27ba1",
-      "binarySha256": "deef4cc68cafff147ad24fcaed2d42389d2dbd54d081696c3d6ea95b7d0ea8fa"
+      "asset": "aistudio2api-v0.2.18-magpie.1-linux-amd64.tar.gz",
+      "sha256": "e6310fb89c34295d1a4c60e40b30d7a3073e9f5fc16343650f4021f396225922",
+      "binarySha256": "1803037342daada925486f5acd40bfc0bc06bda54b0f1f4459da79d1e917d283"
     },
     "linux-arm64": {
-      "asset": "aistudio2api-v0.2.16-magpie.1-linux-arm64.tar.gz",
-      "sha256": "2fccc892f00e17b8171ab2ed5d22b4a413b6e7d8230bb911bc5e846c5dc8f717",
-      "binarySha256": "567c61bec4f7cf199eabd05ecb3420f409039064fe02a2e38ed22e8b35db3da9"
+      "asset": "aistudio2api-v0.2.18-magpie.1-linux-arm64.tar.gz",
+      "sha256": "965336192889bcd2d9f6db1e5f9c035251ff64db86ff0e590d9ed89662867629",
+      "binarySha256": "81553da83a7322d608b2498e6c6a01b08fe963341d8655262ed2dd17ca7a83df"
     },
     "win32-x64": {
-      "asset": "aistudio2api-v0.2.16-magpie.1-windows-amd64.zip",
-      "sha256": "e7d115aacd957ffda80cf2ecadc38af8404d780bc45af01b6b945accc50d8bc7",
-      "binarySha256": "bf96178445dbb653b6876b3abe1768b880465974531d6fb12892857fbc666818"
+      "asset": "aistudio2api-v0.2.18-magpie.1-windows-amd64.zip",
+      "sha256": "537884412868849665b22d5d9066101a94d389ad0f048555da8c8ea55c7240ba",
+      "binarySha256": "0024d8709eb97950ddb3ad6016612521a76c7aca553235db2dddb9183188806e"
     }
   }
 }

package/lib/studio.mjs

@@ -1,4 +1,4 @@
-import { normalizeBaseURL, credentials, forward, makeOpenAIError, UNREACHABLE_HEADER } from './backend.mjs';
+import { normalizeBaseURL, credentials, forward, makeOpenAIError, UNREACHABLE_HEADER, PLUGIN_ICON } from './backend.mjs';
 import path from 'node:path';
 import { localStudio, ensureStudio, studioAdmin, studioAccounts, studioProxy, studioCommand, validateProxy, isConnectRefused, PROXY_SOURCES, downloadProxy, redactProxy, studioDataDir, checkStudioHealth, setupStep, camoufoxState } from './studio-native.mjs';
 import { openProgressPage } from './studio-page.mjs';
@@ -10,6 +10,19 @@ const STUDIO_EXCLUDE = /(?:image|nano-banana|tts|audio|live|transcribe|robotics|
 // Catalog capabilities of models made for images, speech or live sessions. Such a model can be
 // marked chat_model and named like a text model too (gemini-omni-*), so the name can't tell.
 const NON_TEXT_CAPS = ['image_route', 'speech_route', 'live_route', 'aspect_ratio', 'output_resolution', 'interactions_api', 'transcription_output'];
+// Of those, the ones an image model (image_route) has. Such a model is listed for Magpie's image
+// generation (one with any other is left out still): on Gemini's own API (@ai-sdk/google), as
+// Magpie draws only with a plugin's Gemini image model there, asking generateContent for images
+// (see forward). Magpie keeps it in its chat model lists too, if it is ticked there.
+const IMAGE_CAPS = new Set(['image_route', 'aspect_ratio', 'output_resolution']);
+// The aspect ratios of an image model whose catalog entry lists none (capability_options
+// .image_aspect_ratios), as the service takes them then (openAIImageAspectRatios).
+const DEFAULT_ASPECTS = ['1:1', '2:3', '3:2', '3:4', '4:3', '4:5', '5:4', '9:16', '16:9', '21:9'];
+const ASPECT = /^\d+(?:\.\d+)?:\d+(?:\.\d+)?$/;
+// The image models each backend's last list named (listStudioModels), with their aspect ratios,
+// for the requests on Gemini's API (imageModelOf); asked again once this old.
+const IMAGE_CATALOG_MS = 10 * 60 * 1000;
+const imageCatalogs = new Map();
 const CONTROL_CHARS = /[\x00-\x1f\x7f]/;
 
 // Magpie waits 10 minutes for a sign-in once authorize returns (signInTimeout), downloads and the
@@ -57,6 +70,7 @@ const KNOWN_STUDIO_NESTED = new Set([
   'baseURL',
   'allowTools',
   'allowImages',
+  'imageModels',
   'contextLimit',
   'outputLimit',
   'requestTimeoutMs',
@@ -78,7 +92,10 @@ export function studioSettings(options = {}) {
     allowTools = options.allowTools;
   }
 
-  let allowImages = false;
+  // On unless turned off: AI Studio's chat models read a chat's images (seen on AIStudio2API
+  // 0.2.17). Gemini Web keeps it off by default (settings), as gemini-3.6-flash there never
+  // answered a chat with an image, each of two times.
+  let allowImages = true;
   if (options.allowImages !== undefined) {
     if (typeof options.allowImages !== 'boolean') {
       throw new Error('Invalid option allowImages: must be a boolean');
@@ -102,6 +119,7 @@ export function studioSettings(options = {}) {
     modelTimeoutMs = options.modelTimeoutMs;
   }
 
+  let imageModels = true;
   let baseURL = STUDIO_BASE;
   let proxy;
   let explicitContextLimit = null;
@@ -140,6 +158,12 @@ export function studioSettings(options = {}) {
       }
       allowImages = s.allowImages;
     }
+    if (s.imageModels !== undefined) {
+      if (typeof s.imageModels !== 'boolean') {
+        throw new Error('Invalid option studio.imageModels: must be a boolean');
+      }
+      imageModels = s.imageModels;
+    }
     if (s.requestTimeoutMs !== undefined) {
       if (!Number.isInteger(s.requestTimeoutMs) || s.requestTimeoutMs <= 0) {
         throw new Error('Invalid option studio.requestTimeoutMs: must be a positive integer');
@@ -173,6 +197,7 @@ export function studioSettings(options = {}) {
     baseURL,
     allowTools,
     allowImages,
+    imageModels,
     requestTimeoutMs,
     modelTimeoutMs,
     proxy,
@@ -225,6 +250,7 @@ export async function listStudioModels(c, opts) {
 
   const result = Object.create(null);
   const seen = new Set();
+  const images = new Map();
   // A model no enabled account's subscription covers is listed without channels, and calls to it
   // get a 403. A backend that lists no channels at all is older than that rule: keep its models.
   const listsChannels = body.data.some(item => Array.isArray(item?.channels));
@@ -240,14 +266,17 @@ export async function listStudioModels(c, opts) {
     if (!id.startsWith('gemini-')) continue;
     // Build assistant models inject Google's coding-agent prompt and do not expose
     // ordinary function calling. Keep them out of this general-purpose provider.
-    if (STUDIO_EXCLUDE.test(id) || /-build$/i.test(id)) continue;
+    if (/-build$/i.test(id)) continue;
 
     const methods = Array.isArray(item.supported_generation_methods) ? item.supported_generation_methods : [];
     if (!methods.includes('generateContent')) continue;
 
     const caps = item.capabilities && typeof item.capabilities === 'object' ? item.capabilities : {};
     if (caps.chat_model !== true || caps.assistant_route === true) continue;
-    if (NON_TEXT_CAPS.some(cap => caps[cap] === true)) continue;
+    // An image model is named for images, so the name filter is for the others only.
+    const draws = caps.image_route === true;
+    if (draws ? !opts.imageModels : STUDIO_EXCLUDE.test(id)) continue;
+    if (NON_TEXT_CAPS.some(cap => caps[cap] === true && !(draws && IMAGE_CAPS.has(cap)))) continue;
     if (listsChannels && !(Array.isArray(item.channels) && item.channels.length > 0)) continue;
 
     if (seen.has(id)) continue;
@@ -266,9 +295,19 @@ export async function listStudioModels(c, opts) {
 
     const toolcall = Boolean(opts.allowTools && caps.function_declarations === true);
     const reasoning = Boolean(caps.thinking === true || caps.thinking_level === true);
-    // Of the levels the backend takes, none is the lowest one again and xhigh/max are high.
-    const variants = caps.thinking_level === true ? { minimal: {}, low: {}, medium: {}, high: {} } : {};
-    const image = Boolean(opts.allowImages && caps.media_resolution === true);
+    // Newer catalogs expose each model's supported levels; older external services do not.
+    const levels = Array.isArray(item.thinking_levels)
+      ? item.thinking_levels.filter(level => ['minimal', 'low', 'medium', 'high'].includes(level))
+      : ['minimal', 'low', 'medium', 'high'];
+    const variants = caps.thinking_level === true ? Object.fromEntries(levels.map(level => [level, {}])) : {};
+    // An image model takes images to edit or draw from, which allowImages (images in a chat on
+    // chat completions) doesn't cover.
+    const image = draws || Boolean(opts.allowImages && caps.media_resolution === true);
+    if (draws) {
+      const listed = item.capability_options?.image_aspect_ratios;
+      const aspects = Array.isArray(listed) ? listed.filter(r => typeof r === 'string' && ASPECT.test(r)) : [];
+      images.set(id, aspects.length > 0 ? aspects : DEFAULT_ASPECTS);
+    }
 
     result[id] = {
       id,
@@ -277,7 +316,7 @@ export async function listStudioModels(c, opts) {
       api: {
         id,
         url: c.baseURL,
-        npm: '@ai-sdk/openai-compatible'
+        npm: draws ? '@ai-sdk/google' : '@ai-sdk/openai-compatible'
       },
       limit: {
         context,
@@ -293,7 +332,8 @@ export async function listStudioModels(c, opts) {
           image
         },
         output: {
-          text: true
+          text: true,
+          image: draws
         }
       },
       cost: {
@@ -315,9 +355,31 @@ export async function listStudioModels(c, opts) {
     throw new Error('No usable Gemini models found in AI Studio response');
   }
 
+  imageCatalogs.set(catalogKey(c), { images, at: Date.now() });
   return result;
 }
 
+function catalogKey(c) {
+  return `${c.baseURL}\n${c.key}`;
+}
+
+// imageModelOf is the aspect ratios of the image model id, which a request on Gemini's API names
+// (see forward), as the backend's list says, asking it again once its last is old: null for a
+// model that isn't one. When the list can't be had again, its last still holds; with none, what
+// the model is isn't known, and the list's error is thrown for forward to answer with.
+async function imageModelOf(c, opts, id) {
+  const key = catalogKey(c);
+  const cached = imageCatalogs.get(key);
+  if (!cached || Date.now() - cached.at > IMAGE_CATALOG_MS) {
+    try {
+      await listStudioModels(c, opts);
+    } catch (err) {
+      if (!cached) throw err;
+    }
+  }
+  return imageCatalogs.get(key).images.get(id) ?? null;
+}
+
 function sameBackend(c, local) {
   return c.key === local.apiKey && c.baseURL === local.baseURL;
 }
@@ -346,6 +408,13 @@ function staleManagedSignIn(auth, opts) {
 
 async function forwardManagedStudio(input, init, getAuth, opts) {
   const retryInput = input instanceof Request ? input.clone() : input;
+  // Gemini's API, for the image models alone (see forward)
+  const forwardOpts = {
+    ...opts,
+    nativeThinking: true,
+    stripCitations: false,
+    imageModel: opts.imageModels ? (c, id) => imageModelOf(c, opts, id) : undefined
+  };
 
   const auth = await getAuth();
   if (auth?.metadata?.managed === true && staleManagedSignIn(auth, opts)) {
@@ -353,7 +422,7 @@ async function forwardManagedStudio(input, init, getAuth, opts) {
   }
 
   const callerSignal = input instanceof Request ? input.signal : init?.signal;
-  const res = await forward(input, init, getAuth, { ...opts, nativeThinking: true, stripCitations: false });
+  const res = await forward(input, init, getAuth, forwardOpts);
   if (res.headers.get(UNREACHABLE_HEADER) !== 'unreachable') return res;
 
   if (callerSignal?.aborted) return res;
@@ -366,7 +435,7 @@ async function forwardManagedStudio(input, init, getAuth, opts) {
   }
 
   if (callerSignal?.aborted) return res;
-  return forward(retryInput, init, getAuth, { ...opts, nativeThinking: true, stripCitations: false });
+  return forward(retryInput, init, getAuth, forwardOpts);
 }
 
 // accountSignIn is the Magpie sign-in for one Google account of the local service: the service's
@@ -667,7 +736,7 @@ export const AIStudioPlugin = async (_input, options = {}) => {
       proxy = downloadProxy(studioDataDir(), opts.proxy);
     } catch {}
     const via = proxy ? `走代理 ${redactProxy(proxy)}` : '按 Magpie 的代理设置';
-    return `本地 AI Studio 服务还没启动：要先启动它，第一次使用或插件更新后还要先从 GitHub 下载（约 25 MB，${via}），可能要等几分钟。${SETUP_PROXY_HINT}\n`;
+    return `本地 AI Studio 服务还没启动：要先启动它，第一次使用或插件更新后还要先从 GitHub 下载（约 40 MB，${via}），可能要等几分钟。${SETUP_PROXY_HINT}\n`;
   }
 
   // addAccount signs a new Google account in through the service's own login window, setting the
@@ -743,6 +812,7 @@ export const AIStudioPlugin = async (_input, options = {}) => {
     },
     auth: {
       provider: STUDIO_ID,
+      icon: PLUGIN_ICON,
       maxConcurrency: 1,
       methods: [
         {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magpie-gemini-web",
-  "version": "0.6.0",
+  "version": "0.8.0",
   "description": "Gemini Web and Google AI Studio provider for Magpie, backed by gemini-web2api-go and AIStudio2API",
   "type": "module",
   "main": "./index.mjs",
@@ -26,6 +26,7 @@
     "scripts/studio-smoke.mjs",
     "scripts/studio.mjs",
     "scripts/studio-release.mjs",
+    "scripts/studio-pins.mjs",
     "scripts/studio-archive.go",
     "scripts/studio-regzip.go",
     "scripts/studio-managed-smoke.mjs",
@@ -39,6 +40,7 @@
     "native-task/LICENSE",
     "README.md",
     "README.en.md",
+    "docs/logo.svg",
     "docs/backend-release.md",
     "docs/studio-release.md",
     "LICENSE",
@@ -51,7 +53,9 @@
     "opencode",
     "provider",
     "gemini",
-    "gemini-web"
+    "gemini-web",
+    "ai-studio",
+    "google-ai-studio"
   ],
   "engines": {
     "node": ">=22"
@@ -78,6 +82,7 @@
     "studio:smoke": "node scripts/studio-smoke.mjs"
   },
   "magpie": {
+    "icon": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIj48ZGVmcz48bGluZWFyR3JhZGllbnQgaWQ9ImEiIHgxPSIyIiB5MT0iMyIgeDI9IjIwIiB5Mj0iMjEiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjMDZCNkQ0Ii8+PHN0b3Agb2Zmc2V0PSI1MCUiIHN0b3AtY29sb3I9IiMzQjgyRjYiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM4QjVDRjYiLz48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBpZD0iYiIgeDE9IjE0IiB5MT0iMiIgeDI9IjIyIiB5Mj0iMTAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjOEI1Q0Y2Ii8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjRUM0ODk5Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHBhdGggZD0iTTEwIDMuMkMxMC4zNSAzLjIgMTAuNjIgMy40NSAxMC43MiAzLjhDMTEuNDUgNi44NSAxMy4xNSA4LjU1IDE2LjIgOS4yOEMxNi41NSA5LjM4IDE2LjggOS42NSAxNi44IDEwQzE2LjggMTAuMzUgMTYuNTUgMTAuNjIgMTYuMiAxMC43MkMxMy4xNSAxMS40NSAxMS40NSAxMy4xNSAxMC43MiAxNi4yQzEwLjYyIDE2LjU1IDEwLjM1IDE2LjggMTAgMTYuOEM5LjY1IDE2LjggOS4zOCAxNi41NSA5LjI4IDE2LjJDOC41NSAxMy4xNSA2Ljg1IDExLjQ1IDMuOCAxMC43MkMzLjQ1IDEwLjYyIDMuMiAxMC4zNSAzLjIgMTBDMy4yIDkuNjUgMy40NSA5LjM4IDMuOCA5LjI4QzYuODUgOC41NSA4LjU1IDYuODUgOS4yOCAzLjhDOS4zOCAzLjQ1IDkuNjUgMy4yIDEwIDMuMloiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0wLjUgMi41KSBzY2FsZSgxLjEyKSIgZmlsbD0idXJsKCNhKSIvPjxwYXRoIGQ9Ik0xOC4yIDEuOEMxOC40MiAxLjggMTguNiAxLjk1IDE4LjY2IDIuMTZDMTkuMDggMy44MiAyMC4wMiA0Ljc2IDIxLjY4IDUuMThDMjEuODkgNS4yNCAyMi4wNCA1LjQyIDIyLjA0IDUuNjRDMjIuMDQgNS44NiAyMS44OSA2LjA0IDIxLjY4IDYuMUMyMC4wMiA2LjUyIDE5LjA4IDcuNDYgMTguNjYgOS4xMkMxOC42IDkuMzMgMTguNDIgOS40OCAxOC4yIDkuNDhDMTcuOTggOS40OCAxNy44IDkuMzMgMTcuNzQgOS4xMkMxNy4zMiA3LjQ2IDE2LjM4IDYuNTIgMTQuNzIgNi4xQzE0LjUxIDYuMDQgMTQuMzYgNS44NiAxNC4zNiA1LjY0QzE0LjM2IDUuNDIgMTQuNTEgNS4yNCAxNC43MiA1LjE4QzE2LjM4IDQuNzYgMTcuMzIgMy44MiAxNy43NCAyLjE2QzE3LjggMS45NSAxNy45OCAxLjggMTguMiAxLjhaIiBmaWxsPSJ1cmwoI2IpIi8+PGNpcmNsZSBjeD0iMTcuOCIgY3k9IjE4LjIiIHI9IjEuMzUiIGZpbGw9IiM2MzY2RjEiLz48L3N2Zz4=",
     "maxConcurrency": 1
   }
 }