CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
feat: 优化 CodexBar 2.0.0 刷新体验
Bob2ae5cf19123f
diff --git a/AGENTS.md b/AGENTS.mdindex 69dd539..0aad579 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -116,14 +116,14 @@ codex app-server --listen stdio://- `requestTimeout` 是 20 秒。- `initialize` 响应的 `userAgent` 首个 token 形如 `codex_bar/0.139.0 (...)`; `serverVersion(fromUserAgent:)` 取 `/` 后版本号作为当前运行版本。- 每条连接保存 `CodexCLIConnectionInfo(source, executablePath, version, openedAt)`, 设置页用它标记「当前使用」。-- `JSONLineReader` 按行读取 stdout, 只消费匹配请求 id 的响应。-- `PipeDrain` 持续排空 stderr, stderr 不进入用户可见文案。+- `JSONLineReader` 按行读取 stdout, 只消费匹配请求 id 的响应; stdout EOF 时标记关闭并唤醒等待中的请求。+- `PipeDrain` 持续排空 stderr, stderr 不进入用户可见文案; stderr EOF 时停止 readability handler。## 自动刷新与连接重建- `RateLimitsViewModel.refreshInterval` 是 60 秒。-- `startAutoRefresh()` 启动每秒唤醒的 `Task`, 每次调用 `refreshIfNeeded()`。-- `refreshIfNeeded()` 只看 `autoRefreshCountdownStartedAt` 距当前是否超过 60 秒。+- `startAutoRefresh()` 启动一个 `Task`, 每轮按 `autoRefreshDelay`(距下次刷新的剩余秒数, 下限 1 秒; `autoRefreshCountdownStartedAt` 为空时取 `refreshInterval`)休眠后调用 `refreshIfNeeded()`, 不再每秒空转唤醒。+- `refreshIfNeeded()` 只看 `autoRefreshCountdownStartedAt` 距当前是否超过 60 秒, 作为动态休眠的兜底判断。- `refresh()` 用 `isRefreshing` 合并并发触发; 开始时不要清空 `lastError`。- `refresh()` 成功后更新 `snapshot` 并清空 `lastError`; 失败时保留旧 `snapshot`, 写入 `lastError`。- 无论成功失败, 刷新结束都更新 `codexConnectionInfo`、重置 `autoRefreshCountdownStartedAt`, 并关闭 `isRefreshing`。@@ -188,6 +188,7 @@ Popover:- 无 quota 数据时显示 `--` / `暂无数据`, 并用占位色。- 重置时间格式 `MM-dd HH:mm`。- 更新时间行显示顺时针自动刷新倒计时圆环、「数据更新时间」和 `HH:mm:ss`; 时间文本使用 `.contentTransition(.numericText())` 和 `Color.codexSecondaryLabel`, 不展示应用版本号。+- 倒计时圆环(`AutoRefreshCountdownCircle`)用 `Circle().trim` 按秒离散跳格, 不做连续动画: `Shape.trim` 的长连续动画是逐帧 CPU 重绘, 比每秒采样更耗 CPU, 不要改成连续动画。每秒采样由 `AutoRefreshCountdownTimeline` 的 `TimelineView` 驱动, 且只在 popover 可见(`PopoverVisibilityState.isVisible`, 由 `StatusItemController` 在 popover show/close 时维护)时启用; 隐藏时静态渲染一次。仅 `startedAt` 变化(刷新重置)且可见时播放 0.2 秒恢复动画, 普通 tick 直接跳变。- token 区域显示「单日峰值」和「全时累计」; `TokenCountText` 对 1K 以下显示完整整数, 1K 起显示 K/M/B。- 热力图是近 30 周、30 列 x 7 行、周日到周六排列、默认不包含今天; hover tooltip 显示日期和单日 token。diff --git a/CLAUDE.md b/CLAUDE.mdindex 10347b2..64263bb 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -116,14 +116,14 @@ codex app-server --listen stdio://- `requestTimeout` 是 20 秒。- `initialize` 响应的 `userAgent` 首个 token 形如 `codex_bar/0.139.0 (...)`; `serverVersion(fromUserAgent:)` 取 `/` 后版本号作为当前运行版本。- 每条连接保存 `CodexCLIConnectionInfo(source, executablePath, version, openedAt)`, 设置页用它标记「当前使用」。-- `JSONLineReader` 按行读取 stdout, 只消费匹配请求 id 的响应。-- `PipeDrain` 持续排空 stderr, stderr 不进入用户可见文案。+- `JSONLineReader` 按行读取 stdout, 只消费匹配请求 id 的响应; stdout EOF 时标记关闭并唤醒等待中的请求。+- `PipeDrain` 持续排空 stderr, stderr 不进入用户可见文案; stderr EOF 时停止 readability handler。## 自动刷新与连接重建- `RateLimitsViewModel.refreshInterval` 是 60 秒。-- `startAutoRefresh()` 启动每秒唤醒的 `Task`, 每次调用 `refreshIfNeeded()`。-- `refreshIfNeeded()` 只看 `autoRefreshCountdownStartedAt` 距当前是否超过 60 秒。+- `startAutoRefresh()` 启动一个 `Task`, 每轮按 `autoRefreshDelay`(距下次刷新的剩余秒数, 下限 1 秒; `autoRefreshCountdownStartedAt` 为空时取 `refreshInterval`)休眠后调用 `refreshIfNeeded()`, 不再每秒空转唤醒。+- `refreshIfNeeded()` 只看 `autoRefreshCountdownStartedAt` 距当前是否超过 60 秒, 作为动态休眠的兜底判断。- `refresh()` 用 `isRefreshing` 合并并发触发; 开始时不要清空 `lastError`。- `refresh()` 成功后更新 `snapshot` 并清空 `lastError`; 失败时保留旧 `snapshot`, 写入 `lastError`。- 无论成功失败, 刷新结束都更新 `codexConnectionInfo`、重置 `autoRefreshCountdownStartedAt`, 并关闭 `isRefreshing`。@@ -188,6 +188,7 @@ Popover:- 无 quota 数据时显示 `--` / `暂无数据`, 并用占位色。- 重置时间格式 `MM-dd HH:mm`。- 更新时间行显示顺时针自动刷新倒计时圆环、「数据更新时间」和 `HH:mm:ss`; 时间文本使用 `.contentTransition(.numericText())` 和 `Color.codexSecondaryLabel`, 不展示应用版本号。+- 倒计时圆环(`AutoRefreshCountdownCircle`)用 `Circle().trim` 按秒离散跳格, 不做连续动画: `Shape.trim` 的长连续动画是逐帧 CPU 重绘, 比每秒采样更耗 CPU, 不要改成连续动画。每秒采样由 `AutoRefreshCountdownTimeline` 的 `TimelineView` 驱动, 且只在 popover 可见(`PopoverVisibilityState.isVisible`, 由 `StatusItemController` 在 popover show/close 时维护)时启用; 隐藏时静态渲染一次。仅 `startedAt` 变化(刷新重置)且可见时播放 0.2 秒恢复动画, 普通 tick 直接跳变。- token 区域显示「单日峰值」和「全时累计」; `TokenCountText` 对 1K 以下显示完整整数, 1K 起显示 K/M/B。- 热力图是近 30 周、30 列 x 7 行、周日到周六排列、默认不包含今天; hover tooltip 显示日期和单日 token。diff --git a/CodexBar.xcodeproj/project.pbxproj b/CodexBar.xcodeproj/project.pbxprojindex 1d22828..1bb0d34 100644--- a/CodexBar.xcodeproj/project.pbxproj+++ b/CodexBar.xcodeproj/project.pbxproj@@ -275,7 +275,7 @@"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";CODE_SIGN_STYLE = Automatic;COMBINE_HIDPI_IMAGES = YES;- CURRENT_PROJECT_VERSION = 9;+ CURRENT_PROJECT_VERSION = 10;DEVELOPMENT_TEAM = 4KJ362VJW5;ENABLE_APP_INTENTS_METADATA_GENERATION = NO;ENABLE_APP_SANDBOX = NO;@@ -290,7 +290,7 @@"$(inherited)","@executable_path/../Frameworks",);- MARKETING_VERSION = 1.3.6;+ MARKETING_VERSION = 2.0.0;PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;PRODUCT_NAME = "$(TARGET_NAME)";REGISTER_APP_GROUPS = YES;@@ -312,7 +312,7 @@"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";CODE_SIGN_STYLE = Automatic;COMBINE_HIDPI_IMAGES = YES;- CURRENT_PROJECT_VERSION = 9;+ CURRENT_PROJECT_VERSION = 10;DEVELOPMENT_TEAM = 4KJ362VJW5;ENABLE_APP_INTENTS_METADATA_GENERATION = NO;ENABLE_APP_SANDBOX = NO;@@ -327,7 +327,7 @@"$(inherited)","@executable_path/../Frameworks",);- MARKETING_VERSION = 1.3.6;+ MARKETING_VERSION = 2.0.0;PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;PRODUCT_NAME = "$(TARGET_NAME)";PROVISIONING_PROFILE_SPECIFIER = "";diff --git a/CodexBar/CodexRateLimitService.swift b/CodexBar/CodexRateLimitService.swiftindex 9942524..2c88e98 100644--- a/CodexBar/CodexRateLimitService.swift+++ b/CodexBar/CodexRateLimitService.swift@@ -406,7 +406,13 @@ private nonisolated final class JSONLineReader: @unchecked Sendable {init(fileHandle: FileHandle) {self.fileHandle = fileHandlefileHandle.readabilityHandler = { [weak self] handle in- self?.append(handle.availableData)+ let data = handle.availableData+ guard !data.isEmpty else {+ handle.readabilityHandler = nil+ self?.markClosed()+ return+ }+ self?.append(data)}}@@ -440,11 +446,6 @@ private nonisolated final class JSONLineReader: @unchecked Sendable {}private func append(_ data: Data) {- guard !data.isEmpty else {- markClosed()- return- }-lock.lock()defer { lock.unlock() }@@ -499,7 +500,12 @@ private nonisolated final class PipeDrain: @unchecked Sendable {init(fileHandle: FileHandle) {self.fileHandle = fileHandle- fileHandle.readabilityHandler = { _ = $0.availableData }+ fileHandle.readabilityHandler = { handle in+ guard !handle.availableData.isEmpty else {+ handle.readabilityHandler = nil+ return+ }+ }}func stop() {diff --git a/CodexBar/RateLimitsMenuView.swift b/CodexBar/RateLimitsMenuView.swiftindex afb29c5..09eec8e 100644--- a/CodexBar/RateLimitsMenuView.swift+++ b/CodexBar/RateLimitsMenuView.swift@@ -5,12 +5,19 @@// Created by Bob on 2026-06-10.//+import Combineimport SwiftUI+@MainActor+final class PopoverVisibilityState: ObservableObject {+ @Published var isVisible = false+}+struct RateLimitsMenuView: View {static let menuWidth: CGFloat = Metrics.padding * 2 + Metrics.panelPadding * 2 + UsageHeatmap.Metrics.totalWidth@ObservedObject var viewModel: RateLimitsViewModel+ @ObservedObject var popoverVisibility: PopoverVisibilityState@EnvironmentObject private var appUpdater: AppUpdater@State private var isEmailBlurred = false@@ -178,14 +185,12 @@ private extension RateLimitsMenuView {func updatedAtRow(for snapshot: CodexQuotaSnapshot) -> some View {HStack {HStack(spacing: 5) {- TimelineView(.periodic(from: .now, by: 1)) { timeline in- AutoRefreshCountdownCircle(- startedAt: viewModel.autoRefreshCountdownStartedAt ?? snapshot.generatedAt,- interval: viewModel.autoRefreshInterval,- now: timeline.date,- color: .blue- )- }+ AutoRefreshCountdownTimeline(+ startedAt: viewModel.autoRefreshCountdownStartedAt ?? snapshot.generatedAt,+ interval: viewModel.autoRefreshInterval,+ isActive: popoverVisibility.isVisible,+ color: .blue+ )Text("数据更新时间").foregroundStyle(Self.secondaryTextColor)@@ -268,10 +273,38 @@ private extension RateLimitsMenuView {static let secondaryTextColor = Color.codexSecondaryLabel}+private struct AutoRefreshCountdownTimeline: View {+ let startedAt: Date+ let interval: TimeInterval+ let isActive: Bool+ let color: Color++ var body: some View {+ if isActive {+ TimelineView(.periodic(from: .now, by: 1)) { timeline in+ circle(now: timeline.date)+ }+ } else {+ circle(now: Date())+ }+ }++ private func circle(now: Date) -> AutoRefreshCountdownCircle {+ AutoRefreshCountdownCircle(+ startedAt: startedAt,+ interval: interval,+ now: now,+ isActive: isActive,+ color: color+ )+ }+}+private struct AutoRefreshCountdownCircle: View {let startedAt: Datelet interval: TimeIntervallet now: Date+ let isActive: Boollet color: Colorprivate var progress: Double {@@ -297,6 +330,12 @@ private struct AutoRefreshCountdownCircle: View {.rotationEffect(.degrees(-90))}.frame(width: 8, height: 8)- .animation(.linear(duration: 1), value: progress)+ // 仅在 startedAt 变化(刷新重置)时播放恢复动画; 普通 tick 只改 now/progress, 直接跳变。+ // popover 隐藏(isActive == false)时不开启动画事务, 避免不可见状态下的无谓渲染。+ .animation(isActive ? .linear(duration: Metrics.resetAnimationDuration) : nil, value: startedAt)+ }++ private enum Metrics {+ static let resetAnimationDuration: TimeInterval = 0.20}}diff --git a/CodexBar/RateLimitsViewModel.swift b/CodexBar/RateLimitsViewModel.swiftindex ef6aef1..d0f09c3 100644--- a/CodexBar/RateLimitsViewModel.swift+++ b/CodexBar/RateLimitsViewModel.swift@@ -52,7 +52,8 @@ final class RateLimitsViewModel: ObservableObject {self?.refreshIfNeeded()while !Task.isCancelled {- if (try? await Task.sleep(for: .seconds(1))) == nil {+ let delay = self?.autoRefreshDelay ?? Self.refreshInterval+ if (try? await Task.sleep(for: .seconds(delay))) == nil {break}@@ -87,4 +88,13 @@ final class RateLimitsViewModel: ObservableObject {self.codexConnectionInfo = await service.currentConnectionInfo()}}++ private var autoRefreshDelay: TimeInterval {+ guard let autoRefreshCountdownStartedAt else {+ return Self.refreshInterval+ }++ let remaining = Self.refreshInterval - Date().timeIntervalSince(autoRefreshCountdownStartedAt)+ return max(1, remaining)+ }}diff --git a/CodexBar/StatusItemController.swift b/CodexBar/StatusItemController.swiftindex 21294fa..8914161 100644--- a/CodexBar/StatusItemController.swift+++ b/CodexBar/StatusItemController.swift@@ -33,6 +33,7 @@ private final class StatusItemController: NSObject {private let appUpdater: AppUpdaterprivate let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)private let popover = NSPopover()+ private let popoverVisibility = PopoverVisibilityState()private lazy var settingsWindowController = SettingsWindowController(viewModel: viewModel,@@ -86,7 +87,10 @@ private final class StatusItemController: NSObject {}private func configurePopover() {- let rootView = RateLimitsMenuView(viewModel: viewModel)+ let rootView = RateLimitsMenuView(+ viewModel: viewModel,+ popoverVisibility: popoverVisibility+ ).environmentObject(appUpdater).frame(width: RateLimitsMenuView.menuWidth)@@ -164,6 +168,7 @@ private final class StatusItemController: NSObject {preparePopoverForFadeIn()popover.show(relativeTo: button.bounds, of: button, preferredEdge: .minY)+ popoverVisibility.isVisible = truestabilizePopoverChromeAppearance()installPopoverDismissMonitors()fadePopover(to: 1, duration: Metrics.fadeInDuration)@@ -229,6 +234,7 @@ private final class StatusItemController: NSObject {cancelPopoverTasks()removePopoverDismissMonitors()+ popoverVisibility.isVisible = falseguard popover.isShown else {resetPopoverAlpha()@@ -270,6 +276,7 @@ private final class StatusItemController: NSObject {popover.performClose(nil)}+ popoverVisibility.isVisible = falseresetPopoverAlpha()popoverState = .hidden}diff --git a/Updates/appcast.xml b/Updates/appcast.xmlindex 03ba03d..6836f0b 100644--- a/Updates/appcast.xml+++ b/Updates/appcast.xml@@ -7,6 +7,15 @@<link>https://codexbar.zabrian.app/appcast.xml</link><description>CodexBar appcast feed</description><language>zh-CN</language>+ <item>+ <title>CodexBar.app 2.0.0</title>+ <sparkle:version>10</sparkle:version>+ <sparkle:shortVersionString>2.0.0</sparkle:shortVersionString>+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/2.0.0.html</sparkle:releaseNotesLink>+ <pubDate>Mon, 15 Jun 2026 22:25:38 +0800</pubDate>+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v2.0.0.dmg" sparkle:edSignature="cSN94/EgbLzV9LvRznE+dsrSlUpIPT9ustcr28E+fZa/0VEz9wtLC3OUriYTZXHvFnixmjHJBaF0s6G+unSUDg==" length="1492881" type="application/octet-stream"/>+ </item><item><title>CodexBar.app 1.3.6</title><sparkle:version>9</sparkle:version>