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(desktop): preserve quota clear and web slot semantics

fmfsaisai317f624e7cd1
diff --git a/apps/desktop/src/renderer/components/settings/__tests__/useDeviceProviderSubscriptionCard.test.ts b/apps/desktop/src/renderer/components/settings/__tests__/useDeviceProviderSubscriptionCard.test.ts
index ec22117258..7a7f4a9c58 100644
--- a/apps/desktop/src/renderer/components/settings/__tests__/useDeviceProviderSubscriptionCard.test.ts
+++ b/apps/desktop/src/renderer/components/settings/__tests__/useDeviceProviderSubscriptionCard.test.ts
@@ -115,7 +115,7 @@ describe('useDeviceProviderSubscriptionCard', () => {
it('reads live remote Codex quota and timestamps the generic account window', async () => {
let finish!: (value: ReturnType<typeof liveQuota>) => void;
invoke.mockImplementation((_device, channel) => channel === 'maker:usage:account'
- ? Promise.resolve({ webSnapshot: { source: 'openai-web', secondary: { usedPercent: 88 } } })
+ ? Promise.resolve({ secondary: { usedPercent: 99 }, webSnapshot: { source: 'openai-web', secondary: { usedPercent: 88 } } })
: new Promise((resolve) => { finish = resolve; }));
const startedAt = Date.now();
const { result } = renderHook(() => ({
@@ -126,6 +126,10 @@ describe('useDeviceProviderSubscriptionCard', () => {
expect(invoke.mock.calls.filter(([, channel]) => channel === 'maker:usage:codex-rate-limits')).toEqual([
['mini', 'maker:usage:codex-rate-limits', ['openai']],
]);
+ await act(async () => {});
+ expect(result.current.models.codex?.web?.secondary?.usedPercent).toBe(88);
+ expect(result.current.models.codex?.buckets).toBeNull();
+ expect(result.current.card).toBeNull();
await act(async () => { finish(liveQuota()); });
expect(remaining(result.current.card)).toEqual([['secondary', 42]]);
expect(result.current.card?.updatedAt).toBeGreaterThanOrEqual(startedAt);
@@ -182,6 +186,12 @@ describe('useDeviceProviderSubscriptionCard', () => {
invoke.mockRejectedValue(new Error('offline'));
await act(async () => { await vi.advanceTimersByTimeAsync(60_000); });
expect(remaining(result.current)).toEqual([['secondary', 26]]);
+ invoke.mockImplementation(async (_device, channel) => {
+ if (channel === 'maker:usage:codex-rate-limits') throw new Error(error);
+ return null; // The host cleared its account after logout, not a transport failure.
+ });
+ await act(async () => { await vi.advanceTimersByTimeAsync(60_000); });
+ expect(result.current).toBeNull();
});
it('rejects unscoped legacy replies for named accounts and keeps devices/accounts separate', async () => {
diff --git a/apps/desktop/src/renderer/hooks/useRemoteDeviceUsage.ts b/apps/desktop/src/renderer/hooks/useRemoteDeviceUsage.ts
index b28e56da8c..ce66bd8bdb 100644
--- a/apps/desktop/src/renderer/hooks/useRemoteDeviceUsage.ts
+++ b/apps/desktop/src/renderer/hooks/useRemoteDeviceUsage.ts
@@ -88,6 +88,8 @@ const codexRateLimitsMirror = createRemoteDeviceUsageMirror<RemoteCodexAccountUs
const fallback = await window.electronAPI.deviceLink.invoke(
deviceId, 'maker:usage:account', providerId === 'openai' ? ['codex'] : ['codex', providerId],
) as (RemoteCodexAccountUsagePayload & { providerId?: string }) | null;
+ // A successful empty account read is authoritative (for example after logout).
+ if (fallback === null) return null;
if (!fallback || !matchesProvider(fallback)) return undefined;
return fallback;
},
@@ -127,9 +129,12 @@ export function useRemoteCodexAccountUsage(
const target = live && isProviderShareAgentDeviceId(deviceId) ? null : deviceId;
const snapshot = codexAccountMirror.useMirror(live && !web ? null : target, providerId);
const realtime = codexRateLimitsMirror.useMirror(live ? target : null, providerId);
- return useMemo(() => live
- ? realtime && web ? { ...realtime, webSnapshot: snapshot?.webSnapshot } : realtime
- : snapshot, [live, web, realtime, snapshot]);
+ return useMemo(() => {
+ if (!live) return snapshot;
+ if (!web) return realtime;
+ if (!realtime && !snapshot?.webSnapshot) return null;
+ return { ...realtime, webSnapshot: snapshot?.webSnapshot };
+ }, [live, web, realtime, snapshot]);
}
export function requestRemoteCodexAccountRefresh(deviceId: string, providerId?: string): void {
diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.md
index 01a64a372b..edac9fc097 100644
--- a/docs/product-rules/provider-sharing.md
+++ b/docs/product-rules/provider-sharing.md
@@ -228,6 +228,7 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):
详情、模型选择器左栏和模型行打开且页面可见时约每 60 秒复查,关闭或隐藏后停止;换账号丢弃旧结果。
详情与左栏取账号通用额度,模型行按模型选择额度桶;ChatGPT 网页额度仍读原有 WHAM 槽。
旧电脑不支持实时通道或读取失败时回退原快照,回退也失败时保留已有数据;「数据更新于」保留数据实际读取的时间。
+ 快照通道成功返回空账号时清除已有额度(例如远端退出账号),不把明确清空当成读取失败。
分享来源仍按 §7.5 的独立授权读取。实现见
[useRemoteDeviceUsage.ts](../../apps/desktop/src/renderer/hooks/useRemoteDeviceUsage.ts),回归见
[useDeviceProviderSubscriptionCard.test.ts](../../apps/desktop/src/renderer/components/settings/__tests__/useDeviceProviderSubscriptionCard.test.ts)。