CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
feat: 支持多 limit 额度分节展示并发布 1.3.0
Bob9116e5c7f187
diff --git a/AGENTS.md b/AGENTS.mdindex 81bc24a..6be8f85 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -24,7 +24,7 @@ SourceKit 经常对跨文件类型误报「Cannot find type ... in scope」(索- `CodexBarApp.swift`:入口,创建 `RateLimitsViewModel` 和 `@StateObject AppUpdater`,后者以 `environmentObject` 注入弹窗。- `CodexRateLimitService.swift`:app-server 常驻连接管理 + JSON-RPC 请求/响应。-- `RateLimitModels.swift`:响应模型、业务快照模型、`CodexRateLimitError`(含 `requiresLogin`、`isAuthenticationRequired` 分类属性)。+- `RateLimitModels.swift`:wire 响应模型(纯 Decodable,不含展示逻辑)、业务快照模型(`CodexQuotaSnapshot` → `limits: [CodexQuotaLimitSnapshot]` → `windows: [QuotaWindow]`,支持多 limit 多窗口)、`CodexRateLimitError`(含 `requiresLogin`、`isAuthenticationRequired` 分类属性)。- `RateLimitsViewModel.swift`:错误状态单一来源——只发布 `lastError: CodexRateLimitError?`,`errorMessage`、`requiresLogin`、`hasError` 都是派生计算属性,**不要再加并列的错误布尔**。- `QuotaRow.swift`:额度行和分段进度条;`LoginItemSettings.swift`:`SMAppService.mainApp` 开机自启;`AppUpdater.swift`:Sparkle 封装。@@ -42,6 +42,8 @@ SourceKit 经常对跨文件类型误报「Cannot find type ... in scope」(索之后每分钟在同一会话上请求 `account/rateLimits/read` 和 `account/usage/read`。+额度解析(`CodexQuotaSnapshot` 的转换 init,wire DTO 本身不做排序/兜底):优先读 `rateLimitsByLimitId`(多 limit),为空则回退顶层 `rateLimits`;顶层 `rateLimits.limitId` 指向的主 limit 置顶(缺省 `"codex"`),其余按名称排序;每个 limit 的 `primary`/`secondary` 窗口合成 `[QuotaWindow]`,无窗口的 limit 被过滤,全部为空才抛 `missingRateLimitWindow`。+连接重建规则(`CodexRateLimitService.ensureConnection`):- 进程已退出 → 重建。@@ -68,9 +70,10 @@ Xcode target 已关闭 App Sandbox(需要启动本机 Codex CLI 并读取用户- 菜单栏正常图标 `person.fill.checkmark`,错误图标 `person.fill.xmark`,切换用 `.contentTransition(.symbolEffect(.replace))`。菜单栏不展示额度数字,详情只在弹窗中展示。- App 图标保持白底黑色 `timelapse`。- 不要给 symbol API 加低版本 fallback,最低系统版本已是 macOS 15.0。-- 分段条展示**剩余**额度(`100 - usedPercent`);额度行标签由 `windowDurationMins` 动态生成(如 `300` → `5 小时`,`10080` → `7 天`)。重置时间格式 `MM-dd HH:mm`,更新时间格式 `HH:mm:ss`。+- 弹窗按 limit 分节展示(节标题取 `limitName` 回退 `limitId`,首字母大写,节之间 `Divider`)。分段条展示**剩余**额度(`100 - usedPercent`);额度行标签由 `windowDurationMins` 动态生成(如 `300` → `5 小时`,`10080` → `7 天`)。重置时间格式 `MM-dd HH:mm`,更新时间格式 `HH:mm:ss`。- token 贡献墙为 30 列 × 7 行蓝色方块热力图,token 数按 `M`/`B` 紧凑单位展示。-- 设置区仅在按住 Option 点击菜单栏图标时展示。+- 设置区仅在按住 Option 点击菜单栏图标时展示;开机自启状态读取是同步 XPC,也只在设置区可见时刷新。+- **错误文案不暴露内部细节**:`serverTimeout` 只携带 JSON-RPC 步骤名;子进程 stderr 由 `PipeDrain` 排空丢弃,不进入任何用户可见文案。- 登录类错误(`requiresLogin`):弹窗顶部橙色提示「Codex 未登录」,旧快照置灰(opacity 0.4)保留,红色错误行被抑制。其他错误:红色小字展示 `errorDescription`,旧快照保持全亮度。- 错误文案保持显示直到某次刷新成功(`refresh()` 开始时不清空 `lastError`);旧额度快照永远不清空。diff --git a/CLAUDE.md b/CLAUDE.mdindex 4c8adba..510d16d 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -24,7 +24,7 @@ SourceKit 经常对跨文件类型误报「Cannot find type ... in scope」(索- `CodexBarApp.swift`:入口,创建 `RateLimitsViewModel` 和 `@StateObject AppUpdater`,后者以 `environmentObject` 注入弹窗。- `CodexRateLimitService.swift`:app-server 常驻连接管理 + JSON-RPC 请求/响应。-- `RateLimitModels.swift`:响应模型、业务快照模型、`CodexRateLimitError`(含 `requiresLogin`、`isAuthenticationRequired` 分类属性)。+- `RateLimitModels.swift`:wire 响应模型(纯 Decodable,不含展示逻辑)、业务快照模型(`CodexQuotaSnapshot` → `limits: [CodexQuotaLimitSnapshot]` → `windows: [QuotaWindow]`,支持多 limit 多窗口)、`CodexRateLimitError`(含 `requiresLogin`、`isAuthenticationRequired` 分类属性)。- `RateLimitsViewModel.swift`:错误状态单一来源——只发布 `lastError: CodexRateLimitError?`,`errorMessage`、`requiresLogin`、`hasError` 都是派生计算属性,**不要再加并列的错误布尔**。- `QuotaRow.swift`:额度行和分段进度条;`LoginItemSettings.swift`:`SMAppService.mainApp` 开机自启;`AppUpdater.swift`:Sparkle 封装。@@ -42,6 +42,8 @@ SourceKit 经常对跨文件类型误报「Cannot find type ... in scope」(索之后每分钟在同一会话上请求 `account/rateLimits/read` 和 `account/usage/read`。+额度解析(`CodexQuotaSnapshot` 的转换 init,wire DTO 本身不做排序/兜底):优先读 `rateLimitsByLimitId`(多 limit),为空则回退顶层 `rateLimits`;顶层 `rateLimits.limitId` 指向的主 limit 置顶(缺省 `"codex"`),其余按名称排序;每个 limit 的 `primary`/`secondary` 窗口合成 `[QuotaWindow]`,无窗口的 limit 被过滤,全部为空才抛 `missingRateLimitWindow`。+连接重建规则(`CodexRateLimitService.ensureConnection`):- 进程已退出 → 重建。@@ -68,9 +70,10 @@ Xcode target 已关闭 App Sandbox(需要启动本机 Codex CLI 并读取用户- 菜单栏正常图标 `person.fill.checkmark`,错误图标 `person.fill.xmark`,切换用 `.contentTransition(.symbolEffect(.replace))`。菜单栏不展示额度数字,详情只在弹窗中展示。- App 图标保持白底黑色 `timelapse`。- 不要给 symbol API 加低版本 fallback,最低系统版本已是 macOS 15.0。-- 分段条展示**剩余**额度(`100 - usedPercent`);额度行标签由 `windowDurationMins` 动态生成(如 `300` → `5 小时`,`10080` → `7 天`)。重置时间格式 `MM-dd HH:mm`,更新时间格式 `HH:mm:ss`。+- 弹窗按 limit 分节展示(节标题取 `limitName` 回退 `limitId`,首字母大写,节之间 `Divider`)。分段条展示**剩余**额度(`100 - usedPercent`);额度行标签由 `windowDurationMins` 动态生成(如 `300` → `5 小时`,`10080` → `7 天`)。重置时间格式 `MM-dd HH:mm`,更新时间格式 `HH:mm:ss`。- token 贡献墙为 30 列 × 7 行蓝色方块热力图,token 数按 `M`/`B` 紧凑单位展示。-- 设置区仅在按住 Option 点击菜单栏图标时展示。+- 设置区仅在按住 Option 点击菜单栏图标时展示;开机自启状态读取是同步 XPC,也只在设置区可见时刷新。+- **错误文案不暴露内部细节**:`serverTimeout` 只携带 JSON-RPC 步骤名;子进程 stderr 由 `PipeDrain` 排空丢弃,不进入任何用户可见文案。- 登录类错误(`requiresLogin`):弹窗顶部橙色提示「Codex 未登录」,旧快照置灰(opacity 0.4)保留,红色错误行被抑制。其他错误:红色小字展示 `errorDescription`,旧快照保持全亮度。- 错误文案保持显示直到某次刷新成功(`refresh()` 开始时不清空 `lastError`);旧额度快照永远不清空。diff --git a/CodexBar.xcodeproj/project.pbxproj b/CodexBar.xcodeproj/project.pbxprojindex bc6269f..6ccd269 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 = 2;+ CURRENT_PROJECT_VERSION = 3;DEVELOPMENT_TEAM = 4KJ362VJW5;ENABLE_APP_INTENTS_METADATA_GENERATION = NO;ENABLE_APP_SANDBOX = NO;@@ -290,7 +290,7 @@"$(inherited)","@executable_path/../Frameworks",);- MARKETING_VERSION = 1.2.1;+ MARKETING_VERSION = 1.3.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 = 2;+ CURRENT_PROJECT_VERSION = 3;DEVELOPMENT_TEAM = 4KJ362VJW5;ENABLE_APP_INTENTS_METADATA_GENERATION = NO;ENABLE_APP_SANDBOX = NO;@@ -327,7 +327,7 @@"$(inherited)","@executable_path/../Frameworks",);- MARKETING_VERSION = 1.2.1;+ MARKETING_VERSION = 1.3.0;PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;PRODUCT_NAME = "$(TARGET_NAME)";PROVISIONING_PROFILE_SPECIFIER = "";diff --git a/CodexBar/AppUpdater.swift b/CodexBar/AppUpdater.swiftindex c5b689f..1e53a21 100644--- a/CodexBar/AppUpdater.swift+++ b/CodexBar/AppUpdater.swift@@ -51,16 +51,16 @@ final class AppUpdater: NSObject, ObservableObject {private func showStatusMessage(_ message: String, autoDismiss: Bool = true) {clearStatusMessageTask?.cancel()statusMessage = message-+guard autoDismiss else { return }-+clearStatusMessageTask = Task { [weak self] intry? await Task.sleep(for: .seconds(3))guard !Task.isCancelled else { return }self?.statusMessage = nil}}-+private static func hasUsableSparkleConfiguration(in bundle: Bundle) -> Bool {guardlet feedURLString = bundle.object(forInfoDictionaryKey: "SUFeedURL") as? String,@@ -70,7 +70,7 @@ final class AppUpdater: NSObject, ObservableObject {else {return false}-+return !publicKey.isEmpty}}@@ -80,7 +80,7 @@ extension AppUpdater: SPUUpdaterDelegate {hasAvailableUpdate = trueshowStatusMessage("发现新版本 v\(item.displayVersionString)", autoDismiss: false)}-+func updaterDidNotFindUpdate(_ updater: SPUUpdater, error: Error) {hasAvailableUpdate = falseshowStatusMessage("已是最新版本")diff --git a/CodexBar/CodexBarApp.swift b/CodexBar/CodexBarApp.swiftindex d7b2037..f736801 100644--- a/CodexBar/CodexBarApp.swift+++ b/CodexBar/CodexBarApp.swift@@ -23,3 +23,9 @@ struct CodexBarApp: App {.menuBarExtraStyle(.window)}}++nonisolated extension Bundle {+ var shortVersionString: String? {+ object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String+ }+}diff --git a/CodexBar/CodexRateLimitService.swift b/CodexBar/CodexRateLimitService.swiftindex cd35d03..0924bdd 100644--- a/CodexBar/CodexRateLimitService.swift+++ b/CodexBar/CodexRateLimitService.swift@@ -80,12 +80,16 @@ nonisolated final class CodexRateLimitService: @unchecked Sendable {}private static func fetchSnapshot(using connection: AppServerConnection) throws -> CodexQuotaSnapshot {- let rateLimitsResponse: AccountRateLimitsResponse- do {- rateLimitsResponse = try connection.session.request(+ func readRateLimits() throws -> AccountRateLimitsResponse {+ try connection.session.request("account/rateLimits/read",as: AccountRateLimitsResponse.self)+ }++ let rateLimitsResponse: AccountRateLimitsResponse+ do {+ rateLimitsResponse = try readRateLimits()} catch let error as CodexRateLimitError where error.isAuthenticationRequired {connection.accountResponse = try connection.session.request("account/read",@@ -94,10 +98,7 @@ nonisolated final class CodexRateLimitService: @unchecked Sendable {)do {- rateLimitsResponse = try connection.session.request(- "account/rateLimits/read",- as: AccountRateLimitsResponse.self- )+ rateLimitsResponse = try readRateLimits()} catch let retryError as CodexRateLimitError where retryError.isAuthenticationRequired {throw CodexRateLimitError.authenticationRequired}@@ -131,7 +132,7 @@ nonisolated final class CodexRateLimitService: @unchecked Sendable {let standardOutput = Pipe()let standardError = Pipe()let lineReader = JSONLineReader(fileHandle: standardOutput.fileHandleForReading)- let errorReader = PipeTextCollector(fileHandle: standardError.fileHandleForReading)+ let errorReader = PipeDrain(fileHandle: standardError.fileHandleForReading)process.standardInput = standardInputprocess.standardOutput = standardOutput@@ -264,8 +265,7 @@ nonisolated final class CodexRateLimitService: @unchecked Sendable {}private nonisolated static func clientVersion() -> String {- guard let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String,- !version.isEmpty else {+ guard let version = Bundle.main.shortVersionString, !version.isEmpty else {return "1.0.0"}@@ -298,7 +298,7 @@ private nonisolated final class AppServerSession {private let input: Pipeprivate let lineReader: JSONLineReader- private let errorReader: PipeTextCollector+ private let errorReader: PipeDrainprivate let timeout: TimeIntervalprivate var nextId = 1@@ -306,7 +306,7 @@ private nonisolated final class AppServerSession {process: Process,input: Pipe,lineReader: JSONLineReader,- errorReader: PipeTextCollector,+ errorReader: PipeDrain,timeout: TimeInterval) {self.process = process@@ -367,7 +367,7 @@ private nonisolated final class AppServerSession {let decoder = JSONDecoder()while Date() < deadline {- guard let line = lineReader.nextLine(timeout: 0.2) else {+ guard let line = lineReader.nextLine(timeout: deadline.timeIntervalSinceNow) else {continue}@@ -390,12 +390,7 @@ private nonisolated final class AppServerSession {return result}- let stderr = errorReader.text.trimmingCharacters(in: .whitespacesAndNewlines)- if stderr.isEmpty {- throw CodexRateLimitError.serverTimeout(step)- }-- throw CodexRateLimitError.serverTimeout("\(step):\(stderr)")+ throw CodexRateLimitError.serverTimeout(step)}}@@ -486,42 +481,15 @@ private nonisolated final class JSONLineReader: @unchecked Sendable {}}-private nonisolated final class PipeTextCollector: @unchecked Sendable {- // 常驻连接 stderr 只保留末尾, 避免无界增长- private static let maxBytes = 16_384-- private let lock = NSLock()+private nonisolated final class PipeDrain: @unchecked Sendable {private let fileHandle: FileHandle- private var data = Data()-- var text: String {- lock.lock()- defer { lock.unlock() }- return String(data: data, encoding: .utf8) ?? ""- }init(fileHandle: FileHandle) {self.fileHandle = fileHandle- fileHandle.readabilityHandler = { [weak self] handle in- self?.append(handle.availableData)- }+ fileHandle.readabilityHandler = { _ = $0.availableData }}func stop() {fileHandle.readabilityHandler = nil}-- private func append(_ newData: Data) {- guard !newData.isEmpty else {- return- }-- lock.lock()- defer { lock.unlock() }-- data.append(newData)- if data.count > Self.maxBytes {- data = Data(data.suffix(Self.maxBytes))- }- }}diff --git a/CodexBar/QuotaRow.swift b/CodexBar/QuotaRow.swiftindex 71c9223..4ee2c97 100644--- a/CodexBar/QuotaRow.swift+++ b/CodexBar/QuotaRow.swift@@ -120,27 +120,3 @@ private extension SegmentedQuotaBar {Color.secondary.opacity(0.18)}}--#Preview {- VStack {- QuotaRow(- window: QuotaWindow(- kind: .fiveHour,- label: "5 小时",- usedPercent: 24,- resetsAt: Date().addingTimeInterval(3600)- )- )-- QuotaRow(- window: QuotaWindow(- kind: .weekly,- label: "7 天",- usedPercent: 50,- resetsAt: Date().addingTimeInterval(86400)- )- )- }- .padding()- .frame(width: RateLimitsMenuView.menuWidth)-}diff --git a/CodexBar/RateLimitModels.swift b/CodexBar/RateLimitModels.swiftindex d57d465..f2d010d 100644--- a/CodexBar/RateLimitModels.swift+++ b/CodexBar/RateLimitModels.swift@@ -8,28 +8,44 @@import Foundationnonisolated struct CodexQuotaSnapshot: Equatable {- let account: CodexAccount?+ let account: CodexAccountlet planType: String?- let limitName: String?let generatedAt: Date- let fiveHour: QuotaWindow- let weekly: QuotaWindow+ let limits: [CodexQuotaLimitSnapshot]let usage: CodexUsageSnapshot?+ var accountLabel: String {+ account.displayName+ }++ var planLabel: String? {+ account.planType ?? planType+ }+}++nonisolated struct CodexQuotaLimitSnapshot: Equatable, Identifiable {+ let limitId: String+ let limitName: String?+ let windows: [QuotaWindow]++ var id: String { limitId }+var title: String {if let limitName, !limitName.isEmpty {- return limitName+ return limitName.capitalizingFirstLetter()}- return "Codex"- }-- var accountLabel: String {- account?.displayName ?? "未登录"+ return limitId.capitalizingFirstLetter()}-- var planLabel: String? {- account?.planType ?? planType+}++nonisolated private extension String {+ func capitalizingFirstLetter() -> String {+ guard let first else {+ return self+ }++ return first.uppercased() + dropFirst()}}@@ -58,21 +74,17 @@ nonisolated struct CodexAccount: Decodable, Equatable {nonisolated struct AccountReadResponse: Decodable {let account: CodexAccount?- let requiresOpenaiAuth: Bool}nonisolated struct QuotaWindow: Equatable, Identifiable {- enum Kind: String {- case fiveHour- case weekly- }-- let kind: Kind- let label: String+ let id: String+ let windowDurationMins: Int?let usedPercent: Int?let resetsAt: Date?- var id: String { kind.rawValue }+ var label: String {+ Self.windowLabel(for: windowDurationMins)+ }var remainingPercent: Int {guard let usedPercent else {@@ -85,18 +97,31 @@ nonisolated struct QuotaWindow: Equatable, Identifiable {var hasData: Bool {usedPercent != nil}++ private static func windowLabel(for minutes: Int?) -> String {+ guard let minutes, minutes > 0 else {+ return "额度"+ }++ if minutes.isMultiple(of: 1_440) {+ return "\(minutes / 1_440) 天"+ }++ if minutes.isMultiple(of: 60) {+ return "\(minutes / 60) 小时"+ }++ return "\(minutes) 分钟"+ }}nonisolated struct AccountRateLimitsResponse: Decodable {let rateLimits: RateLimitSnapshotlet rateLimitsByLimitId: [String: RateLimitSnapshot]?-- var codexSnapshot: RateLimitSnapshot {- rateLimitsByLimitId?["codex"] ?? rateLimits- }}nonisolated struct RateLimitSnapshot: Decodable {+ let limitId: String?let limitName: String?let planType: String?let primary: RateLimitWindow?@@ -124,23 +149,18 @@ nonisolated struct UsageSummary: Decodable, Equatable {let peakDailyTokens: Int}-nonisolated struct DailyUsageBucket: Decodable, Equatable {+nonisolated struct DailyUsageBucket: Decodable, Equatable, Identifiable {let startDate: Stringlet tokens: Int++ var id: String { startDate }}nonisolated struct CodexUsageSnapshot: Equatable {- struct Day: Equatable, Identifiable {- let startDate: String- let tokens: Int-- var id: String { startDate }- }-let summary: UsageSummarylet dailyBuckets: [DailyUsageBucket]- func recentDays(count: Int, endingDaysAgo: Int = 0) -> [Day] {+ func recentDays(count: Int, endingDaysAgo: Int) -> [DailyUsageBucket] {let calendar = Calendar.currentlet today = calendar.startOfDay(for: Date())let tokensByDate = dailyBuckets.reduce(into: [String: Int]()) { result, bucket in@@ -153,7 +173,7 @@ nonisolated struct CodexUsageSnapshot: Equatable {}let startDate = Self.dayFormatter.string(from: date)- return Day(startDate: startDate, tokens: tokensByDate[startDate] ?? 0)+ return DailyUsageBucket(startDate: startDate, tokens: tokensByDate[startDate] ?? 0)}}@@ -176,67 +196,74 @@ nonisolated extension CodexQuotaSnapshot {throw CodexRateLimitError.notLoggedIn}- let snapshot = rateLimitsResponse.codexSnapshot+ let limits = Self.orderedSnapshots(from: rateLimitsResponse).compactMap { entry in+ CodexQuotaLimitSnapshot(limitId: entry.limitId, snapshot: entry.snapshot)+ }- try self.init(- account: account,- snapshot: snapshot,- usageResponse: usageResponse,- generatedAt: generatedAt- )- }-- private init(- account: CodexAccount?,- snapshot: RateLimitSnapshot,- usageResponse: AccountUsageResponse?,- generatedAt: Date- ) throws {- guard let primary = snapshot.primary else {- throw CodexRateLimitError.missingRateLimitWindow("5 小时额度")+ guard !limits.isEmpty else {+ throw CodexRateLimitError.missingRateLimitWindow}self.init(account: account,- planType: snapshot.planType,- limitName: snapshot.limitName,+ planType: rateLimitsResponse.rateLimits.planType,generatedAt: generatedAt,- fiveHour: QuotaWindow(- kind: .fiveHour,- label: Self.windowLabel(for: primary.windowDurationMins, fallback: "5 小时"),- usedPercent: primary.usedPercent,- resetsAt: primary.resetDate- ),- weekly: QuotaWindow(- kind: .weekly,- label: Self.windowLabel(for: snapshot.secondary?.windowDurationMins, fallback: "7 天"),- usedPercent: snapshot.secondary?.usedPercent,- resetsAt: snapshot.secondary?.resetDate- ),+ limits: limits,usage: usageResponse.map {CodexUsageSnapshot(summary: $0.summary, dailyBuckets: $0.dailyUsageBuckets)})}- private static func windowLabel(for minutes: Int?, fallback: String) -> String {- guard let minutes, minutes > 0 else {- return fallback- }+ /// 展示顺序: 顶层 rateLimits 指向的主 limit 置顶, 其余按名称排序+ private static func orderedSnapshots(+ from response: AccountRateLimitsResponse+ ) -> [(limitId: String, snapshot: RateLimitSnapshot)] {+ let primaryLimitId = response.rateLimits.limitId ?? "codex"- if minutes < 60 {- return "\(minutes) 分钟"+ guard let byLimitId = response.rateLimitsByLimitId, !byLimitId.isEmpty else {+ return [(primaryLimitId, response.rateLimits)]}- if minutes.isMultiple(of: 1_440) {- return "\(minutes / 1_440) 天"- }+ return byLimitId+ .map { (limitId: $0.key, snapshot: $0.value) }+ .sorted { lhs, rhs in+ if (lhs.limitId == primaryLimitId) != (rhs.limitId == primaryLimitId) {+ return lhs.limitId == primaryLimitId+ }++ return lhs.limitId.localizedStandardCompare(rhs.limitId) == .orderedAscending+ }+ }+}++nonisolated extension CodexQuotaLimitSnapshot {+ init?(limitId: String, snapshot: RateLimitSnapshot) {+ let windows = [("primary", snapshot.primary), ("secondary", snapshot.secondary)]+ .compactMap { id, window in+ window.map { QuotaWindow(id: id, window: $0) }+ }- if minutes.isMultiple(of: 60) {- return "\(minutes / 60) 小时"+ guard !windows.isEmpty else {+ return nil}- return "\(minutes) 分钟"+ self.init(+ limitId: limitId,+ limitName: snapshot.limitName,+ windows: windows+ )+ }+}++nonisolated extension QuotaWindow {+ init(id: String, window: RateLimitWindow) {+ self.init(+ id: id,+ windowDurationMins: window.windowDurationMins,+ usedPercent: window.usedPercent,+ resetsAt: window.resetDate+ )}}@@ -245,7 +272,7 @@ nonisolated enum CodexRateLimitError: LocalizedError {case serverStartFailed(String)case serverTimeout(String)case serverError(String)- case missingRateLimitWindow(String)+ case missingRateLimitWindowcase notLoggedIncase authenticationRequired@@ -259,8 +286,8 @@ nonisolated enum CodexRateLimitError: LocalizedError {return "Codex app-server 响应超时: \(step)"case .serverError(let message):return "Codex app-server 返回错误: \(message)"- case .missingRateLimitWindow(let name):- return "查询不到 \(name)"+ case .missingRateLimitWindow:+ return "查询不到数据"case .notLoggedIn:return "Codex 未登录"case .authenticationRequired:diff --git a/CodexBar/RateLimitsMenuView.swift b/CodexBar/RateLimitsMenuView.swiftindex 4f2fbdc..5dc9036 100644--- a/CodexBar/RateLimitsMenuView.swift+++ b/CodexBar/RateLimitsMenuView.swift@@ -27,8 +27,12 @@ struct RateLimitsMenuView: View {.padding(Metrics.padding).onAppear {viewModel.refreshIfNeeded()- loginItemSettings.refresh()showsControls = NSEvent.modifierFlags.contains(.option)++ // 开机自启状态读取是同步 XPC, 仅在设置区可见时刷新+ if showsControls {+ loginItemSettings.refresh()+ }}}}@@ -51,10 +55,7 @@ private extension RateLimitsMenuView {Group {accountRow(title: snapshot.accountLabel, plan: snapshot.planLabel)- VStack(spacing: 8) {- QuotaRow(window: snapshot.fiveHour)- QuotaRow(window: snapshot.weekly)- }+ quotaLimitsView(snapshot.limits)if let usage = snapshot.usage {UsageSummaryView(usage: usage)@@ -64,11 +65,8 @@ private extension RateLimitsMenuView {}// 未登录时旧数据已过期, 置灰提示不可信.opacity(viewModel.requiresLogin ? 0.4 : 1)- } else if viewModel.isRefreshing {- accountRow(title: "Codex")- loadingView} else {- accountRow(title: "Codex")+ accountRow(title: "")emptyView}}@@ -95,25 +93,42 @@ private extension RateLimitsMenuView {}}- var loadingView: some View {- HStack(spacing: 10) {- ProgressView()- .controlSize(.small)-- Text("正在获取数据")- .foregroundStyle(.secondary)- }- .frame(maxWidth: .infinity, alignment: .leading)- .padding(.vertical, Metrics.loadingVerticalPadding)- }var emptyView: some View {Text("暂无数据").foregroundStyle(.secondary)- .frame(maxWidth: .infinity, alignment: .leading)+ .frame(maxWidth: .infinity, alignment: .center).padding(.vertical, Metrics.loadingVerticalPadding)}+ func quotaLimitsView(_ limits: [CodexQuotaLimitSnapshot]) -> some View {+ VStack(alignment: .leading, spacing: 8) {+ ForEach(limits) { limit in+ if limit.id != limits.first?.id {+ Divider()+ }++ quotaLimitSection(limit)+ }+ }+ }++ func quotaLimitSection(_ limit: CodexQuotaLimitSnapshot) -> some View {+ VStack(alignment: .leading, spacing: 6) {+ Text(limit.title)+ .font(.caption.weight(.semibold))+ .foregroundStyle(.primary)+ .lineLimit(1)+ .truncationMode(.middle)++ VStack(spacing: 8) {+ ForEach(limit.windows) { window in+ QuotaRow(window: window)+ }+ }+ }+ }+func accountRow(title: String, plan: String? = nil) -> some View {HStack(spacing: 8) {Image(systemName: "person.fill")@@ -130,7 +145,7 @@ private extension RateLimitsMenuView {if viewModel.isRefreshing {ProgressView()- .controlSize(.small)+ .controlSize(.mini).padding(.leading, 2)}@@ -168,7 +183,16 @@ private extension RateLimitsMenuView {var settingsView: some View {HStack {- loginItemToggle+ Toggle(+ "开机自动启动",+ isOn: Binding(+ get: { loginItemSettings.isEnabled },+ set: { loginItemSettings.setEnabled($0) }+ )+ )+ .toggleStyle(.switch)+ .controlSize(.small)+ .font(.caption)Spacer()@@ -180,25 +204,6 @@ private extension RateLimitsMenuView {}}- var loginItemToggle: some View {- settingsToggle(- "开机自动启动",- isEnabled: loginItemSettings.isEnabled,- setEnabled: { loginItemSettings.setEnabled($0) }- )- }-- func settingsToggle(- _ title: String,- isEnabled: Bool,- setEnabled: @escaping (Bool) -> Void- ) -> some View {- Toggle(title, isOn: Binding(get: { isEnabled }, set: setEnabled))- .toggleStyle(.switch)- .controlSize(.small)- .font(.caption)- }-@ViewBuilderfunc errorView(_ message: String?) -> some View {if let message {@@ -218,15 +223,15 @@ private extension RateLimitsMenuView {}()static let appVersionLabel: String = {- let version = Bundle.main.object(forInfoDictionaryKey: "CFBundleShortVersionString") as? String ?? "--"+ let version = Bundle.main.shortVersionString ?? "--"return "App 版本: v\(version)"}()}private struct UsageSummaryView: View {let usage: CodexUsageSnapshot- private let days: [CodexUsageSnapshot.Day]- @State private var hoveredDay: CodexUsageSnapshot.Day?+ private let days: [DailyUsageBucket]+ @State private var hoveredDay: DailyUsageBucket?init(usage: CodexUsageSnapshot) {self.usage = usage@@ -257,10 +262,7 @@ private struct UsageSummaryView: View {.foregroundStyle(.secondary).frame(maxWidth: .infinity, alignment: alignment)- Text(TokenCountFormatter.string(from: value))- .font(.caption.monospacedDigit().weight(.semibold))- .lineLimit(1)- .minimumScaleFactor(0.8)+ TokenCountText(tokens: value).frame(maxWidth: .infinity, alignment: alignment)}.frame(width: 96)@@ -268,12 +270,16 @@ private struct UsageSummaryView: View {}private struct UsageHeatmap: View {- let days: [CodexUsageSnapshot.Day]- @Binding var hoveredDay: CodexUsageSnapshot.Day?+ let days: [DailyUsageBucket]+ @Binding var hoveredDay: DailyUsageBucket?@State private var hoverLocation: CGPoint = .zero+ // hover 期间 body 频繁重算, 峰值只在构建时求一次+ private let peakTokens: Int- private var peakTokens: Int {- max(days.lazy.map(\.tokens).max() ?? 0, 1)+ init(days: [DailyUsageBucket], hoveredDay: Binding<DailyUsageBucket?>) {+ self.days = days+ self._hoveredDay = hoveredDay+ self.peakTokens = max(days.lazy.map(\.tokens).max() ?? 0, 1)}var body: some View {@@ -325,12 +331,12 @@ private struct UsageHeatmap: View {day: day,percent: Double(day.tokens) / Double(peakTokens),isHovered: hoveredDay?.id == day.id- ) { hoveredDay, location in- self.hoveredDay = hoveredDay+ ) { location in+ hoveredDay = dayhoverLocation = location- } onEnded: { day in- if self.hoveredDay?.id == day.id {- self.hoveredDay = nil+ } onEnded: {+ if hoveredDay?.id == day.id {+ hoveredDay = nil}}} else {@@ -373,11 +379,11 @@ private extension UsageHeatmap {}private struct UsageHeatmapSquare: View {- let day: CodexUsageSnapshot.Day+ let day: DailyUsageBucketlet percent: Doublelet isHovered: Bool- let onActive: (CodexUsageSnapshot.Day, CGPoint) -> Void- let onEnded: (CodexUsageSnapshot.Day) -> Void+ let onActive: (CGPoint) -> Void+ let onEnded: () -> Voidvar body: some View {GeometryReader { proxy in@@ -393,9 +399,9 @@ private struct UsageHeatmapSquare: View {switch phase {case .active(let location):let frame = proxy.frame(in: .named(UsageHeatmap.Metrics.coordinateSpaceName))- onActive(day, CGPoint(x: frame.minX + location.x, y: frame.minY + location.y))+ onActive(CGPoint(x: frame.minX + location.x, y: frame.minY + location.y))case .ended:- onEnded(day)+ onEnded()}}}@@ -428,7 +434,7 @@ private struct UsageHeatmapSquare: View {}private struct UsageHeatmapTooltip: View {- let day: CodexUsageSnapshot.Day+ let day: DailyUsageBucketvar body: some View {VStack(alignment: .leading, spacing: 2) {@@ -436,11 +442,8 @@ private struct UsageHeatmapTooltip: View {.font(.caption2.monospacedDigit()).foregroundStyle(Color(nsColor: .secondaryLabelColor))- Text(TokenCountFormatter.string(from: day.tokens))- .font(.caption.monospacedDigit().weight(.semibold))+ TokenCountText(tokens: day.tokens).foregroundStyle(Color(nsColor: .labelColor))- .lineLimit(1)- .minimumScaleFactor(0.8)}.padding(.horizontal, 7).padding(.vertical, 5)@@ -454,6 +457,17 @@ private struct UsageHeatmapTooltip: View {}}+private struct TokenCountText: View {+ let tokens: Int++ var body: some View {+ Text(TokenCountFormatter.string(from: tokens))+ .font(.caption.monospacedDigit().weight(.semibold))+ .lineLimit(1)+ .minimumScaleFactor(0.8)+ }+}+private enum TokenCountFormatter {static func string(from tokens: Int) -> String {if tokens >= 1_000_000_000 {@@ -476,9 +490,3 @@ private enum TokenCountFormatter {return formatter}()}--#Preview {- let viewModel = RateLimitsViewModel()- return RateLimitsMenuView(viewModel: viewModel)- .frame(width: RateLimitsMenuView.menuWidth)-}diff --git a/CodexBar/RateLimitsViewModel.swift b/CodexBar/RateLimitsViewModel.swiftindex 3e5772f..ea866d1 100644--- a/CodexBar/RateLimitsViewModel.swift+++ b/CodexBar/RateLimitsViewModel.swift@@ -33,7 +33,7 @@ final class RateLimitsViewModel: ObservableObject {}func refreshIfNeeded() {- guard snapshot == nil || Date().timeIntervalSince(snapshot?.generatedAt ?? .distantPast) > Self.refreshInterval else {+ guard Date().timeIntervalSince(snapshot?.generatedAt ?? .distantPast) > Self.refreshInterval else {return}diff --git a/Images/screenshot.png b/Images/screenshot.pngindex e0b7952..c81fff2 100644Binary files a/Images/screenshot.png and b/Images/screenshot.png differdiff --git a/README.md b/README.mdindex 7e6f70d..db50ee1 100644--- a/README.md+++ b/README.md@@ -10,7 +10,7 @@ CodexBar 是一个轻量级 macOS 菜单栏应用。它直接连接本机 Codex## 特性-- **额度一目了然**: 分段电量条展示各时间窗口(如 5 小时、7 天)的剩余额度,附剩余百分比和重置时间+- **额度一目了然**: 分段电量条展示各时间窗口 (如 5 小时、7 天) 的剩余额度,附剩余百分比和重置时间- **token 贡献墙**: 30 周的每日 token 用量热力图,鼠标悬停查看单日明细,同时展示累计 token 和单日峰值- **自动刷新**: 每分钟后台刷新一次,弹窗未打开也保持最新;双击账号图标可手动刷新- **开机自启**: 按住 Option 点击菜单栏图标打开设置区diff --git a/Updates/appcast.xml b/Updates/appcast.xmlindex e2d9160..39112d5 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 1.3.0</title>+ <sparkle:version>3</sparkle:version>+ <sparkle:shortVersionString>1.3.0</sparkle:shortVersionString>+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/1.3.0.html</sparkle:releaseNotesLink>+ <pubDate>Fri, 12 Jun 2026 16:48:27 +0800</pubDate>+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v1.3.0.dmg" sparkle:edSignature="9d/fZdrMGXjOlKoKOTRutWZcNIdjxxQEbK0WqV+vg2rlEyaUYK973gD/JlX6S6+mhrSFQjAPdw5nd3y/C4j0CA==" length="1330236" type="application/octet-stream"/>+ </item><item><title>CodexBar.app 1.2.1</title><sparkle:version>2</sparkle:version>