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(desktop): 供应商组每行都报负载,别只在跑着时才显示

MagicLizia76050239143
diff --git a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
index 2b8bb08a09..2bc77ac683 100644
--- a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
@@ -240,6 +240,10 @@ function MemberRow({
: t('providerGroup.member.sourceShare', { name: status?.ownerName ?? '' });
const ready = status?.state === 'available' || status?.state === 'full';
const running = status?.running ?? 0;
+ // 能用的时候状态词本身就报负载(「空闲」/「N 个任务运行中」),所以每行永远看得出这台现在跑了几个;
+ // 「已满」等于跑满上限,上限就在旁边的下拉里,不必再报一遍数。其余状态(冷却、不在线、已暂停)
+ // 上面可能还有在跑的任务,补一段运行数。
+ const appendRunning = running > 0 && status != null && status.state !== 'available' && status.state !== 'full';
return (
<div
data-testid="provider-group-member"
@@ -267,9 +271,9 @@ function MemberRow({
className="h-1.5 w-1.5 shrink-0 rounded-full"
style={{ background: ready ? 'var(--remote-status-ready)' : 'var(--remote-status-disconnected)' }}
/>
- <span>{memberStatusText(t, status, i18n.language)}</span>
{/* 运行数是状态,上限是设置:各说一次,不再出现「0 / 10」与下拉里重复同一个上限。 */}
- {running > 0 && (
+ <span>{memberStatusText(t, status, i18n.language)}</span>
+ {appendRunning && (
<>
<span aria-hidden="true">·</span>
<span className="[font-variant-numeric:tabular-nums]">
@@ -341,7 +345,10 @@ function memberStatusText(
if (!status) return t('providerGroup.member.status.checking');
switch (status.state) {
case 'available':
- return t('providerGroup.member.status.available');
+ // 「可用」不报负载,整列空着时就看不出每台跑了几个;状态词直接承载运行数。
+ return status.running > 0
+ ? t('providerGroup.member.runningCount', { count: status.running })
+ : t('providerGroup.member.status.idle');
case 'full':
return t('providerGroup.member.status.full');
case 'paused':
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 6c1324e6ce..a9ff864528 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
@@ -54,6 +54,8 @@ const MINI = {
};
let stored: ProviderGroupConfig | null = null;
+/** 按 member key 覆盖「正在运行」的台数;不设时本机 1、其余 0。 */
+let running: Record<string, number> | null = null;
const command = vi.fn();
function viewOf(config: ProviderGroupConfig | null): ProviderGroupView {
@@ -65,7 +67,7 @@ function viewOf(config: ProviderGroupConfig | null): ProviderGroupView {
kind: m.kind,
label: m.kind === 'local' ? 'Home Mac Studio' : m.label ?? m.key,
state: m.paused ? 'paused' : m.kind === 'local' ? 'available' : 'cooling',
- running: m.kind === 'local' ? 1 : 0,
+ running: running?.[m.key] ?? (m.kind === 'local' ? 1 : 0),
limit: m.limit,
weight: m.weight,
paused: m.paused,
@@ -76,6 +78,7 @@ function viewOf(config: ProviderGroupConfig | null): ProviderGroupView {
beforeEach(() => {
stored = null;
+ running = null;
confirmSpy.mockClear();
command.mockReset();
command.mockImplementation(async (cmd: { action: string; config?: ProviderGroupConfig }) => {
@@ -140,6 +143,16 @@ describe('ProviderGroupSection', () => {
await waitFor(() => expect(stored?.members[1].paused).toBe(true));
});
+ it('says idle instead of staying silent when a computer is available with nothing running', async () => {
+ running = { local: 0 };
+ stored = { strategy: 'least', autoSwitch: true, members: [LOCAL] };
+ render(<ProviderGroupSection providerId="anthropic" providerName="Anthropic" />);
+ const rows = await screen.findAllByTestId('provider-group-member');
+ // 每行都要报负载:跑 0 个时说「空闲」,不是什么都不显示。
+ expect(within(rows[0]).getByText('providerGroup.member.status.idle')).toBeTruthy();
+ expect(within(rows[0]).queryByText(/providerGroup\.member\.runningCount/)).toBeNull();
+ });
+
it('changes the group strategy and turns automatic switching off', async () => {
stored = { strategy: 'least', autoSwitch: true, members: [LOCAL, MINI] };
render(<ProviderGroupSection providerId="anthropic" providerName="Anthropic" />);
diff --git a/apps/desktop/src/renderer/i18n/locales/en/common.json b/apps/desktop/src/renderer/i18n/locales/en/common.json
index e8c564c07c..51dda2b07e 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -454,7 +454,7 @@
"remove": "Remove from Group",
"status": {
"checking": "Checking…",
- "available": "Available",
+ "idle": "Idle",
"full": "Full",
"paused": "Assignments paused",
"cooling": "Cooling down",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 11cbb2ae47..852d612831 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -449,7 +449,7 @@
"remove": "グループから外す",
"status": {
"checking": "確認中…",
- "available": "利用可能",
+ "idle": "待機中",
"full": "上限に到達",
"paused": "割り当て停止中",
"cooling": "クールダウン中",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 894d343063..1e29a12a95 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -449,7 +449,7 @@
"remove": "그룹에서 제외",
"status": {
"checking": "확인 중…",
- "available": "사용 가능",
+ "idle": "대기 중",
"full": "한도 도달",
"paused": "배정 일시 중지됨",
"cooling": "대기 중",
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 b6b9a986ff..147c087cb6 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -449,7 +449,7 @@
"remove": "移出组",
"status": {
"checking": "正在检查…",
- "available": "可用",
+ "idle": "空闲",
"full": "已满",
"paused": "已暂停分配",
"cooling": "冷却中",
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 9e2f8841f7..006e8aca54 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -449,7 +449,7 @@
"remove": "移出組",
"status": {
"checking": "正在檢查…",
- "available": "可用",
+ "idle": "空閒",
"full": "已滿",
"paused": "已暫停分配",
"cooling": "冷卻中",
diff --git a/docs/design-previews/provider-groups/index.html b/docs/design-previews/provider-groups/index.html
index 2dd3719770..382e65ec23 100644
--- a/docs/design-previews/provider-groups/index.html
+++ b/docs/design-previews/provider-groups/index.html
@@ -625,9 +625,10 @@
/* ---------- 模拟数据 ---------- */
let hasGroup = true;
const members = [
- { id: 'self', name: '本机', sub: 'Home Mac Studio', state: 'on', running: 1, limit: 4, status: '可用' },
- { id: 'mbp', name: "Lizi's MacBook Pro", sub: '我的其他电脑', state: 'on', running: 0, limit: 4, status: '可用' },
- { id: 'mini', name: "Magi's Mac Mini", sub: '来自 Magi 的分享', state: 'on', running: 2, limit: 4, status: '可用' },
+ /* state 为 on 时状态词由运行数决定(空闲 / N 个任务运行中),不再单独写「可用」。 */
+ { id: 'self', name: '本机', sub: 'Home Mac Studio', state: 'on', running: 1, limit: 4 },
+ { id: 'mbp', name: "Lizi's MacBook Pro", sub: '我的其他电脑', state: 'on', running: 0, limit: 4 },
+ { id: 'mini', name: "Magi's Mac Mini", sub: '来自 Magi 的分享', state: 'on', running: 2, limit: 4 },
{ id: 'pc', name: 'Studio-PC', sub: '来自 Kai 的分享', state: 'cool', running: 0, limit: 4, status: '冷却中 · 撞到用量上限,约 15:20 恢复' },
{ id: 'imac', name: 'Office-iMac', sub: '来自 王一 的分享', state: 'off', running: 0, limit: 2, status: '不在线' },
];
@@ -673,7 +674,11 @@
$('#member-count').textContent = members.length + ' 台';
$('#members').innerHTML = members.map((m) => {
const dot = m.state === 'on' ? '<span class="d"></span>' : '<span class="d gray"></span>';
- const run = m.running > 0 ? ` · <span class="run">${m.running} 个任务运行中</span>` : '';
+ // 状态词本身报负载:每行永远看得出这台现在跑了几个,不靠「>0 才显示」去推断。
+ const run = `<span class="run">${m.running} 个任务运行中</span>`;
+ const load = m.state === 'on'
+ ? (m.running > 0 ? run : '空闲')
+ : `${m.status}${m.running > 0 ? ` · ${run}` : ''}`;
// 参与分配对所有来源都是同一个开关(同一个 paused 布尔值),不按来源分叉成「开关 / 暂停分配按钮」。
// 「移出组」罕用且不可逆,收进行内 ··· 菜单;本机不能移出,留等宽占位。
const more = m.id === 'self'
@@ -684,7 +689,7 @@
<span class="avatar" aria-hidden="true">${monitor}</span>
<div class="who">
<div class="line1">${m.name} <span class="src">${m.sub}</span></div>
- <div class="line2"><span class="status">${dot}${m.status}</span>${run}</div>
+ <div class="line2"><span class="status">${dot}${load}</span></div>
</div>
<div class="actions">
<span class="sel">上限 ${m.limit}${chevron}</span>
diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.md
index 98a55d720f..e5cec37d29 100644
--- a/docs/product-rules/provider-groups.md
+++ b/docs/product-rules/provider-groups.md
@@ -211,6 +211,8 @@
- **参与分配只有一种控件。** `paused` 是同一个布尔值,本机与远程都用开关表达,不按来源分叉成
「开关 / 暂停分配按钮」两套;暂停后的含义由状态行文字说明,不另弹 toast。
- **运行数是状态,上限是设置。** 运行数只出现在状态行,上限只出现在下拉里,同一个数字不在一行里说两遍。
+ **能用时状态词本身报负载**:跑 0 个说「空闲」,跑了就说「{N} 个任务运行中」,不写「可用」——
+ 否则组里都空着时整列没有数字,看不出每台在跑几个。「已满」等于跑满上限,不再重复报数。
- **「移出组」收进 `···` 菜单**(与供应商详情头的供应商级菜单同模式)。本机不能移出(§3),
该位置留等宽占位以保持列宽。
- **添加电脑**:弹窗分「已经能用的」与「分享链接」两页:前者把你的其他电脑和别人分享给你的放在同一个列表里勾选;分享链接沿用申请与配对码流程,