Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。
TypeScript agentai-agentai-assistantandroidclaude-codecodexelectroniosllmmacosreact-nativetypescriptwindows
fix(provider-group): 模型列表把组里的电脑聚合成一项,换电脑后的第一次失败也照常换
Lizi7b078646eb8d
diff --git a/apps/desktop/src/main/maker-ipc/register.ts b/apps/desktop/src/main/maker-ipc/register.tsindex 4672e4de8f..94edbeacfc 100644--- a/apps/desktop/src/main/maker-ipc/register.ts+++ b/apps/desktop/src/main/maker-ipc/register.ts@@ -43,6 +43,7 @@ import {getProviderGroupRemoteGroups,getProviderGroupRouter,setProviderGroupLocalLoad,+ setProviderGroupSessionGroupReader,setProviderGroupTurnProbe,} from '../provider-group/runtime.js';import { countProviderRunningTurns, type ProviderLocalLoadRoute } from '../provider-group/localLoad.js';@@ -9737,6 +9738,9 @@ export function registerMakerIpc(maker: Maker, options: RegisterMakerIpcOptions)log,});setProviderGroupTurnProbe((sessionId) => maker.getSession(sessionId)?.isTurnRunning() ?? false);+ // 模型列表把归组的任务显示在组那一项下(provider-groups.md §10)。+ const sessionGroupService = providerGroupService;+ setProviderGroupSessionGroupReader((sessionId) => sessionGroupService.sessionGroup(sessionId));// 这台电脑上每个供应商正在运行一轮的任务数:组里「本机」这台显示它,同账号电脑读目录时也带上(§5)。setProviderGroupLocalLoad(() => countProviderRunningTurns({listTurnRunningSessions: () => maker.listActiveSessions().filter((s) => s.isTurnRunning()).map((s) => s.id),diff --git a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts b/apps/desktop/src/main/provider-group/__tests__/ipc.test.tsindex c0b9dde557..584a7a15c2 100644--- a/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/ipc.test.ts@@ -4,7 +4,12 @@import { describe, expect, it, vi } from 'vitest';vi.mock('electron', () => ({ ipcMain: { handle: vi.fn() } }));-vi.mock('../runtime.js', () => ({ getProviderGroupDirectory: vi.fn(), getProviderGroupRouter: vi.fn() }));+vi.mock('../runtime.js', () => ({+ getProviderGroupDirectory: vi.fn(),+ getProviderGroupRouter: vi.fn(),+ getProviderGroupRemoteClient: vi.fn(),+ readProviderGroupOfSession: vi.fn(),+}));vi.mock('../store.js', () => ({ readProviderGroup: vi.fn(), writeProviderGroup: vi.fn() }));vi.mock('../bindings.js', () => ({ pruneProviderGroupBindings: vi.fn() }));vi.mock('../../appSessionState.js', () => ({ activeOwnerScopeKey: () => 'owner-a' }));@@ -65,6 +70,13 @@ describe('parseProviderGroupCommand', () => {expect(() => parseProviderGroupCommand({ action: 'remote-view', providerId: 'anthropic' })).toThrow();expect(() => parseProviderGroupCommand({ action: 'remote-view', providerId: 'anthropic', deviceId: 'bad id' })).toThrow();});++ it('accepts asking which group a task is in, without a provider id', () => {+ expect(parseProviderGroupCommand({ action: 'session-group', sessionId: 'db5a0a2c-3084-408c-9f78-234fe3c6745c' }))+ .toEqual({ action: 'session-group', sessionId: 'db5a0a2c-3084-408c-9f78-234fe3c6745c' });+ expect(() => parseProviderGroupCommand({ action: 'session-group' })).toThrow();+ expect(() => parseProviderGroupCommand({ action: 'session-group', sessionId: '../x' })).toThrow();+ });});describe('executeProviderGroupCommand reads', () => {@@ -78,6 +90,15 @@ describe('executeProviderGroupCommand reads', () => {await executeProviderGroupCommand(d, { action: 'remote-view', providerId: 'anthropic', deviceId: 'mini' });expect(remoteView).toHaveBeenCalledWith('mini', 'anthropic');});++ it('answers which group a task is in from the service', async () => {+ const d = deps([]);+ const sessionGroup = vi.fn(async () => ({ groupDeviceId: 'mini', providerId: 'anthropic' }));+ Object.assign(d, { sessionGroup });+ expect(await executeProviderGroupCommand(d, { action: 'session-group', sessionId: 's1' }))+ .toEqual({ groupDeviceId: 'mini', providerId: 'anthropic' });+ expect(sessionGroup).toHaveBeenCalledWith('s1');+ });});describe('executeProviderGroupCommand save', () => {diff --git a/apps/desktop/src/main/provider-group/__tests__/remoteGroup.test.ts b/apps/desktop/src/main/provider-group/__tests__/remoteGroup.test.tsindex 29a26b9175..dc18b0633f 100644--- a/apps/desktop/src/main/provider-group/__tests__/remoteGroup.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/remoteGroup.test.ts@@ -305,6 +305,33 @@ describe('switching computers within a group on another computer', () => {expect(h.deps.fallback).not.toHaveBeenCalled();});+ it('tells the model list which group the task is in only while it runs on the bound computer', async () => {+ const h = bound();+ expect(await h.service.sessionGroup('s1')).toEqual({ groupDeviceId: OWNER, providerId: 'anthropic' });+ // 挪到了组外(或还没核对的别处):不按组显示。+ h.row.agentDeviceId = 'elsewhere';+ expect(await h.service.sessionGroup('s1')).toBeNull();+ // 任务就在这台(组里的「我的电脑」)运行。+ h.row.agentDeviceId = null;+ h.row.providerId = 'anthropic';+ h.bindings.set('s1', { providerId: 'anthropic', memberKey: SELF.key, groupDeviceId: OWNER, at: 1 });+ expect(await h.service.sessionGroup('s1')).toEqual({ groupDeviceId: OWNER, providerId: 'anthropic' });+ expect(await h.service.sessionGroup('no-binding')).toBeNull();+ expect(h.remote.readGroup).not.toHaveBeenCalled();+ });++ it('still switches when the task was just moved to another computer in the group', async () => {+ // 2026-10-11:交接到 Studio 后,任务又被挪回组所在电脑(绑定还写着 Studio),那台撞到周上限。+ const h = bound({ row: { agentDeviceId: OWNER, providerId: 'anthropic', sdkSessionId: 'native-2' }, picks: [STUDIO] });+ h.service.onTurnError('s1', { sdkError: 'rate_limit' }, 3);+ await flush();+ expect(h.remote.cool).toHaveBeenCalledWith(OWNER, expect.objectContaining({ memberKey: 'local', cause: 'usage-limit' }));+ expect(h.remote.pick).toHaveBeenCalledWith(OWNER, expect.objectContaining({ exclude: expect.arrayContaining(['local']) }));+ expect(h.deps.switchAgentLocation).toHaveBeenCalledWith('s1', expect.objectContaining({ agentDeviceId: 'studio' }), expect.anything());+ expect(h.bindings.get('s1')).toMatchObject({ memberKey: STUDIO.key, groupDeviceId: OWNER });+ expect(h.deps.fallback).not.toHaveBeenCalled();+ });+it('only avoids an unreachable computer itself instead of cooling it for the whole group', async () => {const h = bound({ picks: [SELF] });await h.service.onTurnError('s1', { message: '[REMOTE_AGENT_DEVICE_UNREACHABLE] gone' }, 3);diff --git a/apps/desktop/src/main/provider-group/__tests__/service.test.ts b/apps/desktop/src/main/provider-group/__tests__/service.test.tsindex d99e279e8c..1d31f41181 100644--- a/apps/desktop/src/main/provider-group/__tests__/service.test.ts+++ b/apps/desktop/src/main/provider-group/__tests__/service.test.ts@@ -574,6 +574,31 @@ describe('onTurnError (automatic switch)', () => {expect(h.deps.switchAgentLocation).toHaveBeenCalledWith('s1', expect.objectContaining({ agentDeviceId: null }), expect.anything());});+ it('reports the group of a task bound to this computer’s group', async () => {+ const h = harness({ row: { agentDeviceId: 'mini', providerId: MINI.providerId } });+ h.bindings.set('s1', { providerId: 'anthropic', memberKey: MINI.key, at: 1 });+ expect(await h.service.sessionGroup('s1')).toEqual({ groupDeviceId: null, providerId: 'anthropic' });+ h.row.agentDeviceId = null;+ expect(await h.service.sessionGroup('s1')).toBeNull();+ });++ it('keeps managing a task that was moved to another computer in the group', async () => {+ // 绑定还写着 MINI,任务已在本机(组里的另一台):绑定跟着更新,这次失败照常换电脑。+ const h = harness({ row: { agentDeviceId: null, providerId: 'anthropic' } });+ h.bindings.set('s1', { providerId: 'anthropic', memberKey: MINI.key, at: 1 });+ h.service.onTurnError('s1', { sdkError: 'rate_limit' }, 1);+ await flush();+ expect(h.router.coolingUntil('anthropic', 'local')).not.toBeNull();+ expect(h.router.coolingUntil('anthropic', MINI.key)).toBeNull();+ expect(h.deps.switchAgentLocation).toHaveBeenCalledWith(+ 's1',+ expect.objectContaining({ agentDeviceId: 'mini', providerId: MINI.providerId }),+ expect.anything(),+ );+ expect(h.bindings.get('s1')?.memberKey).toBe(MINI.key);+ expect(h.deps.fallback).not.toHaveBeenCalled();+ });+it('respects a manual move: the binding is dropped and the task is not moved back', async () => {const h = harness({ row: { agentDeviceId: 'studio-not-in-group', providerId: 'anthropic' } });h.bindings.set('s1', { providerId: 'anthropic', memberKey: MINI.key, at: 1 });diff --git a/apps/desktop/src/main/provider-group/ipc.ts b/apps/desktop/src/main/provider-group/ipc.tsindex f6e1bccd12..ad4511de64 100644--- a/apps/desktop/src/main/provider-group/ipc.ts+++ b/apps/desktop/src/main/provider-group/ipc.ts@@ -11,6 +11,7 @@ import {normalizeProviderGroupConfig,type ProviderGroupCommand,type ProviderGroupConfig,+ type ProviderGroupSessionGroup,type ProviderGroupView,} from '../../shared/providerGroup.js';import { tapWindowBroadcast } from '../device-link/broadcast-tap.js';@@ -23,7 +24,12 @@ import { throwIpcError } from '../utils/ipcValidate.js';import { pruneProviderGroupBindings } from './bindings.js';import type { ProviderGroupDirectory } from './directory.js';import type { ProviderGroupRouter } from './router.js';-import { getProviderGroupDirectory, getProviderGroupRemoteClient, getProviderGroupRouter } from './runtime.js';+import {+ getProviderGroupDirectory,+ getProviderGroupRemoteClient,+ getProviderGroupRouter,+ readProviderGroupOfSession,+} from './runtime.js';import { listProviderGroups, readProviderGroup, writeProviderGroup } from './store.js';const log = createLogger('provider-group');@@ -41,15 +47,24 @@ export interface ProviderGroupCommandDeps {remoteView(deviceId: string, providerId: string): Promise<ProviderGroupView>;/** 本机全部组的设置(不读远端,模型列表据此收起本机组里的远程供应商)。 */listGroups(): Record<string, ProviderGroupConfig>;+ /** 这个任务此刻归哪个组(只读本机记录)。 */+ sessionGroup(sessionId: string): Promise<ProviderGroupSessionGroup>;changed(providerId: string): void;}const REMOTE_DEVICE_ID_PATTERN = /^[A-Za-z0-9_.-]{1,128}$/;+const SESSION_ID_PATTERN = /^[A-Za-z0-9_-]{1,128}$/;export function parseProviderGroupCommand(raw: unknown): ProviderGroupCommand {if (!raw || typeof raw !== 'object' || Array.isArray(raw)) throwIpcError('INVALID_PARAMS', 'command required');const value = raw as Record<string, unknown>;if (value.action === 'list') return { action: 'list' };+ if (value.action === 'session-group') {+ if (typeof value.sessionId !== 'string' || !SESSION_ID_PATTERN.test(value.sessionId)) {+ throwIpcError('INVALID_PARAMS', 'sessionId required');+ }+ return { action: 'session-group', sessionId: value.sessionId as string };+ }if (!isProviderGroupProviderId(value.providerId)) throwIpcError('INVALID_PARAMS', 'providerId required');const providerId = value.providerId as string;switch (value.action) {@@ -75,6 +90,7 @@ export function parseProviderGroupCommand(raw: unknown): ProviderGroupCommand {/** 业务体(依赖注入,单测直接调)。 */export async function executeProviderGroupCommand(deps: ProviderGroupCommandDeps, command: ProviderGroupCommand) {if (command.action === 'list') return deps.listGroups();+ if (command.action === 'session-group') return deps.sessionGroup(command.sessionId);const { providerId } = command;switch (command.action) {case 'get':@@ -131,6 +147,7 @@ export function registerProviderGroupIpc(): void {ownerKey: activeOwnerScopeKey,remoteView: (deviceId, providerId) => getProviderGroupRemoteClient().view(deviceId, providerId),listGroups: listProviderGroups,+ sessionGroup: readProviderGroupOfSession,changed: (providerId) => {try {broadcast(PROVIDER_GROUP_IPC.CHANGED, { providerId });diff --git a/apps/desktop/src/main/provider-group/runtime.ts b/apps/desktop/src/main/provider-group/runtime.tsindex 29219c53ba..7c92a0cdfa 100644--- a/apps/desktop/src/main/provider-group/runtime.ts+++ b/apps/desktop/src/main/provider-group/runtime.ts@@ -8,7 +8,7 @@import type { ProviderView } from '@cindy/model-providers';import { activeOwnerScopeKey } from '../appSessionState.js';-import { readProviderGroupSummary } from '../../shared/providerGroup.js';+import { readProviderGroupSummary, type ProviderGroupSessionGroup } from '../../shared/providerGroup.js';import { getReceivedShares } from '../device-link/providerShareGuest.js';import { handleListDevices, defaultDeps as deviceDirectoryDeps } from '../device-link/ipc.js';import { remoteBackgroundInvoke } from '../device-link/index.js';@@ -34,6 +34,7 @@ interface OwnerRuntime {let current: OwnerRuntime | null = null;let isTurnRunning: (sessionId: string) => boolean = () => false;let localLoad: (() => Promise<ReadonlyMap<string, number>>) | null = null;+let sessionGroupReader: ((sessionId: string) => Promise<ProviderGroupSessionGroup>) | null = null;function runtimeForActiveOwner(): OwnerRuntime {const owner = activeOwnerScopeKey();@@ -147,6 +148,21 @@ export function setProviderGroupTurnProbe(probe: (sessionId: string) => boolean)isTurnRunning = probe;}+/** register 装配供应商组服务后注入:任务此刻归哪个组(模型列表用)。 */+export function setProviderGroupSessionGroupReader(reader: ((sessionId: string) => Promise<ProviderGroupSessionGroup>) | null): void {+ sessionGroupReader = reader;+}++/** 任务此刻归哪个组;还没装配或读不到时按没归组处理。 */+export async function readProviderGroupOfSession(sessionId: string): Promise<ProviderGroupSessionGroup> {+ if (!sessionGroupReader) return null;+ try {+ return await sessionGroupReader(sessionId);+ } catch {+ return null;+ }+}+/** register 装配会话表后注入:这台电脑上每个供应商正在运行一轮的任务数(localLoad.ts)。 */export function setProviderGroupLocalLoad(probe: (() => Promise<ReadonlyMap<string, number>>) | null): void {localLoad = probe;diff --git a/apps/desktop/src/main/provider-group/service.ts b/apps/desktop/src/main/provider-group/service.tsindex c24eecec98..4504fe4cfc 100644--- a/apps/desktop/src/main/provider-group/service.ts+++ b/apps/desktop/src/main/provider-group/service.ts@@ -30,6 +30,7 @@ import type {ProviderGroupMember,ProviderGroupRemoteCoolCause,ProviderGroupRemotePick,+ ProviderGroupSessionGroup,ProviderGroupView,} from '../../shared/providerGroup.js';import { providerGroupMemberKey } from '../../shared/providerGroup.js';@@ -238,6 +239,12 @@ export interface ProviderGroupService {beforeSend(sessionId: string, options?: ProviderGroupBeforeSendOptions): Promise<void>;/** 用户亲自接手:这一轮重新从头试。 */noteUserAction(sessionId: string): void;+ /**+ * 任务此刻归哪个组(模型列表据此把它显示在组那一项下,provider-groups.md §10):有绑定、且任务记录里的+ * 位置就是绑定的那台时返回组;没归组、位置与绑定对不上(挪到了别处,等下次核对)时返回 null。只读本机记录,+ * 不问组所在电脑。+ */+ sessionGroup(sessionId: string): Promise<ProviderGroupSessionGroup>;}export interface ProviderGroupBeforeSendOptions {@@ -630,8 +637,11 @@ export function createProviderGroupService(deps: ProviderGroupServiceDeps): Prov}/**- * 以任务记录为准核对绑定:用户手动把任务挪到了别处时修正或解除绑定,并返回 null——之后的自动换电脑- * 不能覆盖用户的选择,也不能把别处的失败记到组内电脑头上。一致时返回当前组内电脑。+ * 以任务记录为准核对绑定,返回任务此刻所在的组内电脑。+ * - 用户把任务挪到了组外:解除绑定并返回 null——之后的自动换电脑不能覆盖用户的选择,也不能把别处的+ * 失败记到组内电脑头上。+ * - 挪到了组里另一台(模型选择里选组那一项、换电脑交接后任务记录先变):仍在组里,绑定跟着更新(§6),+ * 照常返回那台——这次失败同样要换电脑,不能因为绑定刚改过就跳过一次(2026-10-11 用户反馈)。*/async function verifyBinding(sessionId: string,@@ -649,10 +659,7 @@ export function createProviderGroupService(deps: ProviderGroupServiceDeps): Provif (!config || located === binding.memberKey) await deps.markReleased(sessionId, groupOf(source, binding.providerId));return null;}- if (key !== binding.memberKey) {- await deps.writeBinding(sessionId, bindingFor(source, binding.providerId, key));- return null;- }+ if (key !== binding.memberKey) await deps.writeBinding(sessionId, bindingFor(source, binding.providerId, key));return config!.members.find((m) => m.key === key) ?? null;}@@ -1423,5 +1430,17 @@ export function createProviderGroupService(deps: ProviderGroupServiceDeps): ProvresetRound(sessionId);deps.guestSwitch?.drop(sessionId);},++ async sessionGroup(sessionId) {+ const binding = deps.readBinding(sessionId);+ if (!binding) return null;+ const source = sourceFor(binding.groupDeviceId);+ const row = source ? await deps.readSessionRow(sessionId) : null;+ if (!source || !row) return null;+ const located = await locatedMemberKey(source, binding.providerId, row);+ return located === binding.memberKey+ ? { groupDeviceId: binding.groupDeviceId ?? null, providerId: binding.providerId }+ : null;+ },};}diff --git a/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupCurrentTask.test.tsx b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupCurrentTask.test.tsxnew file mode 100644index 0000000000..d048706fe1--- /dev/null+++ b/apps/desktop/src/renderer/__tests__/modelSelectorProviderGroupCurrentTask.test.tsx@@ -0,0 +1,276 @@+// @vitest-environment jsdom+/**+ * 任务正跑在供应商组里的某台电脑上时,模型列表把那台聚合在组那一项下(provider-groups.md §10,+ * 2026-10-11 用户反馈:组把任务换到 grok-bot-vm 后,那台在模型列表里单独出现、还被选中,分不清)。+ *+ * 场景:Mac Mini 把 Anthropic 建成了组(Mac Mini 自己 + grok-bot-vm),任务被组分到 grok-bot-vm 上运行。+ * 1. 归组的任务:grok-bot-vm 的 Anthropic 不单独出现,打开停在组那一项,当前模型显示为选中;在组那一项里+ * 选模型 = 留在 grok-bot-vm 只换模型(带那台上的供应商 id),不把 Agent 挪到 Mac Mini;+ * 2. 没归组、只是直接用着那台的任务:同样收进组里,但组那一项不显示为正在用,选它照旧是挪过去;+ * 3. 组所在电脑离线(组那一项不在):那台照常单独显示、照常选中;+ * 4. 归组的任务就在这台电脑上运行:打开同样先停在组那一项,在里面选模型留在这台。+ */+import { act, cleanup, fireEvent, render, screen, within } from '@testing-library/react';+import React from 'react';+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';++vi.mock('react-i18next', async (importOriginal) => ({+ ...(await importOriginal<typeof import('react-i18next')>()),+ useTranslation: () => ({+ t: (key: string, options?: Record<string, string | number>) => {+ const o = options ?? {};+ const table: Record<string, string> = {+ 'newChat.modelSelector.modelListAria': '模型列表',+ 'newChat.modelSelector.search.placeholderAll': '搜索模型…',+ 'newChat.modelSelector.unified.favoritesGroup': '收藏',+ 'newChat.modelSelector.unified.customize': '自定义',+ 'newChat.modelSelector.unified.railAll': '全部',+ 'newChat.modelSelector.unified.railRemoteProvider': `${o.provider} · ${o.device}`,+ 'newChat.modelSelector.unified.railRemoteProviderGroup': `${o.provider} · ${o.device} · ${o.group}`,+ 'newChat.modelSelector.unified.providerGroupLabel': `${o.provider} · ${o.group}`,+ 'settings.providers.remote.groupBadge': `供应商组 · ${o.count} 台电脑`,+ 'effortLevels.low': '低',+ 'effortLevels.high': '高',+ };+ return table[key] ?? (o.defaultValue as string | undefined) ?? key;+ },+ }),+}));++vi.mock('@/lib/scrollbarAutoHide', () => ({ flashScrollbar: vi.fn() }));+vi.mock('@/hooks/useAgentCapabilities', () => ({+ evictDeviceCapabilities: vi.fn(),+ prefetchDeviceCapabilities: vi.fn(async () => {}),+ useAgentCapabilities: () => ({+ capabilities: { hasFastMode: false, effortLevels: [], availableModels: [] },+ loading: false,+ error: null,+ }),+}));+vi.mock('@/hooks/useApiKey', () => ({ useApiKey: () => ({ hasSavedKey: true }) }));+vi.mock('@/hooks/useConnectedSource', () => ({+ useConnectedSource: () => ({ hasConnectedSource: true, loading: false }),+}));+vi.mock('@/hooks/useModelPricing', () => ({+ useGatewayModelPricing: () => null,+ useReferenceModelPricing: () => null,+}));++const catalogs = vi.hoisted(() => {+ const models = [['opus', 'Opus'], ['sonnet', 'Sonnet']] as const;+ const provider = (+ id: string,+ name: string,+ rows: readonly (readonly [string, string])[],+ extra: Record<string, unknown> = {},+ ) => ({+ id,+ name,+ source: 'user',+ agents: ['claude-code'],+ auth: { method: 'api-key' },+ routing: { 'claude-code': {} },+ connected: true,+ models: {+ 'claude-code': rows.map(([modelId, modelName]) => ({+ id: modelId,+ name: modelName,+ contextWindow: 200000,+ efforts: ['low', 'high'],+ defaultEffort: 'high',+ })),+ },+ ...extra,+ });+ const member = (key: string, kind: string, agentDeviceId: string | null, providerId: string) => ({+ key, kind, agentDeviceId, providerId, paused: false,+ });+ return {+ offline: new Set<string>(),+ local: [provider('anthropic-local', 'Anthropic Local', models)] as unknown[],+ byDevice: {+ mini: [+ provider('anthropic', 'Anthropic', models, {+ remoteInvocationEnabled: true,+ group: {+ strategy: 'least',+ autoSwitch: true,+ members: [+ member('local', 'local', null, 'anthropic'),+ // 第二个订阅账号:那台上的供应商 id 带随机后缀。+ member('device:vm:anthropic-9z', 'device', 'vm', 'anthropic-9z'),+ member('device:desk:anthropic-local', 'device', 'desk', 'anthropic-local'),+ ],+ },+ }),+ ],+ vm: [+ provider('anthropic-9z', 'Anthropic', models, { remoteInvocationEnabled: true }),+ provider('fp', 'FP', [['fp-model', 'FP Model']], { remoteInvocationEnabled: true }),+ ],+ } as Record<string, unknown[]>,+ };+});++vi.mock('@/hooks/useProviders', () => ({+ useProviders: () => ({ providers: catalogs.local, providerOrder: [] }),+}));+vi.mock('@/hooks/useDeviceProviders', () => ({+ evictDeviceProviders: vi.fn(),+ prefetchDeviceProviders: vi.fn(async () => {}),+ useDeviceProviders: (deviceId?: string) =>+ deviceId && catalogs.offline.has(deviceId)+ ? { providers: [], loading: false, error: 'DEVICE_LINK_UNREACHABLE', unsupported: false }+ : { providers: deviceId ? (catalogs.byDevice[deviceId] ?? []) : [], loading: false, error: null, unsupported: false },+}));+vi.mock('@/hooks/useDevicesProviders', () => ({+ useDevicesProviders: (deviceIds: readonly string[]) =>+ new Map(+ deviceIds.flatMap((deviceId) =>+ catalogs.offline.has(deviceId)+ ? []+ : [[deviceId, { providers: catalogs.byDevice[deviceId] ?? [], loading: false, error: null }] as const],+ ),+ ),+}));+vi.mock('@/features/provider-group/useLocalProviderGroups', () => ({+ useLocalProviderGroups: () => ({}),+}));+vi.mock('@/state/modelVisibilityPrefs', () => ({+ isModelEnabled: () => true,+ useModelVisibilityVersion: () => 0,+}));+vi.mock('@/state/deviceLinkModelMirror', () => ({+ useDeviceLinkModelMirrorVersion: () => 0,+}));+vi.mock('@/hooks/useRemoteDeviceUsage', () => ({+ useRemoteCodexAccountUsage: () => null,+ useRemoteXaiSubscriptionUsage: () => null,+}));+vi.mock('@/hooks/useRemoteClaudeSubscriptionUsage', () => ({+ useRemoteClaudeSubscriptionUsage: () => null,+}));++import { ModelSelectorContent } from '@/components/new-chat/ModelSelector';+import { __resetForTest as resetEnginePrefs } from '@/state/modelEnginePrefs';+import { __resetForTest as resetFavorites } from '@/state/modelFavorites';++const devices = [+ { deviceId: 'mini', name: 'Mac Mini' },+ { deviceId: 'vm', name: 'grok-bot-vm' },+];+const GROUP = 'Anthropic · Mac Mini · 供应商组 · 3 台电脑';++async function renderTask(options: {+ bound: boolean;+ selectedDeviceId?: string | null;+ currentProviderId?: string;+}) {+ const onRelocate = vi.fn(async () => true);+ const onProviderChange = vi.fn();+ const readProviderGroup = vi.fn(async () => (options.bound ? { deviceId: 'mini', providerId: 'anthropic' } : null));+ render(+ React.createElement(ModelSelectorContent, {+ modelId: 'opus',+ effort: 'high',+ onModelChange: vi.fn(),+ onEffortChange: vi.fn(),+ currentProviderId: options.currentProviderId ?? 'anthropic-9z',+ onProviderChange,+ actualRoute: true,+ vendorKey: 'cc',+ remoteAgent: {+ devices,+ selectedDeviceId: options.selectedDeviceId === undefined ? 'vm' : options.selectedDeviceId,+ onRelocate,+ readProviderGroup,+ },+ }),+ );+ // 等「这个任务归哪个组」读回来。+ await act(async () => {});+ return { onRelocate, onProviderChange, readProviderGroup };+}++const list = () => screen.getByRole('listbox');+const row = (name: string) => within(list()).getByText(name).closest('[role="option"]') as HTMLElement;++async function click(element: HTMLElement) {+ await act(async () => {+ fireEvent.click(element);+ });+}++beforeEach(() => {+ resetEnginePrefs();+ resetFavorites();+});++afterEach(() => {+ cleanup();+ catalogs.offline.clear();+});++describe('任务正跑在组里的某台电脑上', () => {+ it('归组的任务:那台收进组里,打开停在组那一项并选中当前模型', async () => {+ await renderTask({ bound: true });+ expect(screen.queryByRole('button', { name: 'Anthropic · grok-bot-vm' })).toBeNull();+ // 那台电脑上不在组里的供应商照常列出。+ expect(screen.getByRole('button', { name: 'FP · grok-bot-vm' })).toBeTruthy();+ expect(screen.getByRole('button', { name: GROUP }).getAttribute('aria-pressed')).toBe('true');+ expect(row('Opus').getAttribute('aria-selected')).toBe('true');+ expect(row('Sonnet').getAttribute('aria-selected')).toBe('false');+ });++ it('归组的任务:在组那一项里选模型,留在 grok-bot-vm 只换模型', async () => {+ const { onRelocate } = await renderTask({ bound: true });+ await click(row('Sonnet'));+ expect(onRelocate).toHaveBeenCalledTimes(1);+ expect(onRelocate).toHaveBeenCalledWith(+ expect.objectContaining({+ providerId: 'anthropic-9z',+ modelId: 'sonnet',+ agent: 'claude-code',+ agentDevice: { deviceId: 'vm', name: 'grok-bot-vm' },+ }),+ );+ });++ it('归组的任务:选那台电脑上组外的供应商,照旧在那台换来源', async () => {+ const { onRelocate, onProviderChange } = await renderTask({ bound: true });+ await click(screen.getByRole('button', { name: 'FP · grok-bot-vm' }));+ await click(row('FP Model'));+ expect(onRelocate).not.toHaveBeenCalled();+ expect(onProviderChange).toHaveBeenCalledWith('fp', 'fp-model', expect.anything(), expect.anything());+ });++ it('没归组的任务:那台同样收进组里,但组那一项不显示为正在用,选它是把 Agent 挪到组所在电脑', async () => {+ const { onRelocate } = await renderTask({ bound: false });+ expect(screen.queryByRole('button', { name: 'Anthropic · grok-bot-vm' })).toBeNull();+ expect(screen.getByRole('button', { name: GROUP }).getAttribute('aria-pressed')).toBe('true');+ expect(row('Opus').getAttribute('aria-selected')).toBe('false');+ await click(row('Sonnet'));+ expect(onRelocate).toHaveBeenCalledWith(+ expect.objectContaining({ providerId: 'anthropic', modelId: 'sonnet', agentDevice: { deviceId: 'mini', name: 'Mac Mini' } }),+ );+ });++ it('组所在电脑离线:那台照常单独显示并选中', async () => {+ catalogs.offline.add('mini');+ const { onRelocate } = await renderTask({ bound: true });+ expect(screen.queryByRole('button', { name: GROUP })).toBeNull();+ expect(screen.getByRole('button', { name: 'Anthropic · grok-bot-vm' }).getAttribute('aria-pressed')).toBe('true');+ expect(row('Opus').getAttribute('aria-selected')).toBe('true');+ expect(onRelocate).not.toHaveBeenCalled();+ });++ it('归组的任务就在这台电脑上运行:打开停在组那一项,在里面选模型留在这台', async () => {+ const { onRelocate } = await renderTask({ bound: true, selectedDeviceId: null, currentProviderId: 'anthropic-local' });+ expect(screen.getByRole('button', { name: GROUP }).getAttribute('aria-pressed')).toBe('true');+ expect(row('Opus').getAttribute('aria-selected')).toBe('true');+ await click(row('Sonnet'));+ expect(onRelocate).toHaveBeenCalledWith(+ expect.objectContaining({ providerId: 'anthropic-local', modelId: 'sonnet', agentDevice: null }),+ );+ });+});diff --git a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsxindex 8a85714c38..76752c0737 100644--- a/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ChatInput.tsx@@ -408,6 +408,7 @@ import { createWorkLouderCodexVoiceGesture } from '@/lib/workLouderCodexVoiceGesimport { appendMentionChip } from './mentionChipInsertion';// device-link 远程会话:设置变更不落本地 DB(会 404),改写远程内存层 + 运行时隧道。import { getSessionDeviceId } from '@/features/device-link/remoteProjectsStore';+import { readSessionProviderGroup } from '@/features/provider-group/sessionProviderGroup';import { makerApiFor, makerApiForDevice, makerApiForSticky, subscribeRemoteCredentialSwitchOutcome } from '@/lib/makerTransport';import { SESSION_LINK_DROP_MIME } from '@/lib/sessionLinkDrop';@@ -7191,6 +7192,11 @@ export function ChatInput({...(deviceLinkDeviceId ? { homeDeviceId: deviceLinkDeviceId } : {}),...(taskComputerModelMemory ? { localModelMemory: taskComputerModelMemory } : {}),deviceModelMemory: agentDeviceModelMemoryAccessors,+ // 归组的任务在组那一项下显示与选择(provider-groups.md §10)。组的绑定记在任务所在电脑上,被控电脑上的+ // 任务不读(那台的绑定不对控制端开放),按没归组的处理;挂着换位置的意图时下一条消息就不在原处了,也不按组显示。+ ...(!deviceLinkDeviceId && intentAgentDeviceId === undefined+ ? { readProviderGroup: () => readSessionProviderGroup(sessionId) }+ : {}),onRelocate: async (selection) => {if (!(await confirmAgentRelocation(selection.agentDevice))) return false;return performAgentSwitchRef.current(selection.agent, selection.modelId, selection.providerId, {@@ -7209,6 +7215,7 @@ export function ChatInput({sessionEngineFilter,remoteAgentDevices,effectiveAgentDeviceId,+ intentAgentDeviceId,confirmAgentRelocation,]);diff --git a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsxindex 1e9a572a24..0ebe095cc6 100644--- a/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx+++ b/apps/desktop/src/renderer/components/new-chat/ModelSelector.tsx@@ -94,7 +94,11 @@ import {import { useDevicesProviders } from '@/hooks/useDevicesProviders';import { RemoteSourceMark } from '@/components/icons/RemoteSourceMark';import { buildUnifiedRail, remoteAgentProviders } from './unifiedModelSelection';-import { collectRemoteProviderGroups, remoteProviderEntryKey } from '@/lib/remoteProviderGroups';+import {+ collectRemoteProviderGroups,+ remoteProviderEntryKey,+ type RemoteProviderGroupEntry,+} from '@/lib/remoteProviderGroups';import { useLocalProviderGroups } from '@/features/provider-group/useLocalProviderGroups';import { readProviderShareGroupSize } from '@cindy/device-link';import { modelPriceDiscountLabelValues, modelPriceDetailRows } from '@/lib/modelPriceFormat';@@ -692,6 +696,12 @@ export interface RemoteAgentSelectorOptions {* 草稿不传(草稿走 onUnifiedSelect,行带 agentDevice)。*/onRelocate?: (selection: RemoteAgentRelocation) => Promise<boolean>;+ /**+ * 已建任务传:这个任务此刻归哪个供应商组(组那一项的位置,provider-groups.md §10)。面板每次打开读一次。+ * 归组的任务在组那一项下显示为「正在用的」,在组那一项里选模型 = 留在此刻运行的那台、只换模型,+ * 不把 Agent 挪到组所在电脑。不传 / 读到 null = 没归组。+ */+ readProviderGroup?: () => Promise<RemoteProviderGroupEntry | null>;}interface ModelSelectorProps {@@ -1545,7 +1555,7 @@ function ModelSelectorContentView({const localProviderGroups = useLocalProviderGroups();// 供应商组(provider-groups.md §10):组里的电脑与分享收起,只列组那一项。组可以在其他电脑上// (看它们目录里的组摘要),也可以是任务所在电脑自己建的(本机任务读本机设置,被控电脑上的任务看那台的- // 目录)。当前正在用的那一项不收起。+ // 目录)。任务此刻正在组员上运行也照样收起,显示在组那一项下(2026-10-11 用户要求:组里的都聚合成一项)。const remoteProviderGroups = useMemo(() => collectRemoteProviderGroups([@@ -1555,21 +1565,73 @@ function ModelSelectorContentView({}),...(homeDeviceId ? [{ deviceId: homeDeviceId, providers: homeDeviceProviders.providers }] : []),],- remoteAgentDeviceId && currentProviderId- ? [remoteProviderEntryKey(remoteAgentDeviceId, currentProviderId)]- : [],- homeDeviceId ? [] : Object.values(localProviderGroups),+ homeDeviceId ? {} : localProviderGroups,),- [- remoteAgentDevices,- remoteDeviceCatalogs,- remoteAgentDeviceId,- currentProviderId,- homeDeviceId,- homeDeviceProviders.providers,- localProviderGroups,- ],+ [remoteAgentDevices, remoteDeviceCatalogs, homeDeviceId, homeDeviceProviders.providers, localProviderGroups],+ );+ // 组那一项在面板里的位置:任务所在电脑自己的供应商(被控电脑上的任务即被控电脑的)在本机那一栏,记为 null。+ const groupEntryAt = useCallback(+ (entry: RemoteProviderGroupEntry | undefined | null): RemoteProviderGroupEntry | null =>+ entry ? (entry.deviceId === homeDeviceId ? { deviceId: null, providerId: entry.providerId } : entry) : null,+ [homeDeviceId],);+ // 这个任务此刻归哪个组(面板每次打开读一次,位置或来源变了再读)。+ const readProviderGroup = remoteAgent?.readProviderGroup;+ const [boundGroup, setBoundGroup] = useState<RemoteProviderGroupEntry | null>(null);+ useEffect(() => {+ if (!readProviderGroup) {+ setBoundGroup(null);+ return;+ }+ let cancelled = false;+ readProviderGroup().then(+ (entry) => !cancelled && setBoundGroup(entry),+ () => !cancelled && setBoundGroup(null),+ );+ return () => {+ cancelled = true;+ };+ }, [readProviderGroup, remoteAgentDeviceId, currentProviderId]);+ // 归的组那一项此刻在列表里(组所在电脑在线、组还在)才按组显示;不然照常列出任务实际所在的那台。+ const boundEntry = useMemo(() => {+ if (!boundGroup) return null;+ const visible = boundGroup.deviceId === null+ ? !homeDeviceId && localProviderGroups[boundGroup.providerId] !== undefined+ : remoteProviderGroups.groups.has(remoteProviderEntryKey(boundGroup.deviceId, boundGroup.providerId));+ return visible ? boundGroup : null;+ }, [boundGroup, homeDeviceId, localProviderGroups, remoteProviderGroups]);+ /**+ * 任务归组、此刻却不在组那一项本身上运行(被组分到或换到了组里另一台):在组那一项里选模型 = 留在那台只换+ * 模型,组那一项显示为正在用的(§10)。+ */+ const stayInGroup =+ boundEntry !== null &&+ !(boundEntry.deviceId === remoteAgentDeviceId && boundEntry.providerId === currentProviderId);+ // 面板不停在收起的组员上:任务正跑在组员上时打开即停在组那一项(没归组的任务只是这样显示,选它照旧是+ // 把 Agent 挪过去);归组的任务即使就在这台运行,第一次打开也先停在组那一项。用户自己点过别的格之后不再挪。+ const [remoteBrowseTouched, setRemoteBrowseTouched] = useState(false);+ const [groupBrowseShown, setGroupBrowseShown] = useState<string | null>(null);+ const browseHiddenEntry = remoteBrowse+ ? groupEntryAt(remoteProviderGroups.memberOf.get(remoteProviderEntryKey(+ remoteBrowse.deviceId,+ remoteBrowse.providerId ?? (remoteBrowse.deviceId === remoteAgentDeviceId ? (currentProviderId ?? '') : ''),+ )))+ : null;+ const boundEntryKey = boundEntry ? remoteProviderEntryKey(boundEntry.deviceId ?? '', boundEntry.providerId) : null;+ const groupBrowseTarget =+ browseHiddenEntry ??+ (stayInGroup && !remoteBrowseTouched && groupBrowseShown !== boundEntryKey ? boundEntry : null);+ if (groupBrowseTarget) {+ if (boundEntryKey !== null && groupBrowseShown !== boundEntryKey) setGroupBrowseShown(boundEntryKey);+ setRemoteBrowse(+ groupBrowseTarget.deviceId+ ? { deviceId: groupBrowseTarget.deviceId, providerId: groupBrowseTarget.providerId }+ : null,+ );+ }+ /** 正在浏览归的组那一项所在的目录:那一项里的模型显示为正在用的,选中时留在此刻运行的那台。 */+ const browsingBoundGroupEntry =+ stayInGroup && boundEntry !== null && (remoteBrowse?.deviceId ?? null) === boundEntry.deviceId;const remoteAgentGroups = useMemo(() => {if (!remoteAgentDevices) return [];return remoteAgentDevices.flatMap((device) => {@@ -3166,10 +3228,22 @@ function ModelSelectorContentView({: null;// 选中直通带上这一行属于哪台电脑(仅远程 Agent 入口);落点不同由调用方连运行位置一起换。const withAgentDevice = remoteAgent ? { agentDevice: remoteBrowseDevice } : {};- // 浏览的不是草稿当前落点的目录时,没有任何一行是「正在用的那一行」。+ // 浏览的不是草稿当前落点的目录时,没有任何一行是「正在用的那一行」;归组的任务在组那一项里显示为正在用的。const panelSelection = browsingSelectedCatalog? { providerId: activeSourceId, modelId }- : { providerId: null, modelId: '' };+ : browsingBoundGroupEntry+ ? { providerId: boundEntry!.providerId, modelId }+ : { providerId: null, modelId: '' };+ const browsingLiveCatalog = browsingSelectedCatalog || browsingBoundGroupEntry;+ // 归组的任务在组那一项里选模型:留在此刻运行的那台(换成那台上这个供应商的 id),只换模型,不挪 Agent。+ const currentAgentDevice: UnifiedSelectionAgentDevice = remoteAgentDeviceId+ ? {+ deviceId: remoteAgentDeviceId,+ name:+ remoteAgentDevices?.find((device) => device.deviceId === remoteAgentDeviceId)?.name ||+ remoteAgentDeviceId,+ }+ : null;// 已建任务浏览的不是 Agent 落点那台的目录:选中的行要连运行位置一起换,同引擎 / 跨引擎// 两条会话链路都按当前落点的目录工作,这里一律改道给 onRelocate。const relocate =@@ -3180,7 +3254,13 @@ function ModelSelectorContentView({row: { providerId: string; modelId: string; agent: AgentKind; effort?: Effort; fast: boolean },dismiss: boolean,): Promise<boolean> =>- runLiveWrite(() => relocate!({ ...row, agentDevice: remoteBrowseDevice })).then((applied) => {+ runLiveWrite(() =>+ relocate!(+ browsingBoundGroupEntry && row.providerId === boundEntry!.providerId && currentProviderId+ ? { ...row, providerId: currentProviderId, agentDevice: currentAgentDevice }+ : { ...row, agentDevice: remoteBrowseDevice },+ ),+ ).then((applied) => {if (applied && dismiss) {closeOptionsPanel();onDismiss?.();@@ -3290,11 +3370,11 @@ function ModelSelectorContentView({selected={panelSelection}selectedFavoriteUid={browsingSelectedCatalog ? selectedFavoriteUid : null}liveAgentKind={- unifiedSelectionPolicy === 'official' || !browsingSelectedCatalog ? null : currentAgentKind+ unifiedSelectionPolicy === 'official' || !browsingLiveCatalog ? null : currentAgentKind}- fastMode={unifiedSelectionPolicy === 'official' || !browsingSelectedCatalog ? false : fastMode}+ fastMode={unifiedSelectionPolicy === 'official' || !browsingLiveCatalog ? false : fastMode}selectedEffort={- unifiedSelectionPolicy === 'official' || !browsingSelectedCatalog ? undefined : effort+ unifiedSelectionPolicy === 'official' || !browsingLiveCatalog ? undefined : effort}{...(modelMemory ? { modelMemory } : {})}{...(remoteAgent && remoteAgentLocalRailItems@@ -3325,6 +3405,7 @@ function ModelSelectorContentView({: {}),onActivate: (target: { deviceId: string; providerId: string } | null) => {closeOptionsPanel();+ setRemoteBrowseTouched(true);setRemoteBrowse(target);},},diff --git a/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx b/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsxindex 2233c14570..21644ac125 100644--- a/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx+++ b/apps/desktop/src/renderer/components/settings/OwnRemoteProviders.tsx@@ -67,8 +67,7 @@ export function useOwnRemoteProviderList(): OwnRemoteProviderList {const catalog = catalogs.get(device.deviceId);return catalog ? [{ deviceId: device.deviceId, providers: catalog.providers }] : [];}),- [],- Object.values(localGroups),+ localGroups,);const entries = devices.flatMap((device) => {const catalog = catalogs.get(device.deviceId);diff --git a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsxindex 896db16fe1..2ad4435aae 100644--- a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx+++ b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx@@ -12,6 +12,7 @@ import { ChevronRight, CircleMinus, Monitor, MoreHorizontal } from 'lucide-reactimport { useCallback, useId, useMemo, useState } from 'react';import { useTranslation } from 'react-i18next';+import { formatQuotaResetAt } from '@/components/status/usageCardModel';import { Button } from '@/components/ui/button';import { useConfirmDialog } from '@/components/ui/confirm-dialog-provider';import {@@ -378,6 +379,7 @@ export function memberStatusText(t: ReturnType<typeof useTranslation>['t'],status: ProviderGroupMemberStatus | undefined,locale: string,+ nowMs: number = Date.now(),): string {if (!status) return t('providerGroup.member.status.checking');switch (status.state) {@@ -390,12 +392,13 @@ export function memberStatusText(return t('providerGroup.member.status.full');case 'paused':return t('providerGroup.member.status.paused');- case 'cooling':- return status.coolingUntil- ? t('providerGroup.member.status.coolingUntil', {- time: new Intl.DateTimeFormat(locale, { hour: '2-digit', minute: '2-digit' }).format(status.coolingUntil),- })+ case 'cooling': {+ // 不在今天恢复的(周上限等)带上日期,不让「约 16:00 恢复」看起来像今天就能用。+ const time = status.coolingUntil ? formatQuotaResetAt(status.coolingUntil / 1000, nowMs, locale) : null;+ return time+ ? t('providerGroup.member.status.coolingUntil', { time }): t('providerGroup.member.status.cooling');+ }case 'offline':return t('providerGroup.member.status.offline');case 'unavailable':diff --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 9a773b50c2..bf6314ba55 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@@ -8,7 +8,7 @@ import type { ReactNode } from 'react';import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';import type { ProviderGroupConfig, ProviderGroupView } from '../../../../shared/providerGroup';-import { ProviderGroupSection } from '../ProviderGroupSection';+import { memberStatusText, ProviderGroupSection } from '../ProviderGroupSection';import { __testing as localGroupsTesting, useLocalProviderGroupsState } from '../useLocalProviderGroups';import { __testing as groupViewTesting } from '../useProviderGroup';@@ -257,3 +257,21 @@ describe('ProviderGroupSection reopened', () => {await act(async () => undefined);});});++describe('memberStatusText', () => {+ const t = ((key: string, options?: Record<string, unknown>) =>+ options ? `${key}:${JSON.stringify(options)}` : key) as unknown as Parameters<typeof memberStatusText>[0];+ const cooling = (coolingUntil: number) => ({+ key: 'device:mini:anthropic', kind: 'device' as const, label: 'Mac mini', state: 'cooling' as const,+ running: 0, limit: 4, weight: 1, paused: false, coolingUntil,+ });++ it('shows only the time for a cooldown that ends today, and the date for a later one', () => {+ const now = new Date(2026, 9, 11, 9, 30).getTime();+ expect(memberStatusText(t, cooling(new Date(2026, 9, 11, 16, 0).getTime()), 'en-US', now))+ .toBe('providerGroup.member.status.coolingUntil:{"time":"16:00"}');+ // 周上限:10 月 15 日才恢复,不能只写 16:00。+ expect(memberStatusText(t, cooling(new Date(2026, 9, 15, 16, 0).getTime()), 'en-US', now))+ .toBe('providerGroup.member.status.coolingUntil:{"time":"Oct 15 16:00"}');+ });+});diff --git a/apps/desktop/src/renderer/features/provider-group/sessionProviderGroup.ts b/apps/desktop/src/renderer/features/provider-group/sessionProviderGroup.tsnew file mode 100644index 0000000000..4498fec45f--- /dev/null+++ b/apps/desktop/src/renderer/features/provider-group/sessionProviderGroup.ts@@ -0,0 +1,18 @@+/**+ * 这个任务此刻归哪个供应商组(provider-groups.md §10):模型列表把归组的任务显示在组那一项下,在组那一项里+ * 选模型时留在此刻运行的那台。只问本机(组的绑定记在任务所在电脑上),读不到按没归组处理。+ */+import type { RemoteProviderGroupEntry } from '@/lib/remoteProviderGroups';++import type { ProviderGroupSessionGroup } from '../../../shared/providerGroup';++export async function readSessionProviderGroup(sessionId: string): Promise<RemoteProviderGroupEntry | null> {+ const api = window.electronAPI?.providerGroup;+ if (typeof api?.command !== 'function') return null;+ try {+ const group = (await api.command({ action: 'session-group', sessionId })) as ProviderGroupSessionGroup;+ return group ? { deviceId: group.groupDeviceId, providerId: group.providerId } : null;+ } catch {+ return null;+ }+}diff --git a/apps/desktop/src/renderer/lib/__tests__/remoteProviderGroups.test.ts b/apps/desktop/src/renderer/lib/__tests__/remoteProviderGroups.test.tsindex ff62c5bac3..f1599c5900 100644--- a/apps/desktop/src/renderer/lib/__tests__/remoteProviderGroups.test.ts+++ b/apps/desktop/src/renderer/lib/__tests__/remoteProviderGroups.test.ts@@ -37,15 +37,30 @@ describe('collectRemoteProviderGroups', () => {expect(result.hidden.has(remoteProviderEntryKey('studio', 'openai'))).toBe(false);});- it('keeps both groups when two groups contain each other, and keeps the entry in use', () => {+ it('keeps both groups when two groups contain each other', () => {const result = collectRemoteProviderGroups([{ deviceId: 'mini', providers: [provider('anthropic', { group: group([{ kind: 'device', agentDeviceId: 'studio', providerId: 'anthropic' }]) })] },{ deviceId: 'studio', providers: [provider('anthropic', { group: group([{ kind: 'device', agentDeviceId: 'mini', providerId: 'anthropic' }, { kind: 'device', agentDeviceId: 'laptop', providerId: 'anthropic' }]) })] },- ], [remoteProviderEntryKey('laptop', 'anthropic')]);- expect(result.hidden.size).toBe(0);+ ]);+ expect([...result.hidden]).toEqual([remoteProviderEntryKey('laptop', 'anthropic')]);expect(result.groups.size).toBe(2);});+ it('collapses every member into its group, including the one the task runs on, and says which group it is in', () => {+ // 2026-10-11:任务被组换到 grok-bot-vm 上运行后,那台不再单独出现,归在 Mac mini 的组那一项下。+ const result = collectRemoteProviderGroups([+ { deviceId: 'mini', providers: [provider('anthropic', { group: group([+ { kind: 'device', agentDeviceId: 'vm-1', providerId: 'anthropic' },+ { kind: 'share', agentDeviceId: 'share:s1', providerId: 'anthropic' },+ ]) })] },+ { deviceId: 'vm-1', providers: [provider('anthropic'), provider('fp')] },+ ]);+ expect(result.hidden.has(remoteProviderEntryKey('vm-1', 'anthropic'))).toBe(true);+ expect(result.memberOf.get(remoteProviderEntryKey('vm-1', 'anthropic'))).toEqual({ deviceId: 'mini', providerId: 'anthropic' });+ expect(result.memberOf.get(remoteProviderEntryKey('share:s1', 'anthropic'))).toEqual({ deviceId: 'mini', providerId: 'anthropic' });+ expect(result.hidden.has(remoteProviderEntryKey('vm-1', 'fp'))).toBe(false);+ });+it('also hides the remote members of groups this computer created', () => {const local = {strategy: 'least' as const,@@ -55,8 +70,10 @@ describe('collectRemoteProviderGroups', () => {{ key: 'device:studio:anthropic', kind: 'device' as const, agentDeviceId: 'studio', providerId: 'anthropic', limit: 4, weight: 1, paused: false },],};- const result = collectRemoteProviderGroups([{ deviceId: 'studio', providers: [provider('anthropic')] }], [], [local]);+ const result = collectRemoteProviderGroups([{ deviceId: 'studio', providers: [provider('anthropic')] }], { anthropic: local });expect([...result.hidden]).toEqual([remoteProviderEntryKey('studio', 'anthropic')]);+ // 组那一项是这台电脑自己的供应商(本机那一栏)。+ expect(result.memberOf.get(remoteProviderEntryKey('studio', 'anthropic'))).toEqual({ deviceId: null, providerId: 'anthropic' });expect(result.groups.size).toBe(0);});diff --git a/apps/desktop/src/renderer/lib/remoteProviderGroups.ts b/apps/desktop/src/renderer/lib/remoteProviderGroups.tsindex eb4ebbd483..43d6f813b9 100644--- a/apps/desktop/src/renderer/lib/remoteProviderGroups.ts+++ b/apps/desktop/src/renderer/lib/remoteProviderGroups.ts@@ -5,7 +5,8 @@* 只看列表里此刻在线(调用方传进来)的电脑的目录:组所在电脑离线时它的那一项不在,组员自然重新单独出现。* 规则:* - 本身带组的项不收起(两个组互相包含时两个组都还在);- * - 当前任务正在用的那一项保留(调用方经 keep 传入),已直接用某台组员跑过的任务不丢来源;+ * - 当前任务正在用的组员也收起(2026-10-11 用户要求:组里的都聚合成一项,不要好几个分不清),+ * 模型列表把它显示在组那一项下(见 memberOf);* - 本机自己的供应商不在远程列表里,组里的「本机这台」不影响本机那一栏。*/import type { ProviderView } from '@cindy/model-providers';@@ -22,31 +23,38 @@ export function remoteProviderGroupOf(provider: ProviderView): ProviderGroupConfreturn readProviderGroupSummary((provider as { group?: unknown }).group, provider.id);}+/** 组那一项在列表里的位置:`deviceId` 为组所在电脑;null = 任务所在电脑自己建的组(组那一项是那台自己的供应商)。 */+export interface RemoteProviderGroupEntry {+ deviceId: string | null;+ providerId: string;+}+export interface RemoteProviderGroups {/** 被收起的组员(按 remoteProviderEntryKey)。 */hidden: ReadonlySet<string>;/** 带组的项(按 remoteProviderEntryKey) → 组设置。 */groups: ReadonlyMap<string, ProviderGroupConfig>;+ /** 被收起的组员(按 remoteProviderEntryKey) → 收着它的组那一项(同时在几个组里时取先列出的那个)。 */+ memberOf: ReadonlyMap<string, RemoteProviderGroupEntry>;}/*** @param catalogs 列表里此刻在线的其他电脑的目录(带组摘要)。- * @param keep 当前正在用、不能收起的项。- * @param localGroups 任务所在电脑自己建的组(本机任务时是本机的组):它们的组员同样收起,组那一项是- * 本机自己的供应商,在本机那一栏,不在远程列表里。+ * @param localGroups 任务所在电脑自己建的组(按供应商 id;本机任务时是本机的组):它们的组员同样收起,组那一项+ * 是本机自己的供应商,在本机那一栏,不在远程列表里。*/export function collectRemoteProviderGroups(catalogs: Iterable<{ deviceId: string; providers: readonly ProviderView[] }>,- keep: Iterable<string> = [],- localGroups: Iterable<ProviderGroupConfig> = [],+ localGroups: Readonly<Record<string, ProviderGroupConfig>> = {},): RemoteProviderGroups {const groups = new Map<string, ProviderGroupConfig>();- const members = new Set<string>();- const addMembers = (config: ProviderGroupConfig) => {+ const memberOf = new Map<string, RemoteProviderGroupEntry>();+ const addMembers = (entry: RemoteProviderGroupEntry, config: ProviderGroupConfig) => {for (const member of config.members) {// 组里的「组所在电脑自己」就是组那一项本身。if (member.kind === 'local' || !member.agentDeviceId) continue;- members.add(remoteProviderEntryKey(member.agentDeviceId, member.providerId));+ const key = remoteProviderEntryKey(member.agentDeviceId, member.providerId);+ if (!memberOf.has(key)) memberOf.set(key, entry);}};for (const { deviceId, providers } of catalogs) {@@ -55,11 +63,10 @@ export function collectRemoteProviderGroups(const config = remoteProviderGroupOf(provider);if (!config) continue;groups.set(remoteProviderEntryKey(deviceId, provider.id), config);- addMembers(config);+ addMembers({ deviceId, providerId: provider.id }, config);}}- for (const config of localGroups) addMembers(config);- for (const key of groups.keys()) members.delete(key);- for (const key of keep) members.delete(key);- return { hidden: members, groups };+ for (const [providerId, config] of Object.entries(localGroups)) addMembers({ deviceId: null, providerId }, config);+ for (const key of groups.keys()) memberOf.delete(key);+ return { hidden: new Set(memberOf.keys()), groups, memberOf };}diff --git a/apps/desktop/src/shared/providerGroup.ts b/apps/desktop/src/shared/providerGroup.tsindex 68a2b56d55..7b12b1c19c 100644--- a/apps/desktop/src/shared/providerGroup.ts+++ b/apps/desktop/src/shared/providerGroup.ts@@ -131,7 +131,15 @@ export type ProviderGroupCommand =/** 同账号另一台电脑上这个供应商的组与组内电脑状态(只读)。 */| { action: 'remote-view'; providerId: string; deviceId: string }/** 本机全部组的设置(不读远端)。 */- | { action: 'list' };+ | { action: 'list' }+ /** 这个任务此刻归哪个组(模型列表把它显示在组那一项下)。 */+ | { action: 'session-group'; sessionId: string };++/**+ * 任务此刻归的组:`groupDeviceId` 为组所在电脑,null = 这台电脑自己建的组;`providerId` 是组那一项在组所在电脑上的+ * 供应商 id。没归组(或位置与绑定对不上)为 null。+ */+export type ProviderGroupSessionGroup = { groupDeviceId: string | null; providerId: string } | null;export type ProviderGroupCommandResult<C extends ProviderGroupCommand> =C extends { action: 'list' } ? Record<string, ProviderGroupConfig>@@ -140,7 +148,8 @@ export type ProviderGroupCommandResult<C extends ProviderGroupCommand> =: C extends { action: 'save' } ? ProviderGroupView: C extends { action: 'delete' } ? ProviderGroupView: C extends { action: 'remote-view' } ? ProviderGroupView- : never;+ : C extends { action: 'session-group' } ? ProviderGroupSessionGroup+ : never;const PROVIDER_ID_PATTERN = /^[a-zA-Z0-9._-]{1,128}$/;const DEVICE_ID_PATTERN = /^[A-Za-z0-9_.-]{1,128}$/;diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.mdindex 6cdb5cd66d..2a93202397 100644--- a/docs/product-rules/provider-groups.md+++ b/docs/product-rules/provider-groups.md@@ -9,6 +9,8 @@> 2026-10-10 用户确认:**换电脑期间不报错**——组里还能换时不出错误卡、红色横幅与红点,只显示「正在换一台电脑继续」;> 组里都不能用才报错,见 §6.1。> 2026-10-11 用户要求:任务所在那台**连不上时先等它恢复**——按退避重试 5 次,恢复了留在原电脑继续,都不行再换电脑,见 §6.1。+> 2026-10-11 用户要求:模型列表里**组里的都聚合成一项**——任务正跑在组员上也不单独列出,显示在组那一项下,在组那一项里+> 选模型留在此刻运行的那台;挪到组里另一台后的第一次失败也照常换电脑,见 §6、§10。> 实现进度见 §12:P1 已实现;P2 全部已实现:同账号直连与模型列表只显示组(P2a)、分享的人经组中转与启动阶段换电脑(P2b)、> 分享的人运行中换电脑与申请弹窗新说法(P2c);P3 未实现。> 交互设计稿见 [`docs/design-previews/provider-groups/index.html`](../design-previews/provider-groups/index.html)。@@ -159,7 +161,8 @@- 不纳入:直接选组里某台电脑或分享来的供应商的任务(用的不是组那一项,§4);因组内电脑被移出、或组被删除而解除过这个组的任务(§9.4,任务所在的电脑按组记下,之后同一台重新加入、或重建同一个组也不纳入)。- 用户在模型选择里把任务挪到组外的电脑或换成别的供应商,任务即退出组:之后不再自动换电脑,也不把那台的失败- 记到组内电脑头上。挪到组里另一台时绑定跟着更新;之后再挪回组那一项时按上一条重新纳入。+ 记到组内电脑头上。挪到组里另一台时绑定跟着更新,仍由组管:那台出问题照常自动换电脑,挪过去之后的第一次失败也换+ (2026-10-11 用户反馈:此前绑定刚改过的那次失败会被跳过,直接报错);之后再挪回组那一项时按上一条重新纳入。### 6.1 自动换电脑@@ -327,7 +330,8 @@不先显示「没有组」再跳成组。「远程与分享」页再次打开时先显示上次读到的组,没读过就按本机组设置先排出组内电脑、状态写「检查中」,再在后台刷新。- **「远程与分享」页**(原「分享 {供应商}」管理页扩展)分三块:- 1. **供应商组**:组内电脑列表(来源、状态、正在运行的任务数、冷却到何时)、并发上限、添加电脑、组策略;+ 1. **供应商组**:组内电脑列表(来源、状态、正在运行的任务数、冷却到何时——不在今天恢复的带上日期,如周上限)、并发上限、+ 添加电脑、组策略;2. **用量**(P3):按使用方 / 按组内电脑切换,时间段切换,展开按模型;3. **分享**:生成分享链接、待处理、已分享的人(与现在一致;P3 起按人用量移到「用量」块,首版仍在已分享的人里)。未开启「允许被远程调用」时,这一块置灰并说明先开启哪一级(供应商分享 §3)。@@ -358,7 +362,12 @@分享不再单独列出,只列组所在电脑那一项;不在任何组里的照常单独显示。规则:- 只看此刻在线、列表里有的电脑的目录:组所在电脑离线时组那一项不在,组员自动重新单独出现;- 本身带组的项不收起(两个组互相包含时两个组都还在);本机自己的供应商照常显示;- - 当前任务正在用的那一项不收起,已直接用某台组员跑过的任务不会丢了来源;+ - 当前任务正跑在组员上也收起(2026-10-11 用户要求:组里的都聚合成一项,不要好几个分不清),模型列表打开时停在组那一项:+ - 任务归这个组(被组分到或换到那台、在组那一项里选的):组那一项里当前模型显示为选中;在组那一项里选模型 = 留在此刻+ 运行的那台、只换模型(换成那台上这个供应商),不把 Agent 挪到组所在电脑。归组的任务就在任务所在电脑上运行时,打开同样+ 先停在组那一项;+ - 没归组、只是直接用着那台的任务(建组前直接选的等):组那一项不显示为正在用,选它照旧是把 Agent 挪到组所在电脑;+ - 被控电脑上的任务读不到那台的绑定(绑定不对控制端开放),按没归组的处理;- 设置页里组那一项行内写「供应商组 · {N} 台电脑」,详情只读列出组内电脑与状态(问组所在电脑,每 15 秒重读),说明组设置要到组所在电脑上改。- 手机端本期不收起(手机只显示任务实际运行的电脑)。