@cortexkit/opencode-antigravity-auth 2.0.0 → 2.1.0

package/README.md

@@ -116,19 +116,14 @@ The model registry lives at `packages/core/src/model-registry.ts`; the OpenCode
 
 | Model | Variants | Quota group |
 | --- | --- | --- |
+| `antigravity-gemini-3.7-flash` | `low`, `high` | `gemini-flash` |
 | `antigravity-gemini-3.6-flash` | `low`, `high` | `gemini-flash` |
 | `antigravity-gemini-3.5-flash` | `low`, `high` | `gemini-flash` |
 | `antigravity-gemini-3.1-pro` | `low`, `high` | `gemini-pro` |
 | `antigravity-gemini-3.1-flash-image` | — | `gemini-flash` |
-| `antigravity-claude-sonnet-4-6` | — | `claude` |
-| `antigravity-claude-opus-4-6-thinking` | `low`, `max` | `claude` |
+| `antigravity-claude-sonnet-4-6-thinking` | — | `claude` |
+| `antigravity-claude-opus-4-6-thinking` | — | `claude` |
 | `antigravity-gpt-oss-120b-medium` | — | `gpt-oss` |
-| `gemini-2.5-flash` | — | `gemini-flash` (CLI pool) |
-| `gemini-2.5-pro` | — | `gemini-pro` (CLI pool) |
-| `gemini-3-flash-preview` | — | `gemini-flash` (CLI pool) |
-| `gemini-3-pro-preview` | — | `gemini-pro` (CLI pool) |
-| `gemini-3.1-pro-preview` | — | `gemini-pro` (CLI pool) |
-| `gemini-3.1-pro-preview-customtools` | — | `gemini-pro` (CLI pool) |
 
 > Gemini 3.5 Flash-Lite is not in the AGY 1.1.5 Antigravity or Gemini CLI quota catalogs, and Gemini 3.5 Flash Cyber is restricted to a limited-access CodeMender pilot — neither is exposed by this plugin.
 

package/dist/cli.js

@@ -862,7 +862,8 @@ function calculateTokenExpiry(requestTimeMs, expiresInSeconds) {
 }
 
 // ../core/dist/fingerprint.js
-var AGY_CLI_VERSION = "1.1.6";
+var AGY_CLI_VERSION = "1.1.13";
+var AGY_CLI_CHANGE_LIST = "964361259";
 function normalizeHarnessPlatform(platform = process.platform) {
   return platform === "win32" ? "windows" : platform || "unknown";
 }
@@ -879,7 +880,8 @@ function normalizeHarnessArch(arch = process.arch) {
 function buildAntigravityHarnessUserAgent(version = AGY_CLI_VERSION, platform = process.platform, arch = process.arch, authMethod = "consumer") {
   const osType = normalizeHarnessPlatform(platform);
   const normalizedArch = normalizeHarnessArch(arch);
-  return `antigravity/cli/${version} (aidev_client; os_type=${osType}; arch=${normalizedArch}; auth_method=${authMethod})`;
+  const changeList = version === AGY_CLI_VERSION ? `; cl=${AGY_CLI_CHANGE_LIST}` : "";
+  return `antigravity/cli/${version} (aidev_client; os_type=${osType}; arch=${normalizedArch}${changeList}; auth_method=${authMethod})`;
 }
 function buildAntigravityHarnessLoadCodeAssistUserAgent(version = AGY_CLI_VERSION) {
   return buildAntigravityHarnessUserAgent(version);
@@ -927,6 +929,16 @@ var ALL_MODEL_DEFINITIONS = {
       high: { thinkingLevel: "high" }
     }
   }),
+  "antigravity-gemini-3.7-flash": defineModel("antigravity-gemini-3.7-flash", {
+    name: "Gemini 3.7 Flash (Antigravity)",
+    reasoning: true,
+    limit: { context: 1048576, output: 65536 },
+    modalities: DEFAULT_MODALITIES,
+    variants: {
+      low: { thinkingLevel: "low" },
+      high: { thinkingLevel: "high" }
+    }
+  }),
   "antigravity-gemini-3.6-flash": defineModel("antigravity-gemini-3.6-flash", {
     name: "Gemini 3.6 Flash (Antigravity)",
     reasoning: true,
@@ -1049,6 +1061,9 @@ var RESOLVER_ALIASES = {
   "gemini-3.6-flash-low": "gemini-3.6-flash",
   "gemini-3.6-flash-medium": "gemini-3.6-flash",
   "gemini-3.6-flash-high": "gemini-3.6-flash",
+  "gemini-3.7-flash-low": "gemini-3.7-flash",
+  "gemini-3.7-flash-medium": "gemini-3.7-flash",
+  "gemini-3.7-flash-high": "gemini-3.7-flash",
   "gemini-claude-opus-4-6-thinking-low": "claude-opus-4-6-thinking",
   "gemini-claude-opus-4-6-thinking-medium": "claude-opus-4-6-thinking",
   "gemini-claude-opus-4-6-thinking-high": "claude-opus-4-6-thinking",
@@ -1063,27 +1078,32 @@ var RESOLVER_ALIASES = {
   "gpt-oss-120b": "gpt-oss-120b-medium"
 };
 var QUOTA_GROUP_BY_MODEL_ID = {
-  "claude-opus-4-6-thinking": "claude",
-  "claude-opus-4-6": "claude",
-  "claude-sonnet-4-6-thinking": "claude",
-  "claude-sonnet-4-6": "claude",
-  "gemini-pro-agent": "gemini-pro",
-  "gemini-3.1-pro": "gemini-pro",
-  "gemini-3.1-pro-low": "gemini-pro",
-  "gemini-3.1-pro-high": "gemini-pro",
-  "gemini-3-flash": "gemini-flash",
-  "gemini-3-flash-agent": "gemini-flash",
-  "gemini-3.5-flash-low": "gemini-flash",
-  "gemini-3.5-flash-extra-low": "gemini-flash",
-  "gemini-3.6-flash-low": "gemini-flash",
-  "gemini-3.6-flash-medium": "gemini-flash",
-  "gemini-3.6-flash-high": "gemini-flash",
-  "gemini-3.6-flash-tiered": "gemini-flash",
-  "gemini-3.1-flash-image": "gemini-flash",
-  "gpt-oss-120b": "gpt-oss",
-  "gpt-oss-120b-medium": "gpt-oss"
+  "claude-opus-4-6-thinking": "non-gemini",
+  "claude-opus-4-6": "non-gemini",
+  "claude-sonnet-4-6-thinking": "non-gemini",
+  "claude-sonnet-4-6": "non-gemini",
+  "gemini-pro-agent": "gemini",
+  "gemini-3.1-pro": "gemini",
+  "gemini-3.1-pro-low": "gemini",
+  "gemini-3.1-pro-high": "gemini",
+  "gemini-3-flash": "gemini",
+  "gemini-3-flash-agent": "gemini",
+  "gemini-3.5-flash-low": "gemini",
+  "gemini-3.5-flash-extra-low": "gemini",
+  "gemini-3.6-flash-low": "gemini",
+  "gemini-3.6-flash-medium": "gemini",
+  "gemini-3.6-flash-high": "gemini",
+  "gemini-3.6-flash-tiered": "gemini",
+  "gemini-3.7-flash-low": "gemini",
+  "gemini-3.7-flash-medium": "gemini",
+  "gemini-3.7-flash-high": "gemini",
+  "gemini-3.7-flash-tiered": "gemini",
+  "gemini-3.1-flash-image": "gemini",
+  "gpt-oss-120b": "non-gemini",
+  "gpt-oss-120b-medium": "non-gemini"
 };
 var ANTIGRAVITY_OPENCODE_MODEL_IDS = [
+  "antigravity-gemini-3.7-flash",
   "antigravity-gemini-3.6-flash",
   "antigravity-gemini-3.5-flash",
   "antigravity-gemini-3.1-pro",
@@ -1100,20 +1120,13 @@ function getResolverAliasMap() {
   return RESOLVER_ALIASES;
 }
 function getQuotaGroupForModel(modelId) {
-  return QUOTA_GROUP_BY_MODEL_ID[modelId.toLowerCase()];
-}
-
-// ../core/dist/transform/model-resolver.js
-var MODEL_ALIASES = getResolverAliasMap();
-function getModelFamily(model) {
-  const lower = model.toLowerCase();
-  if (lower.includes("claude")) {
-    return "claude";
-  }
-  if (lower.includes("flash")) {
-    return "gemini-flash";
-  }
-  return "gemini-pro";
+  const normalized = modelId.toLowerCase();
+  return QUOTA_GROUP_BY_MODEL_ID[normalized] ?? // Check Claude / GPT-OSS substrings BEFORE the `gemini` substring so
+  // a `gemini-claude-*` alias (which is a Claude route exposed under
+  // a `gemini-` namespace) attributes to the non-gemini pool rather
+  // than the gemini pool. Substring matching is required because the
+  // alias IDs start with `gemini-` but contain `claude`.
+  (normalized.includes("claude") || normalized.includes("gpt-oss") ? "non-gemini" : normalized.startsWith("gemini") || normalized.startsWith("tab_") ? "gemini" : void 0);
 }
 
 // ../core/dist/account-manager.js
@@ -1946,7 +1959,7 @@ async function ensureProjectContext(auth) {
       const effectiveProjectId = parts.projectId || fallbackProjectId;
       return { auth, effectiveProjectId };
     }
-    const persistManagedProject = async (managedProjectId) => {
+    const persistManagedProject = async (managedProjectId, capturedTier) => {
       const updatedAuth = {
         ...auth,
         refresh: formatRefreshParts({
@@ -1955,12 +1968,23 @@ async function ensureProjectContext(auth) {
           managedProjectId
         })
       };
-      return { auth: updatedAuth, effectiveProjectId: managedProjectId };
+      return {
+        auth: updatedAuth,
+        effectiveProjectId: managedProjectId,
+        capturedTier
+      };
     };
     const loadPayload = await loadManagedProject(accessToken, parts.projectId ?? fallbackProjectId);
+    const capturedTierId = loadPayload?.currentTier?.id;
+    const paidTierId = typeof loadPayload?.paidTier === "string" ? loadPayload.paidTier : loadPayload?.paidTier?.id;
+    const tierFromPayload = capturedTierId ? {
+      id: capturedTierId,
+      ...paidTierId ? { paidId: paidTierId } : {},
+      capturedAt: Date.now()
+    } : void 0;
     const resolvedManagedProjectId = extractManagedProjectId(loadPayload);
     if (resolvedManagedProjectId) {
-      return persistManagedProject(resolvedManagedProjectId);
+      return persistManagedProject(resolvedManagedProjectId, tierFromPayload);
     }
     const tierId = getDefaultTierId(loadPayload?.allowedTiers) ?? "free-tier";
     log3.debug("Auto-provisioning managed project", {
@@ -1972,7 +1996,7 @@ async function ensureProjectContext(auth) {
       log3.debug("Successfully provisioned managed project", {
         provisionedProjectId
       });
-      return persistManagedProject(provisionedProjectId);
+      return persistManagedProject(provisionedProjectId, tierFromPayload);
     }
     log3.warn("Failed to provision managed project - account may not work correctly", {
       hasProjectId: !!parts.projectId
@@ -1981,9 +2005,17 @@ async function ensureProjectContext(auth) {
       provisionFailedKeys.add(cacheKey);
     }
     if (parts.projectId) {
-      return { auth, effectiveProjectId: parts.projectId };
+      return {
+        auth,
+        effectiveProjectId: parts.projectId,
+        capturedTier: tierFromPayload
+      };
     }
-    return { auth, effectiveProjectId: fallbackProjectId };
+    return {
+      auth,
+      effectiveProjectId: fallbackProjectId,
+      capturedTier: tierFromPayload
+    };
   };
   if (!cacheKey) {
     return resolveContext();
@@ -2225,15 +2257,13 @@ function classifyQuotaGroup(modelName, displayName) {
     return registryGroup;
   }
   const combined = `${modelName} ${displayName ?? ""}`.toLowerCase();
-  if (combined.includes("claude")) {
-    return "claude";
+  if (combined.includes("claude") || combined.includes("gpt-oss")) {
+    return "non-gemini";
   }
-  const isGemini3 = combined.includes("gemini-3") || combined.includes("gemini 3");
-  if (!isGemini3) {
-    return null;
+  if (combined.includes("gemini")) {
+    return "gemini";
   }
-  const family = getModelFamily(modelName);
-  return family === "gemini-flash" ? "gemini-flash" : "gemini-pro";
+  return null;
 }
 function normalizeRemainingFraction(value) {
   if (typeof value !== "number" || !Number.isFinite(value)) {
@@ -2301,6 +2331,147 @@ function aggregateQuota(models) {
   perModel.sort((a, b) => a.modelId.localeCompare(b.modelId));
   return { groups, perModel, modelCount: totalCount };
 }
+function mostConstrainedWindow(windows) {
+  if (windows.length === 0)
+    return void 0;
+  let best = windows[0];
+  for (let i = 1; i < windows.length; i++) {
+    if (windows[i].remainingFraction < best.remainingFraction) {
+      best = windows[i];
+    }
+  }
+  return {
+    remainingFraction: best.remainingFraction,
+    resetTime: best.resetTime
+  };
+}
+function poolForBucketId(bucketId) {
+  if (bucketId.startsWith("gemini-"))
+    return "gemini";
+  if (bucketId.startsWith("3p-"))
+    return "non-gemini";
+  return null;
+}
+function parseDescriptionModelCount(description) {
+  const prefixMatch = description.match(/^[^:]+:\s*/);
+  const payload = prefixMatch ? description.slice(prefixMatch[0].length) : description;
+  if (!payload)
+    return 0;
+  const entries = payload.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+  return entries.length;
+}
+function windowDurationMs(window) {
+  switch (window) {
+    case "5h":
+      return 5 * 60 * 60 * 1e3;
+    case "weekly":
+      return 7 * 24 * 60 * 60 * 1e3;
+    default:
+      return Number.MAX_SAFE_INTEGER;
+  }
+}
+function aggregateQuotaSummary(response) {
+  const groups = {};
+  let totalCount = 0;
+  for (const group of response.groups) {
+    const windows = [];
+    for (const bucket of group.buckets) {
+      const pool2 = poolForBucketId(bucket.bucketId);
+      if (!pool2)
+        continue;
+      windows.push({
+        window: bucket.window,
+        remainingFraction: normalizeRemainingFraction(bucket.remainingFraction),
+        resetTime: bucket.resetTime
+      });
+    }
+    if (windows.length === 0)
+      continue;
+    windows.sort((a, b) => windowDurationMs(a.window) - windowDurationMs(b.window));
+    const constrained = mostConstrainedWindow(windows);
+    const recognizedBucket = group.buckets.find((bucket) => poolForBucketId(bucket.bucketId));
+    if (!recognizedBucket)
+      continue;
+    const pool = poolForBucketId(recognizedBucket.bucketId);
+    if (!pool || !constrained)
+      continue;
+    const modelCount = group.description ? parseDescriptionModelCount(group.description) : 0;
+    groups[pool] = {
+      remainingFraction: constrained.remainingFraction,
+      resetTime: constrained.resetTime,
+      modelCount,
+      windows
+    };
+    totalCount += modelCount;
+  }
+  return { groups, modelCount: totalCount };
+}
+async function fetchQuotaSummary(options) {
+  const timeoutMs = options.timeoutMs ?? QUOTA_MANAGER_DEFAULT_TIMEOUT_MS;
+  const userAgent = options.userAgent ?? buildAntigravityHarnessUserAgent();
+  const transport = options.fetchVia ?? defaultTransport;
+  const errors = [];
+  if (options.endpoints.length === 0) {
+    throw new Error("No endpoints configured for fetchQuotaSummary");
+  }
+  const tryBody = async (endpoint, projectId) => {
+    const body = { project: projectId };
+    try {
+      const response = await transport(`${endpoint}/v1internal:retrieveUserQuotaSummary`, {
+        method: "POST",
+        headers: {
+          "User-Agent": userAgent,
+          Authorization: `Bearer ${options.accessToken}`,
+          "Content-Type": "application/json",
+          "Accept-Encoding": "gzip"
+        },
+        body: JSON.stringify(body)
+      }, { timeoutMs });
+      if (response.ok) {
+        return {
+          ok: true,
+          summary: await response.json()
+        };
+      }
+      const status = response.status;
+      if (status === 403) {
+        errors.push(`retrieveUserQuotaSummary 403 at ${endpoint} (project=${projectId.slice(0, 12)}\u2026)`);
+        return { ok: false, reason: "403" };
+      }
+      if (status === 429 || status >= 500) {
+        const message2 = await response.text().catch(() => "");
+        errors.push(`retrieveUserQuotaSummary ${status} at ${endpoint}${message2 ? `: ${message2.trim().slice(0, 200)}` : ""}`);
+        return { ok: false, reason: "transient" };
+      }
+      const message = await response.text().catch(() => "");
+      errors.push(`retrieveUserQuotaSummary ${status} at ${endpoint}${message ? `: ${message.trim().slice(0, 200)}` : ""}`);
+      return { ok: false, reason: "transient" };
+    } catch (error) {
+      errors.push(`retrieveUserQuotaSummary network error at ${endpoint}: ${error instanceof Error ? error.message : String(error)}`);
+      return { ok: false, reason: "transient" };
+    }
+  };
+  const primary = options.managedProjectId ?? options.projectId;
+  let primaryGot403 = false;
+  if (primary) {
+    for (const endpoint of options.endpoints) {
+      const result = await tryBody(endpoint, primary);
+      if (result.ok)
+        return { summary: result.summary };
+      if (result.reason === "403")
+        primaryGot403 = true;
+    }
+  }
+  const fallbackId = primaryGot403 && options.managedProjectId && options.projectId && options.managedProjectId !== options.projectId ? options.projectId : void 0;
+  if (fallbackId) {
+    for (const endpoint of options.endpoints) {
+      const result = await tryBody(endpoint, fallbackId);
+      if (result.ok)
+        return { summary: result.summary };
+    }
+  }
+  throw new Error(errors.join("; ") || "fetchQuotaSummary failed: no project ID available");
+}
 function aggregateGeminiCliQuota(response) {
   const models = [];
   if (!response.buckets || response.buckets.length === 0) {
@@ -2383,10 +2554,12 @@ async function fetchAvailableModels(options) {
 async function fetchGeminiCliQuota(options) {
   const timeoutMs = options.timeoutMs ?? QUOTA_MANAGER_DEFAULT_TIMEOUT_MS;
   const userAgent = options.userAgent ?? buildAntigravityHarnessUserAgent();
+  const transport = options.fetchVia ?? defaultTransport;
+  const errors = [];
   for (const endpoint of options.endpoints) {
     const body = options.projectId ? { project: options.projectId } : {};
     try {
-      const response = await defaultTransport(`${endpoint}/v1internal:retrieveUserQuota`, {
+      const response = await transport(`${endpoint}/v1internal:retrieveUserQuota`, {
         method: "POST",
         headers: {
           Authorization: `Bearer ${options.accessToken}`,
@@ -2400,18 +2573,26 @@ async function fetchGeminiCliQuota(options) {
       }
       const status = response.status;
       if (status === 429 || status >= 500) {
+        errors.push(`fetchGeminiCliQuota ${status} at ${endpoint}`);
         continue;
       }
       return { buckets: [] };
-    } catch {
+    } catch (error) {
+      errors.push(error instanceof Error ? error.message : String(error));
     }
   }
+  if (errors.length > 0) {
+    throw new Error(errors.join("; ") || "fetchGeminiCliQuota failed");
+  }
   return { buckets: [] };
 }
 async function defaultTransport(url, init, options) {
   return fetchWithActiveTimeout(url, init, { timeoutMs: options.timeoutMs });
 }
 
+// ../core/dist/transform/model-resolver.js
+var MODEL_ALIASES = getResolverAliasMap();
+
 // src/plugin/oauth-login.ts
 function expectedState(authorizationUrl) {
   try {
@@ -3127,6 +3308,32 @@ async function checkAccountsQuotaStandalone(accounts, options) {
     makeFetchAccountQuota(void 0, ANTIGRAVITY_PROVIDER_ID)
   );
 }
+async function fetchLegacyModelsFallback(options) {
+  try {
+    const modelsResponse = await fetchAvailableModels({
+      accessToken: options.accessToken,
+      projectId: options.projectId,
+      endpoints: ANTIGRAVITY_ENDPOINT_FALLBACKS,
+      userAgent: buildAntigravityHarnessUserAgent(),
+      timeoutMs: 1e4,
+      ...options.fetchVia ? { fetchVia: options.fetchVia } : {}
+    });
+    if (modelsResponse.models) {
+      return aggregateQuota(modelsResponse.models);
+    }
+    return {
+      groups: {},
+      modelCount: 0,
+      error: "Failed to fetch Antigravity quota (legacy fallback)"
+    };
+  } catch {
+    return {
+      groups: {},
+      modelCount: 0,
+      error: "Failed to fetch Antigravity quota"
+    };
+  }
+}
 function makeFetchAccountQuota(client, providerId, fetchVia) {
   return async (account, signal) => {
     const index = 0;
@@ -3166,49 +3373,79 @@ function makeFetchAccountQuota(client, providerId, fetchVia) {
       }
       const projectContext = await ensureProjectContext(auth);
       auth = projectContext.auth;
-      const updatedAccount = applyAccountUpdates(account, auth);
+      const updatedAccount = applyAccountUpdates(
+        account,
+        auth,
+        projectContext.capturedTier
+      );
       if (rotatedRefresh && client) {
         await persistRotatedRefresh(client, providerId, auth).catch(() => {
         });
       }
-      const [antigravityResponse, geminiCliResponse] = await Promise.all([
-        fetchAvailableModels({
-          accessToken: auth.access ?? "",
-          projectId: projectContext.effectiveProjectId,
-          endpoints: ANTIGRAVITY_ENDPOINT_FALLBACKS,
-          userAgent: buildAntigravityHarnessUserAgent(),
-          timeoutMs: 1e4,
-          ...fetchVia ? { fetchVia } : {}
-        }).catch(() => ({ models: void 0 })),
-        fetchGeminiCliQuota({
-          accessToken: auth.access ?? "",
-          projectId: projectContext.effectiveProjectId,
-          endpoints: ANTIGRAVITY_ENDPOINT_FALLBACKS,
-          userAgent: buildGeminiCliUserAgent(),
-          timeoutMs: 1e4,
-          ...fetchVia ? { fetchVia } : {}
-        })
-      ]);
       let quotaResult;
-      if (antigravityResponse.models === void 0) {
-        quotaResult = {
-          groups: {},
-          modelCount: 0,
-          error: "Failed to fetch Antigravity quota"
-        };
-      } else {
-        quotaResult = aggregateQuota(antigravityResponse.models);
-      }
+      let fellBackToLegacy = false;
+      const authParts = parseRefreshParts(auth.refresh);
+      const managedProjectId = authParts.managedProjectId ?? account.managedProjectId;
+      const fetchSummaryPayload = (async () => {
+        try {
+          const summaryResult = await fetchQuotaSummary({
+            accessToken: auth.access ?? "",
+            managedProjectId,
+            projectId: projectContext.effectiveProjectId,
+            endpoints: ANTIGRAVITY_ENDPOINT_FALLBACKS,
+            userAgent: buildAntigravityHarnessUserAgent(),
+            timeoutMs: 1e4,
+            ...fetchVia ? { fetchVia } : {}
+          });
+          return {
+            result: aggregateQuotaSummary(summaryResult.summary),
+            fellBackToLegacy: summaryResult.fellBackToLegacy ?? false
+          };
+        } catch {
+          return {
+            result: await fetchLegacyModelsFallback({
+              accessToken: auth.access ?? "",
+              projectId: projectContext.effectiveProjectId,
+              fetchVia
+            }),
+            fellBackToLegacy: true
+          };
+        }
+      })();
+      let geminiCliFetchError;
+      const fetchGeminiCliPayload = fetchGeminiCliQuota({
+        accessToken: auth.access ?? "",
+        projectId: projectContext.effectiveProjectId,
+        endpoints: ANTIGRAVITY_ENDPOINT_FALLBACKS,
+        userAgent: buildGeminiCliUserAgent(),
+        timeoutMs: 1e4,
+        ...fetchVia ? { fetchVia } : {}
+      }).catch((error) => {
+        geminiCliFetchError = error instanceof Error ? error.message : String(error);
+        log7.debug("fetchGeminiCliQuota failed", { error: geminiCliFetchError });
+        return { buckets: void 0 };
+      });
+      const [summary, geminiCliResponse] = await Promise.all([
+        fetchSummaryPayload,
+        fetchGeminiCliPayload
+      ]);
+      quotaResult = summary.result;
+      fellBackToLegacy = summary.fellBackToLegacy;
       const geminiCliQuotaResult = aggregateGeminiCliQuota(geminiCliResponse);
       const annotated = geminiCliResponse.buckets === void 0 || geminiCliResponse.buckets.length === 0 ? {
         ...geminiCliQuotaResult,
-        error: geminiCliQuotaResult.models.length === 0 ? "No Gemini CLI quota available" : void 0
+        error: (
+          // A real fetch exception is a transient failure, not a
+          // "no CLI configured" scenario — propagate the actual message.
+          geminiCliFetchError ?? (geminiCliQuotaResult.models.length === 0 ? "No Gemini CLI quota available" : void 0)
+        )
       } : geminiCliQuotaResult;
       for (const [family, groupQuota] of Object.entries(quotaResult.groups)) {
         const remainingPercent = (groupQuota.remainingFraction ?? 0) * 100;
         logQuotaStatus(account.email, index, remainingPercent, family);
       }
-      logQuotaFetch("complete", 1, "ok=1 errors=0");
+      const legacyTag = fellBackToLegacy ? " legacy=1" : "";
+      logQuotaFetch("complete", 1, `ok=1 errors=0${legacyTag}`);
       return {
         index,
         email: account.email,
@@ -3246,7 +3483,7 @@ function buildAuthFromAccount(account) {
     expires: void 0
   };
 }
-function applyAccountUpdates(account, auth) {
+function applyAccountUpdates(account, auth, capturedTier) {
   const parts = parseRefreshParts(auth.refresh);
   if (!parts.refreshToken) {
     return void 0;
@@ -3255,9 +3492,19 @@ function applyAccountUpdates(account, auth) {
     ...account,
     refreshToken: parts.refreshToken,
     projectId: parts.projectId ?? account.projectId,
-    managedProjectId: parts.managedProjectId ?? account.managedProjectId
+    managedProjectId: parts.managedProjectId ?? account.managedProjectId,
+    // Persist the captured tier alongside the project-context write. Only
+    // present when the loadCodeAssist payload returned a non-empty currentTier.id.
+    ...capturedTier ? {
+      capturedTierId: capturedTier.id,
+      ...capturedTier.paidId !== void 0 ? { capturedPaidTierId: capturedTier.paidId } : {},
+      capturedTierAt: capturedTier.capturedAt
+    } : {}
   };
-  const changed = updated.refreshToken !== account.refreshToken || updated.projectId !== account.projectId || updated.managedProjectId !== account.managedProjectId;
+  const changed = updated.refreshToken !== account.refreshToken || updated.projectId !== account.projectId || updated.managedProjectId !== account.managedProjectId || updated.capturedTierId !== account.capturedTierId || updated.capturedPaidTierId !== account.capturedPaidTierId || // capturedAt represents when the tier was LAST CONFIRMED, not when it
+  // changed -- always update it on a successful observation so consumers
+  // can gate staleness on that timestamp even when the id stays the same.
+  capturedTier !== void 0 && updated.capturedTierAt !== account.capturedTierAt;
   return changed ? updated : void 0;
 }
 async function persistRotatedRefresh(client, providerId, auth) {