fix: Gemini/Antigravity quota sources and update labels (#379)

* refactor: unify Google quota window logic and labels

* chore: add OAuth client id/secret and notes in quota providers

packages/ui/src/components/layout/Header.tsx

@@ -1063,8 +1063,7 @@ export const Header: React.FC = () => {
                                             const displayPercent = quotaDisplayMode === 'remaining'
                                               ? window.remainingPercent
                                               : window.usedPercent;
-                                            // For model-level quotas, use '5h' as typical window label for Google models
-                                            const paceInfo = calculatePace(window.usedPercent, window.resetAt, window.windowSeconds, '5h');
+                                            const paceInfo = calculatePace(window.usedPercent, window.resetAt, window.windowSeconds);
                                             const expectedMarker = paceInfo?.dailyAllocationPercent != null
                                               ? calculateExpectedUsagePercent(paceInfo.elapsedRatio)
                                               : null;
@@ -1509,8 +1508,7 @@ export const Header: React.FC = () => {
                                         const displayPercent = quotaDisplayMode === 'remaining'
                                           ? window.remainingPercent
                                           : window.usedPercent;
-                                        // For model-level quotas, use '5h' as typical window label for Google models
-                                        const paceInfo = calculatePace(window.usedPercent, window.resetAt, window.windowSeconds, '5h');
+                                        const paceInfo = calculatePace(window.usedPercent, window.resetAt, window.windowSeconds);
                                         const expectedMarker = paceInfo?.dailyAllocationPercent != null
                                           ? calculateExpectedUsagePercent(paceInfo.elapsedRatio)
                                           : null;

packages/ui/src/lib/quota/utils.ts

@@ -27,11 +27,12 @@ export const resolveUsageTone = (percent: number | null): 'safe' | 'warn' | 'cri
 };
 
 export const formatWindowLabel = (label: string): string => {
-  if (label === '5h') return '5-Hour Limit';
+  if (label === '5h') return '5-Hour';
   if (label === '7d') return '7-Day Limit';
   if (label === '7d-sonnet') return '7-Day Sonnet Limit';
   if (label === '7d-opus') return '7-Day Opus Limit';
   if (label === 'weekly') return 'Weekly Limit';
+  if (label === 'daily') return 'Daily';
   if (label === 'monthly') return 'Monthly Limit';
   if (label === 'credits') return 'Credits';
   if (label === 'premium') return 'Premium Interactions';

packages/vscode/src/quotaProviders.ts

@@ -49,6 +49,14 @@ type GoogleModelsPayload = {
   }>;
 };
 
+type GoogleQuotaBucketsPayload = {
+  buckets?: Array<{
+    modelId?: string;
+    remainingFraction?: number;
+    resetTime?: string;
+  }>;
+};
+
 type ZaiLimit = {
   type?: string;
   number?: number;
@@ -83,16 +91,29 @@ const ANTIGRAVITY_ACCOUNTS_PATHS = [
   path.join(OPENCODE_DATA_DIR, 'antigravity-accounts.json'),
 ];
 
-const GOOGLE_CLIENT_ID =
+// OAuth Secret value used to init client
+// Note: It's ok to save this in git because this is an installed application
+// as described here: https://developers.google.com/identity/protocols/oauth2#installed
+// "The process results in a client ID and, in some cases, a client secret,
+// which you embed in the source code of your application. (In this context,
+// the client secret is obviously not treated as a secret.)"
+// ref: https://github.com/opgginc/opencode-bar
+
+const ANTIGRAVITY_GOOGLE_CLIENT_ID =
   '1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com';
-const GOOGLE_CLIENT_SECRET = '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';
+const ANTIGRAVITY_GOOGLE_CLIENT_SECRET = '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';
+const GEMINI_GOOGLE_CLIENT_ID =
+  '681255809395-oo8ft2oprdrnp9e3aqf6av3hmdib135j.apps.googleusercontent.com';
+const GEMINI_GOOGLE_CLIENT_SECRET = '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';
 const DEFAULT_PROJECT_ID = 'rising-fact-p41fc';
-const GOOGLE_WINDOW_SECONDS = 5 * 60 * 60;
+const GOOGLE_FIVE_HOUR_WINDOW_SECONDS = 5 * 60 * 60;
+const GOOGLE_DAILY_WINDOW_SECONDS = 24 * 60 * 60;
+const GOOGLE_PRIMARY_ENDPOINT = 'https://cloudcode-pa.googleapis.com';
 
 const GOOGLE_ENDPOINTS = [
   'https://daily-cloudcode-pa.sandbox.googleapis.com',
   'https://autopush-cloudcode-pa.sandbox.googleapis.com',
-  'https://cloudcode-pa.googleapis.com',
+  GOOGLE_PRIMARY_ENDPOINT,
 ];
 
 const GOOGLE_HEADERS = {
@@ -102,6 +123,26 @@ const GOOGLE_HEADERS = {
     '{"ideType":"IDE_UNSPECIFIED","platform":"PLATFORM_UNSPECIFIED","pluginType":"GEMINI"}',
 };
 
+const resolveGoogleWindow = (sourceId: GoogleAuthSource['sourceId'], resetAt: number | null) => {
+  if (sourceId === 'gemini') {
+    return { label: 'daily', seconds: GOOGLE_DAILY_WINDOW_SECONDS } as const;
+  }
+
+  if (sourceId === 'antigravity') {
+    const remainingSeconds = typeof resetAt === 'number'
+      ? Math.max(0, Math.round((resetAt - Date.now()) / 1000))
+      : null;
+
+    if (remainingSeconds !== null && remainingSeconds > 10 * 60 * 60) {
+      return { label: 'daily', seconds: GOOGLE_DAILY_WINDOW_SECONDS } as const;
+    }
+
+    return { label: '5h', seconds: GOOGLE_FIVE_HOUR_WINDOW_SECONDS } as const;
+  }
+
+  return { label: 'daily', seconds: GOOGLE_DAILY_WINDOW_SECONDS } as const;
+};
+
 const ZAI_TOKEN_WINDOW_SECONDS: Record<number, number> = { 3: 3600 };
 
 const readAuthFile = (): AuthFile => {
@@ -158,6 +199,30 @@ const normalizeAuthEntry = (entry: AuthEntry | null) => {
   return null;
 };
 
+const asObject = (value: unknown): Record<string, unknown> | null => (
+  value && typeof value === 'object' ? value as Record<string, unknown> : null
+);
+
+const asNonEmptyString = (value: unknown): string | null => {
+  if (typeof value !== 'string') return null;
+  const trimmed = value.trim();
+  return trimmed ? trimmed : null;
+};
+
+const parseGoogleRefreshToken = (rawRefreshToken: unknown) => {
+  const refreshToken = asNonEmptyString(rawRefreshToken);
+  if (!refreshToken) {
+    return { refreshToken: null, projectId: null, managedProjectId: null };
+  }
+
+  const [rawToken = '', rawProject = '', rawManagedProject = ''] = refreshToken.split('|');
+  return {
+    refreshToken: asNonEmptyString(rawToken),
+    projectId: asNonEmptyString(rawProject),
+    managedProjectId: asNonEmptyString(rawManagedProject),
+  };
+};
+
 const toNumber = (value: unknown): number | null => {
   if (typeof value === 'number' && Number.isFinite(value)) {
     return value;
@@ -281,8 +346,7 @@ export const listConfiguredQuotaProviders = () => {
     configured.add('codex');
   }
 
-  const googleAuth = normalizeAuthEntry(getAuthEntry(auth, ['google', 'antigravity']));
-  if (googleAuth && ((googleAuth as Record<string, unknown>).access || (googleAuth as Record<string, unknown>).token || (googleAuth as Record<string, unknown>).refresh)) {
+  if (resolveGeminiCliAuth(auth) || resolveAntigravityAuth()) {
     configured.add('google');
   }
 
@@ -307,15 +371,6 @@ export const listConfiguredQuotaProviders = () => {
     configured.add('github-copilot-addon');
   }
 
-  for (const filePath of ANTIGRAVITY_ACCOUNTS_PATHS) {
-    const data = readJsonFile(filePath);
-    const accounts = data?.accounts;
-    if (Array.isArray(accounts) && accounts.length > 0) {
-      configured.add('google');
-      break;
-    }
-  }
-
   return Array.from(configured);
 };
 
@@ -409,26 +464,42 @@ export const fetchCodexQuota = async (): Promise<ProviderResult> => {
   }
 };
 
-const resolveGoogleAuth = () => {
-  const auth = readAuthFile();
-  const entry = normalizeAuthEntry(getAuthEntry(auth, ['google', 'antigravity'])) as Record<string, unknown> | null;
-  if (entry) {
-    const accessToken = (entry.access as string | undefined) ?? (entry.token as string | undefined);
-    let refreshToken = entry.refresh as string | undefined;
-    let projectId: string | undefined;
-    if (refreshToken && refreshToken.includes('|')) {
-      const [first, second] = refreshToken.split('|');
-      refreshToken = first;
-      projectId = second;
-    }
-    return {
-      accessToken,
-      refreshToken,
-      expires: entry.expires as number | undefined,
-      projectId,
-    };
+type GoogleAuthSource = {
+  sourceId: 'gemini' | 'antigravity';
+  sourceLabel: string;
+  accessToken?: string;
+  refreshToken?: string;
+  expires?: number;
+  projectId?: string;
+  email?: string;
+};
+
+const resolveGeminiCliAuth = (auth: AuthFile): GoogleAuthSource | null => {
+  const entry = normalizeAuthEntry(getAuthEntry(auth, ['google', 'google.oauth'])) as Record<string, unknown> | null;
+  const entryObject = asObject(entry);
+  if (!entryObject) {
+    return null;
   }
 
+  const oauthObject = asObject(entryObject.oauth) ?? entryObject;
+  const accessToken = asNonEmptyString(oauthObject.access) ?? asNonEmptyString(oauthObject.token);
+  const refreshParts = parseGoogleRefreshToken(oauthObject.refresh);
+
+  if (!accessToken && !refreshParts.refreshToken) {
+    return null;
+  }
+
+  return {
+    sourceId: 'gemini',
+    sourceLabel: 'Gemini',
+    accessToken: accessToken ?? undefined,
+    refreshToken: refreshParts.refreshToken ?? undefined,
+    projectId: (refreshParts.projectId ?? refreshParts.managedProjectId) ?? undefined,
+    expires: toTimestamp(oauthObject.expires) ?? undefined,
+  };
+};
+
+const resolveAntigravityAuth = (): GoogleAuthSource | null => {
   for (const filePath of ANTIGRAVITY_ACCOUNTS_PATHS) {
     const data = readJsonFile(filePath);
     const accounts = data?.accounts;
@@ -438,10 +509,17 @@ const resolveGoogleAuth = () => {
         : 0;
       const account = (accounts[index] as Record<string, unknown> | undefined) ?? (accounts[0] as Record<string, unknown> | undefined);
       if (account?.refreshToken) {
+        const refreshParts = parseGoogleRefreshToken(account.refreshToken);
         return {
-          refreshToken: account.refreshToken as string,
-          projectId: (account.projectId as string | undefined) ?? (account.managedProjectId as string | undefined),
-          email: account.email as string | undefined,
+          sourceId: 'antigravity',
+          sourceLabel: 'Antigravity',
+          refreshToken: refreshParts.refreshToken ?? undefined,
+          projectId: asNonEmptyString(account.projectId)
+            ?? asNonEmptyString(account.managedProjectId)
+            ?? refreshParts.projectId
+            ?? refreshParts.managedProjectId
+            ?? undefined,
+          email: asNonEmptyString(account.email) ?? undefined,
         };
       }
     }
@@ -450,13 +528,44 @@ const resolveGoogleAuth = () => {
   return null;
 };
 
-const refreshGoogleAccessToken = async (refreshToken: string) => {
+const resolveGoogleAuthSources = (): GoogleAuthSource[] => {
+  const auth = readAuthFile();
+  const sources: GoogleAuthSource[] = [];
+
+  const geminiAuth = resolveGeminiCliAuth(auth);
+  if (geminiAuth) {
+    sources.push(geminiAuth);
+  }
+
+  const antigravityAuth = resolveAntigravityAuth();
+  if (antigravityAuth) {
+    sources.push(antigravityAuth);
+  }
+
+  return sources;
+};
+
+const resolveGoogleOAuthClient = (sourceId: GoogleAuthSource['sourceId']) => {
+  if (sourceId === 'gemini') {
+    return {
+      clientId: GEMINI_GOOGLE_CLIENT_ID,
+      clientSecret: GEMINI_GOOGLE_CLIENT_SECRET,
+    };
+  }
+
+  return {
+    clientId: ANTIGRAVITY_GOOGLE_CLIENT_ID,
+    clientSecret: ANTIGRAVITY_GOOGLE_CLIENT_SECRET,
+  };
+};
+
+const refreshGoogleAccessToken = async (refreshToken: string, clientId: string, clientSecret: string) => {
   const response = await fetch('https://oauth2.googleapis.com/token', {
     method: 'POST',
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     body: new URLSearchParams({
-      client_id: GOOGLE_CLIENT_ID,
-      client_secret: GOOGLE_CLIENT_SECRET,
+      client_id: clientId,
+      client_secret: clientSecret,
       refresh_token: refreshToken,
       grant_type: 'refresh_token',
     }),
@@ -470,6 +579,35 @@ const refreshGoogleAccessToken = async (refreshToken: string) => {
   return typeof data?.access_token === 'string' ? data.access_token : null;
 };
 
+const fetchGoogleQuotaBuckets = async (accessToken: string, projectId?: string) => {
+  const body = projectId ? { project: projectId } : {};
+  const controller = typeof AbortController !== 'undefined' ? new AbortController() : null;
+  const timeout = controller ? setTimeout(() => controller.abort(), 15000) : null;
+  try {
+    const response = await fetch(`${GOOGLE_PRIMARY_ENDPOINT}/v1internal:retrieveUserQuota`, {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify(body),
+      signal: controller?.signal,
+    });
+
+    if (!response.ok) {
+      return null;
+    }
+
+    return await response.json() as GoogleQuotaBucketsPayload;
+  } catch {
+    return null;
+  } finally {
+    if (timeout) {
+      clearTimeout(timeout);
+    }
+  }
+};
+
 const fetchGoogleModels = async (accessToken: string, projectId?: string) => {
   const body = projectId ? { project: projectId } : {};
 
@@ -504,8 +642,8 @@ const fetchGoogleModels = async (accessToken: string, projectId?: string) => {
 };
 
 export const fetchGoogleQuota = async (): Promise<ProviderResult> => {
-  const auth = resolveGoogleAuth();
-  if (!auth) {
+  const authSources = resolveGoogleAuthSources();
+  if (!authSources.length) {
     return buildResult({
       providerId: 'google',
       providerName: 'Google',
@@ -515,64 +653,108 @@ export const fetchGoogleQuota = async (): Promise<ProviderResult> => {
     });
   }
 
-  const now = Date.now();
-  let accessToken: string | undefined = auth.accessToken;
-  if (!accessToken || (typeof auth.expires === 'number' && auth.expires <= now)) {
-    if (!auth.refreshToken) {
-      return buildResult({
-        providerId: 'google',
-        providerName: 'Google',
-        ok: false,
-        configured: true,
-        error: 'Missing refresh token',
-      });
-    }
-    accessToken = (await refreshGoogleAccessToken(auth.refreshToken)) ?? undefined;
-  }
-
-  if (!accessToken) {
-    return buildResult({
-      providerId: 'google',
-      providerName: 'Google',
-      ok: false,
-      configured: true,
-      error: 'Failed to refresh OAuth token',
-    });
-  }
-
-  const projectId = auth.projectId ?? DEFAULT_PROJECT_ID;
-  const payload = await fetchGoogleModels(accessToken, projectId);
-  if (!payload || typeof payload !== 'object') {
-    return buildResult({
-      providerId: 'google',
-      providerName: 'Google',
-      ok: false,
-      configured: true,
-      error: 'Failed to fetch models',
-    });
-  }
-
   const models: Record<string, ProviderUsage> = {};
-  const payloadModels = (payload as GoogleModelsPayload).models ?? {};
-  for (const [modelName, modelData] of Object.entries(payloadModels)) {
-    const quotaInfo = modelData?.quotaInfo;
-    const remainingFraction = quotaInfo?.remainingFraction;
-    const remainingPercent = typeof remainingFraction === 'number'
-      ? Math.round(remainingFraction * 100)
-      : null;
-    const usedPercent = remainingPercent !== null ? Math.max(0, 100 - remainingPercent) : null;
-    const resetAt = quotaInfo?.resetTime
-      ? new Date(quotaInfo.resetTime).getTime()
-      : null;
-    models[modelName] = {
-      windows: {
-        '5h': toUsageWindow({
-          usedPercent,
-          windowSeconds: GOOGLE_WINDOW_SECONDS,
-          resetAt,
-        }),
-      },
-    };
+  const sourceErrors: string[] = [];
+
+  for (const source of authSources) {
+    const now = Date.now();
+    let accessToken = source.accessToken;
+
+    if (!accessToken || (typeof source.expires === 'number' && source.expires <= now)) {
+      if (!source.refreshToken) {
+        sourceErrors.push(`${source.sourceLabel}: Missing refresh token`);
+        continue;
+      }
+      const { clientId, clientSecret } = resolveGoogleOAuthClient(source.sourceId);
+      accessToken = (await refreshGoogleAccessToken(source.refreshToken, clientId, clientSecret)) ?? undefined;
+    }
+
+    if (!accessToken) {
+      sourceErrors.push(`${source.sourceLabel}: Failed to refresh OAuth token`);
+      continue;
+    }
+
+    const projectId = source.projectId ?? DEFAULT_PROJECT_ID;
+    let mergedAnyModel = false;
+
+    if (source.sourceId === 'gemini') {
+      const quotaPayload = await fetchGoogleQuotaBuckets(accessToken, projectId);
+      const buckets = Array.isArray(quotaPayload?.buckets) ? quotaPayload.buckets : [];
+
+      for (const bucket of buckets) {
+        const modelId = asNonEmptyString(bucket.modelId);
+        if (!modelId) {
+          continue;
+        }
+
+        const scopedName = modelId.startsWith(`${source.sourceId}/`)
+          ? modelId
+          : `${source.sourceId}/${modelId}`;
+
+        const remainingFraction = toNumber(bucket.remainingFraction);
+        const remainingPercent = remainingFraction !== null
+          ? Math.round(remainingFraction * 100)
+          : null;
+        const usedPercent = remainingPercent !== null ? Math.max(0, 100 - remainingPercent) : null;
+        const resetAt = toTimestamp(bucket.resetTime);
+        const window = resolveGoogleWindow(source.sourceId, resetAt);
+
+        models[scopedName] = {
+          windows: {
+            [window.label]: toUsageWindow({
+              usedPercent,
+              windowSeconds: window.seconds,
+              resetAt,
+            }),
+          },
+        };
+        mergedAnyModel = true;
+      }
+    }
+
+    const payload = await fetchGoogleModels(accessToken, projectId);
+    if (payload && typeof payload === 'object') {
+      const payloadModels = (payload as GoogleModelsPayload).models ?? {};
+      for (const [modelName, modelData] of Object.entries(payloadModels)) {
+        const scopedName = modelName.startsWith(`${source.sourceId}/`)
+          ? modelName
+          : `${source.sourceId}/${modelName}`;
+        const quotaInfo = modelData?.quotaInfo;
+        const remainingFraction = quotaInfo?.remainingFraction;
+        const remainingPercent = typeof remainingFraction === 'number'
+          ? Math.round(remainingFraction * 100)
+          : null;
+        const usedPercent = remainingPercent !== null ? Math.max(0, 100 - remainingPercent) : null;
+        const resetAt = quotaInfo?.resetTime
+          ? new Date(quotaInfo.resetTime).getTime()
+          : null;
+        const window = resolveGoogleWindow(source.sourceId, resetAt);
+        models[scopedName] = {
+          windows: {
+            [window.label]: toUsageWindow({
+              usedPercent,
+              windowSeconds: window.seconds,
+              resetAt,
+            }),
+          },
+        };
+        mergedAnyModel = true;
+      }
+    }
+
+    if (!mergedAnyModel) {
+      sourceErrors.push(`${source.sourceLabel}: Failed to fetch models`);
+    }
+  }
+
+  if (!Object.keys(models).length) {
+    return buildResult({
+      providerId: 'google',
+      providerName: 'Google',
+      ok: false,
+      configured: true,
+      error: sourceErrors[0] ?? 'Failed to fetch models',
+    });
   }
 
   return buildResult({

packages/web/server/lib/quota-providers.js

@@ -47,6 +47,28 @@ const normalizeAuthEntry = (entry) => {
   return null;
 };
 
+const asObject = (value) => (value && typeof value === 'object' ? value : null);
+
+const asNonEmptyString = (value) => {
+  if (typeof value !== 'string') return null;
+  const trimmed = value.trim();
+  return trimmed ? trimmed : null;
+};
+
+const parseGoogleRefreshToken = (rawRefreshToken) => {
+  const refreshToken = asNonEmptyString(rawRefreshToken);
+  if (!refreshToken) {
+    return { refreshToken: null, projectId: null, managedProjectId: null };
+  }
+
+  const [rawToken = '', rawProject = '', rawManagedProject = ''] = refreshToken.split('|');
+  return {
+    refreshToken: asNonEmptyString(rawToken),
+    projectId: asNonEmptyString(rawProject),
+    managedProjectId: asNonEmptyString(rawManagedProject)
+  };
+};
+
 const toNumber = (value) => {
   if (typeof value === 'number' && Number.isFinite(value)) {
     return value;
@@ -159,8 +181,7 @@ export const listConfiguredQuotaProviders = () => {
     configured.add('codex');
   }
 
-  const googleAuth = normalizeAuthEntry(getAuthEntry(auth, ['google', 'antigravity']));
-  if (googleAuth?.access || googleAuth?.token || googleAuth?.refresh) {
+  if (resolveGeminiCliAuth(auth) || resolveAntigravityAuth()) {
     configured.add('google');
   }
 
@@ -185,14 +206,6 @@ export const listConfiguredQuotaProviders = () => {
     configured.add('github-copilot-addon');
   }
 
-  for (const filePath of ANTIGRAVITY_ACCOUNTS_PATHS) {
-    const data = readJsonFile(filePath);
-    if (Array.isArray(data?.accounts) && data.accounts.length > 0) {
-      configured.add('google');
-      break;
-    }
-  }
-
   return Array.from(configured);
 };
 
@@ -268,16 +281,29 @@ export const fetchOpenaiQuota = async () => {
   }
 };
 
-const GOOGLE_CLIENT_ID =
+// OAuth Secret value used to init client
+// Note: It's ok to save this in git because this is an installed application
+// as described here: https://developers.google.com/identity/protocols/oauth2#installed
+// "The process results in a client ID and, in some cases, a client secret,
+// which you embed in the source code of your application. (In this context,
+// the client secret is obviously not treated as a secret.)"
+// ref: https://github.com/opgginc/opencode-bar
+
+const ANTIGRAVITY_GOOGLE_CLIENT_ID =
   '1071006060591-tmhssin2h21lcre235vtolojh4g403ep.apps.googleusercontent.com';
-const GOOGLE_CLIENT_SECRET = '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';
+const ANTIGRAVITY_GOOGLE_CLIENT_SECRET = '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';
+const GEMINI_GOOGLE_CLIENT_ID =
+  '681255809395-oo8ft2oprdrnp9e3aqf6av3hmdib135j.apps.googleusercontent.com';
+const GEMINI_GOOGLE_CLIENT_SECRET = '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';
 const DEFAULT_PROJECT_ID = 'rising-fact-p41fc';
-const GOOGLE_WINDOW_SECONDS = 5 * 60 * 60;
+const GOOGLE_FIVE_HOUR_WINDOW_SECONDS = 5 * 60 * 60;
+const GOOGLE_DAILY_WINDOW_SECONDS = 24 * 60 * 60;
+const GOOGLE_PRIMARY_ENDPOINT = 'https://cloudcode-pa.googleapis.com';
 
 const GOOGLE_ENDPOINTS = [
   'https://daily-cloudcode-pa.sandbox.googleapis.com',
   'https://autopush-cloudcode-pa.sandbox.googleapis.com',
-  'https://cloudcode-pa.googleapis.com'
+  GOOGLE_PRIMARY_ENDPOINT
 ];
 
 const GOOGLE_HEADERS = {
@@ -287,26 +313,52 @@ const GOOGLE_HEADERS = {
     '{"ideType":"IDE_UNSPECIFIED","platform":"PLATFORM_UNSPECIFIED","pluginType":"GEMINI"}'
 };
 
-const resolveGoogleAuth = () => {
-  const auth = readAuthFile();
-  const entry = normalizeAuthEntry(getAuthEntry(auth, ['google', 'antigravity']));
-  if (entry) {
-    const accessToken = entry.access ?? entry.token;
-    let refreshToken = entry.refresh;
-    let projectId = undefined;
-    if (refreshToken && refreshToken.includes('|')) {
-      const parts = refreshToken.split('|');
-      refreshToken = parts[0];
-      projectId = parts[1];
-    }
-    return {
-      accessToken,
-      refreshToken,
-      expires: entry.expires,
-      projectId
-    };
+const resolveGoogleWindow = (sourceId, resetAt) => {
+  if (sourceId === 'gemini') {
+    return { label: 'daily', seconds: GOOGLE_DAILY_WINDOW_SECONDS };
   }
 
+  if (sourceId === 'antigravity') {
+    const remainingSeconds = typeof resetAt === 'number'
+      ? Math.max(0, Math.round((resetAt - Date.now()) / 1000))
+      : null;
+
+    if (remainingSeconds !== null && remainingSeconds > 10 * 60 * 60) {
+      return { label: 'daily', seconds: GOOGLE_DAILY_WINDOW_SECONDS };
+    }
+
+    return { label: '5h', seconds: GOOGLE_FIVE_HOUR_WINDOW_SECONDS };
+  }
+
+  return { label: 'daily', seconds: GOOGLE_DAILY_WINDOW_SECONDS };
+};
+
+const resolveGeminiCliAuth = (auth) => {
+  const entry = normalizeAuthEntry(getAuthEntry(auth, ['google', 'google.oauth']));
+  const entryObject = asObject(entry);
+  if (!entryObject) {
+    return null;
+  }
+
+  const oauthObject = asObject(entryObject.oauth) ?? entryObject;
+  const accessToken = asNonEmptyString(oauthObject.access) ?? asNonEmptyString(oauthObject.token);
+  const refreshParts = parseGoogleRefreshToken(oauthObject.refresh);
+
+  if (!accessToken && !refreshParts.refreshToken) {
+    return null;
+  }
+
+  return {
+    sourceId: 'gemini',
+    sourceLabel: 'Gemini',
+    accessToken,
+    refreshToken: refreshParts.refreshToken,
+    projectId: refreshParts.projectId ?? refreshParts.managedProjectId,
+    expires: toTimestamp(oauthObject.expires)
+  };
+};
+
+const resolveAntigravityAuth = () => {
   for (const filePath of ANTIGRAVITY_ACCOUNTS_PATHS) {
     const data = readJsonFile(filePath);
     const accounts = data?.accounts;
@@ -314,9 +366,15 @@ const resolveGoogleAuth = () => {
       const index = typeof data.activeIndex === 'number' ? data.activeIndex : 0;
       const account = accounts[index] ?? accounts[0];
       if (account?.refreshToken) {
+        const refreshParts = parseGoogleRefreshToken(account.refreshToken);
         return {
-          refreshToken: account.refreshToken,
-          projectId: account.projectId ?? account.managedProjectId,
+          sourceId: 'antigravity',
+          sourceLabel: 'Antigravity',
+          refreshToken: refreshParts.refreshToken,
+          projectId: asNonEmptyString(account.projectId)
+            ?? asNonEmptyString(account.managedProjectId)
+            ?? refreshParts.projectId
+            ?? refreshParts.managedProjectId,
           email: account.email
         };
       }
@@ -326,13 +384,44 @@ const resolveGoogleAuth = () => {
   return null;
 };
 
-const refreshGoogleAccessToken = async (refreshToken) => {
+const resolveGoogleAuthSources = () => {
+  const auth = readAuthFile();
+  const sources = [];
+
+  const geminiAuth = resolveGeminiCliAuth(auth);
+  if (geminiAuth) {
+    sources.push(geminiAuth);
+  }
+
+  const antigravityAuth = resolveAntigravityAuth();
+  if (antigravityAuth) {
+    sources.push(antigravityAuth);
+  }
+
+  return sources;
+};
+
+const resolveGoogleOAuthClient = (sourceId) => {
+  if (sourceId === 'gemini') {
+    return {
+      clientId: GEMINI_GOOGLE_CLIENT_ID,
+      clientSecret: GEMINI_GOOGLE_CLIENT_SECRET
+    };
+  }
+
+  return {
+    clientId: ANTIGRAVITY_GOOGLE_CLIENT_ID,
+    clientSecret: ANTIGRAVITY_GOOGLE_CLIENT_SECRET
+  };
+};
+
+const refreshGoogleAccessToken = async (refreshToken, clientId, clientSecret) => {
   const response = await fetch('https://oauth2.googleapis.com/token', {
     method: 'POST',
     headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
     body: new URLSearchParams({
-      client_id: GOOGLE_CLIENT_ID,
-      client_secret: GOOGLE_CLIENT_SECRET,
+      client_id: clientId,
+      client_secret: clientSecret,
       refresh_token: refreshToken,
       grant_type: 'refresh_token'
     })
@@ -346,6 +435,30 @@ const refreshGoogleAccessToken = async (refreshToken) => {
   return typeof data?.access_token === 'string' ? data.access_token : null;
 };
 
+const fetchGoogleQuotaBuckets = async (accessToken, projectId) => {
+  const body = projectId ? { project: projectId } : {};
+
+  try {
+    const response = await fetch(`${GOOGLE_PRIMARY_ENDPOINT}/v1internal:retrieveUserQuota`, {
+      method: 'POST',
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        'Content-Type': 'application/json'
+      },
+      body: JSON.stringify(body),
+      signal: AbortSignal.timeout(15000)
+    });
+
+    if (!response.ok) {
+      return null;
+    }
+
+    return await response.json();
+  } catch {
+    return null;
+  }
+};
+
 const fetchGoogleModels = async (accessToken, projectId) => {
   const body = projectId ? { project: projectId } : {};
 
@@ -374,8 +487,8 @@ const fetchGoogleModels = async (accessToken, projectId) => {
 };
 
 export const fetchGoogleQuota = async () => {
-  const auth = resolveGoogleAuth();
-  if (!auth) {
+  const authSources = resolveGoogleAuthSources();
+  if (!authSources.length) {
     return buildResult({
       providerId: 'google',
       providerName: 'Google',
@@ -385,62 +498,107 @@ export const fetchGoogleQuota = async () => {
     });
   }
 
-  const now = Date.now();
-  let accessToken = auth.accessToken;
-  if (!accessToken || (typeof auth.expires === 'number' && auth.expires <= now)) {
-    if (!auth.refreshToken) {
-      return buildResult({
-        providerId: 'google',
-        providerName: 'Google',
-        ok: false,
-        configured: true,
-        error: 'Missing refresh token'
-      });
-    }
-    accessToken = await refreshGoogleAccessToken(auth.refreshToken);
-  }
-
-  if (!accessToken) {
-    return buildResult({
-      providerId: 'google',
-      providerName: 'Google',
-      ok: false,
-      configured: true,
-      error: 'Failed to refresh OAuth token'
-    });
-  }
-
-  const projectId = auth.projectId ?? DEFAULT_PROJECT_ID;
-  const payload = await fetchGoogleModels(accessToken, projectId);
-  if (!payload) {
-    return buildResult({
-      providerId: 'google',
-      providerName: 'Google',
-      ok: false,
-      configured: true,
-      error: 'Failed to fetch models'
-    });
-  }
-
   const models = {};
-  for (const [modelName, modelData] of Object.entries(payload.models ?? {})) {
-    const remainingFraction = modelData?.quotaInfo?.remainingFraction;
-    const remainingPercent = typeof remainingFraction === 'number'
-      ? Math.round(remainingFraction * 100)
-      : null;
-    const usedPercent = remainingPercent !== null ? Math.max(0, 100 - remainingPercent) : null;
-    const resetAt = modelData?.quotaInfo?.resetTime
-      ? new Date(modelData.quotaInfo.resetTime).getTime()
-      : null;
-    models[modelName] = {
-      windows: {
-        '5h': toUsageWindow({
-          usedPercent,
-          windowSeconds: GOOGLE_WINDOW_SECONDS,
-          resetAt
-        })
+  const sourceErrors = [];
+
+  for (const source of authSources) {
+    const now = Date.now();
+    let accessToken = source.accessToken;
+
+    if (!accessToken || (typeof source.expires === 'number' && source.expires <= now)) {
+      if (!source.refreshToken) {
+        sourceErrors.push(`${source.sourceLabel}: Missing refresh token`);
+        continue;
       }
-    };
+      const { clientId, clientSecret } = resolveGoogleOAuthClient(source.sourceId);
+      accessToken = await refreshGoogleAccessToken(source.refreshToken, clientId, clientSecret);
+    }
+
+    if (!accessToken) {
+      sourceErrors.push(`${source.sourceLabel}: Failed to refresh OAuth token`);
+      continue;
+    }
+
+    const projectId = source.projectId ?? DEFAULT_PROJECT_ID;
+    let mergedAnyModel = false;
+
+    if (source.sourceId === 'gemini') {
+      const quotaPayload = await fetchGoogleQuotaBuckets(accessToken, projectId);
+      const buckets = Array.isArray(quotaPayload?.buckets) ? quotaPayload.buckets : [];
+
+      for (const bucket of buckets) {
+        const modelId = asNonEmptyString(bucket?.modelId);
+        if (!modelId) {
+          continue;
+        }
+
+        const scopedName = modelId.startsWith(`${source.sourceId}/`)
+          ? modelId
+          : `${source.sourceId}/${modelId}`;
+
+        const remainingFraction = toNumber(bucket?.remainingFraction);
+        const remainingPercent = remainingFraction !== null
+          ? Math.round(remainingFraction * 100)
+          : null;
+        const usedPercent = remainingPercent !== null ? Math.max(0, 100 - remainingPercent) : null;
+        const resetAt = toTimestamp(bucket?.resetTime);
+        const window = resolveGoogleWindow(source.sourceId, resetAt);
+
+        models[scopedName] = {
+          windows: {
+            [window.label]: toUsageWindow({
+              usedPercent,
+              windowSeconds: window.seconds,
+              resetAt
+            })
+          }
+        };
+        mergedAnyModel = true;
+      }
+    }
+
+    const payload = await fetchGoogleModels(accessToken, projectId);
+    if (payload) {
+      for (const [modelName, modelData] of Object.entries(payload.models ?? {})) {
+        const scopedName = modelName.startsWith(`${source.sourceId}/`)
+          ? modelName
+          : `${source.sourceId}/${modelName}`;
+
+        const remainingFraction = modelData?.quotaInfo?.remainingFraction;
+        const remainingPercent = typeof remainingFraction === 'number'
+          ? Math.round(remainingFraction * 100)
+          : null;
+        const usedPercent = remainingPercent !== null ? Math.max(0, 100 - remainingPercent) : null;
+        const resetAt = modelData?.quotaInfo?.resetTime
+          ? new Date(modelData.quotaInfo.resetTime).getTime()
+          : null;
+        const window = resolveGoogleWindow(source.sourceId, resetAt);
+        models[scopedName] = {
+          windows: {
+            [window.label]: toUsageWindow({
+              usedPercent,
+              windowSeconds: window.seconds,
+              resetAt
+            })
+          }
+        };
+        mergedAnyModel = true;
+      }
+    }
+
+    if (!mergedAnyModel) {
+      sourceErrors.push(`${source.sourceLabel}: Failed to fetch models`);
+    }
+  }
+
+  if (!Object.keys(models).length) {
+    return buildResult({
+      providerId: 'google',
+      providerName: 'Google',
+      ok: false,
+      configured: true,
+      error: sourceErrors[0] ?? 'Failed to fetch models'
+    });
   }
 
   return buildResult({