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): 同一台电脑上的多个账号按电脑聚合显示与计数 (#6156)
Lizi2c1d7e54c468
diff --git a/apps/desktop/src/main/__tests__/providerImportWiring.test.ts b/apps/desktop/src/main/__tests__/providerImportWiring.test.tsindex a2d44616ed..6ea1cf3830 100644--- a/apps/desktop/src/main/__tests__/providerImportWiring.test.ts+++ b/apps/desktop/src/main/__tests__/providerImportWiring.test.ts@@ -7,8 +7,18 @@ const bootstrap = readFileSync(new URL('../bootstrap-electron.ts', import.meta.uconst register = readFileSync(new URL('../maker-ipc/register.ts', import.meta.url), 'utf8');const updateService = readFileSync(new URL('../updateService.ts', import.meta.url), 'utf8');const mainLayout = readFileSync(new URL('../../renderer/components/layout/MainLayout.tsx', import.meta.url), 'utf8');+const preload = readFileSync(new URL('../../preload/preload.ts', import.meta.url), 'utf8');describe('provider import wiring', () => {+ it('forwards provider-share deep-link events through the preload bridge', () => {+ // Electron preload is a context-bridge adapter; keep this source guard next to+ // the existing wiring checks so the runtime allowlist cannot drift from the+ // renderer contract without a real Electron bootstrap in the test.+ expect(preload).toMatch(/onDeepLinkNavigate:[\s\S]*?\{ type: 'provider-share-join'; link: string \}/);+ expect(preload).toMatch(/p\.type === 'provider-share-join'[\s\S]*?p\.link\.length <= 4096[\s\S]*?callback\(\{ type: 'provider-share-join', link: p\.link \}\)/);+ expect(preload).toMatch(/takePendingDeepLink:[\s\S]*?\{ type: 'provider-share-join'; link: string \}/);+ });+it('consumes the main pending slot when an import wake-up reaches MainLayout', () => {expect(mainLayout).toMatch(/onDeepLinkNavigate\(\(payload\) => \{[\s\S]*?if \(payload.type !== 'provider-import' && payload.type !== 'shared-task-join' && payload.type !== 'provider-share-join'\) \{\s*handleDeepLinkPayload\(payload\);\s*return;\s*\}[\s\S]*?void pullChatInvitations\(\);/);});diff --git a/apps/desktop/src/main/provider-group/__tests__/directory.test.ts b/apps/desktop/src/main/provider-group/__tests__/directory.test.tsindex bfd11fd37a..e237d5b532 100644--- a/apps/desktop/src/main/provider-group/__tests__/directory.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/directory.test.ts@@ -80,6 +80,9 @@ describe('listCandidates', () => {// 分享来的电脑只用分享者的昵称称呼,不用分享者的电脑名(provider-sharing.md §6)。expect(candidates[1]).toMatchObject({ label: 'Magi', ownerName: 'Magi' });expect(JSON.stringify(candidates)).not.toContain('s1-pc');+ // 分享者那台电脑只带设备 id,用来把同一台的几个分享收在一起。+ expect(candidates[1].hostDeviceId).toBe('host-s1');+ expect(candidates[0].hostDeviceId).toBeUndefined();});it('marks computers already in the group', async () => {@@ -114,7 +117,9 @@ describe('resolveMembers', () => {});it('reads quota only for available Claude subscriptions on this account’s computers', async () => {- const readClaudeUsage = vi.fn(async (_member: ProviderGroupMember) => ({ updatedAt: 1_000, fiveHour: { utilization: 25 } }));+ const readClaudeUsage = vi.fn<(member: ProviderGroupMember) => Promise<{ updatedAt: number; fiveHour: { utilization: number } }>>(+ async () => ({ updatedAt: 1_000, fiveHour: { utilization: 25 } }),+ );const directory = createProviderGroupDirectory(deps({ readClaudeUsage }));const member = (kind: 'local' | 'device' | 'share', agentDeviceId: string | null, providerId: string) => ({key: `${kind}:${agentDeviceId}:${providerId}`, kind, agentDeviceId, providerId, limit: 4, weight: 1, paused: false,diff --git a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts b/apps/desktop/src/main/provider-group/__tests__/ipc.test.tsindex 7fb15cc7f5..54bff2407f 100644--- a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts@@ -123,7 +123,7 @@ describe('executeProviderGroupCommand reads', () => {],};// 这台电脑读不到 mini 的目录(连不上)。- const readDeviceCatalog = vi.fn(async (_agentDeviceId: string): Promise<never[]> => {+ const readDeviceCatalog = vi.fn<(agentDeviceId: string) => Promise<never[]>>(async () => {throw new Error('[DEVICE_LINK_DEVICE_UNRESPONSIVE] target device mini is unresponsive (circuit open)');});const marked = await markMembersUnreachableHere(view, { readDeviceCatalog }, 'self');@@ -189,14 +189,52 @@ describe('executeProviderGroupCommand save', () => {await executeProviderGroupCommand(d, {action: 'save',providerId: 'anthropic',- config: { strategy: 'least', autoSwitch: true, members: [LOCAL, MINI] },+ // 渲染端带来的账号名只是快照,以目录为准。+ config: { strategy: 'least', autoSwitch: true, members: [LOCAL, { ...MINI, providerName: 'Stale name' }] },});const written = d.writeGroup.mock.calls[0][1] as ProviderGroupConfig;expect(written.members.map((m) => m.key)).toEqual(['local', MINI.key]);expect(written.members[1].label).toBe('Mac mini');+ expect(written.members[1].providerName).toBe('Claude');expect(d.changed).toHaveBeenCalledWith('anthropic');});+ it('records the sharer’s computer of a shared-in member from the directory and keeps it on later saves', async () => {+ const SHARED = { key: 'share:s1:anthropic', kind: 'share' as const, agentDeviceId: 'share:s1', providerId: 'anthropic', limit: 4, weight: 1, paused: false };+ const d = deps([{ key: SHARED.key, kind: 'share', agentDeviceId: 'share:s1', providerId: 'anthropic', label: 'Kai', providerName: 'Claude', ownerName: 'Kai', hostDeviceId: 'kai-pc' }]);+ await executeProviderGroupCommand(d, {+ action: 'save',+ providerId: 'anthropic',+ config: { strategy: 'least', autoSwitch: true, members: [LOCAL, { ...SHARED, hostDeviceId: 'forged' }] },+ });+ expect((d.writeGroup.mock.calls[0][1] as ProviderGroupConfig).members[1].hostDeviceId).toBe('kai-pc');+ // 设置页即使带着伪造的快照保存(例如只改了暂停),也以目录里的值为准。+ await executeProviderGroupCommand(d, {+ action: 'save',+ providerId: 'anthropic',+ config: { strategy: 'least', autoSwitch: true, members: [LOCAL, { ...SHARED, paused: true, hostDeviceId: 'forged-again' }] },+ });+ expect((d.writeGroup.mock.calls[1][1] as ProviderGroupConfig).members[1]).toMatchObject({ paused: true, hostDeviceId: 'kai-pc' });+ });++ it('does not trust a shared host id when the renderer has a stale member snapshot', async () => {+ const SHARED = { key: 'share:s1:anthropic', kind: 'share' as const, agentDeviceId: 'share:s1', providerId: 'anthropic', limit: 4, weight: 1, paused: false };+ const existing: ProviderGroupConfig = {+ strategy: 'least',+ autoSwitch: true,+ members: [LOCAL, { ...SHARED, hostDeviceId: 'kai-pc' }],+ };+ const d = deps([{ key: SHARED.key, kind: 'share', agentDeviceId: 'share:s1', providerId: 'anthropic', label: 'Kai', providerName: 'Claude', ownerName: 'Kai', hostDeviceId: 'kai-pc' }], existing);++ await executeProviderGroupCommand(d, {+ action: 'save',+ providerId: 'anthropic',+ config: { ...existing, members: [LOCAL, { ...SHARED, hostDeviceId: 'forged' }] },+ });++ expect((d.writeGroup.mock.calls[0][1] as ProviderGroupConfig).members[1].hostDeviceId).toBe('kai-pc');+ });+it('refuses a computer that is not offered as a candidate', async () => {const d = deps([]);await expect(executeProviderGroupCommand(d, {diff --git a/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts b/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.tsindex a9a6b7430e..455fc641c1 100644--- a/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts@@ -586,4 +586,22 @@ describe('sharedProviderGroupSize', () => {expect(sharedProviderGroupSize({ readGroup, isRemoteAllowed: () => true }, 'openai')).toBeNull();expect(sharedProviderGroupSize({ readGroup, isRemoteAllowed: () => false }, 'anthropic')).toBeNull();});++ it('counts computers, not accounts: several accounts on one computer are one computer for guests', () => {+ const share = (id: string, providerId: string): ProviderGroupMember => ({+ key: `share:${id}:${providerId}`, kind: 'share', agentDeviceId: `share:${id}`, providerId,+ hostDeviceId: 'kai-pc', limit: 4, weight: 1, paused: false,+ });+ const config: ProviderGroupConfig = {+ ...CONFIG,+ members: [+ ...CONFIG.members,+ { ...MINI, key: 'device:mini:anthropic-b', providerId: 'anthropic-b' },+ share('s1', 'anthropic'),+ share('s2', 'anthropic-x'),+ ],+ };+ // 本机 + Mini(两个账号) + Kai 的那台(两个分享) = 3 台。+ expect(sharedProviderGroupSize({ readGroup: () => config, isRemoteAllowed: () => true }, 'anthropic')).toBe(3);+ });});diff --git a/apps/desktop/src/main/provider-group/__tests__/removedShares.test.ts b/apps/desktop/src/main/provider-group/__tests__/removedShares.test.tsindex 5b195bb6e8..bc16f7fcb5 100644--- a/apps/desktop/src/main/provider-group/__tests__/removedShares.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/removedShares.test.ts@@ -5,7 +5,12 @@import { describe, expect, it, vi } from 'vitest';import type { ProviderGroupConfig, ProviderGroupMember } from '../../../shared/providerGroup';-import { pruneRemovedShareMembers, type PruneRemovedShareMembersDeps } from '../removedShares';+import {+ pruneRemovedShareMembers,+ recordShareHosts,+ type PruneRemovedShareMembersDeps,+ type RecordShareHostsDeps,+} from '../removedShares';function member(key: string, kind: ProviderGroupMember['kind'], agentDeviceId: string | null): ProviderGroupMember {return { key, kind, agentDeviceId, providerId: 'anthropic', limit: 4, weight: 1, paused: false };@@ -91,3 +96,97 @@ describe('removing computers whose share is gone', () => {expect(env.deps.changed).not.toHaveBeenCalled();});});++// 旧组里分享来的电脑补记分享者那台电脑,同一台的几个分享才能按一台电脑展示与计数(provider-groups.md §10)。+describe('recording the computer of shared-in members', () => {+ function setupHosts(hosts: ReadonlyMap<string, string>) {+ let groups: Record<string, ProviderGroupConfig> = {+ anthropic: { strategy: 'least', autoSwitch: true, members: [LOCAL, MINI, FROM_A, { ...FROM_D, hostDeviceId: 'host-d' }] },+ openai: { strategy: 'least', autoSwitch: true, members: [{ ...LOCAL, providerId: 'openai' }] },+ };+ const updateGroup = vi.fn<RecordShareHostsDeps['updateGroup']>(async (providerId, updater) => {+ const current = groups[providerId] ?? null;+ const updated = updater(current);+ if (updated !== undefined) {+ if (updated) groups = { ...groups, [providerId]: updated };+ else {+ const next = { ...groups };+ delete next[providerId];+ groups = next;+ }+ }+ return groups[providerId] ?? null;+ });+ const deps: RecordShareHostsDeps = {+ shareHosts: () => hosts,+ listGroups: () => groups,+ updateGroup,+ ownerKey: () => 'owner',+ changed: vi.fn(),+ };+ return { deps, updateGroup, groups: () => groups, setGroups: (next: Record<string, ProviderGroupConfig>) => { groups = next; } };+ }++ it('fills in the computer of shares it can see and writes only the groups that change', async () => {+ const env = setupHosts(new Map([['a1', 'host-a'], ['d1', 'host-d']]));+ expect(await recordShareHosts(env.deps)).toEqual(['anthropic']);+ expect(env.groups().anthropic.members.map((m) => m.hostDeviceId)).toEqual([undefined, undefined, 'host-a', 'host-d']);+ expect(env.updateGroup).toHaveBeenCalledTimes(1);+ expect(env.deps.changed).toHaveBeenCalledWith('anthropic');+ // 再跑一次没有变化,不再写。+ expect(await recordShareHosts(env.deps)).toEqual([]);+ expect(env.updateGroup).toHaveBeenCalledTimes(1);+ });++ it('leaves shares it cannot see yet as they are, and does nothing before the list is read', async () => {+ const env = setupHosts(new Map([['d1', 'host-d']]));+ expect(await recordShareHosts(env.deps)).toEqual([]);+ expect(env.groups().anthropic.members[2].hostDeviceId).toBeUndefined();+ const empty = setupHosts(new Map());+ expect(await recordShareHosts(empty.deps)).toEqual([]);+ expect(empty.updateGroup).not.toHaveBeenCalled();+ });++ it('stops when the account changes during the write', async () => {+ const env = setupHosts(new Map([['a1', 'host-a']]));+ let owner = 'owner';+ env.deps.ownerKey = () => owner;+ env.updateGroup.mockImplementationOnce(async () => { owner = 'new-owner'; return null; });+ expect(await recordShareHosts(env.deps)).toEqual([]);+ expect(env.deps.changed).not.toHaveBeenCalled();+ });++ it('patches the latest group and does not recreate a group deleted while waiting for the lock', async () => {+ const env = setupHosts(new Map([['a1', 'host-a']]));+ const original = env.groups();+ env.setGroups({+ ...original,+ openai: { ...original.openai, members: [...original.openai.members, { ...FROM_A, providerId: 'openai' }] },+ });+ const initial = env.groups();+ env.updateGroup.mockImplementationOnce(async (providerId, updater) => {+ const latest = {+ ...initial.anthropic,+ strategy: 'round',+ members: [...initial.anthropic.members, { ...LOCAL, key: 'new-local' }],+ } satisfies ProviderGroupConfig;+ env.setGroups({ ...initial, anthropic: latest });+ const updated = updater(env.groups()[providerId] ?? null);+ if (updated) env.setGroups({ ...env.groups(), [providerId]: updated });+ return updated ?? null;+ });+ env.updateGroup.mockImplementationOnce(async (providerId, updater) => {+ const next = { ...env.groups() };+ delete next[providerId];+ env.setGroups(next);+ expect(updater(null)).toBeUndefined();+ return null;+ });++ expect(await recordShareHosts(env.deps)).toEqual(['anthropic']);+ expect(env.groups().anthropic.strategy).toBe('round');+ expect(env.groups().anthropic.members.map((m) => m.key)).toContain('new-local');+ expect(env.groups().anthropic.members.find((m) => m.key === FROM_A.key)?.hostDeviceId).toBe('host-a');+ expect(env.groups().openai).toBeUndefined();+ });+});diff --git a/apps/desktop/src/main/provider-group/__tests__/sharedStatus.test.ts b/apps/desktop/src/main/provider-group/__tests__/sharedStatus.test.tsindex 0c7e81d9bc..7053c555eb 100644--- a/apps/desktop/src/main/provider-group/__tests__/sharedStatus.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/sharedStatus.test.ts@@ -48,6 +48,21 @@ describe('anonymous shared group status', () => {expect(await createGuestSupportReader(env.readCaps)(member)).toBe('needs-update');});+ it('coalesces shared accounts that point to one physical computer', async () => {+ const env = setup(['available', 'available']);+ const base = env.view.config!.members[1]!;+ const members = [+ { ...base, kind: 'share' as const, agentDeviceId: 'share:s1', hostDeviceId: 'kai-pc' },+ { ...base, kind: 'share' as const, agentDeviceId: 'share:s2', hostDeviceId: 'kai-pc' },+ ];+ env.readCaps.mockResolvedValue({ virtualWorkspace: true, reshareConsent: true } as RemoteAgentCaps);+ const read = createGuestSupportReader(env.readCaps);++ expect(await Promise.all(members.map((member) => read(member)))).toEqual(['supported', 'supported']);+ expect(env.readCaps).toHaveBeenCalledTimes(1);+ expect(env.readCaps).toHaveBeenCalledWith(members[0]);+ });+it('projects coarse states without identities, sources, limits, or usage', async () => {const env = setup();expect(await readSharedGroupStatus(env.deps, 'anthropic')).toEqual([@@ -219,6 +234,18 @@ describe('anonymous shared group status', () => {expect(await readSharedGroupStatus({ ...env.deps, reshareState }, 'anthropic')).toEqual(['available', 'busy', 'offline']);});+ // 受邀者看到的是电脑不是账号(provider-groups.md §10,2026-10-15):同一台电脑的几个账号合成一项,取最能接任务的状态。+ it('lists one state per computer, taking the most usable account of each computer', async () => {+ const env = setup(['available', 'cooling', 'full', 'offline', 'cooling', 'paused']);+ const members = env.view.config!.members;+ members[2].agentDeviceId = members[1].agentDeviceId;+ for (const index of [3, 4]) {+ Object.assign(members[index], { kind: 'share', agentDeviceId: `share:s${index}`, hostDeviceId: 'kai-pc' });+ }+ // 本机;同一台(冷却 + 满载仍能接 → 忙碌);Kai 的那台(离线 + 冷却 → 冷却);暂停的那台。+ expect(await readSharedGroupStatus(env.deps, 'anthropic')).toEqual(['available', 'busy', 'cooling', 'paused']);+ });+it('reflects the same temporary exclusion as the guest router without probing or changing it', async () => {const env = setup(['available', 'available']);env.isIncapable.mockReturnValue(true);diff --git a/apps/desktop/src/main/provider-group/directory.ts b/apps/desktop/src/main/provider-group/directory.tsindex 91d24d885c..fb38a29e6f 100644--- a/apps/desktop/src/main/provider-group/directory.ts+++ b/apps/desktop/src/main/provider-group/directory.ts@@ -376,6 +376,8 @@ export function createProviderGroupDirectory(deps: ProviderGroupDirectoryDeps):label: share.owner.displayName,providerName: share.providerLabel,ownerName: share.owner.displayName,+ // 同一个人从同一台电脑分享的几个账号按一台电脑展示(不显示,也不用于连接)。+ hostDeviceId: share.hostDeviceId,};if (memberKeys.has(key)) {candidates.push({ ...base, blocked: 'member' });diff --git a/apps/desktop/src/main/provider-group/ipc.ts b/apps/desktop/src/main/provider-group/ipc.tsindex b5205b876a..08986c5183 100644--- a/apps/desktop/src/main/provider-group/ipc.ts+++ b/apps/desktop/src/main/provider-group/ipc.ts@@ -182,20 +182,34 @@ export async function executeProviderGroupCommand(deps: ProviderGroupCommandDepsconst next = normalizeProviderGroupConfig(command.config, providerId);if (next) {// 新加入的电脑必须是这台电脑已经能用的同一个供应商(§3),不能凭渲染端点名加入。- const previous = new Set(deps.readGroup(providerId)?.members.map((m) => m.key) ?? []);+ const stored = new Map(deps.readGroup(providerId)?.members.map((m) => [m.key, m]) ?? []);+ const previous = new Set(stored.keys());+ // 设置页拿着对账补记之前的组来保存时,不丢掉已经记下的分享者那台电脑(removedShares.ts)。+ for (const member of next.members) {+ const host = stored.get(member.key)?.hostDeviceId;+ if (member.kind === 'share' && !member.hostDeviceId && host) member.hostDeviceId = host;+ }const added = next.members.filter((m) => m.kind !== 'local' && !previous.has(m.key));- if (added.length > 0) {+ // 分享成员的 hostDeviceId 由 Main 端收到的分享目录持有。即使只是修改已有成员,+ // 也不能接受渲染端快照自报的物理电脑键(协议兼容规则中的供应商组聚合条目)。+ if (added.length > 0 || next.members.some((m) => m.kind === 'share')) {const candidates = await deps.directory.listCandidates(providerId, deps.readGroup(providerId));+ const byKey = new Map(candidates.map((c) => [c.key, c]));const allowed = new Set(candidates.filter((c) => !c.blocked).map((c) => c.key));const rejected = added.filter((m) => !allowed.has(m.key));if (rejected.length > 0) {throwIpcError('PRECONDITION_FAILED', 'Only the same provider that this computer can already use can join the group');}- // 显示名以目录为准,渲染端给的只是快照。- const labels = new Map(candidates.map((c) => [c.key, c.label]));+ // 显示名(电脑名与供应商名)以目录为准,渲染端给的只是快照。for (const member of next.members) {- const label = labels.get(member.key);- if (label) member.label = label;+ const candidate = byKey.get(member.key);+ if (candidate?.label) member.label = candidate.label;+ if (candidate?.providerName) member.providerName = candidate.providerName;+ if (member.kind === 'share') {+ if (candidate?.hostDeviceId) member.hostDeviceId = candidate.hostDeviceId;+ else if (stored.get(member.key)?.hostDeviceId) member.hostDeviceId = stored.get(member.key)?.hostDeviceId;+ else delete member.hostDeviceId;+ }}}}diff --git a/apps/desktop/src/main/provider-group/remoteHandler.ts b/apps/desktop/src/main/provider-group/remoteHandler.tsindex 0abf8cbb3e..f95a5f75fb 100644--- a/apps/desktop/src/main/provider-group/remoteHandler.ts+++ b/apps/desktop/src/main/provider-group/remoteHandler.ts@@ -15,6 +15,7 @@ import { PROVIDER_RUNNING_TURNS_FIELD } from '@cindy/device-link';import {parseProviderGroupRemoteRequest,PROVIDER_GROUP_LOCAL_MEMBER_KEY,+ providerGroupDeviceCount,providerGroupSummaryForWire,type ProviderGroupConfig,type ProviderGroupRemotePick,@@ -89,6 +90,7 @@ export function decorateProviderListWithGroups(/*** 分享出去的供应商建了组时提供台数(provider-groups.md §8),不返回组员名单;匿名状态由受邀者分配器按需提供。+ * 台数按电脑算(2026-10-15):同一台电脑上的几个账号算一台,与匿名状态的项数一致(sharedStatus.ts)。* 供应商不再允许被远程调用时分享本身就不可用,不报台数。*/export function sharedProviderGroupSize(@@ -96,7 +98,7 @@ export function sharedProviderGroupSize(providerId: string,): number | null {if (!deps.isRemoteAllowed(providerId)) return null;- const count = deps.readGroup(providerId)?.members.length ?? 0;+ const count = providerGroupDeviceCount(deps.readGroup(providerId)?.members ?? []);return count > 0 ? count : null;}diff --git a/apps/desktop/src/main/provider-group/removedShares.ts b/apps/desktop/src/main/provider-group/removedShares.tsindex 4f0ab8ab54..b184496501 100644--- a/apps/desktop/src/main/provider-group/removedShares.ts+++ b/apps/desktop/src/main/provider-group/removedShares.ts@@ -2,6 +2,9 @@* 原分享被删除或已退出(docs/product-rules/provider-groups.md §3、provider-sharing.md §4.3):这个账号收到的分享里* 已经没有它了,组里指向它的电脑移出组,本机自己与本机分享的人都不再用到它。* 只在已收到的分享名单完整可信时判断(说不准时什么都不做);分享只是暂停时仍在名单里,不动。+ *+ * 同一轮对账也给旧组里分享来的电脑补上分享者那台电脑({@link recordShareHosts}):只用于把同一台电脑上的几个分享+ * 按一台电脑展示与计数(provider-groups.md §10),不影响分配与连接。*/import type { ProviderGroupConfig } from '../../shared/providerGroup.js';import { isProviderShareAgentDeviceId, PROVIDER_SHARE_AGENT_DEVICE_PREFIX } from '../../shared/providerShare.js';@@ -49,3 +52,61 @@ export async function pruneRemovedShareMembers(deps: PruneRemovedShareMembersDep}return removed;}++export interface RecordShareHostsDeps {+ /** 本账号收到的分享:分享 id → 分享者那台电脑的设备 id。还没读到的分享不在里面(不要求名单完整)。 */+ shareHosts(): ReadonlyMap<string, string>;+ listGroups(): Record<string, ProviderGroupConfig>;+ /** 在写锁内基于最新组配置更新,组已被删除时 updater 收到 null。 */+ updateGroup(+ providerId: string,+ updater: (current: ProviderGroupConfig | null) => ProviderGroupConfig | null | undefined,+ ): Promise<ProviderGroupConfig | null>;+ ownerKey(): string;+ changed(providerId: string): void;+}++/**+ * 给组里分享来的电脑记上分享者那台电脑(旧组加入时还没记,或记的与分享不一致),返回改过的组。+ * 只补名单里有的分享,没读到的保持原样(按分享各算一台);没有变化的组不写。+ */+export async function recordShareHosts(deps: RecordShareHostsDeps): Promise<string[]> {+ const owner = deps.ownerKey();+ const hosts = deps.shareHosts();+ if (hosts.size === 0) return [];+ const updated: string[] = [];+ for (const providerId of Object.keys(deps.listGroups())) {+ if (deps.ownerKey() !== owner) break;+ const listed = deps.listGroups()[providerId];+ if (!listed || !listed.members.some((member) => {+ if (member.kind !== 'share' || member.agentDeviceId === null || !isProviderShareAgentDeviceId(member.agentDeviceId)) {+ return false;+ }+ const host = hosts.get(member.agentDeviceId.slice(PROVIDER_SHARE_AGENT_DEVICE_PREFIX.length));+ return host !== undefined && host !== member.hostDeviceId;+ })) continue;+ let changed = false;+ const written = await deps.updateGroup(providerId, (config) => {+ // 组可能在等待写锁时被用户删除;不要用旧快照把它重新创建。+ if (!config) return undefined;+ let dirty = false;+ const members = config.members.map((member) => {+ if (member.kind !== 'share' || member.agentDeviceId === null || !isProviderShareAgentDeviceId(member.agentDeviceId)) {+ return member;+ }+ const host = hosts.get(member.agentDeviceId.slice(PROVIDER_SHARE_AGENT_DEVICE_PREFIX.length));+ if (!host || host === member.hostDeviceId) return member;+ dirty = true;+ return { ...member, hostDeviceId: host };+ });+ if (!dirty) return undefined;+ changed = true;+ return { ...config, members };+ });+ if (deps.ownerKey() !== owner) break;+ if (!changed || !written) continue;+ updated.push(providerId);+ deps.changed(providerId);+ }+ return updated;+}diff --git a/apps/desktop/src/main/provider-group/reshareRuntime.ts b/apps/desktop/src/main/provider-group/reshareRuntime.tsindex 2135224524..9b402a7c15 100644--- a/apps/desktop/src/main/provider-group/reshareRuntime.ts+++ b/apps/desktop/src/main/provider-group/reshareRuntime.ts@@ -11,14 +11,18 @@ import { activeOwnerScopeKey } from '../appSessionState.js';import { PROVIDER_GROUP_IPC } from '../../shared/providerGroup.js';import { tapWindowBroadcast } from '../device-link/broadcast-tap.js';import { broadcast, remoteBackgroundInvoke } from '../device-link/index.js';-import { getConfirmedReceivedShareIds, onProviderShareReceivedChanged } from '../device-link/providerShareGuest.js';+import {+ getConfirmedReceivedShareIds,+ getReceivedShares,+ onProviderShareReceivedChanged,+} from '../device-link/providerShareGuest.js';import { getProviderShareHostLoadedSnapshot, onProviderShareHostChanged } from '../device-link/providerShareHost.js';import { createLogger } from '../logger.js';import { MAKER_PUSH } from '../maker-ipc/channels.js';import { pruneProviderGroupBindings } from './bindings.js';-import { pruneRemovedShareMembers } from './removedShares.js';+import { pruneRemovedShareMembers, recordShareHosts } from './removedShares.js';import { createProviderGroupReshare, type ProviderGroupReshare } from './reshare.js';-import { completeProviderGroupReshareCleanup, listProviderGroupReshareCleanups, listProviderGroups, writeProviderGroup } from './store.js';+import { completeProviderGroupReshareCleanup, listProviderGroupReshareCleanups, listProviderGroups, updateProviderGroup, writeProviderGroup } from './store.js';const log = createLogger('provider-group:reshare');@@ -81,6 +85,12 @@ export const providerGroupReshare = {let registered = false;let pruning: Promise<void> | null = null;+function groupChanged(providerId: string): void {+ broadcastChanged(providerId);+ // 同账号其他电脑的模型列表按本机目录里的组摘要收起组内电脑:组变化后让它们重读目录。+ tapWindowBroadcast(MAKER_PUSH.PROVIDER_CHANGED, {});+}+function pruneSoon(): void {if (pruning) return;pruning = pruneRemovedShareMembers({@@ -89,11 +99,7 @@ function pruneSoon(): void {writeGroup: writeProviderGroup,pruneBindings: pruneProviderGroupBindings,ownerKey: activeOwnerScopeKey,- changed: (providerId) => {- broadcastChanged(providerId);- // 同账号其他电脑的模型列表按本机目录里的组摘要收起组内电脑:组变化后让它们重读目录。- tapWindowBroadcast(MAKER_PUSH.PROVIDER_CHANGED, {});- },+ changed: groupChanged,}).then((removed) => {if (removed.length > 0) {log.info('provider group: removed computers whose share is gone', { count: removed.length });@@ -101,6 +107,16 @@ function pruneSoon(): void {}}).catch((error: unknown) => {log.warn('provider group: removing gone shares failed', { error: error instanceof Error ? error.message : String(error) });+ }).then(() => recordShareHosts({+ shareHosts: () => new Map(getReceivedShares().map((share) => [share.shareId, share.hostDeviceId])),+ listGroups: listProviderGroups,+ updateGroup: updateProviderGroup,+ ownerKey: activeOwnerScopeKey,+ changed: groupChanged,+ })).then((updated) => {+ if (updated.length > 0) log.info('provider group: recorded the computers of shared-in members', { count: updated.length });+ }).catch((error: unknown) => {+ log.warn('provider group: recording shared-in computers failed', { error: error instanceof Error ? error.message : String(error) });}).finally(() => {pruning = null;});diff --git a/apps/desktop/src/main/provider-group/router.ts b/apps/desktop/src/main/provider-group/router.tsindex b1d4811eb6..58f3244d7a 100644--- a/apps/desktop/src/main/provider-group/router.ts+++ b/apps/desktop/src/main/provider-group/router.ts@@ -276,6 +276,8 @@ export function createProviderGroupRouter(deps: ProviderGroupRouterDeps): Provid: remembered === null ? quota.resetAtMs: quota.resetAtMs === null ? remembered : Math.max(remembered, quota.resetAtMs);const count = memberRunning(providerId, r);+ // 那台电脑上这个供应商现在的显示名,读不到时用加入时的快照:同一台电脑有几个账号时界面按它区分。+ const providerName = r.view?.name || r.member.providerName;const state = r.member.paused? 'paused' as const: r.state !== 'ok'@@ -289,6 +291,7 @@ export function createProviderGroupRouter(deps: ProviderGroupRouterDeps): Providkey: r.member.key,kind: r.member.kind,label: r.label,+ ...(providerName ? { providerName } : {}),...(r.ownerName ? { ownerName: r.ownerName } : {}),...(r.appVersion ? { appVersion: r.appVersion } : {}),...(guestSupport ? { guestSupport } : {}),diff --git a/apps/desktop/src/main/provider-group/sharedStatus.ts b/apps/desktop/src/main/provider-group/sharedStatus.tsindex dbaa42717e..6e418707db 100644--- a/apps/desktop/src/main/provider-group/sharedStatus.ts+++ b/apps/desktop/src/main/provider-group/sharedStatus.ts@@ -1,7 +1,15 @@-/** 受邀者可见的组状态:白名单投影,不携带组员身份和用量,也不分配任务或改变冷却。 */+/**+ * 受邀者可见的组状态:白名单投影,不携带组员身份和用量,也不分配任务或改变冷却。+ * 按电脑而不是按账号列(provider-groups.md §10,2026-10-15):同一台电脑上的几个账号合成一项,受邀者看不出有几个账号。+ */import type { ProviderShareGroupState, RemoteAgentCaps } from '@cindy/device-link';-import type { ProviderGroupConfig, ProviderGroupGuestSupport, ProviderGroupMember } from '../../shared/providerGroup.js';+import {+ providerGroupPhysicalDeviceKey,+ type ProviderGroupConfig,+ type ProviderGroupGuestSupport,+ type ProviderGroupMember,+} from '../../shared/providerGroup.js';import type { ProviderGroupOwnerScope } from './runtime.js';export const SHARED_GROUP_STATUS_TIMEOUT_MS = 3_000;@@ -47,18 +55,18 @@ export function createGuestSupportReader(readCaps: SharedGroupStatusDeps['readCa}return async (member: ProviderGroupMember): Promise<ProviderGroupGuestSupport> => {if (!member.agentDeviceId) return 'supported';+ const deviceKey = providerGroupPhysicalDeviceKey(member);const now = Date.now();- for (const [agentDeviceId, entry] of caps) {- if (entry.expiresAt <= now) caps.delete(agentDeviceId);+ for (const [key, entry] of caps) {+ if (entry.expiresAt <= now) caps.delete(key);}- let pending = caps.get(member.agentDeviceId);+ let pending = caps.get(deviceKey);if (!pending) {- const agentDeviceId = member.agentDeviceId;const promise = new Promise<RemoteAgentCaps | null>((resolve) => {const cancel = () => {queued.delete(start);clearTimeout(timer);- caps.delete(agentDeviceId);+ caps.delete(deviceKey);resolve(null);};const start = () => {@@ -81,7 +89,7 @@ export function createGuestSupportReader(readCaps: SharedGroupStatusDeps['readCaconst entry = { promise, expiresAt: Infinity };void promise.then(() => { entry.expiresAt = Date.now() + SHARED_GROUP_STATUS_CAPS_CACHE_MS; });pending = entry;- caps.set(member.agentDeviceId, pending);+ caps.set(deviceKey, pending);}const promise = pending.promise;const capability = await readWithin(() => promise);@@ -124,5 +132,32 @@ export async function readSharedGroupStatus(deps: SharedGroupStatusDeps, provide}));// 读取期间换账号或编辑组时丢弃快照,避免将旧组状态贴到新组序号上。const latest = deps.readGroup(providerId);- return scope.isCurrent() && JSON.stringify(latest) === JSON.stringify(config) ? states : null;+ return scope.isCurrent() && JSON.stringify(latest) === JSON.stringify(config)+ ? sharedGroupComputerStates(config.members, states)+ : null;+}++/**+ * 一台电脑有几个账号时取最能接任务的那个状态:有一个能接就能接;都不能接时,还没确认的优先(不能断言不可用),+ * 其次是需要那台更新或会自己恢复的原因,最后才是暂停、不可用与离线。+ */+const COMPUTER_STATE_ORDER: readonly ProviderShareGroupState[] = [+ 'available', 'busy', 'unknown', 'needs-update', 'cooling', 'paused', 'unavailable', 'offline',+];++/** 按电脑合并账号状态,顺序是每台电脑第一个账号在组里的位置;项数与给受邀者的台数(`sharedProviderGroupSize`)一致。 */+export function sharedGroupComputerStates(+ members: readonly ProviderGroupMember[],+ states: readonly ProviderShareGroupState[],+): ProviderShareGroupState[] {+ const computers = new Map<string, ProviderShareGroupState>();+ members.forEach((member, index) => {+ const key = providerGroupPhysicalDeviceKey(member);+ const state = states[index] ?? 'unknown';+ const current = computers.get(key);+ if (current === undefined || COMPUTER_STATE_ORDER.indexOf(state) < COMPUTER_STATE_ORDER.indexOf(current)) {+ computers.set(key, state);+ }+ });+ return [...computers.values()];}diff --git a/apps/desktop/src/main/provider-group/store.ts b/apps/desktop/src/main/provider-group/store.tsindex e25c5c6f8e..29e9670d9a 100644--- a/apps/desktop/src/main/provider-group/store.ts+++ b/apps/desktop/src/main/provider-group/store.ts@@ -96,6 +96,31 @@ export async function writeProviderGroup(return next.groups[providerId] ?? null;}+/** 在同一把写锁内基于最新组配置做最小更新;更新器返回 undefined 表示放弃写入。 */+export async function updateProviderGroup(+ providerId: string,+ updater: (current: ProviderGroupConfig | null) => ProviderGroupConfig | null | undefined,+): Promise<ProviderGroupConfig | null> {+ if (!isProviderGroupProviderId(providerId)) throw new Error('Invalid provider id');+ const next = await store.updateAtomic(({ value }) => {+ const current = value.groups[providerId] ?? null;+ const updated = updater(current);+ if (updated === undefined) return {};+ const normalized = updated === null ? null : normalizeProviderGroupConfig(updated, providerId);+ if (updated !== null && !normalized) throw new Error('Invalid provider group config');+ const groups = { ...value.groups };+ if (normalized) groups[providerId] = normalized;+ else delete groups[providerId];+ const remaining = sharedDevices(groups);+ const reshareCleanups = { ...value.reshareCleanups };+ for (const device of sharedDevices(value.groups)) {+ if (!remaining.has(device)) reshareCleanups[device] = randomUUID();+ }+ return { groups, reshareCleanups };+ });+ return next.groups[providerId] ?? null;+}+export function listProviderGroupReshareCleanups(): Readonly<Record<string, string>> {store.invalidateIfChanged();return store.read().reshareCleanups ?? {};diff --git a/apps/desktop/src/preload/preload.ts b/apps/desktop/src/preload/preload.tsindex 1458bc869b..9087ae8fcf 100644--- a/apps/desktop/src/preload/preload.ts+++ b/apps/desktop/src/preload/preload.ts@@ -3805,6 +3805,7 @@ contextBridge.exposeInMainWorld('electronAPI', {// - { type: 'project', workingDir } : 聚焦已有 project 节点// - { type: 'new-session', workingDir }: 新建对话且预填 workingDir (右键 "通过 Cindy 打开")// - { type: 'share-import', filePath } : 打开 .cshare/.xdtshare 会话导入向导+ // - { type: 'provider-share-join', link } : 打开供应商分享申请弹窗// - { type: 'settings', tab, connect? }: 打开设置页 (connect 为可选 provider / preset id,// 来自 cindy://settings/providers?connect=<providerId> 深链, per-type 白名单再校验)onDeepLinkNavigate: (@@ -3816,6 +3817,7 @@ contextBridge.exposeInMainWorld('electronAPI', {| { type: 'share-import'; filePath: string }| { type: 'provider-import'; importId: string }| { type: 'shared-task-join'; invitation: string; server: string }+ | { type: 'provider-share-join'; link: string }| { type: 'chat-invite'; token: string }| { type: 'chat-invite-malformed' }| { type: 'settings'; tab: 'voice-input' | 'providers'; connect?: string },@@ -3832,6 +3834,7 @@ contextBridge.exposeInMainWorld('electronAPI', {invitation?: unknown;token?: unknown;server?: unknown;+ link?: unknown;tab?: unknown;connect?: unknown;messageClientId?: unknown;@@ -3863,6 +3866,13 @@ contextBridge.exposeInMainWorld('electronAPI', {callback({ type: 'chat-invite-malformed' });} else if (p.type === 'shared-task-join' && typeof p.invitation === 'string' && /^[A-Za-z0-9_-]{43}$/.test(p.invitation) && typeof p.server === 'string' && p.server.length <= 2048) {callback({ type: 'shared-task-join', invitation: p.invitation, server: p.server });+ } else if (+ p.type === 'provider-share-join' &&+ typeof p.link === 'string' &&+ p.link.length > 0 &&+ p.link.length <= 4096+ ) {+ callback({ type: 'provider-share-join', link: p.link });} else if (p.type === 'provider-import' &&typeof p.importId === 'string' &&@@ -3900,6 +3910,7 @@ contextBridge.exposeInMainWorld('electronAPI', {| { type: 'share-import'; filePath: string }| { type: 'provider-import'; importId: string }| { type: 'shared-task-join'; invitation: string; server: string }+ | { type: 'provider-share-join'; link: string }| { type: 'chat-invite'; token: string }| { type: 'chat-invite-malformed' }| { type: 'settings'; tab: 'voice-input' | 'providers'; connect?: string }diff --git a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupLabel.test.tsx b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupLabel.test.tsxindex 346a966f6c..96443e4d15 100644--- a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupLabel.test.tsx+++ b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupLabel.test.tsx@@ -246,4 +246,23 @@ describe('模型列表里供应商组的标题', () => {expect(headings()).toEqual(['A Local · 供应商组 · 2 台电脑']);expect(screen.getByRole('button', { name: 'A Plain' })).toBeTruthy();});++ it('同一台电脑上的几个账号只算一台', async () => {+ type Group = { members: unknown[] };+ const second = { key: 'device:device-d:d-second', kind: 'device', agentDeviceId: 'device-d', providerId: 'd-second', label: 'Laptop', paused: false };+ const remote = (catalogs.byDevice['device-c'][0] as { group: Group }).group;+ const local = catalogs.localGroups['a-local'] as Group;+ const [remoteMembers, localMembers] = [remote.members, local.members];+ remote.members = [...remoteMembers, second];+ local.members = [...localMembers, second];+ try {+ renderLocalTaskPanel();+ expect(screen.getByRole('button', { name: 'A Local · 供应商组 · 2 台电脑' })).toBeTruthy();+ await browse('C Open · Studio · 供应商组 · 3 台电脑');+ expect(headings()).toEqual(['C Open · Studio · 供应商组 · 3 台电脑']);+ } finally {+ remote.members = remoteMembers;+ local.members = localMembers;+ }+ });});diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsxindex d4190d975a..1a9cce55c7 100644--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx@@ -101,7 +101,7 @@ import {remoteProviderEntryKey,type RemoteProviderGroupEntry,} from '@/lib/remoteProviderGroups';-import type { ProviderGroupConfig } from '../../../shared/providerGroup';+import { providerGroupDeviceCount, type ProviderGroupConfig } from '../../../shared/providerGroup';import { useLocalProviderGroups } from '@/features/provider-group/useLocalProviderGroups';import { readProviderShareGroupSize } from '@cindy/device-link';import { modelPriceDiscountLabelValues, modelPriceDetailRows } from '@/lib/modelPriceFormat';@@ -1732,7 +1732,7 @@ function ModelSelectorContentView({return config? t('newChat.modelSelector.unified.providerGroupLabel', {provider: label,- group: t('settings.providers.remote.groupBadge', { count: config.members.length }),+ group: t('settings.providers.remote.groupBadge', { count: providerGroupDeviceCount(config.members) }),}): label;},@@ -1752,9 +1752,9 @@ function ModelSelectorContentView({.find((group) => group.deviceId === targetDeviceId)?.providers.find((entry) => entry.id === providerId);// 组只写有几台,不写是哪几台(2026-10-10 用户要求);分享来的组目录里本来就只有台数。- const groupSize =- remoteProviderGroups.groups.get(remoteProviderEntryKey(targetDeviceId, providerId))?.members.length- ?? readProviderShareGroupSize(provider);+ // 台数按电脑算:一台电脑上的几个账号算一台。+ const groupMembers = remoteProviderGroups.groups.get(remoteProviderEntryKey(targetDeviceId, providerId))?.members;+ const groupSize = groupMembers ? providerGroupDeviceCount(groupMembers) : readProviderShareGroupSize(provider);const values = {provider: provider ? providerDisplayName(provider, t) : providerId,device: device?.name || targetDeviceId,diff --git a/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx b/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsxindex 219548b782..3783afc402 100644--- a/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx+++ b/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx@@ -26,7 +26,7 @@ import { providerMonogram } from '@/lib/providerModels';import { collectRemoteProviderGroups, remoteProviderEntryKey } from '@/lib/remoteProviderGroups';import { cn } from '@/lib/utils';import { PROVIDER_SHARE_AGENT_DEVICE_PREFIX } from '../../../shared/providerShare';-import type { ProviderGroupConfig } from '../../../shared/providerGroup';+import { providerGroupDeviceCount, type ProviderGroupConfig } from '../../../shared/providerGroup';import { ReadOnlyProviderModelSection, readOnlyProviderModels } from './ReadOnlyProviderModels';@@ -174,7 +174,7 @@ export function OwnRemoteProviderRows({</span><span className="shrink-0 select-none text-11 tabular-nums" style={{ color: 'var(--text-tertiary)' }}>{entry.group- ? t('settings.providers.remote.groupBadge', { count: entry.group.members.length })+ ? t('settings.providers.remote.groupBadge', { count: providerGroupDeviceCount(entry.group.members) }): t('settings.providers.models.modelCount', {count: readOnlyProviderModels(entry.provider, entry.modelVisibilityOverrides).length,})}diff --git a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsxindex be116b1997..f023ae4bc0 100644--- a/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx+++ b/apps/desktop/src/renderer/components/settings/ProvidersSection.tsx@@ -137,6 +137,7 @@ import {import { localCliDisplayName, type LocalCliDetection } from '../../../shared/localCliDetect';import { isBuiltinRefreshableProviderId } from '../../../shared/providerModelRefresh';+import { providerGroupDeviceCount } from '../../../shared/providerGroup';import { applyProviderOrder } from '../../../shared/providerOrder';import type { AgentKind, CustomProviderConfig, ProviderView } from '@cindy/model-providers';import { isCustomRoutedProvider, isOrganizationManagedProvider, storedCustomProviderId } from '@cindy/model-providers';@@ -235,7 +236,7 @@ function RemoteProviderAccessRow({</div><div className="ml-auto flex shrink-0 items-center gap-3"><ProviderShareEntryButton- groupSize={group ? group.members.length : null}+ groupSize={group ? providerGroupDeviceCount(group.members) : null}pendingCount={pendingShareRequests}onOpen={onManageShare}/>@@ -1076,7 +1077,6 @@ function OpenAiHeader({refresh,triggerLogin,cancelLogin,- logout,} = useCodexAuth();const reconnectRequired = state.kind === 'reconnect-required';const loggingIn = state.kind === 'login-pending';diff --git a/apps/desktop/src/renderer/features/provider-group/ProviderGroupAddDialog.tsx b/apps/desktop/src/renderer/features/provider-group/ProviderGroupAddDialog.tsxindex 6e2b3916ef..716864a48e 100644--- a/apps/desktop/src/renderer/features/provider-group/ProviderGroupAddDialog.tsx+++ b/apps/desktop/src/renderer/features/provider-group/ProviderGroupAddDialog.tsx@@ -25,10 +25,12 @@ import {PROVIDER_GROUP_DEFAULT_LIMIT,PROVIDER_GROUP_DEFAULT_WEIGHT,PROVIDER_GROUP_LOCAL_MEMBER_KEY,+ providerGroupPhysicalDeviceKey,type ProviderGroupCandidate,type ProviderGroupConfig,type ProviderGroupMember,} from '../../../shared/providerGroup';+import { groupProviderGroupItems } from './providerGroupPresentation';type Tab = 'available' | 'link';@@ -80,6 +82,8 @@ export function ProviderGroupAddDialog({agentDeviceId: c.agentDeviceId,providerId: c.providerId,label: c.label,+ providerName: c.providerName,+ ...(c.hostDeviceId ? { hostDeviceId: c.hostDeviceId } : {}),limit: PROVIDER_GROUP_DEFAULT_LIMIT,weight: PROVIDER_GROUP_DEFAULT_WEIGHT,paused: false,@@ -93,16 +97,24 @@ export function ProviderGroupAddDialog({kind: 'local',agentDeviceId: null,providerId,+ providerName,limit: PROVIDER_GROUP_DEFAULT_LIMIT,weight: PROVIDER_GROUP_DEFAULT_WEIGHT,paused: false,}],};+ // 每个都是组里原来没有的电脑才说「N 台电脑」;同一台的几个账号、或已在组里那台电脑的另一个账号,按账号说。+ const present = new Set(base.members.map(providerGroupPhysicalDeviceKey));+ const devices = new Set(added.map(providerGroupPhysicalDeviceKey));+ const newComputers = devices.size === added.length && [...devices].every((key) => !present.has(key));setSaving(true);try {const saved = await onSave({ ...base, members: [...base.members, ...added] },- t('providerGroup.toast.added', { count: added.length, provider: providerName }),+ t(newComputers ? 'providerGroup.toast.added' : 'providerGroup.toast.addedAccounts', {+ count: added.length,+ provider: providerName,+ }),);if (saved) onClose();} finally {@@ -145,62 +157,61 @@ export function ProviderGroupAddDialog({{t('providerGroup.add.empty', { provider: providerName })}</p>) : (- (candidates ?? []).map((candidate, index) => {- const member = candidate.blocked === 'member';- const checked = member || picked.has(candidate.key);+ groupProviderGroupItems(candidates ?? []).map((device, index) => {+ const first = device.items[0];+ // 分享来的电脑只用分享者的昵称称呼,不用电脑名(provider-sharing.md §6)。+ const computer = first.kind === 'share' ? providerShareComputerName(t, first.ownerName) : first.label;+ const source = first.kind === 'device'+ ? t('providerGroup.member.sourceDevice')+ : t('providerGroup.member.sourceShare', { name: first.ownerName ?? '' });+ const divider = index > 0 && 'border-t border-[var(--border-default)]';+ const toggle = (key: string) =>+ setPicked((current) => {+ const next = new Set(current);+ if (next.has(key)) next.delete(key);+ else next.add(key);+ return next;+ });+ // 只有一个账号的电脑不分两层:一行写电脑,账号写在来源后面。+ if (device.items.length === 1) {+ return (+ <CandidateRow+ key={first.key}+ candidate={first}+ checked={first.blocked === 'member' || picked.has(first.key)}+ disabled={saving}+ title={computer}+ detail={[source, first.providerName]}+ onToggle={() => toggle(first.key)}+ className={divider}+ />+ );+ }return (- <button- key={candidate.key}- type="button"- role="checkbox"- aria-checked={checked}- disabled={member || saving}- data-testid="provider-group-candidate"- onClick={() =>- setPicked((current) => {- const next = new Set(current);- if (next.has(candidate.key)) next.delete(candidate.key);- else next.add(candidate.key);- return next;- })- }- className={cn(- 'flex w-full items-center gap-3 px-4 py-2.5 text-left transition-colors',- 'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-[var(--focus-ring)]',- index > 0 && 'border-t border-[var(--border-default)]',- member ? 'cursor-default opacity-60' : 'hover:bg-sidebar-item-hover',- )}- >- <span- aria-hidden="true"- className={cn(- // 与消息分享选择框同一套圆形勾选(pill 档)。- 'flex h-5 w-5 shrink-0 items-center justify-center rounded-full',- checked- ? 'bg-[var(--accent-cta-bg-pure)] text-[var(--accent-pure-cta-fg)]'- : 'border border-[var(--border-default)]',- )}- >- {checked && <Check size={12} strokeWidth={2.5} />}- </span>- <span className="flex min-w-0 flex-col">- {/* 分享来的电脑只用分享者的昵称称呼,不用电脑名(provider-sharing.md §6)。 */}- <span className="truncate text-13 text-[var(--text-primary)]">- {candidate.kind === 'share'- ? providerShareComputerName(t, candidate.ownerName)- : candidate.label}+ <div key={device.key} data-testid="provider-group-candidate-device" className={cn(divider)}>+ {/* 电脑这一层只是标题,勾选的仍是下面每个账号(组里各占一个位置)。 */}+ <div className="flex items-center gap-3 px-4 py-2.5">+ <span aria-hidden="true" className="w-5 shrink-0" />+ <span className="flex min-w-0 flex-col">+ <span className="truncate text-13 font-medium text-[var(--text-primary)]">{computer}</span>+ <span className="truncate text-12 text-[var(--text-secondary)]">+ {[source, t('providerGroup.member.accountCount', { count: device.items.length })].join(' · ')}+ </span></span>- <span className="truncate text-12 text-[var(--text-secondary)]">- {[- candidate.kind === 'device'- ? t('providerGroup.member.sourceDevice')- : t('providerGroup.member.sourceShare', { name: candidate.ownerName ?? '' }),- candidate.providerName,- member ? t('providerGroup.add.alreadyMember') : null,- ].filter(Boolean).join(' · ')}- </span>- </span>- </button>+ </div>+ {device.items.map((candidate) => (+ <CandidateRow+ key={candidate.key}+ nested+ candidate={candidate}+ checked={candidate.blocked === 'member' || picked.has(candidate.key)}+ disabled={saving}+ title={candidate.providerName}+ detail={[]}+ onToggle={() => toggle(candidate.key)}+ />+ ))}+ </div>);}))}@@ -247,3 +258,79 @@ export function ProviderGroupAddDialog({</>);}++/**+ * 可以加入的一个账号。`nested` 时收在电脑标题下面:空出勾选框那一列,分隔线从账号起;+ * 否则就是只有一个账号的电脑那一整行。+ */+function CandidateRow({+ candidate,+ nested = false,+ checked,+ disabled,+ title,+ detail,+ onToggle,+ className,+}: {+ candidate: ProviderGroupCandidate;+ nested?: boolean;+ checked: boolean;+ disabled: boolean;+ title: string;+ detail: readonly string[];+ onToggle: () => void;+ className?: string | false;+}) {+ const { t } = useTranslation();+ const member = candidate.blocked === 'member';+ const lines = [...detail, member ? t('providerGroup.add.alreadyMember') : null].filter(Boolean);+ const content = (+ <>+ <span+ aria-hidden="true"+ className={cn(+ // 与消息分享选择框同一套圆形勾选(pill 档)。+ 'flex h-5 w-5 shrink-0 items-center justify-center rounded-full',+ checked+ ? 'bg-[var(--accent-cta-bg-pure)] text-[var(--accent-pure-cta-fg)]'+ : 'border border-[var(--border-default)]',+ )}+ >+ {checked && <Check size={12} strokeWidth={2.5} />}+ </span>+ <span className="flex min-w-0 flex-col">+ <span className="truncate text-13 text-[var(--text-primary)]">{title}</span>+ {lines.length > 0 && (+ <span className="truncate text-12 text-[var(--text-secondary)]">{lines.join(' · ')}</span>+ )}+ </span>+ </>+ );+ return (+ <button+ type="button"+ role="checkbox"+ aria-checked={checked}+ disabled={member || disabled}+ data-testid="provider-group-candidate"+ onClick={onToggle}+ className={cn(+ 'flex w-full text-left transition-colors',+ 'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-[var(--focus-ring)]',+ member ? 'cursor-default opacity-60' : 'hover:bg-sidebar-item-hover',+ nested ? 'pl-4' : 'items-center gap-3 px-4 py-2.5',+ className,+ )}+ >+ {nested ? (+ <>+ <span aria-hidden="true" className="w-5 shrink-0" />+ <span className="ml-3 flex min-w-0 flex-1 items-center gap-3 border-t border-[var(--border-default)] py-2.5 pr-4">+ {content}+ </span>+ </>+ ) : content}+ </button>+ );+}diff --git a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsxindex 057f0626ee..20c616b010 100644--- a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx+++ b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx@@ -7,6 +7,9 @@* 不再按来源分叉成「开关 / 暂停分配按钮」两套控件;暂停的结果由状态行文字说明,不再弹 toast。* 「移出组」是罕用且不可逆的操作,收进 `···` 菜单(与 ProvidersSection 的供应商级菜单同模式);* 本机不能移出(§3),该位置留空占位以保持列宽。+ *+ * 列表按电脑聚合(providerGroupPresentation.ts):一台电脑只有一个账号时就是一行;有几个账号时先列电脑,+ * 账号收在它下面,上限、开关、移出与额度仍按账号各管各的。*/import { ChevronRight, CircleMinus, Monitor, MoreHorizontal } from 'lucide-react';import { useCallback, useId, useMemo, useState } from 'react';@@ -34,6 +37,7 @@ import {PROVIDER_GROUP_MAX_LIMIT,PROVIDER_GROUP_MAX_WEIGHT,PROVIDER_GROUP_STRATEGIES,+ providerGroupDeviceCount,type ProviderGroupConfig,type ProviderGroupMember,type ProviderGroupMemberStatus,@@ -44,6 +48,11 @@ import { GroupMemberQuota, groupMemberQuotaTarget } from './GroupMemberQuota';import { GroupMemberReshare, reshareSummaryText } from './GroupMemberReshare';import { GroupMemberDetailsButton, GroupMemberVersion } from './GroupMemberVersion';import { ProviderGroupAddDialog } from './ProviderGroupAddDialog';+import {+ groupProviderGroupItems,+ providerGroupAccountName,+ providerGroupDeviceVersion,+} from './providerGroupPresentation';import { useProviderGroup } from './useProviderGroup';/**@@ -141,7 +150,8 @@ export function ProviderGroupSection({ providerId, providerName }: { providerId:<h3 id="provider-group-title" className="text-13 font-medium text-[var(--settings-section-title)]">{t('providerGroup.section.title')}</h3>- {config && <span className="text-13 text-[var(--text-tertiary)]">{config.members.length}</span>}+ {/* 台数按电脑算:一台电脑上的几个账号算一台(与入口的「N 台电脑」一致)。 */}+ {config && <span className="text-13 text-[var(--text-tertiary)]">{providerGroupDeviceCount(config.members)}</span>}<span className="flex-1" />{config && (<Button variant="secondary" size="sm" compact tone="quiet" disabled={saving} onClick={() => void deleteGroup()}>@@ -164,18 +174,32 @@ export function ProviderGroupSection({ providerId, providerName }: { providerId:</p>) : (<>- {config.members.map((member, index) => (- <MemberRow- key={member.key}- member={member}- status={statuses.get(member.key)}- strategy={config.strategy}- first={index === 0}- disabled={saving}- onChange={(patch) => updateMember(member.key, patch)}- onRemove={(label) => void removeMember(member, label)}- />- ))}+ {groupProviderGroupItems(config.members).map((device, index) => {+ const row = (member: ProviderGroupMember, account?: number) => (+ <MemberRow+ key={member.key}+ member={member}+ status={statuses.get(member.key)}+ strategy={config.strategy}+ first={index === 0}+ account={account}+ disabled={saving}+ onChange={(patch) => updateMember(member.key, patch)}+ onRemove={(label) => void removeMember(member, label)}+ />+ );+ if (device.items.length === 1) return row(device.items[0]);+ return (+ <div+ key={device.key}+ data-testid="provider-group-device"+ className={cn(index > 0 && 'border-t border-[var(--settings-theme-card-border)]')}+ >+ <MemberDeviceHeader members={device.items} statuses={device.items.map((m) => statuses.get(m.key))} />+ {device.items.map((member, accountIndex) => row(member, accountIndex + 1))}+ </div>+ );+ })}<div className="flex flex-col gap-1.5 border-t border-[var(--settings-theme-card-border)] px-4 py-3"><div className="flex flex-wrap items-center gap-3"><span className="text-13 text-[var(--text-primary)]">{t('providerGroup.strategy.label')}</span>@@ -232,11 +256,63 @@ export function ProviderGroupSection({ providerId, providerName }: { providerId:);}+/** 组内电脑的称呼与来源;只有一个账号的电脑行与多个账号时的电脑这一层共用。 */+function useMemberNames(member: ProviderGroupMember, status: ProviderGroupMemberStatus | undefined) {+ const { t } = useTranslation();+ const ownerNameOf = useProviderShareOwnerNameOf();+ // 分享来的电脑只用分享者的昵称称呼,不用电脑名(provider-sharing.md §6)。+ const ownerName = member.kind === 'share' ? (status?.ownerName ?? ownerNameOf(member.agentDeviceId)) : null;+ const label = member.kind === 'local'+ ? t('providerGroup.member.local')+ : member.kind === 'share'+ ? providerShareComputerName(t, ownerName)+ : (status?.label ?? member.label ?? member.key);+ const source = member.kind === 'local'+ ? status?.label+ : member.kind === 'device'+ ? t('providerGroup.member.sourceDevice')+ : t('providerGroup.member.sourceShare', { name: ownerName ?? '' });+ return { ownerName, label, source };+}++/** 一台电脑上有几个账号时,电脑这一层:只说是哪台、来源与版本,设置都在下面每个账号上。 */+function MemberDeviceHeader({+ members,+ statuses,+}: {+ members: readonly ProviderGroupMember[];+ statuses: readonly (ProviderGroupMemberStatus | undefined)[];+}) {+ const { t } = useTranslation();+ const { label, source } = useMemberNames(members[0], statuses.find((status) => status != null));+ return (+ <div data-testid="provider-group-device-header" className="flex items-center gap-3 px-4 py-3">+ <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>+ <span className="flex min-w-0 flex-1 flex-col gap-0.5">+ <span className="flex flex-wrap items-baseline gap-2 text-13">+ <span className="font-medium text-[var(--text-primary)]">{label}</span>+ <GroupMemberVersion status={providerGroupDeviceVersion(statuses)} />+ {source && <span className="text-12 text-[var(--text-secondary)]">{source}</span>}+ </span>+ <span className="text-12 text-[var(--text-secondary)]">+ {t('providerGroup.member.accountCount', { count: members.length })}+ </span>+ </span>+ </div>+ );+}+function MemberRow({member,status,strategy,first,+ account,disabled,onChange,onRemove,@@ -245,24 +321,19 @@ function MemberRow({status: ProviderGroupMemberStatus | undefined;strategy: ProviderGroupStrategy;first: boolean;+ /** 同一台电脑上有几个账号时,这是第几个(从 1 起):行收在电脑下面,只写账号;不传就是一台电脑一行。 */+ account?: number;disabled: boolean;onChange: (patch: Partial<ProviderGroupMember>) => void;onRemove: (label: string) => void;}) {const { t, i18n } = useTranslation();- const ownerNameOf = useProviderShareOwnerNameOf();- // 分享来的电脑只用分享者的昵称称呼,不用电脑名(provider-sharing.md §6)。- const ownerName = member.kind === 'share' ? (status?.ownerName ?? ownerNameOf(member.agentDeviceId)) : null;- const label = member.kind === 'local'- ? t('providerGroup.member.local')- : member.kind === 'share'- ? providerShareComputerName(t, ownerName)- : (status?.label ?? member.label ?? member.key);- const source = member.kind === 'local'- ? status?.label- : member.kind === 'device'- ? t('providerGroup.member.sourceDevice')- : t('providerGroup.member.sourceShare', { name: ownerName ?? '' });+ const { ownerName, label: computer, source } = useMemberNames(member, status);+ const accountName = account === undefined+ ? null+ : providerGroupAccountName(member, status) ?? t('providerGroup.member.accountFallback', { index: account });+ // 无障碍标签与移出确认用:账号行带上电脑名,同一台电脑的几个账号不会重名。+ const label = accountName === null ? computer : `${computer} · ${accountName}`;const ready = status?.state === 'available' || status?.state === 'full';const running = status?.running ?? 0;// 能用的时候状态词本身就报负载(「空闲」/「N 个任务运行中」),所以每行永远看得出这台现在跑了几个;@@ -278,119 +349,131 @@ function MemberRow({<divdata-testid="provider-group-member"data-member-state={status?.state ?? 'loading'}- className={cn(!first && 'border-t border-[var(--settings-theme-card-border)]')}+ className={cn(accountName === null && !first && 'border-t border-[var(--settings-theme-card-border)]')}>- <div className="flex flex-wrap items-center gap-3 px-4 py-3">- <GroupMemberDetailsButton- status={status}- type="button"- aria-expanded={quotaOpen}- aria-controls={quotaOpen ? quotaId : undefined}- onClick={() => setQuotaOpen((open) => !open)}- className="group -m-1 flex min-w-[200px] flex-1 items-center gap-3 rounded-lg p-1 text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]"+ <div className={cn('flex', accountName !== null && 'pl-4')}>+ {/* 收在电脑下面的账号:空出图标那一列,分隔线从账号名起,看得出这几个账号在同一台电脑上。 */}+ {accountName !== null && <span aria-hidden="true" className="w-8 shrink-0" />}+ <div+ className={cn(+ 'flex min-w-0 flex-1 flex-wrap items-center gap-3 py-3',+ accountName === null ? 'px-4' : 'ml-3 border-t border-[var(--settings-theme-card-border)] pr-4',+ )}>- {/* 组内电脑用设备图标;人像头像留给下方「分享」块里真实的人。 */}- <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)]"+ <GroupMemberDetailsButton+ status={status}+ type="button"+ aria-expanded={quotaOpen}+ aria-controls={quotaOpen ? quotaId : undefined}+ onClick={() => setQuotaOpen((open) => !open)}+ className="group -m-1 flex min-w-[200px] flex-1 items-center gap-3 rounded-lg p-1 text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]">- <Monitor size={16} />- </span>- <span className={cn('flex min-w-0 flex-1 flex-col gap-0.5', member.paused && 'opacity-60')}>- <span className="flex flex-wrap items-baseline gap-2 text-13">- <span className="font-medium text-[var(--text-primary)]">{label}</span>- <GroupMemberVersion status={status} />- {source && <span className="text-12 text-[var(--text-secondary)]">{source}</span>}- <ChevronRight- aria-hidden="true"- size={14}- className={cn(- 'shrink-0 self-center text-[var(--text-tertiary)] transition-transform group-hover:text-[var(--text-secondary)]',- quotaOpen && 'rotate-90',- )}- />- </span>- <span className="flex flex-wrap items-center gap-1.5 text-12 text-[var(--text-secondary)]">+ {/* 组内电脑用设备图标;人像头像留给下方「分享」块里真实的人。账号行的图标在电脑那一层。 */}+ {accountName === null && (<spanaria-hidden="true"- className="h-1.5 w-1.5 shrink-0 rounded-full"- style={{ background: ready ? 'var(--remote-status-ready)' : 'var(--remote-status-disconnected)' }}- />- {/* 运行数是状态,上限是设置:各说一次,不再出现「0 / 10」与下拉里重复同一个上限。 */}- <span>{member.kind === 'local' && status?.state === 'paused'- ? t('providerGroup.member.status.pausedLocal')- : memberStatusText(t, status, i18n.language)}</span>- {appendRunning && (- <>- <span aria-hidden="true">·</span>- <span className="[font-variant-numeric:tabular-nums]">- {t('providerGroup.member.runningCount', { count: running })}- </span>- </>- )}- {/* 分享来的电脑:它的主人是否同意给本机分享的人用(provider-sharing.md §4.3),展开看每个人。 */}- {reshare && (- <>- <span aria-hidden="true">·</span>- <span data-testid="provider-group-member-reshare-summary">- {reshareSummaryText(t, reshare, ownerName ?? '')}- </span>- </>- )}+ 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>+ )}+ <span className={cn('flex min-w-0 flex-1 flex-col gap-0.5', member.paused && 'opacity-60')}>+ <span className="flex flex-wrap items-baseline gap-2 text-13">+ <span className="font-medium text-[var(--text-primary)]">{accountName ?? computer}</span>+ {/* 版本与来源属于电脑:账号行不重复,写在电脑那一层。 */}+ {accountName === null && <GroupMemberVersion status={status} />}+ {accountName === null && source && <span className="text-12 text-[var(--text-secondary)]">{source}</span>}+ <ChevronRight+ aria-hidden="true"+ size={14}+ className={cn(+ 'shrink-0 self-center text-[var(--text-tertiary)] transition-transform group-hover:text-[var(--text-secondary)]',+ quotaOpen && 'rotate-90',+ )}+ />+ </span>+ <span className="flex flex-wrap items-center gap-1.5 text-12 text-[var(--text-secondary)]">+ <span+ aria-hidden="true"+ className="h-1.5 w-1.5 shrink-0 rounded-full"+ style={{ background: ready ? 'var(--remote-status-ready)' : 'var(--remote-status-disconnected)' }}+ />+ {/* 运行数是状态,上限是设置:各说一次,不再出现「0 / 10」与下拉里重复同一个上限。 */}+ <span>{member.kind === 'local' && status?.state === 'paused'+ ? t('providerGroup.member.status.pausedLocal')+ : memberStatusText(t, status, i18n.language)}</span>+ {appendRunning && (+ <>+ <span aria-hidden="true">·</span>+ <span className="[font-variant-numeric:tabular-nums]">+ {t('providerGroup.member.runningCount', { count: running })}+ </span>+ </>+ )}+ {/* 分享来的电脑:它的主人是否同意给本机分享的人用(provider-sharing.md §4.3),展开看每个人。 */}+ {reshare && (+ <>+ <span aria-hidden="true">·</span>+ <span data-testid="provider-group-member-reshare-summary">+ {reshareSummaryText(t, reshare, ownerName ?? '')}+ </span>+ </>+ )}+ </span></span>- </span>- </GroupMemberDetailsButton>- <div className="flex shrink-0 items-center gap-1.5">- <Select- label={t('providerGroup.member.limitAria', { name: label })}- value={String(member.limit)}- options={LIMIT_OPTIONS.map((value) => ({ value, label: t('providerGroup.member.limitOption', { count: Number(value) }) }))}- onValueChange={(value) => onChange({ limit: Number(value) })}- disabled={disabled}- className="w-[104px]"- />- {strategy === 'weight' && (+ </GroupMemberDetailsButton>+ <div className="flex shrink-0 items-center gap-1.5"><Select- label={t('providerGroup.member.weightAria', { name: label })}- value={String(member.weight)}- options={WEIGHT_OPTIONS.map((value) => ({ value, label: t('providerGroup.member.weightOption', { weight: value }) }))}- onValueChange={(value) => onChange({ weight: Number(value) })}+ label={t('providerGroup.member.limitAria', { name: label })}+ value={String(member.limit)}+ options={LIMIT_OPTIONS.map((value) => ({ value, label: t('providerGroup.member.limitOption', { count: Number(value) }) }))}+ onValueChange={(value) => onChange({ limit: Number(value) })}disabled={disabled}- /* 权重最大 100,各语言的「权重 100」都比「上限 16」长:按内容定宽,避免 trigger 自己截断。 */- className="w-[120px]"+ className="w-[104px]"/>- )}- <Switch- checked={!member.paused}- disabled={disabled}- aria-label={t(member.kind === 'local'- ? 'providerGroup.member.assignLocalAria'- : 'providerGroup.member.assignAria', { name: label })}- onCheckedChange={(on) => onChange({ paused: !on })}- />- {member.kind === 'local' ? (- <span aria-hidden="true" className="h-8 w-8 shrink-0" />- ) : (- <DropdownMenu>- <DropdownMenuTrigger asChild>- <Tip text={t('providerGroup.member.moreAria', { name: label })}>- <button- type="button"- aria-label={t('providerGroup.member.moreAria', { name: label })}- className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full text-[var(--text-tertiary)] transition-colors hover:bg-[var(--surface-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]"- >- <MoreHorizontal size={18} />- </button>- </Tip>- </DropdownMenuTrigger>- <DropdownMenuContent align="end">- <DropdownMenuItem variant="danger" disabled={disabled} onClick={() => onRemove(label)}>- <CircleMinus size={18} className="mr-2.5" />- {t('providerGroup.member.remove')}- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- )}+ {strategy === 'weight' && (+ <Select+ label={t('providerGroup.member.weightAria', { name: label })}+ value={String(member.weight)}+ options={WEIGHT_OPTIONS.map((value) => ({ value, label: t('providerGroup.member.weightOption', { weight: value }) }))}+ onValueChange={(value) => onChange({ weight: Number(value) })}+ disabled={disabled}+ /* 权重最大 100,各语言的「权重 100」都比「上限 16」长:按内容定宽,避免 trigger 自己截断。 */+ className="w-[120px]"+ />+ )}+ <Switch+ checked={!member.paused}+ disabled={disabled}+ aria-label={t(member.kind === 'local'+ ? 'providerGroup.member.assignLocalAria'+ : 'providerGroup.member.assignAria', { name: label })}+ onCheckedChange={(on) => onChange({ paused: !on })}+ />+ {member.kind === 'local' ? (+ <span aria-hidden="true" className="h-8 w-8 shrink-0" />+ ) : (+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <Tip text={t('providerGroup.member.moreAria', { name: label })}>+ <button+ type="button"+ aria-label={t('providerGroup.member.moreAria', { name: label })}+ className="flex h-8 w-8 shrink-0 items-center justify-center rounded-full text-[var(--text-tertiary)] transition-colors hover:bg-[var(--surface-hover)] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--focus-ring)]"+ >+ <MoreHorizontal size={18} />+ </button>+ </Tip>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end">+ <DropdownMenuItem variant="danger" disabled={disabled} onClick={() => onRemove(label)}>+ <CircleMinus size={18} className="mr-2.5" />+ {t('providerGroup.member.remove')}+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ )}+ </div></div></div>{quotaOpen && (diff --git a/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx b/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsxindex 7ab586064d..3d0d19be85 100644--- a/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx+++ b/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx@@ -2,6 +2,7 @@* 另一台电脑上的供应商组,只读(docs/product-rules/provider-groups.md §10):设置页里同账号另一台电脑的* 供应商被建成了组时,详情里列出组内电脑与它们的状态(在线、正在运行几个任务、冷却到何时)。* 组的设置只能在组所在电脑上改。状态没有推送,打开期间定时重读。+ * 与组所在电脑上的列表一样按电脑聚合:一台电脑有几个账号时先列电脑,账号收在它下面(providerGroupPresentation.ts)。*/import { ChevronRight, Monitor } from 'lucide-react';import { useCallback, useEffect, useId, useRef, useState } from 'react';@@ -22,6 +23,11 @@ import { providerShareComputerName, useProviderShareOwnerNameOf } from '../proviimport { GroupMemberQuota, groupMemberQuotaTarget } from './GroupMemberQuota';import { GroupMemberDetailsButton, GroupMemberVersion } from './GroupMemberVersion';import { memberStatusText } from './ProviderGroupSection';+import {+ groupProviderGroupItems,+ providerGroupAccountName,+ providerGroupDeviceVersion,+} from './providerGroupPresentation';const REFRESH_INTERVAL_MS = 15_000;@@ -91,6 +97,10 @@ export function RemoteProviderGroupMembers({const { t } = useTranslation();const { view, versions, failed } = useRemoteProviderGroupView(deviceId, providerId);const members = view?.config?.members ?? config.members;+ const statusOf = (member: ProviderGroupMember) => view?.members.find((m) => m.key === member.key);+ // local 指组所在电脑,不是查看端;分享来源不能按同账号设备查版本。+ const appVersionOf = (member: ProviderGroupMember) => member.kind === 'local' ? versions.get(deviceId)+ : member.kind === 'device' && member.agentDeviceId ? versions.get(member.agentDeviceId) : undefined;return (<sectiondata-testid="remote-provider-group-members"@@ -101,18 +111,34 @@ export function RemoteProviderGroupMembers({{t('settings.providers.remote.groupMembersTitle')}</h3><div className="overflow-hidden rounded-lg border border-[var(--settings-theme-card-border)]">- {members.map((member, index) => (- <MemberRow- key={member.key}- member={member}- status={view?.members.find((m) => m.key === member.key)}- // local 指组所在电脑,不是查看端;分享来源不能按同账号设备查版本。- appVersion={member.kind === 'local' ? versions.get(deviceId)- : member.kind === 'device' && member.agentDeviceId ? versions.get(member.agentDeviceId) : undefined}- first={index === 0}- ownerDeviceId={deviceId}- />- ))}+ {groupProviderGroupItems(members).map((device, index) => {+ const row = (member: ProviderGroupMember, account?: number) => (+ <MemberRow+ key={member.key}+ member={member}+ status={statusOf(member)}+ appVersion={appVersionOf(member)}+ first={index === 0}+ account={account}+ ownerDeviceId={deviceId}+ />+ );+ if (device.items.length === 1) return row(device.items[0]);+ return (+ <div+ key={device.key}+ data-testid="remote-provider-group-device"+ className={cn(index > 0 && 'border-t border-[var(--settings-theme-card-border)]')}+ >+ <DeviceHeader+ members={device.items}+ statuses={device.items.map(statusOf)}+ appVersions={device.items.map(appVersionOf)}+ />+ {device.items.map((member, accountIndex) => row(member, accountIndex + 1))}+ </div>+ );+ })}</div>{failed && (<p className="mt-2 text-12 leading-[1.5] text-[var(--text-tertiary)]">@@ -123,32 +149,90 @@ export function RemoteProviderGroupMembers({);}+type VersionStatus = Pick<ProviderGroupMemberStatus, 'appVersion' | 'guestSupport'>;++/** 组所在电脑没回版本时,用查看端设备目录里的版本补上。 */+function withAppVersion(+ status: ProviderGroupMemberStatus | undefined,+ appVersion: string | undefined,+): VersionStatus | undefined {+ return status?.appVersion ? status : appVersion ? { ...status, appVersion } : status;+}++/** 组内电脑的称呼与来源;只有一个账号的电脑行与多个账号时的电脑这一层共用。 */+function useMemberNames(member: ProviderGroupMember, status: ProviderGroupMemberStatus | undefined) {+ const { t } = useTranslation();+ const ownerNameOf = useProviderShareOwnerNameOf();+ // 分享来的电脑只用分享者的昵称称呼,不用电脑名(provider-sharing.md §6)。+ const ownerName = member.kind === 'share' ? (status?.ownerName ?? ownerNameOf(member.agentDeviceId)) : null;+ const label = member.kind === 'share'+ ? providerShareComputerName(t, ownerName)+ : (status?.label ?? member.label ?? member.key);+ const source = member.kind === 'local'+ ? t('providerGroup.member.sourceGroupOwner')+ : member.kind === 'device'+ ? t('providerGroup.member.sourceDevice')+ : t('providerGroup.member.sourceShare', { name: ownerName ?? '' });+ return { label, source };+}++/** 一台电脑上有几个账号时,电脑这一层:只说是哪台、来源与版本,状态与额度在下面每个账号上。 */+function DeviceHeader({+ members,+ statuses,+ appVersions,+}: {+ members: readonly ProviderGroupMember[];+ statuses: readonly (ProviderGroupMemberStatus | undefined)[];+ appVersions: readonly (string | undefined)[];+}) {+ const { t } = useTranslation();+ const { label, source } = useMemberNames(members[0], statuses.find((status) => status != null));+ const version = providerGroupDeviceVersion(statuses.map((status, index) => withAppVersion(status, appVersions[index])));+ return (+ <div data-testid="remote-provider-group-device-header" className="flex items-center gap-3 px-3 py-2.5">+ <span+ aria-hidden="true"+ className="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded-full bg-[var(--surface-chip)] text-[var(--text-secondary)]"+ >+ <Monitor size={14} />+ </span>+ <span className="flex min-w-0 flex-1 flex-col gap-0.5">+ <span className="flex min-w-0 flex-wrap items-baseline gap-2 text-13">+ <span className="truncate font-medium text-[var(--text-primary)]">{label}</span>+ <GroupMemberVersion status={version} />+ <span className="text-12 text-[var(--text-secondary)]">{source}</span>+ </span>+ <span className="text-12 text-[var(--text-secondary)]">+ {t('providerGroup.member.accountCount', { count: members.length })}+ </span>+ </span>+ </div>+ );+}+function MemberRow({member,status,appVersion,first,+ account,ownerDeviceId,}: {member: ProviderGroupMember;status: ProviderGroupMemberStatus | undefined;appVersion?: string;first: boolean;+ /** 同一台电脑上有几个账号时,这是第几个(从 1 起):行收在电脑下面,只写账号;不传就是一台电脑一行。 */+ account?: number;/** 组所在电脑:组里的「组所在电脑自己」读它的账号额度。 */ownerDeviceId: string;}) {const { t, i18n } = useTranslation();- const ownerNameOf = useProviderShareOwnerNameOf();- // 分享来的电脑只用分享者的昵称称呼,不用电脑名(provider-sharing.md §6)。- const ownerName = member.kind === 'share' ? (status?.ownerName ?? ownerNameOf(member.agentDeviceId)) : null;- const label = member.kind === 'share'- ? providerShareComputerName(t, ownerName)- : (status?.label ?? member.label ?? member.key);- const source = member.kind === 'local'- ? t('providerGroup.member.sourceGroupOwner')- : member.kind === 'device'- ? t('providerGroup.member.sourceDevice')- : t('providerGroup.member.sourceShare', { name: ownerName ?? '' });+ const { label, source } = useMemberNames(member, status);+ const accountName = account === undefined+ ? null+ : providerGroupAccountName(member, status) ?? t('providerGroup.member.accountFallback', { index: account });// 组所在电脑看它能用,这台电脑却连不上(换电脑时会跳过它):不显示成能用。const unreachableHere = status?.unreachableHere === true;const ready = !unreachableHere && (status?.state === 'available' || status?.state === 'full');@@ -159,13 +243,61 @@ function MemberRow({const [quotaOpen, setQuotaOpen] = useState(false);const quotaId = useId();const selfDeviceId = useOptionalAuthDeviceId();- const versionStatus = status?.appVersion ? status : appVersion ? { ...status, appVersion } : status;+ const versionStatus = withAppVersion(status, appVersion);+ const content = (+ <>+ {/* 账号行的图标、版本与来源都在电脑那一层,这里不重复。 */}+ {accountName === null && (+ <span+ aria-hidden="true"+ className="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded-full bg-[var(--surface-chip)] text-[var(--text-secondary)]"+ >+ <Monitor size={14} />+ </span>+ )}+ <span className={cn('flex min-w-0 flex-1 flex-col gap-0.5', member.paused && 'opacity-60')}>+ <span className="flex min-w-0 flex-wrap items-baseline gap-2 text-13">+ <span className="truncate font-medium text-[var(--text-primary)]">{accountName ?? label}</span>+ {accountName === null && <GroupMemberVersion status={versionStatus} />}+ {accountName === null && <span className="text-12 text-[var(--text-secondary)]">{source}</span>}+ <ChevronRight+ aria-hidden="true"+ size={14}+ className={cn(+ 'shrink-0 self-center text-[var(--text-tertiary)] transition-transform group-hover:text-[var(--text-secondary)]',+ quotaOpen && 'rotate-90',+ )}+ />+ </span>+ <span className="flex flex-wrap items-center gap-1.5 text-12 text-[var(--text-secondary)]">+ <span+ aria-hidden="true"+ className="h-1.5 w-1.5 shrink-0 rounded-full"+ style={{ background: ready ? 'var(--remote-status-ready)' : 'var(--remote-status-disconnected)' }}+ />+ <span>+ {unreachableHere+ ? t('providerGroup.member.status.unreachableHere')+ : memberStatusText(t, status, i18n.language)}+ </span>+ {appendRunning && (+ <>+ <span aria-hidden="true">·</span>+ <span className="[font-variant-numeric:tabular-nums]">+ {t('providerGroup.member.runningCount', { count: running })}+ </span>+ </>+ )}+ </span>+ </span>+ </>+ );return (<divdata-testid="remote-provider-group-member"data-member-state={status?.state ?? 'loading'}data-unreachable-here={unreachableHere || undefined}- className={cn(!first && 'border-t border-[var(--settings-theme-card-border)]')}+ className={cn(accountName === null && !first && 'border-t border-[var(--settings-theme-card-border)]')}><GroupMemberDetailsButtonstatus={versionStatus}@@ -173,49 +305,20 @@ function MemberRow({aria-expanded={quotaOpen}aria-controls={quotaOpen ? quotaId : undefined}onClick={() => setQuotaOpen((open) => !open)}- className="group flex w-full items-center gap-3 px-3 py-2.5 text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-[var(--focus-ring)]"+ className={cn(+ 'group flex w-full text-left focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-inset focus-visible:ring-[var(--focus-ring)]',+ accountName === null ? 'items-center gap-3 px-3 py-2.5' : 'pl-3',+ )}>- <span- aria-hidden="true"- className="inline-flex h-7 w-7 shrink-0 items-center justify-center rounded-full bg-[var(--surface-chip)] text-[var(--text-secondary)]"- >- <Monitor size={14} />- </span>- <span className={cn('flex min-w-0 flex-1 flex-col gap-0.5', member.paused && 'opacity-60')}>- <span className="flex min-w-0 flex-wrap items-baseline gap-2 text-13">- <span className="truncate font-medium text-[var(--text-primary)]">{label}</span>- <GroupMemberVersion status={versionStatus} />- <span className="text-12 text-[var(--text-secondary)]">{source}</span>- <ChevronRight- aria-hidden="true"- size={14}- className={cn(- 'shrink-0 self-center text-[var(--text-tertiary)] transition-transform group-hover:text-[var(--text-secondary)]',- quotaOpen && 'rotate-90',- )}- />- </span>- <span className="flex flex-wrap items-center gap-1.5 text-12 text-[var(--text-secondary)]">- <span- aria-hidden="true"- className="h-1.5 w-1.5 shrink-0 rounded-full"- style={{ background: ready ? 'var(--remote-status-ready)' : 'var(--remote-status-disconnected)' }}- />- <span>- {unreachableHere- ? t('providerGroup.member.status.unreachableHere')- : memberStatusText(t, status, i18n.language)}+ {accountName === null ? content : (+ <>+ {/* 收在电脑下面的账号:空出图标那一列,分隔线从账号名起,看得出这几个账号在同一台电脑上。 */}+ <span aria-hidden="true" className="w-7 shrink-0" />+ <span className="ml-3 flex min-w-0 flex-1 items-center gap-3 border-t border-[var(--settings-theme-card-border)] py-2.5 pr-3">+ {content}</span>- {appendRunning && (- <>- <span aria-hidden="true">·</span>- <span className="[font-variant-numeric:tabular-nums]">- {t('providerGroup.member.runningCount', { count: running })}- </span>- </>- )}- </span>- </span>+ </>+ )}</GroupMemberDetailsButton>{quotaOpen && (<GroupMemberQuotadiff --git a/apps/desktop/src/renderer/features/provider-group/__tests__/ProviderGroupSection.test.tsx b/apps/desktop/src/renderer/features/provider-group/__tests__/ProviderGroupSection.test.tsxindex 8e74d77043..c786ec8d63 100644--- a/apps/desktop/src/renderer/features/provider-group/__tests__/ProviderGroupSection.test.tsx+++ b/apps/desktop/src/renderer/features/provider-group/__tests__/ProviderGroupSection.test.tsx@@ -9,6 +9,7 @@ import type { ReactNode } from 'react';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import type { ProviderGroupConfig, ProviderGroupView } from '../../../../shared/providerGroup';+import { toast } from '@/lib/toast';import zhCN from '../../../i18n/locales/zh-CN/common.json';import { memberStatusText, ProviderGroupSection } from '../ProviderGroupSection';import { __testing as localGroupsTesting, useLocalProviderGroupsState } from '../useLocalProviderGroups';@@ -157,6 +158,8 @@ describe('ProviderGroupSection', () => {expect(saved.members.map((m) => m.key)).toEqual(['local', MINI.key]);expect(saved).toMatchObject({ strategy: 'least', autoSwitch: true });expect(await screen.findAllByTestId('provider-group-member')).toHaveLength(2);+ // 一台组里原来没有的电脑:照旧说「N 台电脑」。+ expect(toast.success).toHaveBeenCalledWith('providerGroup.toast.added:{"count":1,"provider":"Anthropic"}');});// 转分享(provider-sharing.md §4.3):分享来的电脑的主人是否同意本机分享出去的人经组使用它。@@ -309,6 +312,106 @@ describe('ProviderGroupSection', () => {expect(screen.queryByRole('radio', { name: '用量均衡' })).toBeNull();});+ it('lists several accounts of one computer under that computer, each with its own settings', async () => {+ const MINI_B = { ...MINI, key: 'device:mini:anthropic-b', providerId: 'anthropic-b', providerName: 'Claude B' };+ stored = { strategy: 'least', autoSwitch: true, members: [LOCAL, { ...MINI, providerName: 'Claude A' }, MINI_B] };+ render(<ProviderGroupSection providerId="anthropic" providerName="Anthropic" />);+ const device = await screen.findByTestId('provider-group-device');+ // 台数按电脑算:本机 + Mac mini = 2 台(组里 3 个账号)。+ expect(screen.getByRole('heading', { name: 'providerGroup.section.title' }).nextElementSibling?.textContent).toBe('2');+ const header = within(device).getByTestId('provider-group-device-header');+ expect(header.textContent).toContain('Mac mini');+ expect(header.textContent).toContain('providerGroup.member.sourceDevice');+ expect(header.textContent).toContain('providerGroup.member.accountCount:{"count":2}');+ const accounts = within(device).getAllByTestId('provider-group-member');+ expect(accounts.map((row) => row.textContent?.includes('Mac mini'))).toEqual([false, false]);+ expect(accounts[0].textContent).toContain('Claude A');+ expect(accounts[1].textContent).toContain('Claude B');+ // 只有一个账号的本机不分两层。+ const rows = screen.getAllByTestId('provider-group-member');+ expect(rows).toHaveLength(3);+ expect(rows[0].closest('[data-testid="provider-group-device"]')).toBeNull();+ // 开关与移出仍按账号:名字带上电脑,同一台的两个账号不重名。+ fireEvent.click(within(accounts[1]).getByRole('switch', {+ name: 'providerGroup.member.assignAria:{"name":"Mac mini · Claude B"}',+ }));+ await waitFor(() => expect(stored?.members.map((m) => m.paused)).toEqual([false, false, true]));+ fireEvent.click(within(accounts[0]).getByRole('button', { name: 'providerGroup.member.remove' }));+ await waitFor(() => expect(stored?.members.map((m) => m.key)).toEqual(['local', MINI_B.key]));+ expect(confirmSpy).toHaveBeenCalledWith(expect.objectContaining({+ title: 'providerGroup.member.removeConfirm.title:{"name":"Mac mini · Claude A"}',+ }));+ // 剩一个账号就回到一行。+ await waitFor(() => expect(screen.queryByTestId('provider-group-device')).toBeNull());+ });++ it('offers the accounts of one computer under that computer when adding, and says how many accounts were added', async () => {+ const candidates = [+ { key: MINI.key, kind: 'device', agentDeviceId: 'mini', providerId: MINI.providerId, label: 'Mac mini', providerName: 'Claude A' },+ { key: 'device:mini:anthropic-b', kind: 'device', agentDeviceId: 'mini', providerId: 'anthropic-b', label: 'Mac mini', providerName: 'Claude B' },+ { key: 'device:studio:anthropic', kind: 'device', agentDeviceId: 'studio', providerId: 'anthropic', label: 'Studio', providerName: 'Claude' },+ ];+ const base = command.getMockImplementation()!;+ command.mockImplementation(async (cmd: { action: string }) => (cmd.action === 'candidates' ? candidates : base(cmd)));+ render(<ProviderGroupSection providerId="anthropic" providerName="Anthropic" />);+ await screen.findByText(/providerGroup\.section\.empty/);+ fireEvent.click(screen.getByRole('button', { name: 'providerGroup.section.addComputer' }));+ const dialog = await screen.findByTestId('provider-group-add-dialog');+ const device = await within(dialog).findByTestId('provider-group-candidate-device');+ expect(device.textContent).toContain('Mac mini');+ expect(device.textContent).toContain('providerGroup.member.accountCount:{"count":2}');+ const accounts = within(device).getAllByTestId('provider-group-candidate');+ expect(accounts.map((row) => row.textContent)).toEqual(['Claude A', 'Claude B']);+ // 只有一个账号的电脑一行写完,不分两层。+ const all = within(dialog).getAllByTestId('provider-group-candidate');+ expect(all).toHaveLength(3);+ expect(all[2].closest('[data-testid="provider-group-candidate-device"]')).toBeNull();+ expect(all[2].textContent).toContain('Studio');+ expect(all[2].textContent).toContain('Claude');+ fireEvent.click(accounts[0]);+ fireEvent.click(accounts[1]);+ fireEvent.click(within(dialog).getByRole('button', { name: 'providerGroup.add.confirm' }));+ await waitFor(() => expect(stored?.members.map((m) => m.key)).toEqual(['local', MINI.key, 'device:mini:anthropic-b']));+ expect(stored?.members.map((m) => m.providerName)).toEqual(['Anthropic', 'Claude A', 'Claude B']);+ // 同一台电脑的两个账号:说加了几个账号,不说「2 台电脑」。+ expect(toast.success).toHaveBeenCalledWith('providerGroup.toast.addedAccounts:{"count":2,"provider":"Anthropic"}');+ });++ it('lists several shares from the same computer of one person under that computer, in the group and when adding', async () => {+ realLocale = createInstance();+ await realLocale.init({ lng: 'zh-CN', resources: { 'zh-CN': { translation: zhCN } }, interpolation: { escapeValue: false } });+ const share = (id: string, providerName: string) => ({+ key: `share:${id}:anthropic`, kind: 'share' as const, agentDeviceId: `share:${id}`, providerId: 'anthropic',+ providerName, hostDeviceId: 'kai-pc', limit: 4, weight: 1, paused: false,+ });+ stored = { strategy: 'least', autoSwitch: true, members: [LOCAL, share('s1', 'Claude Pro'), share('s2', 'Claude Max')] };+ const view = viewOf(stored);+ view.members = view.members.map((m) => (m.kind === 'share' ? { ...m, ownerName: 'Kai', state: 'available' as const } : m));+ const candidates = [+ { key: 'share:s1:anthropic', kind: 'share', agentDeviceId: 'share:s1', providerId: 'anthropic', label: 'Kai', providerName: 'Claude Pro', ownerName: 'Kai', hostDeviceId: 'kai-pc', blocked: 'member' },+ { key: 'share:s2:anthropic', kind: 'share', agentDeviceId: 'share:s2', providerId: 'anthropic', label: 'Kai', providerName: 'Claude Max', ownerName: 'Kai', hostDeviceId: 'kai-pc', blocked: 'member' },+ ];+ command.mockImplementation(async (cmd: { action: string }) =>+ (cmd.action === 'list' ? { anthropic: stored } : cmd.action === 'candidates' ? candidates : view));+ render(<ProviderGroupSection providerId="anthropic" providerName="Anthropic" />);+ const device = await screen.findByTestId('provider-group-device');+ const header = within(device).getByTestId('provider-group-device-header');+ expect(header.textContent).toContain('Kai 的电脑');+ expect(header.textContent).toContain('来自 Kai 的分享');+ expect(header.textContent).toContain('2 个账号');+ const accounts = within(device).getAllByTestId('provider-group-member');+ expect(accounts[0].textContent).toContain('Claude Pro');+ expect(accounts[1].textContent).toContain('Claude Max');+ // 本机 + Kai 的那台 = 2 台。+ expect(screen.getByRole('heading', { name: '供应商组' }).nextElementSibling?.textContent).toBe('2');+ fireEvent.click(screen.getByRole('button', { name: '添加电脑' }));+ const dialog = await screen.findByTestId('provider-group-add-dialog');+ const offered = await within(dialog).findByTestId('provider-group-candidate-device');+ expect(offered.textContent).toContain('Kai 的电脑');+ expect(within(offered).getAllByTestId('provider-group-candidate').map((row) => row.textContent))+ .toEqual(['Claude Pro已在组里', 'Claude Max已在组里']);+ });+it('shows the quota hint for a subscription group', async () => {stored = { strategy: 'least', autoSwitch: true, members: [LOCAL] };render(<ProviderGroupSection providerId="anthropic" providerName="Anthropic" />);diff --git a/apps/desktop/src/renderer/features/provider-group/__tests__/RemoteProviderGroupMembers.test.tsx b/apps/desktop/src/renderer/features/provider-group/__tests__/RemoteProviderGroupMembers.test.tsxindex a6177c69a3..bdb69a83da 100644--- a/apps/desktop/src/renderer/features/provider-group/__tests__/RemoteProviderGroupMembers.test.tsx+++ b/apps/desktop/src/renderer/features/provider-group/__tests__/RemoteProviderGroupMembers.test.tsx@@ -196,6 +196,34 @@ describe('RemoteProviderGroupMembers', () => {expect(screen.queryByText('providerGroup.member.version.updateRequired')).toBeNull();});+ it('lists several accounts of one computer under that computer and keeps a one-account computer as one row', async () => {+ const config: ProviderGroupConfig = { ...CONFIG, members: [+ { ...VM, key: 'local:anthropic', kind: 'local', agentDeviceId: null, label: 'Group host' },+ { ...VM, providerName: 'Claude A' },+ { ...VM, key: 'device:vm:anthropic-b', providerId: 'anthropic-b' },+ ] };+ mountWith({}, { config, devices: [{ deviceId: 'vm', appVersion: '0.1.103' }] });+ const device = await screen.findByTestId('remote-provider-group-device');+ expect(screen.getAllByTestId('remote-provider-group-device')).toHaveLength(1);+ const header = within(device).getByTestId('remote-provider-group-device-header');+ expect(header.textContent).toContain('grok-bot-vm');+ expect(header.textContent).toContain('providerGroup.member.accountCount:{"count":2}');+ // 版本属于电脑:写在电脑那一层,账号行不重复。+ await waitFor(() => expect(within(header).getByText('v0.1.103')).toBeTruthy());+ const accounts = within(device).getAllByTestId('remote-provider-group-member');+ expect(accounts).toHaveLength(2);+ expect(accounts[0].textContent).toContain('Claude A');+ expect(accounts[0].textContent).not.toContain('grok-bot-vm');+ expect(within(accounts[0]).queryByText('v0.1.103')).toBeNull();+ // 旧组没有账号名快照、那台也没报:按第几个账号称呼,不显示内部 id。+ expect(accounts[1].textContent).toContain('providerGroup.member.accountFallback:{"index":2}');+ expect(accounts[1].textContent).not.toContain('anthropic-b');+ // 只有一个账号的组所在电脑不分两层。+ const host = screen.getAllByTestId('remote-provider-group-member')[0];+ expect(host.closest('[data-testid="remote-provider-group-device"]')).toBeNull();+ expect(host.textContent).toContain('Group host');+ });+it('says this computer cannot reach a computer the group computer still sees as usable', async () => {mountWith({ unreachableHere: true });await waitFor(() => expect(screen.getByText('providerGroup.member.status.unreachableHere')).toBeTruthy());diff --git a/apps/desktop/src/renderer/features/provider-group/providerGroupPresentation.ts b/apps/desktop/src/renderer/features/provider-group/providerGroupPresentation.tsnew file mode 100644index 0000000000..0f96a24a96--- /dev/null+++ b/apps/desktop/src/renderer/features/provider-group/providerGroupPresentation.ts@@ -0,0 +1,54 @@+/**+ * 供应商组的界面按物理电脑聚合(2026-10-15 用户要求):同一台电脑上登录了几个同品牌账号时,+ * 底层仍是几个独立的组内账号(各自的上限、暂停与冷却),界面上收在同一台电脑下面;只有一个账号的电脑不分两层。+ */+import {+ providerGroupPhysicalDeviceKey,+ type ProviderGroupMember,+ type ProviderGroupMemberStatus,+ type ProviderGroupPhysicalMember,+} from '../../../shared/providerGroup';++export interface ProviderGroupDeviceBucket<T> {+ key: string;+ items: T[];+}++/**+ * 按物理电脑聚合展示(分享来的按分享者那台电脑),保留每个账号槽位的原始顺序与对象;电脑按它第一个账号出现的位置排。+ */+export function groupProviderGroupItems<T extends ProviderGroupPhysicalMember>(+ items: readonly T[],+): ProviderGroupDeviceBucket<T>[] {+ const buckets = new Map<string, ProviderGroupDeviceBucket<T>>();+ for (const item of items) {+ const key = providerGroupPhysicalDeviceKey(item);+ const bucket = buckets.get(key);+ if (bucket) bucket.items.push(item);+ else buckets.set(key, { key, items: [item] });+ }+ return [...buckets.values()];+}++/** 账号行的名称:那台电脑上这个供应商现在的显示名,读不到时用加入时的快照;旧组两者都没有时为 null。 */+export function providerGroupAccountName(+ member: Pick<ProviderGroupMember, 'providerName'>,+ status: Pick<ProviderGroupMemberStatus, 'providerName'> | undefined,+): string | null {+ return status?.providerName || member.providerName || null;+}++type VersionStatus = Pick<ProviderGroupMemberStatus, 'appVersion' | 'guestSupport'>;++/** 电脑这一层的版本:同一台电脑的几个账号是同一个应用,取读到的版本;任一账号需要更新就提示。 */+export function providerGroupDeviceVersion(+ statuses: readonly (VersionStatus | undefined)[],+): VersionStatus | undefined {+ const known = statuses.filter((status): status is VersionStatus => status != null);+ if (known.length === 0) return undefined;+ const appVersion = known.find((status) => status.appVersion)?.appVersion;+ const guestSupport = known.some((status) => status.guestSupport === 'needs-update')+ ? 'needs-update' as const+ : known[0].guestSupport;+ return { ...(appVersion ? { appVersion } : {}), ...(guestSupport ? { guestSupport } : {}) };+}diff --git a/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsxindex 43369376a4..6f27d6af5e 100644--- a/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx+++ b/apps/desktop/src/renderer/features/provider-share/ProviderUsageSection.tsx@@ -19,7 +19,7 @@ import { useLocalProviderGroups } from '@/features/provider-group/useLocalProvidimport { formatModelShort } from '@/lib/usageFormat';import { cn } from '@/lib/utils';-import { PROVIDER_GROUP_LOCAL_MEMBER_KEY } from '../../../shared/providerGroup';+import { providerGroupPhysicalDeviceKey, PROVIDER_GROUP_LOCAL_MEMBER_KEY } from '../../../shared/providerGroup';import type {ProviderOwnUsageView,ProviderShareMemberView,@@ -87,7 +87,11 @@ export function ProviderUsageSection({const ownerNameOf = useProviderShareOwnerNameOf();const group = useLocalProviderGroups()[providerId] ?? null;const memberKeys = useMemo(- () => group?.members.map((member) => member.key) ?? [PROVIDER_GROUP_LOCAL_MEMBER_KEY],+ () => group ? [...new Set(group.members.map(providerGroupPhysicalDeviceKey))] : [PROVIDER_GROUP_LOCAL_MEMBER_KEY],+ [group],+ );+ const memberKeyAliases = useMemo(+ () => group ? new Map(group.members.map((member) => [member.key, providerGroupPhysicalDeviceKey(member)])) : undefined,[group],);const [expanded, setExpanded] = useState<ReadonlySet<string>>(() => new Set());@@ -145,7 +149,8 @@ export function ProviderUsageSection({if (memberKey === PROVIDER_GROUP_LOCAL_MEMBER_KEY) {return { name: t('providerGroup.member.local'), source: removed ?? selfDeviceName };}- const member = group?.members.find((item) => item.key === memberKey);+ const member = group?.members.find((item) => item.key === memberKey)+ ?? group?.members.find((item) => providerGroupPhysicalDeviceKey(item) === memberKey);const deviceId = member?.kind === 'device' ? member.agentDeviceId : deviceIdOfMemberKey(memberKey);if (deviceId) {return {@@ -242,6 +247,7 @@ export function ProviderUsageSection({unavailable={party.key === 'self' && ownFailed && !own}totalTokens={summary.tokens}memberKeys={memberKeys}+ memberKeyAliases={memberKeyAliases}showComputerCount={Boolean(group)}memberLabel={memberLabel}time={time}@@ -270,6 +276,7 @@ function UsagePartyRow({unavailable,totalTokens,memberKeys,+ memberKeyAliases,showComputerCount,memberLabel,time,@@ -284,6 +291,8 @@ function UsagePartyRow({totalTokens: number;/** 组内电脑(按组里的顺序);没有组时只有本机。 */memberKeys: readonly string[];+ /** 同一台电脑上的多个账号映射到一个物理电脑键。 */+ memberKeyAliases?: ReadonlyMap<string, string>;/** 收起时写「用了几台电脑」:没有组时只有本机一台,这句没有信息量。 */showComputerCount: boolean;memberLabel: (memberKey: string | null, inGroup: boolean) => MemberLabel;@@ -293,7 +302,10 @@ function UsagePartyRow({const { t } = useTranslation();const totals = summarizeShareUsage(party.models);const share = totals.tokens > 0 && totalTokens > 0 ? Math.max(3, Math.round((totals.tokens / totalTokens) * 100)) : 0;- const breakdown = useMemo(() => groupUsageByMember(party.models, memberKeys), [memberKeys, party.models]);+ const breakdown = useMemo(+ () => groupUsageByMember(party.models, memberKeys, memberKeyAliases),+ [memberKeyAliases, memberKeys, party.models],+ );const usedOn = showComputerCount? breakdown.filter((item) => item.memberKey !== null && summarizeShareUsage(item.models).tokens > 0).length: 0;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 fcd15bb3b5..35fc5aa800 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@@ -216,8 +216,8 @@ describe('ProviderShareManagePage', () => {const members = within(self).getAllByTestId('provider-usage-member');expect(members.map((member) => member.getAttribute('data-member-key'))).toEqual(['local',- 'device:studio:xd-2',- 'share:share-9:xd',+ 'device:studio',+ 'share:share:share-9',]);expect(members[0]!.textContent).toContain('providerGroup.member.local');expect(members[0]!.textContent).toContain("Magi's Mac Mini");@@ -232,10 +232,52 @@ describe('ProviderShareManagePage', () => {fireEvent.click(screen.getByRole('button', { name: /providerGroup\.usage\.expandAria.*Lizi/ }));const lizi = screen.getAllByTestId('provider-usage-row')[1]!;const keys = within(lizi).getAllByTestId('provider-usage-member').map((member) => member.getAttribute('data-member-key'));- expect(keys).toEqual(['local', 'device:studio:xd-2', 'share:share-9:xd', '']);+ expect(keys).toEqual(['local', 'device:studio', 'share:share:share-9', '']);expect(lizi.textContent).toContain('providerGroup.usage.unattributed');});+ it('counts usage from multiple accounts on one physical computer once', async () => {+ localGroups = {+ xd: {+ ...xdGroup,+ members: [+ { ...xdGroup.members[0]! },+ { ...xdGroup.members[1]! },+ { ...xdGroup.members[2]!, hostDeviceId: 'kai-pc' },+ {+ ...xdGroup.members[2]!,+ key: 'share:share-10:xd',+ agentDeviceId: 'share:share-10',+ hostDeviceId: 'kai-pc',+ },+ ],+ },+ };+ const usage = ownUsage();+ usage.local!.models.push(+ usageModel('claude-sonnet-5', 2_000, 0.2, 'share:share-9:xd'),+ usageModel('claude-sonnet-5', 3_000, 0.3, 'share:share-10:xd'),+ );+ command.mockImplementation(async (cmd: { action: string }) => {+ if (cmd.action === 'owned') return owned();+ if (cmd.action === 'own-usage') return usage;+ if (cmd.action === 'received') return [];+ throw new Error('unexpected action');+ });++ renderPage();+ const rows = await screen.findAllByTestId('provider-usage-row');+ expect(rows[0]!.textContent).toContain('providerGroup.usage.computerCount:{\\"count\\":3}');+ fireEvent.click(screen.getByRole('button', { name: /providerGroup\.usage\.expandAria.*Magi/ }));++ const members = within(screen.getAllByTestId('provider-usage-row')[0]!).getAllByTestId('provider-usage-member');+ expect(members.map((member) => member.getAttribute('data-member-key'))).toEqual([+ 'local',+ 'device:studio',+ 'share-host:kai-pc',+ ]);+ });+it('re-reads usage when the period changes', async () => {renderPage();await screen.findAllByTestId('provider-usage-row');diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/providerUsageBreakdown.test.ts b/apps/desktop/src/renderer/features/provider-share/__tests__/providerUsageBreakdown.test.tsindex 6b2af40f1d..523a595ffe 100644--- a/apps/desktop/src/renderer/features/provider-share/__tests__/providerUsageBreakdown.test.ts+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/providerUsageBreakdown.test.ts@@ -61,6 +61,26 @@ describe('groupUsageByMember', () => {[null, false, 1],]);});++ it('merges accounts that share one physical computer', () => {+ const aliases = new Map([+ ['share:kai-1:xd', 'share-host:kai-pc'],+ ['share:kai-2:xd', 'share-host:kai-pc'],+ ]);+ const groups = groupUsageByMember(+ [+ usage({ memberKey: 'share:kai-1:xd' }),+ usage({ memberKey: 'share:kai-2:xd', providerId: 'xd-2', turns: 2, inputTokens: 20 }),+ ],+ ['local', 'share-host:kai-pc'],+ aliases,+ );+ expect(groups.map((group) => [group.memberKey, group.models.length])).toEqual([+ ['local', 0],+ ['share-host:kai-pc', 1],+ ]);+ expect(groups[1]!.models[0]).toMatchObject({ turns: 3, inputTokens: 30, memberKey: 'share-host:kai-pc' });+ });});describe('member keys', () => {diff --git a/apps/desktop/src/renderer/features/provider-share/providerUsageBreakdown.ts b/apps/desktop/src/renderer/features/provider-share/providerUsageBreakdown.tsindex c22b47a361..63a9cfdc88 100644--- a/apps/desktop/src/renderer/features/provider-share/providerUsageBreakdown.ts+++ b/apps/desktop/src/renderer/features/provider-share/providerUsageBreakdown.ts@@ -17,11 +17,13 @@ function addMoney(a: ProviderShareMoney | null, b: ProviderShareMoney | null): P*/export function mergeModelUsage(lists: ReadonlyArray<readonly ProviderShareModelUsageView[]>,+ mergeAcrossProviders = false,): ProviderShareModelUsageView[] {- const merged = new Map<string, ProviderShareModelUsageView & { mixed?: boolean }>();+ const merged = new Map<string, ProviderShareModelUsageView>();+ const mixedKeys = new Set<string>();for (const list of lists) {for (const row of list) {- const key = JSON.stringify([row.kind, row.providerId, row.model, row.memberKey]);+ const key = JSON.stringify([row.kind, mergeAcrossProviders ? null : row.providerId, row.model, row.memberKey]);const existing = merged.get(key);if (!existing) {merged.set(key, { ...row, amount: row.amount ? { ...row.amount } : null });@@ -32,10 +34,10 @@ export function mergeModelUsage(existing.outputTokens += row.outputTokens;existing.cacheReadTokens += row.cacheReadTokens;existing.cacheCreateTokens += row.cacheCreateTokens;- if (existing.mixed) continue;+ if (mixedKeys.has(key)) continue;const amount = addMoney(existing.amount, row.amount);if (amount === 'mixed') {- existing.mixed = true;+ mixedKeys.add(key);existing.amount = null;} else {existing.amount = amount;@@ -43,7 +45,6 @@ export function mergeModelUsage(}}return [...merged.values()]- .map(({ mixed: _mixed, ...row }) => row).sort((a, b) => b.turns - a.turns || a.model.localeCompare(b.model));}@@ -62,25 +63,29 @@ export interface MemberUsageGroup {export function groupUsageByMember(models: readonly ProviderShareModelUsageView[],memberKeys: readonly string[],+ memberKeyAliases?: ReadonlyMap<string, string>,): MemberUsageGroup[] {const byKey = new Map<string | null, ProviderShareModelUsageView[]>();for (const row of models) {- const list = byKey.get(row.memberKey);- if (list) list.push(row);- else byKey.set(row.memberKey, [row]);+ const memberKey = row.memberKey === null ? null : memberKeyAliases?.get(row.memberKey) ?? row.memberKey;+ const normalized = memberKey === row.memberKey ? row : { ...row, memberKey };+ const list = byKey.get(memberKey);+ if (list) list.push(normalized);+ else byKey.set(memberKey, [normalized]);}const groups: MemberUsageGroup[] = memberKeys.map((memberKey) => ({memberKey,inGroup: true,- models: byKey.get(memberKey) ?? [],+ // 展开按物理电脑展示:同一台电脑上的多个账号,同一个 Agent/模型只保留一行。+ models: mergeModelUsage([byKey.get(memberKey) ?? []], true),}));const known = new Set(memberKeys);for (const [memberKey, list] of byKey) {if (memberKey === null || known.has(memberKey)) continue;- groups.push({ memberKey, inGroup: false, models: list });+ groups.push({ memberKey, inGroup: false, models: mergeModelUsage([list], true) });}const unattributed = byKey.get(null);- if (unattributed?.length) groups.push({ memberKey: null, inGroup: false, models: unattributed });+ if (unattributed?.length) groups.push({ memberKey: null, inGroup: false, models: mergeModelUsage([unattributed], true) });return groups;}diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.jsonindex 9f05ee9cea..6f3cccbd2f 100644--- a/apps/desktop/src/renderer/i18n/locales/en/common.json+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json@@ -520,6 +520,9 @@"sourceShare": "Shared by {{name}}","shareComputer": "{{name}}'s computer","shareComputerUnknown": "Shared computer",+ "accountCount_one": "{{count}} account",+ "accountCount_other": "{{count}} accounts",+ "accountFallback": "Account {{index}}","quota": {"loading": "Reading quota…","unavailable": "Can’t read this computer’s quota right now",@@ -603,6 +606,8 @@"toast": {"added_one": "Added {{count}} computer to the {{provider}} provider group","added_other": "Added {{count}} computers to the {{provider}} provider group",+ "addedAccounts_one": "Added {{count}} account to the {{provider}} provider group",+ "addedAccounts_other": "Added {{count}} accounts to the {{provider}} provider group","removed": "Removed {{name}} from the provider group","deleted": "Deleted the {{provider}} provider group"}diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.jsonindex 676cb05af2..602560ea24 100644--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json@@ -517,6 +517,8 @@"sourceShare": "{{name}} からの共有","shareComputer": "{{name}} のパソコン","shareComputerUnknown": "共有されたパソコン",+ "accountCount_other": "{{count}} 個のアカウント",+ "accountFallback": "アカウント {{index}}","quota": {"loading": "クォータを読み込み中…","unavailable": "このパソコンのクォータを今は読み取れません",@@ -595,6 +597,7 @@},"toast": {"added_other": "{{count}} 台のパソコンを {{provider}} のプロバイダーグループに追加しました",+ "addedAccounts_other": "{{count}} 個のアカウントを {{provider}} のプロバイダーグループに追加しました","removed": "{{name}} をプロバイダーグループから外しました","deleted": "{{provider}} のプロバイダーグループを削除しました"}diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.jsonindex 518e75fc7b..2d5385799e 100644--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json@@ -517,6 +517,8 @@"sourceShare": "{{name}}님의 공유","shareComputer": "{{name}}님의 컴퓨터","shareComputerUnknown": "공유된 컴퓨터",+ "accountCount_other": "계정 {{count}}개",+ "accountFallback": "계정 {{index}}","quota": {"loading": "할당량을 불러오는 중…","unavailable": "지금은 이 컴퓨터의 할당량을 읽을 수 없습니다",@@ -595,6 +597,7 @@},"toast": {"added_other": "컴퓨터 {{count}}대를 {{provider}} 제공자 그룹에 추가했습니다",+ "addedAccounts_other": "계정 {{count}}개를 {{provider}} 제공자 그룹에 추가했습니다","removed": "{{name}}을(를) 제공자 그룹에서 제외했습니다","deleted": "{{provider}} 제공자 그룹을 삭제했습니다"}diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.jsonindex 25ae88ff2e..1236d40c3d 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json@@ -517,6 +517,8 @@"sourceShare": "来自 {{name}} 的分享","shareComputer": "{{name}} 的电脑","shareComputerUnknown": "分享来的电脑",+ "accountCount_other": "{{count}} 个账号",+ "accountFallback": "账号 {{index}}","quota": {"loading": "正在读取配额…","unavailable": "暂时读不到这台电脑的配额",@@ -595,6 +597,7 @@},"toast": {"added_other": "已把 {{count}} 台电脑加入 {{provider}} 的供应商组",+ "addedAccounts_other": "已把 {{count}} 个账号加入 {{provider}} 的供应商组","removed": "已把 {{name}} 移出供应商组","deleted": "已删除 {{provider}} 的供应商组"}diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.jsonindex 4672880f3c..ca10f40e70 100644--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json@@ -517,6 +517,8 @@"sourceShare": "來自 {{name}} 的分享","shareComputer": "{{name}} 的電腦","shareComputerUnknown": "分享來的電腦",+ "accountCount_other": "{{count}} 個帳號",+ "accountFallback": "帳號 {{index}}","quota": {"loading": "正在讀取配額…","unavailable": "暫時讀不到這台電腦的配額",@@ -595,6 +597,7 @@},"toast": {"added_other": "已把 {{count}} 臺電腦加入 {{provider}} 的供應商組",+ "addedAccounts_other": "已把 {{count}} 個帳號加入 {{provider}} 的供應商組","removed": "已把 {{name}} 移出供應商組","deleted": "已刪除 {{provider}} 的供應商組"}diff --git a/apps/desktop/src/shared/__tests__/providerGroup.test.ts b/apps/desktop/src/shared/__tests__/providerGroup.test.tsindex 61cc3aa466..74faf8c7d0 100644--- a/apps/desktop/src/shared/__tests__/providerGroup.test.ts+++ b/apps/desktop/src/shared/__tests__/providerGroup.test.ts@@ -7,7 +7,9 @@ import {PROVIDER_GROUP_DEFAULT_LIMIT,PROVIDER_GROUP_MAX_LIMIT,normalizeProviderGroupConfig,+ providerGroupDeviceCount,providerGroupMemberKey,+ providerGroupSummaryForWire,parseProviderGroupRemoteRequest,parseProviderGroupRemoteView,} from '../providerGroup';@@ -38,6 +40,74 @@ describe('group detail diagnostics compatibility', () => {);});+describe('accounts on the same computer', () => {+ const raw = {+ members: [+ { kind: 'local' },+ { kind: 'device', agentDeviceId: 'vm', providerId: 'openai-a', providerName: ' GPT work ' },+ { kind: 'device', agentDeviceId: 'vm', providerId: 'openai-b', providerName: 'bad\u0007name' },+ { kind: 'share', agentDeviceId: 'share:s1', providerId: 'openai' },+ ],+ };++ it('counts each computer once however many of its accounts are in the group', () => {+ const config = normalizeProviderGroupConfig(raw, 'openai')!;+ expect(config.members).toHaveLength(4);+ expect(providerGroupDeviceCount(config.members)).toBe(3);+ });++ it('counts shares from the same computer of the sharer as one computer once that computer is known', () => {+ const shares = normalizeProviderGroupConfig({+ members: [+ { kind: 'local' },+ { kind: 'share', agentDeviceId: 'share:s1', providerId: 'openai', hostDeviceId: 'kai-pc' },+ { kind: 'share', agentDeviceId: 'share:s2', providerId: 'openai-b', hostDeviceId: 'kai-pc' },+ // 还没补记那台电脑的旧组员:按分享各算一台。+ { kind: 'share', agentDeviceId: 'share:s3', providerId: 'openai' },+ // 只有分享来的才记分享者那台电脑;设备 ID 是协议里的不透明值,允许任意字符。+ { kind: 'device', agentDeviceId: 'vm', providerId: 'openai', hostDeviceId: 'kai-pc' },+ { kind: 'share', agentDeviceId: 'share:s4', providerId: 'openai', hostDeviceId: 'phone:1' },+ { kind: 'share', agentDeviceId: 'share:s5', providerId: 'openai', hostDeviceId: ' ' },+ ],+ }, 'openai')!;+ expect(shares.members.map((m) => m.hostDeviceId)).toEqual([undefined, 'kai-pc', 'kai-pc', undefined, undefined, 'phone:1', ' ']);+ expect(providerGroupDeviceCount(shares.members)).toBe(6);+ expect(providerGroupSummaryForWire(shares).members.map((m) => m.hostDeviceId))+ .toEqual([undefined, 'kai-pc', 'kai-pc', undefined, undefined, 'phone:1', ' ']);+ });++ it('accepts the full shared-task host device id domain and rejects only empty or oversized values', () => {+ const config = normalizeProviderGroupConfig({+ members: [+ { kind: 'share', agentDeviceId: 'share:s1', providerId: 'openai', hostDeviceId: 'phone~1' },+ { kind: 'share', agentDeviceId: 'share:s2', providerId: 'openai', hostDeviceId: '设备/手机' },+ { kind: 'share', agentDeviceId: 'share:s3', providerId: 'openai', hostDeviceId: '' },+ { kind: 'share', agentDeviceId: 'share:s4', providerId: 'openai', hostDeviceId: 'x'.repeat(129) },+ ],+ }, 'openai')!;+ expect(config.members.map((member) => member.hostDeviceId)).toEqual(['phone~1', '设备/手机', undefined, undefined]);+ });++ it('keeps a valid account name snapshot and carries it to same-account computers', () => {+ const config = normalizeProviderGroupConfig(raw, 'openai')!;+ expect(config.members[1].providerName).toBe('GPT work');+ expect(config.members[2].providerName).toBeUndefined();+ expect(providerGroupSummaryForWire(config).members.map((m) => m.providerName)).toEqual([undefined, 'GPT work', undefined, undefined]);+ });++ it('reads the account name from a group host reply and falls back to the snapshot for an old host', () => {+ const config = normalizeProviderGroupConfig(raw, 'openai');+ const view = parseProviderGroupRemoteView({+ config,+ members: [+ { key: 'device:vm:openai-a', state: 'available' },+ { key: 'device:vm:openai-b', state: 'available', providerName: 'GPT home' },+ ],+ }, 'openai');+ expect(view.members.map((m) => m.providerName)).toEqual(['GPT work', 'GPT home']);+ });+});+describe('providerGroupMemberKey', () => {it('keys the local member, same-account devices and received shares separately', () => {expect(providerGroupMemberKey(null, 'anthropic')).toBe('local');diff --git a/apps/desktop/src/shared/providerGroup.ts b/apps/desktop/src/shared/providerGroup.tsindex b430e5665f..730a006c15 100644--- a/apps/desktop/src/shared/providerGroup.ts+++ b/apps/desktop/src/shared/providerGroup.ts@@ -42,6 +42,13 @@ export interface ProviderGroupMember {providerId: string;/** 加入时的显示名快照,那台电脑离线时展示。 */label?: string;+ /** 加入时的供应商显示名快照;用于同一台电脑上的多个供应商账号区分。 */+ providerName?: string;+ /**+ * 分享来的电脑:分享者那台电脑的设备 id(本账号收到的分享里本来就有)。只用来把同一台电脑上的几个分享+ * 按一台电脑展示与计数,不显示、不用于连接;不会发给受邀者。旧组没有时由组所在电脑对账补上(removedShares.ts)。+ */+ hostDeviceId?: string;/** 并发上限:只统计经本组分到这台的任务。 */limit: number;weight: number;@@ -83,6 +90,8 @@ export interface ProviderGroupMemberStatus {kind: ProviderGroupMemberKind;/** 设备名(本机为本机设备名)。 */label: string;+ /** 那台电脑上这个供应商的显示名;旧组或旧端未提供时省略。 */+ providerName?: string;/** 分享来的电脑:分享者昵称。 */ownerName?: string;/** Cindy 应用版本;缺失表示旧端或分享来源未提供,不是 remote-agent 协议版本。 */@@ -159,6 +168,8 @@ export interface ProviderGroupCandidate {/** 那台电脑上这个供应商的显示名。 */providerName: string;ownerName?: string;+ /** 分享来的:分享者那台电脑的设备 id(同一台电脑的几个分享收在一起)。 */+ hostDeviceId?: string;blocked?: ProviderGroupCandidateBlock;}@@ -241,18 +252,48 @@ function normalizeMember(raw: unknown, groupProviderId: string): ProviderGroupMeconst providerId = kind === 'local' ? groupProviderId : value.providerId;if (!isProviderGroupProviderId(providerId)) return null;const label = normalizeLabel(value.label);+ const providerName = normalizeLabel(value.providerName);+ const hostDeviceId = kind === 'share' ? normalizeShareHostDeviceId(value.hostDeviceId) : undefined;return {key: providerGroupMemberKey(agentDeviceId as string | null, providerId),kind,agentDeviceId: agentDeviceId as string | null,providerId,...(label ? { label } : {}),+ ...(providerName ? { providerName } : {}),+ ...(hostDeviceId ? { hostDeviceId } : {}),limit: clampInt(value.limit, 1, PROVIDER_GROUP_MAX_LIMIT, PROVIDER_GROUP_DEFAULT_LIMIT),weight: clampInt(value.weight, 1, PROVIDER_GROUP_MAX_WEIGHT, PROVIDER_GROUP_DEFAULT_WEIGHT),paused: value.paused === true,};}+function normalizeShareHostDeviceId(value: unknown): string | undefined {+ // Provider-share host IDs use the shared-task device domain: any non-empty+ // string up to 128 UTF-16 code units. They are opaque and never used as a+ // connection address here, so do not apply the narrower local-device regex.+ return typeof value === 'string' && value.length > 0 && value.length <= 128+ ? value+ : undefined;+}++export type ProviderGroupPhysicalMember = Pick<ProviderGroupMember, 'kind' | 'agentDeviceId' | 'hostDeviceId'>;++/**+ * 供应商组展示与计数用的物理电脑键;账号仍由 member.key 独立区分。分享来的按分享者那台电脑:同一个人从同一台电脑+ * 分享的几个账号算一台;还不知道那台电脑时(旧组尚未对账)按分享各算一台。分享者的电脑一定属于别的账号,不会与自己的电脑重合。+ */+export function providerGroupPhysicalDeviceKey(member: ProviderGroupPhysicalMember): string {+ if (member.kind === 'local') return PROVIDER_GROUP_LOCAL_MEMBER_KEY;+ if (member.kind === 'share' && member.hostDeviceId) return `share-host:${member.hostDeviceId}`;+ return `${member.kind}:${member.agentDeviceId ?? ''}`;+}++/** 组里实际的物理电脑数。同一台电脑上的多个供应商账号(含同一台分享来的几个)只算一台。 */+export function providerGroupDeviceCount(members: readonly ProviderGroupPhysicalMember[]): number {+ return new Set(members.map(providerGroupPhysicalDeviceKey)).size;+}+/*** 校正一份组设置(存储读取与 IPC 写入共用)。没有组内电脑 = 没有组,返回 null:* 组里至少保留一台,移除最后一台即删除组。@@ -286,7 +327,8 @@ export function normalizeProviderGroupConfig(raw: unknown, groupProviderId: striexport interface ProviderGroupWireSummary {strategy: ProviderGroupStrategy;autoSwitch: boolean;- members: Array<Pick<ProviderGroupMember, 'key' | 'kind' | 'agentDeviceId' | 'providerId' | 'label' | 'paused'>>;+ members: Array<Pick<ProviderGroupMember,+ 'key' | 'kind' | 'agentDeviceId' | 'providerId' | 'label' | 'providerName' | 'hostDeviceId' | 'paused'>>;}export function providerGroupSummaryForWire(config: ProviderGroupConfig): ProviderGroupWireSummary {@@ -300,6 +342,9 @@ export function providerGroupSummaryForWire(config: ProviderGroupConfig): ProvidproviderId: m.providerId,// 分享来的电脑不带名字:旧版本存的快照是分享者的电脑名(provider-sharing.md §6),界面按分享者昵称显示。...(m.label && m.kind !== 'share' ? { label: m.label } : {}),+ ...(m.providerName ? { providerName: m.providerName } : {}),+ // 同账号电脑据此把同一台分享来的几个账号算一台;组摘要不发给受邀者。+ ...(m.hostDeviceId ? { hostDeviceId: m.hostDeviceId } : {}),paused: m.paused,})),};@@ -579,6 +624,8 @@ export function parseProviderGroupRemoteView(raw: unknown, groupProviderId: stri? item.reason as ProviderGroupUnavailableReason: undefined;const ownerName = normalizeLabel(item.ownerName);+ // 旧组所在电脑不回账号名:用组设置里的快照,都没有时界面按第几个账号称呼。+ const providerName = normalizeLabel(item.providerName) ?? member.providerName;const appVersion = readProviderGroupAppVersion(item.appVersion);const guestSupport = ['supported', 'needs-update', 'unknown'].includes(item.guestSupport as string)? item.guestSupport as ProviderGroupGuestSupport : undefined;@@ -587,6 +634,7 @@ export function parseProviderGroupRemoteView(raw: unknown, groupProviderId: strikey: member.key,kind: member.kind,label: normalizeLabel(item.label) ?? member.label ?? member.key,+ ...(providerName ? { providerName } : {}),...(ownerName ? { ownerName } : {}),...(appVersion ? { appVersion } : {}),...(guestSupport ? { guestSupport } : {}),diff --git a/apps/mobile/src/__tests__/remoteProviderGroups.test.ts b/apps/mobile/src/__tests__/remoteProviderGroups.test.tsindex 93e2cd2835..d66691fe38 100644--- a/apps/mobile/src/__tests__/remoteProviderGroups.test.ts+++ b/apps/mobile/src/__tests__/remoteProviderGroups.test.ts@@ -13,7 +13,7 @@ import {const provider = (id: string, extra: Record<string, unknown> = {}) =>({ id, name: id, models: {}, connected: true, remoteInvocationEnabled: true, ...extra }) as unknown as ProviderView;-const summary = (owner: string, members: Array<{ kind: string; agentDeviceId: string | null; providerId: string }>) => ({+const summary = (owner: string, members: Array<{ kind: string; agentDeviceId: string | null; providerId: string; hostDeviceId?: string }>) => ({group: {strategy: 'least',autoSwitch: true,@@ -51,6 +51,33 @@ describe('collectMobileProviderGroups', () => {expect(groups.hidden.has(providerGroupEntryKey(null, 'account'))).toBe(false);});+ it('counts computers, not accounts, when one computer has several accounts in the group', () => {+ const groups = collectMobileProviderGroups({+ hostDeviceId: 'host',+ hostProviders: [],+ catalogs: [+ {+ deviceId: 'mini',+ providers: [provider('anthropic', summary('anthropic', [+ { kind: 'device', agentDeviceId: 'vm', providerId: 'anthropic-a' },+ { kind: 'device', agentDeviceId: 'vm', providerId: 'anthropic-b' },+ { kind: 'device', agentDeviceId: 'vm', providerId: 'anthropic-c' },+ // 同一个人从同一台电脑分享的两个账号算一台;还没记下那台电脑的分享按分享各算一台。+ { kind: 'share', agentDeviceId: 'share:s1', providerId: 'claude', hostDeviceId: 'kai-pc' },+ { kind: 'share', agentDeviceId: 'share:s2', providerId: 'claude-b', hostDeviceId: 'kai-pc' },+ { kind: 'share', agentDeviceId: 'share:s-special', providerId: 'claude-c', hostDeviceId: 'phone~1' },+ { kind: 'share', agentDeviceId: 'share:s3', providerId: 'claude' },+ ]))],+ },+ ],+ });+ // 组所在电脑 + vm(三个账号) + Kai 的那台(两个分享) + 旧的一个分享 = 4 台电脑;账号仍各自收进组那一项。+ expect(groups.sizes.get(providerGroupEntryKey('mini', 'anthropic'))).toBe(5);+ expect(groups.hidden.has(providerGroupEntryKey('share:s2', 'claude-b'))).toBe(true);+ expect(['anthropic-a', 'anthropic-b', 'anthropic-c']+ .every((id) => groups.hidden.has(providerGroupEntryKey('vm', id)))).toBe(true);+ });+it('labels the controlled computer’s own group and shared groups, and keeps entries that carry a group', () => {const groups = collectMobileProviderGroups({hostDeviceId: 'host',diff --git a/apps/mobile/src/session/remoteProviderGroups.ts b/apps/mobile/src/session/remoteProviderGroups.tsindex 15287bf46c..2ecccc891c 100644--- a/apps/mobile/src/session/remoteProviderGroups.ts+++ b/apps/mobile/src/session/remoteProviderGroups.ts@@ -41,6 +41,12 @@ interface SummaryMember {/** 组员所在电脑(组所在电脑视角);null = 组所在电脑自己,就是组那一项本身。 */agentDeviceId: string | null;providerId: string;+ /** 台数按哪台电脑算:分享来的按分享者那台电脑(组摘要带了时),其余就是 agentDeviceId(与桌面端一致)。 */+ computer: string;+}++function isHostDeviceId(value: unknown): value is string {+ return typeof value === 'string' && value.length > 0 && value.length <= 128;}/** 目录里某个供应商带的组摘要里的组员;没有组或格式不对返回 null(当作没有组)。 */@@ -53,15 +59,20 @@ function readSummaryMembers(provider: ProviderView): SummaryMember[] | null {const seen = new Set<string>();for (const entry of raw.slice(0, MAX_SUMMARY_MEMBERS)) {if (!entry || typeof entry !== 'object' || Array.isArray(entry)) continue;- const { kind, agentDeviceId, providerId } = entry as Record<string, unknown>;+ const { kind, agentDeviceId, providerId, hostDeviceId } = entry as Record<string, unknown>;let member: SummaryMember | null = null;- if (kind === 'local') member = { agentDeviceId: null, providerId: provider.id };+ if (kind === 'local') member = { agentDeviceId: null, providerId: provider.id, computer: 'local' };else if ((kind === 'device' || kind === 'share')&& typeof agentDeviceId === 'string' && agentDeviceId.length > 0 && agentDeviceId.length <= 160&& (kind === 'share') === isProviderShareAgentDeviceId(agentDeviceId)&& typeof providerId === 'string' && providerId.length > 0 && providerId.length <= 128- ) member = { agentDeviceId, providerId };+ ) {+ const host = kind === 'share' && isHostDeviceId(hostDeviceId)+ ? `share-host:${hostDeviceId}`+ : null;+ member = { agentDeviceId, providerId, computer: host ?? `${kind}:${agentDeviceId}` };+ }if (!member) continue;const key = providerGroupEntryKey(member.agentDeviceId, member.providerId);if (seen.has(key)) continue;@@ -92,7 +103,8 @@ export function collectMobileProviderGroups(input: {if (shared !== null) sizes.set(key, shared);return;}- sizes.set(key, members.length);+ // 台数按电脑算:同一台电脑上的几个账号(含同一台分享来的几个)只算一台(与桌面端一致)。+ sizes.set(key, new Set(members.map((member) => member.computer)).size);groupKeys.add(key);for (const member of members) {// 组员就是组那一项本身,或是被控电脑自己的供应商(被控电脑那一栏照常显示)。diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.mdindex c58676c3ca..0289e8900a 100644--- a/docs/dev-rules/protocol-compatibility.md+++ b/docs/dev-rules/protocol-compatibility.md@@ -1054,6 +1054,29 @@ B 上的 Worker 是一条普通任务,`sessions.orca_remote_lead`(migration 01`service.ts` 的组来源);回归见同目录 `__tests__/remoteGroup.test.ts`、`remoteHandler.test.ts`、`leaseReporter.test.ts`,`device-link/__tests__/providerShareDispatch.test.ts`(受邀者拒绝与不泄露组摘要)。+## 供应商组:同一台电脑的几个账号按电脑聚合(2026-10-15)++产品规则见 [`provider-groups.md`](../product-rules/provider-groups.md) §10。组成员的键与分配不变,只给展示与计数补两项可选字段:++- 组设置成员新增可选 `providerName`(加入时那台电脑上这个供应商的显示名快照,保存时以候选目录为准);同账号目录里的组摘要+ (`maker:provider:list` 的 `group.members[]`)与 `provider-group:remote` 的 `view` 成员状态也带可选 `providerName`+ (状态优先用那台电脑当前的供应商名)。按显示名校验(去空白、≤128、无控制字符),不合格就丢弃。+- 分享来的组员新增可选 `hostDeviceId`(分享者那台电脑的设备 id,本账号收到的分享里本来就有):加入时取自候选目录,+ 保存时渲染端给的值以目录为准、渲染端漏带时沿用已存的;旧组由 `removedShares.ts` 的 `recordShareHosts` 在对账已收到的+ 分享时补记(只补名单里有的,没变化不写)。随组摘要发给同账号电脑(含手机),不显示、不用于连接;只接受设备 id 格式,+ 其余组员类型上的这一项丢弃。物理电脑键:分享来的有它时按它,没有时按分享各算一台。+- 旧端忽略这两个字段(旧版本读写组设置会丢掉它们,升级后由对账与下次保存补回);新端读到旧组所在电脑的回包没有+ `providerName` 时用组设置里的快照,都没有时界面写「账号 N」。不新增 channel,不改 relay、服务器或数据库。+ 组摘要本来就不发给受邀者,受邀者的匿名状态也不带这两项。+- **给受邀者的 `groupSize` 与匿名状态改为按物理电脑**:`sharedProviderGroupSize` 用 `providerGroupDeviceCount`,+ `readSharedGroupStatus` 把同一台电脑的几个账号合成一项(`sharedGroupComputerStates`,取最能接任务的状态),两者项数一致,+ 仍满足 `readProviderShareGroupStatus` 的「状态数 = 台数」校验;新旧受邀者都按原格式读,只是项数变少。+- 实现:`shared/providerGroup.ts`、`provider-group/router.ts`、`ipc.ts`、`directory.ts`、`removedShares.ts`、+ `reshareRuntime.ts`、`sharedStatus.ts`、`remoteHandler.ts`,界面聚合在+ `renderer/features/provider-group/providerGroupPresentation.ts`,手机计数在 `apps/mobile/src/session/remoteProviderGroups.ts`;+ 回归见 `shared/__tests__/providerGroup.test.ts`、`provider-group/__tests__/` 下 `ipc`、`directory`、`removedShares`、+ `sharedStatus`、`remoteHandler` 测试与界面、手机同名测试。+## 供应商组:Claude 订阅额度筛选与用量均衡(2026-10-12)产品规则见 [`provider-groups.md`](../product-rules/provider-groups.md) §5。选电脑仍由组所在电脑完成:先排除额度耗尽的成员,diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.mdindex 0faa375daa..16472eea57 100644--- a/docs/product-rules/provider-groups.md+++ b/docs/product-rules/provider-groups.md@@ -493,6 +493,7 @@- **受邀者查看匿名状态**(2026-10-12):在「分享给我的供应商」详情中按当前组顺序显示「电脑 1、电脑 2…」与可用、忙碌但仍可接任务、冷却中、离线或无法连接、暂停分配、暂不可用、需要更新、状态未知。序号仅为当前列表位置,不透露设备身份,不显示用量或展开配额。汇总显示几台可接任务;有未确认的电脑时不能断言全部不可用。+ 一项是一台电脑而不是一个账号(2026-10-15,见本节「同一台电脑上的几个账号按电脑聚合」),台数同此。- 状态由组所在电脑提供,沿用组的状态与冷却;额外按接收分享任务的条件核对 `virtualWorkspace` / `guestRelay`,并反映受邀者分配器已记录的临时版本排除。满载仍能接任务,显示为忙碌;不承诺所有模型都能运行。- 详情在前台时约每 15 秒刷新,可手动刷新;关闭或切到后台暂停读取。刷新失败清掉旧的可用状态,提示刷新重试;@@ -549,6 +550,23 @@另一台电脑上的组的只读列表同样可以展开。这是剩余配额,不是 §7 的经组运行的用量统计(P3)。- **添加电脑**:弹窗分「已经能用的」与「分享链接」两页:前者把你的其他电脑和别人分享给你的放在同一个列表里勾选;分享链接沿用申请与配对码流程,供应商不一致(§3 口径)、链接属于自己账号、链接失效时给出对应提示。+- **同一台电脑上的几个账号按电脑聚合**(2026-10-15 用户要求):组里的一项仍是「电脑 + 这台电脑上的一个供应商账号」,+ 各有并发上限、参与分配开关、移出与配额,选电脑与运行中换电脑的规则不变(§5、§6.1);界面按物理电脑收拢,+ 不再把同一台电脑列成几行一样的电脑——那台断网或关机时它的几个账号一起不能用,并没有多出几台:+ - **一台电脑只有一个账号:一行,不分两层**,结构同上。+ - **两个及以上账号**:先一行电脑(图标、名称、版本、来源,下一行「N 个账号」,没有设置控件),账号缩进列在下面;+ 账号行写那台电脑上这个供应商的显示名(读不到时用加入时的快照,旧组两者都没有时写「账号 N」),版本与来源不在账号行重复,+ 上限、开关、`···` 与展开配额都在账号行。无障碍名称与移出确认写「电脑 · 账号」,同一台的几个账号不重名。+ - 建组电脑的设置页、同账号另一台电脑的只读列表、「添加电脑」弹窗同一规则;弹窗里电脑那一行只是标题,勾选的仍是每个账号。+ 加入的每个都是组里原来没有的电脑时提示「N 台电脑」,否则提示「N 个账号」。+ - **台数按电脑算**:入口「供应商组 · N 台电脑」、页内标题旁的数字、模型列表(桌面与手机)都把同一台电脑的几个账号算一台。+ - **分享来的同样按电脑合并**(2026-10-15 用户要求):同一个人从同一台电脑分享的几个账号收在「{昵称} 的电脑」下面,+ 算一台。依据是本账号收到的分享里本来就有的分享者那台电脑的设备 id,组设置里随分享来的组员记下(加入时记;+ 旧组由组所在电脑在对账已收到的分享时补记,见 §3 同一处对账)。只用于展示与计数,不显示、不用于连接,界面仍不写分享者的电脑名;+ 还没记下时按分享各算一台。+ - **给受邀者的匿名列表与台数也按电脑**(同日):受邀者看到的「电脑 1、电脑 2…」与「供应商组 · N 台电脑」中,+ 同一台电脑的几个账号合成一项,看不出有几个账号;这一项取最能接任务的那个账号的状态(有一个能接就显示能接;都不能接时+ 依次是状态未知、需要更新、冷却中、暂停分配、暂不可用、离线)。- **模型列表**:组那一项的分组标题与左栏悬停提示写同一句,只写组里有几台,不写是哪几台,也不另起一行(2026-10-10 用户要求)。台数与设置页左栏的「供应商组 · N 台电脑」同一写法:- 同账号其他电脑上的组:「{供应商} · {组所在电脑} · 供应商组 · 3 台电脑」;diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.mdindex 6bc778cdd3..b878f490dc 100644--- a/docs/product-rules/provider-sharing.md+++ b/docs/product-rules/provider-sharing.md@@ -211,13 +211,15 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):- **只展示昵称和头像**(2026-10-07 裁决)。邮箱、手机号一律不展示,脱敏后也不展示;组织、区域也不展示。服务端不收集、不保存这些信息。- **不展示分享者的电脑名**(2026-10-10 用户裁决)。受邀者只知道是谁分享的、分享的是哪个供应商;分享者- 建了[供应商组](provider-groups.md)时可以知道台数并查看匿名状态(§5.2,2026-10-12),不知道是哪几台。分享者的订阅账号+ 建了[供应商组](provider-groups.md)时可以知道台数并查看匿名状态(§5.2,2026-10-12),不知道是哪几台;台数与匿名状态按电脑,+ 看不出一台上有几个账号(2026-10-15)。分享者的订阅账号(登录邮箱)在每一跳都去掉(§9)。具体做法:- 生成链接时分享者电脑不再上传电脑名,`deviceName` 填固定占位(字段必填,旧版受邀者按必填解析);服务端仍存着旧链接里的电脑名,新版本的界面一律不显示它,转给手机时也换成占位;- 申请弹窗、模型列表、「分享给我的供应商」、换电脑的分隔条都不写电脑名;- 分享来的电脑加进供应商组后,组所在电脑的主人也只看到分享者的昵称(「Magi 的电脑」),- 组摘要里这类组员不带名字,换电脑的活动记录写分享者昵称。+ 组摘要里这类组员不带名字,换电脑的活动记录写分享者昵称。同一个人从同一台电脑分享的几个账号收在同一个+ 「Magi 的电脑」下面(按分享里本来就有的设备 id 判断,不显示电脑名,2026-10-15)。- 已知差异:旧版本受邀者看到的是占位名(新链接)或原来的电脑名(旧链接),更新后才不显示。- 展示的昵称和头像必须来自对方本人的账号、由服务端核实,不能来自客户端自报或消息内容。- **身份名片**:没有任何「查看别人资料」的接口,也不新增。每一方只在自己操作时(分享者生成链接、