feat(tray): show subscription utilization as clockwise ring icon on macOS#2353
Open
TuYv wants to merge 9 commits intofarion1231:mainfrom
Open
feat(tray): show subscription utilization as clockwise ring icon on macOS#2353TuYv wants to merge 9 commits intofarion1231:mainfrom
TuYv wants to merge 9 commits intofarion1231:mainfrom
Conversation
- Add Rust-side write-through UsageCache backed by SQLite - Surface per-provider usage in system tray submenus (subscription quota, script quota, coding-plan quota for Kimi/Zhipu/MiniMax) - Show subscription reset countdowns as a disabled second line below each app submenu title - Skip hidden apps on hover refresh; drop stale disabled-script cache - Bridge tray UsageCache writes to frontend React Query - Add 200ms debounce to set_tray_focus_app IPC calls in frontend
Draw a clockwise sector over the tray icon to visualize subscription usage: green <70%, orange 70-90%, red >=90%. Add a toggle in Settings (tray_progress_icon). Toggling off immediately restores the template icon; toggling on kicks off a background refresh so the icon appears without requiring a menu-bar click.
TuYv
force-pushed
the
feat/tray-ring-icon
branch
from
c63e1a9 to
a7e3369
Compare
Owner
|
@codex review |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: a7e336975d
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
- tray: change LAST_TRAY_ICON_PCT cache key from rounded u8 to (u8, tier) so the icon re-renders when utilization crosses a color boundary even if both values round to the same integer (#P2) - tray: handle (Some(item), None) match arm to trigger menu rebuild when usage becomes unavailable, preventing stale detail text in the tray (#P2) - settings: only reset refresh throttle and spawn a fetch when tray_progress_icon transitions false→true, not on every settings save while already enabled (#P3)
…idden sections - update_tray_icon: wrap ring-icon render path in #[cfg(target_os = "macos")] so Windows/Linux tray icons are never replaced by the macOS statusbar asset - update_tray_icon: when compute_tray_worst_pct returns None after a ring icon was already shown, clear LAST_TRAY_ICON_PCT and restore the template icon instead of leaving a stale colored arc on screen - update_tray_usage_labels: skip sections hidden by visible_apps setting so they can no longer trigger spurious full menu rebuilds on every usage refresh
Functions/statics only used in macOS rendering path caused dead-code warnings under Linux CI clippy. Gate update_tray_icon and all its dependencies (TRAY_LAST_OFFICIAL_APP, LAST_TRAY_ICON_PCT, pct_to_color_tier, generate_ring_icon_rgba, get_section_subscription_pct, compute_tray_worst_pct) plus the ring icon pixel tests. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Two call sites in update_tray_usage_labels and refresh_tray_menu were missed; wrap them with #[cfg(target_os = "macos")]. Rename unused 'app' params in set_tray_focused_app and update_tray_icon_pub to _app to suppress Linux unused-variable warning. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
ICON_BASE_BYTES and ICON_BASE_RGBA are only referenced inside #[cfg(target_os = "macos")] code; gate them to silence Linux dead-code warnings. Replace the early return+cfg pattern in update_tray_usage_labels with an if/else so clippy does not flag a needless return on Linux. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Contributor
Author
|
@codex review |
|
To use Codex here, create a Codex account and connect to github. |
Contributor
Author
|
@codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: fc9b2f8823
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
switch_provider now accepts AppHandle and calls update_tray_icon_pub after a successful switch, so the ring icon reflects the new provider's category (official vs third-party) immediately instead of waiting for the next activeApp focus change or usage refresh. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Contributor
Author
|
@codex review |
1 similar comment
Contributor
Author
|
@codex review |
|
Codex Review: Didn't find any major issues. 🎉 ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
If Codex has suggestions, it will comment; otherwise it will react with 👍. Codex can also answer questions or update the PR. Try commenting "@codex address that feedback". |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary / 概述
format_subscription_summary中的\n，解决首次点击托盘菜单被强制收起的问题🟢 h9% 1h 30m · w27% 2d 0h）Related Issue / 关联 Issue
Fixes #
Screenshots / 截图
Code Review Fixes / CR 修复记录
经过两轮 Code Review，共修复以下问题：
第一轮 CR
(rounded_u8, color_tier)元组，89.x→90.x 这类跨阈值变化不再被去重逻辑误判为"无变化"(Some(item), None)match 分支，usage 消失时触发菜单重建以移除过期条目if enable_progress_icon改为if enable_progress_icon && !was_enabled，仅在开关从关→开时才重置节流并发起请求第二轮 CR
#[cfg(not(target_os = "macos"))] return;，Windows/Linux 不再被 macOS 专属图标资源覆盖托盘图标compute_tray_worst_pct返回None时，若之前已渲染过环形图，清空缓存并还原模板图标update_tray_usage_labels循环开头加visible_apps.is_visible检查，隐藏 section 直接跳过，不再误触发refresh_tray_menuChecklist / 检查清单
pnpm typecheckpasses / 通过 TypeScript 类型检查pnpm format:checkpasses / 通过代码格式检查cargo clippypasses (if Rust code changed) / 通过 Clippy 检查（如修改了 Rust 代码）