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-group): remove collapsed member quota pace bars

MagicLizife4ac16c9eca
diff --git a/apps/desktop/src/main/provider-group/router.ts b/apps/desktop/src/main/provider-group/router.ts
index d3bcae3159..865d99d87d 100644
--- a/apps/desktop/src/main/provider-group/router.ts
+++ b/apps/desktop/src/main/provider-group/router.ts
@@ -374,7 +374,7 @@ export function createProviderGroupRouter(deps: ProviderGroupRouterDeps): Provid
weight: r.member.weight,
paused: r.member.paused,
...(until !== null ? { coolingUntil: until } : {}),
- // 与选电脑排序用的同一个窗口(provider-groups.md §10 进度条);分享来的电脑本来就不读配额。
+ // 与选电脑排序用的同一个窗口,同账号电脑据此提议任务进行中换号(provider-groups.md §6.2);分享来的电脑本来就不读配额。
...(quota.quota ? { quota: quota.quota } : {}),
...(quota.quota && quota.fiveHourTight ? { fiveHourTight: true as const } : {}),
};
diff --git a/apps/desktop/src/main/provider-group/usage.ts b/apps/desktop/src/main/provider-group/usage.ts
index 8bdbde2dad..281594000b 100644
--- a/apps/desktop/src/main/provider-group/usage.ts
+++ b/apps/desktop/src/main/provider-group/usage.ts
@@ -79,7 +79,7 @@ export function providerGroupRebalanceTarget(
}
/**
- * 几个窗口取最不急的那个(也是设置页进度条画的那个):一个窗口已经用得太快,就不再催这台。有一个读不到就整台读不到。
+ * 几个窗口取最不急的那个:一个窗口已经用得太快,就不再催这台。有一个读不到就整台读不到。
*/
function paceOf(
windows: readonly ProviderGroupMemberQuota[],
@@ -94,7 +94,7 @@ function paceOf(
return pace;
}
-/** 排序用的急不急,加上设置页进度条画的那个窗口;读不到时两者都是 null。 */
+/** 排序用的急不急,加上算出它的那个窗口;读不到时两者都是 null。 */
function paceState(windows: readonly ProviderGroupMemberQuota[] | null, now: number) {
const pace = windows ? paceOf(windows, now) : null;
return { urgency: pace?.urgency ?? null, quota: pace?.window ?? null };
diff --git a/apps/desktop/src/renderer/features/provider-group/GroupMemberPace.tsx b/apps/desktop/src/renderer/features/provider-group/GroupMemberPace.tsx
deleted file mode 100644
index ca6e96fdd2..0000000000
--- a/apps/desktop/src/renderer/features/provider-group/GroupMemberPace.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * 组内电脑行里的配额进度条(docs/product-rules/provider-groups.md §10,2026-10-21 用户要求:一眼看出各账号
- * 是不是在平均地用):已用多少、按时间这时候该用到哪(竖线)、多久后重置。数字是组所在电脑选电脑时排序用的
- * 同一个窗口,不另读那台电脑。
- *
- * 这一行整个是展开详情的按钮:按钮里只能放行内元素,所以条用 span 画、对读屏隐藏,数字由旁边的文字说出来。
- * 颜色与 QuotaBar 同一套额度条 token 和预警分级。
- */
-import { useTranslation } from 'react-i18next';
-
-import { quotaSeverity } from '@/components/status/QuotaBar';
-import { formatQuotaResetCountdown } from '@/components/status/usageCardModel';
-import { cn } from '@/lib/utils';
-
-import type { ProviderGroupMemberQuota } from '../../../shared/providerGroup';
-
-const FILL = {
- normal: 'bg-[var(--quota-bar-fill)]',
- warn: 'bg-[var(--quota-bar-warn)]',
- crit: 'bg-[var(--quota-bar-crit)]',
-} as const;
-
-/** 跟在状态行后面(前面由调用方放分隔点);几段各自换行,窄的时候不撑破这一行。 */
-export function GroupMemberPace({ quota, nowMs = Date.now() }: { quota: ProviderGroupMemberQuota; nowMs?: number }) {
- const { t } = useTranslation();
- const used = Math.round(quota.usedPercent);
- // 还没开始计时的窗口没有「该用到哪」,也没有重置时间。
- const expected = quota.resetAtMs === null
- ? null
- : Math.round(Math.min(100, Math.max(0, (1 - (quota.resetAtMs - nowMs) / quota.windowMs) * 100)));
- const reset = quota.resetAtMs === null ? null : formatQuotaResetCountdown(quota.resetAtMs / 1000, nowMs, t);
- const text = expected === null
- ? t('providerGroup.member.pace.used', { used })
- : t('providerGroup.member.pace.usedExpected', { used, expected });
- return (
- <>
- <span data-testid="provider-group-member-pace" className="inline-flex items-center gap-1.5 [font-variant-numeric:tabular-nums]">
- <span aria-hidden="true" className="relative inline-flex items-center">
- <span className="inline-flex h-[5px] w-12 overflow-hidden rounded-full bg-[var(--quota-bar-track)]">
- <span
- data-testid="provider-group-member-pace-fill"
- className={cn('h-full rounded-full', used > 0 && 'min-w-[4px]', FILL[quotaSeverity(quota.usedPercent)])}
- style={{ width: `${quota.usedPercent}%` }}
- />
- </span>
- {expected !== null && (
- // 竖线比条高出上下各 2px,落在已用部分里也看得见。
- <span
- data-testid="provider-group-member-pace-marker"
- className="pointer-events-none absolute top-1/2 h-[9px] w-[2px] -translate-x-1/2 -translate-y-1/2 bg-[var(--text-primary)]"
- style={{ left: `${expected}%` }}
- />
- )}
- </span>
- <span>{text}</span>
- </span>
- {reset && (
- <>
- <span aria-hidden="true">·</span>
- <span className="[font-variant-numeric:tabular-nums]">{reset}</span>
- </>
- )}
- </>
- );
-}
diff --git a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
index 16df014541..229efab05d 100644
--- a/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/ProviderGroupSection.tsx
@@ -44,7 +44,6 @@ import {
type ProviderGroupStrategy,
} from '../../../shared/providerGroup';
import { providerShareComputerName, useProviderShareOwnerNameOf } from '../provider-share/providerShareNames';
-import { GroupMemberPace } from './GroupMemberPace';
import { GroupMemberQuota, groupMemberQuotaTarget } from './GroupMemberQuota';
import { GroupMemberReshare, reshareSummaryText } from './GroupMemberReshare';
import { GroupMemberDetailsButton, GroupMemberVersion } from './GroupMemberVersion';
@@ -461,12 +460,6 @@ function MemberRow({
</span>
</>
)}
- {status?.quota && (
- <>
- <span aria-hidden="true">·</span>
- <GroupMemberPace quota={status.quota} />
- </>
- )}
</span>
</span>
</GroupMemberDetailsButton>
diff --git a/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx b/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx
index 983dfd5ffe..5daa20d1dc 100644
--- a/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx
+++ b/apps/desktop/src/renderer/features/provider-group/RemoteProviderGroupMembers.tsx
@@ -20,7 +20,6 @@ import type {
ProviderGroupView,
} from '../../../shared/providerGroup';
import { providerShareComputerName, useProviderShareOwnerNameOf } from '../provider-share/providerShareNames';
-import { GroupMemberPace } from './GroupMemberPace';
import { GroupMemberQuota, groupMemberQuotaTarget } from './GroupMemberQuota';
import { GroupMemberDetailsButton, GroupMemberVersion } from './GroupMemberVersion';
import { memberStatusText } from './ProviderGroupSection';
@@ -289,12 +288,6 @@ function MemberRow({
</span>
</>
)}
- {status?.quota && (
- <>
- <span aria-hidden="true">·</span>
- <GroupMemberPace quota={status.quota} />
- </>
- )}
</span>
</span>
</>
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 34ad3f0660..3861ed9052 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
@@ -288,25 +288,6 @@ describe('ProviderGroupSection', () => {
expect(within(rows[0]).queryByText(/providerGroup\.member\.runningCount/)).toBeNull();
});
- // provider-groups.md §10(2026-10-21 用户要求):不展开就能比较各账号用到哪;读不到配额的电脑不画进度条。
- it('shows each computer’s quota against an even pace without expanding, and nothing when unknown', async () => {
- realLocale = createInstance();
- await realLocale.init({ lng: 'zh-CN', resources: { 'zh-CN': { translation: zhCN } }, interpolation: { escapeValue: false } });
- const DAY = 86_400_000;
- stored = { strategy: 'least', autoSwitch: true, members: [LOCAL, MINI] };
- const view = viewOf(stored);
- // 周配额还剩一半时间:按时间该用到 50%。
- view.members[0] = { ...view.members[0], quota: { usedPercent: 40, resetAtMs: Date.now() + 3.5 * DAY + 30_000, windowMs: 7 * DAY } };
- command.mockImplementation(async (cmd: { action: string }) => (cmd.action === 'list' ? { anthropic: stored } : view));
- render(<ProviderGroupSection providerId="anthropic" providerName="Anthropic" />);
- const rows = await screen.findAllByTestId('provider-group-member');
- expect(await within(rows[0]).findByText('已用 40%,该用到 50%')).toBeTruthy();
- expect(within(rows[0]).getByTestId('provider-group-member-pace-fill').style.width).toBe('40%');
- expect(within(rows[0]).getByTestId('provider-group-member-pace-marker').style.left).toBe('50%');
- expect(within(rows[0]).getByText('3天 12小时后重置')).toBeTruthy();
- expect(within(rows[1]).queryByTestId('provider-group-member-pace')).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 dc6c4c0e30..59ef7d324b 100644
--- a/apps/desktop/src/renderer/i18n/locales/en/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/en/common.json
@@ -696,10 +696,6 @@
},
"runningCount_one": "{{count}} task running",
"runningCount_other": "{{count}} tasks running",
- "pace": {
- "used": "{{used}}% used",
- "usedExpected": "{{used}}% used, {{expected}}% expected by now"
- },
"limitAria": "Task limit for {{name}}",
"limitOption_one": "Max {{count}}",
"limitOption_other": "Max {{count}}",
diff --git a/apps/desktop/src/renderer/i18n/locales/ja/common.json b/apps/desktop/src/renderer/i18n/locales/ja/common.json
index 274519dcff..7ddf2d8c8e 100644
--- a/apps/desktop/src/renderer/i18n/locales/ja/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ja/common.json
@@ -689,10 +689,6 @@
"share": "ほかの人から共有されたパソコンのクォータは表示されません"
},
"runningCount_other": "{{count}} 件実行中",
- "pace": {
- "used": "{{used}}% 使用",
- "usedExpected": "{{used}}% 使用、目安 {{expected}}%"
- },
"limitAria": "{{name}} の同時実行数の上限",
"limitOption_other": "上限 {{count}}",
"weightAria": "{{name}} の重み",
diff --git a/apps/desktop/src/renderer/i18n/locales/ko/common.json b/apps/desktop/src/renderer/i18n/locales/ko/common.json
index 843c96d8d1..35094a8171 100644
--- a/apps/desktop/src/renderer/i18n/locales/ko/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/ko/common.json
@@ -689,10 +689,6 @@
"share": "다른 사람이 공유한 컴퓨터의 할당량은 표시되지 않습니다"
},
"runningCount_other": "{{count}}개 실행 중",
- "pace": {
- "used": "{{used}}% 사용",
- "usedExpected": "{{used}}% 사용, 기준 {{expected}}%"
- },
"limitAria": "{{name}}의 동시 실행 한도",
"limitOption_other": "한도 {{count}}",
"weightAria": "{{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 f327aae840..6c0ff9317e 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-CN/common.json
@@ -689,10 +689,6 @@
"share": "别人分享的电脑不显示配额"
},
"runningCount_other": "{{count}} 个任务运行中",
- "pace": {
- "used": "已用 {{used}}%",
- "usedExpected": "已用 {{used}}%,该用到 {{expected}}%"
- },
"limitAria": "{{name}} 的并发上限",
"limitOption_other": "上限 {{count}}",
"weightAria": "{{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 758350185c..45143a0006 100644
--- a/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
+++ b/apps/desktop/src/renderer/i18n/locales/zh-TW/common.json
@@ -689,10 +689,6 @@
"share": "別人分享的電腦不顯示配額"
},
"runningCount_other": "{{count}} 個任務執行中",
- "pace": {
- "used": "已用 {{used}}%",
- "usedExpected": "已用 {{used}}%,該用到 {{expected}}%"
- },
"limitAria": "{{name}} 的並行上限",
"limitOption_other": "上限 {{count}}",
"weightAria": "{{name}} 的權重",
diff --git a/apps/desktop/src/shared/providerGroup.ts b/apps/desktop/src/shared/providerGroup.ts
index 0a8cdec591..aa433de6e6 100644
--- a/apps/desktop/src/shared/providerGroup.ts
+++ b/apps/desktop/src/shared/providerGroup.ts
@@ -109,8 +109,8 @@ export interface ProviderGroupMemberStatus {
/** 冷却到何时(unix ms)。 */
coolingUntil?: number;
/**
- * 选电脑时排序用的那个配额窗口(provider-groups.md §5、§10):本机与同账号电脑的订阅才有,读不到时省略。
- * 发给同账号电脑,不进受邀者的匿名状态。
+ * 选电脑时排序用的那个配额窗口(provider-groups.md §5):本机与同账号电脑的订阅才有,读不到时省略。
+ * 发给同账号电脑,用来提议任务进行中换号(§6.2),界面不显示;不进受邀者的匿名状态。
*/
quota?: ProviderGroupMemberQuota;
/**
@@ -130,7 +130,7 @@ export interface ProviderGroupMemberStatus {
reshare?: ProviderGroupReshareSummary;
}
-/** 一个配额窗口此刻的用量:组内电脑行的进度条按它画已用多少、按时间该用到哪。 */
+/** 一个配额窗口此刻的用量:已用多少、何时重置、窗口多长,够算出这个账号的额度有多急着用。 */
export interface ProviderGroupMemberQuota {
usedPercent: number;
/** 重置时刻(unix ms);null = 这个窗口还没开始计时。 */
diff --git a/docs/dev-rules/protocol-compatibility.md b/docs/dev-rules/protocol-compatibility.md
index 03e6f519ae..b07926e533 100644
--- a/docs/dev-rules/protocol-compatibility.md
+++ b/docs/dev-rules/protocol-compatibility.md
@@ -1724,11 +1724,12 @@ B 上的 Worker 是一条普通任务,`sessions.orca_remote_lead`(migration 01
同账号不带 `model` 的 `view` 用已有 `cooling` / `coolingUntil` 表达总窗口耗尽,带 `model` 的发送前查询只在回显模型一致时
临时表达该模型的额度状态,不能改变其他模型的可用性。账号切换时丢弃旧读取,不扩大 allowlist 或凭证访问。
- **成员状态可选 `quota`(2026-10-21 用户确认)**:`ProviderGroupView.members[]` 增加可选
- `quota: { usedPercent, resetAtMs: number | null, windowMs }`,只是选电脑排序用的那一个窗口(provider-groups.md §5、§10
- 的进度条),不带 5 小时窗口、模型桶名、账号标识或重置卡。组所在电脑本机界面与同账号 `view` 回包都带;读不到配额的成员
+ `quota: { usedPercent, resetAtMs: number | null, windowMs }`,只是选电脑排序用的那一个窗口(provider-groups.md §5),
+ 同账号电脑据此提议任务进行中换号(§6.2);2026-10-22 起界面不再画进度条(§10),字段保留。不带 5 小时窗口、模型桶名、
+ 账号标识或重置卡。组所在电脑本机界面与同账号 `view` 回包都带;读不到配额的成员
省略。`parseProviderGroupRemoteView` 只收有限数值(百分比收敛到 0–100,窗口 0–31 天,重置时刻为正数或 `null`),
- 分享来的成员一律丢弃;受邀者的匿名状态是白名单投影,不带此字段。旧组所在电脑不回此字段,查看端不画进度条;
- 旧查看端忽略它。不新增 channel、请求参数或持久数据。
+ 分享来的成员一律丢弃;受邀者的匿名状态是白名单投影,不带此字段。旧组所在电脑不回此字段,查看端按读不到配额处理、
+ 不提议换到这台;旧查看端忽略它。不新增 channel、请求参数或持久数据。
- 不新增 channel,不改 relay、服务器、数据库或持久冷却格式。实现:`provider-group/usage.ts`、`directory.ts`、`runtime.ts`、
`router.ts`、`remoteClient.ts`、`remoteHandler.ts`、`service.ts`;额度判定与自动继续复用 `shared/accountUsageLimit.ts`。回归见
`provider-group/__tests__/usage.test.ts`、`router.usage.test.ts`、`runtime.test.ts` 与 `scheduler.test.ts`。
diff --git a/docs/product-rules/provider-groups.md b/docs/product-rules/provider-groups.md
index 4a1f768055..bf48c4a16e 100644
--- a/docs/product-rules/provider-groups.md
+++ b/docs/product-rules/provider-groups.md
@@ -37,6 +37,9 @@
> 多久后重置),数据由组所在电脑随组状态发给同账号电脑(同日用户确认),见 §10。同日还评估过「任务进行中自动换账号」:
> 换电脑的交接只带最近几轮原文与前面的摘要,会丢工具输出与推理细节,用户决定不自动换;随后改为**上一轮结束、用户发下一条消息时
> 弹窗问要不要换号**,可以为这个任务选「以后自动换」,手机与电脑一致,见 §6.2。
+> 2026-10-22 用户裁决(取代上一条的配额进度条):**组内电脑行不再画配额进度条**——收起时挤在一行里看不懂,又和展开后的剩余配额
+> 重复,要看各账号用到哪就展开那一行。「快作废的先用、各账号平均」的排序不变;组所在电脑照常随组状态发出配额窗口,只供 §6.2
+> 的换号提议使用,见 §10。
> 2026-10-16 用户要求:「远程与分享」页的**「已分享的人」并进「用量」**——同一个人不在两处各占一行:分享的人那一行同时写分享状态、
> 加入时间与用量,关闭/恢复与删除收进行尾 `···`,见 §7、§10。同日用户反馈底部的「生成分享链接」太难找:它放到页面标题右侧,
> 待处理紧跟标题,页面不再单设「分享」块与分享说明,见 §10。
@@ -673,14 +676,9 @@
只写「别人分享的电脑不显示配额」;不在线的电脑不去读。展示组件只在展开时读,收起时停止展示读取;
组状态与分配所需的 Claude 订阅额度另按 §5 读取,不依赖这一行是否展开。
另一台电脑上的组的只读列表同样可以展开。这是剩余配额,不是 §7 的经组运行的用量统计(P3)。
- - **状态行带配额进度条**(2026-10-21 用户要求:不展开就能看出各账号是不是在平均地用):状态词后面接一条细进度条,
- 条上的竖线是按时间这时候该用到的位置,后面写「已用 40%,该用到 50%」与「3天 12小时后重置」。画的是 §5 选电脑排序用的
- 同一个窗口(周配额;有模型专属周配额时取两者中不急的那个;只有 5 小时窗口的 OpenAI 套餐画 5 小时窗口),由组所在电脑
- 随组状态给出,不另读那台电脑;窗口还没开始计时时只写已用、不画竖线。读不到配额的电脑(别人分享的、API 连接、
- 旧版本的组所在电脑)不画。本机的组与另一台电脑上的组的只读列表都显示;受邀者的匿名状态不带。
- 实现见 `apps/desktop/src/renderer/features/provider-group/GroupMemberPace.tsx`,回归见同目录
- `__tests__/ProviderGroupSection.test.tsx`、`apps/desktop/src/main/provider-group/__tests__/router.usage.test.ts`
- 与 `apps/desktop/src/shared/__tests__/providerGroup.test.ts`。
+ - **状态行不画配额进度条**(2026-10-22 用户裁决,撤掉 2026-10-21 加的那条):收起时那根细条和「已用 40%,该用到 50%」
+ 挤在一行里看不懂,又和展开后的剩余配额重复;要看各账号用到哪就展开这一行。本机的组与另一台电脑上的组的只读列表都一样。
+ 组所在电脑随组状态给出的配额窗口(`quota`)仍发给同账号电脑,只用于 §6.2 的换号提议,界面不显示。
- **添加电脑**:弹窗分「已经能用的」与「分享链接」两页:前者把你的其他电脑和别人分享给你的放在同一个列表里勾选;分享链接沿用申请与配对码流程,
供应商不一致(§3 口径)、链接属于自己账号、链接失效时给出对应提示。
- **同一台电脑上的几个账号按电脑聚合**(2026-10-15 用户要求):组里的一项仍是「电脑 + 这台电脑上的一个供应商账号」,