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): refresh remote quota after peer recovery

qianbo9008f30b733d
diff --git a/apps/desktop/src/renderer/__tests__/useRemoteDeviceUsage.test.ts b/apps/desktop/src/renderer/__tests__/useRemoteDeviceUsage.test.ts
index 0534cbddf5..85001d73b8 100644
--- a/apps/desktop/src/renderer/__tests__/useRemoteDeviceUsage.test.ts
+++ b/apps/desktop/src/renderer/__tests__/useRemoteDeviceUsage.test.ts
@@ -36,6 +36,7 @@ type PushListener = (
const mocks = vi.hoisted(() => ({
invoke: vi.fn<(deviceId: string, channel: string, args: unknown[]) => Promise<unknown>>(),
pushListeners: [] as PushListener[],
+ presenceListeners: [] as Array<(value: { deviceId: string; online: boolean }) => void>,
}));
function emitPush(push: { deviceId: string; channel: string; payload: unknown }): void {
@@ -57,11 +58,17 @@ beforeEach(() => {
resetRemoteClaudeSessionRouteCacheForTest();
mocks.invoke.mockReset();
mocks.pushListeners.length = 0;
+ mocks.presenceListeners.length = 0;
Object.defineProperty(window, 'electronAPI', {
configurable: true,
value: {
deviceLink: {
invoke: mocks.invoke,
+ onPresenceChanged: (listener: (value: { deviceId: string; online: boolean }) => void) => {
+ mocks.presenceListeners.push(listener);
+ return () => { mocks.presenceListeners = mocks.presenceListeners.filter(item => item !== listener); };
+ },
+ onStatusChanged: () => () => {},
onRemotePush: (cb: PushListener) => {
mocks.pushListeners.push(cb);
return () => {
@@ -376,3 +383,32 @@ it('retains remote quota on unavailable reads but replays a missed unlimited cle
await flushMicrotasks();
expect(cleared.result.current).toBeNull();
});
+
+it('rereads only the recovered quota peer while consumers remain mounted', async () => {
+ const quota = { spend: 12, maxBudget: 100, currency: 'CNY', todaySpend: null, fetchedAt: 1 };
+ mocks.invoke.mockResolvedValue(quota);
+ const a = renderHook(() => useRemoteClaudeAccountUsage('peer-a'));
+ const b = renderHook(() => useRemoteClaudeAccountUsage('peer-b'));
+ await flushMicrotasks();
+ mocks.invoke.mockClear();
+ mocks.invoke.mockResolvedValue({ quotaState: 'unlimited' });
+ act(() => mocks.presenceListeners.forEach(cb => cb({ deviceId: 'peer-a', online: false })));
+ act(() => mocks.presenceListeners.forEach(cb => cb({ deviceId: 'peer-a', online: true })));
+ await flushMicrotasks();
+ expect(mocks.invoke).toHaveBeenCalledTimes(1);
+ expect(mocks.invoke.mock.calls[0]?.[0]).toBe('peer-a');
+ expect(a.result.current).toBeNull();
+ expect(b.result.current).toEqual(quota);
+});
+
+it('queues a recovery read when a previous quota request is still in flight', async () => {
+ let finish!: (value: unknown) => void;
+ mocks.invoke.mockImplementationOnce(() => new Promise(resolve => { finish = resolve; }));
+ mocks.invoke.mockResolvedValue({ quotaState: 'unlimited' });
+ const a = renderHook(() => useRemoteClaudeAccountUsage('peer-pending'));
+ act(() => mocks.presenceListeners.forEach(cb => cb({ deviceId: 'peer-pending', online: true })));
+ await act(async () => finish(null));
+ await flushMicrotasks();
+ expect(mocks.invoke).toHaveBeenCalledTimes(2);
+ expect(a.result.current).toBeNull();
+});
diff --git a/apps/desktop/src/renderer/hooks/remoteDeviceUsageMirror.ts b/apps/desktop/src/renderer/hooks/remoteDeviceUsageMirror.ts
index 62011cb4e0..aa6455016b 100644
--- a/apps/desktop/src/renderer/hooks/remoteDeviceUsageMirror.ts
+++ b/apps/desktop/src/renderer/hooks/remoteDeviceUsageMirror.ts
@@ -16,7 +16,7 @@ function isSnapshotShape(value: unknown): value is Record<string, unknown> {
export interface RemoteDeviceUsageMirror<T> {
useMirror(deviceId: string | null, providerId?: string): T | null;
- request(deviceId: string, providerId?: string): void;
+ request(deviceId: string, providerId?: string, queueIfPending?: boolean): void;
resetForTest(): void;
}
@@ -33,6 +33,7 @@ export function createRemoteDeviceUsageMirror<T extends object>(cfg: {
revision: number;
unsupportedUntil: number;
pending: boolean;
+ refreshQueued: boolean;
/** Last time a read or push settled this entry; 0 = never. */
settledAt: number;
owner: ReturnType<typeof getDataOwnerGeneration>;
@@ -53,6 +54,7 @@ export function createRemoteDeviceUsageMirror<T extends object>(cfg: {
revision: 0,
unsupportedUntil: 0,
pending: false,
+ refreshQueued: false,
settledAt: 0,
owner: cacheOwner,
listeners: new Set(),
@@ -67,10 +69,14 @@ export function createRemoteDeviceUsageMirror<T extends object>(cfg: {
entry.settledAt = Date.now();
for (const notify of entry.listeners) notify();
}
- function request(deviceId: string, providerId?: string): void {
+ function request(deviceId: string, providerId?: string, queueIfPending = false): void {
if (!cfg.invokeChannel) return;
const entry = entryFor(deviceId, providerId);
- if (entry.pending || Date.now() < entry.unsupportedUntil) return;
+ if (entry.pending) {
+ if (queueIfPending) entry.refreshQueued = true;
+ return;
+ }
+ if (Date.now() < entry.unsupportedUntil) return;
const revision = entry.revision;
const args = [...(cfg.invokeArgs ?? [])];
// Keep the legacy builtin call shape; scoped reads must explicitly name their provider.
@@ -105,6 +111,10 @@ export function createRemoteDeviceUsageMirror<T extends object>(cfg: {
})
.finally(() => {
entry.pending = false;
+ if (entry.refreshQueued) {
+ entry.refreshQueued = false;
+ if (isDataOwnerGenerationCurrent(entry.owner) && entry.listeners.size > 0) request(deviceId, providerId);
+ }
});
}
function useMirror(deviceId: string | null, providerId?: string): T | null {
diff --git a/apps/desktop/src/renderer/hooks/useRemoteDeviceUsage.ts b/apps/desktop/src/renderer/hooks/useRemoteDeviceUsage.ts
index 986fe09a29..d646a56fb9 100644
--- a/apps/desktop/src/renderer/hooks/useRemoteDeviceUsage.ts
+++ b/apps/desktop/src/renderer/hooks/useRemoteDeviceUsage.ts
@@ -1,3 +1,5 @@
+import { useEffect } from 'react';
+import { useDeviceLinkReconnectEpoch } from '../features/device-link/useDeviceLinkReconnectEpoch';
import { CLAUDE_QUOTA_STATE_READ, isClaudeQuotaClear } from '../../shared/claudeQuotaState';
/**
* useRemoteDeviceUsage — device-link 远程会话各计费形态的被控端用量镜像集。
@@ -83,7 +85,12 @@ export function requestRemoteCodexAccountRefresh(deviceId: string, providerId?:
export function useRemoteClaudeAccountUsage(
deviceId: string | null,
): ClaudeAccountUsageSnapshot | null {
- return claudeAccountMirror.useMirror(deviceId);
+ const epoch = useDeviceLinkReconnectEpoch(deviceId ?? undefined);
+ const usage = claudeAccountMirror.useMirror(deviceId);
+ useEffect(() => {
+ if (deviceId && epoch > 0) claudeAccountMirror.request(deviceId, undefined, true);
+ }, [deviceId, epoch]);
+ return usage;
}
/** 被控端 xAI 订阅周用量镜像(远程 xai 形态会话 chip 用)。 */