Skip to content

routing: 「Weekly pace」|「重置前用完」中文名改为「额度均衡」,使中文更清楚直观 - #951

Open
pc418 wants to merge 3 commits into
yetone:mainfrom
pc418:pace-wording
Open

pc418 wants to merge 3 commits into
yetone:mainfrom
pc418:pace-wording

Conversation

@pc418

@pc418 pc418 commented Oct 5, 2026 •

Copy link
Copy Markdown
Contributor

#517 合并后,中文名「重置前用完」带的意思并不明确直观,对功能的说明不容易理解:按紧迫度、先用快到期的,那是「智能」已经在做的事。
Weekly pace 真正的目的,是让每个账号的周额度都按各自的重置时间匀速用掉,不让某一个账号提前见底,这样后面更多的 5 小时窗口里都还有多个账号可用。该算法,在重置时间差不多的情况下相当于最少使用,差别较大时相当于智能,所以哪个都不准确。

这个 PR 只改文案,不动路由逻辑:

  • 中文选项名:重置前用完 → 额度均衡(Routing 页的路由说明前缀一并改)。
  • 中文说明:「根据剩余周额度和重置时间分配使用,避免过早耗尽某个账号的周额度,让后续更多个 5 小时窗口仍有多个账号可用。」其后保留原有的细节(90% 以上的排后、只有 5 小时额度的账号、Key 的排法)。
  • 英文名保持 Weekly pace,说明改为先讲它做什么:“uses each account's week up evenly until it renews — the most of its week left per hour first — so later five-hour windows still have several accounts”,长度和原来差不多。
  • 日文「週ペース」、德文「Wochentempo」的名字保留,说明随英文重新翻译。
  • 文档(en/zh)路由表、README、magpie group 帮助文本同步;routing-save.test.cjs 的中文名断言更新。

中文名的备选,供 @yetone 定:

觉得那个更好说一句我就改这个pr,目前这个没有很好说明功能, 有点怪怪的。

候选 说明 推荐 by
额度均衡(本 PR) 短,直说「均衡用额度」;不强调周,但说明第一句就讲周额度 Astra
周额度均衡 更准确,点明按周额度;稍长 Astra
均衡消耗 最口语,强调不把单个账号烧穿;没说是哪种额度 Fable
周配速 和英文 Weekly pace 一一对应;但没说出为什么,要靠说明 Fable
按(周)进度 和Weekly pace 对应;但没说出为什么,要靠说明 我
负载均衡 算吧,比较接近的一个词。 某人的第一印象

验证:go vet、go build -tags nogui、go test -tags nogui ./internal/gui/ . 通过;只改了文案,浏览器测试没有跑(routing-save.test.cjs 里的中文名断言已同步更新)。

pc418 and others added 3 commits October 5, 2026 13:07
… for (yetone#517 follow-up) — 重置前用完 read as the soonest renewal first, which is Smart's order, when the point is the opposite: each account's week is used up evenly until its own reset, so none runs out of its week early and the five-hour windows later on still have several accounts with quota. The English name and its pace wording stay; the provider editor's, the group editor's and the Routing tab's hints lead with that (uses each account's week up evenly until it renews), then how it ranks; zh takes 根据剩余周额度和重置时间分配使用,避免过早耗尽某个账号的周额度,让后续更多个 5 小时窗口仍有多个账号可用, with the details as before, and the Routing tab's stories begin 额度均衡. ja (週ペース) and de (Wochentempo) keep their names, their hints translated anew for the new English. The docs' routing tables (en, zh), README's routing= row and magpie group's help say the same; routing-save.test.cjs expects 额度均衡. No routing logic changes. go vet, go build -tags nogui, go test -tags nogui ./internal/gui/ . pass.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…e, as the others are

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…eek used up evenly, the most left per hour first, so later five-hour windows still have several — about as long as they were before; ja and de follow, zh unchanged; README's row is the first half alone

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Copilot AI balanced review requested due to automatic review settings October 5, 2026 20:26

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note

Copilot was unable to run its full agentic suite in this review.

Copilot review overview

Review effort: Lite
Findings: 2 Medium severity · 1 Low severity

Open (3)
What changed in this PR

Updates the “pace” routing mode’s user-facing explanation and Chinese label to reflect a more “balance weekly quota” behavior, keeping docs/UI/help text in sync.

Changes:

  • Updated the “Weekly pace (pace)” description across docs and GUI strings.
  • Renamed the Chinese label for “Weekly pace” from “重置前用完” to “额度均衡” in docs/UI/i18n.
  • Adjusted GUI tests to match the updated Chinese label.
File Description
site/​public/​docs/​zh/​start.html Updates Chinese documentation text and route naming for pace.
site/​public/​docs/​start.html Updates English end-user docs for pace to the new explanation.
internal/​gui/​tests/​routing-save.test.cjs Updates expected Chinese label for pace to keep tests passing.
internal/​gui/​assets/​routing.js Updates routing tooltip/description strings for pace.
internal/​gui/​assets/​i18n.js Updates Chinese translations and related localized strings for pace.
internal/​gui/​assets/​app.js Updates GUI routing descriptions for pace in the app asset bundle.
groups_cli.go Updates CLI help text for pace to match new behavior description.
README.md Updates README table description for pace to match new behavior description.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread groups_cli.go
usage the account or key with the most of its allowance left first
pace the account with the most of its week left per hour until it renews first, so less
of a week is lost at its reset
pace each week used evenly up to its reset, so later five hours still have several accounts

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

就是在说每周均衡而非账号的均衡,后者是最少使用

<ul>
<li><b>不会无限递归。</b>一个组不能包含它自己,无论是直接包含,还是经由它里面的组间接包含。Coder 已经包含 Fast 时,再把 Coder 放进 Fast 会被拒绝,选择器里也不会列出这样的组。最多嵌套 8 层。一个组被别的组包含时不能删除,要先从那个组里移除它。</li>
<li><b>每一层按自己的路由。</b>外层组不管用什么路由,都不会伸进它里面的组:智能、轮流、最少使用、重置前用完都把子组当作一个成员,拿子组自己会先用的那个账号或 Key 来比;排到它时,子组按自己的顺序整体尝试。Coder 设为智能、里面放 Claude(按顺序)和 GPT(按顺序)两个组时,比较的是 Claude 组的第一个和 GPT 组的第一个,不会把两组的账号混在一起排。</li>
<li><b>每一层按自己的路由。</b>外层组不管用什么路由,都不会伸进它里面的组:智能、轮流、最少使用、额度均衡都把子组当作一个成员,拿子组自己会先用的那个账号或 Key 来比;排到它时,子组按自己的顺序整体尝试。Coder 设为智能、里面放 Claude(按顺序)和 GPT(按顺序)两个组时,比较的是 Claude 组的第一个和 GPT 组的第一个,不会把两组的账号混在一起排。</li>

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

最少使用是特定选项

rotate: ["In turn", "In turn: each conversation's next turn goes to the account after the one that answered its last, and a new conversation starts one further along; the requests within a turn stay put, keeping the prompt cache."],
usage: ["Least used", "Least used first: the account with the most of its allowance left goes first; a key by the tokens magpie sent it lately."],
pace: ["Weekly pace", "Weekly pace: the account with the most of its week left per hour until it renews goes first — the one with the most to lose at its reset; an account with five hours and no week by what its five hours have left per hour. One at 90% or more waits until the others can't answer; a key by the tokens magpie sent it lately."],
pace: ["Weekly pace", "Weekly pace: uses each account's week up evenly until it renews — the most of its week left per hour first — so later five-hour windows still have several accounts; one with five hours and no week goes by its five hours. One at 90% or more waits until the others can't answer; a key by the tokens magpie sent it lately."],

@pc418 pc418 Oct 5, 2026 •

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

原意更清楚,相信opus 5.5,copilot是gpt不会写文。前文短句更多好阅读,后文要到per hour再想想才知道意思

@yetone

yetone commented Oct 5, 2026

Copy link
Copy Markdown
Owner

@pc418 谢谢这个 PR,文案确实比「重置前用完」清楚。我把 head 5681046d rebase 到当前 main 上逐行看过、实际跑过:

核对

  • 新的说明和算法一致:provider.Allowance.Pace 按「周剩余额度 ÷ 距重置小时数」从高到低排,持续先用这个值最高的账号,结果就是各账号的周额度按各自的重置时间匀速用掉。所以「均衡用掉、每小时剩余最多的先用」的说法是准确的,路由逻辑也确实没有改动。
  • git grep 重置前用完 和旧英文说明:除一条无关的图表说明(「会在重置前用完」)和测试注释外,没有遗漏。
  • 三条新英文 key 在 zh / ja / de 里都有;ja、de 的译文我读过,意思准确、通顺。

测试

  • go vet、go build -tags nogui 通过;PR 的 CI 在 macOS 和 Windows 上 go test 通过(ubuntu 那一路被取消了,不是失败)。
  • GUI(Chromium + WebKit):routing-save(en/zh)8/8,routing-levels、routing-sealed-task、routing-reset-deadline 各 4/4;gui-ja、gui-de 的「每条 zh 字符串都有译文、占位符和标签一致」检查和 i18n-keys 都通过。

为什么先不合并
这个 PR 改到了 site/(site/public/docs/start.html 和 zh/start.html)。按我们刚更新的贡献规则,改动 site/ 的社区 PR 要等维护者 @yetone 先看过,所以先放着,名字(额度均衡 / 周额度均衡 / …)也请他来定。你这边暂时不需要再改什么。

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants