@expiren/opencode-antigravity-auth 1.6.25 → 1.6.27

package/dist/index.js

@@ -1683,11 +1683,11 @@ function classifyOverallQuotaHealth(cachedQuota) {
   if (!cachedQuota) {
     return { health: "unknown" };
   }
-  const QUOTA_KEYS = ["claude", "gemini-pro", "gemini-flash"];
+  const QUOTA_KEYS2 = ["claude", "gemini-pro", "gemini-flash"];
   let groupsWithData = 0;
   let exhaustedCount = 0;
   let maxResetMs;
-  for (const key of QUOTA_KEYS) {
+  for (const key of QUOTA_KEYS2) {
     const value = cachedQuota[key]?.remainingFraction;
     if (typeof value !== "number" || !Number.isFinite(value)) continue;
     groupsWithData++;
@@ -1779,6 +1779,114 @@ function getStatusBadge(status, account) {
       return "";
   }
 }
+function getAccountTier(acc) {
+  if (acc.isCurrentAccount) return 0;
+  if (acc.enabled === false) return 6;
+  if (acc.status === "active") {
+    const overall = classifyOverallQuotaHealth(acc.cachedQuota);
+    if (overall.health === "exhausted") return 3;
+    if (overall.health === "partial") return 2;
+    return 1;
+  }
+  if (acc.status === "rate-limited") return 4;
+  return 5;
+}
+function getHealthLabel(acc) {
+  if (acc.enabled === false) return "disabled";
+  if (acc.status === "active") {
+    const overall = classifyOverallQuotaHealth(acc.cachedQuota);
+    if (overall.health === "exhausted") return "exhausted";
+    if (overall.health === "partial") return "limited";
+    return "active";
+  }
+  if (acc.status === "rate-limited") return "rate-limited";
+  if (acc.status === "expired") return "expired";
+  return "other";
+}
+var QUOTA_KEYS = [
+  { key: "claude", label: "Claude" },
+  { key: "gemini-pro", label: "Gemini Pro" },
+  { key: "gemini-flash", label: "Gemini Flash" }
+];
+function parseResetTimeToMs2(resetTime) {
+  if (!resetTime) return null;
+  const timestamp = Date.parse(resetTime);
+  if (!Number.isFinite(timestamp)) return null;
+  const ms = timestamp - Date.now();
+  return ms > 0 ? ms : null;
+}
+function buildModelBreakdown(accounts) {
+  const results = [];
+  for (const { key, label } of QUOTA_KEYS) {
+    let exhaustedCount = 0;
+    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) {
+        exhaustedCount++;
+        const resetMs = parseResetTimeToMs2(group.resetTime);
+        if (resetMs !== null && (maxResetMs === void 0 || resetMs > maxResetMs)) {
+          maxResetMs = resetMs;
+        }
+      }
+    }
+    if (exhaustedCount > 0) {
+      const resetSuffix = maxResetMs !== void 0 ? ` ~${formatWaitDuration(maxResetMs)}` : "";
+      results.push(`${label}: ${exhaustedCount} exhausted${resetSuffix}`);
+    }
+  }
+  return results;
+}
+function buildAccountSummary(accounts) {
+  const counts = {};
+  for (const acc of accounts) {
+    const label = getHealthLabel(acc);
+    counts[label] = (counts[label] ?? 0) + 1;
+  }
+  const order = ["active", "limited", "exhausted", "rate-limited", "expired", "disabled", "other"];
+  const parts = order.filter((label) => (counts[label] ?? 0) > 0).map((label) => `${counts[label]} ${label}`);
+  const modelBreakdown = buildModelBreakdown(accounts);
+  const summary = parts.length > 0 ? parts.join(", ") : "";
+  const modelPart = modelBreakdown.length > 0 ? ` | ${modelBreakdown.join(", ")}` : "";
+  return summary ? `Accounts (${summary}${modelPart})` : "Accounts";
+}
+function buildAccountHint(account) {
+  if (account.quotaSummary) {
+    return account.quotaSummary;
+  }
+  if (account.lastUsed) {
+    return `used ${formatRelativeTime(account.lastUsed)}`;
+  }
+  return "";
+}
+function buildAccountMenuItems(accounts) {
+  const sorted = accounts.slice().sort((a, b) => getAccountTier(a) - getAccountTier(b));
+  const items = [];
+  let prevTier = -1;
+  for (let i = 0; i < sorted.length; i++) {
+    const account = sorted[i];
+    const tier = getAccountTier(account);
+    if (prevTier !== -1 && tier !== prevTier) {
+      items.push({ label: "", value: { type: "cancel" }, separator: true });
+    }
+    prevTier = tier;
+    const displayNum = i + 1;
+    const statusBadge = getStatusBadge(account.status, account);
+    const currentBadge = account.isCurrentAccount ? ` ${ANSI.cyan}[current]${ANSI.reset}` : "";
+    const disabledBadge = account.enabled === false ? ` ${ANSI.red}[disabled]${ANSI.reset}` : "";
+    const baseLabel = account.email || `Account ${displayNum}`;
+    const numbered = `${displayNum}. ${baseLabel}`;
+    const fullLabel = `${numbered}${currentBadge}${statusBadge}${disabledBadge}`;
+    items.push({
+      label: fullLabel,
+      hint: buildAccountHint(account),
+      value: { type: "select-account", account }
+    });
+  }
+  return items;
+}
 async function showAuthMenu(accounts) {
   const items = [
     { label: "Actions", value: { type: "cancel" }, kind: "heading" },
@@ -1791,34 +1899,8 @@ async function showAuthMenu(accounts) {
     { label: "Verify all accounts", value: { type: "verify-all" }, color: "cyan" },
     { label: "Configure models in opencode.json", value: { type: "configure-models" }, color: "cyan" },
     { label: "", value: { type: "cancel" }, separator: true },
-    { label: "Accounts", value: { type: "cancel" }, kind: "heading" },
-    ...accounts.slice().sort((a, b) => {
-      const statusOrder = (acc) => {
-        if (acc.isCurrentAccount) return 0;
-        if (acc.status === "active") {
-          const overall = classifyOverallQuotaHealth(acc.cachedQuota);
-          if (overall.health === "exhausted") return 3;
-          if (overall.health === "partial") return 2;
-          return 1;
-        }
-        if (acc.status === "rate-limited") return 4;
-        return 5;
-      };
-      return statusOrder(a) - statusOrder(b);
-    }).map((account, displayIndex) => {
-      const displayNum = displayIndex + 1;
-      const statusBadge = getStatusBadge(account.status, account);
-      const currentBadge = account.isCurrentAccount ? ` ${ANSI.cyan}[current]${ANSI.reset}` : "";
-      const disabledBadge = account.enabled === false ? ` ${ANSI.red}[disabled]${ANSI.reset}` : "";
-      const baseLabel = account.email || `Account ${displayNum}`;
-      const numbered = `${displayNum}. ${baseLabel}`;
-      const fullLabel = `${numbered}${currentBadge}${statusBadge}${disabledBadge}`;
-      return {
-        label: fullLabel,
-        hint: account.quotaSummary ?? (account.lastUsed ? `used ${formatRelativeTime(account.lastUsed)}` : ""),
-        value: { type: "select-account", account }
-      };
-    }),
+    { label: buildAccountSummary(accounts), value: { type: "cancel" }, kind: "heading" },
+    ...buildAccountMenuItems(accounts),
     { label: "", value: { type: "cancel" }, separator: true },
     { label: "Danger zone", value: { type: "cancel" }, kind: "heading" },
     { label: "Delete all accounts", value: { type: "delete-all" }, color: "red" }
@@ -1853,7 +1935,7 @@ async function showFingerprintHistory(history, accountLabel) {
     { label: "", value: null, separator: true },
     { label: "Fingerprint history", value: null, kind: "heading" },
     ...history.map((entry, index) => {
-      const deviceShort = entry.deviceId.slice(0, 8);
+      const deviceShort = entry.fingerprint.deviceId.slice(0, 8);
       const reasonBadge = `${ANSI.dim}[${formatFingerprintReason(entry.reason)}]${ANSI.reset}`;
       const label = `${index + 1}. ${deviceShort}... ${reasonBadge}`;
       const hint = formatRelativeTime(entry.timestamp);
@@ -12847,6 +12929,7 @@ Alternatively, you can:
                         status = "rate-limited";
                       }
                     }
+                    const cooldownMs = acc.coolingDownUntil && acc.coolingDownUntil > now ? acc.coolingDownUntil - now : void 0;
                     return {
                       email: acc.email,
                       index: idx,
@@ -12855,7 +12938,11 @@ Alternatively, you can:
                       status,
                       isCurrentAccount: idx === (existingStorage2.activeIndex ?? 0),
                       enabled: acc.enabled !== false,
-                      quotaSummary: formatCachedQuotaSummary(acc)
+                      quotaSummary: formatCachedQuotaSummary(acc),
+                      cooldownMs,
+                      cooldownReason: cooldownMs ? acc.cooldownReason : void 0,
+                      cachedQuota: acc.cachedQuota,
+                      fingerprintHistory: acc.fingerprintHistory
                     };
                   });
                   menuResult = await promptLoginMode(existingAccounts);