BuzzbeeSCD/openchamber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(quota): support z.ai credit limits

Browse Source
This commit is contained in:
Bohdan Triapitsyn
2026-08-20 19:09:13 +03:00
parent 108c9f529b
commit 3613127e2d
19 changed files with 162 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/ui/src/components/usage/UsageProviderCards.tsx
+8 -3
View File
@@ -35,6 +35,11 @@ export const UsageProviderCards: React.FC<{
<span className="min-w-0 flex-1 truncate typography-ui-label font-medium text-foreground">
{group.providerName}
</span>
{group.planLabel ? (
<span className="shrink-0 typography-micro capitalize text-muted-foreground">
{group.planLabel}
</span>
) : null}
{group.status && group.rows.length === 0 ? (
<span className="shrink-0 truncate typography-micro text-muted-foreground">{group.status}</span>
) : null}
@@ -54,12 +59,12 @@ export const UsageProviderCards: React.FC<{
);
return (
<div key={row.key} className="flex min-w-0 items-baseline justify-between gap-3">
<span className="inline-flex min-w-0 flex-1 items-baseline gap-1.5">
<span className="truncate typography-ui-label text-muted-foreground">
<span className="flex min-w-0 flex-1 items-baseline gap-1.5">
<span className="shrink-0 truncate typography-ui-label text-muted-foreground">
{row.subtitle ? `${row.subtitle} · ${row.label}` : row.label}
</span>
{resetLabel ? (
<span className="shrink-0 truncate typography-micro text-muted-foreground/70">
<span className="min-w-0 truncate typography-micro text-muted-foreground/70">
{resetLabel}
</span>
) : null}
packages/ui/src/components/usage/usageGroups.ts
+2
View File
@@ -15,6 +15,7 @@ export type UsageLimitRow = {
export type UsageProviderGroup = {
providerId: QuotaProviderId;
providerName: string;
planLabel?: string | null;
rows: UsageLimitRow[];
/** Provider-level message: a fetch error, or "nothing reported". */
status: string | null;
@@ -76,6 +77,7 @@ export const useUsageProviderGroups = (): UsageProviderGroup[] => {
return {
providerId: providerMeta.id,
providerName: providerMeta.name,
planLabel: result.planLabel,
rows,
status,
};
packages/ui/src/lib/i18n/messages/de.ts
+2 -2
View File
@@ -2853,9 +2853,9 @@ export const dict = {
'quota.window.5h': '5-Stunden-Limit',
'quota.window.7d': '7-Tage-Limit',
'quota.window.extraUsage': 'Zusätzliche Nutzung',
'quota.window.weekly': 'Wöchentliches Limit',
'quota.window.weekly': 'Wöchentlich',
'quota.window.daily': 'Täglich',
'quota.window.monthly': 'Monatliches Limit',
'quota.window.monthly': 'Monatlich',
'quota.window.credits': 'Credits',
'quota.window.creditsBalance': 'Kreditguthaben',
'quota.window.monthlyCredits': 'Monatliche Credits',
packages/ui/src/lib/i18n/messages/en.ts
+2 -2
View File
@@ -3031,9 +3031,9 @@ export const dict = {
'quota.window.5h': '5-Hour',
'quota.window.7d': '7-Day Limit',
'quota.window.extraUsage': 'Extra Usage',
'quota.window.weekly': 'Weekly Limit',
'quota.window.weekly': 'Weekly',
'quota.window.daily': 'Daily',
'quota.window.monthly': 'Monthly Limit',
'quota.window.monthly': 'Monthly',
'quota.window.credits': 'Credits',
'quota.window.creditsBalance': 'Credits Balance',
'quota.window.monthlyCredits': 'Monthly Credits',
packages/ui/src/lib/i18n/messages/es.ts
+2 -2
View File
@@ -3032,9 +3032,9 @@ export const dict: Record<I18nKey, string> = {
"quota.window.5h": "5-Hour",
"quota.window.7d": "7-Day Limit",
"quota.window.extraUsage": "Uso adicional",
"quota.window.weekly": "Weekly Limit",
"quota.window.weekly": "Semanal",
"quota.window.daily": "Daily",
"quota.window.monthly": "Monthly Limit",
"quota.window.monthly": "Mensual",
"quota.window.credits": "Credits",
"quota.window.creditsBalance": "Credits Balance",
"quota.window.monthlyCredits": "Créditos mensuales",
packages/ui/src/lib/i18n/messages/fr.ts
+2 -2
View File
@@ -2724,9 +2724,9 @@ export const dict = {
'quota.window.5h': '5 heures',
'quota.window.7d': 'Limite sur 7 jours',
'quota.window.extraUsage': 'Utilisation supplémentaire',
'quota.window.weekly': 'Limite hebdomadaire',
'quota.window.weekly': 'Hebdomadaire',
'quota.window.daily': 'Quotidien',
'quota.window.monthly': 'Limite mensuelle',
'quota.window.monthly': 'Mensuel',
'quota.window.credits': 'Crédits',
'quota.window.creditsBalance': 'Solde de crédits',
'quota.window.monthlyCredits': 'Crédits mensuels',
packages/ui/src/lib/i18n/messages/ja.ts
+2 -2
View File
@@ -3027,9 +3027,9 @@ export const dict: Record<I18nKey, string> = {
'quota.window.5h': '5時間',
'quota.window.7d': '7日間制限',
'quota.window.extraUsage': '追加利用',
'quota.window.weekly': '週間制限',
'quota.window.weekly': '毎週',
'quota.window.daily': '日次',
'quota.window.monthly': '月間制限',
'quota.window.monthly': '毎月',
'quota.window.credits': 'クレジット',
'quota.window.creditsBalance': 'クレジット残高',
'quota.window.monthlyCredits': '月間クレジット',
packages/ui/src/lib/i18n/messages/ko.ts
+2 -2
View File
@@ -3031,9 +3031,9 @@ export const dict: Record<I18nKey, string> = {
'quota.window.5h': '5-Hour',
'quota.window.7d': '7-Day Limit',
'quota.window.extraUsage': '추가 사용량',
'quota.window.weekly': 'Weekly Limit',
'quota.window.weekly': '매주',
'quota.window.daily': 'Daily',
'quota.window.monthly': 'Monthly Limit',
'quota.window.monthly': '매월',
'quota.window.credits': 'Credits',
'quota.window.creditsBalance': 'Credits Balance',
'quota.window.monthlyCredits': '월간 크레딧',
packages/ui/src/lib/i18n/messages/pl.ts
+2 -2
View File
@@ -3048,9 +3048,9 @@ export const dict: Record<I18nKey, string> = {
'quota.window.5h': '5-Hour',
'quota.window.7d': '7-Day Limit',
'quota.window.extraUsage': 'Dodatkowe zużycie',
'quota.window.weekly': 'Weekly Limit',
'quota.window.weekly': 'Tygodniowo',
'quota.window.daily': 'Daily',
'quota.window.monthly': 'Monthly Limit',
'quota.window.monthly': 'Miesięcznie',
'quota.window.credits': 'Credits',
'quota.window.creditsBalance': 'Credits Balance',
'quota.window.monthlyCredits': 'Kredyty miesięczne',
packages/ui/src/lib/i18n/messages/pt-BR.ts
+2 -2
View File
@@ -3032,9 +3032,9 @@ export const dict: Record<I18nKey, string> = {
"quota.window.5h": "5-Hour",
"quota.window.7d": "7-Day Limit",
"quota.window.extraUsage": "Uso adicional",
"quota.window.weekly": "Weekly Limit",
"quota.window.weekly": "Semanal",
"quota.window.daily": "Daily",
"quota.window.monthly": "Monthly Limit",
"quota.window.monthly": "Mensal",
"quota.window.credits": "Credits",
"quota.window.creditsBalance": "Credits Balance",
"quota.window.monthlyCredits": "Créditos mensais",
packages/ui/src/lib/i18n/messages/uk.ts
+2 -2
View File
@@ -3032,9 +3032,9 @@ export const dict: Record<I18nKey, string> = {
"quota.window.5h": "5-Hour",
"quota.window.7d": "7-Day Limit",
"quota.window.extraUsage": "Додаткове використання",
"quota.window.weekly": "Weekly Limit",
"quota.window.weekly": "Щотижня",
"quota.window.daily": "Daily",
"quota.window.monthly": "Monthly Limit",
"quota.window.monthly": "Щомісяця",
"quota.window.credits": "Credits",
"quota.window.creditsBalance": "Credits Balance",
"quota.window.monthlyCredits": "Місячні кредити",
packages/ui/src/lib/i18n/messages/zh-CN.ts
+2 -2
View File
@@ -3032,9 +3032,9 @@ export const dict: Record<I18nKey, string> = {
'quota.window.5h': '5-Hour',
'quota.window.7d': '7-Day Limit',
'quota.window.extraUsage': '额外用量',
'quota.window.weekly': 'Weekly Limit',
'quota.window.weekly': '每周',
'quota.window.daily': 'Daily',
'quota.window.monthly': 'Monthly Limit',
'quota.window.monthly': '每月',
'quota.window.credits': 'Credits',
'quota.window.creditsBalance': 'Credits Balance',
'quota.window.monthlyCredits': '每月积分',
packages/ui/src/lib/i18n/messages/zh-TW.ts
+2 -2
View File
@@ -3031,9 +3031,9 @@ export const dict: Record<I18nKey, string> = {
'quota.window.5h': '5-Hour',
'quota.window.7d': '7-Day Limit',
'quota.window.extraUsage': '額外用量',
'quota.window.weekly': 'Weekly Limit',
'quota.window.weekly': '每週',
'quota.window.daily': 'Daily',
'quota.window.monthly': 'Monthly Limit',
'quota.window.monthly': '每月',
'quota.window.credits': 'Credits',
'quota.window.creditsBalance': 'Credits Balance',
'quota.window.monthlyCredits': '每月點數',
packages/vscode/src/quotaProviders.test.ts
+27
View File
@@ -327,6 +327,33 @@ describe('Z.ai quota provider (VS Code parity)', () => {
assert.equal(windows['MCP Tools']!.windowSeconds, 30 * 24 * 60 * 60);
assert.equal(windows['MCP Tools']!.resetAt, 1787128459979);
});
test('maps CREDIT_LIMIT entries to windows with credit value labels and plan level', async () => {
stubFetchReturning(() => Promise.resolve(mockResponse({
code: 200,
data: {
limits: [
{ type: 'CREDIT_LIMIT', unit: 3, number: 5, usage: 12000, currentValue: 65, remaining: 11934, percentage: 1, nextResetTime: 1787257978907 },
{ type: 'CREDIT_LIMIT', unit: 6, number: 1, usage: 60000, currentValue: 65, remaining: 59934, percentage: 1, nextResetTime: 1787844668997 },
],
level: 'pro',
},
})));
const result = await fetchQuotaForProvider('zai-coding-plan');
const windows = result.usage!.windows;
assert.equal(result.ok, true);
assert.equal(result.planLabel, 'pro');
assert.equal(windows['5h']!.usedPercent, 1);
assert.equal(windows['5h']!.windowSeconds, 5 * 60 * 60);
assert.equal(windows['5h']!.resetAt, 1787257978907);
assert.equal(windows['5h']!.valueLabel, '65 / 12k credits');
assert.equal(windows.weekly!.usedPercent, 1);
assert.equal(windows.weekly!.windowSeconds, 7 * 24 * 60 * 60);
assert.equal(windows.weekly!.resetAt, 1787844668997);
assert.equal(windows.weekly!.valueLabel, '65 / 60k credits');
});
});
describe('NeuralWatt quota provider (VS Code parity)', () => {
packages/vscode/src/quotaProviders.ts
+41 -14
View File
@@ -72,13 +72,31 @@ type ZaiLimit = {
type?: string;
number?: number;
unit?: number;
usage?: number;
currentValue?: number;
remaining?: number;
nextResetTime?: number;
percentage?: number;
};
// CREDIT_LIMIT entries carry `usage` (total credits) and `currentValue` (consumed);
// TOKENS_LIMIT entries only carry a percentage.
const formatZaiCreditAmount = (value: number): string => {
if (value < 1000) return value.toLocaleString('en-US');
return `${Math.round(value / 100) / 10}k`;
};
const formatZaiCreditValueLabel = (limit: ZaiLimit): string | null => {
const used = toNumber(limit.currentValue);
const total = toNumber(limit.usage);
if (used === null || total === null) return null;
return `${formatZaiCreditAmount(used)} / ${formatZaiCreditAmount(total)} credits`;
};
type ZaiPayload = {
data?: {
limits?: ZaiLimit[];
level?: string;
};
};
@@ -411,15 +429,20 @@ const buildResult = (data: {
configured: boolean;
usage?: ProviderUsage | null;
error?: string;
}): ProviderResult => ({
providerId: data.providerId,
providerName: data.providerName,
ok: data.ok,
configured: data.configured,
usage: data.usage ?? null,
...(data.error ? { error: data.error } : {}),
fetchedAt: Date.now(),
});
planLabel?: string | null;
}): ProviderResult => {
const result: ProviderResult = {
providerId: data.providerId,
providerName: data.providerName,
ok: data.ok,
configured: data.configured,
usage: data.usage ?? null,
...(data.error ? { error: data.error } : {}),
fetchedAt: Date.now(),
};
if (data.planLabel) result.planLabel = data.planLabel;
return result;
};
const resolveXaiAuth = (): XaiAuthEntry | null => {
const entry = getProviderAuth('xai');
@@ -1291,7 +1314,7 @@ const buildClaudeRateLimitResult = (): ProviderResult => (
providerName: 'Claude',
ok: false,
configured: true,
error: 'Rate limited by Anthropic. Retrying shortly.',
error: 'Rate limited. Retrying soon.',
})
);
@@ -2059,16 +2082,19 @@ const fetchZaiQuota = async (): Promise<ProviderResult> => {
const payload = await response.json() as ZaiPayload;
const limits = Array.isArray(payload?.data?.limits) ? payload.data.limits : [];
const windows: Record<string, UsageWindow> = {};
for (const tokensLimit of limits.filter((limit) => limit?.type === 'TOKENS_LIMIT')) {
const windowSeconds = resolveWindowSeconds(tokensLimit as Record<string, unknown>);
// The API renamed TOKENS_LIMIT to CREDIT_LIMIT; field semantics stayed the same,
// so both limit types map to the same windows.
for (const limit of limits.filter((entry) => entry?.type === 'TOKENS_LIMIT' || entry?.type === 'CREDIT_LIMIT')) {
const windowSeconds = resolveWindowSeconds(limit as Record<string, unknown>);
const windowLabel = resolveWindowLabel(windowSeconds);
const resetAt = tokensLimit.nextResetTime ? normalizeTimestamp(tokensLimit.nextResetTime) : null;
const usedPercent = typeof tokensLimit.percentage === 'number' ? tokensLimit.percentage : null;
const resetAt = limit.nextResetTime ? normalizeTimestamp(limit.nextResetTime) : null;
const usedPercent = typeof limit.percentage === 'number' ? limit.percentage : null;
windows[windowLabel] = toUsageWindow({
usedPercent,
windowSeconds,
resetAt,
valueLabel: formatZaiCreditValueLabel(limit),
});
}
@@ -2087,6 +2113,7 @@ const fetchZaiQuota = async (): Promise<ProviderResult> => {
ok: true,
configured: true,
usage: { windows },
planLabel: payload?.data?.level || null,
});
} catch (error) {
return buildResult({
packages/web/server/lib/quota/DOCUMENTATION.md
+1 -1
View File
@@ -101,4 +101,4 @@ The provider computes `usedPercent` from whichever of `used`/`remaining` is pres
- Keep provider IDs stable; clients use them directly.
- Avoid adding alias-based dispatch in `fetchQuotaForProvider`; dispatch currently expects exact provider IDs.
- Keep Google behavior changes isolated and review `providers/google/*` together.
- Z.ai Coding Plan exposes separate 5-hour and weekly `TOKENS_LIMIT` entries plus a monthly `TIME_LIMIT` for MCP tools; web and VS Code must preserve all three windows.
- Z.ai Coding Plan exposes separate 5-hour and weekly token/credit limit entries plus a monthly `TIME_LIMIT` for MCP tools. The API renamed the limit type from `TOKENS_LIMIT` to `CREDIT_LIMIT` (same `unit`/`number` window semantics); `CREDIT_LIMIT` entries additionally carry `usage` (total), `currentValue` (consumed), and `remaining`, surfaced as a credit `valueLabel`, and the payload's `data.level` becomes `planLabel`. Web and VS Code must preserve these windows and stay in sync.
packages/web/server/lib/quota/providers/claude/index.js
+2 -2
View File
@@ -81,7 +81,7 @@ const fetchQuotaUncoalesced = async () => {
if (Date.now() < cooldownUntil) {
return cachedResultFor(fingerprint, credential.planLabel)
?? failure('Rate limited by Anthropic. Retrying shortly.');
?? failure('Rate limited. Retrying soon.');
}
let response;
@@ -100,7 +100,7 @@ const fetchQuotaUncoalesced = async () => {
if (response.status === 429) {
cooldownUntil = Date.now() + cooldownFromHeader(response);
return cachedResultFor(fingerprint, credential.planLabel)
?? failure('Rate limited by Anthropic. Retrying shortly.');
?? failure('Rate limited. Retrying soon.');
}
if (response.status === 401 || response.status === 403) {
packages/web/server/lib/quota/providers/zai.js
+26 -6
View File
@@ -4,6 +4,7 @@ import {
normalizeAuthEntry,
buildResult,
toUsageWindow,
toNumber,
resolveWindowSeconds,
resolveWindowLabel,
normalizeTimestamp
@@ -13,6 +14,20 @@ export const providerId = 'zai-coding-plan';
export const providerName = 'z.ai';
const aliases = ['zai-coding-plan', 'zai', 'z.ai'];
// CREDIT_LIMIT entries carry `usage` (total credits), `currentValue` (consumed),
// and `remaining`; TOKENS_LIMIT entries only carry a percentage.
const formatCreditAmount = (value) => {
if (value < 1000) return value.toLocaleString('en-US');
return `${Math.round(value / 100) / 10}k`;
};
const formatCreditValueLabel = (limit) => {
const used = toNumber(limit?.currentValue);
const total = toNumber(limit?.usage);
if (used === null || total === null) return null;
return `${formatCreditAmount(used)} / ${formatCreditAmount(total)} credits`;
};
export const isConfigured = () => {
const auth = readAuthFile();
const entry = normalizeAuthEntry(getAuthEntry(auth, aliases));
@@ -56,16 +71,20 @@ export const fetchQuota = async () => {
const payload = await response.json();
const limits = Array.isArray(payload?.data?.limits) ? payload.data.limits : [];
const windows = {};
for (const tokensLimit of limits.filter((limit) => limit?.type === 'TOKENS_LIMIT')) {
const windowSeconds = resolveWindowSeconds(tokensLimit);
// The API renamed TOKENS_LIMIT to CREDIT_LIMIT; field semantics stayed the same,
// so both limit types map to the same windows.
for (const limit of limits.filter((entry) => entry?.type === 'TOKENS_LIMIT' || entry?.type === 'CREDIT_LIMIT')) {
const windowSeconds = resolveWindowSeconds(limit);
const windowLabel = resolveWindowLabel(windowSeconds);
const resetAt = tokensLimit?.nextResetTime ? normalizeTimestamp(tokensLimit.nextResetTime) : null;
const usedPercent = typeof tokensLimit?.percentage === 'number' ? tokensLimit.percentage : null;
const resetAt = limit?.nextResetTime ? normalizeTimestamp(limit.nextResetTime) : null;
const usedPercent = typeof limit?.percentage === 'number' ? limit.percentage : null;
const creditValueLabel = formatCreditValueLabel(limit);
windows[windowLabel] = toUsageWindow({
usedPercent,
windowSeconds,
resetAt
resetAt,
valueLabel: creditValueLabel
});
}
@@ -83,7 +102,8 @@ export const fetchQuota = async () => {
providerName,
ok: true,
configured: true,
usage: { windows }
usage: { windows },
planLabel: typeof payload?.data?.level === 'string' && payload.data.level ? payload.data.level : null
});
} catch (error) {
return buildResult({
packages/web/server/lib/quota/providers/zai.test.js
+33
View File
@@ -51,4 +51,37 @@ describe('Z.ai quota provider', () => {
resetAt: 1787128459979,
});
});
it('maps CREDIT_LIMIT entries to windows with credit value labels and plan level', async () => {
vi.stubGlobal('fetch', vi.fn().mockResolvedValue(mockResponse({
code: 200,
data: {
limits: [
{ type: 'CREDIT_LIMIT', unit: 3, number: 5, usage: 12000, currentValue: 65, remaining: 11934, percentage: 1, nextResetTime: 1787257978907 },
{ type: 'CREDIT_LIMIT', unit: 6, number: 1, usage: 60000, currentValue: 65, remaining: 59934, percentage: 1, nextResetTime: 1787844668997 },
],
level: 'pro',
},
})));
const result = await fetchQuota();
const windows = result.usage.windows;
expect(result.ok).toBe(true);
expect(result.planLabel).toBe('pro');
expect(windows['5h']).toMatchObject({
usedPercent: 1,
remainingPercent: 99,
windowSeconds: 5 * 60 * 60,
resetAt: 1787257978907,
valueLabel: '65 / 12k credits',
});
expect(windows.weekly).toMatchObject({
usedPercent: 1,
remainingPercent: 99,
windowSeconds: 7 * 24 * 60 * 60,
resetAt: 1787844668997,
valueLabel: '65 / 60k credits',
});
});
});