Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

feat(provider-groups): 展示匿名电脑状态和版本兼容提示

MagicLizi34c6e05f8cb7
diff --git a/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts b/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts
index 8606cbc56c..ed113befe0 100644
--- a/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts
+++ b/apps/desktop/src/main/device-link/__tests__/providerShareDispatch.test.ts
@@ -2,7 +2,7 @@
* 被控端对供应商分享受邀者(另一个账号)的入口:只建后台链路、只放行远程 Agent 与过滤后的供应商列表,
* 订阅与其他通道一律拒绝;撤权后迟到的结果不再带出数据;撤权只会命中受邀者对端。
*/
-import { providerShareGuestPeer, PROVIDER_SHARE_RELAY_CAPABILITY, type DeviceLinkClient } from '@cindy/device-link';
+import { providerShareGuestPeer, PROVIDER_SHARE_RELAY_CAPABILITY, type DeviceLinkClient, type ProviderShareGroupState } from '@cindy/device-link';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
const state = vi.hoisted(() => ({ access: null as null | { shareId: string; memberId: string; providerId: string } }));
@@ -263,6 +263,46 @@ describe('provider share invoke', () => {
registry.reset();
}
});
+
+ it('only reads anonymous group status on explicit requests, scoped to the authorized provider', async () => {
+ state.access = ACCESS;
+ const sharedGroupStatus = vi.fn(async (): Promise<ProviderShareGroupState[] | null> => ['busy', 'needs-update']);
+ setRemoteAgentHandler({ handle: vi.fn(), abortAll: vi.fn(), sharedGroupStatus });
+ setProviderGroupRemoteHandler({ handle: vi.fn(), decorateProviderList: (value) => value, sharedGroupSize: () => 2 });
+ const { __testing: registry } = await import('../invoke-registry');
+ registry.reset();
+ const provider = { id: 'anthropic', remoteInvocationEnabled: true, groupSize: 2, groupStatus: ['available', 'available'] };
+ registry.register('maker:provider:list', async () => ({ providers: [provider, { id: 'private-provider', remoteInvocationEnabled: true }] }));
+ try {
+ // Normal directory reads must not recursively query groups or trust injected status.
+ const normal = await runInvoke(GUEST, { channel: 'maker:provider:list', args: [] });
+ expect(normal).toMatchObject({ ok: true, result: { providers: [{ id: 'anthropic', groupSize: 2 }] } });
+ expect(JSON.stringify(normal)).not.toContain('groupStatus');
+ expect(sharedGroupStatus).not.toHaveBeenCalled();
+ const explicit = await runInvoke(GUEST, { channel: 'maker:provider:list', args: [{ includeSharedGroupStatus: true, providerId: 'private-provider' }] });
+ expect(explicit).toMatchObject({ ok: true, result: { providers: [{ id: 'anthropic', groupStatus: ['busy', 'needs-update'] }] } });
+ expect(sharedGroupStatus).toHaveBeenCalledWith('anthropic');
+ expect(JSON.stringify(explicit)).not.toContain('private-provider');
+
+ // An old host or failed status read still supplies its ordinary model catalog.
+ sharedGroupStatus.mockRejectedValueOnce(new Error('status read failed'));
+ const failed = await runInvoke(GUEST, { channel: 'maker:provider:list', args: [{ includeSharedGroupStatus: true }] });
+ expect(failed.ok).toBe(true);
+ expect(JSON.stringify(failed)).not.toContain('groupStatus');
+ setRemoteAgentHandler({ handle: vi.fn(), abortAll: vi.fn() });
+ const old = await runInvoke(GUEST, { channel: 'maker:provider:list', args: [{ includeSharedGroupStatus: true }] });
+ expect(old.ok).toBe(true);
+ expect(JSON.stringify(old)).not.toContain('groupStatus');
+ setRemoteAgentHandler({ handle: vi.fn(), abortAll: vi.fn(), sharedGroupStatus });
+
+ sharedGroupStatus.mockImplementation(async () => { state.access = null; return ['available', 'busy']; });
+ const revoked = await runInvoke(GUEST, { channel: 'maker:provider:list', args: [{ includeSharedGroupStatus: true }] });
+ expect(revoked.ok).toBe(false);
+ expect(JSON.stringify(revoked)).not.toContain('groupStatus');
+ } finally {
+ registry.reset();
+ }
+ });
});
describe('provider group channel', () => {
diff --git a/apps/desktop/src/main/device-link/dispatch.ts b/apps/desktop/src/main/device-link/dispatch.ts
index 2b40350a88..3f62dca9b7 100644
--- a/apps/desktop/src/main/device-link/dispatch.ts
+++ b/apps/desktop/src/main/device-link/dispatch.ts
@@ -9,6 +9,10 @@ import {
decodeSessionTagCatalog,
scrubSharedProvider,
PROVIDER_SHARE_GROUP_SIZE_FIELD,
+ PROVIDER_SHARE_GROUP_STATUS_FIELD,
+ PROVIDER_SHARE_GROUP_STATUS_REQUEST,
+ readProviderShareGroupStatus,
+ type ProviderShareGroupState,
PROVIDER_SHARE_GUEST_RUNNING_FIELD,
CONTROLLER_CAPABILITY_SESSION_LIST_MESSAGES_V1,
isListMessagePush,
@@ -394,6 +398,8 @@ export interface RemoteAgentHandler {
activeControllers?(): string[];
/** 正在运行一轮的任务的控制端(每个任务一项)。 */
turnRunningControllers?(): string[];
+ /** 分享详情的匿名组状态;不开放同账号组管理通道。 */
+ sharedGroupStatus?(providerId: string): Promise<ProviderShareGroupState[] | null>;
}
let remoteAgentHandler: RemoteAgentHandler | null = null;
@@ -4177,7 +4183,15 @@ async function projectProviderShareRead(
src: string, channel: string, args: unknown[], result: unknown, providerId: string,
): Promise<{ ok: true; value: unknown } | Extract<InvokeResultPayload, { ok: false }>> {
if (channel === 'maker:provider:list') {
- return { ok: true, value: projectProviderListForShare(result, providerId, providerShareGuestRunning(src)) };
+ const request = args[0];
+ const wantsStatus = request && typeof request === 'object' && !Array.isArray(request)
+ && (request as Record<string, unknown>)[PROVIDER_SHARE_GROUP_STATUS_REQUEST] === true;
+ const providers = result && typeof result === 'object' ? (result as { providers?: unknown }).providers : null;
+ const offered = Array.isArray(providers) && providers.some((p) => p?.id === providerId && p.remoteInvocationEnabled === true);
+ const states = wantsStatus && offered
+ ? await remoteAgentHandler?.sharedGroupStatus?.(providerId).catch(() => null) ?? null
+ : null;
+ return { ok: true, value: projectProviderListForShare(result, providerId, providerShareGuestRunning(src), states) };
}
const view = await sharedProviderView(src, providerId);
if (view && 'ok' in view) return view;
@@ -4226,7 +4240,9 @@ function providerShareGuestRunning(src: string): number | null {
* Keep only the shared provider (and only while it stays open for remote use). `guestRunning` is the
* calling guest's own running count on this share (null = not known, the field is left out).
*/
-function projectProviderListForShare(result: unknown, providerId: string, guestRunning: number | null = null): unknown {
+function projectProviderListForShare(
+ result: unknown, providerId: string, guestRunning: number | null = null, groupStatus: ProviderShareGroupState[] | null = null,
+): unknown {
if (!result || typeof result !== 'object' || Array.isArray(result)) return result;
const value = result as { providers?: unknown; modelVisibilityOverrides?: unknown; providerOrder?: unknown };
const providers = Array.isArray(value.providers)
@@ -4245,7 +4261,11 @@ function projectProviderListForShare(result: unknown, providerId: string, guestR
providers: providers.map((provider) => {
const scrubbed: Record<string, unknown> = { ...scrubSharedProvider(provider) };
delete scrubbed[PROVIDER_SHARE_GROUP_SIZE_FIELD];
+ delete scrubbed[PROVIDER_SHARE_GROUP_STATUS_FIELD];
if (groupSize !== null) scrubbed[PROVIDER_SHARE_GROUP_SIZE_FIELD] = groupSize;
+ // 只来自本机受邀者分配器;按状态白名单重新构造,绝不透出组员资料。
+ const safeStatus = readProviderShareGroupStatus({ groupSize, groupStatus });
+ if (safeStatus !== null) scrubbed[PROVIDER_SHARE_GROUP_STATUS_FIELD] = safeStatus;
// 只来自本机远程 Agent 服务按调用方统计的数,目录里原有的值不算。
delete scrubbed[PROVIDER_SHARE_GUEST_RUNNING_FIELD];
if (guestRunning !== null) scrubbed[PROVIDER_SHARE_GUEST_RUNNING_FIELD] = guestRunning;
diff --git a/apps/desktop/src/main/provider-group/__tests__/directory.test.ts b/apps/desktop/src/main/provider-group/__tests__/directory.test.ts
index e9d50f40dc..235c9dec4c 100644
--- a/apps/desktop/src/main/provider-group/__tests__/directory.test.ts
+++ b/apps/desktop/src/main/provider-group/__tests__/directory.test.ts
@@ -100,6 +100,19 @@ describe('listCandidates', () => {
});
describe('resolveMembers', () => {
+ it('uses actual local and advertised device versions, including offline devices; never invents a share version', async () => {
+ const directory = createProviderGroupDirectory(deps({ localAppVersion: () => '0.1.104-beta' }));
+ const members: ProviderGroupConfig['members'] = [
+ { key: 'local', kind: 'local', agentDeviceId: null, providerId: 'anthropic', limit: 4, weight: 1, paused: false },
+ { key: 'mini', kind: 'device', agentDeviceId: 'mini', providerId: 'anthropic-1a2b3c4d', limit: 4, weight: 1, paused: false },
+ { key: 'off', kind: 'device', agentDeviceId: 'off', providerId: 'anthropic', limit: 4, weight: 1, paused: false },
+ { key: 'share', kind: 'share', agentDeviceId: 'share:s1', providerId: 'anthropic', limit: 4, weight: 1, paused: false },
+ ];
+ const resolved = await directory.resolveMembers('anthropic', { strategy: 'least', autoSwitch: true, members });
+ expect(resolved.map((m) => m.appVersion)).toEqual(['0.1.104-beta', '1.0.0', '1.0.0', undefined]);
+ expect(resolved[2].state).toBe('offline');
+ });
+
it('reports each member with a state and reason', async () => {
const directory = createProviderGroupDirectory(deps({
listReceivedShares: () => [share('s1'), share('s2', { status: 'paused' })],
diff --git a/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts b/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts
index 432e14e7ab..62e1f92d33 100644
--- a/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts
+++ b/apps/desktop/src/main/provider-group/__tests__/remoteHandler.test.ts
@@ -91,6 +91,31 @@ function deps(overrides: Partial<ProviderGroupRemoteHandlerDeps> = {}) {
const PICK = { action: 'pick', sessionId: 's1', providerId: 'anthropic', agentKind: 'claude-code', model: 'opus', exclude: ['local'] };
describe('provider-group:remote', () => {
+ it('carries the optional detail request across the same-account client and host without probing on ordinary reads', async () => {
+ const d = deps();
+ const invoke = vi.fn<ProviderGroupRemoteInvoke>(async (_device, _channel, args) => ({
+ ok: true, result: await handleProviderGroupRemote(d, 'laptop', args[0]),
+ }));
+ const client = createProviderGroupRemoteClient(invoke);
+ await client.view('mini', 'anthropic', { includeGuestSupport: true });
+ expect(d.router.view).toHaveBeenLastCalledWith('anthropic', { includeGuestSupport: true });
+ await client.view('mini', 'anthropic');
+ expect(d.router.view).toHaveBeenLastCalledWith('anthropic', { includeGuestSupport: false });
+ });
+
+ it('only requests compatibility diagnostics when asked and discards a late reply after switching accounts', async () => {
+ const d = deps();
+ await handleProviderGroupRemote(d, 'laptop', { action: 'view', providerId: 'anthropic' });
+ expect(d.router.view).toHaveBeenLastCalledWith('anthropic', { includeGuestSupport: false });
+ d.router.view.mockImplementationOnce(async () => {
+ d.switchAccount();
+ return { providerId: 'anthropic', config: CONFIG, members: [] };
+ });
+ expect(await handleProviderGroupRemote(d, 'laptop', { action: 'view', providerId: 'anthropic', includeGuestSupport: true }))
+ .toEqual({ providerId: 'anthropic', config: null, members: [] });
+ expect(d.router.view).toHaveBeenLastCalledWith('anthropic', { includeGuestSupport: true });
+ });
+
it('picks a computer, honouring what the caller already tried, and holds it briefly', async () => {
const d = deps();
const result = await handleProviderGroupRemote(d, 'laptop', PICK);
diff --git a/apps/desktop/src/main/provider-group/__tests__/router.test.ts b/apps/desktop/src/main/provider-group/__tests__/router.test.ts
index d3d8cb3493..13f42db39c 100644
--- a/apps/desktop/src/main/provider-group/__tests__/router.test.ts
+++ b/apps/desktop/src/main/provider-group/__tests__/router.test.ts
@@ -3,13 +3,14 @@
* 设置页与分配用同一个数,取它与经组计数中较大的。
*/
import type { ProviderView } from '@cindy/model-providers';
+import type { RemoteAgentCaps } from '@cindy/device-link';
import { describe, expect, it, vi } from 'vitest';
import type { ProviderGroupConfig, ProviderGroupMember } from '../../../shared/providerGroup';
import type { ProviderGroupBinding } from '../bindings';
import type { DeviceLinkDeviceView } from '../../../shared/deviceLinkIpc';
import { createProviderGroupDirectory, type ProviderGroupDirectory, type ResolvedProviderGroupMember } from '../directory';
-import { createProviderGroupRouter, PROVIDER_GROUP_PICK_QUICK_MS } from '../router';
+import { createProviderGroupRouter, PROVIDER_GROUP_PICK_QUICK_MS, type ProviderGroupRouterDeps } from '../router';
const MODEL = 'claude-opus-5-5';
@@ -32,7 +33,7 @@ const LOCAL = member('local', 'local', null);
const SHARE_A = member('share:a:anthropic', 'share', 'share:a', 2);
const SHARE_B = member('share:b:anthropic', 'share', 'share:b');
-function harness(reported: Record<string, number>, bindings: Record<string, ProviderGroupBinding> = {}, running: string[] = []) {
+function harness(reported: Record<string, number>, bindings: Record<string, ProviderGroupBinding> = {}, running: string[] = [], overrides: Partial<ProviderGroupRouterDeps> = {}) {
const config: ProviderGroupConfig = { strategy: 'least', autoSwitch: true, members: [SHARE_A, SHARE_B, LOCAL] };
const directory: ProviderGroupDirectory = {
async resolveMembers(_providerId, current) {
@@ -63,10 +64,35 @@ function harness(reported: Record<string, number>, bindings: Record<string, Prov
isTurnRunning: (sessionId) => running.includes(sessionId),
now: () => 1_000,
random: () => 0,
+ ...overrides,
});
}
describe('provider group running count', () => {
+ it('only probes sharing support for details and keeps an older computer usable by its owner', async () => {
+ const device = member('device:old:anthropic', 'device', 'old');
+ const readCaps = vi.fn(async () => ({ virtualWorkspace: true }) as RemoteAgentCaps);
+ const router = harness({}, {}, [], {
+ readGroup: () => ({ strategy: 'least', autoSwitch: true, members: [device] }), readCaps,
+ });
+ expect(await router.pick({ providerId: 'anthropic', agentKind: 'claude-code', model: MODEL })).toMatchObject({ kind: 'member' });
+ await router.view('anthropic');
+ expect(readCaps).not.toHaveBeenCalled();
+ const details = await router.view('anthropic', { includeGuestSupport: true });
+ expect(details.members[0]).toMatchObject({ state: 'available', guestSupport: 'needs-update' });
+ expect(readCaps).toHaveBeenCalledTimes(1);
+ expect(await router.pick({ providerId: 'anthropic', agentKind: 'claude-code', model: MODEL })).toMatchObject({ kind: 'member' });
+ expect(router.coolingUntil('anthropic', device.key)).toBeNull();
+ });
+
+ it('reports failed capability checks as unknown without changing ordinary availability', async () => {
+ const router = harness({}, {}, [], { readCaps: async () => { throw new Error('offline'); } });
+ const details = await router.view('anthropic', { includeGuestSupport: true });
+ expect(details.members.map((m) => [m.state, m.guestSupport])).toEqual([
+ ['available', 'unknown'], ['available', 'unknown'], ['available', 'supported'],
+ ]);
+ });
+
it('shows what a shared computer reports for this account, including tasks that did not go through the group', async () => {
const router = harness({ [SHARE_A.key]: 2, [SHARE_B.key]: 1 });
const members = (await router.view('anthropic')).members;
diff --git a/apps/desktop/src/main/provider-group/__tests__/runtime.test.ts b/apps/desktop/src/main/provider-group/__tests__/runtime.test.ts
index f06a8f153b..168f803b22 100644
--- a/apps/desktop/src/main/provider-group/__tests__/runtime.test.ts
+++ b/apps/desktop/src/main/provider-group/__tests__/runtime.test.ts
@@ -21,6 +21,21 @@ vi.mock('../store.js', () => ({ readProviderGroup: () => null }));
const { getProviderGroupDirectory, getProviderGroupOwnerScope, getProviderGroupRouter } = await import('../runtime.js');
describe('provider group runtime', () => {
+ it('does not return the previous owner’s details after an account change', async () => {
+ owner = 'detail-owner';
+ const scope = getProviderGroupOwnerScope();
+ const read = vi.spyOn(scope.router, 'view').mockImplementationOnce(async (providerId) => {
+ owner = 'next-detail-owner';
+ return {
+ providerId, config: { strategy: 'least', autoSwitch: true, members: [] },
+ members: [{ key: 'local', kind: 'local', label: 'private', state: 'available', running: 0, limit: 4, weight: 1, paused: false }],
+ };
+ });
+ expect(await getProviderGroupRouter().view('anthropic', { includeGuestSupport: true }))
+ .toEqual({ providerId: 'anthropic', config: null, members: [] });
+ read.mockRestore();
+ });
+
it('keeps cooling and round state per account behind stable handles', () => {
const router = getProviderGroupRouter();
expect(getProviderGroupRouter()).toBe(router);
diff --git a/apps/desktop/src/main/provider-group/__tests__/sharedStatus.test.ts b/apps/desktop/src/main/provider-group/__tests__/sharedStatus.test.ts
new file mode 100644
index 0000000000..98be195d9c
--- /dev/null
+++ b/apps/desktop/src/main/provider-group/__tests__/sharedStatus.test.ts
@@ -0,0 +1,112 @@
+import { afterEach, describe, expect, it, vi } from 'vitest';
+
+import type { RemoteAgentCaps } from '@cindy/device-link';
+import type { ProviderGroupConfig, ProviderGroupMemberState, ProviderGroupView } from '../../../shared/providerGroup';
+import type { ProviderGroupOwnerScope } from '../runtime';
+import { createGuestSupportReader, readSharedGroupStatus, SHARED_GROUP_STATUS_TIMEOUT_MS } from '../sharedStatus';
+
+function setup(states: ProviderGroupMemberState[] = ['available', 'full', 'cooling', 'offline', 'paused', 'unavailable']) {
+ let current = true;
+ let config: ProviderGroupConfig | null = {
+ strategy: 'least', autoSwitch: true,
+ members: states.map((state, index) => ({
+ key: `private-key-${index}`, label: `Secret Computer ${index}`, kind: index === 0 ? 'local' : 'device',
+ agentDeviceId: index === 0 ? null : `private-device-${index}`, providerId: 'anthropic',
+ limit: 4, weight: 1, paused: state === 'paused',
+ })),
+ };
+ const view: ProviderGroupView = {
+ providerId: 'anthropic', config, members: config.members.map((member, index) => ({
+ ...member, label: member.label!, ownerName: 'private-owner', state: states[index], running: index === 1 ? 4 : 0,
+ })),
+ };
+ const router = { view: vi.fn(async () => view) };
+ const readCaps = vi.fn(async () => ({ virtualWorkspace: true, guestRelay: true }) as RemoteAgentCaps);
+ const isIncapable = vi.fn(() => false);
+ const deps = {
+ scope: () => ({ router, isCurrent: () => current }) as unknown as ProviderGroupOwnerScope,
+ readGroup: () => config, readCaps, isIncapable,
+ };
+ return {
+ deps, router, view, readCaps, isIncapable,
+ changeOwner: () => { current = false; },
+ removeGroup: () => { config = null; },
+ setConfig: (next: ProviderGroupConfig) => { config = next; },
+ };
+}
+
+afterEach(() => vi.useRealTimers());
+
+describe('anonymous shared group status', () => {
+ it('coalesces capability reads per computer without caching across detail refreshes', async () => {
+ const env = setup(['available', 'available']);
+ const member = env.view.config!.members[1];
+ const read = createGuestSupportReader(env.readCaps);
+ expect(await Promise.all([read(member), read({ ...member, providerId: 'other' })])).toEqual(['supported', 'supported']);
+ expect(env.readCaps).toHaveBeenCalledTimes(1);
+ env.readCaps.mockResolvedValue({ virtualWorkspace: true } as RemoteAgentCaps);
+ expect(await createGuestSupportReader(env.readCaps)(member)).toBe('needs-update');
+ });
+
+ it('projects coarse states without identities, sources, limits, or usage', async () => {
+ const env = setup();
+ expect(await readSharedGroupStatus(env.deps, 'anthropic')).toEqual([
+ 'available', 'busy', 'cooling', 'offline', 'paused', 'unavailable',
+ ]);
+ expect(env.readCaps).toHaveBeenCalledTimes(1);
+ });
+
+ it('checks guest compatibility even when the owner can use the computer', async () => {
+ const env = setup(['available', 'available']);
+ env.readCaps.mockResolvedValue({ virtualWorkspace: true } as RemoteAgentCaps);
+ expect(await readSharedGroupStatus(env.deps, 'anthropic')).toEqual(['available', 'needs-update']);
+ // A shared member is already isolated by its host and does not require guestRelay.
+ env.view.config!.members[1].kind = 'share';
+ expect(await readSharedGroupStatus(env.deps, 'anthropic')).toEqual(['available', 'busy']);
+ env.readCaps.mockResolvedValue({ guestRelay: true } as RemoteAgentCaps);
+ expect(await readSharedGroupStatus(env.deps, 'anthropic')).toEqual(['available', 'needs-update']);
+ });
+
+ 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);
+ expect(await readSharedGroupStatus(env.deps, 'anthropic')).toEqual(['available', 'needs-update']);
+ expect(env.readCaps).not.toHaveBeenCalled();
+ });
+
+ it('keeps confirmed statuses while an unresponsive capability read becomes unknown', async () => {
+ vi.useFakeTimers();
+ const env = setup(['available', 'available']);
+ env.readCaps.mockImplementation(() => new Promise(() => {}));
+ const result = readSharedGroupStatus(env.deps, 'anthropic');
+ await vi.advanceTimersByTimeAsync(SHARED_GROUP_STATUS_TIMEOUT_MS);
+ expect(await result).toEqual(['available', 'unknown']);
+ });
+
+ it('bounds a failed/slow group read without declaring computers available', async () => {
+ vi.useFakeTimers();
+ const env = setup();
+ env.router.view.mockImplementation(() => new Promise(() => {}));
+ const result = readSharedGroupStatus(env.deps, 'anthropic');
+ await vi.advanceTimersByTimeAsync(SHARED_GROUP_STATUS_TIMEOUT_MS);
+ expect(await result).toEqual(['unknown', 'unknown', 'unknown', 'unknown', 'paused', 'unknown']);
+ expect(env.readCaps).not.toHaveBeenCalled();
+ });
+
+ it('discards status when ownership or group membership changes during the read', async () => {
+ const env = setup();
+ env.readCaps.mockImplementation(async () => {
+ env.changeOwner();
+ return { virtualWorkspace: true, guestRelay: true } as RemoteAgentCaps;
+ });
+ expect(await readSharedGroupStatus(env.deps, 'anthropic')).toBeNull();
+ const changed = setup();
+ changed.readCaps.mockImplementation(async () => {
+ changed.setConfig({ ...changed.view.config!, members: [...changed.view.config!.members].reverse() });
+ return { virtualWorkspace: true, guestRelay: true } as RemoteAgentCaps;
+ });
+ expect(await readSharedGroupStatus(changed.deps, 'anthropic')).toBeNull();
+ changed.removeGroup();
+ expect(await readSharedGroupStatus(changed.deps, 'anthropic')).toBeNull();
+ });
+});
diff --git a/apps/desktop/src/main/provider-group/directory.ts b/apps/desktop/src/main/provider-group/directory.ts
index 79caf140f7..72a99e5f2f 100644
--- a/apps/desktop/src/main/provider-group/directory.ts
+++ b/apps/desktop/src/main/provider-group/directory.ts
@@ -15,6 +15,7 @@ import {
} from '../../shared/providerShare.js';
import {
providerGroupMemberKey,
+ readProviderGroupAppVersion,
type ProviderGroupCandidate,
type ProviderGroupConfig,
type ProviderGroupMember,
@@ -28,6 +29,7 @@ export interface ProviderGroupDirectoryDeps {
listLocalProviders(): Promise<ProviderView[]>;
/** 本机设备名。 */
localDeviceName(): string;
+ localAppVersion?(): string;
listDevices(): Promise<readonly DeviceLinkDeviceView[]>;
/** 那台电脑允许被远程调用的供应商;读不到时抛错(带 `[REMOTE_AGENT_SHARE_*]` 前缀时保留原因)。 */
readDeviceProviders(agentDeviceId: string): Promise<ProviderView[]>;
@@ -44,6 +46,7 @@ export interface ResolvedProviderGroupMember {
member: ProviderGroupMember;
label: string;
ownerName?: string;
+ appVersion?: string;
state: ResolvedMemberState;
reason?: ProviderGroupUnavailableReason;
/** 那台电脑上的这个供应商(state 为 ok 时一定有)。 */
@@ -153,10 +156,12 @@ export function createProviderGroupDirectory(deps: ProviderGroupDirectoryDeps):
async function resolveLocal(member: ProviderGroupMember): Promise<ResolvedProviderGroupMember> {
const label = deps.localDeviceName();
+ const appVersion = readProviderGroupAppVersion(deps.localAppVersion?.());
+ const base = { member, label, ...(appVersion ? { appVersion } : {}) };
const view = await localGroupProvider(member.providerId);
- if (!view || !view.connected || view.suspended) return { member, label, state: 'unavailable', reason: 'disconnected' };
+ if (!view || !view.connected || view.suspended) return { ...base, state: 'unavailable', reason: 'disconnected' };
const reportedRunning = await deps.localRunning?.(member.providerId).catch(() => null);
- return { member, label, state: 'ok', view, ...(typeof reportedRunning === 'number' ? { reportedRunning } : {}) };
+ return { ...base, state: 'ok', view, ...(typeof reportedRunning === 'number' ? { reportedRunning } : {}) };
}
async function resolveDevice(
@@ -166,16 +171,18 @@ export function createProviderGroupDirectory(deps: ProviderGroupDirectoryDeps):
const deviceId = member.agentDeviceId!;
const device = deviceList?.find((d) => d.deviceId === deviceId);
const label = device?.name || member.label || deviceId;
- if (!device || !isControllable(device)) return { member, label, state: 'offline' };
+ const appVersion = readProviderGroupAppVersion(device?.appVersion);
+ const version = appVersion ? { appVersion } : {};
+ if (!device || !isControllable(device)) return { member, label, ...version, state: 'offline' };
let views: ProviderView[];
try {
views = await readCatalog(deviceId);
} catch {
- return { member, label, state: 'offline' };
+ return { member, label, ...version, state: 'offline' };
}
const resolved = withView(member, label, undefined, views);
const reportedRunning = resolved.view ? readProviderRunningTurns(resolved.view) : null;
- return reportedRunning === null ? resolved : { ...resolved, reportedRunning };
+ return { ...resolved, ...version, ...(reportedRunning === null ? {} : { reportedRunning }) };
}
async function resolveShare(
diff --git a/apps/desktop/src/main/provider-group/guestRelay.ts b/apps/desktop/src/main/provider-group/guestRelay.ts
index c2ad486738..108ea68a23 100644
--- a/apps/desktop/src/main/provider-group/guestRelay.ts
+++ b/apps/desktop/src/main/provider-group/guestRelay.ts
@@ -8,11 +8,14 @@
* 受邀者的任务,但不冷却它,本机自己的任务照常分过去。
*/
import type { AgentKind } from '@cindy/maker-core';
+import type { ProviderShareGroupState } from '@cindy/device-link';
import type { ProviderGroupConfig } from '../../shared/providerGroup.js';
import type { RelayRunFailure } from '../remote-agent/host/groupRelay.js';
import type { GroupRelayLoad, GroupRelayMember, RemoteAgentGroupRelayDeps } from '../remote-agent/host/runHost.js';
import type { RemoteAgentInvoke, RemoteAgentPoller } from '../remote-agent/controller/runClient.js';
+import { RemoteAgentRunClient } from '../remote-agent/controller/runClient.js';
+import { readSharedGroupStatus } from './sharedStatus.js';
import { PROVIDER_GROUP_MAX_REMOTE_COOLDOWN_MS } from './remoteHandler.js';
import { PROVIDER_GROUP_DEFAULT_COOLDOWN_MS, PROVIDER_GROUP_FAILURE_COOLDOWN_MS } from './router.js';
import { decideProviderGroupFailure, describeProviderGroupFailure, providerGroupFailureSignals } from './failurePolicy.js';
@@ -36,7 +39,9 @@ function errorText(error: unknown): string {
return error instanceof Error ? error.message : String(error);
}
-export function createProviderGroupGuestRelay(deps: ProviderGroupGuestRelayDeps): RemoteAgentGroupRelayDeps {
+export function createProviderGroupGuestRelay(deps: ProviderGroupGuestRelayDeps): RemoteAgentGroupRelayDeps & {
+ sharedStatus(providerId: string): Promise<ProviderShareGroupState[] | null>;
+} {
/** 不支持接受受邀者任务的同账号电脑 → 到何时前不再试。 */
const incapable = new Map<string, number>();
@@ -51,6 +56,13 @@ export function createProviderGroupGuestRelay(deps: ProviderGroupGuestRelayDeps)
}
return {
+ sharedStatus: (providerId) => readSharedGroupStatus({
+ scope: deps.scope,
+ readGroup: deps.readGroup,
+ isIncapable,
+ readCaps: (member) => RemoteAgentRunClient.caps(deps.connect(member.agentDeviceId!).invoke),
+ }, providerId),
+
async plan({ kind, model, providerId, exclude, reserve }) {
const config = deps.readGroup(providerId);
if (!config) return null;
diff --git a/apps/desktop/src/main/provider-group/ipc.ts b/apps/desktop/src/main/provider-group/ipc.ts
index f1a0c8b4dc..23d3667ac8 100644
--- a/apps/desktop/src/main/provider-group/ipc.ts
+++ b/apps/desktop/src/main/provider-group/ipc.ts
@@ -137,7 +137,7 @@ export async function executeProviderGroupCommand(deps: ProviderGroupCommandDeps
const { providerId } = command;
switch (command.action) {
case 'get':
- return deps.router.view(providerId);
+ return deps.router.view(providerId, { includeGuestSupport: true });
case 'remote-view':
return markMembersUnreachableHere(
await deps.remoteView(command.deviceId, providerId),
@@ -150,7 +150,7 @@ export async function executeProviderGroupCommand(deps: ProviderGroupCommandDeps
await deps.writeGroup(providerId, null);
await deps.pruneBindings(providerId, null);
deps.changed(providerId);
- return deps.router.view(providerId);
+ return deps.router.view(providerId, { includeGuestSupport: true });
case 'save': {
const owner = deps.ownerKey();
const next = normalizeProviderGroupConfig(command.config, providerId);
@@ -179,7 +179,7 @@ export async function executeProviderGroupCommand(deps: ProviderGroupCommandDeps
const written = await deps.writeGroup(providerId, next);
await deps.pruneBindings(providerId, written ? new Set(written.members.map((m) => m.key)) : null);
deps.changed(providerId);
- return deps.router.view(providerId);
+ return deps.router.view(providerId, { includeGuestSupport: true });
}
}
}
@@ -192,7 +192,7 @@ export function registerProviderGroupIpc(): void {
writeGroup: writeProviderGroup,
pruneBindings: pruneProviderGroupBindings,
ownerKey: activeOwnerScopeKey,
- remoteView: (deviceId, providerId) => getProviderGroupRemoteClient().view(deviceId, providerId),
+ remoteView: (deviceId, providerId) => getProviderGroupRemoteClient().view(deviceId, providerId, { includeGuestSupport: true }),
localDeviceId: getSelfDeviceId,
listGroups: listProviderGroups,
sessionGroup: readProviderGroupOfSession,
diff --git a/apps/desktop/src/main/provider-group/remoteClient.ts b/apps/desktop/src/main/provider-group/remoteClient.ts
index 1bb10f19dc..098b16dd04 100644
--- a/apps/desktop/src/main/provider-group/remoteClient.ts
+++ b/apps/desktop/src/main/provider-group/remoteClient.ts
@@ -45,7 +45,7 @@ export interface ProviderGroupRemoteClient {
resetAt?: number | null;
}): Promise<void>;
leases(ownerDeviceId: string, seq: number, entries: readonly ProviderGroupRemoteLease[]): Promise<void>;
- view(ownerDeviceId: string, providerId: string): Promise<ProviderGroupView>;
+ view(ownerDeviceId: string, providerId: string, options?: { includeGuestSupport?: boolean }): Promise<ProviderGroupView>;
/** 报告经组、在组里别的电脑上运行的用量;组所在电脑是旧版本时抛 ProviderGroupRemoteUnsupportedError。 */
usage(ownerDeviceId: string, report: { seq: number; sinceDay: string | null; rows: readonly ProviderGroupRemoteUsageRow[] }, beforeSend?: () => void): Promise<void>;
}
@@ -103,8 +103,11 @@ export function createProviderGroupRemoteClient(invoke: ProviderGroupRemoteInvok
await call(ownerDeviceId, { action: 'leases', seq, entries: entries.map((e) => ({ ...e })) });
},
- async view(ownerDeviceId, providerId) {
- return parseProviderGroupRemoteView(await call(ownerDeviceId, { action: 'view', providerId }), providerId);
+ async view(ownerDeviceId, providerId, options) {
+ return parseProviderGroupRemoteView(await call(ownerDeviceId, {
+ action: 'view', providerId,
+ ...(options?.includeGuestSupport ? { includeGuestSupport: true } : {}),
+ }), providerId);
},
async usage(ownerDeviceId, report, beforeSend) {
diff --git a/apps/desktop/src/main/provider-group/remoteHandler.ts b/apps/desktop/src/main/provider-group/remoteHandler.ts
index 5eeee5af6f..5260eba1aa 100644
--- a/apps/desktop/src/main/provider-group/remoteHandler.ts
+++ b/apps/desktop/src/main/provider-group/remoteHandler.ts
@@ -88,7 +88,7 @@ export function decorateProviderListWithGroups(
}
/**
- * 分享出去的供应商建了组时,受邀者只看到组里有几台电脑(provider-groups.md §8):不给名单、不给状态。
+ * 分享出去的供应商建了组时提供台数(provider-groups.md §8),不返回组员名单;匿名状态由受邀者分配器按需提供。
* 供应商不再允许被远程调用时分享本身就不可用,不报台数。
*/
export function sharedProviderGroupSize(
@@ -148,7 +148,9 @@ export async function handleProviderGroupRemote(
return {};
case 'view': {
if (!deps.isRemoteAllowed(request.providerId)) return { providerId: request.providerId, config: null, members: [] };
- return scope.router.view(request.providerId);
+ const view = await scope.router.view(request.providerId, { includeGuestSupport: request.includeGuestSupport === true });
+ return scope.isCurrent() && deps.isRemoteAllowed(request.providerId)
+ ? view : { providerId: request.providerId, config: null, members: [] };
}
case 'usage':
case 'usage-part': {
diff --git a/apps/desktop/src/main/provider-group/remoteRegistration.ts b/apps/desktop/src/main/provider-group/remoteRegistration.ts
index 43e5b37b7d..7e67d072bb 100644
--- a/apps/desktop/src/main/provider-group/remoteRegistration.ts
+++ b/apps/desktop/src/main/provider-group/remoteRegistration.ts
@@ -1,7 +1,7 @@
/**
* 把供应商组接到设备互联(docs/product-rules/provider-groups.md §4):同账号其他电脑的
* `provider-group:remote` 请求(含它们报告来的用量),以及给它们的 `maker:provider:list` 补组摘要与运行数。
- * 组摘要只服务同账号电脑,dispatch 已拒绝受邀者与共享任务访客;受邀者只拿得到组里有几台(§8)。
+ * 组摘要只服务同账号电脑,dispatch 已拒绝受邀者与共享任务访客;受邀者的台数由本接口提供,匿名状态另由受邀者分配器提供(§8)。
*/
import { setProviderGroupRemoteHandler } from '../device-link/dispatch.js';
import { isRemoteProviderInvocationAllowed } from '../maker-host/remote-provider-access-store.js';
diff --git a/apps/desktop/src/main/provider-group/router.ts b/apps/desktop/src/main/provider-group/router.ts
index 165e498f39..2101b18fc3 100644
--- a/apps/desktop/src/main/provider-group/router.ts
+++ b/apps/desktop/src/main/provider-group/router.ts
@@ -13,11 +13,13 @@
*/
import { findCatalogModel, isModelSelectableForNewRoute } from '@cindy/model-providers';
import type { AgentKind } from '@cindy/maker-core';
+import type { RemoteAgentCaps } from '@cindy/device-link';
import type { ProviderGroupConfig, ProviderGroupMember, ProviderGroupView } from '../../shared/providerGroup.js';
import type { ProviderGroupBinding } from './bindings.js';
import type { ProviderGroupDirectory, ResolvedProviderGroupMember } from './directory.js';
import { pickProviderGroupMember, type SchedulableMember } from './scheduler.js';
+import { createGuestSupportReader } from './sharedStatus.js';
/** 撞到用量上限但拿不到重置时刻时,默认冷却多久。 */
export const PROVIDER_GROUP_DEFAULT_COOLDOWN_MS = 30 * 60_000;
@@ -39,6 +41,8 @@ export type ProviderGroupPersistedCooling = Record<string, Record<string, number
export interface ProviderGroupRouterDeps {
directory: ProviderGroupDirectory;
+ /** 仅详情页按需读取;分配与普通状态查询不探测远端能力。 */
+ readCaps?(member: ProviderGroupMember): Promise<RemoteAgentCaps>;
readGroup(providerId: string): ProviderGroupConfig | null;
listBindings(): Record<string, ProviderGroupBinding>;
/** 这个任务现在是否正在运行一轮。 */
@@ -86,7 +90,7 @@ export type ProviderGroupPickResult =
export interface ProviderGroupRouter {
pick(input: ProviderGroupPickInput): Promise<ProviderGroupPickResult>;
- view(providerId: string): Promise<ProviderGroupView>;
+ view(providerId: string, options?: { includeGuestSupport?: boolean }): Promise<ProviderGroupView>;
/** 经本组分到这台、正在运行的任务数。 */
running(providerId: string, memberKey: string): number;
markCooling(providerId: string, memberKey: string, until: number): void;
@@ -233,14 +237,18 @@ export function createProviderGroupRouter(deps: ProviderGroupRouterDeps): Provid
return { kind: 'member', member: chosen.member, label: chosen.label, resolved };
},
- async view(providerId) {
+ async view(providerId, options) {
const config = deps.readGroup(providerId);
if (!config) return { providerId, config: null, members: [] };
const resolved = await deps.directory.resolveMembers(providerId, config);
+ const readSupport = options?.includeGuestSupport && deps.readCaps ? createGuestSupportReader(deps.readCaps) : null;
return {
providerId,
config,
- members: resolved.map((r) => {
+ members: await Promise.all(resolved.map(async (r) => {
+ const guestSupport = readSupport
+ ? (r.member.kind === 'local' || r.state === 'ok' ? await readSupport(r.member) : 'unknown' as const)
+ : undefined;
const until = coolingUntil(providerId, r.member.key);
const count = memberRunning(providerId, r);
const state = r.member.paused
@@ -257,6 +265,8 @@ export function createProviderGroupRouter(deps: ProviderGroupRouterDeps): Provid
kind: r.member.kind,
label: r.label,
...(r.ownerName ? { ownerName: r.ownerName } : {}),
+ ...(r.appVersion ? { appVersion: r.appVersion } : {}),
+ ...(guestSupport ? { guestSupport } : {}),
state,
...(r.reason ? { reason: r.reason } : {}),
running: count,
@@ -265,7 +275,7 @@ export function createProviderGroupRouter(deps: ProviderGroupRouterDeps): Provid
paused: r.member.paused,
...(until !== null ? { coolingUntil: until } : {}),
};
- }),
+ })),
};
},
diff --git a/apps/desktop/src/main/provider-group/runtime.ts b/apps/desktop/src/main/provider-group/runtime.ts
index 694d820758..0db5eb73f8 100644
--- a/apps/desktop/src/main/provider-group/runtime.ts
+++ b/apps/desktop/src/main/provider-group/runtime.ts
@@ -7,6 +7,8 @@
* 调用方拿到的是固定的门面,每次调用按当前账号转发。
*/
import type { ProviderView } from '@cindy/model-providers';
+import { REMOTE_AGENT_CHANNEL, parseRemoteAgentCaps } from '@cindy/device-link';
+import { app } from 'electron';
import { activeOwnerScopeKey } from '../appSessionState.js';
import { readProviderGroupSummary, type ProviderGroupSessionGroup } from '../../shared/providerGroup.js';
@@ -44,6 +46,7 @@ function runtimeForActiveOwner(): OwnerRuntime {
const directory = createProviderGroupDirectory({
listLocalProviders: () => getDesktopProviderService().listProviders({ allowSideEffects: false }),
localDeviceName: () => deviceName(),
+ localAppVersion: () => app.getVersion(),
listDevices: async () => (await handleListDevices(deviceDirectoryDeps())).devices,
readDeviceProviders: (agentDeviceId) => readDeviceProviderViews(remoteBackgroundInvoke, agentDeviceId),
listReceivedShares: () => getReceivedShares(),
@@ -54,6 +57,13 @@ function runtimeForActiveOwner(): OwnerRuntime {
const externalLoad = createProviderGroupExternalLoad({ now: () => Date.now() });
const router = createProviderGroupRouter({
directory,
+ readCaps: async (member) => {
+ if (activeOwnerScopeKey() !== owner) throw new Error('The account changed');
+ const reply = await remoteBackgroundInvoke(member.agentDeviceId!, REMOTE_AGENT_CHANNEL, [{ op: 'caps' }]);
+ if (activeOwnerScopeKey() !== owner) throw new Error('The account changed');
+ if (!reply.ok) throw new Error('Could not read computer capabilities');
+ return parseRemoteAgentCaps(reply.result);
+ },
readGroup: readProviderGroup,
listBindings: listProviderGroupBindings,
isTurnRunning: (sessionId) => isTurnRunning(sessionId),
@@ -85,7 +95,11 @@ const directoryFacade: ProviderGroupDirectory = {
const routerFacade: ProviderGroupRouter = {
pick: (input) => runtimeForActiveOwner().router.pick(input),
- view: (providerId) => runtimeForActiveOwner().router.view(providerId),
+ view: async (providerId, options) => {
+ const runtime = runtimeForActiveOwner();
+ const view = await runtime.router.view(providerId, options);
+ return activeOwnerScopeKey() === runtime.owner ? view : { providerId, config: null, members: [] };
+ },
running: (providerId, memberKey) => runtimeForActiveOwner().router.running(providerId, memberKey),
markCooling: (providerId, memberKey, until) => runtimeForActiveOwner().router.markCooling(providerId, memberKey, until),
coolingUntil: (providerId, memberKey) => runtimeForActiveOwner().router.coolingUntil(providerId, memberKey),
diff --git a/apps/desktop/src/main/provider-group/sharedStatus.ts b/apps/desktop/src/main/provider-group/sharedStatus.ts
new file mode 100644
index 0000000000..4a46f7f4d3
--- /dev/null
+++ b/apps/desktop/src/main/provider-group/sharedStatus.ts
@@ -0,0 +1,69 @@
+/** 受邀者可见的组状态:白名单投影,不携带组员身份和用量,也不分配任务或改变冷却。 */
+import type { ProviderShareGroupState, RemoteAgentCaps } from '@cindy/device-link';
+
+import type { ProviderGroupConfig, ProviderGroupGuestSupport, ProviderGroupMember } from '../../shared/providerGroup.js';
+import type { ProviderGroupOwnerScope } from './runtime.js';
+
+export const SHARED_GROUP_STATUS_TIMEOUT_MS = 3_000;
+
+export interface SharedGroupStatusDeps {
+ scope(): ProviderGroupOwnerScope;
+ readGroup(providerId: string): ProviderGroupConfig | null;
+ readCaps(member: ProviderGroupMember): Promise<RemoteAgentCaps>;
+ isIncapable(agentDeviceId: string): boolean;
+}
+
+async function readWithin<T>(read: () => Promise<T>): Promise<T | null> {
+ let timer: ReturnType<typeof setTimeout> | undefined;
+ try {
+ return await Promise.race([
+ Promise.resolve().then(read).catch(() => null),
+ new Promise<null>((resolve) => { timer = setTimeout(() => resolve(null), SHARED_GROUP_STATUS_TIMEOUT_MS); }),
+ ]);
+ } finally {
+ clearTimeout(timer);
+ }
+}
+
+/** 一次详情读取内按电脑合并能力查询;沿用真正接收分享任务时的能力条件。 */
+export function createGuestSupportReader(readCaps: SharedGroupStatusDeps['readCaps']) {
+ const caps = new Map<string, Promise<RemoteAgentCaps | null>>();
+ return async (member: ProviderGroupMember): Promise<ProviderGroupGuestSupport> => {
+ if (!member.agentDeviceId) return 'supported';
+ let pending = caps.get(member.agentDeviceId);
+ if (!pending) {
+ pending = readWithin(() => readCaps(member));
+ caps.set(member.agentDeviceId, pending);
+ }
+ const capability = await pending;
+ if (!capability) return 'unknown';
+ return capability.virtualWorkspace === true && (member.kind !== 'device' || capability.guestRelay === true)
+ ? 'supported' : 'needs-update';
+ };
+}
+
+export async function readSharedGroupStatus(deps: SharedGroupStatusDeps, providerId: string): Promise<ProviderShareGroupState[] | null> {
+ const scope = deps.scope();
+ const config = deps.readGroup(providerId);
+ if (!config) return null;
+ const view = await readWithin(() => scope.router.view(providerId));
+ if (!scope.isCurrent()) return null;
+ const readSupport = createGuestSupportReader(deps.readCaps);
+ const states = await Promise.all(config.members.map(async (member): Promise<ProviderShareGroupState> => {
+ if (member.paused) return 'paused';
+ const status = view?.members.find((item) => item.key === member.key);
+ if (!status) return 'unknown';
+ if (status.state !== 'available' && status.state !== 'full') return status.state;
+ if (member.agentDeviceId) {
+ // 与实际接任务的条件一致;旧版同账号组员可能主人能用,受邀者却不能用。
+ if (member.kind === 'device' && deps.isIncapable(member.agentDeviceId)) return 'needs-update';
+ const support = await readSupport(member);
+ if (support !== 'supported') return support;
+ }
+ // 满载仍能接任务;只报粗略忙闲,绝不返回任务数和上限。
+ return status.running > 0 || status.state === 'full' ? 'busy' : 'available';
+ }));
+ // 读取期间换账号或编辑组时丢弃快照,避免将旧组状态贴到新组序号上。
+ const latest = deps.readGroup(providerId);
+ return scope.isCurrent() && JSON.stringify(latest) === JSON.stringify(config) ? states : null;
+}
diff --git a/apps/desktop/src/main/remote-agent/host/service.ts b/apps/desktop/src/main/remote-agent/host/service.ts
index e2cdf8df94..d483ef6432 100644
--- a/apps/desktop/src/main/remote-agent/host/service.ts
+++ b/apps/desktop/src/main/remote-agent/host/service.ts
@@ -98,6 +98,19 @@ function guestAllows(controller: string, providerId: string): boolean {
export function installRemoteAgentHost(options: { getMaker: () => Maker; userDataDir: string }): void {
if (host) return;
const usage = installProviderShareUsageStore(options.userDataDir);
+ // 同一份受邀者分配器同时提供匿名状态,沿用实际分配时记录的版本兼容情况。
+ const groupRelay = createProviderGroupGuestRelay({
+ scope: getProviderGroupOwnerScope,
+ readGroup: readProviderGroup,
+ connect: (agentDeviceId) => {
+ const poller = remoteAgentPollerFor(agentDeviceId, remoteBackgroundInvoke, log);
+ return { invoke: poller.invoke, poller };
+ },
+ // 组内电脑的报错用那台机器的本地时间:不带时区的钟点不按本机时区理解。
+ readResetAt: (failure) => readTurnUsageResetAt(failure, Date.now(), { localTimeZoneTrusted: false }),
+ now: () => Date.now(),
+ log,
+ });
host = createRemoteAgentHost({
isAgentAvailable: (kind) => {
try {
@@ -159,18 +172,7 @@ export function installRemoteAgentHost(options: { getMaker: () => Maker; userDat
},
recordOwnerUsage: (controller, sample) => recordDeviceUsage(controller, sample, 'device'),
// 供应商组(本机是组所在电脑):受邀者的任务按组分给组内电脑,本机中转(provider-groups.md §4)。
- groupRelay: createProviderGroupGuestRelay({
- scope: getProviderGroupOwnerScope,
- readGroup: readProviderGroup,
- connect: (agentDeviceId) => {
- const poller = remoteAgentPollerFor(agentDeviceId, remoteBackgroundInvoke, log);
- return { invoke: poller.invoke, poller };
- },
- // 组内电脑的报错用那台机器的本地时间:不带时区的钟点不按本机时区理解。
- readResetAt: (failure) => readTurnUsageResetAt(failure, Date.now(), { localTimeZoneTrusted: false }),
- now: () => Date.now(),
- log,
- }),
+ groupRelay,
captureOwner: captureDataOwnerBroadcastScope,
isOwnerCurrent: (owner) => isDataOwnerBroadcastScopeCurrent(owner as DataOwnerBroadcastScope),
runsRoot: path.join(options.userDataDir, 'remote-agent'),
@@ -186,6 +188,7 @@ export function installRemoteAgentHost(options: { getMaker: () => Maker; userDat
purgeControllers: (match) => current.purgeControllers(match),
activeControllers: () => current.activeControllers(),
turnRunningControllers: () => current.turnRunningControllers(),
+ sharedGroupStatus: (providerId) => groupRelay.sharedStatus(providerId),
});
}
diff --git a/apps/desktop/src/renderer/features/provider-group/GroupMemberVersion.tsx b/apps/desktop/src/renderer/features/provider-group/GroupMemberVersion.tsx
new file mode 100644
index 0000000000..7cffc87547
--- /dev/null
+++ b/apps/desktop/src/renderer/features/provider-group/GroupMemberVersion.tsx
@@ -0,0 +1,21 @@
+import { useTranslation } from 'react-i18next';
+
+import type { ProviderGroupMemberStatus } from '../../../shared/providerGroup';
+
+/** 本机组设置与同账号组详情共用;分享能力不能覆盖主人自己的可用状态。 */
+export function GroupMemberVersion({ status }: { status: ProviderGroupMemberStatus | undefined }) {
+ const { t } = useTranslation();
+ return (
+ <span className="flex flex-wrap items-baseline gap-x-2 gap-y-0.5 text-12 leading-[1.5] text-[var(--text-tertiary)]">
+ <span>{status?.appVersion
+ ? t('providerGroup.member.version.current', { version: status.appVersion })
+ : t('providerGroup.member.version.unknown')}</span>
+ {status?.guestSupport === 'needs-update' && (
+ <span className="text-[var(--warning-fg)]">{t('providerGroup.member.version.needsUpdate')}</span>
+ )}
+ {status && (!status.guestSupport || status.guestSupport === 'unknown') && (
+ <span>{t('providerGroup.member.version.supportUnknown')}</span>
+ )}
+ </span>
+ );
+}
diff --git a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
index 2ad4435aae..4097c70cd9 100644
--- a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
@@ -41,6 +41,7 @@ import {
} from '../../../shared/providerGroup';
import { providerShareComputerName, useProviderShareOwnerNameOf } from '../provider-share/providerShareNames';
import { GroupMemberQuota, groupMemberQuotaTarget } from './GroupMemberQuota';
+import { GroupMemberVersion } from './GroupMemberVersion';
import { ProviderGroupAddDialog } from './ProviderGroupAddDialog';
import { useProviderGroup } from './useProviderGroup';
@@ -310,6 +311,7 @@ function MemberRow({
</>
)}
</span>
+ <GroupMemberVersion status={status} />
</span>
</button>
<div className="flex shrink-0 items-center gap-1.5">
diff --git a/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx b/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx
index 55f038ba51..df0abe2ec1 100644
--- a/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx
@@ -18,6 +18,7 @@ import type {
} from '../../../shared/providerGroup';
import { providerShareComputerName, useProviderShareOwnerNameOf } from '../provider-share/providerShareNames';
import { GroupMemberQuota, groupMemberQuotaTarget } from './GroupMemberQuota';
+import { GroupMemberVersion } from './GroupMemberVersion';
import { memberStatusText } from './ProviderGroupSection';
const REFRESH_INTERVAL_MS = 15_000;
@@ -183,6 +184,7 @@ function MemberRow({
</>
)}
</span>
+ <GroupMemberVersion status={status} />
</span>
</button>
{quotaOpen && (
diff --git a/apps/desktop/src/renderer/features/provider-group/__tests__/GroupMemberVersion.test.tsx b/apps/desktop/src/renderer/features/provider-group/__tests__/GroupMemberVersion.test.tsx
new file mode 100644
index 0000000000..94d6b8fc3a
--- /dev/null
+++ b/apps/desktop/src/renderer/features/provider-group/__tests__/GroupMemberVersion.test.tsx
@@ -0,0 +1,42 @@
+// @vitest-environment jsdom
+import { cleanup, render, screen } from '@testing-library/react';
+import { createInstance } from 'i18next';
+import { I18nextProvider } from 'react-i18next';
+import { afterEach, describe, expect, it } from 'vitest';
+
+import en from '@/i18n/locales/en/common.json';
+import ja from '@/i18n/locales/ja/common.json';
+import ko from '@/i18n/locales/ko/common.json';
+import zhCN from '@/i18n/locales/zh-CN/common.json';
+import zhTW from '@/i18n/locales/zh-TW/common.json';
+
+import type { ProviderGroupMemberStatus } from '../../../../shared/providerGroup';
+import { GroupMemberVersion } from '../GroupMemberVersion';
+
+const catalogs = { en, ja, ko, 'zh-CN': zhCN, 'zh-TW': zhTW };
+const status: ProviderGroupMemberStatus = {
+ key: 'local', kind: 'local', label: 'Computer', state: 'available', running: 0, limit: 4, weight: 1, paused: false,
+ appVersion: '0.1.103', guestSupport: 'needs-update',
+};
+afterEach(cleanup);
+
+describe('group member version translations', () => {
+ it.each([
+ ['en', 'Update needed to receive shared tasks'],
+ ['ja', '共有されたタスクを受け取るには更新が必要'],
+ ['ko', '공유받은 작업을 실행하려면 업데이트 필요'],
+ ['zh-CN', '需要更新才能接收分享任务'],
+ ['zh-TW', '需要更新才能接收分享任務'],
+ ] as const)('renders actual %s text and keeps missing versions unknown', async (lang, warning) => {
+ const i18n = createInstance();
+ await i18n.init({ lng: lang, fallbackLng: false, resources: { [lang]: { translation: catalogs[lang] } } });
+ const { rerender } = render(<I18nextProvider i18n={i18n}><GroupMemberVersion status={status} /></I18nextProvider>);
+ expect(screen.getByText('Cindy 0.1.103')).toBeTruthy();
+ expect(screen.getByText(warning)).toBeTruthy();
+ expect(document.body.textContent).not.toContain('???');
+ rerender(<I18nextProvider i18n={i18n}><GroupMemberVersion status={{ ...status, appVersion: undefined, guestSupport: undefined }} /></I18nextProvider>);
+ expect(screen.getByText(catalogs[lang].providerGroup.member.version.unknown)).toBeTruthy();
+ expect(screen.getByText(catalogs[lang].providerGroup.member.version.supportUnknown)).toBeTruthy();
+ expect(screen.queryByText(warning)).toBeNull();
+ });
+});
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.tsx
index bf6314ba55..52c0a55d27 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
@@ -120,6 +120,18 @@ beforeEach(() => {
afterEach(() => cleanup());
describe('ProviderGroupSection', () => {
+ it('shows the version and sharing update hint alongside the owner’s normal availability', async () => {
+ stored = { strategy: 'least', autoSwitch: true, members: [LOCAL] };
+ const base = viewOf(stored);
+ base.members[0] = { ...base.members[0], appVersion: '0.1.103', guestSupport: 'needs-update' };
+ command.mockImplementation(async (cmd: { action: string }) => cmd.action === 'list' ? { anthropic: stored } : base);
+ render(<ProviderGroupSection providerId="anthropic" providerName="Anthropic" />);
+ await screen.findByText('providerGroup.member.version.current:{"version":"0.1.103"}');
+ expect(screen.getByText('providerGroup.member.version.needsUpdate')).toBeTruthy();
+ expect(screen.getByTestId('provider-group-member').getAttribute('data-member-state')).toBe('available');
+ expect(screen.getByText('providerGroup.member.runningCount:{"count":1}')).toBeTruthy();
+ });
+
it('creates a group with this computer plus the selected computers', async () => {
render(<ProviderGroupSection providerId="anthropic" providerName="Anthropic" />);
expect(await screen.findByText(/providerGroup\.section\.empty/)).toBeTruthy();
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.tsx
index 33196a6586..5e617266e2 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
@@ -56,6 +56,21 @@ afterEach(() => {
});
describe('RemoteProviderGroupMembers', () => {
+ it('shows the version and sharing update hint without hiding availability for the owner', async () => {
+ mountWith({ appVersion: '0.1.103', guestSupport: 'needs-update' });
+ await screen.findByText('providerGroup.member.version.current:{"version":"0.1.103"}');
+ expect(screen.getByText('providerGroup.member.version.needsUpdate')).toBeTruthy();
+ expect(screen.getByTestId('remote-provider-group-member').getAttribute('data-member-state')).toBe('available');
+ expect(screen.getByText('providerGroup.member.runningCount:{"count":2}')).toBeTruthy();
+ });
+
+ it('leaves the version and sharing compatibility unknown for an older group host', async () => {
+ mountWith({});
+ await screen.findByText('providerGroup.member.version.supportUnknown');
+ expect(screen.getByText('providerGroup.member.version.unknown')).toBeTruthy();
+ expect(screen.queryByText('providerGroup.member.version.needsUpdate')).toBeNull();
+ });
+
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-share/ProviderShareReceivedRail.tsx b/apps/desktop/src/renderer/features/provider-share/ProviderShareReceivedRail.tsx
index 099b2af8b8..11b16ba16d 100644
--- a/apps/desktop/src/renderer/features/provider-share/ProviderShareReceivedRail.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/ProviderShareReceivedRail.tsx
@@ -29,6 +29,7 @@ import { providerShareAgentDeviceId } from './providerShareFormat';
import { providerShareDisplayNames } from './providerShareNames';
import { useProviderShareReceived } from './providerShareStore';
import { ShareAvatar } from './ShareAvatar';
+import { SharedProviderGroupStatus } from './SharedProviderGroupStatus';
type ReceivedStatus = 'active' | 'paused' | 'offline' | 'needs-update';
@@ -199,7 +200,7 @@ export function ProviderShareReceivedDetail({ share }: { share: ProviderShareRec
else if (models.length === 0) body = t('providerShare.received.modelsEmpty');
return (
- <div data-testid="provider-share-received-detail" className="flex min-h-0 flex-1 flex-col">
+ <div data-testid="provider-share-received-detail" className="flex min-h-0 flex-1 flex-col overflow-y-auto">
<div className="shrink-0 px-5 py-4">
<div className="flex flex-wrap items-center gap-3 gap-y-2">
<div className="flex min-w-0 flex-auto basis-[220px] items-center gap-3">
@@ -235,7 +236,7 @@ export function ProviderShareReceivedDetail({ share }: { share: ProviderShareRec
<div className="flex shrink-0 items-center gap-2.5">
<span role="status" className="inline-flex items-center gap-1.5 text-12 text-[var(--text-secondary)]">
<StatusDot status={status} />
- {t(STATUS_LABEL_KEY[status])}
+ {t(status === 'active' && groupSize !== null ? 'providerShare.received.groupStatus.shareActive' : STATUS_LABEL_KEY[status])}
</span>
<Button
variant="secondary"
@@ -263,23 +264,29 @@ export function ProviderShareReceivedDetail({ share }: { share: ProviderShareRec
</p>
</div>
- <ReadOnlyProviderModelSection
- title={t('providerShare.received.modelsTitle')}
- models={models}
- note={body}
- action={
- status === 'active' && catalog.error ? (
- <Button
- variant="secondary"
- size="sm"
- onClick={() => void refreshRemoteCatalogSnapshot(catalogDeviceId).catch(() => undefined)}
- >
- {t('providerShare.received.retryModels')}
- </Button>
- ) : null
- }
- testId="provider-share-received-models"
- />
+ {status === 'active' && groupSize !== null && (
+ <SharedProviderGroupStatus key={catalogDeviceId} deviceId={catalogDeviceId} providerId={share.providerId} initialSize={groupSize} />
+ )}
+
+ <div className="flex min-h-40 flex-1 flex-col">
+ <ReadOnlyProviderModelSection
+ title={t('providerShare.received.modelsTitle')}
+ models={models}
+ note={body}
+ action={
+ status === 'active' && catalog.error ? (
+ <Button
+ variant="secondary"
+ size="sm"
+ onClick={() => void refreshRemoteCatalogSnapshot(catalogDeviceId).catch(() => undefined)}
+ >
+ {t('providerShare.received.retryModels')}
+ </Button>
+ ) : null
+ }
+ testId="provider-share-received-models"
+ />
+ </div>
</div>
);
}
diff --git a/apps/desktop/src/renderer/features/provider-share/SharedProviderGroupStatus.tsx b/apps/desktop/src/renderer/features/provider-share/SharedProviderGroupStatus.tsx
new file mode 100644
index 0000000000..58f3d4ba05
--- /dev/null
+++ b/apps/desktop/src/renderer/features/provider-share/SharedProviderGroupStatus.tsx
@@ -0,0 +1,116 @@
+/** 分享给我的供应商组:只读匿名状态。仅在详情可见时刷新,失败后不把旧状态当作仍可用。 */
+import { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import {
+ PROVIDER_SHARE_GROUP_STATUS_REQUEST,
+ readProviderShareGroupSize,
+ readProviderShareGroupStatus,
+ type ProviderShareGroupState,
+} from '@cindy/device-link';
+
+import { Button } from '@/components/ui/button';
+import { getDataOwnerGeneration, isDataOwnerGenerationCurrent, isDataOwnerIdCurrent } from '@/contexts/dataOwnerGeneration';
+
+const REFRESH_MS = 15_000;
+const COPY = 'providerShare.received.groupStatus';
+const isVisible = () => document.visibilityState !== 'hidden';
+
+export function SharedProviderGroupStatus({
+ deviceId, providerId, initialSize,
+}: { deviceId: string; providerId: string; initialSize: number }) {
+ const { t } = useTranslation();
+ const [snapshot, setSnapshot] = useState<{ size: number | null; states: ProviderShareGroupState[] | null }>({
+ size: initialSize, states: null,
+ });
+ const [loading, setLoading] = useState(true);
+ const [failed, setFailed] = useState(false);
+ const [refresh, setRefresh] = useState(0);
+
+ useEffect(() => {
+ let cancelled = false;
+ let pending = false;
+ let timer: ReturnType<typeof setTimeout> | undefined;
+ const owner = getDataOwnerGeneration();
+ const current = () => !cancelled && isDataOwnerIdCurrent(owner);
+ const reload = async () => {
+ if (!current() || pending || !isVisible()) return;
+ clearTimeout(timer);
+ const generation = getDataOwnerGeneration();
+ const canApply = () => current() && isDataOwnerGenerationCurrent(generation);
+ pending = true;
+ setLoading(true);
+ try {
+ const raw = await window.electronAPI.deviceLink.invoke(deviceId, 'maker:provider:list', [
+ { [PROVIDER_SHARE_GROUP_STATUS_REQUEST]: true },
+ ]) as { providers?: Array<{ id?: string }> };
+ if (!canApply()) return;
+ const provider = Array.isArray(raw?.providers) ? raw.providers.find((entry) => entry?.id === providerId) : null;
+ if (!provider) throw new Error('Shared provider missing');
+ setSnapshot({ size: readProviderShareGroupSize(provider), states: readProviderShareGroupStatus(provider) });
+ setFailed(false);
+ } catch {
+ if (!canApply()) return;
+ setSnapshot((previous) => ({ ...previous, states: null }));
+ setFailed(true);
+ } finally {
+ pending = false;
+ if (current()) {
+ setLoading(false);
+ if (isVisible()) timer = setTimeout(() => void reload(), REFRESH_MS);
+ }
+ }
+ };
+ const onVisibility = () => {
+ clearTimeout(timer);
+ if (isVisible()) void reload();
+ };
+ void reload();
+ document.addEventListener('visibilitychange', onVisibility);
+ return () => {
+ cancelled = true;
+ clearTimeout(timer);
+ document.removeEventListener('visibilitychange', onVisibility);
+ };
+ }, [deviceId, providerId, refresh]);
+
+ if (snapshot.size === null && !failed) return null;
+ const states = snapshot.states;
+ const ready = states?.filter((state) => state === 'available' || state === 'busy').length ?? 0;
+ const unknown = !states || states.includes('unknown');
+ const summary = failed ? t(`${COPY}.failed`)
+ : !states ? t(`${COPY}.${loading ? 'loading' : 'unsupported'}`)
+ : ready > 0 ? t(`${COPY}.summary`, { ready, total: states.length })
+ : unknown ? t(`${COPY}.unconfirmed`) : t(`${COPY}.noneReady`);
+ return (
+ <section data-testid="shared-provider-group-status" className="shrink-0 border-t border-[var(--settings-theme-card-border)] px-5 py-3">
+ <div className="mb-2 flex items-center justify-between gap-3">
+ <h3 className="text-13 font-medium text-[var(--settings-section-title)]">{t(`${COPY}.title`)}</h3>
+ <Button variant="secondary" size="sm" disabled={loading} onClick={() => setRefresh((value) => value + 1)}>
+ {t(`${COPY}.refresh`)}
+ </Button>
+ </div>
+ <p role="status" className="mb-2 text-12 leading-[1.5] text-[var(--text-secondary)]">{summary}</p>
+ <ul className="max-h-64 overflow-y-auto rounded-xl border border-[var(--settings-theme-card-border)]">
+ {Array.from({ length: snapshot.size ?? initialSize }, (_, index) => {
+ const state = states?.[index] ?? 'unknown';
+ const available = state === 'available' || state === 'busy';
+ return (
+ <li key={index} className="flex flex-wrap items-center justify-between gap-2 border-t border-[var(--settings-theme-card-border)] px-3 py-2.5 first:border-t-0">
+ <span className="text-13 text-[var(--text-primary)]">{t(`${COPY}.computer`, { number: index + 1 })}</span>
+ <span className="inline-flex 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={{ backgroundColor: available ? 'var(--remote-status-ready)' : 'var(--remote-status-disconnected)' }} />
+ {t(`${COPY}.state.${state}`)}
+ </span>
+ </li>
+ );
+ })}
+ </ul>
+ <p className="mt-2 text-12 leading-[1.5] text-[var(--text-tertiary)]">{t(`${COPY}.note`)}</p>
+ {states?.includes('needs-update') && (
+ <p className="mt-1 text-12 leading-[1.5] text-[var(--text-secondary)]">{t(`${COPY}.updateNote`)}</p>
+ )}
+ </section>
+ );
+}
diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsx
index a4aa3e104a..294a056187 100644
--- a/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsx
+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/ProviderShareReceivedRail.test.tsx
@@ -1,5 +1,5 @@
// @vitest-environment jsdom
-import { cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { act, cleanup, fireEvent, render, screen, waitFor } from '@testing-library/react';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { ProviderShareReceived } from '@cindy/device-link';
@@ -109,6 +109,20 @@ describe('ProviderShareReceivedRailGroup', () => {
});
describe('ProviderShareReceivedDetail', () => {
+ it('shows anonymous status only for an active grouped share', async () => {
+ catalog.value.providers = [{ id: 'xd', groupSize: 2, models: {} }];
+ const invoke = vi.fn(async () => ({ providers: [{ id: 'xd', groupSize: 2, groupStatus: ['available', 'needs-update'] }] }));
+ Object.assign(window.electronAPI, { deviceLink: { invoke } });
+ let view!: ReturnType<typeof render>;
+ await act(async () => { view = render(<ProviderShareReceivedDetail share={{ ...share, status: 'active' }} />); });
+ expect(screen.getByTestId('shared-provider-group-status')).toBeTruthy();
+ expect(screen.getByText('providerShare.received.groupStatus.state.needs-update')).toBeTruthy();
+ expect(screen.queryByText(share.deviceName)).toBeNull();
+ await act(async () => { view.rerender(<ProviderShareReceivedDetail share={share} />); });
+ expect(screen.queryByTestId('shared-provider-group-status')).toBeNull();
+ expect(invoke).toHaveBeenCalledTimes(1);
+ });
+
it('explains a paused share without reading its models, and leaves after confirmation', async () => {
render(<ProviderShareReceivedDetail share={share} />);
expect(screen.getByText('providerShare.received.statusPaused')).toBeTruthy();
diff --git a/apps/desktop/src/renderer/features/provider-share/__tests__/SharedProviderGroupStatus.test.tsx b/apps/desktop/src/renderer/features/provider-share/__tests__/SharedProviderGroupStatus.test.tsx
new file mode 100644
index 0000000000..e3f3c940a4
--- /dev/null
+++ b/apps/desktop/src/renderer/features/provider-share/__tests__/SharedProviderGroupStatus.test.tsx
@@ -0,0 +1,128 @@
+// @vitest-environment jsdom
+import { act, cleanup, fireEvent, render, screen } from '@testing-library/react';
+import { createInstance } from 'i18next';
+import { I18nextProvider } from 'react-i18next';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import en from '@/i18n/locales/en/common.json';
+import ja from '@/i18n/locales/ja/common.json';
+import ko from '@/i18n/locales/ko/common.json';
+import zhCN from '@/i18n/locales/zh-CN/common.json';
+import zhTW from '@/i18n/locales/zh-TW/common.json';
+import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
+
+import { SharedProviderGroupStatus } from '../SharedProviderGroupStatus';
+
+const catalogs = { en, ja, ko, 'zh-CN': zhCN, 'zh-TW': zhTW };
+const i18n = createInstance();
+const invoke = vi.fn();
+const payload = (states: unknown[] | null = ['available', 'needs-update']) => ({
+ providers: [{ id: 'anthropic', groupSize: 2, ...(states ? { groupStatus: states } : {}) }],
+});
+const element = (deviceId = 'share:one') => (
+ <I18nextProvider i18n={i18n}>
+ <SharedProviderGroupStatus key={deviceId} deviceId={deviceId} providerId="anthropic" initialSize={2} />
+ </I18nextProvider>
+);
+
+beforeEach(async () => {
+ vi.useFakeTimers();
+ invoke.mockReset().mockResolvedValue(payload());
+ setDataOwnerGeneration('test-owner', 0);
+ Object.assign(window, { electronAPI: { deviceLink: { invoke } } });
+ await i18n.init({
+ lng: 'zh-CN', fallbackLng: false, defaultNS: 'common',
+ resources: Object.fromEntries(Object.entries(catalogs).map(([locale, common]) => [locale, { common }])),
+ interpolation: { escapeValue: false },
+ });
+});
+
+afterEach(() => {
+ cleanup();
+ vi.restoreAllMocks();
+ vi.useRealTimers();
+});
+
+describe('received provider group status', () => {
+ it.each(Object.keys(catalogs) as Array<keyof typeof catalogs>)('renders real %s copy and only anonymous computer labels', async (locale) => {
+ await i18n.changeLanguage(locale);
+ await act(async () => { render(element()); });
+ const copy = catalogs[locale].providerShare.received.groupStatus;
+ expect(screen.getByText(copy.title)).toBeTruthy();
+ expect(screen.getByText(copy.computer.replace('{{number}}', '1'))).toBeTruthy();
+ expect(screen.getByText(copy.state['needs-update'])).toBeTruthy();
+ expect(screen.getByText(copy.updateNote)).toBeTruthy();
+ expect(screen.getByTestId('shared-provider-group-status').textContent).not.toContain('providerShare.');
+ expect(screen.getByTestId('shared-provider-group-status').textContent).not.toContain('???');
+ expect(invoke).toHaveBeenCalledWith('share:one', 'maker:provider:list', [{ includeSharedGroupStatus: true }]);
+ });
+
+ it('counts busy computers as usable and never renders injected identity or usage', async () => {
+ invoke.mockResolvedValue(payload(['busy', { state: 'available', label: 'SECRET NAME', running: 777 }]));
+ await act(async () => { render(element()); });
+ expect(screen.getByRole('status').textContent).toBe('2 台中有 1 台可接任务');
+ expect(screen.getByText('忙碌,仍可接任务')).toBeTruthy();
+ expect(screen.getByText('状态未知')).toBeTruthy();
+ expect(document.body.textContent).not.toMatch(/SECRET NAME|777/);
+ });
+
+ it('clears stale availability after a failed refresh and allows a retry', async () => {
+ await act(async () => { render(element()); });
+ invoke.mockRejectedValueOnce(new Error('offline'));
+ await act(async () => { await vi.advanceTimersByTimeAsync(15_000); });
+ expect(screen.getByText('电脑状态读取失败,请刷新重试')).toBeTruthy();
+ expect(screen.queryByText('可用')).toBeNull();
+ expect(screen.getAllByText('状态未知')).toHaveLength(2);
+ invoke.mockResolvedValue(payload(['cooling', 'paused']));
+ await act(async () => { fireEvent.click(screen.getByRole('button', { name: '刷新状态' })); });
+ expect(screen.getByText('目前没有可接任务的电脑,请联系分享者检查')).toBeTruthy();
+ expect(screen.getByText('冷却中,暂不接新任务')).toBeTruthy();
+ });
+
+ it('does not call an old host healthy or unavailable when it supplies no statuses', async () => {
+ invoke.mockResolvedValue(payload(null));
+ await act(async () => { render(element()); });
+ expect(screen.getByText(zhCN.providerShare.received.groupStatus.unsupported)).toBeTruthy();
+ expect(screen.queryByText('可用')).toBeNull();
+ expect(screen.queryByText(zhCN.providerShare.received.groupStatus.noneReady)).toBeNull();
+ });
+
+ it('pauses in the background, refreshes when visible, and stops after closing', async () => {
+ const visibility = vi.spyOn(document, 'visibilityState', 'get').mockReturnValue('visible');
+ let close!: () => void;
+ await act(async () => { close = render(element()).unmount; });
+ visibility.mockReturnValue('hidden');
+ fireEvent(document, new Event('visibilitychange'));
+ await act(async () => { await vi.advanceTimersByTimeAsync(60_000); });
+ expect(invoke).toHaveBeenCalledTimes(1);
+ visibility.mockReturnValue('visible');
+ await act(async () => { fireEvent(document, new Event('visibilitychange')); });
+ expect(invoke).toHaveBeenCalledTimes(2);
+ close();
+ await act(async () => { await vi.advanceTimersByTimeAsync(30_000); });
+ expect(invoke).toHaveBeenCalledTimes(2);
+ });
+
+ it('ignores a late result from the previously selected share', async () => {
+ let resolveOld!: (value: ReturnType<typeof payload>) => void;
+ invoke.mockImplementationOnce(() => new Promise((resolve) => { resolveOld = resolve; }));
+ const view = render(element());
+ invoke.mockResolvedValue(payload(['offline', 'paused']));
+ await act(async () => { view.rerender(element('share:two')); });
+ await act(async () => { resolveOld(payload(['available', 'available'])); });
+ expect(screen.queryByText('可用')).toBeNull();
+ expect(screen.getByText('离线或无法连接')).toBeTruthy();
+ });
+
+ it('discards an outdated owner snapshot and continues refreshing for the same owner', async () => {
+ let resolveOld!: (value: ReturnType<typeof payload>) => void;
+ invoke.mockImplementationOnce(() => new Promise((resolve) => { resolveOld = resolve; }));
+ render(element());
+ setDataOwnerGeneration('test-owner', 1);
+ await act(async () => { resolveOld(payload()); });
+ expect(screen.queryByText('可用')).toBeNull();
+ invoke.mockResolvedValue(payload(['busy', 'paused']));
+ await act(async () => { await vi.advanceTimersByTimeAsync(15_000); });
+ expect(screen.getByText('忙碌,仍可接任务')).toBeTruthy();
+ });
+});
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index 82019c9eee..cc9e4d0d18 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -378,6 +378,30 @@
"modelsRefused": "The owner’s computer isn’t allowing this share right now. It may not allow remote control, “Allow remote use” may be off for this provider, or their Cindy may still be starting. Try again shortly, or ask them to check both settings.",
"modelsFailedWithCode": "Couldn’t read the models they made available. Try again shortly. (Error code: {{code}})",
"retryModels": "Reload Models",
+ "groupStatus": {
+ "title": "Group Computer Status",
+ "shareActive": "Sharing Active",
+ "refresh": "Refresh Status",
+ "computer": "Computer {{number}}",
+ "summary": "{{ready}} of {{total}} computers can accept tasks",
+ "loading": "Reading computer status…",
+ "unsupported": "The sharer’s Cindy has not provided status. Ask the sharer to check or update Cindy.",
+ "failed": "Could not read computer status. Refresh to try again.",
+ "unconfirmed": "Some computer statuses are unconfirmed. Refresh shortly.",
+ "noneReady": "No computers can accept tasks right now. Ask the sharer to check.",
+ "note": "Only anonymous status is shown, without computer names or usage. Availability also depends on the selected model.",
+ "updateNote": "The sharer needs to update Cindy on the indicated computers to accept shared tasks.",
+ "state": {
+ "available": "Available",
+ "busy": "Busy, Can Accept Tasks",
+ "cooling": "Cooling Down, No New Tasks",
+ "offline": "Offline or Unreachable",
+ "paused": "Assignment Paused",
+ "unavailable": "Temporarily Unavailable",
+ "needs-update": "Update Required",
+ "unknown": "Status Unknown"
+ }
+ },
"modelsEmpty": "They haven't made any models available yet.",
"pausedNote": "They've paused this share. You can use it again once they resume it.",
"offlineNote": "Their computer is offline. You can use it again once it is back online.",
@@ -456,6 +480,12 @@
},
"member": {
"local": "This Computer",
+ "version": {
+ "current": "Cindy {{version}}",
+ "unknown": "Version unknown",
+ "needsUpdate": "Update needed to receive shared tasks",
+ "supportUnknown": "Shared-task compatibility unknown"
+ },
"sourceDevice": "My other computer",
"sourceShare": "Shared by {{name}}",
"shareComputer": "{{name}}'s computer",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 06dfced78d..3a7019953d 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -376,6 +376,30 @@
"modelsRefused": "相手のパソコンが今この共有の読み込みを許可していません。リモート操作を許可していないか、このプロバイダーの「リモート利用を許可」がオフになっているか、相手の Cindy が起動したばかりでまだ準備できていない可能性があります。しばらくしてから再試行するか、相手にこの 2 つの設定を確認してもらってください。",
"modelsFailedWithCode": "相手が公開しているモデルを読み込めませんでした。しばらくしてから再試行してください。(エラーコード:{{code}})",
"retryModels": "モデルを再読み込み",
+ "groupStatus": {
+ "title": "グループ内のコンピューターの状態",
+ "shareActive": "共有中",
+ "refresh": "状態を更新",
+ "computer": "コンピューター {{number}}",
+ "summary": "{{total}} 台中 {{ready}} 台がタスクを受け付け可能",
+ "loading": "コンピューターの状態を取得中…",
+ "unsupported": "共有元の Cindy から状態が提供されていません。共有元に確認や更新を依頼してください。",
+ "failed": "コンピューターの状態を取得できませんでした。更新して再試行してください。",
+ "unconfirmed": "一部のコンピューターの状態が未確認です。しばらくしてから更新してください。",
+ "noneReady": "現在タスクを受け付けられるコンピューターはありません。共有元に確認を依頼してください。",
+ "note": "匿名の状態のみを表示し、コンピューター名や使用量は表示しません。利用可否は選択したモデルにも依存します。",
+ "updateNote": "共有されたタスクを受け付けるには、共有元が該当するコンピューターの Cindy を更新する必要があります。",
+ "state": {
+ "available": "利用可能",
+ "busy": "使用中・タスク受付可能",
+ "cooling": "クールダウン中・新規タスク受付停止",
+ "offline": "オフラインまたは接続不可",
+ "paused": "割り当て停止中",
+ "unavailable": "一時的に利用不可",
+ "needs-update": "更新が必要",
+ "unknown": "状態不明"
+ }
+ },
"modelsEmpty": "相手はまだ利用できるモデルを公開していません。",
"pausedNote": "相手がこの共有を一時停止しています。再開されると使えるようになります。",
"offlineNote": "相手のパソコンがオフラインです。オンラインに戻ると使えるようになります。",
@@ -453,6 +477,12 @@
},
"member": {
"local": "このパソコン",
+ "version": {
+ "current": "Cindy {{version}}",
+ "unknown": "バージョン不明",
+ "needsUpdate": "共有されたタスクを受け取るには更新が必要",
+ "supportUnknown": "共有タスクへの対応状況は不明"
+ },
"sourceDevice": "自分のほかのパソコン",
"sourceShare": "{{name}} からの共有",
"shareComputer": "{{name}} のパソコン",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 94bd506dd4..6dac39c4e1 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -376,6 +376,30 @@
"modelsRefused": "상대방 컴퓨터가 지금 이 공유를 읽도록 허용하지 않습니다. 원격 제어를 허용하지 않았거나 이 제공자의 원격 사용 허용이 꺼져 있거나, 상대방 Cindy가 방금 시작되어 아직 준비되지 않았을 수 있습니다. 잠시 후 다시 시도하거나 상대방에게 두 설정을 확인해 달라고 하세요.",
"modelsFailedWithCode": "상대방이 공개한 모델을 읽을 수 없습니다. 잠시 후 다시 시도하세요. (오류 코드: {{code}})",
"retryModels": "모델 다시 읽기",
+ "groupStatus": {
+ "title": "그룹 내 컴퓨터 상태",
+ "shareActive": "공유 중",
+ "refresh": "상태 새로고침",
+ "computer": "컴퓨터 {{number}}",
+ "summary": "{{total}}대 중 {{ready}}대가 작업을 받을 수 있음",
+ "loading": "컴퓨터 상태를 읽는 중…",
+ "unsupported": "공유자의 Cindy가 상태를 제공하지 않았습니다. 공유자에게 확인 또는 업데이트를 요청하세요.",
+ "failed": "컴퓨터 상태를 읽지 못했습니다. 새로고침하여 다시 시도하세요.",
+ "unconfirmed": "일부 컴퓨터의 상태가 확인되지 않았습니다. 잠시 후 새로고침하세요.",
+ "noneReady": "현재 작업을 받을 수 있는 컴퓨터가 없습니다. 공유자에게 확인을 요청하세요.",
+ "note": "컴퓨터 이름과 사용량 없이 익명 상태만 표시합니다. 사용 가능 여부는 선택한 모델에 따라서도 달라집니다.",
+ "updateNote": "공유된 작업을 받으려면 공유자가 해당 컴퓨터의 Cindy를 업데이트해야 합니다.",
+ "state": {
+ "available": "사용 가능",
+ "busy": "사용 중, 작업 수신 가능",
+ "cooling": "대기 중, 새 작업 수신 중지",
+ "offline": "오프라인 또는 연결 불가",
+ "paused": "할당 일시 중지",
+ "unavailable": "일시적으로 사용 불가",
+ "needs-update": "업데이트 필요",
+ "unknown": "상태 알 수 없음"
+ }
+ },
"modelsEmpty": "상대방이 아직 사용 가능한 모델을 공개하지 않았습니다.",
"pausedNote": "상대방이 이 공유를 일시 중지했습니다. 다시 시작하면 사용할 수 있습니다.",
"offlineNote": "상대방 컴퓨터가 오프라인입니다. 다시 온라인이 되면 사용할 수 있습니다.",
@@ -453,6 +477,12 @@
},
"member": {
"local": "이 컴퓨터",
+ "version": {
+ "current": "Cindy {{version}}",
+ "unknown": "버전 확인 안 됨",
+ "needsUpdate": "공유받은 작업을 실행하려면 업데이트 필요",
+ "supportUnknown": "공유 작업 호환성 확인 안 됨"
+ },
"sourceDevice": "내 다른 컴퓨터",
"sourceShare": "{{name}}님의 공유",
"shareComputer": "{{name}}님의 컴퓨터",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
index d87aa77c41..56adbf27a5 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -376,6 +376,30 @@
"modelsRefused": "对方电脑暂时不让读取这个分享:可能没有允许远程控制、关了这个供应商的「允许被远程调用」,也可能对方的 Cindy 刚启动、还没准备好。请稍后重试,或让对方检查这两项设置。",
"modelsFailedWithCode": "暂时读不到对方开放的模型,请稍后重试。(错误代码:{{code}})",
"retryModels": "重新读取模型",
+ "groupStatus": {
+ "title": "组内电脑状态",
+ "shareActive": "分享已开启",
+ "refresh": "刷新状态",
+ "computer": "电脑 {{number}}",
+ "summary": "{{total}} 台中有 {{ready}} 台可接任务",
+ "loading": "正在读取电脑状态…",
+ "unsupported": "分享者的 Cindy 暂未提供状态,请联系分享者检查或更新",
+ "failed": "电脑状态读取失败,请刷新重试",
+ "unconfirmed": "部分电脑状态尚未确认,请稍后刷新",
+ "noneReady": "目前没有可接任务的电脑,请联系分享者检查",
+ "note": "仅显示匿名状态,不显示电脑名称和用量。能否运行还取决于所选模型。",
+ "updateNote": "需要分享者更新对应电脑上的 Cindy,才能接收分享来的任务",
+ "state": {
+ "available": "可用",
+ "busy": "忙碌,仍可接任务",
+ "cooling": "冷却中,暂不接新任务",
+ "offline": "离线或无法连接",
+ "paused": "已暂停分配",
+ "unavailable": "暂不可用",
+ "needs-update": "需要更新",
+ "unknown": "状态未知"
+ }
+ },
"modelsEmpty": "对方还没有开放可用的模型。",
"pausedNote": "对方暂停了这个分享,恢复后才能使用。",
"offlineNote": "对方电脑不在线,上线后就能继续使用。",
@@ -453,6 +477,12 @@
},
"member": {
"local": "本机",
+ "version": {
+ "current": "Cindy {{version}}",
+ "unknown": "版本未知",
+ "needsUpdate": "需要更新才能接收分享任务",
+ "supportUnknown": "分享任务兼容性未知"
+ },
"sourceDevice": "我的其他电脑",
"sourceShare": "来自 {{name}} 的分享",
"shareComputer": "{{name}} 的电脑",
diff --git a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
index 97b22b6400..d9dfe663b1 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -376,6 +376,30 @@
"modelsRefused": "對方電腦暫時不讓讀取這個分享:可能沒有允許遠端控制、關了這個供應商的「允許遠端呼叫」,也可能對方的 Cindy 剛啟動、還沒準備好。請稍後重試,或請對方檢查這兩項設定。",
"modelsFailedWithCode": "暫時讀不到對方開放的模型,請稍後重試。(錯誤代碼:{{code}})",
"retryModels": "重新讀取模型",
+ "groupStatus": {
+ "title": "組內電腦狀態",
+ "shareActive": "分享已開啟",
+ "refresh": "重新整理狀態",
+ "computer": "電腦 {{number}}",
+ "summary": "{{total}} 台中有 {{ready}} 台可接任務",
+ "loading": "正在讀取電腦狀態…",
+ "unsupported": "分享者的 Cindy 尚未提供狀態,請聯絡分享者檢查或更新",
+ "failed": "電腦狀態讀取失敗,請重新整理再試",
+ "unconfirmed": "部分電腦狀態尚未確認,請稍後重新整理",
+ "noneReady": "目前沒有可接任務的電腦,請聯絡分享者檢查",
+ "note": "僅顯示匿名狀態,不顯示電腦名稱和用量。能否執行仍取決於所選模型。",
+ "updateNote": "需要分享者更新對應電腦上的 Cindy,才能接收分享來的任務",
+ "state": {
+ "available": "可用",
+ "busy": "忙碌,仍可接任務",
+ "cooling": "冷卻中,暫不接新任務",
+ "offline": "離線或無法連線",
+ "paused": "已暫停分配",
+ "unavailable": "暫不可用",
+ "needs-update": "需要更新",
+ "unknown": "狀態未知"
+ }
+ },
"modelsEmpty": "對方還沒有開放可用的模型。",
"pausedNote": "對方暫停了這個分享,恢復後才能使用。",
"offlineNote": "對方電腦不在線,上線後就能繼續使用。",
@@ -453,6 +477,12 @@
},
"member": {
"local": "本機",
+ "version": {
+ "current": "Cindy {{version}}",
+ "unknown": "版本未知",
+ "needsUpdate": "需要更新才能接收分享任務",
+ "supportUnknown": "分享任務相容性未知"
+ },
"sourceDevice": "我的其他電腦",
"sourceShare": "來自 {{name}} 的分享",
"shareComputer": "{{name}} 的電腦",
diff --git a/apps/desktop/src/shared/__tests__/providerGroup.test.ts b/apps/desktop/src/shared/__tests__/providerGroup.test.ts
index 8490e7aa62..b7c8bd35ac 100644
--- a/apps/desktop/src/shared/__tests__/providerGroup.test.ts
+++ b/apps/desktop/src/shared/__tests__/providerGroup.test.ts
@@ -8,8 +8,36 @@ import {
PROVIDER_GROUP_MAX_LIMIT,
normalizeProviderGroupConfig,
providerGroupMemberKey,
+ parseProviderGroupRemoteRequest,
+ parseProviderGroupRemoteView,
} from '../providerGroup';
+describe('group detail diagnostics compatibility', () => {
+ const config = { members: [{ kind: 'local' }] };
+ const payload = (extra: Record<string, unknown>) => ({ config, members: [{ key: 'local', state: 'available', ...extra }] });
+
+ it('preserves explicit diagnostic requests and ignores malformed options', () => {
+ expect(parseProviderGroupRemoteRequest({ action: 'view', providerId: 'anthropic', includeGuestSupport: true }))
+ .toEqual({ action: 'view', providerId: 'anthropic', includeGuestSupport: true });
+ expect(parseProviderGroupRemoteRequest({ action: 'view', providerId: 'anthropic', includeGuestSupport: 'true' }))
+ .toEqual({ action: 'view', providerId: 'anthropic' });
+ });
+
+ it('retains valid optional versions and support without changing the ordinary state', () => {
+ expect(parseProviderGroupRemoteView(payload({ appVersion: '0.1.104-beta', guestSupport: 'needs-update' }), 'anthropic').members[0])
+ .toMatchObject({ appVersion: '0.1.104-beta', guestSupport: 'needs-update', state: 'available' });
+ });
+
+ it.each([{}, { appVersion: 1, guestSupport: true }, { appVersion: 'secret hostname', guestSupport: 'all-good' }, { appVersion: '1.2.3-' + 'a'.repeat(65) }])(
+ 'accepts old replies and drops malformed diagnostics: %j', (extra) => {
+ const member = parseProviderGroupRemoteView(payload(extra), 'anthropic').members[0];
+ expect(member.state).toBe('available');
+ expect(member.appVersion).toBeUndefined();
+ expect(member.guestSupport).toBeUndefined();
+ },
+ );
+});
+
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.ts
index a2fa3a53a2..9b145a5a15 100644
--- a/apps/desktop/src/shared/providerGroup.ts
+++ b/apps/desktop/src/shared/providerGroup.ts
@@ -85,6 +85,10 @@ export interface ProviderGroupMemberStatus {
label: string;
/** 分享来的电脑:分享者昵称。 */
ownerName?: string;
+ /** Cindy 应用版本;缺失表示旧端或分享来源未提供,不是 remote-agent 协议版本。 */
+ appVersion?: string;
+ /** 仅描述接收分享任务的能力,不改变主人自己的可用状态。 */
+ guestSupport?: ProviderGroupGuestSupport;
state: ProviderGroupMemberState;
reason?: ProviderGroupUnavailableReason;
/** 经本组分到这台、正在运行的任务数。 */
@@ -108,6 +112,14 @@ export interface ProviderGroupView {
members: ProviderGroupMemberStatus[];
}
+export type ProviderGroupGuestSupport = 'supported' | 'needs-update' | 'unknown';
+
+/** 设备目录中的应用版本只用于展示,拒绝异常长字符串和非版本文本。 */
+export function readProviderGroupAppVersion(value: unknown): string | undefined {
+ return typeof value === 'string' && value.length <= 64 && /^[0-9]+[.][0-9]+[.][0-9]+(?:[-+][0-9A-Za-z.+-]+)?$/.test(value)
+ ? value : undefined;
+}
+
export type ProviderGroupCandidateBlock =
/** 已在组里。 */
| 'member'
@@ -325,7 +337,7 @@ export type ProviderGroupRemoteRequest =
/** 这台电脑经组运行、正在跑的任务(整体替换上一份;seq 只增,乱序到达的旧份丢弃)。 */
| { action: 'leases'; seq: number; entries: ProviderGroupRemoteLease[] }
/** 组内电脑的状态(发送前检查、设置页展示)。 */
- | { action: 'view'; providerId: string }
+ | { action: 'view'; providerId: string; includeGuestSupport?: true }
/**
* 这台电脑经组、在组里别的电脑上运行的用量(组所在电脑经手不到):整体替换这台从 sinceDay 起(含;null = 全部)
* 报过的行。seq 只增,乱序到达的旧份丢弃。
@@ -455,7 +467,10 @@ export function parseProviderGroupRemoteRequest(raw: unknown): ProviderGroupRemo
};
}
case 'view':
- return { action: 'view', providerId: remoteProviderId(value.providerId) };
+ return {
+ action: 'view', providerId: remoteProviderId(value.providerId),
+ ...(value.includeGuestSupport === true ? { includeGuestSupport: true } : {}),
+ };
case 'usage':
case 'usage-part': {
if (!Number.isSafeInteger(value.seq) || (value.seq as number) < 0) invalidRemote('invalid seq');
@@ -533,12 +548,17 @@ export function parseProviderGroupRemoteView(raw: unknown, groupProviderId: stri
? item.reason as ProviderGroupUnavailableReason
: undefined;
const ownerName = normalizeLabel(item.ownerName);
+ const appVersion = readProviderGroupAppVersion(item.appVersion);
+ const guestSupport = ['supported', 'needs-update', 'unknown'].includes(item.guestSupport as string)
+ ? item.guestSupport as ProviderGroupGuestSupport : undefined;
const coolingUntil = typeof item.coolingUntil === 'number' && Number.isFinite(item.coolingUntil) ? item.coolingUntil : undefined;
return [{
key: member.key,
kind: member.kind,
label: normalizeLabel(item.label) ?? member.label ?? member.key,
...(ownerName ? { ownerName } : {}),
+ ...(appVersion ? { appVersion } : {}),
+ ...(guestSupport ? { guestSupport } : {}),
state,
...(reason ? { reason } : {}),
running: count(item.running, 10_000),
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 49933b8d59..530ae6b2f4 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -937,7 +937,7 @@ G 重新打开时换一台。G 与 O 之间新增四项可选内容,O 与 M
## 供应商分享:受邀者不看分享者的电脑名,组只给台数(2026-10-10)
产品规则见 [`provider-sharing.md`](../product-rules/provider-sharing.md) §5.1、§6 与 [`provider-groups.md`](../product-rules/provider-groups.md)
-§8、§9.7、§10。受邀者只知道是谁分享的、分享的是哪个供应商;建了组时只知道背后是个组、有几台。
+§8、§9.7、§10。受邀者只知道是谁分享的、分享的是哪个供应商;本节登记组台数,2026-10-12 增加的匿名状态见下一节。
- **分享投影里的 `maker:provider:list` 新增可选 `groupSize`**(正整数,1–512):分享者把这个供应商建了组、且仍「允许被远程调用」
时,`projectProviderListForShare` 按本机组设置填上(目录里原有的值一律先去掉)。`scrubSharedProvider` 在分享者电脑、受邀者电脑
@@ -955,6 +955,34 @@ G 重新打开时换一台。G 与 O 之间新增四项可选内容,O 与 M
`device-link/__tests__/providerShareDispatch.test.ts`、`provider-group/__tests__/remoteHandler.test.ts`、`directory.test.ts`、
`packages/device-link/src/__tests__/providerShare.test.ts`。
+## 供应商分享:按需查看匿名组状态(2026-10-12)
+
+产品规则见 [`provider-groups.md`](../product-rules/provider-groups.md) §8、§9.7、§10。
+
+- 受邀者读现有 `maker:provider:list` 时可在 `args[0]` 加 `includeSharedGroupStatus: true`。只在分享详情使用;
+ 普通目录读取不探测组员,避免组之间相互读取目录时递归。供应商始终取实际分享授权,不信任请求中指定的供应商。
+- 新分享者在这一条供应商上附加可选 `groupStatus`:长度与 `groupSize` 一致的状态数组,只允许
+ `available / busy / cooling / offline / paused / unavailable / needs-update / unknown`。序号由界面按数组位置生成,
+ 不传组员名称、标识、来源、任务数或用量;不扩展 `provider-group:remote` 的受邀者权限。
+- 由实际受邀者分配器读取组状态并按同一能力条件检查能否接分享任务,状态与能力读取各有 3 秒等待上限;
+ 超时/失败为未知,不改变分配与冷却。读取期间组设置或账号变化丢弃快照,分享撤销后不返回在途结果。
+ `scrubSharedProvider` 在各跳按白名单重建数组;不合法的单项替换为 `unknown`,长度不符则不带字段。
+- 兼容:旧分享者忽略查询选项,新受邀者显示未提供状态;旧受邀者不发选项、行为不变。手机沿用目录清洗但
+ 本期不增加状态入口。无组的供应商不带状态,不改服务器、relay、数据库或既有 channel 白名单。
+- 实现:`provider-group/sharedStatus.ts`、`guestRelay.ts`、`device-link/dispatch.ts`、
+ `packages/device-link/src/providerShareCatalog.ts`;回归:`sharedStatus.test.ts`、`providerShareDispatch.test.ts`、
+ `providerShare.test.ts`、`SharedProviderGroupStatus.test.tsx`。
+
+## 同账号供应商组:版本与分享兼容提示(2026-10-12)
+
+- 同账号组详情的 view 请求可选带 includeGuestSupport: true,才按现有远程 Agent 能力查询核对能否接收分享任务。
+ 普通状态与任务分配不增加能力探测,不修改实际分配、冷却或权限。单台查询最多等 3 秒,失败或超时为未知。
+- 成员状态可选携带 appVersion(不超过 64 字符的应用版本)与 guestSupport(supported / needs-update / unknown)。
+ 本机版本由应用提供,同账号设备版本复用设备目录;分享来源没有版本则省略。能力按真实声明判断,不按版本号猜测。
+- 新端白名单解析;旧组所在电脑忽略选项、未带字段时显示未知,旧控制端忽略新增字段。
+ 成员信息仍只对同账号可读,受邀者匿名状态数组不携带这些字段。异步查询期间换账号或撤销远程调用权限后丢弃回包。
+ 没有新 channel、服务器改动或数据库迁移。回归覆盖目录、组状态、同账号请求解析及本机和远程两处界面。
+
## 供应商分享:受邀者自己的运行数(2026-10-10)
产品规则见 [`provider-groups.md`](../product-rules/provider-groups.md) §5「分享来的电脑」与
diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.md
index 4a049f026f..8a4bbec34b 100644
--- a/docs/product-rules/provider-groups.md
+++ b/docs/product-rules/provider-groups.md
@@ -1,6 +1,7 @@
# 供应商组:一台电脑把多台电脑上的同一个供应商合成一组
> 产品方案:2026-10-09 用户确认(含自动换电脑、受邀者不提醒、自定义供应商按名称匹配、不设数量上限)。
+> 2026-10-12 用户要求:受邀者能查看组内电脑的**匿名状态**,便于判断分享不可用的原因;不显示真实电脑名、设备标识或用量,见 §8、§10。
> 2026-10-10 用户确认:同账号其他电脑经组使用时**直接连到选中的组内电脑**(不经组所在电脑中转),
> 分享的人仍经组所在电脑中转;被组收进去的远程供应商与分享,在同账号其他电脑上只显示组那一项。
> 2026-10-10 用户确认:分享来的组内电脑按**本账号在那台实际跑着的任务数**统计(含不经组直接用的),见 §5。
@@ -378,7 +379,7 @@
之后建组不改变受邀者同意过的内容,所以不需要再提醒。
- 「分享给我的供应商」详情里的说明与申请弹窗同一句话,受邀者想了解时可以查看。
- 受邀者那边不显示组内电脑的名称:模型列表标题写「{供应商} · 来自 {分享者} 的分享 · 供应商组 · N 台电脑」
- (2026-10-10 用户裁决:受邀者只知道背后是个组、有几台);任务头部不显示实际运行的电脑;
+ (2026-10-10 用户裁决;2026-10-12 补充:详情可查看匿名状态,见 §10);任务头部不显示实际运行的电脑;
自动换电脑的活动记录写「已自动换一台电脑继续」。组内电脑的名称属于分享者和组内电脑主人,不透给受邀者;
分享者的电脑名同样不给受邀者(供应商分享 §6)。
- 分享者这边也不弹确认:「远程与分享」页的供应商组一块写明「分享的人的任务也按组分配」。
@@ -405,10 +406,23 @@
受邀者隔离运行,受邀者不会因为经过同账号的组所在电脑而拿到主人级权限。
7. **组内电脑的名单只给同账号电脑。** `provider-group:remote` 通道与目录里的组摘要都只给同账号电脑:受邀者与共享任务
访客调用通道一律拒绝,分享出去的目录里去掉组摘要(分享者电脑、受邀者电脑与手机各去一遍),只带组里有几台
- (`groupSize`,2026-10-10)。组摘要里分享来的组员也不带名字(旧快照可能是那位分享者的电脑名)。
+ (`groupSize`,2026-10-10)。2026-10-12 增加按需读取的匿名状态(`groupStatus`):只含固定状态枚举,
+ 不含组员标识、真实名称、来源关系、任务数、并发上限、订阅配额或用量。组摘要里分享来的组员也不带名字
+ (旧快照可能是那位分享者的电脑名)。
## 10. 界面
+- **受邀者查看匿名状态**(2026-10-12):在「分享给我的供应商」详情中按当前组顺序显示「电脑 1、电脑 2…」与
+ 可用、忙碌但仍可接任务、冷却中、离线或无法连接、暂停分配、暂不可用、需要更新、状态未知。序号仅为当前列表位置,
+ 不透露设备身份,不显示用量或展开配额。汇总显示几台可接任务;有未确认的电脑时不能断言全部不可用。
+ - 状态由组所在电脑提供,沿用组的状态与冷却;额外按接收分享任务的条件核对 `virtualWorkspace` / `guestRelay`,
+ 并反映受邀者分配器已记录的临时版本排除。满载仍能接任务,显示为忙碌;不承诺所有模型都能运行。
+ - 详情在前台时约每 15 秒刷新,可手动刷新;关闭或切到后台暂停读取。刷新失败清掉旧的可用状态,提示刷新重试;
+ 旧分享者未提供状态时明确说明,不能猜成可用。未建组的分享保持原样。手机本期仍不增加组状态界面。
+ - 查询只读,不分配任务、不改变冷却或版本排除,不开放同账号的组管理接口。实现见
+ `apps/desktop/src/main/provider-group/sharedStatus.ts` 与
+ `apps/desktop/src/renderer/features/provider-share/SharedProviderGroupStatus.tsx`,回归见各自同名测试。
+
- **入口**(2026-10-11 用户反馈供应商详情多出一行太长,改为不单独占行):「允许被远程调用」一行开关左侧的入口按钮
有组时写「供应商组 · {N} 台电脑」,没有组时写「远程与分享」,点击进入该供应商的「远程与分享」页(供应商分享 §7.1);
组策略只在那一页显示。有组时这一行的说明改写「由供应商组选一台电脑运行 Agent」,不再说 Agent 在这台电脑上运行。
@@ -423,7 +437,13 @@
还没有单独的「按组内电脑」切换;
3. **分享**:生成分享链接、待处理、已分享的人(按人用量已移到「用量」块,这里只管分享本身)。
未开启「允许被远程调用」时,这一块置灰并说明先开启哪一级(供应商分享 §3)。
-- **组内电脑一行的结构对所有来源一致**,右侧才能真正成列:设备图标 → 名称与来源 → 状态行 →
+- **自己的组显示版本与分享兼容提示**(2026-10-12 用户裁决):建组电脑的设置页、同账号另一台电脑查看组的只读详情,
+ 都在状态下显示 Cindy 应用版本。本机使用当前应用版本,同账号电脑使用设备目录最近上报的版本;离线时版本不代表已重新确认。
+ 分享来源或旧端未提供版本时显示「版本未知」,不拿协议版本代替。
+ - 详情按需核对能否接收分享任务;缺少必要能力时提示「需要更新才能接收分享任务」,不覆盖主人自己的空闲、运行中等状态。
+ 这里不是检查有没有更新发布,也不意味着主人不能使用该电脑。读取失败或旧组所在电脑未提供能力时显示兼容性未知。
+ - 只读能力探测每台最多等待 3 秒,同一次请求按电脑合并;普通状态查询与任务分配不增加探测,不修改冷却与分配。
+- **组内电脑一行的结构对所有来源一致**,右侧才能真正成列:设备图标 → 名称与来源 → 状态与版本行 →
并发上限(按权重时多一个权重)→ 参与分配开关 → 行内 `···` 菜单。三条由此固定:
- **参与分配只有一种控件。** `paused` 是同一个布尔值,本机与远程都用开关表达,不按来源分叉成
「开关 / 暂停分配按钮」两套;暂停后的含义由状态行文字说明,不另弹 toast。
diff --git a/docs/product-rules/provider-sharing.md b/docs/product-rules/provider-sharing.md
index 64f6b7b112..96920a10f0 100644
--- a/docs/product-rules/provider-sharing.md
+++ b/docs/product-rules/provider-sharing.md
@@ -118,7 +118,7 @@
- 分享来的供应商:`Anthropic · 来自 Magi 的分享`,不写分享者的电脑名(§6,2026-10-10 用户裁决)。
同一位分享者的同一个供应商分享了不止一份时,后面的按列表顺序加序号:`来自 Magi 的分享 (2)`。
- 分享者把这个供应商建成了[供应商组](provider-groups.md)时:标题后加台数,
- `Anthropic · 来自 Magi 的分享 · 供应商组 · 3 台电脑`。受邀者只知道背后是个组、组里有几台,不知道是哪几台。手机端本期不显示组信息
+ `Anthropic · 来自 Magi 的分享 · 供应商组 · 3 台电脑`。标题显示台数,匿名状态在详情查看(§5.2),不显示是哪几台。手机端本期不显示组信息
(与[供应商组](provider-groups.md) §10 手机端口径一致),只沿用前两条的标题写法。
Desktop 与 Mobile 使用同一写法。
@@ -134,6 +134,8 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):
- **分享给我的供应商**单独一组「分享给我的供应商」,没有分享时整组不显示:每条用分享者头像标明来自谁,
带状态点;点开在右栏看来源、状态、对方开放的模型(只读,开关由分享者决定),并可「退出」。来源只写
「来自 Magi 的分享」,不写分享者的电脑名;分享者建了供应商组时补「供应商组 · N 台电脑」。
+ 2026-10-12:详情可查看「电脑 1、电脑 2…」的匿名状态,以判断离线、冷却、暂停或不支持接收分享任务等情况;
+ 不显示真实名称、设备标识、来源或用量。状态刷新与旧版本回退见[供应商组](provider-groups.md) §10。
- **输入分享链接**:页面右上角一个「输入分享链接…」按钮,点开弹窗输入链接,之后进入同一个申请弹窗。
网页唤起 Cindy 失败时,加入页指引用户到这里输入。
@@ -154,7 +156,7 @@ Desktop「设置 → 模型供应商」的左栏(2026-10-08 用户裁决):
- **只展示昵称和头像**(2026-10-07 裁决)。邮箱、手机号一律不展示,脱敏后也不展示;组织、区域
也不展示。服务端不收集、不保存这些信息。
- **不展示分享者的电脑名**(2026-10-10 用户裁决)。受邀者只知道是谁分享的、分享的是哪个供应商;分享者
- 建了[供应商组](provider-groups.md)时只知道背后是个组、组里有几台,不知道是哪几台。分享者的订阅账号
+ 建了[供应商组](provider-groups.md)时可以知道台数并查看匿名状态(§5.2,2026-10-12),不知道是哪几台。分享者的订阅账号
(登录邮箱)在每一跳都去掉(§9)。具体做法:
- 生成链接时分享者电脑不再上传电脑名,`deviceName` 填固定占位(字段必填,旧版受邀者按必填解析);
服务端仍存着旧链接里的电脑名,新版本的界面一律不显示它,转给手机时也换成占位;
diff --git a/packages/device-link/src/__tests__/providerShare.test.ts b/packages/device-link/src/__tests__/providerShare.test.ts
index 7f288cbb92..273e8b7df4 100644
--- a/packages/device-link/src/__tests__/providerShare.test.ts
+++ b/packages/device-link/src/__tests__/providerShare.test.ts
@@ -161,6 +161,21 @@ describe('provider share identity scrubbing', () => {
expect(readProviderShareGroupSize(null)).toBeNull();
});
+ it('keeps only anonymous status enums and preserves positions for unknown or malicious entries', async () => {
+ const { readProviderShareGroupStatus, scrubSharedProvider } = await import('../providerShareCatalog.js');
+ const provider = {
+ id: 'anthropic', groupSize: 3, group: { members: [{ label: 'private-name' }] },
+ groupStatus: ['available', { state: 'busy', label: 'private-name', running: 7 }, 'private-device-id'],
+ };
+ expect(scrubSharedProvider(provider)).toEqual({ id: 'anthropic', groupSize: 3, groupStatus: ['available', 'unknown', 'unknown'] });
+ for (const groupStatus of [null, {}, ['available'], Array(513).fill('available')]) {
+ expect(readProviderShareGroupStatus({ groupSize: 3, groupStatus })).toBeNull();
+ expect(scrubSharedProvider({ groupSize: 3, groupStatus })).toEqual({ groupSize: 3 });
+ }
+ expect(readProviderShareGroupStatus({ groupStatus: ['available'] })).toBeNull();
+ expect(readProviderShareGroupStatus({ groupSize: 2, groupStatus: ['needs-update', 'busy'] })).toEqual(['needs-update', 'busy']);
+ });
+
it('keeps only a sane guest running count', async () => {
const { readProviderShareGuestRunning, scrubSharedProvider } = await import('../providerShareCatalog.js');
expect(scrubSharedProvider({ id: 'anthropic', name: 'Anthropic', guestRunning: 0 }))
diff --git a/packages/device-link/src/providerShareCatalog.ts b/packages/device-link/src/providerShareCatalog.ts
index 65dedb4a3c..49ddba84ae 100644
--- a/packages/device-link/src/providerShareCatalog.ts
+++ b/packages/device-link/src/providerShareCatalog.ts
@@ -16,7 +16,7 @@ export const PROVIDER_SHARE_NEUTRAL_DEVICE_NAME = 'Cindy';
/**
* 分享出去的目录里,供应商建了组时带上组里有几台电脑(`groupSize`):受邀者只知道背后是个组、有几台,
- * 不知道是哪几台。组内电脑的名单(`group`)只给同账号电脑。
+ * 不知道是哪几台;详情可另取匿名状态。组内电脑的名单(`group`)只给同账号电脑。
*/
export const PROVIDER_SHARE_GROUP_SIZE_FIELD = 'groupSize';
const MAX_SHARE_GROUP_SIZE = 512;
@@ -30,6 +30,23 @@ export function readProviderShareGroupSize(provider: unknown): number | null {
: null;
}
+/** 只在分享详情请求时附带匿名状态;普通目录读取不探测组员,避免组之间递归查询。 */
+export const PROVIDER_SHARE_GROUP_STATUS_REQUEST = 'includeSharedGroupStatus';
+export const PROVIDER_SHARE_GROUP_STATUS_FIELD = 'groupStatus';
+export const PROVIDER_SHARE_GROUP_STATES = [
+ 'available', 'busy', 'cooling', 'offline', 'paused', 'unavailable', 'needs-update', 'unknown',
+] as const;
+export type ProviderShareGroupState = typeof PROVIDER_SHARE_GROUP_STATES[number];
+
+/** 顺序对应当前组的顺序,不发送名称、设备标识、来源、运行数或配额。未知状态保留位置。 */
+export function readProviderShareGroupStatus(provider: unknown): ProviderShareGroupState[] | null {
+ const size = readProviderShareGroupSize(provider);
+ if (size === null) return null;
+ const value = (provider as Record<string, unknown>)[PROVIDER_SHARE_GROUP_STATUS_FIELD];
+ if (!Array.isArray(value) || value.length !== size) return null;
+ return Array.from(value, (state) => PROVIDER_SHARE_GROUP_STATES.includes(state) ? state : 'unknown');
+}
+
/**
* 分享出去的目录里,读目录的这个受邀者账号(它的每台电脑)此刻在这个分享上正在运行一轮的任务数
* (`guestRunning`):受邀者把这个分享加进自己的供应商组时,组页面据此显示这台在跑几个。只是调用方
@@ -145,21 +162,24 @@ function accountIdentity(value: unknown): string | undefined {
/**
* 分享出去的一条供应商:去掉分享者的账号身份字段(`subscriptionAccount` / `openAiAccount`,
* 含登录邮箱)并清理名称,地址里的用户名密码与查询参数也去掉;其余展示字段沿用同账号投影。
- * 供应商组摘要(`group`,列着组内电脑)只给同账号电脑,这里也去掉;只留组里有几台(`groupSize`)
- * 与受邀者自己的运行数(`guestRunning`),不合理的值一并去掉;这台电脑上的总运行数(`runningTurns`)含分享者
+ * 供应商组摘要(`group`,列着组内电脑)只给同账号电脑,这里也去掉;只留组里有几台(`groupSize`)、
+ * 匿名状态(`groupStatus`)与受邀者自己的运行数(`guestRunning`),不合理的值一并去掉;这台电脑上的总运行数(`runningTurns`)含分享者
* 本人与其他人的任务,只给同账号电脑,这里去掉。
* 分享者电脑、受邀者电脑与手机都各过一遍。
*/
export function scrubSharedProvider<T>(provider: T): T {
if (!provider || typeof provider !== 'object' || Array.isArray(provider)) return provider;
const groupSize = readProviderShareGroupSize(provider);
+ const groupStatus = readProviderShareGroupStatus(provider);
const guestRunning = readProviderShareGuestRunning(provider);
const { subscriptionAccount, openAiAccount, ...fields } = provider as Record<string, unknown>;
delete fields.group;
delete fields[PROVIDER_RUNNING_TURNS_FIELD];
delete fields[PROVIDER_SHARE_GROUP_SIZE_FIELD];
+ delete fields[PROVIDER_SHARE_GROUP_STATUS_FIELD];
delete fields[PROVIDER_SHARE_GUEST_RUNNING_FIELD];
if (groupSize !== null) fields[PROVIDER_SHARE_GROUP_SIZE_FIELD] = groupSize;
+ if (groupStatus !== null) fields[PROVIDER_SHARE_GROUP_STATUS_FIELD] = groupStatus;
if (guestRunning !== null) fields[PROVIDER_SHARE_GUEST_RUNNING_FIELD] = guestRunning;
const rest = stripNestedUrlSecrets(fields, 0) as Record<string, unknown>;
if (typeof rest.name === 'string') {