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): refresh remote Codex subscription quotas

fmfsaisai994073815120
diff --git a/apps/desktop/src/renderer/__tests__/modelSourceDetails.test.tsx b/apps/desktop/src/renderer/__tests__/modelSourceDetails.test.tsx
index b5edadf18c..d35701bed3 100644
--- a/apps/desktop/src/renderer/__tests__/modelSourceDetails.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/modelSourceDetails.test.tsx
@@ -235,7 +235,7 @@ describe('model source second line', () => {
expect(screen.getByText(quotaText('1小时 39%'))).toBeTruthy();
expect(screen.getByText('claude · Pro')).toBeTruthy();
expect(screen.getAllByText('account-a · Plus')).toHaveLength(2);
- expect(reads.remoteCodex).toHaveBeenCalledWith('device-1', 'account-a');
+ expect(reads.remoteCodex).toHaveBeenCalledWith('device-1', 'account-a', { live: true, web: true });
expect(reads.codex.mock.calls.some(([enabled]) => enabled)).toBe(false);
expect(reads.web.mock.calls.some(([, vendor]) => vendor === 'codex')).toBe(false);
expect(reads.claude.mock.calls.some(([enabled]) => enabled)).toBe(false);
diff --git a/apps/desktop/src/renderer/__tests__/providerRailWeeklyQuota.test.tsx b/apps/desktop/src/renderer/__tests__/providerRailWeeklyQuota.test.tsx
index 54b94b4319..941adba931 100644
--- a/apps/desktop/src/renderer/__tests__/providerRailWeeklyQuota.test.tsx
+++ b/apps/desktop/src/renderer/__tests__/providerRailWeeklyQuota.test.tsx
@@ -335,7 +335,7 @@ describe('provider rail weekly remaining bars', () => {
el.getAttribute('data-weekly-remaining'),
),
).toEqual(['75', '30']);
- expect(reads.remoteCodex).toHaveBeenCalledWith('device-1', 'openai');
+ expect(reads.remoteCodex).toHaveBeenCalledWith('device-1', 'openai', { live: true, web: false });
expect(reads.remoteClaude).toHaveBeenCalledWith('device-1', 'anthropic');
expect(reads.remoteXai).toHaveBeenCalledWith('device-1', 'xai');
for (const read of [reads.codex, reads.claude, reads.xai])
diff --git a/apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.ts b/apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.ts
index 576000a401..eb826fdda8 100644
--- a/apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.ts
+++ b/apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.ts
@@ -165,6 +165,7 @@ export function useProviderUsageSnapshots(
const remoteCodex = useRemoteCodexAccountUsage(
source === 'codex' ? remoteDeviceId : null,
provider.id,
+ { live: true, web },
);
const remoteClaude = useRemoteClaudeSubscriptionUsage(
source === 'claude' ? remoteDeviceId : null,
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 fb04f7e150..ec22117258 100644
--- a/apps/desktop/src/renderer/components/settings/__tests__/useDeviceProviderSubscriptionCard.test.ts
+++ b/apps/desktop/src/renderer/components/settings/__tests__/useDeviceProviderSubscriptionCard.test.ts
@@ -5,7 +5,7 @@
* - 指定电脑时经 device-link 读那台的镜像,按那台的供应商 id 读,不借用本机同名账号;
* - 不是订阅类连接(API key 等)两边都不读。
*/
-import { cleanup, renderHook } from '@testing-library/react';
+import { act, cleanup, renderHook } from '@testing-library/react';
import type { ProviderView } from '@cindy/model-providers';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
@@ -34,7 +34,10 @@ vi.mock('@/hooks/useClaudeSubscriptionUsage', () => ({
},
}));
vi.mock('@/hooks/useCodexRateLimits', () => ({ useCodexRateLimits: () => ({ snapshot: null }) }));
-vi.mock('@/hooks/useAccountUsage', () => ({ useAccountUsage: () => null }));
+vi.mock('@/hooks/useAccountUsage', async (importOriginal) => ({
+ ...await importOriginal<typeof import('@/hooks/useAccountUsage')>(),
+ useAccountUsage: () => null,
+}));
vi.mock('@/hooks/useXaiSubscriptionUsage', () => ({
useXaiSubscriptionUsage: () => null,
requestXaiSubscriptionRefresh: vi.fn(),
@@ -48,10 +51,12 @@ vi.mock('@/hooks/useRemoteClaudeSubscriptionUsage', () => ({
vi.mock('@/hooks/useRemoteDeviceUsage', async () => {
const actual = await vi.importActual<typeof import('@/hooks/useRemoteDeviceUsage')>('@/hooks/useRemoteDeviceUsage');
return {
+ ...actual,
selectRemoteCodexAccountUsage: actual.selectRemoteCodexAccountUsage,
- useRemoteCodexAccountUsage: (deviceId: string | null, providerId?: string) => {
+ useRemoteCodexAccountUsage: (...args: Parameters<typeof actual.useRemoteCodexAccountUsage>) => {
+ const [deviceId, providerId] = args;
mocks.remoteCodex.push([deviceId, providerId]);
- return null;
+ return actual.useRemoteCodexAccountUsage(...args);
},
useRemoteXaiSubscriptionUsage: (deviceId: string | null, providerId?: string) => {
mocks.remoteXai.push([deviceId, providerId]);
@@ -61,25 +66,164 @@ vi.mock('@/hooks/useRemoteDeviceUsage', async () => {
});
import { useDeviceProviderSubscriptionCard } from '../useProviderSubscriptionCard';
+import { resetRemoteDeviceUsageMirrorsForTest } from '@/hooks/useRemoteDeviceUsage';
+import { useProviderUsageSnapshots, useProviderWeeklyQuota } from '../../new-chat/useProviderWeeklyQuota';
+import { matchCodexBucketForModel } from '@cindy/maker-shared/codex-usage-buckets';
+import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
function provider(id: string, auth: Record<string, unknown>): ProviderView {
return { id, name: id, source: 'user', connected: true, auth } as unknown as ProviderView;
}
const claude = provider('anthropic-1a2b', { method: 'oauth', native: 'claude' });
const apiKey = provider('openrouter', { method: 'api-key' });
+const codex = provider('openai', { method: 'oauth', native: 'codex' });
+const invoke = vi.fn();
+const liveQuota = (used = 42, providerId?: string) => ({
+ providerId,
+ account: { planType: 'pro' },
+ rateLimits: { limitId: 'promo', secondary: { usedPercent: 1, windowMinutes: 10080 } },
+ rateLimitsByLimitId: {
+ codex: { secondary: { usedPercent: used, windowMinutes: 10080 } },
+ 'gpt-5.4': { limitId: 'gpt-5.4', limitName: 'GPT-5.4', secondary: { usedPercent: 7, windowMinutes: 10080 } },
+ },
+});
beforeEach(() => {
+ vi.useFakeTimers();
+ vi.setSystemTime(new Date('2026-10-27T00:00:00Z'));
+ setDataOwnerGeneration('owner-a');
+ resetRemoteDeviceUsageMirrorsForTest();
+ invoke.mockReset().mockResolvedValue(liveQuota());
+ Object.defineProperty(document, 'visibilityState', { configurable: true, value: 'visible' });
+ Object.assign(window, { electronAPI: { deviceLink: { invoke, onRemotePush: () => () => {} } } });
mocks.localClaude.length = 0;
mocks.remoteClaude.length = 0;
mocks.remoteCodex.length = 0;
mocks.remoteXai.length = 0;
});
-afterEach(() => cleanup());
+afterEach(() => {
+ cleanup();
+ vi.useRealTimers();
+});
const remaining = (card: ReturnType<typeof useDeviceProviderSubscriptionCard>) =>
card?.windows.map((window) => [window.key, window.window.utilization]);
describe('useDeviceProviderSubscriptionCard', () => {
+ // Unit regression: the real card hook used a day-old snapshot because remote reads
+ // never reached app-server. Existing account routing mocks did not exercise IPC.
+ 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 } } })
+ : new Promise((resolve) => { finish = resolve; }));
+ const startedAt = Date.now();
+ const { result } = renderHook(() => ({
+ card: useDeviceProviderSubscriptionCard(codex, 'mini'),
+ rail: useProviderWeeklyQuota(codex, { deviceId: 'mini' }),
+ models: useProviderUsageSnapshots(codex, { deviceId: 'mini' }, { web: true }),
+ }));
+ expect(invoke.mock.calls.filter(([, channel]) => channel === 'maker:usage:codex-rate-limits')).toEqual([
+ ['mini', 'maker:usage:codex-rate-limits', ['openai']],
+ ]);
+ await act(async () => { finish(liveQuota()); });
+ expect(remaining(result.current.card)).toEqual([['secondary', 42]]);
+ expect(result.current.card?.updatedAt).toBeGreaterThanOrEqual(startedAt);
+ expect(result.current.rail?.usedPercent).toBe(42);
+ expect(matchCodexBucketForModel(result.current.models.codex?.buckets, 'gpt-5.4')?.secondary?.usedPercent).toBe(7);
+ expect(result.current.models.codex?.web?.secondary?.usedPercent).toBe(88);
+ });
+
+ it('shares one read per minute and stops when hidden, closed or unmounted', async () => {
+ const { result, rerender, unmount } = renderHook(({ open }) => ({
+ card: useDeviceProviderSubscriptionCard(open ? codex : undefined, 'mini'),
+ second: useDeviceProviderSubscriptionCard(open ? codex : undefined, 'mini'),
+ }), { initialProps: { open: true } });
+ await act(async () => {});
+ invoke.mockResolvedValue(liveQuota(56));
+ await act(async () => { await vi.advanceTimersByTimeAsync(60_000); });
+ expect(invoke).toHaveBeenCalledTimes(2);
+ expect(remaining(result.current.card)).toEqual([['secondary', 56]]);
+ expect(result.current.card?.updatedAt).toBe(Date.now());
+ act(() => {
+ Object.defineProperty(document, 'visibilityState', { configurable: true, value: 'hidden' });
+ document.dispatchEvent(new Event('visibilitychange'));
+ });
+ await act(async () => { await vi.advanceTimersByTimeAsync(120_000); });
+ expect(invoke).toHaveBeenCalledTimes(2);
+ await act(async () => {
+ Object.defineProperty(document, 'visibilityState', { configurable: true, value: 'visible' });
+ document.dispatchEvent(new Event('visibilitychange'));
+ });
+ expect(invoke).toHaveBeenCalledTimes(3);
+ rerender({ open: false });
+ await act(async () => { await vi.advanceTimersByTimeAsync(120_000); });
+ expect(invoke).toHaveBeenCalledTimes(3);
+ expect(result.current.card).toBeNull();
+ rerender({ open: true });
+ await act(async () => {});
+ expect(invoke).toHaveBeenCalledTimes(4);
+ unmount();
+ await act(async () => { await vi.advanceTimersByTimeAsync(120_000); });
+ expect(invoke).toHaveBeenCalledTimes(4);
+ });
+
+ it.each(['[CHANNEL_NOT_ALLOWED]', 'network unavailable'])('falls back to the old snapshot after %s without clearing it on failure', async (error) => {
+ const updatedAt = Date.now() - 86_400_000;
+ invoke.mockImplementation(async (_device, channel) => {
+ if (channel === 'maker:usage:codex-rate-limits') throw new Error(error);
+ return { secondary: { usedPercent: 26, windowMinutes: 10080 }, updatedAt };
+ });
+ const { result } = renderHook(() => useDeviceProviderSubscriptionCard(codex, 'mini'));
+ await act(async () => {});
+ expect(invoke).toHaveBeenLastCalledWith('mini', 'maker:usage:account', ['codex']);
+ expect(remaining(result.current)).toEqual([['secondary', 26]]);
+ expect(result.current?.updatedAt).toBe(updatedAt);
+ invoke.mockRejectedValue(new Error('offline'));
+ await act(async () => { await vi.advanceTimersByTimeAsync(60_000); });
+ expect(remaining(result.current)).toEqual([['secondary', 26]]);
+ });
+
+ it('rejects unscoped legacy replies for named accounts and keeps devices/accounts separate', async () => {
+ const named = provider('openai-secondary', { method: 'oauth', native: 'codex' });
+ invoke.mockImplementation(async (device, channel, [id]) => channel === 'maker:usage:account'
+ ? { secondary: { usedPercent: 99, windowMinutes: 10080 } }
+ : liveQuota(device === 'mini' ? 42 : 61, id === named.id ? undefined : id));
+ const { result } = renderHook(() => ({
+ first: useDeviceProviderSubscriptionCard(codex, 'mini'),
+ other: useDeviceProviderSubscriptionCard(codex, 'other'),
+ named: useDeviceProviderSubscriptionCard(named, 'mini'),
+ }));
+ await act(async () => {});
+ expect(remaining(result.current.first)).toEqual([['secondary', 42]]);
+ expect(remaining(result.current.other)).toEqual([['secondary', 61]]);
+ expect(result.current.named).toBeNull();
+ expect(invoke).toHaveBeenCalledWith('mini', 'maker:usage:codex-rate-limits', [named.id]);
+ invoke.mockResolvedValue(liveQuota(18, named.id));
+ await act(async () => { await vi.advanceTimersByTimeAsync(60_000); });
+ expect(remaining(result.current.named)).toEqual([['secondary', 18]]);
+ expect(remaining(result.current.first)).toEqual([['secondary', 42]]);
+ });
+
+ it('drops old-owner results and never queries sharing devices', async () => {
+ let finish!: (value: ReturnType<typeof liveQuota>) => void;
+ invoke.mockImplementation(() => new Promise((resolve) => { finish = resolve; }));
+ const { result, rerender } = renderHook(({ device }) => useDeviceProviderSubscriptionCard(codex, device), {
+ initialProps: { device: 'mini' },
+ });
+ const oldFinish = finish;
+ setDataOwnerGeneration('owner-b');
+ rerender({ device: 'mini' });
+ await act(async () => { oldFinish(liveQuota(90)); });
+ expect(result.current).toBeNull();
+ await act(async () => { finish(liveQuota(15)); });
+ expect(remaining(result.current)).toEqual([['secondary', 15]]);
+ rerender({ device: 'share:example' });
+ const count = invoke.mock.calls.length;
+ await act(async () => { await vi.advanceTimersByTimeAsync(120_000); });
+ expect(invoke).toHaveBeenCalledTimes(count);
+ expect(result.current).toBeNull();
+ });
it('reads this computer’s account when no device is given', () => {
const { result } = renderHook(() => useDeviceProviderSubscriptionCard(claude, null));
expect(remaining(result.current)).toEqual([['five-hour', 10], ['seven-day', 26]]);
diff --git a/apps/desktop/src/renderer/components/settings/useProviderSubscriptionCard.ts b/apps/desktop/src/renderer/components/settings/useProviderSubscriptionCard.ts
index 5fa679e4b5..b5127cf309 100644
--- a/apps/desktop/src/renderer/components/settings/useProviderSubscriptionCard.ts
+++ b/apps/desktop/src/renderer/components/settings/useProviderSubscriptionCard.ts
@@ -112,7 +112,7 @@ function useRemoteProviderSubscriptionCard(
const { t, i18n } = useTranslation();
const source = provider && deviceId ? providerWeeklyQuotaSource({ ...provider, suspended: false }) : null;
const providerId = provider?.id ?? 'openai';
- const codex = useRemoteCodexAccountUsage(source === 'codex' ? deviceId : null, providerId);
+ const codex = useRemoteCodexAccountUsage(source === 'codex' ? deviceId : null, providerId, { live: true });
const claude = useRemoteClaudeSubscriptionUsage(source === 'claude' ? deviceId : null, providerId);
const xai = useRemoteXaiSubscriptionUsage(source === 'xai' ? deviceId : null, providerId);
const [nowMs, setNowMs] = useState(Date.now);
diff --git a/apps/desktop/src/renderer/hooks/remoteDeviceUsageMirror.ts b/apps/desktop/src/renderer/hooks/remoteDeviceUsageMirror.ts
index aa6455016b..b2f39f3516 100644
--- a/apps/desktop/src/renderer/hooks/remoteDeviceUsageMirror.ts
+++ b/apps/desktop/src/renderer/hooks/remoteDeviceUsageMirror.ts
@@ -22,9 +22,13 @@ export interface RemoteDeviceUsageMirror<T> {
export function createRemoteDeviceUsageMirror<T extends object>(cfg: {
invokeChannel: string | null;
+ /** Optional reader for an existing channel with a legacy fallback. */
+ read?: (deviceId: string, providerId?: string) => Promise<unknown>;
+ /** Only visible, mounted consumers poll; all consumers still share the entry. */
+ refreshIntervalMs?: number;
decodeRead?: (value: unknown) => T | null | undefined;
invokeArgs?: unknown[];
- pushChannel: string;
+ pushChannel: string | null;
defaultProviderId?: string;
providerPushChannel?: string;
}): RemoteDeviceUsageMirror<T> {
@@ -36,6 +40,7 @@ export function createRemoteDeviceUsageMirror<T extends object>(cfg: {
refreshQueued: boolean;
/** Last time a read or push settled this entry; 0 = never. */
settledAt: number;
+ requestedAt: number;
owner: ReturnType<typeof getDataOwnerGeneration>;
listeners: Set<() => void>;
};
@@ -56,6 +61,7 @@ export function createRemoteDeviceUsageMirror<T extends object>(cfg: {
pending: false,
refreshQueued: false,
settledAt: 0,
+ requestedAt: 0,
owner: cacheOwner,
listeners: new Set(),
};
@@ -70,7 +76,7 @@ export function createRemoteDeviceUsageMirror<T extends object>(cfg: {
for (const notify of entry.listeners) notify();
}
function request(deviceId: string, providerId?: string, queueIfPending = false): void {
- if (!cfg.invokeChannel) return;
+ if (!cfg.invokeChannel && !cfg.read) return;
const entry = entryFor(deviceId, providerId);
if (entry.pending) {
if (queueIfPending) entry.refreshQueued = true;
@@ -82,8 +88,11 @@ export function createRemoteDeviceUsageMirror<T extends object>(cfg: {
// Keep the legacy builtin call shape; scoped reads must explicitly name their provider.
if (providerId && providerId !== cfg.defaultProviderId) args.push(providerId);
entry.pending = true;
- void window.electronAPI.deviceLink
- .invoke(deviceId, cfg.invokeChannel, args)
+ entry.requestedAt = Date.now();
+ const reading = cfg.read
+ ? cfg.read(deviceId, providerId ?? cfg.defaultProviderId)
+ : window.electronAPI.deviceLink.invoke(deviceId, cfg.invokeChannel!, args);
+ void reading
.then((value) => {
if (!isDataOwnerGenerationCurrent(entry.owner) || entry.revision !== revision) return;
// Older hosts may ignore new optional arguments. Never accept their builtin snapshot
@@ -132,8 +141,26 @@ export function createRemoteDeviceUsageMirror<T extends object>(cfg: {
entry.settledAt > 0 &&
Date.now() - entry.settledAt < MOUNT_REUSE_MS;
entry.listeners.add(notify);
- if (!settled) request(deviceId, providerId);
- const off = window.electronAPI.deviceLink.onRemotePush((push, ownerStamp) => {
+ const visible = () => document.visibilityState !== 'hidden';
+ if (!settled && (!cfg.refreshIntervalMs || visible())) request(deviceId, providerId);
+ let timer: ReturnType<typeof setInterval> | undefined;
+ const poll = () => {
+ if (!isDataOwnerGenerationCurrent(entry.owner) || !visible()) return;
+ if (Date.now() - entry.requestedAt >= cfg.refreshIntervalMs!) request(deviceId, providerId);
+ };
+ const watchVisibility = () => {
+ clearInterval(timer);
+ timer = undefined;
+ if (visible()) {
+ poll();
+ timer = setInterval(poll, cfg.refreshIntervalMs);
+ }
+ };
+ if (cfg.refreshIntervalMs) {
+ watchVisibility();
+ document.addEventListener('visibilitychange', watchVisibility);
+ }
+ const off = cfg.pushChannel ? window.electronAPI.deviceLink.onRemotePush((push, ownerStamp) => {
if (
push.deviceId !== deviceId ||
!isDataOwnerGenerationCurrent(entry.owner) ||
@@ -157,8 +184,10 @@ export function createRemoteDeviceUsageMirror<T extends object>(cfg: {
if (value !== null && !isSnapshotShape(value)) return;
entry.unsupportedUntil = 0;
apply(entry, value as T | null);
- });
+ }) : () => {};
return () => {
+ clearInterval(timer);
+ if (cfg.refreshIntervalMs) document.removeEventListener('visibilitychange', watchVisibility);
entry.listeners.delete(notify);
off();
};
diff --git a/apps/desktop/src/renderer/hooks/useRemoteDeviceUsage.ts b/apps/desktop/src/renderer/hooks/useRemoteDeviceUsage.ts
index d646a56fb9..b28e56da8c 100644
--- a/apps/desktop/src/renderer/hooks/useRemoteDeviceUsage.ts
+++ b/apps/desktop/src/renderer/hooks/useRemoteDeviceUsage.ts
@@ -1,4 +1,7 @@
-import { useEffect } from 'react';
+import { useEffect, useMemo } from 'react';
+import type { MobileCodexRateLimitsResult } from '@cindy/maker-shared/device-link-contract';
+import { getDataOwnerGeneration, isDataOwnerGenerationCurrent } from '@/contexts/dataOwnerGeneration';
+import { isProviderShareAgentDeviceId } from '../../shared/providerShare';
import { useDeviceLinkReconnectEpoch } from '../features/device-link/useDeviceLinkReconnectEpoch';
import { CLAUDE_QUOTA_STATE_READ, isClaudeQuotaClear } from '../../shared/claudeQuotaState';
/**
@@ -46,6 +49,50 @@ const codexAccountMirror = createRemoteDeviceUsageMirror<RemoteCodexAccountUsage
defaultProviderId: 'openai',
providerPushChannel: 'usage:codex-provider-account-changed',
});
+
+/** Account cards and model lists read app-server directly, just like Mobile. */
+const codexRateLimitsMirror = createRemoteDeviceUsageMirror<RemoteCodexAccountUsagePayload>({
+ invokeChannel: 'maker:usage:codex-rate-limits',
+ pushChannel: null,
+ defaultProviderId: 'openai',
+ refreshIntervalMs: 60_000,
+ async read(deviceId, providerId = 'openai') {
+ const owner = getDataOwnerGeneration();
+ const matchesProvider = (value: { providerId?: string }) =>
+ value.providerId === providerId || (value.providerId === undefined && providerId === 'openai');
+ try {
+ const result = await window.electronAPI.deviceLink.invoke(
+ deviceId, 'maker:usage:codex-rate-limits', [providerId],
+ ) as MobileCodexRateLimitsResult | null;
+ if (result && matchesProvider(result) && result.rateLimits && result.account) {
+ const updatedAt = Date.now();
+ const buckets = result.rateLimitsByLimitId ?? {
+ [result.rateLimits.limitId ?? 'codex']: result.rateLimits,
+ };
+ return {
+ // An empty authoritative table must not revive the compatibility slot.
+ ...(Object.keys(buckets).length ? result.rateLimits : {}),
+ providerId,
+ webSnapshot: null,
+ planType: result.account.planType ?? result.rateLimits.planType,
+ updatedAt,
+ appServerBuckets: Object.fromEntries(Object.entries(buckets).map(([id, bucket]) => [id, {
+ ...bucket, planType: result.account.planType ?? bucket.planType, updatedAt,
+ }])),
+ };
+ }
+ } catch {
+ // Old hosts or temporary read failures retain the previous snapshot below.
+ }
+ if (!isDataOwnerGenerationCurrent(owner)) return undefined;
+ const fallback = await window.electronAPI.deviceLink.invoke(
+ deviceId, 'maker:usage:account', providerId === 'openai' ? ['codex'] : ['codex', providerId],
+ ) as (RemoteCodexAccountUsagePayload & { providerId?: string }) | null;
+ if (!fallback || !matchesProvider(fallback)) return undefined;
+ return fallback;
+ },
+});
+
const claudeAccountMirror = createRemoteDeviceUsageMirror<ClaudeAccountUsageSnapshot>({
invokeChannel: 'maker:usage:account',
invokeArgs: ['claude-code', CLAUDE_QUOTA_STATE_READ],
@@ -73,8 +120,16 @@ const xaiRateLimitMirror = createRemoteDeviceUsageMirror<XaiRateLimitSnapshot>({
export function useRemoteCodexAccountUsage(
deviceId: string | null,
providerId?: string,
+ { live = false, web = false }: { live?: boolean; web?: boolean } = {},
): RemoteCodexAccountUsagePayload | null {
- return codexAccountMirror.useMirror(deviceId, providerId);
+ // The WHAM slot still comes from the existing account reader. Sharing uses a
+ // separate permissioned quota reader; session chips retain their push mirror.
+ 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]);
}
export function requestRemoteCodexAccountRefresh(deviceId: string, providerId?: string): void {
@@ -138,6 +193,7 @@ export function selectRemoteCodexAccountUsage(
/** 供单测重置全部镜像缓存。 */
export function resetRemoteDeviceUsageMirrorsForTest(): void {
codexAccountMirror.resetForTest();
+ codexRateLimitsMirror.resetForTest();
claudeAccountMirror.resetForTest();
xaiSubscriptionMirror.resetForTest();
xaiRateLimitMirror.resetForTest();
diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.md
index 9ace7cc8a0..4e404eec50 100644
--- a/docs/product-rules/provider-groups.md
+++ b/docs/product-rules/provider-groups.md
@@ -680,6 +680,9 @@
本机读本机账号,我的其他电脑经设备互联读那台的账号;别人分享来的电脑不读(分享者的配额不对受邀者开放),
只写「别人分享的电脑不显示配额」;不在线的电脑不去读。展示组件只在展开时读,收起时停止展示读取;
组状态与分配所需的 Claude 订阅额度另按 §5 读取,不依赖这一行是否展开。
+ 同账号远程 Codex 配额与供应商详情、模型列表共用实时读取:展开且页面可见时约每 60 秒复查,收起或隐藏停止;
+ 按电脑与供应商账号隔离,旧端不支持或读取失败时回退原快照,不改变组调度使用的数据源。
+ 实现与兼容规则见[供应商分享 §5.2](provider-sharing.md#52-供应商设置)。
另一台电脑上的组的只读列表同样可以展开。这是剩余配额,不是 §7 的经组运行的用量统计(P3)。
- **状态行不画配额进度条**(2026-10-22 用户裁决,撤掉 2026-10-21 加的那条):收起时那根细条和「已用 40%,该用到 50%」
挤在一行里看不懂,又和展开后的剩余配额重复;要看各账号用到哪就展开这一行。本机的组与另一台电脑上的组的只读列表都一样。
diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.md
index 6824e9a085..01a64a372b 100644
--- a/docs/product-rules/provider-sharing.md
+++ b/docs/product-rules/provider-sharing.md
@@ -224,6 +224,13 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):
2026-10-22(用户裁决):右栏同时只读显示那台电脑上该账号的剩余额度,与本机详情复用同一张额度卡;
仅订阅类连接读到数据时显示,不提供重置或打开用量网页等管理操作,也不受分享的「允许查看剩余额度」开关控制。
供应商组只在成员里分别显示,不在顶层合并或代取某一台的额度。
+ 同账号电脑上的 Codex 额度经已有 `maker:usage:codex-rate-limits` 实时读取,按电脑与供应商账号共享缓存和在途请求。
+ 详情、模型选择器左栏和模型行打开且页面可见时约每 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)。
实现见 [OwnRemoteProviders.tsx](../../apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx),
回归见 [OwnRemoteProviders.test.tsx](../../apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsx)。
- **分享给我的供应商**单独一组「分享给我的供应商」,没有分享时整组不显示:每条用分享者头像标明来自谁,