Skip to content

CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息

fix: 优化热力图待更新状态展示

Bob0d6981f2423a
diff --git a/AGENTS.md b/AGENTS.md
index e892aa7..1a7f302 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -44,6 +44,7 @@ CodexBar 是面向 macOS 15+ 的 `LSUIElement` 菜单栏应用,使用 Swift 6,
- 标题、独立列表项、编号项和表格单元格行末不加标点
- 如果一行以 Markdown 格式的链接或行内代码结尾,后面不加任何标点;链接或行内代码位于句中时仍按句子结构使用中文标点
- Markdown 语法、代码块、命令、路径、URL、版本号和程序标识符内部的符号保持原样
+- 如果某句话的作用只是防止被质疑,而不是推进论证,请删除
## 架构与编码约定
diff --git a/CodexBar/Models/UsageHeatmapDay.swift b/CodexBar/Models/UsageHeatmapDay.swift
index d537a76..2b0d70b 100644
--- a/CodexBar/Models/UsageHeatmapDay.swift
+++ b/CodexBar/Models/UsageHeatmapDay.swift
@@ -1,15 +1,33 @@
import Foundation
+nonisolated enum UsageHeatmapTokenState: Equatable {
+ case available(Int)
+ case pending
+ case unavailable
+
+ var count: Int? {
+ guard case let .available(count) = self else {
+ return nil
+ }
+
+ return count
+ }
+}
+
/// 热力图单元格模型, 合并 app-server token 数据和本地 Hook 工作流统计
nonisolated struct UsageHeatmapDay: Equatable, Identifiable {
let startDate: String
- let tokenCount: Int?
+ let tokenState: UsageHeatmapTokenState
let workflow: WorkflowDailyMetrics
var id: String {
startDate
}
+ var tokenCount: Int? {
+ tokenState.count
+ }
+
var tokensForHeatmap: Int {
tokenCount ?? 0
}
@@ -42,16 +60,18 @@ nonisolated struct UsageHeatmapDay: Equatable, Identifiable {
}
let startDate = CodexDateFormat.dayString(from: date)
- let tokenCount: Int? = if !hasDailyUsageBuckets {
- nil
+ let tokenState: UsageHeatmapTokenState = if !hasDailyUsageBuckets {
+ .unavailable
+ } else if startDate == todayString, let todayTokenCount {
+ .available(todayTokenCount)
} else if startDate == todayString {
- todayTokenCount
+ .pending
} else {
- usage?.tokenCount(on: date) ?? 0
+ .available(usage?.tokenCount(on: date) ?? 0)
}
return UsageHeatmapDay(
startDate: startDate,
- tokenCount: tokenCount,
+ tokenState: tokenState,
workflow: workflowByDate[startDate] ?? .empty(startDate: startDate)
)
}
diff --git a/CodexBar/Views/Menu/UsageHeatmap.swift b/CodexBar/Views/Menu/UsageHeatmap.swift
index 081ea44..e80e956 100644
--- a/CodexBar/Views/Menu/UsageHeatmap.swift
+++ b/CodexBar/Views/Menu/UsageHeatmap.swift
@@ -668,7 +668,7 @@ struct UsageHeatmapDayDetailView: View {
Spacer(minLength: 8)
- tokenIntensityValue
+ tokenIntensityStrip
.frame(width: Metrics.tokenIntensityStripWidth)
}
}
@@ -680,7 +680,7 @@ struct UsageHeatmapDayDetailView: View {
.foregroundStyle(.secondary)
.frame(width: Metrics.metricLabelWidth, alignment: .leading)
- tokenIntensityValue
+ tokenIntensityStrip
.frame(width: Metrics.tokenIntensityStripWidth)
.frame(maxWidth: .infinity, alignment: .trailing)
}
@@ -724,19 +724,6 @@ struct UsageHeatmapDayDetailView: View {
.frame(height: Metrics.tokenIntensityStripHeight)
}
- @ViewBuilder
- private var tokenIntensityValue: some View {
- if context.day.tokenCount != nil {
- tokenIntensityStrip
- } else {
- Text(verbatim: "--")
- .foregroundStyle(Color.codexLabel)
- .fontWeight(.semibold)
- .monospacedDigit()
- .frame(maxWidth: .infinity, alignment: .trailing)
- }
- }
-
private var workflowMetricRows: [WorkflowMetricRow] {
[
WorkflowMetricRow(
@@ -782,7 +769,7 @@ struct UsageHeatmapDayDetailView: View {
private var tokenText: some View {
HeatmapTokenText(
- tokenCount: context.day.tokenCount,
+ tokenState: context.day.tokenState,
font: tokenFont,
numericWidth: Metrics.tokenMinimumWidth,
unitWidth: Metrics.tokenUnitWidth
@@ -818,6 +805,10 @@ struct UsageHeatmapDayDetailView: View {
}
private func tokenIntensityFill(for index: Int) -> Color {
+ guard context.day.tokenCount != nil else {
+ return Color.secondary.opacity(colorScheme == .dark ? 0.18 : 0.12)
+ }
+
guard index < tokenIntensityLevel else {
return Color.blue.opacity(colorScheme == .dark ? 0.14 : 0.10)
}
@@ -905,36 +896,36 @@ struct UsageHeatmapDayDetailView: View {
}
}
-/// token 详情在数字和 `--` 之间切换时只做淡入淡出, 数字之间仍保留滚动过渡
+/// token 详情在数字和占位状态之间切换时只做淡入淡出, 数字之间仍保留滚动过渡
private struct HeatmapTokenText: View {
- let tokenCount: Int?
+ let tokenState: UsageHeatmapTokenState
let font: Font
let numericWidth: CGFloat
let unitWidth: CGFloat
- @State private var displayedTokenCount: Int?
+ @State private var displayedTokenState: UsageHeatmapTokenState
@State private var isVisible = true
@State private var fadeTask: Task<Void, Never>?
init(
- tokenCount: Int?,
+ tokenState: UsageHeatmapTokenState,
font: Font,
numericWidth: CGFloat,
unitWidth: CGFloat
) {
- self.tokenCount = tokenCount
+ self.tokenState = tokenState
self.font = font
self.numericWidth = numericWidth
self.unitWidth = unitWidth
- _displayedTokenCount = State(initialValue: tokenCount)
+ _displayedTokenState = State(initialValue: tokenState)
}
var body: some View {
content
.opacity(isVisible ? 1 : 0)
.frame(width: width, alignment: .trailing)
- .onChange(of: tokenCount) { _, newTokenCount in
- updateDisplayedTokenCount(newTokenCount)
+ .onChange(of: tokenState) { _, newTokenState in
+ updateDisplayedTokenState(newTokenState)
}
.onDisappear {
fadeTask?.cancel()
@@ -943,44 +934,55 @@ private struct HeatmapTokenText: View {
@ViewBuilder
private var content: some View {
- if let displayedTokenCount {
+ switch displayedTokenState {
+ case let .available(tokenCount):
TokenCountText(
- tokens: displayedTokenCount,
+ tokens: tokenCount,
font: font,
reservedNumericWidth: numericWidth,
reservedUnitWidth: unitWidth
)
.foregroundStyle(Color.codexLabel)
- } else {
+
+ case .pending:
+ Image(systemName: "hourglass")
+ .font(.system(size: 13, weight: .medium))
+ .foregroundStyle(Color.codexSecondaryLabel)
+ .symbolEffect(.rotate.byLayer, options: .repeat(.periodic(delay: 1.0)))
+
+ case .unavailable:
Text(verbatim: "--")
.font(font)
.foregroundStyle(Color.codexLabel)
}
}
- private func updateDisplayedTokenCount(_ newTokenCount: Int?) {
+ private func updateDisplayedTokenState(_ newTokenState: UsageHeatmapTokenState) {
fadeTask?.cancel()
- if (displayedTokenCount == nil) == (newTokenCount == nil) {
- updateTokenCountWithoutFade(newTokenCount)
+ guard displayedTokenState != newTokenState || !isVisible else {
return
}
- fadeToTokenCount(newTokenCount)
- }
-
- private func updateTokenCountWithoutFade(_ newTokenCount: Int?) {
- guard displayedTokenCount != newTokenCount || !isVisible else {
- return
+ if displayedTokenState.count != nil, newTokenState.count != nil {
+ updateTokenStateWithoutFade(newTokenState)
+ } else if displayedTokenState == newTokenState {
+ withAnimation(Metrics.fadeAnimation) {
+ isVisible = true
+ }
+ } else {
+ fadeToTokenState(newTokenState)
}
+ }
+ private func updateTokenStateWithoutFade(_ newTokenState: UsageHeatmapTokenState) {
withAnimation(Metrics.numericAnimation) {
- displayedTokenCount = newTokenCount
+ displayedTokenState = newTokenState
isVisible = true
}
}
- private func fadeToTokenCount(_ newTokenCount: Int?) {
+ private func fadeToTokenState(_ newTokenState: UsageHeatmapTokenState) {
fadeTask = Task { @MainActor in
withAnimation(Metrics.fadeAnimation) {
isVisible = false
@@ -991,7 +993,7 @@ private struct HeatmapTokenText: View {
return
}
- displayedTokenCount = newTokenCount
+ displayedTokenState = newTokenState
withAnimation(Metrics.fadeAnimation) {
isVisible = true
}
diff --git a/Config/Version.xcconfig b/Config/Version.xcconfig
index 5545941..8ee7157 100644
--- a/Config/Version.xcconfig
+++ b/Config/Version.xcconfig
@@ -1,2 +1,2 @@
-MARKETING_VERSION = 3.6.13
-CURRENT_PROJECT_VERSION = 80
+MARKETING_VERSION = 3.6.14
+CURRENT_PROJECT_VERSION = 81
diff --git a/appcast.xml b/appcast.xml
index 66f8c7d..0b473d4 100644
--- a/appcast.xml
+++ b/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 3.6.14</title>
+ <sparkle:version>81</sparkle:version>
+ <sparkle:shortVersionString>3.6.14</sparkle:shortVersionString>
+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#3.6.14</sparkle:releaseNotesLink>
+ <pubDate>Fri, 04 Sep 2026 14:10:15 +0800</pubDate>
+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v3.6.14.dmg" sparkle:edSignature="jIZoJhDg66tqVT8yu1cmgBJ0jjm2Pv813tyLrwAUYvtxZbXmG8wt035TtdM3Ef2gPocyXlYqxPdSDIa67Ym1Dw==" length="7640418" type="application/octet-stream"/>
+ </item>
<item>
<title>CodexBar.app 3.6.13</title>
<sparkle:version>80</sparkle:version>