Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

fix(usage): clear cached quota when the limit is removed

qianbod51ec6449023
diff --git a/apps/desktop/src/main/usage/__tests__/organizationAccountUsage.test.ts b/apps/desktop/src/main/usage/__tests__/organizationAccountUsage.test.ts
index 34d1e9d9ed..27148015dd 100644
--- a/apps/desktop/src/main/usage/__tests__/organizationAccountUsage.test.ts
+++ b/apps/desktop/src/main/usage/__tests__/organizationAccountUsage.test.ts
@@ -19,7 +19,11 @@ describe('organization account usage', () => {
fetch.mockRejectedValue(new ServerApiError('ERROR', status, 'safe'));
expect(await readOrganizationAccountUsage()).toBeNull();
});
- it.each([{ ...valid, spend: NaN }, { ...valid, currency: 'unknown' }, { ...valid, maxBudget: null }])('does not invent a finite quota for malformed or unlimited data', async data => {
+ it('distinguishes unlimited from an unavailable response', async () => {
+ fetch.mockResolvedValue({ ...valid, maxBudget: null });
+ expect(await readOrganizationAccountUsage()).toBe('unlimited');
+ });
+ it.each([{ ...valid, spend: NaN }, { ...valid, currency: 'unknown' }])('does not invent a finite quota for malformed or unlimited data', async data => {
fetch.mockResolvedValue(data);
expect(await readOrganizationAccountUsage()).toBeNull();
});
diff --git a/apps/desktop/src/main/usage/__tests__/organizationQuotaRefresh.test.ts b/apps/desktop/src/main/usage/__tests__/organizationQuotaRefresh.test.ts
index fe571dc5a6..ff2b14ccb2 100644
--- a/apps/desktop/src/main/usage/__tests__/organizationQuotaRefresh.test.ts
+++ b/apps/desktop/src/main/usage/__tests__/organizationQuotaRefresh.test.ts
@@ -1,11 +1,11 @@
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
const mocks = vi.hoisted(() => ({
auth: { mode: 'cloud', dataOwnerId: 'owner-a', user: { id: 'member-a', membershipKind: 'org' } },
- managed: vi.fn(), outbound: vi.fn(),
+ managed: vi.fn(), outbound: vi.fn(), broadcast: vi.fn(),
}));
vi.mock('electron', () => ({ BrowserWindow: { getAllWindows: () => [] } }));
vi.mock('../../authManager', () => ({ getAuthState: () => mocks.auth }));
-vi.mock('../../device-link/broadcast-tap.js', () => ({ tapWindowBroadcast: vi.fn() }));
+vi.mock('../../device-link/broadcast-tap.js', () => ({ tapWindowBroadcast: mocks.broadcast }));
vi.mock('../../logger', () => ({ createLogger: () => ({ info: vi.fn(), debug: vi.fn() }) }));
vi.mock('../../maker-host/auth-adapters', () => ({ readClaudeApiKey: () => 'fixture-key' }));
vi.mock('../../maker-host/outbound-fetch', () => ({ outboundFetch: mocks.outbound }));
@@ -51,6 +51,16 @@ describe('Cindy AI enterprise quota refresh', () => {
resolve(quota); await pending;
expect(api.readClaudeAccountUsageSnapshot()).toBeNull();
});
+ it('clears and broadcasts an unlimited result after a finite quota was cached', async () => {
+ const api = await import('../claudeAccountUsage');
+ await api.triggerClaudeAccountUsageRefresh(true);
+ expect(api.readClaudeAccountUsageSnapshot()).toEqual(quota);
+ mocks.managed.mockResolvedValue('unlimited');
+ await api.triggerClaudeAccountUsageRefresh(true);
+ expect(api.readClaudeAccountUsageSnapshot()).toBeNull();
+ expect(mocks.broadcast).toHaveBeenLastCalledWith('usage:claude-account-changed', null);
+ expect(mocks.outbound).not.toHaveBeenCalled();
+ });
it('keeps local gateway reads on the original endpoint', async () => {
mocks.auth.mode = 'local';
const api = await import('../claudeAccountUsage');
diff --git a/apps/desktop/src/main/usage/claudeAccountUsage.ts b/apps/desktop/src/main/usage/claudeAccountUsage.ts
index 4c0718286d..07b600c172 100644
--- a/apps/desktop/src/main/usage/claudeAccountUsage.ts
+++ b/apps/desktop/src/main/usage/claudeAccountUsage.ts
@@ -203,7 +203,7 @@ function resolveDailyActivitySpend(activity: LiteLlmDailyActivity): { todaySpend
return { todaySpend: Number.isFinite(totalSpend) ? totalSpend : 0 };
}
-async function fetchOnce(authenticatedUserId?: string): Promise<ClaudeAccountUsageSnapshot | null> {
+async function fetchOnce(authenticatedUserId?: string): Promise<ClaudeAccountUsageSnapshot | 'unlimited' | null> {
// Enterprise AIGateway inference endpoints need not expose LiteLLM management APIs.
// Resolve the signed-in member's tenant in Model Access. Nova/older servers keep
// the existing direct query; authorization/network errors never trigger fallback.
@@ -274,8 +274,15 @@ export async function triggerClaudeAccountUsageRefresh(force = false): Promise<v
lastFetchAt = Date.now();
try {
const next = await fetchOnce(owner.authenticatedUserId);
- if (!next) return;
if (currentQuotaOwner()?.key !== owner.key) return;
+ if (next === 'unlimited') {
+ snapshot = null;
+ snapshotOwnerKey = owner.key;
+ broadcast(null);
+ ensureIdlePoll();
+ return;
+ }
+ if (!next) return;
snapshot = next;
snapshotOwnerKey = owner.key;
broadcast(next);
@@ -310,7 +317,7 @@ export function readClaudeAccountUsageSnapshot(): ClaudeAccountUsageSnapshot | n
return owner && snapshotOwnerKey === owner.key ? snapshot : null;
}
-function broadcast(payload: ClaudeAccountUsageSnapshot): void {
+function broadcast(payload: ClaudeAccountUsageSnapshot | null): void {
for (const win of BrowserWindow.getAllWindows()) {
if (!win.isDestroyed()) {
win.webContents.send(USAGE_CLAUDE_ACCOUNT_CHANGED, payload);
diff --git a/apps/desktop/src/main/usage/organizationAccountUsage.ts b/apps/desktop/src/main/usage/organizationAccountUsage.ts
index 9c482bbf5f..1671d0275d 100644
--- a/apps/desktop/src/main/usage/organizationAccountUsage.ts
+++ b/apps/desktop/src/main/usage/organizationAccountUsage.ts
@@ -3,7 +3,7 @@ import { getClientEndpoint } from '../clientEndpointsService.js';
import type { ClaudeAccountUsageSnapshot } from './claudeAccountUsage.js';
/** undefined means legacy gateway/server; null means unavailable, with no credential fallback. */
-export async function readOrganizationAccountUsage(): Promise<ClaudeAccountUsageSnapshot | null | undefined> {
+export async function readOrganizationAccountUsage(): Promise<ClaudeAccountUsageSnapshot | 'unlimited' | null | undefined> {
try {
const data = await serverApiFetch<unknown>('/api/model-access/quota', {
baseUrl: () => getClientEndpoint('modelAccessApiBaseUrl'),
@@ -13,9 +13,10 @@ export async function readOrganizationAccountUsage(): Promise<ClaudeAccountUsage
if (!data || typeof data !== 'object') return null;
const row = data as Record<string, unknown>;
if (typeof row.spend !== 'number' || !Number.isFinite(row.spend) || row.spend < 0 ||
- typeof row.maxBudget !== 'number' || !Number.isFinite(row.maxBudget) || row.maxBudget <= 0 ||
+ (row.maxBudget !== null && (typeof row.maxBudget !== 'number' || !Number.isFinite(row.maxBudget) || row.maxBudget <= 0)) ||
(row.currency !== 'CNY' && row.currency !== 'USD') ||
(row.budgetResetAt !== null && (typeof row.budgetResetAt !== 'string' || !Number.isFinite(Date.parse(row.budgetResetAt))))) return null;
+ if (row.maxBudget === null) return 'unlimited';
return { spend: row.spend, maxBudget: row.maxBudget, currency: row.currency,
budgetResetAt: row.budgetResetAt, todaySpend: null, fetchedAt: Date.now() };
} catch (error) {
diff --git a/apps/desktop/src/renderer/__tests__/gatewayAccountUsageHooks.test.tsx b/apps/desktop/src/renderer/__tests__/gatewayAccountUsageHooks.test.tsx
index 3632180819..c6c2142726 100644
--- a/apps/desktop/src/renderer/__tests__/gatewayAccountUsageHooks.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/gatewayAccountUsageHooks.test.tsx
@@ -112,3 +112,24 @@ for (const kind of ['quota', 'credit'] as const) {
await waitFor(() => expect(request).toHaveBeenCalledTimes(2));
});
}
+
+
+it('clears the mounted and warm quota cache when the main process reports no limit', async () => {
+ state.owner = 'quota-unlimited';
+ state.membership = 'org';
+ let changed!: Parameters<typeof window.electronAPI.maker.usage.onClaudeAccountChanged>[0];
+ window.electronAPI.maker.usage.onClaudeAccountChanged = (listener) => {
+ changed = listener;
+ return () => {};
+ };
+ state.quota.mockResolvedValue({ spend: 100, maxBudget: 100, currency: 'CNY', todaySpend: null, fetchedAt: 1 });
+ const view = renderHook(() => useClaudeAccountUsageResult(true));
+ await waitFor(() => expect(view.result.current.usage?.maxBudget).toBe(100));
+ state.quota.mockResolvedValue(null);
+ act(() => changed(null));
+ expect(view.result.current.usage).toBeNull();
+ view.unmount();
+ const reopened = renderHook(() => useClaudeAccountUsageResult(true));
+ expect(reopened.result.current.usage).toBeNull();
+ await waitFor(() => expect(reopened.result.current.loading).toBe(false));
+});
diff --git a/apps/desktop/src/renderer/hooks/useClaudeAccountUsage.ts b/apps/desktop/src/renderer/hooks/useClaudeAccountUsage.ts
index 654d1d287b..14b54d0531 100644
--- a/apps/desktop/src/renderer/hooks/useClaudeAccountUsage.ts
+++ b/apps/desktop/src/renderer/hooks/useClaudeAccountUsage.ts
@@ -101,6 +101,11 @@ export function useClaudeAccountUsageResult(enabled: boolean) {
.getAccount('claude-code')
.then((res) => {
if (cancelled) return;
+ if (res === null) {
+ if (lastSnapshot?.ownerKey === ownerKey) lastSnapshot = null;
+ setSnapshot(null);
+ return;
+ }
if (!isSnapshot(res)) return;
lastSnapshot = { ownerKey, cachedAt: Date.now(), usage: res };
setSnapshot(lastSnapshot);
@@ -120,6 +125,11 @@ export function useClaudeAccountUsageResult(enabled: boolean) {
useEffect(() => {
if (!ownerKey) return;
return window.electronAPI.maker.usage.onClaudeAccountChanged((p) => {
+ if (p === null) {
+ if (lastSnapshot?.ownerKey === ownerKey) lastSnapshot = null;
+ setSnapshot(null);
+ return;
+ }
if (!isSnapshot(p)) return;
lastSnapshot = { ownerKey, cachedAt: Date.now(), usage: p };
setSnapshot(lastSnapshot);
diff --git a/apps/desktop/src/renderer/vite-env.d.ts b/apps/desktop/src/renderer/vite-env.d.ts
index ba118c3967..e2e99b8b24 100644
--- a/apps/desktop/src/renderer/vite-env.d.ts
+++ b/apps/desktop/src/renderer/vite-env.d.ts
@@ -6944,7 +6944,7 @@ interface ElectronAPI {
budgetResetAt?: string | null;
todaySpend: number | null;
fetchedAt: number;
- }) => void,
+ } | null) => void,
) => () => void;
onCodexAccountChanged: (
cb: (p: {
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 247be7fad9..c3cf91e1a0 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -1759,3 +1759,7 @@ PC 同源 ghostPermissionItems 声明摘要投影并排除 tool,以请求 loca
才使用原有网关查询。鉴权失败、上游故障或响应无效均显示不可用,不回退或借用其他身份数据。
本接口尚无当日统计,todaySpend 为 null;未设周期上限时不伪造有限配额。
本地手填网关和个人计费路径保持原协议。无新环境变量或数据库变更。
+
+管理员取消周期上限后,主进程明确清空当前 owner 的配额缓存,并通过现有
+`usage:claude-account-changed` 广播 null;renderer 同步清除当前 owner 的快照与热缓存。
+已有未知载荷消费者会忽略 null,新旧有限配额快照字段不变;网络失败仍保留既有缓存策略。