Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(desktop): show own remote provider subscription quota
fmfsaisaie6abaa9a7584
diff --git a/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx b/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsxindex 053722df22..4352af6c90 100644--- a/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx+++ b/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx@@ -3,7 +3,7 @@* 打开了「允许被远程调用」且已连接的供应商——也就是模型列表里能选的那些远程供应商。** 与本机供应商同在左栏,图标右上角带远程角标(与模型列表同一个 RemoteSourceMark);点开在- * 右栏查看所在电脑与开放模型;自己的供应商组可从这里进入「远程与分享」管理。供应商凭证仍在原电脑配置。+ * 右栏查看所在电脑、剩余额度与开放模型;自己的供应商组可从这里进入「远程与分享」管理。供应商凭证仍在原电脑配置。** 供应商组(provider-groups.md §10):另一台电脑把某个供应商建成了组时,组里的电脑与分享不再单独* 列出,组所在电脑那一项标成供应商组,详情列出组内电脑与状态,并提供同账号管理入口。规则与模型列表同一份。@@ -17,6 +17,7 @@ import { remoteInvocationModels } from '@cindy/model-providers';import { hasProviderLogo, ProviderLogoMark } from '@/components/icons/ProviderLogoMark';import { RemoteSourceMark } from '@/components/icons/RemoteSourceMark';import { remoteAgentProviders } from '@/components/new-chat/unifiedModelSelection';+import { QuotaHoverCard } from '@/components/status/QuotaHoverCard';import { Tip } from '@/components/ui/tooltip';import { RemoteProviderGroupMembers } from '@/features/provider-group/RemoteProviderGroupMembers';import { ProviderShareEntryButton } from '@/features/provider-share/ProviderShareEntryButton';@@ -31,6 +32,7 @@ import { PROVIDER_SHARE_AGENT_DEVICE_PREFIX } from '../../../shared/providerSharimport { providerGroupDeviceCount, type ProviderGroupConfig } from '../../../shared/providerGroup';import { ReadOnlyProviderModelSection, readOnlyProviderModels } from './ReadOnlyProviderModels';+import { useDeviceProviderSubscriptionCard } from './useProviderSubscriptionCard';export interface OwnRemoteProvider {/** 左栏选中态的键。 */@@ -270,6 +272,8 @@ export function OwnRemoteProviderDetail({ entry, pendingShareRequests = 0, onMan</p></div>+ {!entry.group && <OwnRemoteProviderQuota key={entry.key} entry={entry} />}+{entry.group && (<RemoteProviderGroupMembers deviceId={entry.deviceId} providerId={entry.provider.id} config={entry.group} />)}@@ -283,3 +287,18 @@ export function OwnRemoteProviderDetail({ entry, pendingShareRequests = 0, onMan</div>);}++/** 只随当前详情读取那台电脑的订阅额度;组的额度保留在各成员里,不取组所在电脑代替。 */+function OwnRemoteProviderQuota({ entry }: { entry: OwnRemoteProvider }) {+ const account = useDeviceProviderSubscriptionCard(entry.provider, entry.deviceId);+ if (!account?.windows.length) return null;+ return (+ <div+ data-testid="provider-usage-module"+ className="shrink-0 border-t px-1 py-2"+ style={{ borderColor: 'var(--settings-theme-card-border)' }}+ >+ <QuotaHoverCard variant="embedded" account={account} />+ </div>+ );+}diff --git a/apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsx b/apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsxindex 430bc5930c..3ed976b9a4 100644--- a/apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsx+++ b/apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsx@@ -30,6 +30,27 @@ vi.mock('@/hooks/useDevicesProviders', () => ({},}));+const usage = vi.hoisted(() => ({+ localClaude: vi.fn(),+ remoteClaude: vi.fn(),+}));+vi.mock('@/hooks/useClaudeSubscriptionUsage', () => ({ useClaudeSubscriptionUsage: usage.localClaude }));+vi.mock('@/hooks/useRemoteClaudeSubscriptionUsage', () => ({ useRemoteClaudeSubscriptionUsage: usage.remoteClaude }));+vi.mock('@/hooks/useCodexRateLimits', () => ({ useCodexRateLimits: () => ({ snapshot: null }) }));+vi.mock('@/hooks/useAccountUsage', () => ({ useAccountUsage: () => null }));+vi.mock('@/hooks/useXaiSubscriptionUsage', () => ({+ useXaiSubscriptionUsage: () => null,+ requestXaiSubscriptionRefresh: vi.fn(),+}));+vi.mock('@/hooks/useRemoteDeviceUsage', () => ({+ useRemoteCodexAccountUsage: () => null,+ useRemoteXaiSubscriptionUsage: () => null,+ selectRemoteCodexAccountUsage: () => null,+}));+vi.mock('@/features/provider-group/RemoteProviderGroupMembers', () => ({+ RemoteProviderGroupMembers: () => <div>Group members</div>,+}));+function provider(id: string, overrides: Record<string, unknown> = {}) {return {id,@@ -38,6 +59,7 @@ function provider(id: string, overrides: Record<string, unknown> = {}) {connected: true,remoteInvocationEnabled: true,routing: {},+ auth: { method: 'api-key' },models: { 'claude-code': [{ id: 'opus', name: 'Opus 5.5' }, { id: 'hidden', name: 'Hidden' }] },...overrides,};@@ -47,6 +69,14 @@ beforeEach(() => {devices.value = [];catalogs.value = new Map();requestedIds.length = 0;+ usage.localClaude.mockReset().mockImplementation((enabled: boolean) => enabled ? {+ fiveHour: { utilization: 10, resetsAt: null },+ updatedAt: Date.now(),+ } : null);+ usage.remoteClaude.mockReset().mockImplementation((deviceId: string | null) => deviceId === 'mini-a' ? {+ fiveHour: { utilization: 37, resetsAt: null },+ updatedAt: Date.now(),+ } : null);});afterEach(() => cleanup());@@ -179,4 +209,51 @@ describe('OwnRemoteProviderRows / OwnRemoteProviderDetail', () => {expect(Array.from(list.querySelectorAll('li')).map((item) => item.textContent)).toEqual(['Opus 5.5']);expect(screen.queryByRole('switch')).toBeNull();});++ // 测试价值:通过真实详情、订阅 hook 与额度卡验证 provider-sharing.md §5.2 的只读远程额度。+ // 现有测试只覆盖模型列表,hook 测试不能发现详情漏接额度;最小输入是一台电脑上的 OAuth 连接。+ // tier: unit,隔离底层用量读取,不依赖网络;切换到无快照的电脑还应移除上一台的额度。+ // 单独运行本文件:3.62s 墙钟(Vitest 2.43s,2026-10-22)。+ it('shows the selected computer’s subscription quota without management actions and clears it on switching', () => {+ const subscription = {+ ...entry,+ provider: { ...entry.provider, auth: { method: 'oauth' as const, native: 'claude' as const } },+ };+ const { rerender } = render(<OwnRemoteProviderDetail entry={subscription} />);+ expect(screen.getByRole('progressbar').getAttribute('aria-valuetext')).toBe('quotaCard.remainingPercent:{"percent":63}');+ expect(usage.remoteClaude).toHaveBeenCalledWith('mini-a', 'anthropic');+ expect(usage.localClaude.mock.calls.every(([enabled]) => !enabled)).toBe(true);+ expect(screen.queryByRole('button')).toBeNull();+ expect(screen.queryByRole('link')).toBeNull();++ rerender(<OwnRemoteProviderDetail entry={{ ...subscription, key: ownRemoteProviderKey('mini-b', 'anthropic'), deviceId: 'mini-b' }} />);+ expect(screen.queryByRole('progressbar')).toBeNull();+ expect(screen.queryByTestId('provider-usage-module')).toBeNull();+ expect(usage.remoteClaude).toHaveBeenLastCalledWith('mini-b', 'anthropic');+ });++ it.each(['api-key', 'group'] as const)('does not read or show a top-level subscription quota for %s', (kind) => {+ render(<OwnRemoteProviderDetail entry={kind === 'api-key' ? entry : {+ ...entry,+ provider: { ...entry.provider, auth: { method: 'oauth', native: 'claude' } },+ group: {+ strategy: 'least', autoSwitch: true,+ members: [{ key: 'local', kind: 'local', agentDeviceId: null, providerId: 'anthropic', limit: 4, weight: 1, paused: false }],+ },+ }} />);+ expect(screen.queryByRole('progressbar')).toBeNull();+ expect(screen.queryByTestId('provider-usage-module')).toBeNull();+ expect(usage.remoteClaude.mock.calls.every(([deviceId]) => deviceId === null)).toBe(true);+ if (kind === 'group') expect(screen.getByText('Group members')).toBeTruthy();+ });++ it('does not show an empty quota card when the remote account has no usage windows', () => {+ usage.remoteClaude.mockReturnValue({ subscriptionType: 'max', updatedAt: Date.now() });+ render(<OwnRemoteProviderDetail entry={{+ ...entry,+ provider: { ...entry.provider, auth: { method: 'oauth', native: 'claude' } },+ }} />);+ expect(screen.queryByTestId('provider-usage-module')).toBeNull();+ expect(screen.queryByText('quotaCard.noWindows')).toBeNull();+ });});diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.mdindex 076b4e4a56..9b7ef7c6a1 100644--- a/docs/product-rules/provider-sharing.md+++ b/docs/product-rules/provider-sharing.md@@ -211,6 +211,11 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):列表同一个远程角标,行式与本机供应商相同,所在电脑只写在悬停提示里;点开在右栏只读地看所在电脑、状态与开放的模型,修改要到那台电脑上去。只列在线、允许远程控制的同账号电脑上已开「允许被远程调用」且已连接的供应商,与模型列表能选的范围一致。+ 2026-10-22(用户裁决):右栏同时只读显示那台电脑上该账号的剩余额度,与本机详情复用同一张额度卡;+ 仅订阅类连接读到数据时显示,不提供重置或打开用量网页等管理操作,也不受分享的「允许查看剩余额度」开关控制。+ 供应商组只在成员里分别显示,不在顶层合并或代取某一台的额度。+ 实现见 [OwnRemoteProviders.tsx](../../apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx),+ 回归见 [OwnRemoteProviders.test.tsx](../../apps/desktop/src/renderer/components/settings/__tests__/OwnRemoteProviders.test.tsx)。- **分享给我的供应商**单独一组「分享给我的供应商」,没有分享时整组不显示:每条用分享者头像标明来自谁,带状态点;点开在右栏看来源、状态、对方开放的模型(只读,开关由分享者决定),并可「退出」。来源只写「来自 Magi 的分享」,不写分享者的电脑名;分享者建了供应商组时补「供应商组 · N 台电脑」。