@expiren/opencode-antigravity-auth 1.6.31 → 1.6.32

package/dist/index.js

@@ -1825,20 +1825,45 @@ function buildModelBreakdown(accounts) {
     let maxResetMs;
     for (const acc of accounts) {
       if (acc.enabled === false) continue;
-      const group = acc.cachedQuota?.[key];
-      if (!group || typeof group.remainingFraction !== "number") continue;
-      if (group.remainingFraction <= 0) {
-        const resetMs = parseResetTimeToMs2(group.resetTime);
-        if (resetMs !== null && resetMs > 0) {
-          exhaustedCount++;
-          if (maxResetMs === void 0 || resetMs > maxResetMs) {
-            maxResetMs = resetMs;
+      if (acc.cachedPerModelQuota && acc.cachedPerModelQuota.length > 0) {
+        const modelsInGroup = acc.cachedPerModelQuota.filter((m) => m.group === key);
+        if (modelsInGroup.length === 0) continue;
+        const allExhausted = modelsInGroup.every((m) => m.remainingFraction <= 0);
+        if (allExhausted) {
+          const freshExhausted = modelsInGroup.some((m) => {
+            const resetMs = parseResetTimeToMs2(m.resetTime);
+            return resetMs !== null && resetMs > 0;
+          });
+          if (freshExhausted) {
+            exhaustedCount++;
+            for (const m of modelsInGroup) {
+              const resetMs = parseResetTimeToMs2(m.resetTime);
+              if (resetMs !== null && resetMs > 0 && (maxResetMs === void 0 || resetMs > maxResetMs)) {
+                maxResetMs = resetMs;
+              }
+            }
+          } else {
+            availableCount++;
           }
         } else {
           availableCount++;
         }
       } else {
-        availableCount++;
+        const group = acc.cachedQuota?.[key];
+        if (!group || typeof group.remainingFraction !== "number") continue;
+        if (group.remainingFraction <= 0) {
+          const resetMs = parseResetTimeToMs2(group.resetTime);
+          if (resetMs !== null && resetMs > 0) {
+            exhaustedCount++;
+            if (maxResetMs === void 0 || resetMs > maxResetMs) {
+              maxResetMs = resetMs;
+            }
+          } else {
+            availableCount++;
+          }
+        } else {
+          availableCount++;
+        }
       }
     }
     if (exhaustedCount > 0 || availableCount > 0) {
@@ -2370,6 +2395,7 @@ async function promptLoginMode(existingAccounts) {
     cooldownMs: acc.cooldownMs,
     cooldownReason: acc.cooldownReason,
     cachedQuota: acc.cachedQuota,
+    cachedPerModelQuota: acc.cachedPerModelQuota,
     fingerprintHistory: acc.fingerprintHistory
   }));
   console.log("");
@@ -10394,20 +10420,28 @@ function classifyQuotaGroup(modelName, displayName) {
 }
 function aggregateQuota(models) {
   const groups = {};
+  const perModel = [];
   if (!models) {
-    return { groups, modelCount: 0 };
+    return { groups, perModel, modelCount: 0 };
   }
   let totalCount = 0;
   for (const [modelName, entry] of Object.entries(models)) {
     const group = classifyQuotaGroup(modelName, entry.displayName ?? entry.modelName);
-    if (!group) {
-      continue;
-    }
     const quotaInfo = entry.quotaInfo;
     const remainingFraction = quotaInfo ? normalizeRemainingFraction(quotaInfo.remainingFraction) : void 0;
     const resetTime = quotaInfo?.resetTime;
     const resetTimestamp = parseResetTime(resetTime);
     totalCount += 1;
+    perModel.push({
+      modelId: modelName,
+      displayName: entry.displayName ?? entry.modelName,
+      group,
+      remainingFraction: remainingFraction ?? 0,
+      resetTime
+    });
+    if (!group) {
+      continue;
+    }
     const existing = groups[group];
     const nextCount = (existing?.modelCount ?? 0) + 1;
     const nextRemaining = remainingFraction === void 0 ? existing?.remainingFraction : existing?.remainingFraction === void 0 ? remainingFraction : Math.min(existing.remainingFraction, remainingFraction);
@@ -10428,7 +10462,8 @@ function aggregateQuota(models) {
       modelCount: nextCount
     };
   }
-  return { groups, modelCount: totalCount };
+  perModel.sort((a, b) => a.modelId.localeCompare(b.modelId));
+  return { groups, perModel, modelCount: totalCount };
 }
 async function fetchWithTimeout2(url, options, timeoutMs = FETCH_TIMEOUT_MS2) {
   const controller = new AbortController();
@@ -10440,51 +10475,85 @@ async function fetchWithTimeout2(url, options, timeoutMs = FETCH_TIMEOUT_MS2) {
   }
 }
 async function fetchAvailableModels(accessToken, projectId) {
-  const endpoint = ANTIGRAVITY_ENDPOINT_PROD;
   const quotaUserAgent = getAntigravityHeaders()["User-Agent"] || "antigravity/windows/amd64";
   const errors = [];
-  const body = projectId ? { project: projectId } : {};
-  const response = await fetchWithTimeout2(`${endpoint}/v1internal:fetchAvailableModels`, {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${accessToken}`,
-      "Content-Type": "application/json",
-      "User-Agent": quotaUserAgent
-    },
-    body: JSON.stringify(body)
-  });
-  if (response.ok) {
-    return await response.json();
+  for (const endpoint of ANTIGRAVITY_ENDPOINT_FALLBACKS) {
+    const body = projectId ? { project: projectId } : {};
+    try {
+      const response = await fetchWithTimeout2(`${endpoint}/v1internal:fetchAvailableModels`, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          "Content-Type": "application/json",
+          "User-Agent": quotaUserAgent
+        },
+        body: JSON.stringify(body)
+      });
+      if (response.ok) {
+        return await response.json();
+      }
+      const status = response.status;
+      if (status === 403 && projectId) {
+        try {
+          const retryResponse = await fetchWithTimeout2(`${endpoint}/v1internal:fetchAvailableModels`, {
+            method: "POST",
+            headers: {
+              Authorization: `Bearer ${accessToken}`,
+              "Content-Type": "application/json",
+              "User-Agent": quotaUserAgent
+            },
+            body: JSON.stringify({})
+          });
+          if (retryResponse.ok) {
+            return await retryResponse.json();
+          }
+        } catch {
+        }
+      }
+      if (status === 429 || status >= 500) {
+        const message2 = await response.text().catch(() => "");
+        const snippet2 = message2.trim().slice(0, 200);
+        errors.push(`fetchAvailableModels ${status} at ${endpoint}${snippet2 ? `: ${snippet2}` : ""}`);
+        continue;
+      }
+      const message = await response.text().catch(() => "");
+      const snippet = message.trim().slice(0, 200);
+      errors.push(`fetchAvailableModels ${status} at ${endpoint}${snippet ? `: ${snippet}` : ""}`);
+      break;
+    } catch (error) {
+      errors.push(`fetchAvailableModels network error at ${endpoint}: ${error instanceof Error ? error.message : String(error)}`);
+      continue;
+    }
   }
-  const message = await response.text().catch(() => "");
-  const snippet = message.trim().slice(0, 200);
-  errors.push(
-    `fetchAvailableModels ${response.status} at ${endpoint}${snippet ? `: ${snippet}` : ""}`
-  );
   throw new Error(errors.join("; ") || "fetchAvailableModels failed");
 }
 async function fetchGeminiCliQuota(accessToken, projectId) {
-  const endpoint = ANTIGRAVITY_ENDPOINT_PROD;
   const geminiCliUserAgent = buildGeminiCliUserAgent();
-  const body = projectId ? { project: projectId } : {};
-  try {
-    const response = await fetchWithTimeout2(`${endpoint}/v1internal:retrieveUserQuota`, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${accessToken}`,
-        "Content-Type": "application/json",
-        "User-Agent": geminiCliUserAgent
-      },
-      body: JSON.stringify(body)
-    });
-    if (response.ok) {
-      const data = await response.json();
-      return data;
+  for (const endpoint of ANTIGRAVITY_ENDPOINT_FALLBACKS) {
+    const body = projectId ? { project: projectId } : {};
+    try {
+      const response = await fetchWithTimeout2(`${endpoint}/v1internal:retrieveUserQuota`, {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${accessToken}`,
+          "Content-Type": "application/json",
+          "User-Agent": geminiCliUserAgent
+        },
+        body: JSON.stringify(body)
+      });
+      if (response.ok) {
+        return await response.json();
+      }
+      const status = response.status;
+      if (status === 429 || status >= 500) {
+        continue;
+      }
+      return { buckets: [] };
+    } catch {
+      continue;
     }
-    return { buckets: [] };
-  } catch {
-    return { buckets: [] };
   }
+  return { buckets: [] };
 }
 function aggregateGeminiCliQuota(response) {
   const models = [];
@@ -12969,6 +13038,7 @@ Alternatively, you can:
                       cooldownMs,
                       cooldownReason: cooldownMs ? acc.cooldownReason : void 0,
                       cachedQuota: acc.cachedQuota,
+                      cachedPerModelQuota: acc.cachedPerModelQuota,
                       fingerprintHistory: acc.fingerprintHistory
                     };
                   });
@@ -13075,6 +13145,7 @@ Alternatively, you can:
                         const acc = existingStorage2.accounts[res.index];
                         if (acc) {
                           acc.cachedQuota = res.quota.groups;
+                          acc.cachedPerModelQuota = res.quota.perModel;
                           acc.cachedQuotaUpdatedAt = Date.now();
                           storageUpdated = true;
                         }
@@ -13083,6 +13154,7 @@ Alternatively, you can:
                         existingStorage2.accounts[res.index] = {
                           ...res.updatedAccount,
                           cachedQuota: res.quota?.groups,
+                          cachedPerModelQuota: res.quota?.perModel,
                           cachedQuotaUpdatedAt: Date.now()
                         };
                         storageUpdated = true;