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。

fix(provider-groups): 从查看端设备目录补充电脑版本

MagicLizi79b9fc5299fb
diff --git a/apps/desktop/src/renderer/features/provider-group/GroupMemberVersion.tsx b/apps/desktop/src/renderer/features/provider-group/GroupMemberVersion.tsx
index 91c54bee51..c5eed11878 100644
--- a/apps/desktop/src/renderer/features/provider-group/GroupMemberVersion.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/GroupMemberVersion.tsx
@@ -5,8 +5,10 @@ import { Tip } from '@/components/ui/tooltip';
import type { ProviderGroupMemberStatus } from '../../../shared/providerGroup';
+type VersionStatus = Pick<ProviderGroupMemberStatus, 'appVersion' | 'guestSupport'>;
+
/** 版本和更新提示并入名称行,未知信息只在悬停说明中展开。 */
-export function GroupMemberVersion({ status }: { status: ProviderGroupMemberStatus | undefined }) {
+export function GroupMemberVersion({ status }: { status: VersionStatus | undefined }) {
const { t } = useTranslation();
const needsUpdate = status?.guestSupport === 'needs-update';
if (!status?.appVersion && !needsUpdate) return null;
@@ -22,7 +24,7 @@ export function GroupMemberVersion({ status }: { status: ProviderGroupMemberStat
/** 整个名称按钮可悬停或聚焦查看说明,不额外增加按钮或常驻信息行。 */
export function GroupMemberDetailsButton({ status, ...props }: {
- status: ProviderGroupMemberStatus | undefined;
+ status: VersionStatus | undefined;
} & ComponentPropsWithoutRef<'button'>) {
const { t } = useTranslation();
const details = [status?.appVersion
diff --git a/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx b/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx
index 074eb896af..4b6dcd65af 100644
--- a/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx
@@ -8,8 +8,10 @@ import { useCallback, useEffect, useId, useRef, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { useOptionalAuthDeviceId } from '@/contexts/AuthContext';
+import { getDataOwnerGeneration, isDataOwnerGenerationCurrent } from '@/contexts/dataOwnerGeneration';
import { cn } from '@/lib/utils';
+import { readProviderGroupAppVersion } from '../../../shared/providerGroup';
import type {
ProviderGroupConfig,
ProviderGroupMember,
@@ -25,24 +27,45 @@ const REFRESH_INTERVAL_MS = 15_000;
function useRemoteProviderGroupView(deviceId: string, providerId: string) {
const [view, setView] = useState<ProviderGroupView | null>(null);
+ const [versions, setVersions] = useState<ReadonlyMap<string, string>>(() => new Map());
const [failed, setFailed] = useState(false);
const seq = useRef(0);
const reload = useCallback(async () => {
const current = ++seq.current;
+ const owner = getDataOwnerGeneration();
+ const canApply = () => current === seq.current && isDataOwnerGenerationCurrent(owner);
+ // 旧组所在电脑不回 appVersion;查看端已有的同账号设备目录仍能提供版本。
+ // 与状态独立读取,设备目录慢或失败时不挡住组状态,也不为此增加一套轮询。
+ const readVersions = async () => {
+ try {
+ const { devices } = await window.electronAPI.deviceLink.listDevices();
+ if (!canApply()) return;
+ const next = new Map<string, string>();
+ for (const device of devices) {
+ const version = readProviderGroupAppVersion(device.appVersion);
+ if (version) next.set(device.deviceId, version);
+ }
+ setVersions(next);
+ } catch {
+ if (canApply()) setVersions(new Map());
+ }
+ };
+ void readVersions();
try {
const next = await window.electronAPI.providerGroup.command({ action: 'remote-view', deviceId, providerId });
- if (current !== seq.current) return;
+ if (!canApply()) return;
setView(next);
setFailed(false);
} catch {
- if (current !== seq.current) return;
+ if (!canApply()) return;
setFailed(true);
}
}, [deviceId, providerId]);
useEffect(() => {
setView(null);
+ setVersions(new Map());
setFailed(false);
void reload();
const timer = window.setInterval(() => void reload(), REFRESH_INTERVAL_MS);
@@ -52,7 +75,7 @@ function useRemoteProviderGroupView(deviceId: string, providerId: string) {
};
}, [reload]);
- return { view, failed };
+ return { view, versions, failed };
}
export function RemoteProviderGroupMembers({
@@ -66,7 +89,7 @@ export function RemoteProviderGroupMembers({
config: ProviderGroupConfig;
}) {
const { t } = useTranslation();
- const { view, failed } = useRemoteProviderGroupView(deviceId, providerId);
+ const { view, versions, failed } = useRemoteProviderGroupView(deviceId, providerId);
const members = view?.config?.members ?? config.members;
return (
<section
@@ -83,6 +106,9 @@ export function RemoteProviderGroupMembers({
key={member.key}
member={member}
status={view?.members.find((m) => m.key === member.key)}
+ // local 指组所在电脑,不是查看端;分享来源不能按同账号设备查版本。
+ appVersion={member.kind === 'local' ? versions.get(deviceId)
+ : member.kind === 'device' && member.agentDeviceId ? versions.get(member.agentDeviceId) : undefined}
first={index === 0}
ownerDeviceId={deviceId}
/>
@@ -100,11 +126,13 @@ export function RemoteProviderGroupMembers({
function MemberRow({
member,
status,
+ appVersion,
first,
ownerDeviceId,
}: {
member: ProviderGroupMember;
status: ProviderGroupMemberStatus | undefined;
+ appVersion?: string;
first: boolean;
/** 组所在电脑:组里的「组所在电脑自己」读它的账号额度。 */
ownerDeviceId: string;
@@ -131,6 +159,7 @@ function MemberRow({
const [quotaOpen, setQuotaOpen] = useState(false);
const quotaId = useId();
const selfDeviceId = useOptionalAuthDeviceId();
+ const versionStatus = appVersion ? { ...status, appVersion } : status;
return (
<div
data-testid="remote-provider-group-member"
@@ -139,7 +168,7 @@ function MemberRow({
className={cn(!first && 'border-t border-[var(--settings-theme-card-border)]')}
>
<GroupMemberDetailsButton
- status={status}
+ status={versionStatus}
type="button"
aria-expanded={quotaOpen}
aria-controls={quotaOpen ? quotaId : undefined}
@@ -155,7 +184,7 @@ function MemberRow({
<span className={cn('flex min-w-0 flex-1 flex-col gap-0.5', member.paused && 'opacity-60')}>
<span className="flex min-w-0 flex-wrap items-baseline gap-2 text-13">
<span className="truncate font-medium text-[var(--text-primary)]">{label}</span>
- <GroupMemberVersion status={status} />
+ <GroupMemberVersion status={versionStatus} />
<span className="text-12 text-[var(--text-secondary)]">{source}</span>
<ChevronRight
aria-hidden="true"
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 dc76a83303..b2d9a20540 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
@@ -3,10 +3,11 @@
* 另一台电脑上的供应商组(只读):组所在电脑看它能用、这台电脑却连不上的组内电脑,不显示成能用
* (provider-groups.md §10)。
*/
-import { cleanup, render, screen, waitFor } from '@testing-library/react';
-import { afterEach, describe, expect, it, vi } from 'vitest';
+import { act, cleanup, render, screen, waitFor, within } from '@testing-library/react';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import type { ProviderGroupConfig, ProviderGroupView } from '../../../../shared/providerGroup';
+import { setDataOwnerGeneration } from '@/contexts/dataOwnerGeneration';
import { RemoteProviderGroupMembers } from '../RemoteProviderGroupMembers';
vi.mock('react-i18next', () => ({
@@ -38,24 +39,139 @@ const VM = {
paused: false,
};
const CONFIG: ProviderGroupConfig = { strategy: 'least', autoSwitch: true, members: [VM] };
+type DeviceVersions = { devices: Array<{ deviceId: string; appVersion: string | null }> };
-function mountWith(status: Partial<ProviderGroupView['members'][number]>) {
+function deferred<T>() {
+ let resolve!: (value: T) => void;
+ const promise = new Promise<T>((done) => { resolve = done; });
+ return { promise, resolve };
+}
+
+function mountWith(
+ status: Partial<ProviderGroupView['members'][number]>,
+ options: {
+ config?: ProviderGroupConfig;
+ devices?: DeviceVersions['devices'];
+ readDevices?: () => Promise<DeviceVersions>;
+ readView?: () => Promise<ProviderGroupView>;
+ } = {},
+) {
+ const { config = CONFIG, devices = [] } = options;
const view: ProviderGroupView = {
providerId: 'anthropic',
- config: CONFIG,
- members: [{ key: VM.key, kind: 'device', label: VM.label, state: 'available', running: 2, limit: 4, weight: 1, paused: false, ...status }],
+ config,
+ members: config.members.map((member) => ({
+ ...member, label: member.label ?? member.key, state: 'available', running: 2, ...status,
+ })),
};
- const command = vi.fn(async () => view);
- Object.assign(window, { electronAPI: { providerGroup: { command } } });
- render(<RemoteProviderGroupMembers deviceId="mini" providerId="anthropic" config={CONFIG} />);
- return command;
+ const command = vi.fn(options.readView ?? (async () => view));
+ const listDevices = vi.fn(options.readDevices ?? (async () => ({ devices })));
+ Object.assign(window, { electronAPI: { providerGroup: { command }, deviceLink: { listDevices } } });
+ const mounted = render(<RemoteProviderGroupMembers deviceId="mini" providerId="anthropic" config={config} />);
+ return { command, listDevices, ...mounted };
}
+beforeEach(() => setDataOwnerGeneration('owner-a', 1));
+
afterEach(() => {
cleanup();
+ vi.useRealTimers();
});
describe('RemoteProviderGroupMembers', () => {
+ it('reads versions from this computer’s device directory when an older group host omits them', async () => {
+ const config: ProviderGroupConfig = { ...CONFIG, members: [
+ { ...VM, key: 'local:anthropic', kind: 'local', agentDeviceId: null, label: 'Group host' },
+ VM,
+ { ...VM, key: 'device:self:anthropic', agentDeviceId: 'self', label: 'This computer' },
+ { ...VM, key: 'share:guest:anthropic', kind: 'share', agentDeviceId: 'share:guest', label: 'Shared computer' },
+ ] };
+ mountWith({}, { config, devices: [
+ { deviceId: 'mini', appVersion: '0.1.104-beta' },
+ { deviceId: 'vm', appVersion: '0.1.103' },
+ { deviceId: 'self', appVersion: '0.1.105' },
+ // A share identifier must never be interpreted as a same-account device.
+ { deviceId: 'share:guest', appVersion: '9.9.9' },
+ ] });
+ await screen.findByText('v0.1.104-beta');
+ const rows = screen.getAllByTestId('remote-provider-group-member');
+ expect(within(rows[0]).getByText('v0.1.104-beta')).toBeTruthy();
+ expect(within(rows[1]).getByText('v0.1.103')).toBeTruthy();
+ expect(within(rows[2]).getByText('v0.1.105')).toBeTruthy();
+ expect(within(rows[3]).queryByText('v9.9.9')).toBeNull();
+ expect(screen.queryByText('providerGroup.member.version.updateRequired')).toBeNull();
+ expect(rows.every((row) => row.getAttribute('data-member-state') === 'available')).toBe(true);
+ });
+
+ it('keeps group status visible while the device directory is slow', async () => {
+ const pending = deferred<DeviceVersions>();
+ mountWith({}, { readDevices: () => pending.promise });
+ await screen.findByText('providerGroup.member.runningCount:{"count":2}');
+ expect(screen.queryByText('v0.1.103')).toBeNull();
+ await act(async () => pending.resolve({ devices: [{ deviceId: 'vm', appVersion: '0.1.103' }] }));
+ expect(screen.getByText('v0.1.103')).toBeTruthy();
+ });
+
+ it('shows the directory version even before the group status arrives', async () => {
+ mountWith({}, {
+ readView: () => new Promise(() => undefined),
+ devices: [{ deviceId: 'vm', appVersion: '0.1.103' }],
+ });
+ await screen.findByText('v0.1.103');
+ expect(screen.getByTestId('remote-provider-group-member').getAttribute('data-member-state')).toBe('loading');
+ });
+
+ it('preserves the group host’s version and state when the directory request fails', async () => {
+ mountWith({ appVersion: '0.1.104', guestSupport: 'supported' }, {
+ readDevices: async () => { throw new Error('Directory unavailable'); },
+ });
+ await screen.findByText('v0.1.104');
+ expect(screen.getByText('providerGroup.member.runningCount:{"count":2}')).toBeTruthy();
+ expect(screen.queryByText('settings.providers.remote.groupMembersFailed')).toBeNull();
+ });
+
+ it('refreshes an offline computer’s reported version and drops invalid or no-longer-reported versions', async () => {
+ vi.useFakeTimers();
+ const { listDevices } = mountWith({ state: 'offline', running: 0 }, {
+ devices: [{ deviceId: 'vm', appVersion: '0.1.103' }],
+ });
+ await act(async () => { await Promise.resolve(); });
+ expect(screen.getByText('v0.1.103')).toBeTruthy();
+ listDevices.mockResolvedValue({ devices: [{ deviceId: 'vm', appVersion: '0.1.104-beta' }] });
+ await act(async () => vi.advanceTimersByTimeAsync(15_000));
+ expect(screen.getByText('v0.1.104-beta')).toBeTruthy();
+ expect(screen.queryByText('v0.1.103')).toBeNull();
+ expect(screen.getByTestId('remote-provider-group-member').getAttribute('data-member-state')).toBe('offline');
+ listDevices.mockResolvedValue({ devices: [{ deviceId: 'vm', appVersion: 'invalid version' }] });
+ await act(async () => vi.advanceTimersByTimeAsync(15_000));
+ expect(screen.queryByText('v0.1.104-beta')).toBeNull();
+ expect(screen.queryByText('vinvalid version')).toBeNull();
+ listDevices.mockResolvedValue({ devices: [] });
+ await act(async () => vi.advanceTimersByTimeAsync(15_000));
+ expect(screen.queryByText('providerGroup.member.version.unknown')).toBeNull();
+ });
+
+ it('does not apply versions fetched for a previous account', async () => {
+ const pending = deferred<DeviceVersions>();
+ mountWith({}, { readDevices: () => pending.promise });
+ await screen.findByText('providerGroup.member.runningCount:{"count":2}');
+ setDataOwnerGeneration('owner-b', 2);
+ await act(async () => pending.resolve({ devices: [{ deviceId: 'vm', appVersion: '0.1.103' }] }));
+ expect(screen.queryByText('v0.1.103')).toBeNull();
+ });
+
+ it('discards a late directory response after switching to a different group', async () => {
+ const pending = deferred<DeviceVersions>();
+ const { listDevices, rerender } = mountWith({}, { readDevices: () => pending.promise });
+ await screen.findByText('providerGroup.member.runningCount:{"count":2}');
+ listDevices.mockResolvedValue({ devices: [{ deviceId: 'vm', appVersion: '0.1.104' }] });
+ rerender(<RemoteProviderGroupMembers deviceId="other" providerId="anthropic" config={CONFIG} />);
+ await screen.findByText('v0.1.104');
+ await act(async () => pending.resolve({ devices: [{ deviceId: 'vm', appVersion: '0.1.103' }] }));
+ expect(screen.getByText('v0.1.104')).toBeTruthy();
+ expect(screen.queryByText('v0.1.103')).toBeNull();
+ });
+
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('v0.1.103');
diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.md
index d552a9e480..16b787c1b2 100644
--- a/docs/product-rules/provider-groups.md
+++ b/docs/product-rules/provider-groups.md
@@ -441,6 +441,8 @@
默认两行展示:名称行附上简短版本号,下一行显示运行状态,不为版本另占第三行。本机使用当前应用版本,
同账号电脑使用设备目录最近上报的版本;离线时版本不代表已重新确认。分享来源或旧端未提供版本时不常驻「版本未知」,
未知信息收进名称按钮的悬停/键盘聚焦说明,不拿协议版本代替(2026-10-12 用户反馈三行文字过多)。
+ - 同账号远程组详情同时从查看端的现有设备目录读取版本,不要求组所在电脑先升级才能显示。按设备 ID 对应:
+ 组里的本机项指组所在电脑,其余同账号项指各自设备;分享来源不补版本。设备目录失败不阻塞组状态,仍可使用组所在电脑已提供的版本。
- 详情按需核对能否接收分享任务;仅确定缺少必要能力时在名称行显示「需要更新」,完整原因在悬停说明中,
不覆盖主人自己的空闲、运行中等状态。这里不是检查有没有更新发布,也不意味着主人不能使用该电脑。
读取失败或旧组所在电脑未提供能力时,只在悬停说明中显示兼容性未知,不逐行重复常驻。