Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): invalidate menu bar cache on quota clear
qianbo4e20ce4b5a02
diff --git a/apps/desktop/src/main/menubar/__tests__/quotaInvalidation.test.ts b/apps/desktop/src/main/menubar/__tests__/quotaInvalidation.test.tsnew file mode 100644index 0000000000..7df1494f65--- /dev/null+++ b/apps/desktop/src/main/menubar/__tests__/quotaInvalidation.test.ts@@ -0,0 +1,83 @@+import { afterEach, beforeEach, expect, it, vi } from 'vitest';+const mocks = vi.hoisted(() => ({+ auth: { mode: 'cloud', dataOwnerId: 'owner', ownerGeneration: 1, user: { id: 'member', membershipKind: 'org' } },+ revision: 0, listeners: new Set<() => void>(), refresh: vi.fn(), collect: vi.fn(),+ quota: null as null | { spend: number; maxBudget: number; currency: string; fetchedAt: number; todaySpend: null },+}));+vi.mock('electron', () => ({ app: {}, Notification: class {} }));+vi.mock('../../agent-island/service.js', () => ({ getAgentIslandService: () => null }));+vi.mock('../../appCapabilities.js', () => ({ getAppCapabilities: () => ({ canUseCindyAccountServices: true }) }));+vi.mock('../../appSessionState.js', () => ({ getActiveAppSession: () => ({ dataOwnerId: 'owner', mode: 'cloud', generation: mocks.auth.ownerGeneration }), isAppSessionBoundaryPending: () => false }));+vi.mock('../../authManager.js', () => ({ getAuthState: () => mocks.auth, onAuthStateChange: () => () => {} }));+vi.mock('../../billing/projection.js', () => ({}));+vi.mock('../../clientEndpointsService.js', () => ({}));+vi.mock('../../deepLink.js', () => ({}));+vi.mock('../../device-link/index.js', () => ({}));+vi.mock('../../device-link/ipc.js', () => ({}));+vi.mock('../../device-link/deviceName.js', () => ({ deviceName: () => 'Fixture' }));+vi.mock('../../i18n.js', () => ({}));+vi.mock('../../localDb/ipc/sessions.js', () => ({}));+vi.mock('../../logger.js', () => ({ createLogger: () => ({ warn: vi.fn(), info: vi.fn() }) }));+vi.mock('../../maker-host/createDesktopProviderService.js', () => ({}));+vi.mock('../../maker-ipc/appDefaultModelControl.js', () => ({}));+vi.mock('../../maker-ipc/register.js', () => ({}));+vi.mock('../../maker-ipc/usage.js', () => ({}));+vi.mock('../../notificationService.js', () => ({}));+vi.mock('../../serverApiClient.js', () => ({}));+vi.mock('../../usage/claudeAccountUsage.js', () => ({ readClaudeQuotaClearRevision: () => mocks.revision, observeClaudeQuotaClears: (listener: () => void) => { mocks.listeners.add(listener); return () => { mocks.listeners.delete(listener); }; }, triggerClaudeAccountUsageRefresh: () => mocks.refresh(), readClaudeAccountUsageSnapshot: () => mocks.quota }));+vi.mock('../../usage/ledgerCurrency.js', () => ({}));+vi.mock('../../usage/usageHistory.js', () => ({}));+vi.mock('../../usageBroadcaster.js', () => ({ observeUsageChanges: () => () => {} }));+vi.mock('../settingsStore.js', () => ({ readMenubarSettings: () => ({ enabled: true }), writeMenubarSettings: (value: unknown) => value }));+vi.mock('../MacMenubarNativeHost.js', () => ({ MacMenubarNativeHost: class { resetFailure() {} prepare() {} suspend() {} stop() {} } }));+vi.mock('../creditSamples.js', () => ({ CreditSampleStore: class { record() { return []; } }, estimateDailyBurn: () => null }));+vi.mock('../collect.js', () => ({ collectMenubarInputs: (...args: unknown[]) => mocks.collect(...args) }));+import { MenubarService } from '../service';+beforeEach(() => {+ vi.useFakeTimers(); mocks.revision = 0; mocks.listeners.clear(); mocks.refresh.mockReset(); mocks.collect.mockReset();+ mocks.quota = { spend: 2, maxBudget: 10, currency: 'CNY', fetchedAt: Date.now(), todaySpend: null };+});+afterEach(() => { vi.clearAllTimers(); vi.useRealTimers(); });+function clearQuota() {+ mocks.quota = null; mocks.revision++;+ for (const listener of mocks.listeners) listener();+}+it.each(['unlimited', 'invalidated'])('evicts cached quota and schedules rebuilding on %s clear', async () => {+ const service = new MenubarService({ openNewTask() {} });+ const schedule = vi.spyOn(service as never, 'scheduleRebuild' as never).mockImplementation(() => undefined);+ service.init();+ expect((await service['readBalance'](false, Date.now()))?.available).toBe(8);+ schedule.mockClear();+ clearQuota();+ expect(schedule).toHaveBeenCalledWith(0);+ expect(await service['readBalance'](false, Date.now())).toBeNull();+ service.stop(); expect(mocks.listeners.size).toBe(0);+});+it('rejects the cache even when the clear happened while the menu bar was stopped', async () => {+ const service = new MenubarService({ openNewTask() {} });+ expect((await service['readBalance'](false, Date.now()))?.available).toBe(8);+ clearQuota();+ expect(await service['readBalance'](false, Date.now())).toBeNull();+});+it('does not restore the captured cache after an in-flight read fails across clear', async () => {+ const service = new MenubarService({ openNewTask() {} });+ await service['readBalance'](false, Date.now());+ let reject!: (error: Error) => void;+ mocks.refresh.mockImplementationOnce(() => new Promise<void>((_, fail) => { reject = fail; }));+ const pending = service['readBalance'](true, Date.now());+ clearQuota(); reject(new Error('unavailable'));+ expect(await pending).toBeNull();+ expect(await service['readBalance'](false, Date.now())).toBeNull();+});+it('does not publish a view collected before clear', async () => {+ const service = new MenubarService({ openNewTask() {} });+ const schedule = vi.spyOn(service as never, 'scheduleRebuild' as never).mockImplementation(() => undefined);+ const publish = vi.spyOn(service as never, 'publish' as never).mockImplementation(() => undefined);+ service.init();+ let resolve!: (value: unknown) => void;+ mocks.collect.mockImplementationOnce(() => new Promise(done => { resolve = done; }));+ const pending = service['collectAndPublish'](Date.now(), false, () => {});+ clearQuota(); resolve({}); await pending;+ expect(publish).not.toHaveBeenCalled(); expect(schedule).toHaveBeenCalledWith(0);+ service.stop();+});diff --git a/apps/desktop/src/main/menubar/service.ts b/apps/desktop/src/main/menubar/service.tsindex 5e043ff77d..865a3fa579 100644--- a/apps/desktop/src/main/menubar/service.ts+++ b/apps/desktop/src/main/menubar/service.ts@@ -58,7 +58,7 @@ import {} from '../maker-ipc/usage.js';import { getDesktopNotificationsEnabled } from '../notificationService.js';import { serverApiFetch } from '../serverApiClient.js';-import { readClaudeAccountUsageSnapshot, triggerClaudeAccountUsageRefresh } from '../usage/claudeAccountUsage.js';+import { observeClaudeQuotaClears, readClaudeQuotaClearRevision, readClaudeAccountUsageSnapshot, triggerClaudeAccountUsageRefresh } from '../usage/claudeAccountUsage.js';import { currentLedgerCurrency } from '../usage/ledgerCurrency.js';import { readUsageHistory, type UsageHistoryPayload } from '../usage/usageHistory.js';import { observeUsageChanges, readCodexAccountUsageSnapshot } from '../usageBroadcaster.js';@@ -137,7 +137,7 @@ interface TimedCache<T> {readAtMs: number;}-class MenubarService {+export class MenubarService {private readonly host: MacMenubarNativeHost;private readonly creditSamples = new CreditSampleStore();private settings: MenubarSettings;@@ -209,6 +209,11 @@ class MenubarService {this.host.prepare();this.disposers.push(observeUsageChanges(() => this.scheduleRebuild()),+ observeClaudeQuotaClears(() => {+ if (!this.balanceAccountKey()?.startsWith('quota:')) return;+ this.balance = null;+ this.scheduleRebuild(0);+ }),authManager.onAuthStateChange((state) => {if (!state.isAuthenticated) this.balance = null;// Usage history belongs to the data owner; token refreshes keep the cache.@@ -315,6 +320,7 @@ class MenubarService {private async collectAndPublish(nowMs: number, force: boolean, markStale: () => void): Promise<void> {const generation = getActiveAppSession().generation;+ const quotaRevision = readClaudeQuotaClearRevision();const collected = await collectMenubarInputs({nowMs,listProviders: () => getDesktopProviderService().listProviders({ allowSideEffects: false }),@@ -340,6 +346,10 @@ class MenubarService {// An owner switch that started during the reads makes them the old owner's data.const after = getActiveAppSession();if (!this.started || isAppSessionBoundaryPending() || after.generation !== generation) return;+ if (readClaudeQuotaClearRevision() !== quotaRevision) {+ this.scheduleRebuild(0);+ return;+ }this.publish(collected, nowMs);}@@ -485,11 +495,11 @@ class MenubarService {*/private balanceAccountKey(): string | null {const auth = authManager.getAuthState();- if (auth.mode === 'local') return auth.dataOwnerId ? `quota:local:${auth.dataOwnerId}` : null;+ if (auth.mode === 'local') return auth.dataOwnerId ? `quota:local:${auth.dataOwnerId}:${auth.ownerGeneration}:${readClaudeQuotaClearRevision()}` : null;if (!getAppCapabilities().canUseCindyAccountServices) return null;const user = auth.user;if (!user) return null;- if (user.membershipKind === 'org') return auth.dataOwnerId ? `quota:cloud:${auth.dataOwnerId}` : null;+ if (user.membershipKind === 'org') return auth.dataOwnerId ? `quota:cloud:${auth.dataOwnerId}:${auth.ownerGeneration}:${readClaudeQuotaClearRevision()}` : null;if (user.membershipKind !== 'personal') return null;return `${user.id}:${CURRENT_CINDY_REGION}`;}@@ -514,6 +524,7 @@ class MenubarService {this.balance = { accountKey, reading, fetchedAtMs: Date.now() };return reading;} catch (error) {+ if (this.balanceAccountKey() !== accountKey) return null;log.warn('menu bar balance read failed', { error: errorMessage(error) });// Keep showing the last known amount; its "updated" time tells the age.return cached?.reading ?? null;diff --git a/apps/desktop/src/main/usage/__tests__/organizationQuotaRefresh.test.ts b/apps/desktop/src/main/usage/__tests__/organizationQuotaRefresh.test.tsindex 5579fc8464..f0bee61427 100644--- a/apps/desktop/src/main/usage/__tests__/organizationQuotaRefresh.test.ts+++ b/apps/desktop/src/main/usage/__tests__/organizationQuotaRefresh.test.ts@@ -74,10 +74,16 @@ describe('Cindy AI enterprise quota refresh', () => {const api = await import('../claudeAccountUsage');await api.triggerClaudeAccountUsageRefresh(true);expect(api.readClaudeAccountUsageSnapshot()).toEqual(quota);+ const cleared = vi.fn();+ const offClear = api.observeClaudeQuotaClears(cleared);+ const revision = api.readClaudeQuotaClearRevision();mocks.managed.mockResolvedValue('unlimited');await api.triggerClaudeAccountUsageRefresh(true);expect(api.readClaudeAccountUsageSnapshot()).toBeNull();expect(api.readClaudeAccountQuotaClear()).toEqual({ quotaState: 'unlimited' });+ expect(cleared).toHaveBeenCalledTimes(1);+ expect(api.readClaudeQuotaClearRevision()).toBe(revision + 1);+ offClear();mocks.managed.mockResolvedValue(null);await api.triggerClaudeAccountUsageRefresh(true);expect(api.readClaudeAccountQuotaClear()).toEqual({ quotaState: 'unlimited' });diff --git a/apps/desktop/src/main/usage/claudeAccountUsage.ts b/apps/desktop/src/main/usage/claudeAccountUsage.tsindex d0daf992b6..f6b49d75be 100644--- a/apps/desktop/src/main/usage/claudeAccountUsage.ts+++ b/apps/desktop/src/main/usage/claudeAccountUsage.ts@@ -333,7 +333,20 @@ export function readClaudeAccountQuotaClear(): ClaudeQuotaClear | null {? { quotaState: clearReason } : null;}+let quotaClearRevision = 0;+const quotaClearListeners = new Set<() => void>();+export function readClaudeQuotaClearRevision(): number { return quotaClearRevision; }+export function observeClaudeQuotaClears(listener: () => void): () => void {+ quotaClearListeners.add(listener);+ return () => { quotaClearListeners.delete(listener); };+}+function broadcast(payload: ClaudeAccountUsageSnapshot | null): void {+ if (payload === null) {+ quotaClearRevision++;+ for (const listener of quotaClearListeners) listener();+ }+for (const win of BrowserWindow.getAllWindows()) {if (!win.isDestroyed()) {win.webContents.send(USAGE_CLAUDE_ACCOUNT_CHANGED, payload);