magpie-gemini-web 0.7.0 → 0.8.1

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', 'FIRST_EVENT_HEDGE'
+  '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,7 +1,7 @@
 {
-  "version": "0.2.17-magpie.1",
+  "version": "0.2.18-magpie.1",
   "repository": "BUKOWSKIREAL/magpie-gemini-web",
-  "tag": "studio-v0.2.17-magpie.1",
+  "tag": "studio-v0.2.18-magpie.1",
   "goVersion": "1.27.1",
   "toolchains": {
     "zig": "0.16.0",
@@ -26,12 +26,38 @@
           "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.17",
+    "version": "0.2.18",
     "repository": "https://github.com/Mag1cFall/AIStudio2API.git",
-    "commit": "bd6c40f5f8a3a680a19a1ebff67216298d8bae27",
+    "commit": "9b694a6b7c6439db1767a577994dfcc87a3cf588",
     "camoufox": "152.0.4-beta.29"
   },
   "patches": [
@@ -39,29 +65,29 @@
   ],
   "binaries": {
     "darwin-arm64": {
-      "asset": "aistudio2api-v0.2.17-magpie.1-darwin-arm64.tar.gz",
-      "sha256": "10a6f71fcd8313b4d3afc72797027454ff45ae545dfd2bbd96cc0b4b97004517",
-      "binarySha256": "5978c56cb705eb1b449e59b772655aac2b3aa933da82e71ce28e7d6f7029e8ef"
+      "asset": "aistudio2api-v0.2.18-magpie.1-darwin-arm64.tar.gz",
+      "sha256": "9f70596a5b95f4bcf5347a52b88ad41e26106cd6e2a79304183a73d58d8a7a29",
+      "binarySha256": "d41e9d4c950efb479ad19727bdf496f8de05c01451110fd9eb7425a9054f5c66"
     },
     "darwin-x64": {
-      "asset": "aistudio2api-v0.2.17-magpie.1-darwin-amd64.tar.gz",
-      "sha256": "44527571d9294db1451ebb215552a76f3836be9e3a1a5e5fd79bfc57ad6b9878",
-      "binarySha256": "f3b3d48094d1a7849c455b31487db5e4569de00124d092d1c639d63fb0162178"
+      "asset": "aistudio2api-v0.2.18-magpie.1-darwin-amd64.tar.gz",
+      "sha256": "b118733750a3f882fe13754b2079f9cc89b2645d3cd3bce4bab26aaee24b54e5",
+      "binarySha256": "6a1017195809a881614032be647faf25754ebfe060e3301424dcdacefba32469"
     },
     "linux-x64": {
-      "asset": "aistudio2api-v0.2.17-magpie.1-linux-amd64.tar.gz",
-      "sha256": "47bc3922c54031435fc35914cf382d20a892ca0a2f4432eb0904677a57b002c0",
-      "binarySha256": "385b21e2d5905acb062a355ebf15c2db17492212a2ab93ef14da2f6acece96a1"
+      "asset": "aistudio2api-v0.2.18-magpie.1-linux-amd64.tar.gz",
+      "sha256": "e6310fb89c34295d1a4c60e40b30d7a3073e9f5fc16343650f4021f396225922",
+      "binarySha256": "1803037342daada925486f5acd40bfc0bc06bda54b0f1f4459da79d1e917d283"
     },
     "linux-arm64": {
-      "asset": "aistudio2api-v0.2.17-magpie.1-linux-arm64.tar.gz",
-      "sha256": "689e7644c766a9da8d8a462752e2495bbc659484e65d280fcf7e6554c6ec17b7",
-      "binarySha256": "20971e5abe5eb27e7e91f1cc2b665c41cd07ad9e1e9a2aa2b8aa7f87a8f1ebe0"
+      "asset": "aistudio2api-v0.2.18-magpie.1-linux-arm64.tar.gz",
+      "sha256": "965336192889bcd2d9f6db1e5f9c035251ff64db86ff0e590d9ed89662867629",
+      "binarySha256": "81553da83a7322d608b2498e6c6a01b08fe963341d8655262ed2dd17ca7a83df"
     },
     "win32-x64": {
-      "asset": "aistudio2api-v0.2.17-magpie.1-windows-amd64.zip",
-      "sha256": "79f8372f81cbe93ad4e663e7a400989e9d55d57f25dd40ca47decfb838071980",
-      "binarySha256": "e05b28fee8a5130074e3e0c23514e3b6451ba1c938458ae63576ffc6d81746f5"
+      "asset": "aistudio2api-v0.2.18-magpie.1-windows-amd64.zip",
+      "sha256": "537884412868849665b22d5d9066101a94d389ad0f048555da8c8ea55c7240ba",
+      "binarySha256": "0024d8709eb97950ddb3ad6016612521a76c7aca553235db2dddb9183188806e"
     }
   }
 }

package/lib/studio.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;
@@ -271,7 +300,14 @@ export async function listStudioModels(c, opts) {
       ? 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, {}])) : {};
-    const image = Boolean(opts.allowImages && caps.media_resolution === true);
+    // 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,
@@ -280,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,
@@ -296,7 +332,8 @@ export async function listStudioModels(c, opts) {
           image
         },
         output: {
-          text: true
+          text: true,
+          image: draws
         }
       },
       cost: {
@@ -318,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;
 }
@@ -349,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)) {
@@ -356,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;
@@ -369,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
@@ -670,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 下载（约 30 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

package/lib/usage.mjs

@@ -35,14 +35,26 @@ const CLIENT_HEADERS = {
   'Sec-CH-UA-Platform': '"Windows"'
 };
 
-// When an account's pools are read again. They move only while the account is used, which the
-// backend records (usedAt, see poolAccounts), or when a window starts over; use from the Gemini
-// app itself is caught by USAGE_MAX_AGE_MS. No two reads of an account are closer than
-// USAGE_MIN_GAP_MS: Magpie set to read allowances automatically asks every few minutes, far
-// more often than a person opens the Usage page. A failed read stands that long too, so a
-// cookie Google turned away isn't asked about again on every refresh.
-export const USAGE_MIN_GAP_MS = 10 * 60 * 1000;
-export const USAGE_MAX_AGE_MS = 6 * 3600 * 1000;
+// When an account's pools are read again: whenever Magpie asks, once the last reading is
+// USAGE_FRESH_MS old. Magpie keeps an account's reading a minute itself (loginUsageCache in its
+// internal/provider/login_usage.go) and dates the card by when it got it, so a reading kept here
+// any longer would show old figures as new, and a refresh would show them again (#34); use from
+// the Gemini app, the website or another device leaves no trace here to read again on. On its
+// own Magpie asks about once a minute while its Usage page or tray panel is open, whenever it
+// brings the menu bar's allowances up to date (every 3 minutes unless set otherwise) and, a
+// minute apart, while it routes requests among the accounts; it asks sooner only when it puts
+// its minute aside. USAGE_FRESH_MS takes in asks that come together, a refresh pressed twice; a
+// read under way is shared.
+// A failed read stands USAGE_RETRY_MS, so a cookie Google turned away, or an account it is
+// limiting, isn't asked about again every minute. Magpie asking again within
+// USAGE_ASKED_AGAIN_MS of the last time tries it again at once: it does that only when it put
+// its minute aside, for a card's refresh button, the Usage page or tray panel brought up or
+// refreshed, `magpie quota` or a sign-in check. Its hook doesn't tell a refresh (auth.usage is
+// given getAuth and the provider alone), so one pressed later than that tries again only when
+// pressed once more.
+export const USAGE_FRESH_MS = 30 * 1000;
+export const USAGE_RETRY_MS = 10 * 60 * 1000;
+export const USAGE_ASKED_AGAIN_MS = 60 * 1000;
 
 // The pools the Usage page shows, under the names Magpie gives the same windows elsewhere.
 const POOLS = [
@@ -64,17 +76,13 @@ async function openReadOnly(file) {
 }
 
 // poolAccounts lists the enabled accounts in the backend's pool, each with the proxy it is
-// bound to, if any, and whether that proxy is enabled (proxyEnabled), whether the pool has
-// proxies at all (pooled: disabled ones count, as they do for the backend), and when the
-// backend last used it (usedAt, Unix seconds): the later of when it last took the account for
-// a request and when it last finished one.
+// bound to, if any, and whether that proxy is enabled (proxyEnabled), and whether the pool has
+// proxies at all (pooled: disabled ones count, as they do for the backend).
 export async function poolAccounts(dataDir = getDataDir()) {
   const db = await openReadOnly(path.join(dataDir, 'gemini.db'));
   try {
     return db.all(`SELECT a.id, a.label, a.cookie, p.url AS proxy, p.enabled AS proxyEnabled,
-        EXISTS (SELECT 1 FROM proxies) AS pooled,
-        MAX(a.last_used_at, COALESCE((SELECT MAX(r.ts) FROM requests r
-          WHERE r.ts >= a.last_used_at AND r.account_id = a.id), 0)) AS usedAt
+        EXISTS (SELECT 1 FROM proxies) AS pooled
       FROM accounts a LEFT JOIN proxies p ON p.id = a.proxy_id
       WHERE a.status = 'enabled' ORDER BY a.id`);
   } finally {
@@ -160,42 +168,48 @@ export async function accountUsage(account, options = {}) {
   }, options));
 }
 
-// The last read of each account: id -> { at, read, pools }, pools once it has succeeded.
+// The last read of each account: id -> { at, read, pools, failed }, pools once it has
+// succeeded, failed once it hasn't, neither while it is under way.
 const reads = new Map();
+// When Magpie last asked for each account's usage: id -> ms.
+const asked = new Map();
 
-// due says whether the account's last read is to be made again (see USAGE_MIN_GAP_MS).
-function due(last, account, options) {
-  const now = Date.now();
-  const age = now - last.at;
-  if (age < (options.minGapMs ?? USAGE_MIN_GAP_MS)) return false;
-  if (!last.pools || age >= (options.maxAgeMs ?? USAGE_MAX_AGE_MS)) return true;
-  if ((account.usedAt ?? 0) >= Math.floor(last.at / 1000)) return true;
-  return last.pools.some(p => {
-    const at = Date.parse(p?.gxu?.windowRefreshesAt ?? '');
-    return at > last.at && at <= now;
-  });
+// due says whether the account's last read is to be made again (see USAGE_FRESH_MS); one under
+// way never is. again: Magpie asked within USAGE_ASKED_AGAIN_MS of the time before.
+function due(last, again, options) {
+  const age = Date.now() - last.at;
+  const fresh = options.freshMs ?? USAGE_FRESH_MS;
+  if (last.pools) return age >= fresh;
+  return !!last.failed && age >= (again ? fresh : (options.retryMs ?? USAGE_RETRY_MS));
 }
 
 function readUsage(account, options) {
+  const now = Date.now();
+  const again = now - asked.get(account.id) < (options.askedAgainMs ?? USAGE_ASKED_AGAIN_MS);
+  asked.set(account.id, now);
   const last = reads.get(account.id);
-  if (last && !due(last, account, options)) return last.read;
-  const entry = { at: Date.now() };
-  entry.read = accountUsage(account, options).then(u => ((entry.pools = u.pools), u));
+  if (last && !due(last, again, options)) return last.read;
+  const entry = { at: now };
+  entry.read = accountUsage(account, options).then(
+    u => ((entry.pools = u.pools), u),
+    err => { entry.failed = true; throw err; }
+  );
   reads.set(account.id, entry);
   return entry.read;
 }
 
 // The Google account's email, from the signed-in app page's bootstrap data (WIZ_global_data's
 // oPEP7c), kept per backend account: the page is large and the email doesn't change. A page
-// that didn't give it is asked for again no sooner than USAGE_MAX_AGE_MS: the email only names
+// that didn't give it is asked for again no sooner than EMAIL_RETRY_MS: the email only names
 // a card. An account with no certain way out (egress) isn't asked yet, and that isn't a try.
 const emails = new Map(); // id -> { email }, or { at } since the last try that got none
 const EMAIL_FIELD = /"oPEP7c":"([^"@\s]+@[^"\s]+)"/;
+const EMAIL_RETRY_MS = 6 * 3600 * 1000;
 
 export async function accountEmail(account, options = {}) {
   const known = emails.get(account.id);
   if (known?.email) return known.email;
-  if (known && Date.now() - known.at < (options.maxAgeMs ?? USAGE_MAX_AGE_MS)) return undefined;
+  if (known && Date.now() - known.at < (options.emailRetryMs ?? EMAIL_RETRY_MS)) return undefined;
   egress(account, options);
   emails.set(account.id, { at: Date.now() });
   const page = await geminiRequest('https://gemini.google.com/app', account, {
@@ -250,7 +264,7 @@ export function poolWindows(read) {
 // usage is the Magpie usage card: one account's 5-hour and weekly windows, as
 // gemini.google.com/usage shows them, when the sign-in names its backend account; else the
 // whole pool's, as one card. Accounts go by their Google emails (#id until that is known).
-// An account is read from Google again only when due (see USAGE_MIN_GAP_MS).
+// An account is read from Google again only when due (see USAGE_FRESH_MS).
 // Magpie hides a card's windows behind an error, so a pool account that can't be read only
 // says so in the tooltip while the others still show.
 export async function usage(options = {}) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "magpie-gemini-web",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "description": "Gemini Web and Google AI Studio provider for Magpie, backed by gemini-web2api-go and AIStudio2API",
   "type": "module",
   "main": "./index.mjs",
@@ -83,6 +83,6 @@
   },
   "magpie": {
     "icon": "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyNCIgaGVpZ2h0PSIyNCIgdmlld0JveD0iMCAwIDI0IDI0IiBmaWxsPSJub25lIj48ZGVmcz48bGluZWFyR3JhZGllbnQgaWQ9ImEiIHgxPSIyIiB5MT0iMyIgeDI9IjIwIiB5Mj0iMjEiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjMDZCNkQ0Ii8+PHN0b3Agb2Zmc2V0PSI1MCUiIHN0b3AtY29sb3I9IiMzQjgyRjYiLz48c3RvcCBvZmZzZXQ9IjEwMCUiIHN0b3AtY29sb3I9IiM4QjVDRjYiLz48L2xpbmVhckdyYWRpZW50PjxsaW5lYXJHcmFkaWVudCBpZD0iYiIgeDE9IjE0IiB5MT0iMiIgeDI9IjIyIiB5Mj0iMTAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBvZmZzZXQ9IjAlIiBzdG9wLWNvbG9yPSIjOEI1Q0Y2Ii8+PHN0b3Agb2Zmc2V0PSIxMDAlIiBzdG9wLWNvbG9yPSIjRUM0ODk5Ii8+PC9saW5lYXJHcmFkaWVudD48L2RlZnM+PHBhdGggZD0iTTEwIDMuMkMxMC4zNSAzLjIgMTAuNjIgMy40NSAxMC43MiAzLjhDMTEuNDUgNi44NSAxMy4xNSA4LjU1IDE2LjIgOS4yOEMxNi41NSA5LjM4IDE2LjggOS42NSAxNi44IDEwQzE2LjggMTAuMzUgMTYuNTUgMTAuNjIgMTYuMiAxMC43MkMxMy4xNSAxMS40NSAxMS40NSAxMy4xNSAxMC43MiAxNi4yQzEwLjYyIDE2LjU1IDEwLjM1IDE2LjggMTAgMTYuOEM5LjY1IDE2LjggOS4zOCAxNi41NSA5LjI4IDE2LjJDOC41NSAxMy4xNSA2Ljg1IDExLjQ1IDMuOCAxMC43MkMzLjQ1IDEwLjYyIDMuMiAxMC4zNSAzLjIgMTBDMy4yIDkuNjUgMy40NSA5LjM4IDMuOCA5LjI4QzYuODUgOC41NSA4LjU1IDYuODUgOS4yOCAzLjhDOS4zOCAzLjQ1IDkuNjUgMy4yIDEwIDMuMloiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0wLjUgMi41KSBzY2FsZSgxLjEyKSIgZmlsbD0idXJsKCNhKSIvPjxwYXRoIGQ9Ik0xOC4yIDEuOEMxOC40MiAxLjggMTguNiAxLjk1IDE4LjY2IDIuMTZDMTkuMDggMy44MiAyMC4wMiA0Ljc2IDIxLjY4IDUuMThDMjEuODkgNS4yNCAyMi4wNCA1LjQyIDIyLjA0IDUuNjRDMjIuMDQgNS44NiAyMS44OSA2LjA0IDIxLjY4IDYuMUMyMC4wMiA2LjUyIDE5LjA4IDcuNDYgMTguNjYgOS4xMkMxOC42IDkuMzMgMTguNDIgOS40OCAxOC4yIDkuNDhDMTcuOTggOS40OCAxNy44IDkuMzMgMTcuNzQgOS4xMkMxNy4zMiA3LjQ2IDE2LjM4IDYuNTIgMTQuNzIgNi4xQzE0LjUxIDYuMDQgMTQuMzYgNS44NiAxNC4zNiA1LjY0QzE0LjM2IDUuNDIgMTQuNTEgNS4yNCAxNC43MiA1LjE4QzE2LjM4IDQuNzYgMTcuMzIgMy44MiAxNy43NCAyLjE2QzE3LjggMS45NSAxNy45OCAxLjggMTguMiAxLjhaIiBmaWxsPSJ1cmwoI2IpIi8+PGNpcmNsZSBjeD0iMTcuOCIgY3k9IjE4LjIiIHI9IjEuMzUiIGZpbGw9IiM2MzY2RjEiLz48L3N2Zz4=",
-    "maxConcurrency": 1
+    "maxConcurrency": 2
   }
 }