Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
feat(provider-group): 组那一项的用量跟着实际运行的那台,远程与分享页补上自己的用量
Lizi7c4ba33e02df
diff --git a/apps/desktop/src/main/device-link/providerShareRuntime.ts b/apps/desktop/src/main/device-link/providerShareRuntime.tsindex 9909504f3d..25bd29569a 100644--- a/apps/desktop/src/main/device-link/providerShareRuntime.ts+++ b/apps/desktop/src/main/device-link/providerShareRuntime.ts@@ -25,6 +25,8 @@ import {type ProviderShareMoney,type ProviderShareOwnerState,type ProviderShareUsageRange,+ type ProviderOwnUsageView,+ type ProviderPartyUsageView,} from '../../shared/providerShare.js';import { getDeviceId } from '../authManager.js';import { t } from '../i18n.js';@@ -36,7 +38,12 @@ import { currentLedgerCurrency } from '../usage/ledgerCurrency.js';import { getGatewayModelPricing, getModelPriceQuote } from '../usage/modelPricing.js';import { computePriceQuoteTurnMoney, normalizeModelIdForPricing } from '../usage/turnCostCalculator.js';import { throwIpcError } from '../utils/ipcValidate.js';-import { providerShareActiveControllers, revokeProviderShareControllers, setProviderShareAccess } from './dispatch.js';+import {+ getControllerDisplayName,+ providerShareActiveControllers,+ revokeProviderShareControllers,+ setProviderShareAccess,+} from './dispatch.js';import { getDeviceLinkInvokeContext } from './invoke-context.js';import { fetchIdentityCard, providerShareApi, providerShareLinkFor, sha256Hex } from './providerShareApi.js';import {@@ -64,7 +71,8 @@ import {stopProviderShareHost,} from './providerShareHost.js';import { getProviderShareUsageStore } from './providerShareUsageStore.js';-import { readDeviceLinkSettings } from './settings-store.js';+import { readDeviceLinkSettings, readLastKnownDeviceNames } from './settings-store.js';+import { currentProviderPartyUsageStore, type ProviderPartyUsage } from '../usage/providerPartyUsageStore.js';const log = createLogger('provider-share');@@ -202,15 +210,19 @@ function text(value: unknown, field: string, max = 256): string {return value.trim();}+function usageRange(range: unknown): ProviderShareUsageRange {+ if (range !== '7d' && range !== 'month' && range !== 'all') throwIpcError('INVALID_PARAMS', 'Invalid range');+ return range;+}+function parseCommand(raw: unknown): ProviderShareCommand {if (!raw || typeof raw !== 'object' || Array.isArray(raw)) throwIpcError('INVALID_PARAMS', 'Invalid command');const value = raw as Record<string, unknown>;switch (value.action) {- case 'owned': {- const range = value.range;- if (range !== '7d' && range !== 'month' && range !== 'all') throwIpcError('INVALID_PARAMS', 'Invalid range');- return { action: 'owned', range };- }+ case 'owned':+ return { action: 'owned', range: usageRange(value.range) };+ case 'own-usage':+ return { action: 'own-usage', providerId: text(value.providerId, 'providerId'), range: usageRange(value.range) };case 'create-link':return { action: 'create-link', providerId: text(value.providerId, 'providerId') };case 'approve':@@ -291,6 +303,35 @@ async function ownerState(range: ProviderShareUsageRange): Promise<ProviderShare};}+/** 这个供应商按使用方的用量:本机与同账号的其他电脑(provider-groups.md §7)。只读本机账本,不经分享服务。 */+async function ownUsage(providerId: string, range: ProviderShareUsageRange): Promise<ProviderOwnUsageView> {+ const { local, devices } = currentProviderPartyUsageStore().query(providerId, range);+ const lastKnownNames = readLastKnownDeviceNames();+ const view = async (party: ProviderPartyUsage): Promise<ProviderPartyUsageView> => ({+ deviceId: party.deviceId,+ deviceName: party.deviceId+ ? (getControllerDisplayName(party.deviceId) ?? lastKnownNames[party.deviceId] ?? null)+ : null,+ lastUsedAt: party.lastUsedAt,+ models: await Promise.all(party.models.map(async (model) => ({+ kind: model.kind,+ providerId,+ model: model.model,+ turns: model.turns,+ inputTokens: model.inputTokens,+ outputTokens: model.outputTokens,+ cacheReadTokens: model.cacheReadTokens,+ cacheCreateTokens: model.cacheCreateTokens,+ amount: await estimate({ ...model, providerId }),+ }))),+ });+ return {+ providerId,+ local: local ? await view(local) : null,+ devices: await Promise.all(devices.map(view)),+ };+}+async function createLink(providerId: string): Promise<ProviderShareLinkCreated> {requireRunning();// 逐级开启:允许远程控制 → 允许被远程调用 → 分享。@@ -323,6 +364,8 @@ async function execute(command: ProviderShareCommand): Promise<unknown> {case 'owned':if (running) markProviderShareHostActive(60_000);return ownerState(command.range);+ case 'own-usage':+ return ownUsage(command.providerId, command.range);case 'create-link':return createLink(command.providerId);case 'approve':diff --git a/apps/desktop/src/main/maker-ipc/__tests__/sessionProviderPartyUsage.test.ts b/apps/desktop/src/main/maker-ipc/__tests__/sessionProviderPartyUsage.test.tsnew file mode 100644index 0000000000..790bb1c236--- /dev/null+++ b/apps/desktop/src/main/maker-ipc/__tests__/sessionProviderPartyUsage.test.ts@@ -0,0 +1,54 @@+import type { AgentEvent, Session } from '@cindy/maker-core';+import { describe, expect, it, vi } from 'vitest';++import { localUsageProviderOf, recordSessionProviderPartyUsage } from '../sessionProviderPartyUsage';++function session(overrides: Partial<Record<'id' | 'agentKind' | 'agentDeviceId' | 'remoteHostId' | 'model', unknown>> = {}): Session {+ return { id: 's1', agentKind: 'codex', agentDeviceId: null, remoteHostId: null, model: 'gpt-5.5', ...overrides } as unknown as Session;+}++const done = (usage: Record<string, number>): AgentEvent => ({ type: 'done', data: { usage } }) as unknown as AgentEvent;++describe('localUsageProviderOf', () => {+ it('records a task in a group built here under the group, wherever the Agent ran', () => {+ const binding = { providerId: 'anthropic', memberKey: 'device:studio:anthropic-2', at: 1 };+ expect(localUsageProviderOf({ binding, agentDeviceId: 'studio', remoteHostId: null, providerId: 'anthropic-2' })).toBe('anthropic');+ });++ it('records other tasks only when the Agent ran on this computer', () => {+ expect(localUsageProviderOf({ binding: null, agentDeviceId: null, remoteHostId: null, providerId: 'openai' })).toBe('openai');+ expect(localUsageProviderOf({ binding: null, agentDeviceId: 'studio', remoteHostId: null, providerId: 'openai' })).toBeNull();+ // 另一台电脑上的组:Agent 在那台运行时由那台记;分到本机运行时记在本机用的供应商上。+ const remote = { providerId: 'anthropic', memberKey: 'local', groupDeviceId: 'mini', at: 1 };+ expect(localUsageProviderOf({ binding: remote, agentDeviceId: 'mini', remoteHostId: null, providerId: 'anthropic' })).toBeNull();+ expect(localUsageProviderOf({ binding: remote, agentDeviceId: null, remoteHostId: null, providerId: 'anthropic-9' })).toBe('anthropic-9');+ expect(localUsageProviderOf({ binding: null, agentDeviceId: null, remoteHostId: 'ssh-1', providerId: 'openai' })).toBeNull();+ expect(localUsageProviderOf({ binding: null, agentDeviceId: null, remoteHostId: null, providerId: null })).toBeNull();+ });+});++describe('recordSessionProviderPartyUsage', () => {+ it('records one round per done event with its tokens', () => {+ const record = vi.fn();+ const deps = { providerOf: () => 'openai', bindingOf: () => null, record };+ const target = session();+ recordSessionProviderPartyUsage(deps, target, { type: 'text', data: {} } as unknown as AgentEvent);+ recordSessionProviderPartyUsage(deps, target, done({ promptTokens: 120, completionTokens: 30 }));+ expect(record).toHaveBeenCalledTimes(1);+ expect(record).toHaveBeenCalledWith({+ kind: 'codex',+ providerId: 'openai',+ samples: [expect.objectContaining({ model: 'gpt-5.5', turns: 1, inputTokens: 120, outputTokens: 30 })],+ });+ });++ it('skips rounds whose Agent ran on another computer', () => {+ const record = vi.fn();+ recordSessionProviderPartyUsage(+ { providerOf: () => 'openai', bindingOf: () => null, record },+ session({ agentDeviceId: 'studio' }),+ done({ promptTokens: 1, completionTokens: 1 }),+ );+ expect(record).not.toHaveBeenCalled();+ });+});diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 94edbeacfc..83750b19b1 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -36,6 +36,8 @@ import {writeProviderGroupBinding,} from '../provider-group/bindings.js';import { getProviderGroupGuestSwitch } from '../provider-group/guestSwitch.js';+import { currentProviderPartyUsageStore } from '../usage/providerPartyUsageStore.js';+import { recordSessionProviderPartyUsage } from './sessionProviderPartyUsage.js';import { createProviderGroupLeaseReporter, type ProviderGroupLeaseReporter } from '../provider-group/leaseReporter.js';import {getProviderGroupDirectory,@@ -5440,6 +5442,21 @@ export function wireSessionToIpc(session: ReturnType<Maker['getSession']>): voidsessionEventDependencies.onPluginTaskTerminal?.(...args);},});+ // 「远程与分享」页按使用方的用量:本机自己的任务记在当前账号的账本里,换了账号之后的迟到事件不记。+ Object.defineProperty(ownerEventDependencies, 'recordProviderPartyUsage', {+ value: (target: Session, event: AgentEvent) => {+ if (!ownerDb || getCurrentDbClientSnapshot() !== ownerDb) return;+ try {+ recordSessionProviderPartyUsage({+ providerOf: getSessionProvider,+ bindingOf: readProviderGroupBinding,+ record: (usage) => currentProviderPartyUsageStore().record({ kind: 'local' }, usage),+ }, target, event);+ } catch (error) {+ log.warn('record provider party usage failed', { sessionId: target.id, error: String(error) });+ }+ },+ });registration.disposers.push(session.onEvent(emitWiredSessionEvent));registration.disposers.push(session.onRuntimeRecovery(emitWiredSessionEvent));sessionBindings.attachStatusListener(registration);diff --git a/apps/desktop/src/main/maker-ipc/sessionEventPipeline.ts b/apps/desktop/src/main/maker-ipc/sessionEventPipeline.tsindex a4206424b9..55850d47f5 100644--- a/apps/desktop/src/main/maker-ipc/sessionEventPipeline.ts+++ b/apps/desktop/src/main/maker-ipc/sessionEventPipeline.ts@@ -32,7 +32,10 @@ export type SessionEventDependencies = PrepareSessionEventDeps &FinishSessionTerminalEventDeps &RecordSessionClaudeTurnUsageDeps &RecordSessionCodexTurnUsageDeps &- RecordSessionPiTurnUsageDeps;+ RecordSessionPiTurnUsageDeps & {+ /** 按供应商记「本机」用量(远程与分享页的按使用方用量)。不提供 = 不记。 */+ readonly recordProviderPartyUsage?: (session: Session, event: AgentEvent) => void;+ };/** Synchronous delivery boundary. Accepted asynchronous writes retain their original turn. */export function handleSessionEvent(@@ -69,4 +72,5 @@ export function handleSessionEvent();recordSessionCodexTurnUsage(deps, session, event, terminal.turnAssistantPersistId);recordSessionPiTurnUsage(deps, session, event, terminal.turnAssistantPersistId);+ deps.recordProviderPartyUsage?.(session, event);}diff --git a/apps/desktop/src/main/maker-ipc/sessionProviderPartyUsage.ts b/apps/desktop/src/main/maker-ipc/sessionProviderPartyUsage.tsnew file mode 100644index 0000000000..ad90d11358--- /dev/null+++ b/apps/desktop/src/main/maker-ipc/sessionProviderPartyUsage.ts@@ -0,0 +1,55 @@+/**+ * 本机任务按供应商记「本机」用量(provider-groups.md §7;账本见 usage/providerPartyUsageStore):+ * - 任务归本机建的供应商组:记在组那个供应商上,Agent 在组里哪台电脑运行都算;+ * - 否则只在 Agent 就在本机运行时,记在任务用的供应商上。Agent 在别的电脑运行(远程 Agent、别的电脑上+ * 的组)或 SSH 远程工作区的任务不记,那一份由运行它的电脑记在「我的其他电脑」下。+ * 每个任务实例一个计量器(Claude 的累计值跟着 SDK 进程走),与受邀者用量同一套算法。+ */+import type { AgentEvent, Session } from '@cindy/maker-core';++import type { ProviderGroupBinding } from '../provider-group/bindings.js';+import { createGuestUsageMeter, type GuestUsageSample } from '../remote-agent/host/guestUsage.js';++export interface SessionProviderPartyUsageDeps {+ /** 任务现在用的供应商;跟随默认路由时为 null。 */+ providerOf(sessionId: string): string | null;+ bindingOf(sessionId: string): ProviderGroupBinding | null;+ record(usage: { kind: string; providerId: string; samples: GuestUsageSample[] }): void;+}++/** 这一轮记在本机的哪个供应商上;不记返回 null。 */+export function localUsageProviderOf(input: {+ binding: ProviderGroupBinding | null;+ agentDeviceId: string | null;+ remoteHostId: string | null;+ providerId: string | null;+}): string | null {+ if (input.remoteHostId) return null;+ if (input.binding && !input.binding.groupDeviceId) return input.binding.providerId;+ return input.agentDeviceId ? null : input.providerId;+}++const meters = new WeakMap<Session, ReturnType<typeof createGuestUsageMeter>>();++export function recordSessionProviderPartyUsage(+ deps: SessionProviderPartyUsageDeps,+ session: Session,+ event: AgentEvent,+): void {+ if (event.type !== 'done') return;+ let meter = meters.get(session);+ if (!meter) {+ meter = createGuestUsageMeter(session.agentKind);+ meters.set(session, meter);+ }+ // 每一轮都喂给计量器,不记的轮次也要更新 Claude 的累计基线。+ const samples = meter.observe(event, session.model);+ if (samples.length === 0) return;+ const providerId = localUsageProviderOf({+ binding: deps.bindingOf(session.id),+ agentDeviceId: session.agentDeviceId,+ remoteHostId: session.remoteHostId,+ providerId: deps.providerOf(session.id),+ });+ if (providerId) deps.record({ kind: session.agentKind, providerId, samples });+}diff --git a/apps/desktop/src/main/remote-agent/__tests__/guestHost.test.ts b/apps/desktop/src/main/remote-agent/__tests__/guestHost.test.tsindex 2b934ecfe3..0c174aa461 100644--- a/apps/desktop/src/main/remote-agent/__tests__/guestHost.test.ts+++ b/apps/desktop/src/main/remote-agent/__tests__/guestHost.test.ts@@ -50,6 +50,9 @@ function makeHost(purge?: (ids: readonly string[], nativeIds: readonly string[]) => Promise<void>;events?: AgentEvent[];recordGuestUsage?: Parameters<typeof createRemoteAgentHost>[0]['recordGuestUsage'];+ recordOwnerUsage?: Parameters<typeof createRemoteAgentHost>[0]['recordOwnerUsage'];+ /** 任务开始时的账号是否仍是当前账号(缺省一直是)。 */+ ownerCurrent?: () => boolean;providerAccess?: boolean;/** false = 不接受受邀者出站登记(旧接线);缺省给一个记录调用的实现。 */bindGuestProviderRoute?: false | Parameters<typeof createRemoteAgentHost>[0]['bindGuestProviderRoute'];@@ -111,9 +114,10 @@ function makeHost(}),...(options.purge ? { purgeHostedTranscripts: options.purge } : {}),...(options.recordGuestUsage ? { recordGuestUsage: options.recordGuestUsage } : {}),+ ...(options.recordOwnerUsage ? { recordOwnerUsage: options.recordOwnerUsage } : {}),...(bindGuestProviderRoute ? { bindGuestProviderRoute } : {}),captureOwner: () => 'owner',- isOwnerCurrent: () => true,+ isOwnerCurrent: () => options.ownerCurrent?.() ?? true,runsRoot,});}@@ -510,14 +514,15 @@ describe('guest provider access and usage', () => {host.dispose();});- it('meters guest turns with the resolved provider and leaves same-account runs unmetered', async () => {+ it('meters guest turns into the guest ledger and same-account turns into the owner ledger', async () => {const done = {type: 'done',data: { modelUsageCumulativeStartsAtZero: true, modelUsage: { 'claude-opus': { inputTokens: 12, outputTokens: 3, costUSD: 0.02 } } },} as unknown as AgentEvent;const recordGuestUsage = vi.fn();+ const recordOwnerUsage = vi.fn();const started: Started[] = [];- const host = makeHost(started, { events: [done], recordGuestUsage });+ const host = makeHost(started, { events: [done], recordGuestUsage, recordOwnerUsage });await host.handle(GUEST, { op: 'open', runId: RUN_1, agentKind: 'claude-code', payload: { json: openPayload('task-1') } });await host.handle(OWNER, { op: 'open', runId: RUN_2, agentKind: 'claude-code', payload: { json: openPayload('task-2') } });// open 只登记任务,启动与事件泵在后台继续;Windows 全量分片繁忙时不能用 waitFor 的@@ -532,16 +537,36 @@ describe('guest provider access and usage', () => {expect(events).toContain('"t":"event","event":{"type":"done"');}}, { timeout: 10_000 });- expect(recordGuestUsage).toHaveBeenCalledTimes(1);- expect(recordGuestUsage).toHaveBeenCalledWith(GUEST, {+ const usage = {kind: 'claude-code',providerId: 'shared-provider',samples: [{ model: 'claude-opus', turns: 1, inputTokens: 12, outputTokens: 3, cacheReadTokens: 0, cacheCreateTokens: 0, sdkCostUsd: 0.02 }],- });+ };+ expect(recordGuestUsage).toHaveBeenCalledTimes(1);+ expect(recordGuestUsage).toHaveBeenCalledWith(GUEST, usage);+ expect(recordOwnerUsage).toHaveBeenCalledTimes(1);+ expect(recordOwnerUsage).toHaveBeenCalledWith(OWNER, usage);expect(host.activeControllers().sort()).toEqual([GUEST, OWNER].sort());host.dispose();});+ it('does not record a late turn after the account changed', async () => {+ const done = {+ type: 'done',+ data: { modelUsageCumulativeStartsAtZero: true, modelUsage: { 'claude-opus': { inputTokens: 12, outputTokens: 3, costUSD: 0.02 } } },+ } as unknown as AgentEvent;+ const recordOwnerUsage = vi.fn();+ const started: Started[] = [];+ const host = makeHost(started, { events: [done], recordOwnerUsage, ownerCurrent: () => false });+ await host.handle(OWNER, { op: 'open', runId: RUN_2, agentKind: 'claude-code', payload: { json: openPayload('task-2') } });+ await vi.waitFor(async () => {+ const poll = await host.handle(OWNER, { op: 'poll', runs: [{ runId: RUN_2, cursor: 0 }], waitMs: 0 }) as { runs: Array<{ data?: string }> };+ expect(Buffer.from(poll.runs[0]?.data ?? '', 'base64').toString('utf8')).toContain('"t":"event","event":{"type":"done"');+ }, { timeout: 10_000 });+ expect(recordOwnerUsage).not.toHaveBeenCalled();+ host.dispose();+ });+it('lists only the runs that are in a turn right now', async () => {const busy = new Set<string>([hostSessionIdFor(GUEST, 'task-1')]);const started: Started[] = [];diff --git a/apps/desktop/src/main/remote-agent/host/runHost.ts b/apps/desktop/src/main/remote-agent/host/runHost.tsindex db291c32cd..d40f36f0fd 100644--- a/apps/desktop/src/main/remote-agent/host/runHost.ts+++ b/apps/desktop/src/main/remote-agent/host/runHost.ts@@ -171,6 +171,8 @@ export interface RemoteAgentHostDeps {purgeHostedTranscripts?(hostSessionIds: readonly string[], nativeIds: readonly string[]): Promise<void>;/** 记录受邀者每一轮的用量(分享者的管理页按人、按模型展示)。只对 guest 调用。 */recordGuestUsage?(controller: string, usage: { kind: RemoteAgentKind; providerId: string | null; samples: GuestUsageSample[] }): void;+ /** 记录同账号其他电脑每一轮的用量(远程与分享页按使用方展示)。只对 owner 调用。 */+ recordOwnerUsage?(controller: string, usage: { kind: RemoteAgentKind; providerId: string | null; samples: GuestUsageSample[] }): void;/*** 「允许被远程调用」(供应商级授权,默认关)。不提供 = 不做供应商级限制(测试 / 旧接线)。* - resolve:把对方要用的来源落到本机已开放的供应商上。providerId 是字符串时只核对它是否开放;@@ -1035,7 +1037,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {for await (const event of handle.events()) {if (run.closing) break;lastEventType = event.type;- if (run.trust === 'guest') meterGuestUsage(run, handle.model, event);+ meterRunUsage(run, handle.model, event);if (run.acceptsGroupSwitch) {// 受邀者的任务按组分到了本机这一台:本机运行中失败时同样可以换一台(凭证排在错误前面)。const failure = relayRunFailureOf(event);@@ -1081,14 +1083,16 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {await finishRun(run, 'ended', 'navigation', false);}- function meterGuestUsage(run: Run, model: string | undefined, event: AgentEvent): void {- if (!deps.recordGuestUsage || event.type !== 'done') return;+ function meterRunUsage(run: Run, model: string | undefined, event: AgentEvent): void {+ const record = run.trust === 'guest' ? deps.recordGuestUsage : deps.recordOwnerUsage;+ // 换了账号之后迟到的这一轮不记:用量账本按账号存放,记进去会落到新账号名下。+ if (!record || event.type !== 'done' || !deps.isOwnerCurrent(run.owner)) return;run.usageMeter ??= createGuestUsageMeter(run.kind);try {const samples = run.usageMeter.observe(event, model ?? '');- if (samples.length > 0) deps.recordGuestUsage(run.controller, { kind: run.kind, providerId: run.providerId ?? null, samples });+ if (samples.length > 0) record(run.controller, { kind: run.kind, providerId: run.providerId ?? null, samples });} catch (error) {- deps.log?.warn('remote agent guest usage record failed', { runId: run.id, error: String(error) });+ deps.log?.warn('remote agent usage record failed', { runId: run.id, error: String(error) });}}@@ -1278,7 +1282,7 @@ export function createRemoteAgentHost(deps: RemoteAgentHostDeps) {backend.client = new RemoteAgentRunClient(randomUUID(), connection.poller, {onEvent: (event) => {if (run.closing || run.relay !== backend) return;- meterGuestUsage(run, backend.model, event as AgentEvent);+ meterRunUsage(run, backend.model, event as AgentEvent);const deliver = () => {if (!run.closing) append(run, { t: 'event', event });};diff --git a/apps/desktop/src/main/remote-agent/host/service.ts b/apps/desktop/src/main/remote-agent/host/service.tsindex b215fa04be..6123abaaad 100644--- a/apps/desktop/src/main/remote-agent/host/service.ts+++ b/apps/desktop/src/main/remote-agent/host/service.ts@@ -22,12 +22,14 @@ import { getProviderGroupOwnerScope } from '../../provider-group/runtime.js';import { readProviderGroup } from '../../provider-group/store.js';import { remoteAgentPollerFor } from '../controller/service';import { getProviderShareUsageStore, installProviderShareUsageStore } from '../../device-link/providerShareUsageStore.js';+import { currentProviderPartyUsageStore, flushProviderPartyUsage } from '../../usage/providerPartyUsageStore.js';import { readDeviceLinkSettings } from '../../device-link/settings-store.js';import { readTurnUsageResetAt } from '../../goal-host/usageLimit.js';import { getDesktopProviderService } from '../../maker-host/createDesktopProviderService.js';import { registerGuestProviderRoute } from '../../maker-host/guest-provider-route-store.js';import { isRemoteProviderInvocationAllowed } from '../../maker-host/remote-provider-access-store.js';import { guestProviderModelIds, resolveGuestProviderId, resolveSharedProviderId } from './providerAccess';+import type { GuestUsageSample } from './guestUsage';import { createRemoteAgentHost, type HostedStartInput, type RemoteAgentHost } from './runHost';import { purgeClaudeHostedSessionArtifacts, purgeClaudeHostedTranscripts, purgePiHostedSubagentRuns } from './transcripts';@@ -151,7 +153,10 @@ export function installRemoteAgentHost(options: { getMaker: () => Maker; userDatrecordGuestUsage: (controller, sample) => {const peer = parseProviderSharePeer(controller);if (peer?.role === 'guest' && peer.memberId) usage.record(peer.shareId, peer.memberId, sample);+ // 同账号的组所在电脑替它的受邀者转过来的任务:记在那台电脑名下(经那台使用)。+ else if (!peer) recordDeviceUsage(controller, sample);},+ recordOwnerUsage: (controller, sample) => recordDeviceUsage(controller, sample),// 供应商组(本机是组所在电脑):受邀者的任务按组分给组内电脑,本机中转(provider-groups.md §4)。groupRelay: createProviderGroupGuestRelay({scope: getProviderGroupOwnerScope,@@ -197,5 +202,17 @@ export function disposeRemoteAgentHost(): void {}function flushProviderShareUsage(): Promise<void> {- return getProviderShareUsageStore()?.flush() ?? Promise.resolve();+ return Promise.all([getProviderShareUsageStore()?.flush(), flushProviderPartyUsage()]).then(() => undefined);+}++/** 同账号另一台电脑在本机运行的这一轮,记在「我的其他电脑」下(远程与分享页按使用方的用量)。 */+function recordDeviceUsage(+ controller: string,+ sample: { kind: string; providerId: string | null; samples: GuestUsageSample[] },+): void {+ if (!sample.providerId) return;+ currentProviderPartyUsageStore().record(+ { kind: 'device', deviceId: controller },+ { kind: sample.kind, providerId: sample.providerId, samples: sample.samples },+ );}diff --git a/apps/desktop/src/main/usage/__tests__/providerPartyUsageStore.test.ts b/apps/desktop/src/main/usage/__tests__/providerPartyUsageStore.test.tsnew file mode 100644index 0000000000..94a21e86fb--- /dev/null+++ b/apps/desktop/src/main/usage/__tests__/providerPartyUsageStore.test.ts@@ -0,0 +1,77 @@+import fs from 'node:fs';+import os from 'node:os';+import path from 'node:path';++import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++const owner = vi.hoisted(() => ({ dir: '' }));+vi.mock('../../appSessionState.js', () => ({+ ownerScopedUserDataPath: (...parts: string[]) => path.join(owner.dir, ...parts),+}));++import {+ createProviderPartyUsageStore,+ currentProviderPartyUsageStore,+ flushProviderPartyUsage,+} from '../providerPartyUsageStore';++const sample = (model: string, input: number, output: number, turns = 1) => ({+ model, turns, inputTokens: input, outputTokens: output, cacheReadTokens: 0, cacheCreateTokens: 0, sdkCostUsd: 0,+});++describe('provider party usage store', () => {+ let dir: string;+ beforeEach(() => {+ dir = fs.mkdtempSync(path.join(os.tmpdir(), 'provider-party-usage-'));+ });+ afterEach(() => {+ fs.rmSync(dir, { recursive: true, force: true });+ });++ it('splits one provider into this computer and each other computer, by range', async () => {+ let now = new Date(2026, 9, 7, 12).getTime();+ const file = path.join(dir, 'usage.json');+ const store = createProviderPartyUsageStore(file, { now: () => now });+ store.record({ kind: 'local' }, { kind: 'claude-code', providerId: 'anthropic', samples: [sample('opus', 10, 5)] });+ store.record({ kind: 'device', deviceId: 'studio' }, { kind: 'claude-code', providerId: 'anthropic', samples: [sample('opus', 7, 3)] });+ // 别的供应商不混进来。+ store.record({ kind: 'local' }, { kind: 'codex', providerId: 'openai', samples: [sample('gpt', 1, 1)] });+ now = new Date(2026, 8, 20, 12).getTime();+ store.record({ kind: 'local' }, { kind: 'claude-code', providerId: 'anthropic', samples: [sample('opus', 100, 50)] });+ now = new Date(2026, 9, 7, 13).getTime();++ const month = store.query('anthropic', 'month');+ expect(month.local).toMatchObject({ deviceId: null, lastUsedAt: new Date(2026, 9, 7, 12).getTime() });+ expect(month.local?.models).toEqual([+ { kind: 'claude-code', model: 'opus', turns: 1, inputTokens: 10, outputTokens: 5, cacheReadTokens: 0, cacheCreateTokens: 0, sdkCostUsd: 0 },+ ]);+ expect(month.devices).toHaveLength(1);+ expect(month.devices[0]).toMatchObject({ deviceId: 'studio' });+ expect(store.query('anthropic', 'all').local?.models[0]).toMatchObject({ turns: 2, inputTokens: 110, outputTokens: 55 });+ expect(store.query('xai', 'all')).toEqual({ local: null, devices: [] });++ await store.flush();+ const reloaded = createProviderPartyUsageStore(file, { now: () => now });+ expect(reloaded.query('anthropic', 'all').devices[0]?.models[0]).toMatchObject({ inputTokens: 7 });+ expect(reloaded.query('openai', 'all').local?.models[0]).toMatchObject({ model: 'gpt' });+ });++ it('ignores rounds without a provider and malformed rows', () => {+ const file = path.join(dir, 'usage.json');+ const store = createProviderPartyUsageStore(file);+ store.record({ kind: 'local' }, { kind: 'pi', providerId: '', samples: [sample('x', 1, 1)] });+ expect(store.query('', 'all')).toEqual({ local: null, devices: [] });+ fs.writeFileSync(file, JSON.stringify({ version: 1, rows: [{ day: '2026-10-01', providerId: 'p', deviceId: '', kind: 'pi', model: 'x', turns: 1 }] }));+ expect(createProviderPartyUsageStore(file).query('p', 'all')).toEqual({ local: null, devices: [] });+ });++ it('keeps one ledger per account', async () => {+ owner.dir = path.join(dir, 'owner-a');+ currentProviderPartyUsageStore().record({ kind: 'local' }, { kind: 'pi', providerId: 'anthropic', samples: [sample('m', 1, 1)] });+ owner.dir = path.join(dir, 'owner-b');+ expect(currentProviderPartyUsageStore().query('anthropic', 'all').local).toBeNull();+ await flushProviderPartyUsage();+ expect(fs.existsSync(path.join(dir, 'owner-a', 'provider-usage-by-party.json'))).toBe(true);+ expect(fs.existsSync(path.join(dir, 'owner-b', 'provider-usage-by-party.json'))).toBe(false);+ });+});diff --git a/apps/desktop/src/main/usage/providerPartyUsageStore.ts b/apps/desktop/src/main/usage/providerPartyUsageStore.tsnew file mode 100644index 0000000000..2d715377bd--- /dev/null+++ b/apps/desktop/src/main/usage/providerPartyUsageStore.ts@@ -0,0 +1,220 @@+/**+ * 供应商「按使用方」的用量账本(provider-groups.md §7):这台电脑自己能记到的两类使用方。+ * - 本机(`local`):这台电脑自己的任务。Agent 在本机用这个供应商运行,或任务归本机建的供应商组+ * (Agent 在组里哪台电脑运行都算,记在组那个供应商上);+ * - 我的其他电脑(`device`):同账号其他电脑的远程 Agent 任务在这台电脑上用这个供应商运行,按那台电脑分开+ * (含同账号的组所在电脑替它的受邀者转过来的任务)。+ * 分享的人仍记在 device-link/providerShareUsageStore。其他电脑经组直接连到别的组内电脑运行的任务,+ * 这台电脑经手不到,不在这里。+ *+ * 供应商 id 在不同账号下会重复,所以按账号存放(owners/<账号>/ 下);原子替换写入,保留 400 天;+ * 只含供应商 id、设备 id 与模型名,不含对话或凭证。+ */+import fs from 'node:fs';+import fsp from 'node:fs/promises';+import path from 'node:path';++import { ownerScopedUserDataPath } from '../appSessionState.js';+import { providerShareUsageRangeStart } from '../device-link/providerShareUsageStore.js';+import type { GuestUsageSample } from '../remote-agent/host/guestUsage.js';+import type { ProviderShareUsageRange } from '../../shared/providerShare.js';++const FILE_NAME = 'provider-usage-by-party.json';+const FILE_VERSION = 1;+const RETAIN_DAYS = 400;+const MAX_ROWS = 20_000;+const FLUSH_DELAY_MS = 1_000;++/** 谁用的:本机自己的任务,或同账号的另一台电脑(设备 id)。 */+export type ProviderUsageParty = { kind: 'local' } | { kind: 'device'; deviceId: string };++interface PartyUsageRow {+ day: string;+ providerId: string;+ /** null = 本机。 */+ deviceId: string | null;+ kind: string;+ model: string;+ turns: number;+ inputTokens: number;+ outputTokens: number;+ cacheReadTokens: number;+ cacheCreateTokens: number;+ sdkCostUsd: number;+ lastAt: number;+}++export interface ProviderPartyUsage {+ /** null = 本机。 */+ deviceId: string | null;+ lastUsedAt: number;+ models: Array<Omit<PartyUsageRow, 'day' | 'providerId' | 'deviceId' | 'lastAt'>>;+}++function localDay(at: number): string {+ const date = new Date(at);+ const pad = (value: number) => String(value).padStart(2, '0');+ return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`;+}++function isRow(value: unknown): value is PartyUsageRow {+ if (!value || typeof value !== 'object') return false;+ const row = value as Record<string, unknown>;+ const numbers = ['turns', 'inputTokens', 'outputTokens', 'cacheReadTokens', 'cacheCreateTokens', 'sdkCostUsd', 'lastAt'];+ return typeof row.day === 'string' && /^\d{4}-\d{2}-\d{2}$/.test(row.day)+ && typeof row.providerId === 'string' && row.providerId.length > 0+ && (row.deviceId === null || (typeof row.deviceId === 'string' && row.deviceId.length > 0))+ && typeof row.kind === 'string' && typeof row.model === 'string'+ && numbers.every((key) => typeof row[key] === 'number' && Number.isFinite(row[key] as number) && (row[key] as number) >= 0);+}++export function createProviderPartyUsageStore(filePath: string, options: { now?: () => number } = {}) {+ const now = options.now ?? Date.now;+ let rows: Map<string, PartyUsageRow> | null = null;+ let timer: ReturnType<typeof setTimeout> | null = null;+ let writing: Promise<void> = Promise.resolve();++ const keyOf = (row: Pick<PartyUsageRow, 'day' | 'providerId' | 'deviceId' | 'kind' | 'model'>) =>+ JSON.stringify([row.day, row.providerId, row.deviceId, row.kind, row.model]);++ function load(): Map<string, PartyUsageRow> {+ if (rows) return rows;+ rows = new Map();+ try {+ const parsed = JSON.parse(fs.readFileSync(filePath, 'utf8')) as { version?: unknown; rows?: unknown };+ if (parsed.version === FILE_VERSION && Array.isArray(parsed.rows)) {+ for (const row of parsed.rows) if (isRow(row)) rows.set(keyOf(row), { ...row });+ }+ } catch {+ // 没有文件或文件损坏:从空账本开始。+ }+ return rows;+ }++ function prune(map: Map<string, PartyUsageRow>): void {+ const cutoff = localDay(now() - RETAIN_DAYS * 86_400_000);+ for (const [key, row] of map) if (row.day < cutoff) map.delete(key);+ if (map.size <= MAX_ROWS) return;+ const oldest = [...map.entries()].sort((a, b) => a[1].lastAt - b[1].lastAt);+ for (const [key] of oldest.slice(0, map.size - MAX_ROWS)) map.delete(key);+ }++ async function writeNow(): Promise<void> {+ const map = load();+ prune(map);+ const body = JSON.stringify({ version: FILE_VERSION, rows: [...map.values()] });+ const tmp = `${filePath}.${process.pid}.${Date.now()}.tmp`;+ await fsp.mkdir(path.dirname(filePath), { recursive: true });+ try {+ await fsp.writeFile(tmp, body, { encoding: 'utf8', mode: 0o600 });+ await fsp.rename(tmp, filePath);+ } finally {+ await fsp.rm(tmp, { force: true }).catch(() => undefined);+ }+ }++ function scheduleFlush(): void {+ if (timer) return;+ timer = setTimeout(() => {+ timer = null;+ writing = writing.then(writeNow).catch(() => undefined);+ }, FLUSH_DELAY_MS);+ (timer as { unref?: () => void }).unref?.();+ }++ return {+ record(+ party: ProviderUsageParty,+ usage: { kind: string; providerId: string; samples: readonly GuestUsageSample[] },+ ): void {+ if (!usage.providerId || usage.samples.length === 0) return;+ const map = load();+ const at = now();+ const day = localDay(at);+ const deviceId = party.kind === 'device' ? party.deviceId : null;+ for (const sample of usage.samples) {+ const identity = { day, providerId: usage.providerId, deviceId, kind: usage.kind, model: sample.model };+ const key = keyOf(identity);+ const row = map.get(key) ?? {+ ...identity, turns: 0, inputTokens: 0, outputTokens: 0, cacheReadTokens: 0, cacheCreateTokens: 0, sdkCostUsd: 0, lastAt: at,+ };+ row.turns += sample.turns;+ row.inputTokens += sample.inputTokens;+ row.outputTokens += sample.outputTokens;+ row.cacheReadTokens += sample.cacheReadTokens;+ row.cacheCreateTokens += sample.cacheCreateTokens;+ row.sdkCostUsd += sample.sdkCostUsd;+ row.lastAt = at;+ map.set(key, row);+ }+ scheduleFlush();+ },++ /** 某个供应商按使用方汇总:本机一项(没用过时为 null),其他电脑每台一项。最近使用时间不受时间段限制。 */+ query(providerId: string, range: ProviderShareUsageRange): { local: ProviderPartyUsage | null; devices: ProviderPartyUsage[] } {+ const start = providerShareUsageRangeStart(range, now());+ const parties = new Map<string, ProviderPartyUsage>();+ for (const row of load().values()) {+ if (row.providerId !== providerId) continue;+ const partyKey = row.deviceId ?? '';+ const party = parties.get(partyKey) ?? { deviceId: row.deviceId, lastUsedAt: 0, models: [] };+ parties.set(partyKey, party);+ party.lastUsedAt = Math.max(party.lastUsedAt, row.lastAt);+ if (start && row.day < start) continue;+ const model = party.models.find((item) => item.model === row.model && item.kind === row.kind);+ if (model) {+ model.turns += row.turns;+ model.inputTokens += row.inputTokens;+ model.outputTokens += row.outputTokens;+ model.cacheReadTokens += row.cacheReadTokens;+ model.cacheCreateTokens += row.cacheCreateTokens;+ model.sdkCostUsd += row.sdkCostUsd;+ } else {+ party.models.push({+ kind: row.kind,+ model: row.model,+ turns: row.turns,+ inputTokens: row.inputTokens,+ outputTokens: row.outputTokens,+ cacheReadTokens: row.cacheReadTokens,+ cacheCreateTokens: row.cacheCreateTokens,+ sdkCostUsd: row.sdkCostUsd,+ });+ }+ }+ for (const party of parties.values()) party.models.sort((a, b) => b.turns - a.turns || a.model.localeCompare(b.model));+ const local = parties.get('') ?? null;+ parties.delete('');+ return { local, devices: [...parties.values()].sort((a, b) => b.lastUsedAt - a.lastUsedAt) };+ },++ async flush(): Promise<void> {+ if (timer) {+ clearTimeout(timer);+ timer = null;+ writing = writing.then(writeNow).catch(() => undefined);+ }+ await writing;+ },+ };+}++export type ProviderPartyUsageStore = ReturnType<typeof createProviderPartyUsageStore>;++const stores = new Map<string, ProviderPartyUsageStore>();++/** 当前账号的账本;登录前是进程临时目录里的空账本(不读写任何账号的数据)。 */+export function currentProviderPartyUsageStore(): ProviderPartyUsageStore {+ const filePath = ownerScopedUserDataPath(FILE_NAME);+ let store = stores.get(filePath);+ if (!store) {+ store = createProviderPartyUsageStore(filePath);+ stores.set(filePath, store);+ }+ return store;+}++/** 退出前把各账号还没写盘的用量写完。 */+export async function flushProviderPartyUsage(): Promise<void> {+ await Promise.all([...stores.values()].map((store) => store.flush()));+}diff --git a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupUsage.test.tsx b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupUsage.test.tsxnew file mode 100644index 0000000000..a50bd66f97--- /dev/null+++ b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupUsage.test.tsx@@ -0,0 +1,304 @@+// @vitest-environment jsdom+/**+ * 模型列表里供应商组那一项的用量(provider-groups.md §10):组那一项代表组里的几台电脑,不拿组所在电脑+ * 自己的账号当整个组的用量。+ * 1. 任务正经组在某台运行:左栏用量条与悬停读那台的账号,悬停写「当前在 {电脑} 上运行」;+ * 2. 任务运行在组所在电脑本身:读组所在电脑的账号;+ * 3. 还没运行过的任务:不显示某一台的配额,悬停说明开始后由组选电脑;+ * 4. 本机建的组:任务在本机运行时读本机账号。+ */+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react';+import React from 'react';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++vi.mock('react-i18next', async (importOriginal) => ({+ ...(await importOriginal<typeof import('react-i18next')>()),+ useTranslation: () => ({+ t: (key: string, options?: Record<string, string | number>) => {+ const o = options ?? {};+ const table: Record<string, string> = {+ 'newChat.modelSelector.modelListAria': '模型列表',+ 'newChat.modelSelector.search.placeholderAll': '搜索模型…',+ 'newChat.modelSelector.unified.railAll': '全部',+ 'newChat.modelSelector.unified.railRemoteProvider': `${o.provider} · ${o.device}`,+ 'newChat.modelSelector.unified.railRemoteProviderGroup': `${o.provider} · ${o.device} · ${o.group}`,+ 'newChat.modelSelector.unified.providerGroupLabel': `${o.provider} · ${o.group}`,+ 'newChat.modelSelector.unified.providerGroupRunningOn': `当前在 ${o.device} 上运行`,+ 'newChat.modelSelector.unified.providerGroupRunningHere': '当前在这台电脑上运行',+ 'newChat.modelSelector.unified.providerGroupUnassigned': '开始后由供应商组选一台电脑,用量按那台显示',+ 'settings.providers.remote.groupBadge': `供应商组 · ${o.count} 台电脑`,+ 'quotaCard.weeklyLabel': '周限',+ 'quotaCard.remainingPercent': `剩余 ${o.percent}%`,+ 'effortLevels.low': '低',+ 'effortLevels.high': '高',+ };+ return table[key] ?? (o.defaultValue as string | undefined) ?? key;+ },+ }),+}));++vi.mock('@/lib/scrollbarAutoHide', () => ({ flashScrollbar: vi.fn() }));+vi.mock('@/hooks/useAgentCapabilities', () => ({+ evictDeviceCapabilities: vi.fn(),+ prefetchDeviceCapabilities: vi.fn(async () => {}),+ useAgentCapabilities: () => ({+ capabilities: { hasFastMode: false, effortLevels: [], availableModels: [] },+ loading: false,+ error: null,+ }),+}));+vi.mock('@/hooks/useApiKey', () => ({ useApiKey: () => ({ hasSavedKey: true }) }));+vi.mock('@/hooks/useConnectedSource', () => ({+ useConnectedSource: () => ({ hasConnectedSource: true, loading: false }),+}));+vi.mock('@/hooks/useModelPricing', () => ({+ useGatewayModelPricing: () => null,+ useReferenceModelPricing: () => null,+}));++const catalogs = vi.hoisted(() => {+ const provider = (id: string, name: string, identity: string, extra: Record<string, unknown> = {}) => ({+ id,+ name,+ source: 'user',+ agents: ['claude-code'],+ auth: { method: 'oauth', native: 'claude' },+ access: { kind: 'subscription', product: 'claude' },+ subscriptionAccount: { identity },+ routing: { 'claude-code': {} },+ connected: true,+ models: {+ 'claude-code': [+ { id: 'opus', name: 'Opus', contextWindow: 200000, efforts: ['low', 'high'], defaultEffort: 'high' },+ ],+ },+ ...extra,+ });+ const member = (key: string, kind: string, agentDeviceId: string | null, providerId: string) => ({+ key, kind, agentDeviceId, providerId, limit: 4, weight: 1, paused: false,+ });+ return {+ local: [provider('a-local', 'A Local', 'me@desk')] as unknown[],+ localGroups: {+ 'a-local': {+ strategy: 'least',+ autoSwitch: true,+ members: [member('local', 'local', null, 'a-local')],+ },+ } as Record<string, unknown>,+ byDevice: {+ // Studio 把 c-open 建成了组:Studio 自己与 Laptop。+ 'device-c': [+ provider('c-open', 'C Open', 'studio@x', {+ remoteInvocationEnabled: true,+ group: {+ strategy: 'least',+ autoSwitch: true,+ members: [member('local', 'local', null, 'c-open'), member('device:device-d:d-open', 'device', 'device-d', 'd-open')],+ },+ }),+ ],+ 'device-d': [+ provider('d-open', 'D Open', 'laptop@x', { remoteInvocationEnabled: true }),+ // 不在组里的供应商照常单独列出。+ provider('d-solo', 'D Solo', 'solo@x', { remoteInvocationEnabled: true }),+ ],+ } as Record<string, unknown[]>,+ // 每台电脑这个账号的周限已用百分比。+ weeklyUsed: { 'device-c': 99, 'device-d': 60, local: 30 } as Record<string, number>,+ };+});++const claude = (used: number) => ({+ subscriptionType: 'max',+ sevenDay: { utilization: used, resetsAt: Date.now() / 1000 + 86400 },+});++vi.mock('@/hooks/useProviders', () => ({+ useProviders: () => ({ providers: catalogs.local, providerOrder: [] }),+}));+vi.mock('@/hooks/useDeviceProviders', () => ({+ evictDeviceProviders: vi.fn(),+ prefetchDeviceProviders: vi.fn(async () => {}),+ useDeviceProviders: (deviceId?: string) => ({+ providers: deviceId ? (catalogs.byDevice[deviceId] ?? []) : [],+ loading: false,+ error: null,+ unsupported: false,+ }),+}));+vi.mock('@/hooks/useDevicesProviders', () => ({+ useDevicesProviders: (deviceIds: readonly string[]) =>+ new Map(+ deviceIds.map((deviceId) => [+ deviceId,+ { providers: catalogs.byDevice[deviceId] ?? [], loading: false, error: null },+ ]),+ ),+}));+vi.mock('@/features/provider-group/useLocalProviderGroups', () => ({+ useLocalProviderGroups: () => catalogs.localGroups,+}));+vi.mock('@/features/provider-share/providerShareStore', () => ({+ useProviderShareReceived: () => ({ received: [], loaded: true }),+}));+vi.mock('@/state/modelVisibilityPrefs', () => ({+ isModelEnabled: () => true,+ useModelVisibilityVersion: () => 0,+}));+vi.mock('@/state/deviceLinkModelMirror', () => ({+ useDeviceLinkModelMirrorVersion: () => 0,+}));+vi.mock('@/hooks/useCodexRateLimits', () => ({ useCodexRateLimits: () => ({ snapshot: null }) }));+vi.mock('@/hooks/useAccountUsage', async (importActual) => ({+ ...(await importActual<typeof import('@/hooks/useAccountUsage')>()),+ useAccountUsage: () => null,+}));+vi.mock('@/hooks/useXaiSubscriptionUsage', () => ({ useXaiSubscriptionUsage: () => null }));+vi.mock('@/hooks/useClaudeSubscriptionUsage', () => ({+ useClaudeSubscriptionUsage: (enabled: boolean) => (enabled ? claude(catalogs.weeklyUsed.local!) : null),+}));+vi.mock('@/hooks/useRemoteDeviceUsage', () => ({+ useRemoteCodexAccountUsage: () => null,+ useRemoteXaiSubscriptionUsage: () => null,+}));+vi.mock('@/hooks/useRemoteClaudeSubscriptionUsage', () => ({+ useRemoteClaudeSubscriptionUsage: (deviceId: string | null) =>+ deviceId && catalogs.weeklyUsed[deviceId] !== undefined ? claude(catalogs.weeklyUsed[deviceId]!) : null,+}));++import { ModelSelectorContent } from '@/components/new-chat/ModelSelector';+import { __resetForTest as resetEnginePrefs } from '@/state/modelEnginePrefs';+import { __resetForTest as resetFavorites } from '@/state/modelFavorites';++const devices = [+ { deviceId: 'device-c', name: 'Studio' },+ { deviceId: 'device-d', name: 'Laptop' },+];+const GROUP = 'C Open · Studio · 供应商组 · 2 台电脑';++function renderTask(route: { deviceId: string | null; providerId: string }, taskStarted: boolean) {+ render(+ React.createElement(ModelSelectorContent, {+ modelId: 'opus',+ effort: 'high',+ onModelChange: vi.fn(),+ onEffortChange: vi.fn(),+ currentProviderId: route.providerId,+ onProviderChange: vi.fn(),+ actualRoute: true,+ taskStarted,+ vendorKey: 'cc',+ remoteAgent: {+ devices,+ selectedDeviceId: route.deviceId,+ selfDeviceId: 'desk',+ onRelocate: vi.fn(async () => true),+ },+ }),+ );+}++const railButton = (name: string) => screen.getByRole('button', { name });+const remaining = (button: HTMLElement) =>+ button.querySelector('[data-weekly-remaining]')?.getAttribute('data-weekly-remaining') ?? null;++beforeEach(() => {+ resetEnginePrefs();+ resetFavorites();+});++afterEach(() => {+ cleanup();+});++describe('模型列表里供应商组那一项的用量', () => {+ it('任务正经组在另一台运行:读那台的账号并写明在哪台', () => {+ renderTask({ deviceId: 'device-d', providerId: 'd-open' }, true);+ const group = railButton(GROUP);+ expect(remaining(group)).toBe('40');+ expect(group.getAttribute('aria-description')).toBe('当前在 Laptop 上运行 · laptop@x · 周限 · 剩余 40%');+ // 组名不再带组所在电脑那一个账号。+ expect(group.getAttribute('aria-label')).not.toContain('studio@x');+ });++ it('任务运行在组所在电脑本身:读组所在电脑的账号', () => {+ renderTask({ deviceId: 'device-c', providerId: 'c-open' }, true);+ const group = railButton(GROUP);+ expect(remaining(group)).toBe('1');+ expect(group.getAttribute('aria-description')).toBe('当前在 Studio 上运行 · studio@x · 周限 · 剩余 1%');+ });++ it('还没运行过的任务:不显示某一台的配额', async () => {+ renderTask({ deviceId: 'device-c', providerId: 'c-open' }, false);+ const group = railButton(GROUP);+ expect(remaining(group)).toBeNull();+ expect(group.getAttribute('aria-description')).toBe('开始后由供应商组选一台电脑,用量按那台显示');+ // 浏览组的目录时,模型行也不拿组所在电脑的配额。+ await act(async () => {+ fireEvent.click(group);+ });+ expect(screen.getByRole('listbox').textContent).not.toContain('剩余 1%');+ });++ it('本机建的组:任务在本机运行时读本机账号', () => {+ renderTask({ deviceId: null, providerId: 'a-local' }, true);+ const group = railButton('A Local · 供应商组 · 1 台电脑');+ expect(remaining(group)).toBe('70');+ expect(group.getAttribute('aria-description')).toBe('当前在这台电脑上运行 · me@desk · 周限 · 剩余 70%');+ });++ it('不是组的供应商照旧按自己的账号显示,组员收进组那一项', () => {+ renderTask({ deviceId: 'device-d', providerId: 'd-open' }, true);+ expect(screen.queryByRole('button', { name: /^D Open · Laptop/ })).toBeNull();+ const solo = railButton('D Solo · Laptop · solo@x');+ expect(remaining(solo)).toBe('40');+ expect(solo.getAttribute('aria-description')).toBe('周限 · 剩余 40%');+ });++ it('读到任务归哪个组时,别的组那一项不认这台', async () => {+ // 本机的组也收了 Laptop:任务归的是 Studio 的组。+ catalogs.localGroups['a-local'] = {+ strategy: 'least',+ autoSwitch: true,+ members: [+ { key: 'local', kind: 'local', agentDeviceId: null, providerId: 'a-local', limit: 4, weight: 1, paused: false },+ { key: 'device:device-d:d-open', kind: 'device', agentDeviceId: 'device-d', providerId: 'd-open', limit: 4, weight: 1, paused: false },+ ],+ };+ try {+ render(+ React.createElement(ModelSelectorContent, {+ modelId: 'opus',+ effort: 'high',+ onModelChange: vi.fn(),+ onEffortChange: vi.fn(),+ currentProviderId: 'd-open',+ onProviderChange: vi.fn(),+ actualRoute: true,+ taskStarted: true,+ vendorKey: 'cc',+ remoteAgent: {+ devices,+ selectedDeviceId: 'device-d',+ selfDeviceId: 'desk',+ readProviderGroup: async () => ({ deviceId: 'device-c', providerId: 'c-open' }),+ onRelocate: vi.fn(async () => true),+ },+ }),+ );+ await act(async () => {});+ expect(railButton(GROUP).getAttribute('aria-description')).toBe('当前在 Laptop 上运行 · laptop@x · 周限 · 剩余 40%');+ // 面板停在 Studio 的组那一项上,左栏本机那一格照样带台数。+ const local = railButton('A Local · 供应商组 · 2 台电脑');+ expect(remaining(local)).toBeNull();+ expect(local.getAttribute('aria-description')).toBe('开始后由供应商组选一台电脑,用量按那台显示');+ } finally {+ catalogs.localGroups['a-local'] = {+ strategy: 'least',+ autoSwitch: true,+ members: [{ key: 'local', kind: 'local', agentDeviceId: null, providerId: 'a-local', limit: 4, weight: 1, paused: false }],+ };+ }+ });+});diff --git a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsxindex 76752c0737..b80fb04546 100644--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx@@ -1299,6 +1299,11 @@ export function ChatInput({/** 下一条消息时 Agent 所在的电脑(null = 任务所在电脑)。 */const effectiveAgentDeviceId =intentAgentDeviceId !== undefined ? intentAgentDeviceId : agentDeviceId;+ /** 有过 Agent 回复:供应商组已为这个任务选好电脑(provider-groups.md §6)。 */+ const taskStarted = useMemo(+ () => !!sessionId && (messages ?? []).some((message) => message.role === 'assistant'),+ [sessionId, messages],+ );/** 模型目录所在的电脑:Agent 在另一台电脑运行时是那台;否则远程任务在被控电脑,本机任务在本机。 */const catalogDeviceId = effectiveAgentDeviceId ?? deviceLinkDeviceId ?? undefined;const { t } = useTranslation();@@ -7190,6 +7195,8 @@ export function ChatInput({selectedDeviceId: effectiveAgentDeviceId,// 被控电脑上的任务:没在浏览其他电脑时列被控电脑自己的目录与它的镜像记忆。...(deviceLinkDeviceId ? { homeDeviceId: deviceLinkDeviceId } : {}),+ ...(deviceLinkDeviceId && deviceLinkDeviceName ? { homeDeviceName: deviceLinkDeviceName } : {}),+ selfDeviceId: selfDeviceId ?? null,...(taskComputerModelMemory ? { localModelMemory: taskComputerModelMemory } : {}),deviceModelMemory: agentDeviceModelMemoryAccessors,// 归组的任务在组那一项下显示与选择(provider-groups.md §10)。组的绑定记在任务所在电脑上,被控电脑上的@@ -7210,6 +7217,8 @@ export function ChatInput({sessionId,agentLocationAware,deviceLinkDeviceId,+ deviceLinkDeviceName,+ selfDeviceId,taskComputerModelMemory,remoteHostId,sessionEngineFilter,@@ -9381,6 +9390,8 @@ export function ChatInput({// 已建会话按实际路由口径解析当前来源(含停用拷贝,跟真实扣费路由);// 草稿是新路由选择,保持准入口径(PR #744 review 第十轮)。actualRoute={!!sessionId}+ // 有过 Agent 回复 = 供应商组已为这个任务选好电脑,组那一项的用量按那台显示。+ taskStarted={taskStarted}onProviderChange={(providerId, modelId, effort, fast) =>handleProviderChange(providerId, modelId, effort, undefined, fast)}diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsxindex 0ebe095cc6..a15c4c0287 100644--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx@@ -69,7 +69,7 @@ import {type UnifiedModelPanelProps,type UnifiedSelectedRow,} from './UnifiedModelPanel';-import type { ProviderUsageScope } from './useProviderWeeklyQuota';+import type { ProviderGroupUsageOf, ProviderUsageScope } from './useProviderWeeklyQuota';import { ThinkingToggle } from './ThinkingToggle';import { useModelDiscoveryPending } from './useModelDiscoveryPending';import { VendorSegmentedSwitcher } from './VendorSegmentedSwitcher';@@ -96,9 +96,11 @@ import { RemoteSourceMark } from '@/components/icons/RemoteSourceMark';import { buildUnifiedRail, remoteAgentProviders } from './unifiedModelSelection';import {collectRemoteProviderGroups,+ providerGroupMemberOfRoute,remoteProviderEntryKey,type RemoteProviderGroupEntry,} from '@/lib/remoteProviderGroups';+import type { ProviderGroupConfig } from '../../../shared/providerGroup';import { useLocalProviderGroups } from '@/features/provider-group/useLocalProviderGroups';import { readProviderShareGroupSize } from '@cindy/device-link';import { modelPriceDiscountLabelValues, modelPriceDetailRows } from '@/lib/modelPriceFormat';@@ -683,6 +685,10 @@ export interface RemoteAgentSelectorOptions {* 不传 = 本机任务,用本机目录。*/homeDeviceId?: string;+ /** homeDeviceId 那台电脑的名字(供应商组那一项的悬停写任务在哪台运行时用)。 */+ homeDeviceName?: string;+ /** 本机的设备 id:供应商组里的组员就是本机时,按任务所在电脑比对任务在哪台运行。 */+ selfDeviceId?: string | null;/** 任务所在电脑目录的模型记忆。Agent 当前在其他电脑时,浏览那份目录用它显示各行的档位。 */localModelMemory?: ModelMemoryAccessors;/**@@ -754,6 +760,8 @@ interface ModelSelectorProps {sourceDisconnected?: boolean;/** 语义同 ModelSelectorContentProps.actualRoute(仅已建会话传 true)。 */actualRoute?: boolean;+ /** 语义同 ModelSelectorContentProps.taskStarted。 */+ taskStarted?: boolean;/** Fast Mode 状态 + 回调(从工具栏搬进 Edit 配置列)。不传 → 配置列不显示 Fast 开关。 */fastMode?: boolean;/** 语义同 onEffortChange(含返回值口径)。 */@@ -948,6 +956,11 @@ interface ModelSelectorContentProps {* (PR #744 review 第十轮)。*/actualRoute?: boolean;+ /**+ * 任务已经运行过(有 Agent 回复)。供应商组在任务第一次运行时选好电脑(provider-groups.md §6),+ * 之后组那一项的用量按任务实际运行的那台显示;草稿与还没运行过的任务不传。+ */+ taskStarted?: boolean;/** 语义同 ModelSelectorProps.maxVisibleModelRows。 */maxVisibleModelRows?: number;/** 模型信息 / 选项浮层的额外样式。供嵌套在高层级 overlay 中的调用方覆盖默认 z-index。 */@@ -1184,6 +1197,7 @@ function ModelSelectorContentView({excludeChatBridgedCodex,onDismiss,actualRoute = false,+ taskStarted = false,maxVisibleModelRows,overlayContentClassName,currentProviderId,@@ -1681,8 +1695,9 @@ function ModelSelectorContentView({visibilityVersion,]);// 供应商组在分组标题与左栏提示里带上台数(provider-groups.md §10):「Anthropic · 供应商组 · 2 台电脑」。- // 只算任务所在电脑就是本机时本机建的组;被控电脑上的任务看那台的目录,不在这里标。- const localGroupsApply = !deviceId && !homeDeviceId && !providersOverride;+ // 只算任务所在电脑就是本机时本机建的组;被控电脑上的任务看那台的目录,不在这里标。远程 Agent 面板正在浏览+ // 另一台电脑的目录时,左栏本机那几格仍是本机的供应商,照样带台数。+ const localGroupsApply = (remoteAgent ? true : !deviceId) && !homeDeviceId && !providersOverride;const withLocalGroupSize = useCallback((providerId: string, label: string): string => {const config = localGroupsApply ? localProviderGroups[providerId] : undefined;@@ -1725,6 +1740,76 @@ function ModelSelectorContentView({},[remoteAgentDevices, remoteAgentGroups, remoteProviderGroups, t],);+ // 供应商组那一项的用量跟着任务实际运行的那台(provider-groups.md §10):组分好电脑后任务记录改成那台的+ // 位置与供应商,与输入框下方的用量同一份;还没分到电脑(草稿、没运行过、用的不是这个组)时不显示某一台+ // 的配额,免得把组所在电脑一台的余量看成整个组的。+ const selfDeviceId = remoteAgent?.selfDeviceId ?? null;+ const providerGroupUsage = useCallback<ProviderGroupUsageOf>(+ (directoryDeviceId, providerId) => {+ if (providersOverride) return null;+ let config: ProviderGroupConfig | undefined;+ if (directoryDeviceId !== null) {+ config = remoteProviderGroups.groups.get(remoteProviderEntryKey(directoryDeviceId, providerId));+ } else if (homeDeviceId) {+ config = remoteProviderGroups.groups.get(remoteProviderEntryKey(homeDeviceId, providerId));+ } else if (remoteAgent || !deviceIdProp) {+ config = localProviderGroups[providerId];+ }+ if (!config) return null;+ if (!taskStarted || !currentProviderId) return { kind: 'unassigned' };+ // 读到了任务归哪个组时只认那个组:同一台电脑可能同时在几个组里。+ if (boundEntry && !(boundEntry.deviceId === directoryDeviceId && boundEntry.providerId === providerId)) {+ return { kind: 'unassigned' };+ }+ const member = providerGroupMemberOfRoute(+ config,+ directoryDeviceId,+ { agentDeviceId: remoteAgentDeviceId, providerId: currentProviderId },+ homeDeviceId ?? selfDeviceId,+ );+ if (!member) return { kind: 'unassigned' };+ const location = member.agentDeviceId;+ if (location === null) {+ const provider = (homeDeviceId ? homeDeviceProviders.providers : localProviders.providers).find(+ (entry) => entry.id === member.providerId,+ );+ return {+ kind: 'running',+ deviceName: homeDeviceId ? remoteAgent?.homeDeviceName || homeDeviceId : null,+ usage: provider ? { provider, scope: { deviceId: homeDeviceId ?? null } } : null,+ };+ }+ const deviceName =+ remoteAgentDevices?.find((device) => device.deviceId === location)?.name || location;+ // 别人分享的电脑:分享者的配额不对受邀者开放(模型列表里那一项本来也不显示)。+ if (isProviderShareAgentDeviceId(location)) return { kind: 'running', deviceName, usage: null };+ const provider = remoteDeviceCatalogs+ .get(location)+ ?.providers.find((entry) => entry.id === member.providerId);+ return {+ kind: 'running',+ deviceName,+ usage: provider ? { provider, scope: { deviceId: location } } : null,+ };+ },+ [+ providersOverride,+ remoteProviderGroups,+ homeDeviceId,+ remoteAgent,+ deviceIdProp,+ localProviderGroups,+ taskStarted,+ currentProviderId,+ boundEntry,+ remoteAgentDeviceId,+ selfDeviceId,+ homeDeviceProviders.providers,+ localProviders.providers,+ remoteAgentDevices,+ remoteDeviceCatalogs,+ ],+ );// 官方默认推荐 → 一次性**种子收藏**(Chris 2026-08-16 裁决,替代列表里的「默认」// 小节):服务端目录用 `newSessionDefault` 标记推荐模型(gateway 下发),首个命中@@ -3350,6 +3435,7 @@ function ModelSelectorContentView({<UnifiedModelPaneldeviceId={deviceId}providerUsage={providerUsageScope}+ providerGroupUsage={providerGroupUsage}providers={providers}providerOrder={deviceId ? undefined : localProviders.providerOrder}{...(unifiedAgents ? { agents: unifiedAgents } : {})}@@ -3837,6 +3923,7 @@ export function ModelSelector({currentProviderId,sourceDisconnected = false,actualRoute = false,+ taskStarted = false,onProviderChange,onNavigateToProviders,agentSwitch,@@ -4629,6 +4716,7 @@ export function ModelSelector({excludeChatBridgedCodex={excludeChatBridgedCodex}onDismiss={() => setOpenWithoutAutoRefresh(false)}actualRoute={actualRoute}+ taskStarted={taskStarted}maxVisibleModelRows={maxVisibleModelRows}currentProviderId={currentProviderId}onProviderChange={onProviderChange}diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSourceDetails.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSourceDetails.tsxindex 2e201b496d..0f23d3e576 100644--- a/apps/desktop/src/renderer/components/new-chat/ModelSourceDetails.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ModelSourceDetails.tsx@@ -18,6 +18,7 @@ import { RESET_PENDING_MAX_MS } from '../status/quotaResetRollup';import {providerWeeklyQuotaSource,useProviderUsageSnapshots,+ type ProviderGroupUsage,type ProviderUsageScope,type ProviderUsageSnapshots,} from './useProviderWeeklyQuota';@@ -31,10 +32,13 @@ const ClockContext = createContext(0);/** One reader per connection, shared by all model/favorite/sizing rows. Existing* account-scoped hooks own fetching and invalidation; this context only composes views. */function SourceUsageProvider({+ usageKey,provider,scope,children,}: {+ /** 目录里这一行的供应商 id;供应商组读实际运行那台的账号时与 provider.id 不同。 */+ usageKey: string;provider: ProviderView;scope: ProviderUsageScope;children: ReactNode;@@ -44,20 +48,23 @@ function SourceUsageProvider({const value = useMemo(() => {if (!source) return parent;const next = new Map(parent);- next.set(provider.id, { source, codex, claude, xai });+ next.set(usageKey, { source, codex, claude, xai });return next;- }, [parent, provider.id, source, codex, claude, xai]);+ }, [parent, usageKey, source, codex, claude, xai]);return <UsageContext.Provider value={value}>{children}</UsageContext.Provider>;}export function ModelSourceUsageProvider({providers,scope,+ groupUsageOf,children,}: {providers: readonly ProviderView[];/** null: this directory may not show any account's usage. */scope: ProviderUsageScope | null;+ /** 目录里的供应商组读谁的账号(provider-groups.md §10);缺省 = 都按目录归属读。 */+ groupUsageOf?: (providerId: string) => ProviderGroupUsage | null;children: ReactNode;}) {const [nowMs, setNowMs] = useState(Date.now);@@ -71,15 +78,22 @@ export function ModelSourceUsageProvider({// Readers follow the directory's owner: remote directories read the device's mirrors,// never this desktop's accounts, even for matching IDs.const content = enabled- ? providers.reduce<ReactNode>((content, provider) => {+ ? providers.reduce<ReactNode>((content, row) => {+ // 供应商组:任务正经组在某台运行时读那台的账号,还没分到电脑时不显示某一台的配额。+ const group = groupUsageOf?.(row.id);+ if (group && (group.kind !== 'running' || !group.usage)) return content;+ const provider = group?.kind === 'running' && group.usage ? group.usage.provider : row;+ const readerDeviceId =+ group?.kind === 'running' && group.usage ? group.usage.scope.deviceId : deviceId;if (provider.auth?.method !== 'oauth') return content;const source = providerWeeklyQuotaSource(provider);if (!source || provider.subscriptionAccount?.reconnectRequired) return content;return (<SourceUsageProvider- key={`${deviceId ?? ''}:${provider.id}`}+ key={`${readerDeviceId ?? ''}:${provider.id}:${row.id}`}+ usageKey={row.id}provider={provider}- scope={{ deviceId }}+ scope={{ deviceId: readerDeviceId }}>{content}</SourceUsageProvider>diff --git a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsxindex dbb8db4c58..82b5c3af7e 100644--- a/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx+++ b/apps/desktop/src/renderer/components/new-chat/UnifiedModelPanel.tsx@@ -43,7 +43,7 @@ import {withMenuLabels,} from '@/components/ui/menu-row';import { ModelSourceUsageProvider } from './ModelSourceDetails';-import type { ProviderUsageScope } from './useProviderWeeklyQuota';+import type { ProviderGroupUsageOf, ProviderUsageScope } from './useProviderWeeklyQuota';import {anchorKey,favoriteMatchesSelection,@@ -143,6 +143,11 @@ export interface UnifiedModelPanelProps {interactionDisabled?: boolean;/** Whose subscription accounts the directory may show: this desktop or its linked device. */providerUsage?: ProviderUsageScope | null;+ /**+ * 供应商组那一项的用量读谁(provider-groups.md §10):任务正经组在某台运行时读那台,还没分到电脑时+ * 不显示某一台的配额。缺省 = 都按目录归属读。+ */+ providerGroupUsage?: ProviderGroupUsageOf;/** 保留付费模型为锁定展示行,并把点击交给统一付费提示。 */includePaymentRequired?: boolean;paymentRequiredLabel?: string;@@ -329,6 +334,7 @@ export function UnifiedModelPanel({listMaxHeight,interactionDisabled = false,providerUsage = null,+ providerGroupUsage,includePaymentRequired = false,paymentRequiredLabel,paymentRequiredUnlockLabel,@@ -1058,6 +1064,7 @@ export function UnifiedModelPanel({><UnifiedModelRailproviderUsage={providerUsage}+ {...(providerGroupUsage ? { providerGroupUsage } : {})}items={railItems}active={effectiveRail}onSelect={handleRailSelect}@@ -1372,7 +1379,16 @@ export function UnifiedModelPanel({</div>);return (- <ModelSourceUsageProvider providers={providers} scope={providerUsage}>+ <ModelSourceUsageProvider+ providers={providers}+ scope={providerUsage}+ {...(providerGroupUsage+ ? {+ groupUsageOf: (providerId: string) =>+ providerGroupUsage(remoteSources?.active?.deviceId ?? null, providerId),+ }+ : {})}+ >{panelContent}</ModelSourceUsageProvider>);diff --git a/apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx b/apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsxindex 14e4f82e6b..3f8bead5a3 100644--- a/apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx+++ b/apps/desktop/src/renderer/components/new-chat/UnifiedModelRail.tsx@@ -8,7 +8,11 @@ import { cn } from '@/lib/utils';import { providerAccountLabel } from '@/lib/providerDisplayName';import { Tip } from '@/components/ui/tooltip';-import { useProviderWeeklyQuota, type ProviderUsageScope } from './useProviderWeeklyQuota';+import {+ useProviderWeeklyQuota,+ type ProviderGroupUsageOf,+ type ProviderUsageScope,+} from './useProviderWeeklyQuota';import { formatQuotaResetCountdown } from '../status/usageCardModel';import { agentOptionOf } from './agentOptions';import { ProviderRailMark } from './UnifiedFlyoutHost';@@ -37,6 +41,7 @@ export function UnifiedModelRail({providerLabel,interactionDisabled = false,providerUsage = null,+ providerGroupUsage,remoteSources,}: {items: readonly UnifiedRailItem[];@@ -47,6 +52,8 @@ export function UnifiedModelRail({interactionDisabled?: boolean;/** Whose account usage the directory may show; null hides it. */providerUsage?: ProviderUsageScope | null;+ /** 供应商组那一格的用量读谁(provider-groups.md §10);缺省 = 都按格所在目录读。 */+ providerGroupUsage?: ProviderGroupUsageOf;/*** 远程供应商格的数据(只有可选远程 Agent 的新任务草稿传)。传了它,本机供应商格的* 图标 / 名字 / 用量一律按本机读 —— 面板此刻可能正列着某台电脑的目录。@@ -93,9 +100,32 @@ export function UnifiedModelRail({: remoteSources? null: (providerUsage?.deviceId ?? null);+ // 供应商组那一格代表组里的几台电脑:任务正经组在某台运行时读那台的账号(与输入框下方的用量+ // 一致),还没分到电脑时不显示某一台的配额;悬停多写一句说明是哪台。+ const groupUsage =+ provider && (item.kind === 'provider' || item.kind === 'remote-provider')+ ? (providerGroupUsage?.(+ item.kind === 'remote-provider' ? item.deviceId : null,+ item.providerId,+ ) ?? null)+ : null;+ const usageProvider = groupUsage+ ? groupUsage.kind === 'running'+ ? groupUsage.usage?.provider+ : undefined+ : provider;const accountIdentity =- provider?.openAiAccount?.identity?.trim() ||- provider?.subscriptionAccount?.identity?.trim();+ usageProvider?.openAiAccount?.identity?.trim() ||+ usageProvider?.subscriptionAccount?.identity?.trim();+ const groupNote = groupUsage+ ? groupUsage.kind !== 'running'+ ? t('newChat.modelSelector.unified.providerGroupUnassigned')+ : groupUsage.deviceName === null+ ? t('newChat.modelSelector.unified.providerGroupRunningHere')+ : t('newChat.modelSelector.unified.providerGroupRunningOn', {+ device: groupUsage.deviceName,+ })+ : undefined;const label =item.kind === 'favorites'? t('newChat.modelSelector.unified.railFavorites')@@ -119,12 +149,17 @@ export function UnifiedModelRail({<RailButtonlabel={label}accountIdentity={accountIdentity}+ {...(groupNote ? { groupNote } : {})}isActive={isActive}itemKey={key}onClick={() => onSelect(item)}disabled={interactionDisabled}- provider={providerUsage ? provider : undefined}- usageDeviceId={usageDeviceId}+ provider={providerUsage ? usageProvider : undefined}+ usageDeviceId={+ groupUsage?.kind === 'running' && groupUsage.usage+ ? groupUsage.usage.scope.deviceId+ : usageDeviceId+ }>{item.kind === 'favorites' ? (// ☆ 未激活与其它格同灰(hover 提亮)—— 常亮金色会在没进收藏视图时也@@ -154,6 +189,8 @@ export function UnifiedModelRail({interface RailButtonProps {label: string;accountIdentity?: string;+ /** 供应商组那一格:用量读的是哪台(或还没分到电脑),账号名跟在这一句后面。 */+ groupNote?: string;isActive: boolean;itemKey: string;onClick: () => void;@@ -181,6 +218,7 @@ function ProviderQuotaButton(props: RailButtonProps & { provider: ProviderView }function RailButtonView({label,accountIdentity,+ groupNote,isActive,itemKey,onClick,@@ -197,16 +235,21 @@ function RailButtonView({? null: `${t('quotaCard.weeklyLabel')} · ${t('quotaCard.remainingPercent', { percent: remaining })}`;const reset = formatQuotaResetCountdown(quota?.resetsAt, Date.now(), t);- const displayLabel = providerAccountLabel(label, accountIdentity);- const tooltip = quotaLabel ? (- <>- <div>{displayLabel}</div>- {quotaLabel && <div>{quotaLabel}</div>}- {reset && <div>{reset}</div>}- </>- ) : (- displayLabel- );+ // 供应商组:组名不带某一台的账号,账号跟在「当前在 {电脑} 上运行」后面。+ const displayLabel = groupNote ? label : providerAccountLabel(label, accountIdentity);+ const note = groupNote ? providerAccountLabel(groupNote, accountIdentity) : null;+ const description = [note, quotaLabel].filter(Boolean).join(' · ');+ const tooltip =+ quotaLabel || note ? (+ <>+ <div>{displayLabel}</div>+ {note && <div>{note}</div>}+ {quotaLabel && <div>{quotaLabel}</div>}+ {reset && <div>{reset}</div>}+ </>+ ) : (+ displayLabel+ );return (<Tiptext={tooltip}@@ -219,7 +262,7 @@ function RailButtonView({disabled={disabled}onClick={onClick}aria-label={displayLabel}- aria-description={quotaLabel ?? undefined}+ aria-description={description || undefined}aria-pressed={isActive}data-rail-item={itemKey}className={cn(diff --git a/apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.ts b/apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.tsindex e1be38d300..f8fe9a3d0e 100644--- a/apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.ts+++ b/apps/desktop/src/renderer/components/new-chat/useProviderWeeklyQuota.ts@@ -36,6 +36,33 @@ export interface ProviderUsageScope {deviceId: string | null;}+/**+ * 供应商组那一项的用量读谁(provider-groups.md §10「模型列表」):组那一项代表组里的几台电脑,+ * 不拿组所在电脑自己的账号当整个组的用量。+ */+export type ProviderGroupUsage =+ /** 任务还没经这个组分到电脑(新任务、还没运行过、用的不是这个组):不显示某一台的配额。 */+ | { kind: 'unassigned' }+ /**+ * 任务正经这个组在这台电脑上运行:读那台的账号,与输入框下方的用量同一份。+ * usage 为 null = 读不到那台的账号(别人分享的电脑、那台的目录还没读到)。+ */+ | {+ kind: 'running';+ /** 那台电脑的名字;null = 就是这台电脑。 */+ deviceName: string | null;+ usage: { provider: ProviderView; scope: ProviderUsageScope } | null;+ };++/**+ * 某个目录里的某个供应商是不是供应商组、用量读谁;不是组返回 null。+ * directoryDeviceId:目录所在的电脑,null = 任务所在电脑的目录。+ */+export type ProviderGroupUsageOf = (+ directoryDeviceId: string | null,+ providerId: string,+) => ProviderGroupUsage | null;+type CodexBucket = MobileCodexRateLimitsResult['rateLimits'];/** Codex account usage in one shape, whether it came from local app-server reads or a device. */diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsxindex 0f8ca3b3d3..04c10b4644 100644--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareManagePage.tsx@@ -1,46 +1,37 @@/*** 「{供应商} · 远程与分享」页(供应商分享 §7.2;供应商组 §10)。从设置 → 模型供应商「允许被远程调用」一行的- * 「远程与分享」入口进入,可返回。只列**这台电脑**上的设置:供应商组、待审批申请、已分享的人与按模型的用量。+ * 「远程与分享」入口进入,可返回。只列**这台电脑**上的设置:供应商组、按使用方的用量、待审批申请与已分享的人。** 打开期间每次 OWNED_CHANGED 都按当前时间段重读(main 因此保持快速拉取,申请能尽快出现);* 关闭、恢复、删除、同意、拒绝都立即生效,结果以 toast 说明。*/-import { ArrowLeft, ChevronRight } from 'lucide-react';+import { ArrowLeft } from 'lucide-react';import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from 'react';import { useTranslation } from 'react-i18next';import { Button } from '@/components/ui/button';import { useConfirmDialog } from '@/components/ui/confirm-dialog-provider';-import { SegmentedControl } from '@/components/ui/segmented-control';-import { Tip } from '@/components/ui/tooltip';import { useDeviceLinkDeviceList } from '@/features/device-link/useDeviceLinkDeviceList';import { toast } from '@/lib/toast';-import { formatModelShort } from '@/lib/usageFormat';import { cn } from '@/lib/utils';import { mapIpcErrorToI18nKey } from '@/utils/ipcError';import { ProviderGroupSection } from '@/features/provider-group/ProviderGroupSection';import type {+ ProviderOwnUsageView,ProviderShareMemberView,ProviderShareOwnerState,ProviderShareUsageRange,} from '../../../shared/providerShare';import { ProviderShareLinkDialog } from './ProviderShareLinkDialog';-import {- formatShareMoney,- formatShareTokens,- summarizeShareUsage,- type ProviderShareGate,- type ProviderSharePendingRequest,-} from './providerShareFormat';+import type { ProviderShareGate, ProviderSharePendingRequest } from './providerShareFormat';+import { ProviderUsageSection } from './ProviderUsageSection';import { publishProviderShareOwnerState, removeProviderSharePendingRequest } from './providerShareStore';import { ShareAvatar } from './ShareAvatar';import { useShareTimeFormat } from './useShareTimeFormat';export type { ProviderShareGate };-const RANGES: readonly ProviderShareUsageRange[] = ['7d', 'month', 'all'];-export function ProviderShareManagePage({providerId,providerName,@@ -61,8 +52,9 @@ export function ProviderShareManagePage({const [range, setRange] = useState<ProviderShareUsageRange>('month');const [state, setState] = useState<ProviderShareOwnerState | null>(null);const [loadFailed, setLoadFailed] = useState(false);+ const [own, setOwn] = useState<ProviderOwnUsageView | null>(null);+ const [ownFailed, setOwnFailed] = useState(false);const [linkOpen, setLinkOpen] = useState(false);- const [expanded, setExpanded] = useState<ReadonlySet<string>>(() => new Set());const [busy, setBusy] = useState<ReadonlySet<string>>(() => new Set());const loadSeq = useRef(0);const rangeRef = useRef(range);@@ -70,17 +62,27 @@ export function ProviderShareManagePage({const load = useCallback(async () => {const seq = ++loadSeq.current;- try {- const next = await window.electronAPI.providerShare.command({ action: 'owned', range: rangeRef.current });- if (seq !== loadSeq.current) return;- setState(next);+ const range = rangeRef.current;+ // 本机与我的其他电脑的用量读这台电脑自己的账本,不依赖分享服务,与分享的成员一起按同一个时间段读。+ const [owned, ownUsage] = await Promise.allSettled([+ window.electronAPI.providerShare.command({ action: 'owned', range }),+ window.electronAPI.providerShare.command({ action: 'own-usage', providerId, range }),+ ]);+ if (seq !== loadSeq.current) return;+ if (owned.status === 'fulfilled') {+ setState(owned.value);setLoadFailed(false);- publishProviderShareOwnerState(next);- } catch {- if (seq !== loadSeq.current) return;+ publishProviderShareOwnerState(owned.value);+ } else {setLoadFailed(true);}- }, []);+ if (ownUsage.status === 'fulfilled') {+ setOwn(ownUsage.value);+ setOwnFailed(false);+ } else {+ setOwnFailed(true);+ }+ }, [providerId]);useEffect(() => {void load();@@ -217,6 +219,18 @@ export function ProviderShareManagePage({<ProviderGroupSection providerId={providerId} providerName={providerName} />+ <ProviderUsageSection+ providerName={providerName}+ own={own}+ ownFailed={ownFailed}+ members={members}+ membersLoading={!state && !loadFailed}+ selfDeviceName={selfDeviceName}+ range={range}+ onRangeChange={setRange}+ time={time}+ />+<div className="mt-8 flex shrink-0 flex-wrap items-start gap-3"><div className="flex min-w-[240px] flex-1 flex-col gap-1"><h3 className="text-13 font-medium text-[var(--settings-section-title)]">@@ -314,13 +328,6 @@ export function ProviderShareManagePage({{t('providerShare.manage.members.title')}</h3>{members.length > 0 && <span className="text-13 text-[var(--text-tertiary)]">{members.length}</span>}- <span className="flex-1" />- <SegmentedControl- value={range}- onValueChange={setRange}- aria-label={t('providerShare.manage.members.rangeAria')}- options={RANGES.map((value) => ({ value, label: t(`providerShare.manage.members.range.${value}`) }))}- /></div><div className="overflow-hidden rounded-xl border border-[var(--settings-theme-card-border)] bg-[var(--settings-theme-card-bg)]">{members.length === 0 ? (@@ -338,17 +345,8 @@ export function ProviderShareManagePage({key={member.memberId}member={member}first={index === 0}- open={expanded.has(member.memberId)}busy={busy.has(member.memberId)}time={time}- onToggle={() =>- setExpanded((current) => {- const next = new Set(current);- if (next.has(member.memberId)) next.delete(member.memberId);- else next.add(member.memberId);- return next;- })- }onPause={() => void setMember(member, member.status === 'paused' ? 'resume' : 'pause')}onRemove={() => void removeMember(member)}/>@@ -371,151 +369,76 @@ export function ProviderShareManagePage({function MemberRow({member,first,- open,busy,time,- onToggle,onPause,onRemove,}: {member: ProviderShareMemberView;first: boolean;- open: boolean;busy: boolean;time: ReturnType<typeof useShareTimeFormat>;- onToggle: () => void;onPause: () => void;onRemove: () => void;}) {const { t } = useTranslation();const paused = member.status === 'paused';- const totals = summarizeShareUsage(member.models);- const breakdownId = `provider-share-usage-${member.memberId}`;const statusText = paused? t('providerShare.manage.members.statusPaused'): member.runningTasks > 0? t('providerShare.manage.members.statusRunning', { count: member.runningTasks }): t('providerShare.manage.members.statusActive');- const toggleLabel = t(open ? 'providerShare.manage.members.collapseAria' : 'providerShare.manage.members.expandAria', {- name: member.displayName,- });+ // 用量在上方「用量」块里按人列出(供应商组 §10),这里只管分享本身。return (<divdata-testid="provider-share-member-row"- className={cn(!first && 'border-t border-[var(--settings-theme-card-border)]')}+ className={cn('flex flex-wrap items-center gap-3 px-4 py-3', !first && 'border-t border-[var(--settings-theme-card-border)]')}>- <div className="flex flex-wrap items-center gap-3 px-4 py-3">- <Tip text={toggleLabel}>- <button- type="button"- onClick={onToggle}- aria-expanded={open}- aria-controls={breakdownId}- aria-label={toggleLabel}- className="-ml-1 flex h-6 w-6 shrink-0 items-center justify-center rounded-full text-[var(--text-secondary)] transition-colors hover:bg-[var(--surface-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]"- >- <ChevronRight- size={14}- aria-hidden- className={cn('transition-transform duration-150 motion-reduce:transition-none', open && 'rotate-90')}+ <ShareAvatar+ displayName={member.displayName}+ avatarUrl={member.avatarUrl}+ className={cn(paused && 'opacity-70')}+ />+ <div className={cn('flex min-w-[180px] flex-1 flex-col gap-0.5', paused && 'opacity-70')}>+ <div className="flex flex-wrap items-center gap-2 text-13">+ <span className="font-medium text-[var(--text-primary)]">{member.displayName}</span>+ <span className="inline-flex items-center gap-1.5 text-12 text-[var(--text-secondary)]">+ <span+ aria-hidden="true"+ className={cn(+ 'h-1.5 w-1.5 shrink-0 rounded-full',+ paused ? 'bg-[var(--remote-status-disconnected)]' : 'bg-[var(--remote-status-ready)]',+ )}/>- </button>- </Tip>- <ShareAvatar- displayName={member.displayName}- avatarUrl={member.avatarUrl}- className={cn(paused && 'opacity-70')}- />- <div className={cn('flex min-w-[180px] flex-1 flex-col gap-0.5', paused && 'opacity-70')}>- <div className="flex flex-wrap items-center gap-2 text-13">- <span className="font-medium text-[var(--text-primary)]">{member.displayName}</span>- <span className="inline-flex items-center gap-1.5 text-12 text-[var(--text-secondary)]">- <span- aria-hidden="true"- className={cn(- 'h-1.5 w-1.5 shrink-0 rounded-full',- paused ? 'bg-[var(--remote-status-disconnected)]' : 'bg-[var(--remote-status-ready)]',- )}- />- {statusText}- </span>- </div>- <div className="flex flex-wrap gap-1.5 text-12 text-[var(--text-secondary)]">- <span>{t('providerShare.manage.members.joined', { date: time.date(Date.parse(member.joinedAt)) })}</span>- <span aria-hidden="true">·</span>- <span>- {member.lastUsedAt- ? t('providerShare.manage.members.lastUsed', { time: time.relative(member.lastUsedAt) })- : t('providerShare.manage.members.neverUsed')}- </span>- </div>- </div>- <div className={cn('flex shrink-0 flex-col items-end text-12 text-[var(--text-secondary)]', paused && 'opacity-70')}>- <span className="text-13 font-medium text-[var(--text-primary)] [font-variant-numeric:tabular-nums]">- {t('providerShare.manage.members.tokens', { tokens: formatShareTokens(totals.tokens) })}+ {statusText}</span>- {totals.amount && (- <span className="[font-variant-numeric:tabular-nums]">- {t('providerShare.manage.members.amount', { amount: formatShareMoney(totals.amount) })}- </span>- )}</div>- <div className="flex shrink-0 items-center gap-1.5">- <Button variant="secondary" size="sm" compact disabled={busy} onClick={onPause}>- {t(paused ? 'providerShare.manage.members.resume' : 'providerShare.manage.members.pause')}- </Button>- <Button- variant="secondary"- tone="danger"- size="sm"- compact- disabled={busy}- aria-label={t('providerShare.manage.members.removeAria', { name: member.displayName })}- onClick={onRemove}- >- {t('providerShare.manage.members.remove')}- </Button>+ <div className="flex flex-wrap gap-1.5 text-12 text-[var(--text-secondary)]">+ <span>{t('providerShare.manage.members.joined', { date: time.date(Date.parse(member.joinedAt)) })}</span>+ <span aria-hidden="true">·</span>+ <span>+ {member.lastUsedAt+ ? t('providerShare.manage.members.lastUsed', { time: time.relative(member.lastUsedAt) })+ : t('providerShare.manage.members.neverUsed')}+ </span></div></div>- {/* 明细表与头像左缘对齐:px-4 + 展开按钮(24 - 4) + gap-3 = 48px。 */}- {open && (- <div id={breakdownId} className="px-4 pb-3.5 sm:pl-12">- <table className="w-full border-collapse text-12">- <thead>- <tr className="border-b border-[var(--border-default)] text-left text-[var(--text-secondary)]">- <th scope="col" className="py-1.5 pr-3 font-medium">{t('providerShare.manage.members.table.model')}</th>- <th scope="col" className="py-1.5 pr-3 text-right font-medium">{t('providerShare.manage.members.table.turns')}</th>- <th scope="col" className="py-1.5 pr-3 text-right font-medium">{t('providerShare.manage.members.table.input')}</th>- <th scope="col" className="py-1.5 pr-3 text-right font-medium">{t('providerShare.manage.members.table.output')}</th>- <th scope="col" className="py-1.5 text-right font-medium">{t('providerShare.manage.members.table.amount')}</th>- </tr>- </thead>- <tbody className="text-[var(--text-primary)] [font-variant-numeric:tabular-nums]">- {member.models.length === 0 ? (- <tr>- <td colSpan={5} className="py-2 text-[var(--text-secondary)]">- {t('providerShare.manage.members.noUsage')}- </td>- </tr>- ) : (- member.models.map((model) => (- <tr- key={`${model.kind}:${model.providerId ?? ''}:${model.model}`}- className="border-b border-[var(--border-default)] last:border-b-0"- >- <td className="py-1.5 pr-3">{formatModelShort(model.model)}</td>- <td className="py-1.5 pr-3 text-right">{model.turns}</td>- <td className="py-1.5 pr-3 text-right">{formatShareTokens(model.inputTokens)}</td>- <td className="py-1.5 pr-3 text-right">{formatShareTokens(model.outputTokens)}</td>- <td className="py-1.5 text-right">{model.amount ? formatShareMoney(model.amount) : '—'}</td>- </tr>- ))- )}- </tbody>- </table>- <p className="mt-2 text-12 text-[var(--text-tertiary)]">{t('providerShare.manage.members.estimateNote')}</p>- </div>- )}+ <div className="flex shrink-0 items-center gap-1.5">+ <Button variant="secondary" size="sm" compact disabled={busy} onClick={onPause}>+ {t(paused ? 'providerShare.manage.members.resume' : 'providerShare.manage.members.pause')}+ </Button>+ <Button+ variant="secondary"+ tone="danger"+ size="sm"+ compact+ disabled={busy}+ aria-label={t('providerShare.manage.members.removeAria', { name: member.displayName })}+ onClick={onRemove}+ >+ {t('providerShare.manage.members.remove')}+ </Button>+ </div></div>);}diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsxnew file mode 100644index 0000000000..ad98e4488a--- /dev/null+++ b/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx@@ -0,0 +1,278 @@+/**+ * 「远程与分享」页的「用量」块(供应商组 §7、§10):按使用方列出这个供应商的用量——本机、我的其他电脑+ * (按电脑分开)、分享的人(按人分开),共用一个时间段切换,每行可展开按模型的明细。+ *+ * 本机与我的其他电脑来自这台电脑自己的账本(main 的 own-usage),分享的人来自分享服务的成员用量;+ * 其他电脑经供应商组直接连到别的组内电脑运行的任务这台电脑经手不到,不在这里。+ */+import { ChevronRight, Monitor } from 'lucide-react';+import { useMemo, useState } from 'react';+import { useTranslation } from 'react-i18next';++import { SegmentedControl } from '@/components/ui/segmented-control';+import { Tip } from '@/components/ui/tooltip';+import { useDeviceLinkDeviceList } from '@/features/device-link/useDeviceLinkDeviceList';+import { formatModelShort } from '@/lib/usageFormat';+import { cn } from '@/lib/utils';++import type {+ ProviderOwnUsageView,+ ProviderShareMemberView,+ ProviderShareModelUsageView,+ ProviderShareUsageRange,+} from '../../../shared/providerShare';+import { formatShareMoney, formatShareTokens, summarizeShareUsage } from './providerShareFormat';+import { ShareAvatar } from './ShareAvatar';+import type { ShareTimeFormat } from './useShareTimeFormat';++const RANGES: readonly ProviderShareUsageRange[] = ['7d', 'month', 'all'];++interface UsageParty {+ key: string;+ name: string;+ source: string | null;+ /** 分享的人用头像,电脑用设备图标。 */+ person?: { displayName: string; avatarUrl?: string | null };+ lastUsedAt: number | null;+ models: ProviderShareModelUsageView[];+}++export function ProviderUsageSection({+ providerName,+ own,+ ownFailed,+ members,+ membersLoading,+ selfDeviceName,+ range,+ onRangeChange,+ time,+}: {+ providerName: string;+ /** null = 还没读到。 */+ own: ProviderOwnUsageView | null;+ ownFailed: boolean;+ members: readonly ProviderShareMemberView[];+ /** 分享服务的成员还没读到。 */+ membersLoading: boolean;+ selfDeviceName: string | null;+ range: ProviderShareUsageRange;+ onRangeChange: (range: ProviderShareUsageRange) => void;+ time: ShareTimeFormat;+}) {+ const { t } = useTranslation();+ const devices = useDeviceLinkDeviceList();+ const [expanded, setExpanded] = useState<ReadonlySet<string>>(() => new Set());++ const parties = useMemo<UsageParty[]>(() => {+ const rows: UsageParty[] = [];+ // 本机一行总在,没用过也写出来:这一块就是要看得到自己的用量。+ if (own || ownFailed) {+ rows.push({+ key: 'local',+ name: t('providerGroup.member.local'),+ source: selfDeviceName,+ lastUsedAt: own?.local?.lastUsedAt ?? null,+ models: own?.local?.models ?? [],+ });+ }+ for (const party of own?.devices ?? []) {+ if (!party.deviceId) continue;+ rows.push({+ key: `device:${party.deviceId}`,+ name:+ devices?.find((device) => device.deviceId === party.deviceId)?.name ||+ party.deviceName ||+ t('providerGroup.usage.unknownDevice'),+ source: t('providerGroup.member.sourceDevice'),+ lastUsedAt: party.lastUsedAt,+ models: party.models,+ });+ }+ for (const member of members) {+ rows.push({+ key: `member:${member.memberId}`,+ name: member.displayName,+ source: t('providerGroup.usage.shareSource'),+ person: { displayName: member.displayName, avatarUrl: member.avatarUrl },+ lastUsedAt: member.lastUsedAt,+ models: member.models,+ });+ }+ return rows;+ }, [devices, members, own, ownFailed, selfDeviceName, t]);++ const toggle = (key: string) =>+ setExpanded((current) => {+ const next = new Set(current);+ if (next.has(key)) next.delete(key);+ else next.add(key);+ return next;+ });++ return (+ <section className="mt-8 shrink-0" aria-labelledby="provider-usage-title">+ <div className="mb-2 flex flex-wrap items-center gap-2">+ <div className="flex min-w-[240px] flex-1 flex-col gap-1">+ <h3 id="provider-usage-title" className="text-13 font-medium text-[var(--settings-section-title)]">+ {t('providerGroup.usage.title')}+ </h3>+ <p className="text-12 leading-[1.5] text-[var(--settings-section-desc)]">+ {t('providerGroup.usage.description', { provider: providerName })}+ </p>+ </div>+ <SegmentedControl+ value={range}+ onValueChange={onRangeChange}+ aria-label={t('providerShare.manage.members.rangeAria')}+ options={RANGES.map((value) => ({ value, label: t(`providerShare.manage.members.range.${value}`) }))}+ />+ </div>+ <div className="overflow-hidden rounded-xl border border-[var(--settings-theme-card-border)] bg-[var(--settings-theme-card-bg)]">+ {parties.length === 0 ? (+ <p className="px-4 py-7 text-center text-13 leading-[1.5] text-[var(--text-secondary)]">+ {membersLoading || !own ? t('providerShare.manage.loading') : '—'}+ </p>+ ) : (+ parties.map((party, index) => (+ <UsagePartyRow+ key={party.key}+ party={party}+ first={index === 0}+ open={expanded.has(party.key)}+ unavailable={party.key === 'local' && ownFailed && !own}+ time={time}+ onToggle={() => toggle(party.key)}+ />+ ))+ )}+ </div>+ </section>+ );+}++function UsagePartyRow({+ party,+ first,+ open,+ unavailable,+ time,+ onToggle,+}: {+ party: UsageParty;+ first: boolean;+ open: boolean;+ /** 本机账本没读出来:不写 0,免得被当成没用过。 */+ unavailable: boolean;+ time: ShareTimeFormat;+ onToggle: () => void;+}) {+ const { t } = useTranslation();+ const totals = summarizeShareUsage(party.models);+ const breakdownId = `provider-usage-${party.key}`;+ const toggleLabel = t(open ? 'providerShare.manage.members.collapseAria' : 'providerShare.manage.members.expandAria', {+ name: party.name,+ });+ return (+ <div+ data-testid="provider-usage-row"+ data-usage-party={party.key}+ className={cn(!first && 'border-t border-[var(--settings-theme-card-border)]')}+ >+ <div className="flex flex-wrap items-center gap-3 px-4 py-3">+ <Tip text={toggleLabel}>+ <button+ type="button"+ onClick={onToggle}+ disabled={unavailable}+ aria-expanded={open}+ aria-controls={breakdownId}+ aria-label={toggleLabel}+ className="-ml-1 flex h-6 w-6 shrink-0 items-center justify-center rounded-full text-[var(--text-secondary)] transition-colors hover:bg-[var(--surface-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)] disabled:opacity-50"+ >+ <ChevronRight+ size={14}+ aria-hidden+ className={cn('transition-transform duration-150 motion-reduce:transition-none', open && 'rotate-90')}+ />+ </button>+ </Tip>+ {party.person ? (+ <ShareAvatar displayName={party.person.displayName} avatarUrl={party.person.avatarUrl} />+ ) : (+ // 电脑用设备图标(与上方组内电脑一致);人像头像留给分享的人。+ <span+ aria-hidden="true"+ className="inline-flex h-8 w-8 shrink-0 items-center justify-center rounded-full bg-[var(--surface-chip)] text-[var(--text-secondary)]"+ >+ <Monitor size={16} />+ </span>+ )}+ <div className="flex min-w-[180px] flex-1 flex-col gap-0.5">+ <div className="flex flex-wrap items-baseline gap-2 text-13">+ <span className="font-medium text-[var(--text-primary)]">{party.name}</span>+ {party.source && <span className="text-12 text-[var(--text-secondary)]">{party.source}</span>}+ </div>+ <span className="text-12 text-[var(--text-secondary)]">+ {unavailable+ ? t('providerShare.manage.loadFailed')+ : party.lastUsedAt+ ? t('providerShare.manage.members.lastUsed', { time: time.relative(party.lastUsedAt) })+ : t('providerShare.manage.members.neverUsed')}+ </span>+ </div>+ {!unavailable && (+ <div className="flex shrink-0 flex-col items-end text-12 text-[var(--text-secondary)]">+ <span className="text-13 font-medium text-[var(--text-primary)] [font-variant-numeric:tabular-nums]">+ {t('providerShare.manage.members.tokens', { tokens: formatShareTokens(totals.tokens) })}+ </span>+ {totals.amount && (+ <span className="[font-variant-numeric:tabular-nums]">+ {t('providerShare.manage.members.amount', { amount: formatShareMoney(totals.amount) })}+ </span>+ )}+ </div>+ )}+ </div>+ {/* 明细表与头像左缘对齐:px-4 + 展开按钮(24 - 4) + gap-3 = 48px。 */}+ {open && !unavailable && (+ <div id={breakdownId} className="px-4 pb-3.5 sm:pl-12">+ <table className="w-full border-collapse text-12">+ <thead>+ <tr className="border-b border-[var(--border-default)] text-left text-[var(--text-secondary)]">+ <th scope="col" className="py-1.5 pr-3 font-medium">{t('providerShare.manage.members.table.model')}</th>+ <th scope="col" className="py-1.5 pr-3 text-right font-medium">{t('providerShare.manage.members.table.turns')}</th>+ <th scope="col" className="py-1.5 pr-3 text-right font-medium">{t('providerShare.manage.members.table.input')}</th>+ <th scope="col" className="py-1.5 pr-3 text-right font-medium">{t('providerShare.manage.members.table.output')}</th>+ <th scope="col" className="py-1.5 text-right font-medium">{t('providerShare.manage.members.table.amount')}</th>+ </tr>+ </thead>+ <tbody className="text-[var(--text-primary)] [font-variant-numeric:tabular-nums]">+ {party.models.length === 0 ? (+ <tr>+ <td colSpan={5} className="py-2 text-[var(--text-secondary)]">+ {t('providerShare.manage.members.noUsage')}+ </td>+ </tr>+ ) : (+ party.models.map((model) => (+ <tr+ key={`${model.kind}:${model.providerId ?? ''}:${model.model}`}+ className="border-b border-[var(--border-default)] last:border-b-0"+ >+ <td className="py-1.5 pr-3">{formatModelShort(model.model)}</td>+ <td className="py-1.5 pr-3 text-right">{model.turns}</td>+ <td className="py-1.5 pr-3 text-right">{formatShareTokens(model.inputTokens)}</td>+ <td className="py-1.5 pr-3 text-right">{formatShareTokens(model.outputTokens)}</td>+ <td className="py-1.5 text-right">{model.amount ? formatShareMoney(model.amount) : '—'}</td>+ </tr>+ ))+ )}+ </tbody>+ </table>+ <p className="mt-2 text-12 text-[var(--text-tertiary)]">{t('providerShare.manage.members.estimateNote')}</p>+ </div>+ )}+ </div>+ );+}diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsxindex 1df0fc84bb..4887641eb6 100644--- a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareManagePage.test.tsx@@ -2,7 +2,7 @@import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';-import type { ProviderShareOwnerState } from '../../../../shared/providerShare';+import type { ProviderOwnUsageView, ProviderShareOwnerState } from '../../../../shared/providerShare';import { ProviderShareManagePage } from '../ProviderShareManagePage';import { getProviderSharePendingRequests, resetProviderShareStoreForTests } from '../providerShareStore';@@ -16,7 +16,10 @@ vi.mock('react-i18next', () => ({}));vi.mock('@/lib/toast', () => ({ toast: { success: vi.fn(), error: vi.fn(), info: vi.fn() } }));vi.mock('@/features/device-link/useDeviceLinkDeviceList', () => ({- useDeviceLinkDeviceList: () => [{ deviceId: 'self', name: "Magi's Mac Mini", isSelf: true }],+ useDeviceLinkDeviceList: () => [+ { deviceId: 'self', name: "Magi's Mac Mini", isSelf: true },+ { deviceId: 'studio', name: 'Studio', isSelf: false },+ ],}));const confirmSpy = vi.hoisted(() => vi.fn(async () => true));vi.mock('@/components/ui/confirm-dialog-provider', () => ({ useConfirmDialog: () => ({ confirm: confirmSpy }) }));@@ -71,6 +74,26 @@ const owned = (): ProviderShareOwnerState => ({],});+const usageModel = (model: string, inputTokens: number, amount: number) => ({+ kind: 'claude-code',+ providerId: 'xd',+ model,+ turns: 3,+ inputTokens,+ outputTokens: 1_000,+ cacheReadTokens: 0,+ cacheCreateTokens: 0,+ amount: { amount, currency: 'USD' as const },+});++const ownUsage = (): ProviderOwnUsageView => ({+ providerId: 'xd',+ local: { deviceId: null, deviceName: null, lastUsedAt: Date.now() - 120_000, models: [usageModel('claude-sonnet-5', 41_000, 2.5)] },+ devices: [+ { deviceId: 'studio', deviceName: 'Old Studio Name', lastUsedAt: Date.now() - 3_600_000, models: [usageModel('claude-fable-5-1', 9_000, 1.25)] },+ ],+});+const command = vi.fn();beforeEach(() => {@@ -79,6 +102,7 @@ beforeEach(() => {command.mockReset();command.mockImplementation(async (cmd: { action: string }) => {if (cmd.action === 'owned') return owned();+ if (cmd.action === 'own-usage') return ownUsage();if (cmd.action === 'set-member' || cmd.action === 'approve' || cmd.action === 'reject') return { ok: true };throw new Error(`unexpected ${cmd.action}`);});@@ -113,18 +137,44 @@ describe('ProviderShareManagePage', () => {expect(screen.getByText(/providerShare\.manage\.descriptionWithDevice/)).toBeTruthy();});+ it('lists usage by party: this computer, my other computers and the people shared with', async () => {+ renderPage();+ const rows = await screen.findAllByTestId('provider-usage-row');+ expect(rows.map((row) => row.getAttribute('data-usage-party'))).toEqual(['local', 'device:studio', 'member:mem-1']);+ expect(command).toHaveBeenCalledWith({ action: 'own-usage', providerId: 'xd', range: 'month' });+ // 本机写本机的电脑名;其他电脑用设备清单里现在的名字。+ expect(rows[0]!.textContent).toContain("Magi's Mac Mini");+ expect(rows[1]!.textContent).toContain('Studio');+ expect(rows[1]!.textContent).not.toContain('Old Studio Name');+ // 用量从已分享的人一行移到了「用量」块。+ expect(screen.getByTestId('provider-share-member-row').textContent).not.toMatch(/members\.tokens/);+ });+it('re-reads usage when the period changes and expands the per-model breakdown', async () => {renderPage();- await screen.findAllByTestId('provider-share-member-row');+ await screen.findAllByTestId('provider-usage-row');fireEvent.click(screen.getByRole('radio', { name: 'providerShare.manage.members.range.7d' }));await waitFor(() => expect(command).toHaveBeenCalledWith({ action: 'owned', range: '7d' }));+ expect(command).toHaveBeenCalledWith({ action: 'own-usage', providerId: 'xd', range: '7d' });- fireEvent.click(screen.getByRole('button', { name: /providerShare\.manage\.members\.expandAria/ }));+ fireEvent.click(screen.getByRole('button', { name: /providerShare\.manage\.members\.expandAria.*Lizi/ }));expect(screen.getByText('Opus 5.5')).toBeTruthy();expect(screen.getByText('$31.20')).toBeTruthy();expect(screen.getByText('providerShare.manage.members.estimateNote')).toBeTruthy();});+ it('does not show zero for this computer when its usage could not be read', async () => {+ command.mockImplementation(async (cmd: { action: string }) => {+ if (cmd.action === 'owned') return owned();+ throw new Error('boom');+ });+ renderPage();+ const rows = await screen.findAllByTestId('provider-usage-row');+ expect(rows[0]!.getAttribute('data-usage-party')).toBe('local');+ expect(rows[0]!.textContent).toContain('providerShare.manage.loadFailed');+ expect(rows[0]!.textContent).not.toMatch(/members\.tokens/);+ });+it('pauses and removes a member after confirmation', async () => {renderPage();await screen.findAllByTestId('provider-share-member-row');diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 9fe3c8fb49..7d3081b6bd 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -402,6 +402,12 @@"title": "{{provider}} · Remote & Sharing","shareTitle": "Sharing"},+ "usage": {+ "title": "Usage",+ "description": "{{provider}} usage by who used it. This computer and your other computers are counted from this update on.",+ "shareSource": "Shared with",+ "unknownDevice": "Another computer"+ },"section": {"title": "Provider Group","addComputer": "Add Computer",@@ -9439,7 +9445,10 @@"crossEngineWarning": "Switching engines rebuilds context and may lose content","favoritesSyncFailed": "Favorites could not sync. Reopen the picker to retry; the remote computer may need an update.","railRemoteProviderGroup": "{{provider}} · {{device}} · {{group}}",- "providerGroupLabel": "{{provider}} · {{group}}"+ "providerGroupLabel": "{{provider}} · {{group}}",+ "providerGroupRunningOn": "Running on {{device}}",+ "providerGroupRunningHere": "Running on this computer",+ "providerGroupUnassigned": "The Provider Group picks a computer when the task starts; usage then shows for that computer"}},"permissionSelector": {diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex f390d09b2a..0acff82436 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -400,6 +400,12 @@"title": "{{provider}} · リモートと共有","shareTitle": "共有"},+ "usage": {+ "title": "使用量",+ "description": "{{provider}} の使用量を利用者ごとに表示します。このパソコンとほかのパソコンの分は、今回のアップデートから記録します。",+ "shareSource": "共有相手",+ "unknownDevice": "別のパソコン"+ },"section": {"title": "プロバイダーグループ","addComputer": "パソコンを追加",@@ -9420,7 +9426,10 @@"crossEngineWarning": "エンジンを切り替えるとコンテキストが再構築され、内容が失われる場合があります","favoritesSyncFailed": "お気に入りを同期できません。選択画面を開き直してください。接続先の更新が必要な場合があります。","railRemoteProviderGroup": "{{provider}} · {{device}} · {{group}}",- "providerGroupLabel": "{{provider}} · {{group}}"+ "providerGroupLabel": "{{provider}} · {{group}}",+ "providerGroupRunningOn": "現在 {{device}} で実行中",+ "providerGroupRunningHere": "現在このパソコンで実行中",+ "providerGroupUnassigned": "開始時にプロバイダーグループがパソコンを選び、使用量はそのパソコンの分を表示します"}},"permissionSelector": {diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 251cc446e0..96bd2b253c 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -400,6 +400,12 @@"title": "{{provider}} · 원격 및 공유","shareTitle": "공유"},+ "usage": {+ "title": "사용량",+ "description": "{{provider}} 사용량을 사용한 곳별로 보여 줍니다. 이 컴퓨터와 내 다른 컴퓨터는 이번 업데이트부터 기록합니다.",+ "shareSource": "공유한 사람",+ "unknownDevice": "다른 컴퓨터"+ },"section": {"title": "제공자 그룹","addComputer": "컴퓨터 추가",@@ -9420,7 +9426,10 @@"crossEngineWarning": "엔진을 전환하면 컨텍스트가 다시 구성되어 내용이 사라질 수 있습니다","favoritesSyncFailed": "즐겨찾기를 동기화할 수 없습니다. 선택 화면을 다시 여세요. 원격 컴퓨터를 업데이트해야 할 수 있습니다.","railRemoteProviderGroup": "{{provider}} · {{device}} · {{group}}",- "providerGroupLabel": "{{provider}} · {{group}}"+ "providerGroupLabel": "{{provider}} · {{group}}",+ "providerGroupRunningOn": "현재 {{device}}에서 실행 중",+ "providerGroupRunningHere": "현재 이 컴퓨터에서 실행 중",+ "providerGroupUnassigned": "시작하면 제공자 그룹이 컴퓨터를 고르고, 사용량은 그 컴퓨터 기준으로 표시됩니다"}},"permissionSelector": {diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 39f7dfed27..f3ef7a5c80 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -400,6 +400,12 @@"title": "{{provider}} · 远程与分享","shareTitle": "分享"},+ "usage": {+ "title": "用量",+ "description": "按使用方统计 {{provider}} 的用量。本机与我的其他电脑从这次更新后开始记录。",+ "shareSource": "分享的人",+ "unknownDevice": "另一台电脑"+ },"section": {"title": "供应商组","addComputer": "添加电脑",@@ -9420,7 +9426,10 @@"crossEngineWarning": "切换引擎会重建上下文,可能丢失内容","favoritesSyncFailed": "收藏未能同步。请重新打开重试;被控电脑可能需要更新。","railRemoteProviderGroup": "{{provider}} · {{device}} · {{group}}",- "providerGroupLabel": "{{provider}} · {{group}}"+ "providerGroupLabel": "{{provider}} · {{group}}",+ "providerGroupRunningOn": "当前在 {{device}} 上运行",+ "providerGroupRunningHere": "当前在这台电脑上运行",+ "providerGroupUnassigned": "开始后由供应商组选一台电脑,用量按那台显示"}},"permissionSelector": {diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 757ca87030..8f49557ba8 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -400,6 +400,12 @@"title": "{{provider}} · 遠端與分享","shareTitle": "分享"},+ "usage": {+ "title": "用量",+ "description": "依使用方統計 {{provider}} 的用量。本機與我的其他電腦從這次更新後開始記錄。",+ "shareSource": "分享的人",+ "unknownDevice": "另一台電腦"+ },"section": {"title": "供應商組","addComputer": "新增電腦",@@ -9419,7 +9425,10 @@"crossEngineWarning": "切換引擎會重建上下文,可能遺失內容","favoritesSyncFailed": "收藏未能同步。請重新開啟重試;被控電腦可能需要更新。","railRemoteProviderGroup": "{{provider}} · {{device}} · {{group}}",- "providerGroupLabel": "{{provider}} · {{group}}"+ "providerGroupLabel": "{{provider}} · {{group}}",+ "providerGroupRunningOn": "目前在 {{device}} 上執行",+ "providerGroupRunningHere": "目前在這台電腦上執行",+ "providerGroupUnassigned": "開始後由供應商組選一台電腦,用量依那台顯示"},"modelListAria": "模型清單"},diff --git a/apps/desktop/src/renderer/lib/__tests__/remoteProviderGroups.test.ts b/apps/desktop/src/renderer/lib/__tests__/remoteProviderGroups.test.tsindex f1599c5900..f735635f06 100644--- a/apps/desktop/src/renderer/lib/__tests__/remoteProviderGroups.test.ts+++ b/apps/desktop/src/renderer/lib/__tests__/remoteProviderGroups.test.ts@@ -5,7 +5,12 @@import type { ProviderView } from '@cindy/model-providers';import { describe, expect, it } from 'vitest';-import { collectRemoteProviderGroups, remoteProviderEntryKey } from '../remoteProviderGroups';+import {+ collectRemoteProviderGroups,+ providerGroupMemberOfRoute,+ remoteProviderEntryKey,+} from '../remoteProviderGroups';+import type { ProviderGroupConfig } from '../../../shared/providerGroup';function provider(id: string, extra: Record<string, unknown> = {}): ProviderView {return { id, name: id, agents: ['claude-code'], connected: true, remoteInvocationEnabled: true, models: {}, routing: {}, ...extra } as unknown as ProviderView;@@ -88,3 +93,42 @@ describe('collectRemoteProviderGroups', () => {expect(result.groups.size).toBe(0);});});++describe('providerGroupMemberOfRoute', () => {+ const member = (kind: 'local' | 'device' | 'share', agentDeviceId: string | null, providerId: string) => ({+ key: `${kind}:${agentDeviceId}:${providerId}`, kind, agentDeviceId, providerId, limit: 4, weight: 1, paused: false,+ });+ // Mini 上的组:Mini 自己、Studio、这台电脑(desk)、Kai 分享来的一台。+ const config: ProviderGroupConfig = {+ strategy: 'least',+ autoSwitch: true,+ members: [+ member('local', null, 'anthropic'),+ member('device', 'studio', 'anthropic-1a2b3c4d'),+ member('device', 'desk', 'anthropic-9z'),+ member('share', 'share:s1', 'anthropic'),+ ],+ };++ it('finds the computer the task now runs on, seen from the task computer', () => {+ const of = (agentDeviceId: string | null, providerId: string) =>+ providerGroupMemberOfRoute(config, 'mini', { agentDeviceId, providerId }, 'desk');+ expect(of('mini', 'anthropic')).toEqual({ agentDeviceId: 'mini', providerId: 'anthropic' });+ expect(of('studio', 'anthropic-1a2b3c4d')).toEqual({ agentDeviceId: 'studio', providerId: 'anthropic-1a2b3c4d' });+ expect(of('share:s1', 'anthropic')).toEqual({ agentDeviceId: 'share:s1', providerId: 'anthropic' });+ // 组员就是任务所在电脑:任务记录里 Agent 位置为空(或写着自己)。+ expect(of(null, 'anthropic-9z')).toEqual({ agentDeviceId: null, providerId: 'anthropic-9z' });+ expect(of('desk', 'anthropic-9z')).toEqual({ agentDeviceId: null, providerId: 'anthropic-9z' });+ });++ it('does not match another provider on a member computer or a computer outside the group', () => {+ expect(providerGroupMemberOfRoute(config, 'mini', { agentDeviceId: 'studio', providerId: 'openai' }, 'desk')).toBeUndefined();+ expect(providerGroupMemberOfRoute(config, 'mini', { agentDeviceId: 'laptop', providerId: 'anthropic' }, 'desk')).toBeUndefined();+ expect(providerGroupMemberOfRoute(config, 'mini', { agentDeviceId: null, providerId: 'anthropic' }, 'desk')).toBeUndefined();+ });++ it('treats the group computer itself as the task computer for a group built here', () => {+ expect(providerGroupMemberOfRoute(config, null, { agentDeviceId: null, providerId: 'anthropic' }, 'mini'))+ .toEqual({ agentDeviceId: null, providerId: 'anthropic' });+ });+});diff --git a/apps/desktop/src/renderer/lib/remoteProviderGroups.ts b/apps/desktop/src/renderer/lib/remoteProviderGroups.tsindex 43d6f813b9..4d4cd12d44 100644--- a/apps/desktop/src/renderer/lib/remoteProviderGroups.ts+++ b/apps/desktop/src/renderer/lib/remoteProviderGroups.ts@@ -70,3 +70,34 @@ export function collectRemoteProviderGroups(for (const key of groups.keys()) memberOf.delete(key);return { hidden: new Set(memberOf.keys()), groups, memberOf };}++/** 任务此刻的 Agent 位置:哪台电脑(null = 任务所在电脑)上的哪个供应商。 */+export interface ProviderGroupTaskRoute {+ agentDeviceId: string | null;+ providerId: string;+}++/**+ * 任务正在组里哪台电脑上运行:组分好电脑后,任务记录改成那台的位置与供应商(provider-groups.md §6),+ * 所以逐台比对组内电脑。返回那台从任务所在电脑看的位置(null = 任务所在电脑);不在组里任何一台上+ * 返回 undefined。+ *+ * @param ownerDeviceId 组所在电脑;组就建在任务所在电脑上时传 null。+ * @param taskDeviceId 任务所在电脑的设备 id:组员就是它时按「任务所在电脑」比。+ */+export function providerGroupMemberOfRoute(+ config: ProviderGroupConfig,+ ownerDeviceId: string | null,+ route: ProviderGroupTaskRoute,+ taskDeviceId: string | null,+): ProviderGroupTaskRoute | undefined {+ const atTask = (deviceId: string | null) => (deviceId && deviceId === taskDeviceId ? null : deviceId);+ const routeDeviceId = atTask(route.agentDeviceId);+ for (const member of config.members) {+ const location = member.kind === 'local' ? ownerDeviceId : atTask(member.agentDeviceId);+ if (location === routeDeviceId && member.providerId === route.providerId) {+ return { agentDeviceId: location, providerId: member.providerId };+ }+ }+ return undefined;+}diff --git a/apps/desktop/src/shared/providerShare.ts b/apps/desktop/src/shared/providerShare.tsindex c6dce25229..fd9578f1fc 100644--- a/apps/desktop/src/shared/providerShare.ts+++ b/apps/desktop/src/shared/providerShare.ts@@ -62,6 +62,28 @@ export interface ProviderShareOwnedView {requests: ProviderShareRequestItem[];}+/** 「远程与分享」页按使用方的用量里一个使用方(本机,或同账号的另一台电脑)。 */+export interface ProviderPartyUsageView {+ /** null = 本机。 */+ deviceId: string | null;+ /** 那台电脑的名字;读不到或本机时为 null。 */+ deviceName: string | null;+ lastUsedAt: number;+ models: ProviderShareModelUsageView[];+}++/**+ * 某个供应商按使用方的用量里,这台电脑自己能记到的部分(provider-groups.md §7):本机自己的任务(含归本机+ * 供应商组、在组里其他电脑上运行的),与同账号其他电脑在本机运行的任务。分享的人在 owned 的成员里。+ */+export interface ProviderOwnUsageView {+ providerId: string;+ /** 本机自己的任务;没用过时为 null。 */+ local: ProviderPartyUsageView | null;+ /** 同账号的其他电脑,每台一项,最近用过的在前。 */+ devices: ProviderPartyUsageView[];+}+export interface ProviderShareOwnerState {/** 分享服务可用(已登录、设备互联已连上本区域服务)。 */ready: boolean;@@ -85,6 +107,8 @@ export interface ProviderShareSettledEvent {export type ProviderShareCommand =| { action: 'owned'; range: ProviderShareUsageRange }+ /** 这个供应商按使用方的用量(本机与我的其他电脑)。不依赖分享服务。 */+ | { action: 'own-usage'; providerId: string; range: ProviderShareUsageRange }| { action: 'create-link'; providerId: string }| { action: 'approve' | 'reject'; requestId: string }| { action: 'set-member'; memberId: string; status: 'pause' | 'resume' | 'remove' }@@ -97,6 +121,7 @@ export type ProviderShareCommand =export interface ProviderShareCommandResult {owned: ProviderShareOwnerState;+ 'own-usage': ProviderOwnUsageView;'create-link': ProviderShareLinkCreated;approve: { ok: true };reject: { ok: true };diff --git a/docs/dev-rules/credentials-and-local-storage.md b/docs/dev-rules/credentials-and-local-storage.mdindex 704dc719fc..1b2927ca9f 100644--- a/docs/dev-rules/credentials-and-local-storage.md+++ b/docs/dev-rules/credentials-and-local-storage.md@@ -195,6 +195,7 @@ Desktop 的运行时 refresh 遇到瞬时失败后,主动调用与定时重试| 旧版 worktree 回收器兼容锁 | 不再创建新的跨 profile Git 锁;保留旧回执对 `<commonGitDir>/worktrees/<id>/locked` 及更早 `.worktree-keep` 的清理。仅当最后一个共享借用结束且自建文件身份和内容仍匹配时删除,不覆盖用户锁;失败沿用 `.release` 重试 || 跨 profile 的 worktree 回收日志位置 | `app.getPath('appData')/Cindy/shared-worktree-recycle-journals`,仍按日志目录哈希发布原 profile 日志位置,兼容可能同时运行的旧客户端;新客户端不再读取其他 profile 的日志来借用工程。不复制恢复状态、不代替 owner 执行恢复 || 供应商分享:分享者电脑上的受邀者用量 | `userData/remote-agent/provider-share-usage.json`,按(日期、分享、成员、Agent、供应商、模型)聚合 token 与轮次,原子替换写入,保留 400 天;只含服务端生成的分享与成员 id,不含昵称、对话或凭证。成员删除后保留(管理页不再显示),同一人重新加入时接续 |+| 供应商按使用方的用量 | `userData/owners/<账号>/provider-usage-by-party.json`,按(日期、供应商、使用方:本机或同账号另一台电脑的设备 id、Agent、模型)聚合 token 与轮次,原子替换写入,保留 400 天;只含供应商 id、设备 id 与模型名,不含对话或凭证。按账号存放(供应商 id 在不同账号下会重复),从开始记录起不补历史 || 供应商分享:受邀者会话登记 | `userData/remote-agent/guest-sessions.json`(控制端摘要 → 本机侧任务与原生会话 id),只用来限制受邀者只能恢复自己的会话,并在分享删除时精确清理影子工作区、附件与会话记录 || 供应商分享:跨区域标记 | `userData/remote-agent/provider-share-regions.json`,账号摘要 → 对方区域;**不含凭证**。跨区连接凭证只在内存里,用新身份名片重新换取;没有标记的账号从不联系对方区域 || 用户明确导出的文件 | 用户选择或任务明确指定的目标路径 |diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.mdindex 2a93202397..caa6ce36f8 100644--- a/docs/product-rules/provider-groups.md+++ b/docs/product-rules/provider-groups.md@@ -11,8 +11,10 @@> 2026-10-11 用户要求:任务所在那台**连不上时先等它恢复**——按退避重试 5 次,恢复了留在原电脑继续,都不行再换电脑,见 §6.1。> 2026-10-11 用户要求:模型列表里**组里的都聚合成一项**——任务正跑在组员上也不单独列出,显示在组那一项下,在组那一项里> 选模型留在此刻运行的那台;挪到组里另一台后的第一次失败也照常换电脑,见 §6、§10。+> 2026-10-11 用户确认:模型列表里组那一项的订阅用量**跟着任务实际运行的那台**,还没分到电脑时不显示某一台的配额,见 §10「模型列表」;+> 「远程与分享」页的用量先补这台电脑能记到的「本机」与「我的其他电脑」,与分享的人并列、共用时间段,见 §7。> 实现进度见 §12:P1 已实现;P2 全部已实现:同账号直连与模型列表只显示组(P2a)、分享的人经组中转与启动阶段换电脑(P2b)、-> 分享的人运行中换电脑与申请弹窗新说法(P2c);P3 未实现。+> 分享的人运行中换电脑与申请弹窗新说法(P2c);P3 只做了按使用方用量的第一步(§7)。> 交互设计稿见 [`docs/design-previews/provider-groups/index.html`](../design-previews/provider-groups/index.html)。> 读取时机:新增或修改供应商组、组策略、组内电脑的添加与状态、经供应商组的任务分配或转发、> 供应商组用量与「远程与分享」页之前。@@ -281,6 +283,16 @@订阅类供应商按本地单价估算并标注「估算」,不代表供应商实际账单(与供应商分享 §7.4 一致)。- 没有组的供应商也显示「按使用方」:列出我的其他电脑与分享的人经这台电脑使用这个供应商的用量。- 组内电脑的主人在自己的分享管理页里看到的是组所在电脑账号的合计用量,看不到最终使用者。+- **已实现(2026-10-11,按使用方的第一步)**:「远程与分享」页的「用量」块按使用方列出本机、我的其他电脑(按电脑分开)+ 与分享的人(按人分开),共用一个时间段切换,每行展开按模型列出;分享的人的用量从「已分享的人」一行移到这一块。+ 本机与我的其他电脑只记这台电脑自己经手的,从这次更新开始记,不补以前的:+ - **本机**:这台电脑自己的任务。归本机建的组的任务记在组那个供应商上,Agent 在组里哪台运行都算;其余任务只在 Agent+ 就在本机运行时记在它用的供应商上(跟随默认路由、没有指定供应商的不记);SSH 远程工作区的任务不记。+ - **我的其他电脑**:同账号其他电脑的远程 Agent 任务在这台电脑上用这个供应商运行的部分,按那台电脑分开;同账号的+ 组所在电脑替它的受邀者转过来的任务记在那台组所在电脑名下。+ - 计量与受邀者用量同一套(每一轮的 done 事件),账本按账号存放(`docs/dev-rules/credentials-and-local-storage.md`)。+ 实现见 `apps/desktop/src/main/usage/providerPartyUsageStore.ts`、`apps/desktop/src/main/maker-ipc/sessionProviderPartyUsage.ts`。+ - 还没做:同账号其他电脑经组直接连到别的组内电脑运行的用量(组所在电脑经手不到,要那台报告),以及「按组内电脑」维度。## 8. 告知与隐私@@ -332,8 +344,8 @@- **「远程与分享」页**(原「分享 {供应商}」管理页扩展)分三块:1. **供应商组**:组内电脑列表(来源、状态、正在运行的任务数、冷却到何时——不在今天恢复的带上日期,如周上限)、并发上限、添加电脑、组策略;- 2. **用量**(P3):按使用方 / 按组内电脑切换,时间段切换,展开按模型;- 3. **分享**:生成分享链接、待处理、已分享的人(与现在一致;P3 起按人用量移到「用量」块,首版仍在已分享的人里)。+ 2. **用量**(P3):按使用方 / 按组内电脑切换,时间段切换,展开按模型;按使用方的第一步已实现(§7),还没有「按组内电脑」切换;+ 3. **分享**:生成分享链接、待处理、已分享的人(按人用量已移到「用量」块,这里只管分享本身)。未开启「允许被远程调用」时,这一块置灰并说明先开启哪一级(供应商分享 §3)。- **组内电脑一行的结构对所有来源一致**,右侧才能真正成列:设备图标 → 名称与来源 → 状态行 →并发上限(按权重时多一个权重)→ 参与分配开关 → 行内 `···` 菜单。三条由此固定:@@ -357,6 +369,15 @@- 同账号其他电脑上的组:「{供应商} · {组所在电脑} · 供应商组 · 3 台电脑」;- 本机建的组:「{供应商} · 供应商组 · 2 台电脑」,每行模型右侧的来源名仍只写供应商名;- 受邀者:「{供应商} · 来自 {分享者} 的分享 · 供应商组 · 3 台电脑」(§8)。+- **组那一项的订阅用量跟着任务实际运行的那台**(2026-10-11 用户确认):组那一项代表组里的几台电脑,左栏用量条、悬停提示与+ 模型行的配额不拿组所在电脑自己的账号当整个组的用量。+ - 任务已经运行过(有 Agent 回复)、此刻在组里某台电脑上运行(任务记录的 Agent 位置与供应商是组里的一台,§6):读那台的账号,+ 与输入框下方的用量同一份;悬停在组名下多一行「当前在 {电脑} 上运行 · {账号}」(就是这台电脑时写「当前在这台电脑上运行」)。+ 那台是别人分享的电脑时不显示配额(分享者的配额不对受邀者开放),只写在哪台运行。+ 同一台电脑同时在几个组里时,只认任务归的那个组(与上面「在组那一项下显示」同一个查询),别的组那一项按还没分到电脑处理。+ - 还没分到电脑(新任务、还没运行过、用的不是这个组):不显示某一台的配额,悬停写「开始后由供应商组选一台电脑,用量按那台显示」。+ - 组名本身不再带组所在电脑那一个账号的名字。手机端本期不变。实现见 `apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx`+ 的 `providerGroupUsage`,回归见 `modelSelectorProviderGroupUsage.test.tsx`。- 设置页组内电脑一行与「添加电脑」弹窗里,分享来的电脑写「{分享者} 的电脑」,不写分享者的电脑名(供应商分享 §6)。- **只显示组**(2026-10-10):同账号其他电脑的模型列表与设置页左栏里,被其他在线电脑的组收进去的远程供应商与分享不再单独列出,只列组所在电脑那一项;不在任何组里的照常单独显示。规则:@@ -396,7 +417,7 @@| P2a(已实现) | 同账号其他电脑经组直连:问组所在电脑选电脑、直接连过去、本机自动换电脑并报告冷却;运行中任务报告给组所在电脑计入负载;防转圈标记;同账号其他电脑的模型列表与设置页只显示组、组项标出供应商组与组内电脑状态 || P2b(已实现) | 分享的人经组所在电脑中转;使用方隔离;同账号组内电脑接受被中转的受邀者(隔离);续接回到原来那台;启动阶段换电脑;删除受邀者时通知组内电脑清理 || P2c(已实现) | 分享的人运行中换电脑:「需要换一台」信号与受邀者那边的自动交接、活动记录「已自动换一台电脑继续」(桌面与手机);申请弹窗与「分享给我的供应商」详情的新说法;「远程与分享」页写明分享的人的任务也按组分配 |-| P3 | 两个维度的用量;全部失败时逐台列出原因、按全组最早恢复的一台等待;手机端显示实际运行电脑 |+| P3 | 两个维度的用量(按使用方的第一步已实现,见 §7);全部失败时逐台列出原因、按全组最早恢复的一台等待;手机端显示实际运行电脑 |## 13. 验收diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.mdindex bceef2332d..8436835cbd 100644--- a/docs/product-rules/provider-sharing.md+++ b/docs/product-rules/provider-sharing.md@@ -199,9 +199,10 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):- **生成分享链接**:主操作。- **待处理**:待审批的申请(同意/拒绝);为空时整块隐藏。链接 5 分钟即过期,不列出未使用的链接。-- **已分享的人**:每人一行,显示头像、昵称、加入时间、最近使用、所选时间段内- 的用量合计、当前状态(正常/已暂停)与是否有任务正在运行。展开后按模型列出:轮次、输入 token、- 输出 token、估算金额。时间段可选近 7 天/本月/全部。+- **已分享的人**:每人一行,显示头像、昵称、加入时间、最近使用、当前状态(正常/已暂停)与是否有任务正在运行。+- **用量**(2026-10-11 起移到页面上方的「用量」块,见[供应商组](provider-groups.md) §7):按使用方列出本机、我的其他电脑+ 与分享的人,每人一行显示所选时间段内的用量合计,展开后按模型列出:轮次、输入 token、输出 token、估算金额。+ 时间段可选近 7 天/本月/全部。- **操作**:- **关闭**:暂停对此人的分享,可随时恢复;- **删除**:永久移除,需要重新生成链接才能再次分享;删除前二次确认。