CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
feat: 支持日周用量切换并保留显示偏好
Bobea55c2424544
diff --git a/CodexBar/Models/UsageHeatmapDay.swift b/CodexBar/Models/UsageHeatmapDay.swiftindex 12854af..c61a3c4 100644--- a/CodexBar/Models/UsageHeatmapDay.swift+++ b/CodexBar/Models/UsageHeatmapDay.swift@@ -75,3 +75,71 @@ nonisolated struct UsageHeatmapDay: Equatable, Identifiable {}}}++nonisolated enum UsageHeatmapMode: String {+ case daily+ case weekly+}++/// 展示期间的汇总, 周视图只合并已有日期, 区间仍覆盖完整的一周+nonisolated struct UsageHeatmapPeriod: Equatable {+ let startDate: String+ let endDate: String+ let tokenState: UsageHeatmapTokenState+ let activityData: ActivityDataMetrics+ let tokenUsage: TokenUsage?++ var tokensForHeatmap: Int {+ tokenState.count ?? 0+ }++ init?(days: [UsageHeatmapDay], endDate: String? = nil) {+ guard let first = days.first, let last = days.last else { return nil }+ startDate = first.startDate+ self.endDate = endDate ?? last.startDate+ tokenState = Self.totalTokenState(days)+ // 每日快照不含会话标识, 周计数沿用每日统计之和+ activityData = days.dropFirst().reduce(first.activityData) { $0.adding($1.activityData) }+ let usages = days.compactMap(\.tokenUsage)+ tokenUsage = usages.dropFirst().reduce(usages.first) { total, usage in+ total?.adding(usage)+ }+ }++ func filledRowCount(peakTokens: Int) -> Int {+ guard tokensForHeatmap > 0, peakTokens > 0 else { return 0 }+ let fraction = min(Double(tokensForHeatmap) / Double(peakTokens), 1)+ return max(1, Int(ceil(fraction * Double(CodexWeekGrid.rowCount))))+ }++ static func weeks(in days: [UsageHeatmapDay?]) -> [UsageHeatmapPeriod?] {+ stride(from: 0, to: days.count, by: CodexWeekGrid.rowCount).map { start in+ let weekDays = days[start ..< min(start + CodexWeekGrid.rowCount, days.count)].compactMap(\.self)+ guard let first = weekDays.first,+ let startDate = CodexDateFormat.dayDate(from: first.startDate),+ let endDate = CodexDateFormat.localGregorianCalendar.date(byAdding: .day, value: CodexWeekGrid.rowCount - 1, to: startDate) else {+ return nil+ }+ return UsageHeatmapPeriod(days: weekDays, endDate: CodexDateFormat.dayString(from: endDate))+ }+ }++ private static func totalTokenState(_ days: [UsageHeatmapDay]) -> UsageHeatmapTokenState {+ var total = 0+ var hasAvailableDay = false+ for day in days {+ switch day.tokenState {+ case let .available(count):+ let sum = total.addingReportingOverflow(count)+ guard !sum.overflow else { return .unavailable }+ total = sum.partialValue+ hasAvailableDay = true+ case .pending:+ continue+ case .unavailable:+ return .unavailable+ }+ }+ return hasAvailableDay ? .available(total) : .pending+ }+}diff --git a/CodexBar/Resources/Localizable.xcstrings b/CodexBar/Resources/Localizable.xcstringsindex 9caa80d..91f0c3f 100644--- a/CodexBar/Resources/Localizable.xcstrings+++ b/CodexBar/Resources/Localizable.xcstrings@@ -6417,6 +6417,22 @@}}},+ "usage.heatmap.daily-data" : {+ "localizations" : {+ "en" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Daily"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "日数据"+ }+ }+ }+ },"usage.heatmap.past-weeks" : {"localizations" : {"en" : {@@ -6465,6 +6481,22 @@}}},+ "usage.heatmap.weekly-data" : {+ "localizations" : {+ "en" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "Weekly"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "周数据"+ }+ }+ }+ },"usage.status.last-updated" : {"localizations" : {"en" : {diff --git a/CodexBar/Services/Settings/MainPanelSettings.swift b/CodexBar/Services/Settings/MainPanelSettings.swiftindex 85bcdcd..017b567 100644--- a/CodexBar/Services/Settings/MainPanelSettings.swift+++ b/CodexBar/Services/Settings/MainPanelSettings.swift@@ -48,11 +48,12 @@ nonisolated struct MainPanelLayout: Equatable, Sendable {}}-/// 主面板区域布局与动画效果偏好+/// 主面板布局 动画和热力图显示偏好@MainActorfinal class MainPanelSettings: ObservableObject {@Published private(set) var layout: MainPanelLayout@Published private(set) var areAnimationsEnabled: Bool+ @Published private(set) var usageHeatmapMode: UsageHeatmapModeprivate let defaults: UserDefaults@@ -60,6 +61,7 @@ final class MainPanelSettings: ObservableObject {self.defaults = defaultslayout = Self.loadLayout(from: defaults)areAnimationsEnabled = Self.loadAnimationsEnabled(from: defaults)+ usageHeatmapMode = Self.loadUsageHeatmapMode(from: defaults)}func refresh() {@@ -68,6 +70,11 @@ final class MainPanelSettings: ObservableObject {areAnimationsEnabled = loadedAnimationsEnabled}+ let loadedUsageHeatmapMode = Self.loadUsageHeatmapMode(from: defaults)+ if loadedUsageHeatmapMode != usageHeatmapMode {+ usageHeatmapMode = loadedUsageHeatmapMode+ }+publish(Self.loadLayout(from: defaults))}@@ -81,6 +88,15 @@ final class MainPanelSettings: ObservableObject {areAnimationsEnabled = enabled}+ func setUsageHeatmapMode(_ mode: UsageHeatmapMode) {+ guard mode != usageHeatmapMode else {+ return+ }++ defaults.set(mode.rawValue, forKey: Self.usageHeatmapModeKey)+ usageHeatmapMode = mode+ }+func setSection(_ section: MainPanelSection,isVisible: Bool,@@ -193,7 +209,12 @@ final class MainPanelSettings: ObservableObject {layout.orderedSections.map(\.rawValue).joined(separator: ",")}+ private static func loadUsageHeatmapMode(from defaults: UserDefaults) -> UsageHeatmapMode {+ defaults.string(forKey: usageHeatmapModeKey).flatMap(UsageHeatmapMode.init(rawValue:)) ?? .daily+ }+private static let sectionOrderKey = "MainPanel.sectionOrder"private static let hiddenSectionsKey = "MainPanel.hiddenSections"private static let animationsEnabledKey = "MainPanel.areAnimationsEnabled"+ private static let usageHeatmapModeKey = "MainPanel.usageHeatmapMode"}diff --git a/CodexBar/Services/Sync/SyncService.swift b/CodexBar/Services/Sync/SyncService.swiftindex d776077..e3bf462 100644--- a/CodexBar/Services/Sync/SyncService.swift+++ b/CodexBar/Services/Sync/SyncService.swift@@ -868,12 +868,12 @@ private extension SyncService {}guard let value = IORegistryEntryCreateCFProperty(- service,- "IOPlatformUUID" as CFString,- kCFAllocatorDefault,- 0- )?.takeRetainedValue() as? String,- !value.isEmpty else {+ service,+ "IOPlatformUUID" as CFString,+ kCFAllocatorDefault,+ 0+ )?.takeRetainedValue() as? String,+ !value.isEmpty else {throw SyncError.missingIOPlatformUUID}diff --git a/CodexBar/Views/Menu/CodexStatusMenuView.swift b/CodexBar/Views/Menu/CodexStatusMenuView.swiftindex fa87048..5d30500 100644--- a/CodexBar/Views/Menu/CodexStatusMenuView.swift+++ b/CodexBar/Views/Menu/CodexStatusMenuView.swift@@ -207,6 +207,10 @@ private extension CodexStatusMenuView {UsageSummaryView(usage: viewModel.snapshot?.usage,history: historyViewModel.snapshot,+ mode: Binding(+ get: { mainPanelSettings.usageHeatmapMode },+ set: { mainPanelSettings.setUsageHeatmapMode($0) }+ ),isStale: viewModel.snapshot?.isUsageStale ?? false,onHoverContextChange: onUsageHeatmapHoverChange)diff --git a/CodexBar/Views/Menu/HeatmapDetailView.swift b/CodexBar/Views/Menu/HeatmapDetailView.swiftindex 8655738..315bac8 100644--- a/CodexBar/Views/Menu/HeatmapDetailView.swift+++ b/CodexBar/Views/Menu/HeatmapDetailView.swift@@ -68,7 +68,7 @@ struct HeatmapDetailView: View {VStack(alignment: .leading, spacing: Metrics.sectionSpacing) {columnTitle("usage.heatmap.token-usage-metrics")- dailyTokenUsageMetrics+ tokenUsageMetrics}.frame(minWidth: 0, maxWidth: .infinity)}@@ -83,15 +83,15 @@ struct HeatmapDetailView: View {.frame(height: Metrics.metricRowHeight)}- private var dailyTokenUsageMetrics: some View {- let tokenUsage = context.day.tokenUsage- let cacheHitRate = tokenUsage?.cacheHitRate ?? 0+ private var tokenUsageMetrics: some View {+ let tokenUsage = context.period.tokenUsage+ let cacheHitRate = tokenUsage.map { $0.cacheHitRate ?? 0 } ?? (context.mode == .daily ? 0 : nil)return Grid(alignment: .leading, horizontalSpacing: Metrics.metricRowSpacing, verticalSpacing: Metrics.metricSpacing) {- dailyTokenUsageRow("usage.token-usage.total", tokens: tokenUsage?.totalTokens, tint: .blue)- dailyTokenUsageRow("usage.token-usage.input", tokens: tokenUsage?.inputTokens, tint: .indigo)- dailyTokenUsageRow("usage.token-usage.output", tokens: tokenUsage?.outputTokens, tint: .orange)- dailyTokenUsageRow("usage.token-usage.cached-input", tokens: tokenUsage?.cachedInputTokens, tint: .green)- dailyTokenUsageRow("usage.token-usage.cache-write-input", tokens: tokenUsage?.cacheWriteInputTokens, tint: .purple)+ tokenUsageRow("usage.token-usage.total", tokens: tokenUsage?.totalTokens, tint: .blue)+ tokenUsageRow("usage.token-usage.input", tokens: tokenUsage?.inputTokens, tint: .indigo)+ tokenUsageRow("usage.token-usage.output", tokens: tokenUsage?.outputTokens, tint: .orange)+ tokenUsageRow("usage.token-usage.cached-input", tokens: tokenUsage?.cachedInputTokens, tint: .green)+ tokenUsageRow("usage.token-usage.cache-write-input", tokens: tokenUsage?.cacheWriteInputTokens, tint: .purple)metricRowLayout {metricDot(tint: .teal)Text("usage.token-usage.cache-hit-rate")@@ -99,16 +99,16 @@ struct HeatmapDetailView: View {.fixedSize(horizontal: true, vertical: false).frame(height: Metrics.metricRowHeight)fittingMetricValue(- cacheHitRate.formatted(.percent.precision(.fractionLength(0 ... 1))),- comparison: cacheHitRate+ cacheHitRate?.formatted(.percent.precision(.fractionLength(0 ... 1))) ?? "--",+ comparison: cacheHitRate ?? 0)}- dailyTokenUsageRow("usage.token-usage.reasoning-output", tokens: tokenUsage?.reasoningOutputTokens, tint: .cyan)+ tokenUsageRow("usage.token-usage.reasoning-output", tokens: tokenUsage?.reasoningOutputTokens, tint: .cyan)}}- private func dailyTokenUsageRow(_ title: LocalizedStringKey, tokens: Int64?, tint: Color) -> some View {- let count = tokens ?? 0+ private func tokenUsageRow(_ title: LocalizedStringKey, tokens: Int64?, tint: Color) -> some View {+ let count = tokens ?? (context.mode == .daily ? 0 : nil)return metricRowLayout {metricDot(tint: tint)Text(title)@@ -116,7 +116,7 @@ struct HeatmapDetailView: View {.lineLimit(1).fixedSize(horizontal: true, vertical: false).frame(height: Metrics.metricRowHeight)- fittingMetricValue(TokenCountFormatter.parts(from: Int(count)).text, comparison: Double(count))+ fittingMetricValue(count.map { TokenCountFormatter.parts(from: Int($0)).text } ?? "--", comparison: Double(count ?? 0))}}@@ -134,7 +134,7 @@ struct HeatmapDetailView: View {.fixedSize(horizontal: true, vertical: false).frame(height: Metrics.metricRowHeight)- fittingModelValue(context.day.activityData.mostUsedModel ?? "--")+ fittingModelValue(context.period.activityData.mostUsedModel ?? "--")}}@@ -164,48 +164,55 @@ struct HeatmapDetailView: View {[ActivityMetricRow(label: String(localized: "history.activity-data.threads"),- value: context.day.activityData.threadCount,+ value: context.period.activityData.threadCount,tint: .green),ActivityMetricRow(label: String(localized: "history.activity-data.turns"),- value: context.day.activityData.turnCount,+ value: context.period.activityData.turnCount,tint: .teal),ActivityMetricRow(label: String(localized: "history.activity-data.subagents"),- value: context.day.activityData.subagentCount,+ value: context.period.activityData.subagentCount,tint: .indigo),ActivityMetricRow(label: String(localized: "history.activity-data.tool-calls"),- value: context.day.activityData.toolCallCount,+ value: context.period.activityData.toolCallCount,tint: .orange),ActivityMetricRow(label: String(localized: "history.activity-data.approvals"),- value: context.day.activityData.approvalRequestedCount,+ value: context.period.activityData.approvalRequestedCount,tint: .red),ActivityMetricRow(label: String(localized: "history.activity-data.compactions"),- value: context.day.activityData.contextCompactionCount,+ value: context.period.activityData.contextCompactionCount,tint: .purple)]}private var dateText: some View {- AnimatedDateText(startDate: context.day.startDate, font: dateFont)- .foregroundStyle(Color.codexSecondaryLabel)- .lineLimit(1)- .fixedSize(horizontal: true, vertical: false)- .layoutPriority(1)+ HStack(spacing: 0) {+ AnimatedDateText(startDate: context.period.startDate, font: dateFont)+ if context.mode == .weekly {+ Text(verbatim: " ~ ")+ .font(dateFont)+ AnimatedDateText(startDate: context.period.endDate, font: dateFont)+ }+ }+ .foregroundStyle(Color.codexSecondaryLabel)+ .lineLimit(1)+ .fixedSize(horizontal: true, vertical: false)+ .layoutPriority(1)}private var tokenText: some View {HeatmapTokenText(- tokenState: context.day.tokenState,+ tokenState: context.period.tokenState,font: tokenFont,numericWidth: Metrics.tokenMinimumWidth,unitWidth: Metrics.tokenUnitWidth@@ -221,7 +228,7 @@ struct HeatmapDetailView: View {}private var tokenIntensityLevel: Int {- guard context.day.tokensForHeatmap > 0 else {+ guard context.period.tokensForHeatmap > 0 else {return 0}@@ -237,11 +244,11 @@ struct HeatmapDetailView: View {return 0}- return min(max(Double(context.day.tokensForHeatmap) / Double(context.peakTokens), 0), 1)+ return min(max(Double(context.period.tokensForHeatmap) / Double(context.peakTokens), 0), 1)}private func tokenIntensityFill(for index: Int) -> Color {- guard context.day.tokenCount != nil else {+ guard context.period.tokenState.count != nil else {return Color.secondary.opacity(colorScheme == .dark ? 0.18 : 0.12)}@@ -255,7 +262,7 @@ struct HeatmapDetailView: View {}private func metricRow(_ row: ActivityMetricRow) -> some View {- let count = row.value ?? 0+ let count = row.value ?? (context.mode == .daily ? 0 : nil)return metricRowLayout {metricDot(tint: row.tint)Text(row.label)@@ -263,7 +270,7 @@ struct HeatmapDetailView: View {.fixedSize(horizontal: true, vertical: false).frame(height: Metrics.metricRowHeight)- fittingMetricValue(String(count), comparison: Double(count))+ fittingMetricValue(count.map(String.init) ?? "--", comparison: Double(count ?? 0))}}diff --git a/CodexBar/Views/Menu/UsageHeatmap.swift b/CodexBar/Views/Menu/UsageHeatmap.swiftindex f221f33..f6a4e69 100644--- a/CodexBar/Views/Menu/UsageHeatmap.swift+++ b/CodexBar/Views/Menu/UsageHeatmap.swift@@ -3,7 +3,8 @@ import SwiftUI/// hover 详情面板需要的完整上下文, 包括屏幕坐标和峰值 tokennonisolated struct UsageHeatmapHoverContext: Equatable {- let day: UsageHeatmapDay+ let period: UsageHeatmapPeriod+ let mode: UsageHeatmapModelet isStale: Boollet alignmentScreenFrame: CGRect?let preferredSide: UsageHeatmapDetailSide@@ -15,7 +16,7 @@ nonisolated enum UsageHeatmapDetailSide: Equatable {case right}-/// hover 单元格在热力图中的列/行位置, 用于吸附和详情定位+/// 日期标识跟随数据刷新, 列/行位置只记录指针命中时的坐标nonisolated struct UsageHeatmapSelection: Equatable {let dateID: Stringlet column: Int@@ -24,6 +25,34 @@ nonisolated struct UsageHeatmapSelection: Equatable {func day(in days: [UsageHeatmapDay?]) -> UsageHeatmapDay? {days.lazy.compactMap(\.self).first { $0.id == dateID }}++ func currentColumn(in days: [UsageHeatmapDay?]) -> Int? {+ days.firstIndex { $0?.id == dateID }.map { $0 / CodexWeekGrid.rowCount }+ }++ func period(in days: [UsageHeatmapDay?], weeks: [UsageHeatmapPeriod?], mode: UsageHeatmapMode) -> UsageHeatmapPeriod? {+ guard let index = days.firstIndex(where: { $0?.id == dateID }) else { return nil }+ switch mode {+ case .daily:+ return days[index].flatMap { UsageHeatmapPeriod(days: [$0]) }+ case .weekly:+ let column = index / CodexWeekGrid.rowCount+ return weeks.indices.contains(column) ? weeks[column] : nil+ }+ }++ static func at(column: Int, row: Int, in days: [UsageHeatmapDay?], mode: UsageHeatmapMode) -> UsageHeatmapSelection? {+ guard column >= 0, column < (days.count + CodexWeekGrid.rowCount - 1) / CodexWeekGrid.rowCount,+ (0 ..< CodexWeekGrid.rowCount).contains(row) else { return nil }+ let selectedRow = mode == .daily ? row : 0+ let index = column * CodexWeekGrid.rowCount + selectedRow+ guard days.indices.contains(index), let day = days[index] else { return nil }+ return UsageHeatmapSelection(dateID: day.id, column: column, row: selectedRow)+ }++ func highlights(column: Int, row: Int, in days: [UsageHeatmapDay?], mode: UsageHeatmapMode) -> Bool {+ Self.at(column: column, row: row, in: days, mode: mode)?.dateID == dateID+ }}// MARK: - 热力图与 hover 吸附@@ -31,53 +60,34 @@ nonisolated struct UsageHeatmapSelection: Equatable {/// 近期 Token 用量热力图, hover 时把指针吸附到最近的有效日期格struct UsageHeatmap: View {let days: [UsageHeatmapDay?]- let onScreenFrameChange: (CGRect?) -> Void+ let weeks: [UsageHeatmapPeriod?]+ @Binding var mode: UsageHeatmapMode@Binding var selection: UsageHeatmapSelection?- @Environment(\.mainPanelEntranceAnimationsEnabled) private var animatesEntrance+ let peakTokens: Int+ var onScreenFrameChange: (CGRect?) -> Void = { _ in }@Environment(\.mainPanelAnimationsEnabled) private var allowsAnimations- @State private var areSquaresRevealed = false- @State private var entranceStartedAt: TimeInterval?- @State private var snapSelection: UsageHeatmapSelection?- @State private var hoverClearTask: Task<Void, Never>?- private let peakTokens: Int-- init(- days: [UsageHeatmapDay?],- selection: Binding<UsageHeatmapSelection?>,- peakTokens: Int,- onScreenFrameChange: @escaping (CGRect?) -> Void = { _ in }- ) {- self.days = days- self.onScreenFrameChange = onScreenFrameChange- _selection = selection- self.peakTokens = peakTokens- }var body: some View {- heatmapGrid- .frame(height: Metrics.height)- .background {- ScreenFrameReader(onChange: onScreenFrameChange)- }- .task {- await revealSquares()- }- .onDisappear {- cancelHoverClearTask()- snapSelection = nil- selection = nil- onScreenFrameChange(nil)- }- }-- private var heatmapGrid: some View {VStack(alignment: .leading, spacing: 6) {- HStack(alignment: .firstTextBaseline) {- Text(LocalizedStringResource("usage.heatmap.past-weeks", defaultValue: "\(Metrics.columnCount, specifier: "%lld")"))- .font(.caption2.weight(.medium))- .foregroundStyle(.secondary)+ HStack(alignment: .firstTextBaseline, spacing: 8) {+ HStack(alignment: .firstTextBaseline, spacing: 4) {+ Text(LocalizedStringResource("usage.heatmap.past-weeks", defaultValue: "\(Metrics.columnCount, specifier: "%lld")"))+ Text(verbatim: "•")+ Button {+ selection = nil+ mode = mode == .daily ? .weekly : .daily+ } label: {+ Text(modeTitle)+ .foregroundStyle(Color.codexSecondaryLabel)+ .numericTransition(value: modeTitle, enabled: allowsAnimations)+ }+ .buttonStyle(ModeButtonStyle())+ }+ .font(.caption2.weight(.medium))+ .foregroundStyle(.secondary)+ .fixedSize()- Spacer()+ Spacer(minLength: 0)if let dateRangeText {Text(dateRangeText)@@ -88,58 +98,151 @@ struct UsageHeatmap: View {}}- HStack(alignment: .top, spacing: Metrics.squareSpacing) {- ForEach(0 ..< Metrics.columnCount, id: \.self) { column in- VStack(spacing: Metrics.squareSpacing) {- ForEach(0 ..< Metrics.rowCount, id: \.self) { row in- let index = column * Metrics.rowCount + row-- if days.indices.contains(index), let day = days[index] {- UsageHeatmapSquare(- day: day,- percent: Double(day.tokensForHeatmap) / Double(peakTokens),- isHovered: snapSelection?.dateID == day.id- )- .opacity(showsSquares ? 1 : 0)- .scaleEffect(showsSquares ? 1 : Metrics.entranceScale)- .animation(- entranceAnimation(column: column, row: row),- value: showsSquares- )- } else {- Color.clear- .frame(width: Metrics.squareSize, height: Metrics.squareSize)- }- }- }- }- }- .frame(width: Metrics.totalWidth, height: Metrics.gridHeight, alignment: .topLeading)- .contentShape(Rectangle())- .onContinuousHover(coordinateSpace: .local) { phase in- switch phase {- case let .active(point):- updatePointerLocation(point)- case .ended:- scheduleDeactivate()- }- }+ UsageHeatmapGrid(days: days, weeks: weeks, mode: mode, selection: $selection, peakTokens: peakTokens)+ // 切换模式重新创建网格, 复用入场动画和任务取消边界+ .id(mode)+ .transition(.identity)}.frame(maxWidth: .infinity, alignment: .leading)+ .frame(height: Metrics.height)+ .background {+ ScreenFrameReader(onChange: onScreenFrameChange)+ }+ .onDisappear {+ onScreenFrameChange(nil)+ }}- private var dateRangeText: String? {- let visibleDays = days.compactMap(\.self)- guard let firstDate = visibleDays.first?.startDate,- let lastDate = visibleDays.last?.startDate else {- return nil+ private struct ModeButtonStyle: ButtonStyle {+ func makeBody(configuration: Configuration) -> some View {+ configuration.label+ }+ }++ private var modeTitle: String {+ switch mode {+ case .daily:+ String(localized: "usage.heatmap.daily-data")+ case .weekly:+ String(localized: "usage.heatmap.weekly-data")}+ }+ private var dateRangeText: String? {+ let firstDate: String?+ let lastDate: String?+ switch mode {+ case .daily:+ let visibleDays = days.compactMap(\.self)+ firstDate = visibleDays.first?.startDate+ lastDate = visibleDays.last?.startDate+ case .weekly:+ let visibleWeeks = weeks.compactMap(\.self)+ firstDate = visibleWeeks.first?.startDate+ lastDate = visibleWeeks.last?.endDate+ }+ guard let firstDate, let lastDate else { return nil }let firstText = localDayText(firstDate)let lastText = localDayText(lastDate)return String(localized: "date-range.closed", defaultValue: "\(firstText)\(lastText)")}+ private func localDayText(_ dayKey: String) -> String {+ guard let date = CodexDateFormat.dayDate(from: dayKey) else {+ return dayKey+ }+ return CodexDateFormat.localDayDisplayString(from: date)+ }+}++/// 网格持有一次入场的动画和 hover 任务, 模式切换时与旧网格一起取消+private struct UsageHeatmapGrid: View {+ typealias Metrics = UsageHeatmap.Metrics++ let days: [UsageHeatmapDay?]+ let weeks: [UsageHeatmapPeriod?]+ let mode: UsageHeatmapMode+ @Binding var selection: UsageHeatmapSelection?+ let peakTokens: Int+ @Environment(\.mainPanelEntranceAnimationsEnabled) private var animatesEntrance+ @Environment(\.colorScheme) private var colorScheme+ @State private var areSquaresRevealed = false+ @State private var entranceStartedAt: TimeInterval?+ @State private var snapSelection: UsageHeatmapSelection?+ @State private var hoverClearTask: Task<Void, Never>?++ var body: some View {+ HStack(alignment: .top, spacing: Metrics.squareSpacing) {+ ForEach(0 ..< Metrics.columnCount, id: \.self) { column in+ VStack(spacing: Metrics.squareSpacing) {+ ForEach(0 ..< Metrics.rowCount, id: \.self) { row in+ square(column: column, row: row)+ .opacity(showsSquares ? 1 : 0)+ .scaleEffect(showsSquares ? 1 : Metrics.entranceScale)+ .animation(entranceAnimation(column: column, row: row), value: showsSquares)+ }+ }+ }+ }+ .frame(width: Metrics.totalWidth, height: Metrics.gridHeight, alignment: .topLeading)+ .contentShape(Rectangle())+ .onContinuousHover(coordinateSpace: .local) { phase in+ switch phase {+ case let .active(point):+ updatePointerLocation(point)+ case .ended:+ scheduleDeactivate()+ }+ }+ .task {+ await revealSquares()+ }+ .onChange(of: days) { _, newDays in+ guard let snapSelection, snapSelection.day(in: newDays) == nil else { return }+ cancelHoverClearTask()+ withAnimation(.snappy(duration: Metrics.snapAnimationDuration)) {+ self.snapSelection = nil+ }+ }+ .onDisappear {+ cancelHoverClearTask()+ snapSelection = nil+ selection = nil+ }+ }++ @ViewBuilder+ private func square(column: Int, row: Int) -> some View {+ let index = column * Metrics.rowCount + row+ let day = days.indices.contains(index) ? days[index] : nil+ let isHovered = snapSelection?.highlights(column: column, row: row, in: days, mode: mode) == true+ if mode == .weekly, weeks.indices.contains(column), let week = weeks[column] {+ let filledRows = week.filledRowCount(peakTokens: peakTokens)+ let isFilled = row >= Metrics.rowCount - filledRows+ RoundedRectangle(cornerRadius: 4, style: .continuous)+ .fill(isFilled ? Color.blue.opacity(0.82) : Color.secondary.opacity(0.09))+ .frame(width: Metrics.squareSize, height: Metrics.squareSize)+ .overlay {+ RoundedRectangle(cornerRadius: 4, style: .continuous)+ .fill(isFilled+ ? (colorScheme == .dark ? Color.white : Color.black).opacity(0.25)+ : Color.blue.opacity(0.15))+ .opacity(isHovered ? 1 : 0)+ .animation(.snappy(duration: 0.14), value: isHovered)+ .allowsHitTesting(false)+ }+ } else if mode == .daily, let day {+ UsageHeatmapSquare(+ tokenState: day.tokenState,+ percent: Double(day.tokensForHeatmap) / Double(peakTokens),+ isHovered: isHovered+ )+ } else {+ Color.clear+ .frame(width: Metrics.squareSize, height: Metrics.squareSize)+ }+ }+private var showsSquares: Bool {areSquaresRevealed || !animatesEntrance}@@ -190,13 +293,6 @@ struct UsageHeatmap: View {return elapsed >= interactiveAt}- private func localDayText(_ dayKey: String) -> String {- guard let date = CodexDateFormat.dayDate(from: dayKey) else {- return dayKey- }- return CodexDateFormat.localDayDisplayString(from: date)- }-private func updatePointerLocation(_ point: CGPoint) {guard let target = snappedSelection(at: point) else {scheduleDeactivate()@@ -236,12 +332,7 @@ struct UsageHeatmap: View {return nil}- let index = column * Metrics.rowCount + row- guard days.indices.contains(index), let day = days[index] else {- return nil- }-- return UsageHeatmapSelection(dateID: day.id, column: column, row: row)+ return UsageHeatmapSelection.at(column: column, row: row, in: days, mode: mode)}private func activate(_ target: UsageHeatmapSelection) {@@ -308,9 +399,9 @@ extension UsageHeatmap {// MARK: - 单元格-/// 单个热力图方块, 蓝色透明度表示当天 token 强度, 中性色表示 token 数据不可用+/// 日视图用透明度表示用量强度private struct UsageHeatmapSquare: View {- let day: UsageHeatmapDay+ let tokenState: UsageHeatmapTokenStatelet percent: Doublelet isHovered: Bool@@ -333,10 +424,10 @@ private struct UsageHeatmapSquare: View {}private var fillColor: Color {- guard day.tokenCount != nil else {+ guard tokenState.count != nil else {return Color.secondary.opacity(isHovered ? 0.12 : 0.05)}- guard day.tokensForHeatmap > 0 else {+ guard (tokenState.count ?? 0) > 0 else {return Color.blue.opacity(isHovered ? 0.16 : 0.08)}@@ -346,17 +437,17 @@ private struct UsageHeatmapSquare: View {}private var borderColor: Color {- guard day.tokenCount != nil else {+ guard tokenState.count != nil else {return Color.secondary.opacity(isHovered ? 0.42 : 0.12)}if isHovered {return Color.blue.opacity(0.78)}- return Color.blue.opacity(day.tokensForHeatmap > 0 ? 0.18 : 0.10)+ return Color.blue.opacity((tokenState.count ?? 0) > 0 ? 0.18 : 0.10)}private var shadowColor: Color {- day.tokenCount == nil ? .clear : .blue.opacity(0.22)+ tokenState.count == nil ? .clear : .blue.opacity(0.22)}}diff --git a/CodexBar/Views/Menu/UsageSummaryView.swift b/CodexBar/Views/Menu/UsageSummaryView.swiftindex 72e3658..4dc2963 100644--- a/CodexBar/Views/Menu/UsageSummaryView.swift+++ b/CodexBar/Views/Menu/UsageSummaryView.swift@@ -10,16 +10,21 @@ struct UsageSummaryView: View {let onHoverContextChange: (UsageHeatmapHoverContext?) -> Voidprivate let days: [UsageHeatmapDay?]private let peakTokens: Int+ private let weeks: [UsageHeatmapPeriod?]+ private let peakWeeklyTokens: Int+ @Binding var mode: UsageHeatmapMode@State private var hoverSelection: UsageHeatmapSelection?@State private var heatmapScreenFrame: CGRect?init(usage: CodexUsageSnapshot?,history: HistorySnapshot,+ mode: Binding<UsageHeatmapMode>,isStale: Bool = false,onHoverContextChange: @escaping (UsageHeatmapHoverContext?) -> Void = { _ in }) {self.usage = usage+ _mode = modeself.isStale = isStaleself.onHoverContextChange = onHoverContextChange@@ -30,6 +35,9 @@ struct UsageSummaryView: View {today: Date())self.days = days+ let weeks = UsageHeatmapPeriod.weeks(in: days)+ self.weeks = weeks+ peakWeeklyTokens = max(weeks.lazy.compactMap { $0?.tokensForHeatmap }.max() ?? 0, 1)peakTokens = max(days.lazy.compactMap { $0?.tokensForHeatmap }.max() ?? 0, 1)}@@ -59,8 +67,10 @@ struct UsageSummaryView: View {metricsGridUsageHeatmap(days: days,+ weeks: weeks,+ mode: $mode,selection: $hoverSelection,- peakTokens: peakTokens,+ peakTokens: mode == .daily ? peakTokens : peakWeeklyTokens,onScreenFrameChange: { frame inheatmapScreenFrame = frame}@@ -150,13 +160,16 @@ struct UsageSummaryView: View {private var hoverContext: UsageHeatmapHoverContext? {// 详情面板由控制器显示, SwiftUI 这里只负责传递屏幕坐标和数据- guard let hoverSelection, let day = hoverSelection.day(in: days) else { return nil }+ guard let hoverSelection,+ let column = hoverSelection.currentColumn(in: days),+ let period = hoverSelection.period(in: days, weeks: weeks, mode: mode) else { return nil }return UsageHeatmapHoverContext(- day: day,+ period: period,+ mode: mode,isStale: isStale,alignmentScreenFrame: heatmapScreenFrame,- preferredSide: UsageHeatmap.Metrics.preferredDetailSide(for: hoverSelection.column),- peakTokens: peakTokens+ preferredSide: UsageHeatmap.Metrics.preferredDetailSide(for: column),+ peakTokens: mode == .daily ? peakTokens : peakWeeklyTokens)}diff --git a/Config/Version.xcconfig b/Config/Version.xcconfigindex f2e91b1..0671bba 100644--- a/Config/Version.xcconfig+++ b/Config/Version.xcconfig@@ -1,2 +1,2 @@-MARKETING_VERSION = 5.0.4-CURRENT_PROJECT_VERSION = 204+MARKETING_VERSION = 5.0.5+CURRENT_PROJECT_VERSION = 205diff --git a/Tests/App/Presentation/SettingsTests.swift b/Tests/App/Presentation/SettingsTests.swiftindex eb9ef3a..19a38b0 100644--- a/Tests/App/Presentation/SettingsTests.swift+++ b/Tests/App/Presentation/SettingsTests.swift@@ -89,6 +89,43 @@ struct SettingsTests {#expect(!settings.areAnimationsEnabled)}+ @Test(arguments: [UsageHeatmapMode.daily, .weekly])+ func usageHeatmapModePersistsRestoresAndRefreshes(_ mode: UsageHeatmapMode) throws {+ let preferences = try TestPreferences()+ defer { preferences.remove() }+ let defaults = preferences.defaults+ let previousMode: UsageHeatmapMode = mode == .daily ? .weekly : .daily+ defaults.set(previousMode.rawValue, forKey: "MainPanel.usageHeatmapMode")+ let settings = MainPanelSettings(defaults: defaults)+ #expect(settings.usageHeatmapMode == previousMode)++ settings.setUsageHeatmapMode(mode)+ #expect(settings.usageHeatmapMode == mode)+ #expect(defaults.string(forKey: "MainPanel.usageHeatmapMode") == mode.rawValue)+ let restoredDefaults = try #require(UserDefaults(suiteName: preferences.suite))+ #expect(MainPanelSettings(defaults: restoredDefaults).usageHeatmapMode == mode)++ defaults.set(previousMode.rawValue, forKey: "MainPanel.usageHeatmapMode")+ settings.refresh()+ #expect(settings.usageHeatmapMode == previousMode)+ }++ @Test func usageHeatmapModeDefaultsToDailyForMissingOrUnknownPreference() throws {+ let preferences = try TestPreferences()+ defer { preferences.remove() }+ let defaults = preferences.defaults+ #expect(MainPanelSettings(defaults: defaults).usageHeatmapMode == .daily)++ defaults.set("unknown", forKey: "MainPanel.usageHeatmapMode")+ let settings = MainPanelSettings(defaults: defaults)+ #expect(settings.usageHeatmapMode == .daily)+ #expect(defaults.string(forKey: "MainPanel.usageHeatmapMode") == "unknown")+ settings.setUsageHeatmapMode(.weekly)+ defaults.removeObject(forKey: "MainPanel.usageHeatmapMode")+ settings.refresh()+ #expect(settings.usageHeatmapMode == .daily)+ }+@Test func rebuildRangeIncludesDatesWithoutActivityEvents() {let range = RebuildDateRange.starting(at: "2026-09-15").completing(with: "2026-09-17")#expect(range.dateKeys == ["2026-09-15", "2026-09-16", "2026-09-17"])diff --git a/Tests/App/Presentation/UsageHeatmapTests.swift b/Tests/App/Presentation/UsageHeatmapTests.swiftnew file mode 100644index 0000000..6cadebf--- /dev/null+++ b/Tests/App/Presentation/UsageHeatmapTests.swift@@ -0,0 +1,215 @@+import Foundation+import Testing++struct UsageHeatmapTests {+ @Test(arguments: ["2026-10-18", "2026-10-20", "2026-10-24"])+ func currentWeekAlwaysHasSevenSelectableRowsWhileDailyFutureStaysEmpty(todayKey: String) throws {+ let today = try #require(CodexDateFormat.dayDate(from: todayKey))+ let days = UsageHeatmapDay.grid(usage: nil, history: .empty, columnCount: 2, today: today)+ let weeks = UsageHeatmapPeriod.weeks(in: days)+ let week = try #require(weeks.last ?? nil)+ #expect(week.startDate == "2026-10-18")+ #expect(week.endDate == "2026-10-24")+ for row in 0 ..< CodexWeekGrid.rowCount {+ let selection = try #require(UsageHeatmapSelection.at(column: 1, row: row, in: days, mode: .weekly))+ #expect(selection.dateID == week.startDate)+ #expect(selection.row == 0)+ #expect(selection.period(in: days, weeks: weeks, mode: .weekly) == week)+ #expect(selection.highlights(column: 1, row: row, in: days, mode: .weekly))+ #expect(!selection.highlights(column: 0, row: row, in: days, mode: .weekly))+ let dailySelection = UsageHeatmapSelection.at(column: 1, row: row, in: days, mode: .daily)+ #expect((dailySelection != nil) == (days[7 + row] != nil))+ }+ }++ @Test func weekAggregatesAllMetricsAndWeightsCacheHitRateByInputTokens() throws {+ let first = day(+ "2026-10-18",+ tokens: 100,+ count: 2,+ models: ["model-a": 5, "model-b": 4],+ usage: usage(input: 100, cached: 80, written: 10, output: 20, reasoning: 5)+ )+ let second = day(+ "2026-10-19",+ tokens: 200,+ count: 3,+ models: ["model-c": 5, "model-b": 4],+ usage: usage(input: 900, cached: 90, written: 20, output: 80, reasoning: 15)+ )+ let week = try #require(UsageHeatmapPeriod.weeks(in: [first, second, nil, nil, nil, nil, nil]).first ?? nil)+ #expect(week.tokenState == .available(300))+ #expect(week.activityData.threadCount == 5)+ #expect(week.activityData.turnCount == 10)+ #expect(week.activityData.toolCallCount == 15)+ #expect(week.activityData.approvalRequestedCount == 20)+ #expect(week.activityData.contextCompactionCount == 25)+ #expect(week.activityData.subagentCount == 30)+ #expect(week.activityData.mostUsedModel == "model-b")+ #expect(week.tokenUsage?.inputTokens == 1000)+ #expect(week.tokenUsage?.cachedInputTokens == 170)+ #expect(week.tokenUsage?.cacheWriteInputTokens == 30)+ #expect(week.tokenUsage?.outputTokens == 100)+ #expect(week.tokenUsage?.reasoningOutputTokens == 20)+ #expect(week.tokenUsage?.totalTokens == 1100)+ #expect(week.tokenUsage?.cacheHitRate == 0.17)+ #expect(week.endDate == "2026-10-24")+ }++ @Test(arguments: [(0, 0), (1, 1), (100, 1), (101, 2), (300, 3), (301, 4), (699, 7), (700, 7), (800, 7)])+ func histogramHeightUsesWeeklyTokensRelativeToPeak(tokens: Int, expectedRows: Int) throws {+ let week = try #require(UsageHeatmapPeriod(days: [day("2026-10-18", tokens: tokens)]))+ #expect(week.filledRowCount(peakTokens: 700) == expectedRows)+ #expect(week.filledRowCount(peakTokens: 0) == 0)+ }++ @Test(arguments: [0, 100])+ func currentWeekShowsAvailableUsageAndAddsTodayWhenItArrives(knownTokens: Int) throws {+ let today = try #require(CodexDateFormat.dayDate(from: "2026-10-20"))+ let summary = try TestFixtures.decode(UsageSummary.self, "{}")+ let buckets = [DailyUsageBucket(startDate: "2026-10-18", tokens: knownTokens)]+ let usage = CodexUsageSnapshot(summary: summary, dailyBuckets: buckets)+ let days = UsageHeatmapDay.grid(usage: usage, history: .empty, columnCount: 1, today: today)+ let selection = try #require(UsageHeatmapSelection.at(column: 0, row: 6, in: days, mode: .weekly))+ let week = try #require(selection.period(in: days, weeks: UsageHeatmapPeriod.weeks(in: days), mode: .weekly))+ #expect(days[2]?.tokenState == .pending)+ #expect(week.tokenState == .available(knownTokens))+ #expect(week.filledRowCount(peakTokens: 700) == (knownTokens > 0 ? 1 : 0))++ let updatedUsage = CodexUsageSnapshot(summary: summary, dailyBuckets: buckets + [DailyUsageBucket(startDate: "2026-10-20", tokens: 50)])+ let updatedDays = UsageHeatmapDay.grid(usage: updatedUsage, history: .empty, columnCount: 1, today: today)+ let updatedWeek = try #require(selection.period(in: updatedDays, weeks: UsageHeatmapPeriod.weeks(in: updatedDays), mode: .weekly))+ #expect(updatedWeek.tokenState == .available(knownTokens + 50))+ #expect(updatedWeek.startDate == "2026-10-18")+ #expect(updatedWeek.endDate == "2026-10-24")+ }++ @Test func pendingDaysPreserveAvailableTokensWhileUnavailableDataStaysUnknown() throws {+ let known = day("2026-10-18", tokens: 100, usage: usage(input: 100))+ let pending = UsageHeatmapDay(startDate: "2026-10-19", tokenState: .pending, activityData: .unavailable(startDate: "2026-10-19"))+ let unavailable = UsageHeatmapDay(startDate: "2026-10-20", tokenState: .unavailable, activityData: .empty(startDate: "2026-10-20"))+ let period = try #require(UsageHeatmapPeriod(days: [known, pending]))+ #expect(period.tokenState == .available(100))+ #expect(period.activityData.threadCount == nil)+ #expect(period.activityData.toolCallCount == nil)+ #expect(period.tokenUsage == known.tokenUsage)+ #expect(UsageHeatmapPeriod(days: [pending])?.tokenState == .pending)+ #expect(UsageHeatmapPeriod(days: [pending, unavailable])?.tokenState == .unavailable)+ #expect(UsageHeatmapPeriod(days: [unavailable, known])?.tokenState == .unavailable)+ #expect(UsageHeatmapPeriod(days: [unavailable])?.tokenUsage == nil)+ #expect(UsageHeatmapPeriod(days: []) == nil)+ }++ @Test(arguments: [("2026-01-01", "2025-12-28", "2026-01-03"), ("2026-03-31", "2026-03-29", "2026-04-04")])+ func fullWeekRangeCrossesMonthAndYearBoundaries(todayKey: String, start: String, end: String) throws {+ let today = try #require(CodexDateFormat.dayDate(from: todayKey))+ let days = UsageHeatmapDay.grid(usage: nil, history: .empty, columnCount: 1, today: today)+ let week = try #require(UsageHeatmapPeriod.weeks(in: days).first ?? nil)+ #expect(week.startDate == start)+ #expect(week.endDate == end)+ }++ @Test func selectedWeekUsesFreshDataAndDoesNotIncludeNeighboringColumns() throws {+ let first = day("2026-10-11", tokens: 900)+ let current = day("2026-10-18", tokens: 20)+ var days: [UsageHeatmapDay?] = [first, nil, nil, nil, nil, nil, nil, current, nil, nil, nil, nil, nil, nil]+ let selection = try #require(UsageHeatmapSelection.at(column: 1, row: 6, in: days, mode: .weekly))+ #expect(selection.period(in: days, weeks: UsageHeatmapPeriod.weeks(in: days), mode: .weekly)?.tokenState == .available(20))+ #expect(selection.highlights(column: 1, row: 6, in: days, mode: .weekly))+ days[8] = day("2026-10-19", tokens: 30)+ #expect(selection.period(in: days, weeks: UsageHeatmapPeriod.weeks(in: days), mode: .weekly)?.tokenState == .available(50))+ #expect(selection.highlights(column: 1, row: 6, in: days, mode: .weekly))+ #expect(selection.period(in: days, weeks: [], mode: .daily)?.tokenState == .available(20))+ days.removeFirst(7)+ #expect(selection.period(in: days, weeks: UsageHeatmapPeriod.weeks(in: days), mode: .weekly)?.tokenState == .available(50))+ #expect(selection.highlights(column: 0, row: 6, in: days, mode: .weekly))+ #expect(!selection.highlights(column: 1, row: 6, in: days, mode: .weekly))+ #expect(selection.period(in: [], weeks: [], mode: .weekly) == nil)+ }++ @Test(arguments: [UsageHeatmapMode.daily, .weekly])+ func selectionHighlightAndDetailSideFollowDateAcrossColumns(mode: UsageHeatmapMode) throws {+ let today = try #require(CodexDateFormat.dayDate(from: "2026-10-24"))+ var days = UsageHeatmapDay.grid(usage: nil, history: .empty, columnCount: UsageHeatmap.Metrics.columnCount, today: today)+ let originalColumn = UsageHeatmap.Metrics.columnCount / 2+ let selectedRow = 3+ let selection = try #require(UsageHeatmapSelection.at(column: originalColumn, row: selectedRow, in: days, mode: mode))+ let initialColumn = try #require(selection.currentColumn(in: days))+ #expect(initialColumn == originalColumn)+ #expect(UsageHeatmap.Metrics.preferredDetailSide(for: initialColumn) == .right)+ let initialPeriod = try #require(selection.period(in: days, weeks: UsageHeatmapPeriod.weeks(in: days), mode: mode))++ days.removeFirst(CodexWeekGrid.rowCount)++ let currentColumn = try #require(selection.currentColumn(in: days))+ #expect(currentColumn == originalColumn - 1)+ #expect(UsageHeatmap.Metrics.preferredDetailSide(for: currentColumn) == .left)+ #expect(selection.period(in: days, weeks: UsageHeatmapPeriod.weeks(in: days), mode: mode) == initialPeriod)+ for row in 0 ..< CodexWeekGrid.rowCount {+ #expect(selection.highlights(column: currentColumn, row: row, in: days, mode: mode) == (mode == .weekly || row == selectedRow))+ #expect(!selection.highlights(column: originalColumn, row: row, in: days, mode: mode))+ }+ }++ @Test(arguments: [UsageHeatmapMode.daily, .weekly])+ func selectionLeavingGridHasNoHighlightOrDetailEvenWhenColumnIsReused(mode: UsageHeatmapMode) throws {+ let today = try #require(CodexDateFormat.dayDate(from: "2026-10-24"))+ var days = UsageHeatmapDay.grid(usage: nil, history: .empty, columnCount: 2, today: today)+ let selection = try #require(UsageHeatmapSelection.at(column: 0, row: 3, in: days, mode: mode))+ #expect(selection.highlights(column: 0, row: 3, in: days, mode: mode))++ days.removeFirst(CodexWeekGrid.rowCount)++ #expect(selection.day(in: days) == nil)+ #expect(selection.currentColumn(in: days) == nil)+ #expect(selection.period(in: days, weeks: UsageHeatmapPeriod.weeks(in: days), mode: mode) == nil)+ for row in 0 ..< CodexWeekGrid.rowCount {+ #expect(!selection.highlights(column: 0, row: row, in: days, mode: mode))+ }+ #expect(selection.currentColumn(in: []) == nil)+ #expect(!selection.highlights(column: 0, row: 0, in: [], mode: mode))+ }++ @Test func overflowDoesNotPublishWrappedWeeklyTotals() throws {+ let first = day("2026-10-18", tokens: Int.max, usage: usage(input: Int64.max))+ let second = day("2026-10-19", tokens: 1, usage: usage(input: 1))+ let week = try #require(UsageHeatmapPeriod(days: [first, second]))+ #expect(week.tokenState == .unavailable)+ #expect(week.tokenUsage == nil)+ }++ @Test func invalidGridPositionsCannotSelectAnotherWeek() {+ let days: [UsageHeatmapDay?] = [day("2026-10-18", tokens: 1), nil, nil, nil, nil, nil, nil]+ for mode in [UsageHeatmapMode.daily, .weekly] {+ #expect(UsageHeatmapSelection.at(column: -1, row: 0, in: days, mode: mode) == nil)+ #expect(UsageHeatmapSelection.at(column: 1, row: 0, in: days, mode: mode) == nil)+ #expect(UsageHeatmapSelection.at(column: 0, row: 7, in: days, mode: mode) == nil)+ #expect(UsageHeatmapSelection.at(column: 0, row: -1, in: days, mode: mode) == nil)+ #expect(UsageHeatmapSelection.at(column: 0, row: 0, in: [], mode: mode) == nil)+ }+ }++ private func day(_ date: String, tokens: Int, count: Int = 0, models: [String: Int] = [:], usage: TokenUsage? = nil) -> UsageHeatmapDay {+ UsageHeatmapDay(+ startDate: date,+ tokenState: .available(tokens),+ activityData: ActivityDataMetrics(+ startDate: date, threadCount: count, turnCount: count * 2, toolCallCount: count * 3,+ approvalRequestedCount: count * 4, contextCompactionCount: count * 5, subagentCount: count * 6,+ modelCounts: models+ ),+ tokenUsage: usage+ )+ }++ private func usage(input: Int64, cached: Int64 = 0, written: Int64 = 0, output: Int64 = 0, reasoning: Int64 = 0) -> TokenUsage {+ TokenUsage(+ inputTokens: input,+ cachedInputTokens: cached,+ cacheWriteInputTokens: written,+ outputTokens: output,+ reasoningOutputTokens: reasoning,+ totalTokens: input + output+ )+ }+}diff --git a/appcast.xml b/appcast.xmlindex 04916ac..3256f8c 100644--- a/appcast.xml+++ b/appcast.xml@@ -5,6 +5,20 @@<link>https://codexbar.zabrian.app/appcast.xml</link><description>CodexBar appcast feed</description><language>zh-CN</language>+ <item>+ <title>CodexBar.app 5.0.5</title>+ <sparkle:version>205</sparkle:version>+ <sparkle:shortVersionString>5.0.5</sparkle:shortVersionString>+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>+ <sparkle:minimumAutoupdateVersion>200</sparkle:minimumAutoupdateVersion>+ <sparkle:informationalUpdate><sparkle:belowVersion>200</sparkle:belowVersion></sparkle:informationalUpdate>+ <link xml:lang="en">https://codexbar.zabrian.app/notes?lang=en#5.0.0-Guide</link>+ <link xml:lang="zh-CN">https://codexbar.zabrian.app/notes?lang=zh-CN#5.0.0-Guide</link>+ <sparkle:releaseNotesLink xml:lang="en">https://codexbar.zabrian.app/notes?lang=en#5.0.5</sparkle:releaseNotesLink>+ <sparkle:releaseNotesLink xml:lang="zh-CN">https://codexbar.zabrian.app/notes?lang=zh-CN#5.0.5</sparkle:releaseNotesLink>+ <pubDate>Sat, 24 Oct 2026 18:18:44 +0800</pubDate>+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v5.0.5.dmg" sparkle:edSignature="KQR+EQxiHLwGAiiKHTvk5zAQ/KCHsho3YJgYBjOXSQYXI0tGNAUWRkXILq7U38zb9NMEYV3qHdkfTPJjlJ+YCA==" length="10197504" type="application/octet-stream"/>+ </item><item><title>CodexBar.app 5.0.4</title><sparkle:version>204</sparkle:version>