Merge upstream provider updates

Author: NGLSL

src/assets/icons/claudeapi.png

@@ -1428,7 +1428,6 @@ const renderKimiItems = (
           'div',
           { className: styleMap.quotaMeta },
           h('span', { className: styleMap.quotaPercent }, percentLabel),
-          limit > 0 ? h('span', { className: styleMap.quotaAmount }, `${used} / ${limit}`) : null,
           resetLabel ? h('span', { className: styleMap.quotaReset }, resetLabel) : null
         )
       ),
@@ -1471,15 +1470,32 @@ const buildXaiBillingSummary = (
     return null;
   }
 
+  const includedUsedCents =
+    usedCents === null
+      ? null
+      : monthlyLimitCents !== null && monthlyLimitCents > 0
+        ? Math.min(usedCents, monthlyLimitCents)
+        : usedCents;
+  const onDemandUsedCents =
+    usedCents !== null && monthlyLimitCents !== null
+      ? Math.max(0, usedCents - monthlyLimitCents)
+      : null;
   const usedPercent =
-    monthlyLimitCents !== null && monthlyLimitCents > 0 && usedCents !== null
-      ? (usedCents / monthlyLimitCents) * 100
+    monthlyLimitCents !== null && monthlyLimitCents > 0 && includedUsedCents !== null
+      ? (includedUsedCents / monthlyLimitCents) * 100
+      : null;
+  const onDemandUsedPercent =
+    onDemandCapCents !== null && onDemandCapCents > 0 && onDemandUsedCents !== null
+      ? (onDemandUsedCents / onDemandCapCents) * 100
       : null;
 
   return {
     monthlyLimitCents,
     usedCents,
+    includedUsedCents,
     onDemandCapCents,
+    onDemandUsedCents,
+    onDemandUsedPercent,
     billingPeriodStart,
     billingPeriodEnd,
     usedPercent,
@@ -1523,15 +1539,26 @@ const formatUsdFromCents = (cents: number | null): string => {
 
 const formatXaiRemainingAmount = (billing: XaiBillingSummary): string => {
   const remainingCents =
-    billing.monthlyLimitCents !== null && billing.usedCents !== null
-      ? Math.max(0, billing.monthlyLimitCents - billing.usedCents)
+    billing.monthlyLimitCents !== null && billing.includedUsedCents !== null
+      ? Math.max(0, billing.monthlyLimitCents - billing.includedUsedCents)
       : null;
   const remaining = formatUsdFromCents(remainingCents);
   const limit = formatUsdFromCents(billing.monthlyLimitCents);
   if (billing.monthlyLimitCents === null) return remaining;
   return `${remaining} / ${limit}`;
 };
 
+const formatXaiOnDemandAmount = (billing: XaiBillingSummary): string => {
+  const remainingCents =
+    billing.onDemandCapCents !== null && billing.onDemandUsedCents !== null
+      ? Math.max(0, billing.onDemandCapCents - billing.onDemandUsedCents)
+      : null;
+  const remaining = formatUsdFromCents(remainingCents);
+  const cap = formatUsdFromCents(billing.onDemandCapCents);
+  if (billing.onDemandCapCents === null) return remaining;
+  return `${remaining} / ${cap}`;
+};
+
 const XAI_SUPERGROK_LIMIT_CENTS = 15_000;
 const XAI_SUPERGROK_HEAVY_LIMIT_CENTS = 150_000;
 
@@ -1567,11 +1594,16 @@ const renderXaiItems = (
   const amountLabel = formatXaiRemainingAmount(billing);
   const resetLabel = formatQuotaResetTime(billing.billingPeriodEnd);
   const onDemandCap = billing.onDemandCapCents ?? 0;
+  const clampedOnDemandUsed =
+    billing.onDemandUsedPercent === null
+      ? null
+      : Math.max(0, Math.min(100, billing.onDemandUsedPercent));
+  const onDemandRemaining =
+    clampedOnDemandUsed === null ? null : Math.max(0, Math.min(100, 100 - clampedOnDemandUsed));
+  const onDemandPercentLabel =
+    onDemandRemaining === null ? '--' : `${Math.round(onDemandRemaining)}%`;
+  const onDemandAmountLabel = formatXaiOnDemandAmount(billing);
   const plan = resolveXaiPlan(billing.monthlyLimitCents);
-  const payAsYouGoLabel =
-    onDemandCap > 0
-      ? t('xai_quota.pay_as_you_go_enabled', { cap: formatUsdFromCents(onDemandCap) })
-      : t('xai_quota.pay_as_you_go_disabled');
 
   return h(
     Fragment,
@@ -1588,12 +1620,33 @@ const renderXaiItems = (
           )
         )
       : null,
-    h(
-      'div',
-      { key: 'pay-as-you-go', className: styleMap.codexPlan },
-      h('span', { className: styleMap.codexPlanLabel }, t('xai_quota.pay_as_you_go_label')),
-      h('span', { className: styleMap.codexPlanValue }, payAsYouGoLabel)
-    ),
+    onDemandCap > 0
+      ? h(
+          'div',
+          { key: 'pay-as-you-go', className: styleMap.quotaRow },
+          h(
+            'div',
+            { className: styleMap.quotaRowHeader },
+            h('span', { className: styleMap.quotaModel }, t('xai_quota.pay_as_you_go_label')),
+            h(
+              'div',
+              { className: styleMap.quotaMeta },
+              h('span', { className: styleMap.quotaPercent }, onDemandPercentLabel),
+              h('span', { className: styleMap.quotaAmount }, onDemandAmountLabel)
+            )
+          ),
+          h(QuotaProgressBar, {
+            percent: onDemandRemaining,
+            highThreshold: QUOTA_PROGRESS_HIGH_THRESHOLD,
+            mediumThreshold: QUOTA_PROGRESS_MEDIUM_THRESHOLD,
+          })
+        )
+      : h(
+          'div',
+          { key: 'pay-as-you-go', className: styleMap.codexPlan },
+          h('span', { className: styleMap.codexPlanLabel }, t('xai_quota.pay_as_you_go_label')),
+          h('span', { className: styleMap.codexPlanValue }, t('xai_quota.pay_as_you_go_disabled'))
+        ),
     h(
       'div',
       { key: 'monthly-credits', className: styleMap.quotaRow },

src/assets/icons/code0.png

@@ -18,6 +18,7 @@ import type { ProviderPanelControls } from './components/ProviderResourcePanel';
 import { SponsorQuickStartPanel } from './components/SponsorQuickStartPanel';
 import { ProviderSheet, type ProviderSheetHandle } from './sheets/ProviderSheet';
 import { APIKEY_FUN_DISPLAY_NAME } from './sponsor';
+import { isMultiProtocolSponsorBrand } from './sponsorDefinitions';
 import { useProviderWorkbench } from './useProviderWorkbench';
 import {
   getProviderFilterState,
@@ -79,16 +80,17 @@ const getResourceRecentSuccess = (
   resource: ProviderResource,
   usageByProvider: ProviderRecentUsageMap
 ): number => {
-  if (resource.brand === 'apikeyFun') {
+  if (isMultiProtocolSponsorBrand(resource.brand)) {
     return 0;
   }
   if (resource.brand === 'openaiCompatibility') {
     return getOpenAIProviderRecentWindowStats(resource.raw as OpenAIProviderConfig, usageByProvider)
       .success;
   }
+  const usageProvider = resource.brand === 'claudeApi' ? 'claude' : resource.brand;
   return getProviderRecentWindowStats(
     usageByProvider,
-    resource.brand,
+    usageProvider,
     resource.apiKey ?? undefined,
     resource.baseUrl ?? undefined,
     resource.authIndex,

src/components/quota/quotaConfigs.ts

@@ -7,10 +7,18 @@ import {
   getApiKeyFunProtocolUrls,
   resolveApiKeyFunBaseUrl,
 } from './sponsor';
+import { CLAUDE_API_DISPLAY_NAME } from './claudeApi';
+import {
+  CODE0_DISPLAY_NAME,
+  CODE0_PROTOCOL_LABELS,
+  getCode0ProtocolUrls,
+  resolveCode0BaseUrl,
+} from './code0';
 import type {
   ProviderBrand,
   ProviderResource,
   ProviderResourceSelector,
+  SponsorProviderBrand,
   SponsorProviderRaw,
 } from './types';
 
@@ -40,7 +48,7 @@ const truncateForId = (value: string | undefined | null): string => {
 };
 
 function providerKeyToResource(
-  brand: 'gemini' | 'codex' | 'claude' | 'vertex',
+  brand: 'gemini' | 'codex' | 'claude' | 'claudeApi' | 'vertex',
   config: GeminiKeyConfig | ProviderKeyConfig,
   index: number
 ): ProviderResource {
@@ -50,7 +58,7 @@ function providerKeyToResource(
   if (brand === 'codex') {
     flags.websockets = (config as ProviderKeyConfig).websockets === true;
   }
-  if (brand === 'claude') {
+  if (brand === 'claude' || brand === 'claudeApi') {
     const cloak = (config as ProviderKeyConfig).cloak;
     flags.cloakEnabled = Boolean(cloak?.mode?.trim());
   }
@@ -99,6 +107,14 @@ export function claudeToResource(config: ProviderKeyConfig, index: number): Prov
   return providerKeyToResource('claude', config, index);
 }
 
+export function claudeApiToResource(config: ProviderKeyConfig, index: number): ProviderResource {
+  const resource = providerKeyToResource('claudeApi', config, index);
+  return {
+    ...resource,
+    name: CLAUDE_API_DISPLAY_NAME,
+  };
+}
+
 export function vertexToResource(config: ProviderKeyConfig, index: number): ProviderResource {
   return providerKeyToResource('vertex', config, index);
 }
@@ -132,22 +148,49 @@ export function openaiToResource(config: OpenAIProviderConfig, index: number): P
   };
 }
 
-export function apiKeyFunToResource(raw: SponsorProviderRaw): ProviderResource | null {
-  if (raw.openai.length === 0 && raw.claude.length === 0 && raw.codex.length === 0) {
+interface SponsorResourceOptions {
+  displayName: string;
+  protocolLabels: readonly string[];
+  resolveBaseUrl: (value: string | undefined | null) => string;
+  getProtocolUrls: (value: string | undefined | null) => {
+    anthropic: string;
+    openai: string;
+    codex: string;
+    gemini: string;
+  };
+}
+
+function sponsorRawToResource(
+  brand: SponsorProviderBrand,
+  raw: SponsorProviderRaw,
+  options: SponsorResourceOptions
+): ProviderResource | null {
+  if (
+    raw.openai.length === 0 &&
+    raw.claude.length === 0 &&
+    raw.codex.length === 0 &&
+    raw.gemini.length === 0
+  ) {
     return null;
   }
   const openaiKeyCount = raw.openai.reduce(
     (count, item) => count + (item.config.apiKeyEntries?.length ?? 0),
     0
   );
   const codexKeyCount = raw.codex.length;
+  const geminiKeyCount = raw.gemini.length;
   const firstOpenAIEntry = raw.openai
     .flatMap((item) => item.config.apiKeyEntries ?? [])
     .find((entry) => entry.apiKey?.trim());
   const firstCodex = raw.codex.find((item) => item.config.apiKey?.trim());
   const firstClaude = raw.claude.find((item) => item.config.apiKey?.trim());
+  const firstGemini = raw.gemini.find((item) => item.config.apiKey?.trim());
   const apiKey =
-    firstOpenAIEntry?.apiKey ?? firstCodex?.config.apiKey ?? firstClaude?.config.apiKey ?? '';
+    firstOpenAIEntry?.apiKey ??
+    firstCodex?.config.apiKey ??
+    firstClaude?.config.apiKey ??
+    firstGemini?.config.apiKey ??
+    '';
   const openaiDisabled =
     raw.openai.length > 0 && raw.openai.every((item) => item.config.disabled === true);
   const codexDisabled =
@@ -156,53 +199,70 @@ export function apiKeyFunToResource(raw: SponsorProviderRaw): ProviderResource |
   const claudeDisabled =
     raw.claude.length > 0 &&
     raw.claude.every((item) => hasDisableAllModelsRule(item.config.excludedModels));
+  const geminiDisabled =
+    raw.gemini.length > 0 &&
+    raw.gemini.every((item) => hasDisableAllModelsRule(item.config.excludedModels));
   const enabledCount =
     (raw.openai.length > 0 && !openaiDisabled ? 1 : 0) +
     (raw.codex.length > 0 && !codexDisabled ? 1 : 0) +
-    (raw.claude.length > 0 && !claudeDisabled ? 1 : 0);
+    (raw.claude.length > 0 && !claudeDisabled ? 1 : 0) +
+    (raw.gemini.length > 0 && !geminiDisabled ? 1 : 0);
   const allResourcesConfigured =
-    raw.openai.length > 0 || raw.codex.length > 0 || raw.claude.length > 0;
+    raw.openai.length > 0 ||
+    raw.codex.length > 0 ||
+    raw.claude.length > 0 ||
+    raw.gemini.length > 0;
   const disabled = allResourcesConfigured && enabledCount === 0;
   const models = [
     ...raw.openai.flatMap((item) => collectModelNames(item.config.models)),
     ...raw.codex.flatMap((item) => collectModelNames(item.config.models)),
     ...raw.claude.flatMap((item) => collectModelNames(item.config.models)),
+    ...raw.gemini.flatMap((item) => collectModelNames(item.config.models)),
   ];
   const uniqueModels = Array.from(new Set(models));
   const headerCount =
     raw.openai.reduce((count, item) => count + countHeaders(item.config.headers), 0) +
     raw.codex.reduce((count, item) => count + countHeaders(item.config.headers), 0) +
-    raw.claude.reduce((count, item) => count + countHeaders(item.config.headers), 0);
+    raw.claude.reduce((count, item) => count + countHeaders(item.config.headers), 0) +
+    raw.gemini.reduce((count, item) => count + countHeaders(item.config.headers), 0);
   const priority = Math.max(
     0,
     ...raw.openai.map((item) => normalizePriority(item.config.priority)),
     ...raw.codex.map((item) => normalizePriority(item.config.priority)),
-    ...raw.claude.map((item) => normalizePriority(item.config.priority))
+    ...raw.claude.map((item) => normalizePriority(item.config.priority)),
+    ...raw.gemini.map((item) => normalizePriority(item.config.priority))
   );
-  const baseUrl = resolveApiKeyFunBaseUrl(
-    raw.openai[0]?.config.baseUrl ?? raw.codex[0]?.config.baseUrl ?? raw.claude[0]?.config.baseUrl
+  const baseUrl = options.resolveBaseUrl(
+    raw.openai[0]?.config.baseUrl ??
+      raw.codex[0]?.config.baseUrl ??
+      raw.claude[0]?.config.baseUrl ??
+      raw.gemini[0]?.config.baseUrl
   );
-  const protocolUrls = getApiKeyFunProtocolUrls(baseUrl);
+  const protocolUrls = options.getProtocolUrls(baseUrl);
 
   return {
-    id: buildId('apikeyFun', 0, 'sponsor'),
-    brand: 'apikeyFun',
+    id: buildId(brand, 0, 'sponsor'),
+    brand,
     originalIndex: 0,
-    name: APIKEY_FUN_DISPLAY_NAME,
-    identifier: APIKEY_FUN_DISPLAY_NAME,
+    name: options.displayName,
+    identifier: options.displayName,
     apiKeyPreview: apiKey ? maskApiKey(apiKey) : null,
     apiKey: apiKey || null,
     authIndex: null,
-    baseUrl: `${protocolUrls.openai} / ${protocolUrls.anthropic}`,
+    baseUrl: [protocolUrls.openai, protocolUrls.anthropic, protocolUrls.gemini]
+      .filter(Boolean)
+      .join(' / '),
     proxyUrl:
       firstOpenAIEntry?.proxyUrl ??
       raw.codex.find((item) => item.config.proxyUrl)?.config.proxyUrl ??
       raw.claude.find((item) => item.config.proxyUrl)?.config.proxyUrl ??
+      raw.gemini.find((item) => item.config.proxyUrl)?.config.proxyUrl ??
       null,
     prefix:
       raw.openai[0]?.config.prefix ??
       raw.codex[0]?.config.prefix ??
       raw.claude[0]?.config.prefix ??
+      raw.gemini[0]?.config.prefix ??
       null,
     modelCount: uniqueModels.length,
     models: uniqueModels,
@@ -216,18 +276,41 @@ export function apiKeyFunToResource(raw: SponsorProviderRaw): ProviderResource |
       raw.claude.reduce(
         (count, item) => count + stripDisableAllModelsRule(item.config.excludedModels).length,
         0
+      ) +
+      raw.gemini.reduce(
+        (count, item) => count + stripDisableAllModelsRule(item.config.excludedModels).length,
+        0
       ),
-    apiKeyEntryCount: openaiKeyCount + codexKeyCount + raw.claude.length,
+    apiKeyEntryCount: openaiKeyCount + codexKeyCount + raw.claude.length + geminiKeyCount,
     disabled,
     flags: {
-      protocols: [...APIKEY_FUN_PROTOCOLS],
+      protocols: [...options.protocolLabels],
     },
     selector: {
-      brand: 'apikeyFun',
+      brand,
       openaiIndices: raw.openai.map((item) => item.index),
       claudeIndices: raw.claude.map((item) => item.index),
       codexIndices: raw.codex.map((item) => item.index),
+      geminiIndices: raw.gemini.map((item) => item.index),
     } as ProviderResourceSelector,
     raw,
   };
 }
+
+export function apiKeyFunToResource(raw: SponsorProviderRaw): ProviderResource | null {
+  return sponsorRawToResource('apikeyFun', raw, {
+    displayName: APIKEY_FUN_DISPLAY_NAME,
+    protocolLabels: APIKEY_FUN_PROTOCOLS,
+    resolveBaseUrl: resolveApiKeyFunBaseUrl,
+    getProtocolUrls: getApiKeyFunProtocolUrls,
+  });
+}
+
+export function code0ToResource(raw: SponsorProviderRaw): ProviderResource | null {
+  return sponsorRawToResource('code0', raw, {
+    displayName: CODE0_DISPLAY_NAME,
+    protocolLabels: CODE0_PROTOCOL_LABELS,
+    resolveBaseUrl: resolveCode0BaseUrl,
+    getProtocolUrls: getCode0ProtocolUrls,
+  });
+}