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): 精简电脑行并收起未知信息

MagicLizi8050d435d91a
diff --git a/apps/desktop/src/renderer/features/provider-group/GroupMemberVersion.tsx b/apps/desktop/src/renderer/features/provider-group/GroupMemberVersion.tsx
index 7cffc87547..91c54bee51 100644
--- a/apps/desktop/src/renderer/features/provider-group/GroupMemberVersion.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/GroupMemberVersion.tsx
@@ -1,21 +1,34 @@
+import type { ComponentPropsWithoutRef } from 'react';
import { useTranslation } from 'react-i18next';
+import { Tip } from '@/components/ui/tooltip';
+
import type { ProviderGroupMemberStatus } from '../../../shared/providerGroup';
-/** 本机组设置与同账号组详情共用;分享能力不能覆盖主人自己的可用状态。 */
+/** 版本和更新提示并入名称行,未知信息只在悬停说明中展开。 */
export function GroupMemberVersion({ status }: { status: ProviderGroupMemberStatus | undefined }) {
const { t } = useTranslation();
+ const needsUpdate = status?.guestSupport === 'needs-update';
+ if (!status?.appVersion && !needsUpdate) return null;
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 className="inline-flex shrink-0 items-baseline gap-2 text-12 text-[var(--text-tertiary)]">
+ {status?.appVersion && <span>v{status.appVersion}</span>}
+ {needsUpdate && (
+ <span className="text-[var(--warning-fg)]">{t('providerGroup.member.version.updateRequired')}</span>
)}
</span>
);
}
+
+/** 整个名称按钮可悬停或聚焦查看说明,不额外增加按钮或常驻信息行。 */
+export function GroupMemberDetailsButton({ status, ...props }: {
+ status: ProviderGroupMemberStatus | undefined;
+} & ComponentPropsWithoutRef<'button'>) {
+ const { t } = useTranslation();
+ const details = [status?.appVersion
+ ? t('providerGroup.member.version.current', { version: status.appVersion })
+ : t('providerGroup.member.version.unknown')];
+ if (status?.guestSupport === 'needs-update') details.push(t('providerGroup.member.version.needsUpdate'));
+ else if (!status?.guestSupport || status.guestSupport === 'unknown') details.push(t('providerGroup.member.version.supportUnknown'));
+ return <Tip text={status ? details.join(' · ') : null}><button {...props} /></Tip>;
+}
diff --git a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
index 4097c70cd9..beb8e23874 100644
--- a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
@@ -41,7 +41,7 @@ import {
} from '../../../shared/providerGroup';
import { providerShareComputerName, useProviderShareOwnerNameOf } from '../provider-share/providerShareNames';
import { GroupMemberQuota, groupMemberQuotaTarget } from './GroupMemberQuota';
-import { GroupMemberVersion } from './GroupMemberVersion';
+import { GroupMemberDetailsButton, GroupMemberVersion } from './GroupMemberVersion';
import { ProviderGroupAddDialog } from './ProviderGroupAddDialog';
import { useProviderGroup } from './useProviderGroup';
@@ -267,7 +267,8 @@ function MemberRow({
className={cn(!first && 'border-t border-[var(--settings-theme-card-border)]')}
>
<div className="flex flex-wrap items-center gap-3 px-4 py-3">
- <button
+ <GroupMemberDetailsButton
+ status={status}
type="button"
aria-expanded={quotaOpen}
aria-controls={quotaOpen ? quotaId : undefined}
@@ -284,6 +285,7 @@ function MemberRow({
<span className={cn('flex min-w-0 flex-1 flex-col gap-0.5', member.paused && 'opacity-60')}>
<span className="flex flex-wrap items-baseline gap-2 text-13">
<span className="font-medium text-[var(--text-primary)]">{label}</span>
+ <GroupMemberVersion status={status} />
{source && <span className="text-12 text-[var(--text-secondary)]">{source}</span>}
<ChevronRight
aria-hidden="true"
@@ -311,9 +313,8 @@ function MemberRow({
</>
)}
</span>
- <GroupMemberVersion status={status} />
</span>
- </button>
+ </GroupMemberDetailsButton>
<div className="flex shrink-0 items-center gap-1.5">
<Select
label={t('providerGroup.member.limitAria', { name: label })}
diff --git a/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx b/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx
index df0abe2ec1..074eb896af 100644
--- a/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx
@@ -18,7 +18,7 @@ import type {
} from '../../../shared/providerGroup';
import { providerShareComputerName, useProviderShareOwnerNameOf } from '../provider-share/providerShareNames';
import { GroupMemberQuota, groupMemberQuotaTarget } from './GroupMemberQuota';
-import { GroupMemberVersion } from './GroupMemberVersion';
+import { GroupMemberDetailsButton, GroupMemberVersion } from './GroupMemberVersion';
import { memberStatusText } from './ProviderGroupSection';
const REFRESH_INTERVAL_MS = 15_000;
@@ -138,7 +138,8 @@ function MemberRow({
data-unreachable-here={unreachableHere || undefined}
className={cn(!first && 'border-t border-[var(--settings-theme-card-border)]')}
>
- <button
+ <GroupMemberDetailsButton
+ status={status}
type="button"
aria-expanded={quotaOpen}
aria-controls={quotaOpen ? quotaId : undefined}
@@ -154,6 +155,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} />
<span className="text-12 text-[var(--text-secondary)]">{source}</span>
<ChevronRight
aria-hidden="true"
@@ -184,9 +186,8 @@ function MemberRow({
</>
)}
</span>
- <GroupMemberVersion status={status} />
</span>
- </button>
+ </GroupMemberDetailsButton>
{quotaOpen && (
<GroupMemberQuota
id={quotaId}
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
index 94d6b8fc3a..77a1377b75 100644
--- a/apps/desktop/src/renderer/features/provider-group/__tests__/GroupMemberVersion.test.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/__tests__/GroupMemberVersion.test.tsx
@@ -1,5 +1,5 @@
// @vitest-environment jsdom
-import { cleanup, render, screen } from '@testing-library/react';
+import { act, cleanup, render, screen } from '@testing-library/react';
import { createInstance } from 'i18next';
import { I18nextProvider } from 'react-i18next';
import { afterEach, describe, expect, it } from 'vitest';
@@ -11,7 +11,7 @@ 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';
+import { GroupMemberDetailsButton, GroupMemberVersion } from '../GroupMemberVersion';
const catalogs = { en, ja, ko, 'zh-CN': zhCN, 'zh-TW': zhTW };
const status: ProviderGroupMemberStatus = {
@@ -22,21 +22,31 @@ 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) => {
+ ['en', 'Update needed'],
+ ['ja', '更新が必要'],
+ ['ko', '업데이트 필요'],
+ ['zh-CN', '需要更新'],
+ ['zh-TW', '需要更新'],
+ ] as const)('keeps %s rows compact and makes the full diagnosis available on focus', 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();
+ const element = (value: ProviderGroupMemberStatus) => (
+ <I18nextProvider i18n={i18n}>
+ <GroupMemberDetailsButton status={value}>Computer <GroupMemberVersion status={value} /></GroupMemberDetailsButton>
+ </I18nextProvider>
+ );
+ const { rerender } = render(element(status));
+ expect(screen.getByText('v0.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();
+ const row = screen.getByRole('button');
+ expect(row.textContent).not.toContain(catalogs[lang].providerGroup.member.version.needsUpdate);
+ act(() => row.focus());
+ const tooltip = await screen.findByRole('tooltip');
+ expect(tooltip.textContent).toContain(catalogs[lang].providerGroup.member.version.needsUpdate);
+ rerender(element({ ...status, appVersion: undefined, guestSupport: undefined }));
+ expect(row.textContent?.trim()).toBe('Computer');
+ expect(tooltip.textContent).toContain(catalogs[lang].providerGroup.member.version.unknown);
+ expect(tooltip.textContent).toContain(catalogs[lang].providerGroup.member.version.supportUnknown);
});
});
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 52c0a55d27..e1507b71fa 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
@@ -126,8 +126,8 @@ describe('ProviderGroupSection', () => {
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();
+ await screen.findByText('v0.1.103');
+ expect(screen.getByText('providerGroup.member.version.updateRequired')).toBeTruthy();
expect(screen.getByTestId('provider-group-member').getAttribute('data-member-state')).toBe('available');
expect(screen.getByText('providerGroup.member.runningCount:{"count":1}')).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 5e617266e2..dc76a83303 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
@@ -58,17 +58,18 @@ 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();
+ await screen.findByText('v0.1.103');
+ expect(screen.getByText('providerGroup.member.version.updateRequired')).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 () => {
+ it('does not repeat unknown diagnostics in every row 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();
+ await screen.findByText('providerGroup.member.runningCount:{"count":2}');
+ expect(screen.queryByText('providerGroup.member.version.unknown')).toBeNull();
+ expect(screen.queryByText('providerGroup.member.version.supportUnknown')).toBeNull();
+ expect(screen.queryByText('providerGroup.member.version.updateRequired')).toBeNull();
});
it('says this computer cannot reach a computer the group computer still sees as usable', async () => {
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index cc9e4d0d18..53762e534a 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -482,6 +482,7 @@
"local": "This Computer",
"version": {
"current": "Cindy {{version}}",
+ "updateRequired": "Update needed",
"unknown": "Version unknown",
"needsUpdate": "Update needed to receive shared tasks",
"supportUnknown": "Shared-task compatibility unknown"
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 3a7019953d..b89303c203 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -479,6 +479,7 @@
"local": "このパソコン",
"version": {
"current": "Cindy {{version}}",
+ "updateRequired": "更新が必要",
"unknown": "バージョン不明",
"needsUpdate": "共有されたタスクを受け取るには更新が必要",
"supportUnknown": "共有タスクへの対応状況は不明"
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 6dac39c4e1..7770afa1aa 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -479,6 +479,7 @@
"local": "이 컴퓨터",
"version": {
"current": "Cindy {{version}}",
+ "updateRequired": "업데이트 필요",
"unknown": "버전 확인 안 됨",
"needsUpdate": "공유받은 작업을 실행하려면 업데이트 필요",
"supportUnknown": "공유 작업 호환성 확인 안 됨"
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 56adbf27a5..f732260500 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -479,6 +479,7 @@
"local": "本机",
"version": {
"current": "Cindy {{version}}",
+ "updateRequired": "需要更新",
"unknown": "版本未知",
"needsUpdate": "需要更新才能接收分享任务",
"supportUnknown": "分享任务兼容性未知"
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 d9dfe663b1..73848aa842 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -479,6 +479,7 @@
"local": "本機",
"version": {
"current": "Cindy {{version}}",
+ "updateRequired": "需要更新",
"unknown": "版本未知",
"needsUpdate": "需要更新才能接收分享任務",
"supportUnknown": "分享任務相容性未知"
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 530ae6b2f4..e0c815b404 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -979,7 +979,7 @@ G 重新打开时换一台。G 与 O 之间新增四项可选内容,O 与 M
普通状态与任务分配不增加能力探测,不修改实际分配、冷却或权限。单台查询最多等 3 秒,失败或超时为未知。
- 成员状态可选携带 appVersion(不超过 64 字符的应用版本)与 guestSupport(supported / needs-update / unknown)。
本机版本由应用提供,同账号设备版本复用设备目录;分享来源没有版本则省略。能力按真实声明判断,不按版本号猜测。
-- 新端白名单解析;旧组所在电脑忽略选项、未带字段时显示未知,旧控制端忽略新增字段。
+- 新端白名单解析;旧组所在电脑忽略选项、未带字段时不推断版本或兼容状态,未知信息放在悬停说明里,旧控制端忽略新增字段。
成员信息仍只对同账号可读,受邀者匿名状态数组不携带这些字段。异步查询期间换账号或撤销远程调用权限后丢弃回包。
没有新 channel、服务器改动或数据库迁移。回归覆盖目录、组状态、同账号请求解析及本机和远程两处界面。
diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.md
index 8a4bbec34b..d552a9e480 100644
--- a/docs/product-rules/provider-groups.md
+++ b/docs/product-rules/provider-groups.md
@@ -438,12 +438,14 @@
3. **分享**:生成分享链接、待处理、已分享的人(按人用量已移到「用量」块,这里只管分享本身)。
未开启「允许被远程调用」时,这一块置灰并说明先开启哪一级(供应商分享 §3)。
- **自己的组显示版本与分享兼容提示**(2026-10-12 用户裁决):建组电脑的设置页、同账号另一台电脑查看组的只读详情,
- 都在状态下显示 Cindy 应用版本。本机使用当前应用版本,同账号电脑使用设备目录最近上报的版本;离线时版本不代表已重新确认。
- 分享来源或旧端未提供版本时显示「版本未知」,不拿协议版本代替。
- - 详情按需核对能否接收分享任务;缺少必要能力时提示「需要更新才能接收分享任务」,不覆盖主人自己的空闲、运行中等状态。
- 这里不是检查有没有更新发布,也不意味着主人不能使用该电脑。读取失败或旧组所在电脑未提供能力时显示兼容性未知。
+ 默认两行展示:名称行附上简短版本号,下一行显示运行状态,不为版本另占第三行。本机使用当前应用版本,
+ 同账号电脑使用设备目录最近上报的版本;离线时版本不代表已重新确认。分享来源或旧端未提供版本时不常驻「版本未知」,
+ 未知信息收进名称按钮的悬停/键盘聚焦说明,不拿协议版本代替(2026-10-12 用户反馈三行文字过多)。
+ - 详情按需核对能否接收分享任务;仅确定缺少必要能力时在名称行显示「需要更新」,完整原因在悬停说明中,
+ 不覆盖主人自己的空闲、运行中等状态。这里不是检查有没有更新发布,也不意味着主人不能使用该电脑。
+ 读取失败或旧组所在电脑未提供能力时,只在悬停说明中显示兼容性未知,不逐行重复常驻。
- 只读能力探测每台最多等待 3 秒,同一次请求按电脑合并;普通状态查询与任务分配不增加探测,不修改冷却与分配。
-- **组内电脑一行的结构对所有来源一致**,右侧才能真正成列:设备图标 → 名称与来源 → 状态与版本行 →
+- **组内电脑一行的结构对所有来源一致**,右侧才能真正成列:设备图标 → 名称、版本与来源 → 状态行 →
并发上限(按权重时多一个权重)→ 参与分配开关 → 行内 `···` 菜单。三条由此固定:
- **参与分配只有一种控件。** `paused` 是同一个布尔值,本机与远程都用开关表达,不按来源分叉成
「开关 / 暂停分配按钮」两套;暂停后的含义由状态行文字说明,不另弹 toast。