Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(model-picker): 按任务所在电脑读取远程供应商余量
Dashabfc7ae013a9
diff --git a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupUsage.test.tsx b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupUsage.test.tsxindex e24bc7e557..6d4625ba3c 100644--- a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupUsage.test.tsx+++ b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupUsage.test.tsx@@ -215,6 +215,33 @@ afterEach(() => {});describe('模型列表里供应商组那一项的用量', () => {+ it('远控任务的普通供应商读任务所在电脑,浏览其它电脑后仍保持归属', async () => {+ render(+ <ModelSelectorContent+ modelId="opus"+ effort="high"+ onModelChange={vi.fn()}+ onEffortChange={vi.fn()}+ currentProviderId="d-solo"+ onProviderChange={vi.fn()}+ vendorKey="cc"+ remoteAgent={{+ devices: [devices[0]!],+ selectedDeviceId: null,+ selfDeviceId: 'desk',+ homeDeviceId: 'device-d',+ }}+ />,+ );+ const solo = railButton('D Solo · solo@x');+ expect(remaining(solo)).toBe('40');+ expect(solo.getAttribute('aria-description')).toBe('周限 · 剩余 40%');+ await act(async () => {+ fireEvent.click(railButton(GROUP));+ });+ expect(remaining(railButton('D Solo · solo@x'))).toBe('40');+ });+it('任务正经组在另一台运行:读那台的账号并写明在哪台', () => {renderTask({ deviceId: 'device-d', providerId: 'd-open' }, true);const group = railButton(GROUP);diff --git a/apps/desktop/src/renderer/__tests__/providerRailWeeklyQuota.test.tsx b/apps/desktop/src/renderer/__tests__/providerRailWeeklyQuota.test.tsxindex f494827ed2..cbe2f8020a 100644--- a/apps/desktop/src/renderer/__tests__/providerRailWeeklyQuota.test.tsx+++ b/apps/desktop/src/renderer/__tests__/providerRailWeeklyQuota.test.tsx@@ -335,4 +335,71 @@ describe('provider rail weekly remaining bars', () => {expect(reads.codex).not.toHaveBeenCalled();expect(reads.remoteCodex).not.toHaveBeenCalled();});++ it.each(['openai', 'anthropic', 'xai', 'account-b'])(+ 'keeps %s quotas with the task host while browsing another device and switching hosts',+ (id) => {+ const usedOn = (deviceId: string | null) =>+ deviceId === 'host' ? 25 : deviceId === 'other' ? 80 : 10;+ const claude = (used: number) => ({ sevenDay: { utilization: used } });+ const xai = (used: number) => ({+ creditUsagePercent: used,+ updatedAt: Date.now(),+ resetsAt: Date.now() / 1000 + 3600,+ });+ reads.codex.mockImplementation((enabled) => ({ snapshot: enabled ? snapshot(10) : null }));+ reads.claude.mockImplementation((enabled) => (enabled ? claude(10) : null));+ reads.xai.mockImplementation((enabled) => (enabled ? xai(10) : null));+ reads.remoteCodex.mockImplementation((deviceId) =>+ deviceId ? { secondary: { usedPercent: usedOn(deviceId), windowMinutes: 10080 } } : null,+ );+ reads.remoteClaude.mockImplementation((deviceId) =>+ deviceId ? claude(usedOn(deviceId)) : null,+ );+ reads.remoteXai.mockImplementation((deviceId) => (deviceId ? xai(usedOn(deviceId)) : null));+ const providers = [+ provider(+ id,+ id === 'account-b' ? { source: 'user', auth: { method: 'oauth', native: 'codex' } } : {},+ ),+ ];+ const props = {+ items: [+ { kind: 'provider' as const, providerId: id },+ { kind: 'remote-provider' as const, deviceId: 'other', providerId: id },+ ],+ active: { kind: 'remote-provider' as const, deviceId: 'other', providerId: id },+ providers,+ providerLabel: () => 'Browsing other',+ providerUsage: { deviceId: 'other' },+ onSelect: vi.fn(),+ remoteSources: {+ localProviders: providers,+ localUsageDeviceId: 'host' as string | null,+ localProviderLabel: () => 'Task host',+ providersOf: () => providers,+ labelOf: () => 'Other device',+ },+ };+ const { rerender } = render(<UnifiedModelRail {...props} />);+ const remaining = (name: string) =>+ screen+ .getByRole('button', { name })+ .querySelector('[data-weekly-remaining]')+ ?.getAttribute('data-weekly-remaining');+ expect(remaining('Task host')).toBe('75');+ expect(remaining('Other device')).toBe('20');+ for (const read of [reads.codex, reads.claude, reads.xai])+ expect(read.mock.calls.some(([enabled]) => enabled)).toBe(false);++ rerender(+ <UnifiedModelRail+ {...props}+ remoteSources={{ ...props.remoteSources, localUsageDeviceId: null }}+ />,+ );+ expect(remaining('Task host')).toBe('90');+ expect(remaining('Other device')).toBe('20');+ },+ );});diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsxindex 1a9cce55c7..9cc51530a3 100644--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx@@ -3560,6 +3560,7 @@ function ModelSelectorContentView({remoteSources: {localRailItems: remoteAgentLocalRailItems,localProviders: homeProviders,+ localUsageDeviceId: homeDeviceId ?? null,localProviderLabel: remoteAgentLocalLabel,groups: remoteAgentGroups,labelOf: remoteAgentLabelOf,diff --git a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsxindex 935c7c3446..244a55d6c4 100644--- a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx+++ b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx@@ -282,17 +282,19 @@ export interface UnifiedModelPanelProps {panelElement: HTMLElement | null;overlayClassName?: string;/**- * 远程 Agent(仅新任务草稿):左侧栏在本机供应商之后列出其他电脑上的供应商。选中那台- * 电脑上的模型 = Agent 在那台电脑运行,任务和文件仍在本机。+ * 远程 Agent:左侧栏在任务所在电脑的供应商之后列出其他电脑上的供应商。选中那台+ * 电脑上的模型 = Agent 在那台电脑运行,任务和文件仍在原电脑。** 面板只管栏位与选中态;列表数据(`providers` / `deviceId` 及各谓词)由调用方随* `active` 切到那台电脑的目录 —— 所以 `ready` 为 false 的那几帧列表显示加载态,* 绝不拿上一份目录按同名供应商筛出一份「看起来像远程」的列表。*/remoteSources?: {- /** 本机格(★ / 全部 / 本机供应商)的栏位,按**本机**目录派生。 */+ /** 普通格(★ / 全部 / 任务所在电脑的供应商),按任务所在电脑的目录派生。 */localRailItems: readonly UnifiedRailItem[];localProviders: readonly ProviderView[];+ /** 任务所在电脑的用量归属;null / 缺省 = 控制端本机。与正在浏览的目录无关。 */+ localUsageDeviceId?: string | null;localProviderLabel: (providerId: string) => string;/** 每台电脑一段:有可用模型的供应商(按那台的目录顺序)。 */groups: readonly {@@ -1294,6 +1296,7 @@ export function UnifiedModelPanel({? {remoteSources: {localProviders: remoteSources.localProviders,+ localUsageDeviceId: remoteSources.localUsageDeviceId,localProviderLabel: remoteSources.localProviderLabel,providersOf: (deviceId: string) =>remoteSources.groups.find((group) => group.deviceId === deviceId)?.providers ?? [],diff --git a/apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx b/apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsxindex 3f8bead5a3..3c4649eff8 100644--- a/apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx+++ b/apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx@@ -55,11 +55,13 @@ export function UnifiedModelRail({/** 供应商组那一格的用量读谁(provider-groups.md §10);缺省 = 都按格所在目录读。 */providerGroupUsage?: ProviderGroupUsageOf;/**- * 远程供应商格的数据(只有可选远程 Agent 的新任务草稿传)。传了它,本机供应商格的- * 图标 / 名字 / 用量一律按本机读 —— 面板此刻可能正列着某台电脑的目录。+ * 可选远程 Agent 的供应商格。localProviders 属于任务所在电脑,远控时未必是控制端本机;+ * 图标 / 名字 / 用量都跟随该电脑,不随面板正在浏览的目录切换。*/remoteSources?: {localProviders: readonly ProviderView[];+ /** localProviders 所在电脑;null / 缺省 = 控制端本机。 */+ localUsageDeviceId?: string | null;localProviderLabel: (providerId: string) => string;providersOf: (deviceId: string) => readonly ProviderView[];labelOf: (deviceId: string, providerId: string) => string;@@ -93,12 +95,12 @@ export function UnifiedModelRail({item.kind === 'provider' || item.kind === 'remote-provider'? railProviders.find((entry) => entry.id === item.providerId): undefined;- // 用量跟随该格目录的归属:远程格读那台电脑的镜像,本机格在远程 Agent 模式下恒读本机。+ // 普通格读任务所在电脑,远程格读指定电脑;两者都不借用当前浏览目录的归属。const usageDeviceId =item.kind === 'remote-provider'? item.deviceId: remoteSources- ? null+ ? (remoteSources.localUsageDeviceId ?? null): (providerUsage?.deviceId ?? null);// 供应商组那一格代表组里的几台电脑:任务正经组在某台运行时读那台的账号(与输入框下方的用量// 一致),还没分到电脑时不显示某一台的配额;悬停多写一句说明是哪台。