Skip to content

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

fix: 统一热力图周汇总的数据统计口径

Bob8943ce29354d
diff --git a/CodexBar.xcodeproj/xcshareddata/xcschemes/CodexBar.xcscheme b/CodexBar.xcodeproj/xcshareddata/xcschemes/CodexBar.xcscheme
index 7259bfe..f4f5b05 100644
--- a/CodexBar.xcodeproj/xcshareddata/xcschemes/CodexBar.xcscheme
+++ b/CodexBar.xcodeproj/xcshareddata/xcschemes/CodexBar.xcscheme
@@ -11,7 +11,7 @@
ActionType = "Xcode.IDEStandardExecutionActionsCore.ExecutionActionType.ShellScriptAction">
<ActionContent
title = "Increment Build Number"
- scriptText = '/usr/bin/perl "${PROJECT_DIR}/Scripts/build-number.pl" "${PROJECT_DIR}/Config/BuildNumber.xcconfig"'>
+ scriptText = "/usr/bin/perl &quot;${PROJECT_DIR}/Scripts/build-number.pl&quot; &quot;${PROJECT_DIR}/Config/BuildNumber.xcconfig&quot;&#10;">
<EnvironmentBuildable>
<BuildableReference
BuildableIdentifier = "primary"
@@ -86,7 +86,7 @@
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
- buildConfiguration = "Release"
+ buildConfiguration = "Debug"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
@@ -97,7 +97,6 @@
BuildableIdentifier = "primary"
BlueprintIdentifier = "C4A0FD942FD9302E000263A7"
BuildableName = "CodexBar.app"
- BlueprintName = "CodexBar"
ReferencedContainer = "container:CodexBar.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
diff --git a/CodexBar/Models/UsageHeatmapDay.swift b/CodexBar/Models/UsageHeatmapDay.swift
index a3be358..4d1db56 100644
--- a/CodexBar/Models/UsageHeatmapDay.swift
+++ b/CodexBar/Models/UsageHeatmapDay.swift
@@ -81,7 +81,7 @@ nonisolated enum UsageHeatmapMode: String {
case weekly
}
-/// 展示期间的汇总, 周视图只合并已有日期, 区间仍覆盖完整的一周
+/// 日详情保留已采集数据, 周汇总只累计接口总量已知的日期
nonisolated struct UsageHeatmapPeriod: Equatable {
let startDate: String
let endDate: String
@@ -93,14 +93,28 @@ nonisolated struct UsageHeatmapPeriod: Equatable {
tokenState.count ?? 0
}
- init?(days: [UsageHeatmapDay], endDate: String? = nil) {
- guard let first = days.first, let last = days.last else { return nil }
+ init(day: UsageHeatmapDay) {
+ startDate = day.startDate
+ endDate = day.startDate
+ tokenState = day.tokenState
+ activityData = day.activityData
+ tokenUsage = day.tokenUsage
+ }
+
+ private init?(weekDays days: [UsageHeatmapDay]) {
+ guard let first = days.first,
+ let weekStart = CodexDateFormat.dayDate(from: first.startDate),
+ let weekEnd = CodexDateFormat.localGregorianCalendar.date(byAdding: .day, value: CodexWeekGrid.rowCount - 1, to: weekStart) else {
+ return nil
+ }
startDate = first.startDate
- self.endDate = endDate ?? last.startDate
+ endDate = CodexDateFormat.dayString(from: weekEnd)
tokenState = Self.totalTokenState(days)
+ let countedDays = days.filter { $0.tokenCount != nil }
// 每日快照不含会话标识, 周计数沿用每日统计之和
- activityData = days.dropFirst().reduce(first.activityData) { $0.adding($1.activityData) }
- let usages = days.compactMap(\.tokenUsage)
+ let firstActivityData = countedDays.first?.activityData ?? .unavailable(startDate: first.startDate)
+ activityData = countedDays.dropFirst().reduce(firstActivityData) { $0.adding($1.activityData) }
+ let usages = countedDays.compactMap(\.tokenUsage)
tokenUsage = usages.dropFirst().reduce(usages.first) { total, usage in
total?.adding(usage)
}
@@ -115,12 +129,7 @@ nonisolated struct UsageHeatmapPeriod: Equatable {
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))
+ return UsageHeatmapPeriod(weekDays: weekDays)
}
}
diff --git a/CodexBar/Views/Menu/UsageHeatmap.swift b/CodexBar/Views/Menu/UsageHeatmap.swift
index 5fc34b9..4065282 100644
--- a/CodexBar/Views/Menu/UsageHeatmap.swift
+++ b/CodexBar/Views/Menu/UsageHeatmap.swift
@@ -32,7 +32,7 @@ nonisolated struct UsageHeatmapSelection: Equatable {
guard let index = days.firstIndex(where: { $0?.id == dateID }) else { return nil }
switch mode {
case .daily:
- return days[index].flatMap { UsageHeatmapPeriod(days: [$0]) }
+ return days[index].map { UsageHeatmapPeriod(day: $0) }
case .weekly:
let column = index / CodexWeekGrid.rowCount
return weeks.indices.contains(column) ? weeks[column] : nil
diff --git a/Config/BuildNumber.xcconfig b/Config/BuildNumber.xcconfig
index b282a5d..38f6adf 100644
--- a/Config/BuildNumber.xcconfig
+++ b/Config/BuildNumber.xcconfig
@@ -1,3 +1,3 @@
// 请勿手动修改
// Do not modify manually
-CURRENT_PROJECT_VERSION = 278
\ No newline at end of file
+CURRENT_PROJECT_VERSION = 294
\ No newline at end of file
diff --git a/Config/Version.xcconfig b/Config/Version.xcconfig
index cf764ce..ed24eb5 100644
--- a/Config/Version.xcconfig
+++ b/Config/Version.xcconfig
@@ -1,2 +1,2 @@
#include "BuildNumber.xcconfig"
-MARKETING_VERSION = 5.2.0
+MARKETING_VERSION = 5.2.1
diff --git a/Tests/App/Presentation/UsageHeatmapTests.swift b/Tests/App/Presentation/UsageHeatmapTests.swift
index ac42fed..413d77d 100644
--- a/Tests/App/Presentation/UsageHeatmapTests.swift
+++ b/Tests/App/Presentation/UsageHeatmapTests.swift
@@ -120,7 +120,7 @@ struct UsageHeatmapTests {
@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)]))
+ let week = try #require(UsageHeatmapPeriod.weeks(in: [day("2026-10-18", tokens: tokens)]).first ?? nil)
#expect(week.filledRowCount(peakTokens: 700) == expectedRows)
#expect(week.filledRowCount(peakTokens: 0) == 0)
}
@@ -150,16 +150,76 @@ struct UsageHeatmapTests {
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]))
+ let period = try #require(UsageHeatmapPeriod.weeks(in: [known, pending]).first ?? nil)
#expect(period.tokenState == .available(100))
- #expect(period.activityData.threadCount == nil)
- #expect(period.activityData.toolCallCount == nil)
+ #expect(period.activityData == known.activityData)
#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)
+ #expect((UsageHeatmapPeriod.weeks(in: [pending]).first ?? nil)?.tokenState == .pending)
+ #expect((UsageHeatmapPeriod.weeks(in: [pending, unavailable]).first ?? nil)?.tokenState == .unavailable)
+ #expect((UsageHeatmapPeriod.weeks(in: [unavailable, known]).first ?? nil)?.tokenState == .unavailable)
+ #expect((UsageHeatmapPeriod.weeks(in: [unavailable]).first ?? nil)?.tokenUsage == nil)
+ #expect(UsageHeatmapPeriod.weeks(in: []).isEmpty)
+ #expect(UsageHeatmapPeriod.weeks(in: Array(repeating: nil, count: CodexWeekGrid.rowCount)) == [nil])
+ }
+
+ @Test(arguments: [0, 50])
+ func weeklyMetricsWaitForTodayAccountUsage(todayTokens: Int) throws {
+ let today = try #require(CodexDateFormat.dayDate(from: "2026-11-02"))
+ let first = day("2026-11-01", tokens: 100, count: 2, models: ["previous": 1], usage: usage(input: 100, cached: 50, output: 10))
+ let current = day("2026-11-02", tokens: todayTokens, count: 3, models: ["current": 2], usage: usage(input: 200, cached: 190, output: 20))
+ var history = HistorySnapshot(activityData: [first.activityData, current.activityData])
+ history.tokenUsageByDate = try [first.startDate: #require(first.tokenUsage), current.startDate: #require(current.tokenUsage)]
+ let summary = try TestFixtures.decode(UsageSummary.self, "{}")
+ let buckets = [DailyUsageBucket(startDate: first.startDate, tokens: 100)]
+ let account = CodexUsageSnapshot(summary: summary, dailyBuckets: buckets)
+ let days = UsageHeatmapDay.grid(usage: account, history: history, columnCount: 1, today: today)
+ let selection = try #require(UsageHeatmapSelection.at(column: 0, row: 1, in: days, mode: .weekly))
+ let week = try #require(selection.period(in: days, weeks: UsageHeatmapPeriod.weeks(in: days), mode: .weekly))
+
+ #expect(week.tokenState == .available(100))
+ #expect(week.activityData == first.activityData)
+ #expect(week.tokenUsage == first.tokenUsage)
+ #expect(week.tokenUsage?.cacheHitRate == 0.5)
+ #expect(week.startDate == "2026-11-01")
+ #expect(week.endDate == "2026-11-07")
+ let dailySelection = UsageHeatmapSelection(dateID: current.startDate)
+ let daily = try #require(dailySelection.period(in: days, weeks: [], mode: .daily))
+ #expect(daily.tokenState == .pending)
+ #expect(daily.activityData == current.activityData)
+ #expect(daily.tokenUsage == current.tokenUsage)
+
+ let updatedAccount = CodexUsageSnapshot(
+ summary: summary,
+ dailyBuckets: buckets + [DailyUsageBucket(startDate: current.startDate, tokens: todayTokens)]
+ )
+ let updatedDays = UsageHeatmapDay.grid(usage: updatedAccount, history: history, columnCount: 1, today: today)
+ let updatedWeek = try #require(selection.period(in: updatedDays, weeks: UsageHeatmapPeriod.weeks(in: updatedDays), mode: .weekly))
+ #expect(updatedWeek.tokenState == .available(100 + todayTokens))
+ #expect(updatedWeek.activityData == first.activityData.adding(current.activityData))
+ #expect(updatedWeek.activityData.mostUsedModel == "current")
+ #expect(try updatedWeek.tokenUsage == first.tokenUsage?.adding(#require(current.tokenUsage)))
+ #expect(updatedWeek.tokenUsage?.cacheHitRate == 0.8)
+ }
+
+ @Test(arguments: [true, false])
+ func weekWithoutAccountUsagePreservesMetricsOnlyInDailyView(hasDailyBuckets: Bool) throws {
+ let today = try #require(CodexDateFormat.dayDate(from: "2026-11-01"))
+ let current = day("2026-11-01", tokens: 30, count: 4, models: ["current": 1], usage: usage(input: 30))
+ var history = HistorySnapshot(activityData: [current.activityData])
+ history.tokenUsageByDate = try [current.startDate: #require(current.tokenUsage)]
+ let summary = try TestFixtures.decode(UsageSummary.self, "{}")
+ let account = CodexUsageSnapshot(summary: summary, dailyBuckets: hasDailyBuckets ? [] : nil)
+ let days = UsageHeatmapDay.grid(usage: account, history: history, columnCount: 1, today: today)
+ let selection = UsageHeatmapSelection(dateID: current.startDate)
+ let week = try #require(selection.period(in: days, weeks: UsageHeatmapPeriod.weeks(in: days), mode: .weekly))
+ #expect(week.tokenState == (hasDailyBuckets ? .pending : .unavailable))
+ #expect(week.activityData == .unavailable(startDate: current.startDate))
+ #expect(week.tokenUsage == nil)
+ #expect(week.endDate == "2026-11-07")
+ let daily = try #require(selection.period(in: days, weeks: [], mode: .daily))
+ #expect(daily.tokenState == week.tokenState)
+ #expect(daily.activityData == current.activityData)
+ #expect(daily.tokenUsage == current.tokenUsage)
}
@Test(arguments: [("2026-01-01", "2025-12-28", "2026-01-03"), ("2026-03-31", "2026-03-29", "2026-04-04")])
@@ -236,7 +296,7 @@ struct UsageHeatmapTests {
@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]))
+ let week = try #require(UsageHeatmapPeriod.weeks(in: [first, second]).first ?? nil)
#expect(week.tokenState == .unavailable)
#expect(week.tokenUsage == nil)
}
diff --git a/appcast.xml b/appcast.xml
index 42ad0c5..9b4954f 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 5.2.1</title>
+ <sparkle:version>294</sparkle:version>
+ <sparkle:shortVersionString>5.2.1</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-US">https://codexbar.zabrian.app/notes?lang=en-US#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-US">https://codexbar.zabrian.app/notes?lang=en-US#5.2.1</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink xml:lang="zh-CN">https://codexbar.zabrian.app/notes?lang=zh-CN#5.2.1</sparkle:releaseNotesLink>
+ <pubDate>Mon, 02 Nov 2026 15:58:53 +0800</pubDate>
+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v5.2.1.dmg" sparkle:edSignature="/QAhtCmca8WPE0zIYAhwfuSprRzFCR2HdM+HfraXYWesFelQ94+uPSCd+03ePjuI5Za++uASKrbvJ8Unu3GdAQ==" length="11314176" type="application/octet-stream"/>
+ </item>
<item>
<title>CodexBar 5.2.0</title>
<sparkle:version>257</sparkle:version>