Skip to content

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

fix: 优化历史查询并完善旧库索引维护

Bobcd6ce994afc4
diff --git a/CodexBar/Services/History/HistoryDatabase.swift b/CodexBar/Services/History/HistoryDatabase.swift
index b037168..6fab95f 100644
--- a/CodexBar/Services/History/HistoryDatabase.swift
+++ b/CodexBar/Services/History/HistoryDatabase.swift
@@ -6,6 +6,19 @@ final nonisolated class HistoryDatabase {
static let filename = "event.db"
private static let schemaVersion: Int32 = 1
private static let transient = unsafeBitCast(-1, to: sqlite3_destructor_type.self)
+ private static let eventIndexPrefix = "codexbar_events_"
+
+ /// 索引使用专用前缀, 定义改变时更换名称, 避免将同名旧索引误判为已更新
+ private static let eventIndexDefinitions = [
+ eventIndexPrefix + "date_kind_position": "(date, kind, position)",
+ eventIndexPrefix + "token_usage_thread": """
+ (CASE WHEN json_valid(CAST(payload AS TEXT)) THEN json_extract(CAST(payload AS TEXT), '$.tokenUsage.threadID') END, position)
+ WHERE kind = 'tokenUsage'
+ """
+ ]
+
+ // 仅记录专用前缀启用前已发布的索引, 后续不再扩充
+ private static let legacyEventIndexNames: Set<String> = ["events_date", "events_token_usage_thread"]
private var connection: OpaquePointer?
private var threadSnapshots: [String: CachedThreadSnapshot] = [:]
@@ -75,7 +88,6 @@ final nonisolated class HistoryDatabase {
payload BLOB NOT NULL
)
""")
- try execute("CREATE INDEX IF NOT EXISTS events_date ON events(date, position)")
try execute("""
CREATE TABLE IF NOT EXISTS aggregates (
date TEXT PRIMARY KEY REFERENCES days(date) ON DELETE CASCADE,
@@ -86,11 +98,7 @@ final nonisolated class HistoryDatabase {
try execute("PRAGMA user_version = \(Self.schemaVersion)")
}
}
- try execute("""
- CREATE INDEX IF NOT EXISTS events_token_usage_thread
- ON events(CASE WHEN json_valid(CAST(payload AS TEXT)) THEN json_extract(CAST(payload AS TEXT), '$.tokenUsage.threadID') END, position)
- WHERE kind = 'tokenUsage'
- """)
+ try ensureEventIndexes()
try FileManager.default.setAttributes([.posixPermissions: 0o600], ofItemAtPath: url.path)
} catch {
sqlite3_close(connection)
@@ -103,6 +111,38 @@ final nonisolated class HistoryDatabase {
sqlite3_close(connection)
}
+ private func ensureEventIndexes() throws {
+ let changes = try eventIndexChanges()
+ guard !changes.missing.isEmpty || !changes.obsolete.isEmpty else { return }
+
+ try transaction {
+ // 等待写锁期间其他连接可能已更新索引, 锁内重新读取后再执行差异
+ let changes = try eventIndexChanges()
+ for (name, definition) in changes.missing.sorted(by: { $0.key < $1.key }) {
+ try execute("CREATE INDEX \(Self.quotedIdentifier(name)) ON events \(definition)")
+ }
+ for name in changes.obsolete.sorted() {
+ try execute("DROP INDEX \(Self.quotedIdentifier(name))")
+ }
+ }
+ }
+
+ private func eventIndexChanges() throws -> (missing: [String: String], obsolete: Set<String>) {
+ var existing = Set<String>()
+ var managed = Set<String>()
+ try query("SELECT name, \"unique\", origin FROM pragma_index_list('events')") {
+ let name = Self.text($0, at: 0)
+ existing.insert(name)
+ guard sqlite3_column_int($0, 1) == 0, Self.text($0, at: 2) == "c",
+ name.hasPrefix(Self.eventIndexPrefix) || Self.legacyEventIndexNames.contains(name) else { return }
+ managed.insert(name)
+ }
+ return (
+ Self.eventIndexDefinitions.filter { !existing.contains($0.key) },
+ managed.subtracting(Self.eventIndexDefinitions.keys)
+ )
+ }
+
var hasOpenTransaction: Bool {
sqlite3_get_autocommit(connection) == 0
}
@@ -307,9 +347,17 @@ final nonisolated class HistoryDatabase {
}
}
- func tokenUsageDates() throws -> [String] {
+ func tokenUsageDates(in dateKeys: [String]) throws -> [String] {
+ let requested = Set(dateKeys).sorted()
+ guard !requested.isEmpty else { return [] }
+ let placeholders = Array(repeating: "?", count: requested.count).joined(separator: ", ")
var result: [String] = []
- try query("SELECT DISTINCT date FROM events WHERE kind = 'tokenUsage' ORDER BY date") { result.append(Self.text($0, at: 0)) }
+ try query("""
+ SELECT date FROM days
+ WHERE date IN (\(placeholders))
+ AND EXISTS (SELECT 1 FROM events WHERE events.date = days.date AND events.kind = 'tokenUsage')
+ ORDER BY date
+ """, requested.map(Value.text)) { result.append(Self.text($0, at: 0)) }
return result
}
@@ -434,6 +482,10 @@ final nonisolated class HistoryDatabase {
Failure(code: code, message: connection.map { String(cString: sqlite3_errmsg($0)) } ?? "Cannot open history database")
}
+ private static func quotedIdentifier(_ name: String) -> String {
+ "\"" + name.replacingOccurrences(of: "\"", with: "\"\"") + "\""
+ }
+
private static func text(_ statement: OpaquePointer, at index: Int32) -> String {
sqlite3_column_text(statement, index).map { String(cString: $0) } ?? ""
}
diff --git a/CodexBar/Services/History/TokenUsageHistoryStore.swift b/CodexBar/Services/History/TokenUsageHistoryStore.swift
index 7541aac..251ecfe 100644
--- a/CodexBar/Services/History/TokenUsageHistoryStore.swift
+++ b/CodexBar/Services/History/TokenUsageHistoryStore.swift
@@ -89,9 +89,9 @@ final nonisolated class TokenUsageHistoryStore: Sendable {
}
func rebuild(for dateKeys: [String]) async throws -> TokenUsageRebuildResult {
- let available = try await database.access { try Set($0.tokenUsageDates()) }
+ let dates = try await database.access { try $0.tokenUsageDates(in: dateKeys) }
var result = TokenUsageRebuildResult.empty
- for date in Set(dateKeys).intersection(available).sorted() {
+ for date in dates {
do {
let aggregate = try await database.access { try $0.aggregateTokenUsage(date: date, rebuilding: true) }
result.dateKeys.append(date)
diff --git a/Config/Version.xcconfig b/Config/Version.xcconfig
index 9ce87af..39ba566 100644
--- a/Config/Version.xcconfig
+++ b/Config/Version.xcconfig
@@ -1,2 +1,2 @@
-MARKETING_VERSION = 5.0.0
-CURRENT_PROJECT_VERSION = 200
+MARKETING_VERSION = 5.0.1
+CURRENT_PROJECT_VERSION = 201
diff --git a/Scripts/appcast.sh b/Scripts/appcast.sh
index 3cd24c7..fa3db71 100755
--- a/Scripts/appcast.sh
+++ b/Scripts/appcast.sh
@@ -2,8 +2,9 @@
set -euo pipefail
# 已安装版本的构建号低于此值时, 需要手动升级
-# 发布不兼容更新时设为该版本的首个构建号, 后续兼容更新保持不变
+# 发布不兼容更新时同步调整构建号和升级指南版本, 后续兼容更新保持不变
readonly MINIMUM_COMPATIBLE_BUILD=200
+readonly UPGRADE_GUIDE_VERSION=5.0.0
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
@@ -33,9 +34,9 @@ Environment:
APPCAST_PATH Path to appcast.xml. Defaults to appcast.xml.
DOWNLOAD_BASE_URL Base URL for DMG downloads.
Defaults to https://codexbar.zabrian.app/download.
- RELEASE_NOTES_BASE_URL Base URL for release notes. The version is appended
- as a fragment anchor (BASE#X.Y.Z).
- Used for both release notes and the browser upgrade link.
+ RELEASE_NOTES_BASE_URL Base URL for release notes and upgrade guides.
+ Release notes append the current version as #X.Y.Z.
+ The browser upgrade link appends #${UPGRADE_GUIDE_VERSION}-Guide.
Defaults to https://codexbar.zabrian.app/notes.
INCLUDE_RELEASE_NOTES Set to 0 to omit sparkle:releaseNotesLink.
MINIMUM_SYSTEM_VERSION Defaults to 15.0.
@@ -171,6 +172,7 @@ if ! perl -e 'exit($ARGV[0] > $ARGV[1] ? 1 : 0)' "${MINIMUM_COMPATIBLE_BUILD}" "
fi
RELEASE_NOTES_URL="${RELEASE_NOTES_BASE_URL%/}#${SHORT_VERSION}"
+UPGRADE_GUIDE_URL="${RELEASE_NOTES_BASE_URL%/}#${UPGRADE_GUIDE_VERSION}-Guide"
if [[ ! "${RELEASE_NOTES_URL}" =~ ^https?://[^/?#[:space:]]+([/?#][^[:space:]]*)?$ ]]; then
echo "error: release notes URL must be an absolute HTTP or HTTPS URL without whitespace" >&2
exit 1
@@ -234,6 +236,7 @@ ED_SIGNATURE_ESCAPED="$(printf '%s' "${ED_SIGNATURE}" | xml_escape)"
MIN_SYSTEM_ESCAPED="$(printf '%s' "${MINIMUM_SYSTEM_VERSION}" | xml_escape)"
SHORT_VERSION_ESCAPED="$(printf '%s' "${SHORT_VERSION}" | xml_escape)"
RELEASE_NOTES_URL_ESCAPED="$(printf '%s' "${RELEASE_NOTES_URL}" | xml_escape)"
+UPGRADE_GUIDE_URL_ESCAPED="$(printf '%s' "${UPGRADE_GUIDE_URL}" | xml_escape)"
RELEASE_NOTES_XML=""
if [[ "${INCLUDE_RELEASE_NOTES}" != "0" ]]; then
@@ -247,7 +250,7 @@ APPCAST_ITEM=" <item>
<sparkle:shortVersionString>${SHORT_VERSION_ESCAPED}</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>${MIN_SYSTEM_ESCAPED}</sparkle:minimumSystemVersion>
<sparkle:informationalUpdate><sparkle:belowVersion>${MINIMUM_COMPATIBLE_BUILD}</sparkle:belowVersion></sparkle:informationalUpdate>
- <link>${RELEASE_NOTES_URL_ESCAPED}</link>
+ <link>${UPGRADE_GUIDE_URL_ESCAPED}</link>
${RELEASE_NOTES_XML} <pubDate>${PUB_DATE}</pubDate>
<enclosure url=\"${DOWNLOAD_URL_ESCAPED}\" sparkle:edSignature=\"${ED_SIGNATURE_ESCAPED}\" length=\"${ARCHIVE_LENGTH}\" type=\"application/octet-stream\"/>
</item>"
diff --git a/Tests/App/History/HistoryDatabaseIndexTests.swift b/Tests/App/History/HistoryDatabaseIndexTests.swift
new file mode 100644
index 0000000..d6bd35c
--- /dev/null
+++ b/Tests/App/History/HistoryDatabaseIndexTests.swift
@@ -0,0 +1,236 @@
+import Foundation
+import SQLite3
+import Testing
+
+struct HistoryDatabaseIndexTests {
+ @Test(arguments: [false, true])
+ func existingDatabaseUpdatesIndexesWithoutChangingHistory(newIndexExists: Bool) throws {
+ let directory = try TestDirectory()
+ defer { try? directory.remove() }
+ let database = try HistoryDatabase(directoryURL: directory.url)
+ let now = TestFixtures.now
+ let date = HistoryStorage.dateKey(for: now)
+ let activity = AppServerEventRecord(activityData: ActivityDataRecord(
+ timestamp: now, name: "toolStarted", origin: .main, cwd: nil, toolName: "read",
+ model: nil, effort: nil, threadID: "thread", turnID: "turn", agentThreadID: nil, id: "event"
+ ))
+ let usage = AppServerEventRecord(tokenUsage: TestFixtures.tokenUsageObservation(at: now, tokenUsage: .zero), recordedAt: now)
+ try database.append(activity)
+ try database.append(usage)
+ let activityAggregate = try database.aggregateActivityData(date: date, now: now)
+ let tokenAggregate = try database.aggregateTokenUsage(date: date)
+ let originalEvents = try database.exportJSONLines(date: date)
+ try database.execute("CREATE INDEX IF NOT EXISTS events_date ON events(date, position)")
+ try createLegacyThreadIndex(in: database)
+ if newIndexExists {
+ try database.execute("CREATE INDEX IF NOT EXISTS codexbar_events_date_kind_position ON events(date, kind, position)")
+ } else {
+ try database.execute("DROP INDEX IF EXISTS codexbar_events_date_kind_position")
+ try database.execute("DROP INDEX IF EXISTS codexbar_events_token_usage_thread")
+ }
+
+ let reopened = try HistoryDatabase(directoryURL: directory.url)
+ #expect(try values(in: directory, sql: "PRAGMA user_version") == ["1"])
+ #expect(try values(in: directory, sql: """
+ SELECT name FROM sqlite_schema WHERE name IN ('events_date', 'events_token_usage_thread')
+ """).isEmpty)
+ #expect(try values(in: directory, sql: "SELECT name FROM pragma_index_info('codexbar_events_date_kind_position') ORDER BY seqno") == ["date", "kind", "position"])
+ #expect(try values(in: directory, sql: """
+ SELECT name FROM pragma_index_list('events') WHERE name = 'codexbar_events_token_usage_thread' AND partial = 1
+ """) == ["codexbar_events_token_usage_thread"])
+ #expect(try reopened.exportJSONLines(date: date) == originalEvents)
+ #expect(try reopened.activityDataAggregates() == [activityAggregate])
+ #expect(try reopened.tokenUsageAggregates() == [tokenAggregate])
+ #expect(try !reopened.append(activity))
+ #expect(try !reopened.append(usage))
+ #expect(try reopened.pendingActivityDataDates().isEmpty)
+ #expect(try reopened.pendingTokenUsageDates().isEmpty)
+ }
+
+ @Test func currentIndexesAllowReopeningWithoutTakingTheWriterLock() throws {
+ let directory = try TestDirectory()
+ defer { try? directory.remove() }
+ let database = try HistoryDatabase(directoryURL: directory.url)
+ let schema = try values(in: directory, sql: "PRAGMA schema_version")
+ try database.execute("BEGIN IMMEDIATE")
+ defer { try? database.execute("ROLLBACK") }
+
+ let reopened = try HistoryDatabase(directoryURL: directory.url)
+ #expect(try reopened.dates().isEmpty)
+ #expect(try values(in: directory, sql: "PRAGMA schema_version") == schema)
+ #expect(try values(in: directory, sql: "SELECT name FROM pragma_index_info('codexbar_events_date_kind_position') ORDER BY seqno") == ["date", "kind", "position"])
+ }
+
+ @Test func failedIndexCommitRollsBackAndCanRetryOnReopen() throws {
+ let directory = try TestDirectory()
+ defer { try? directory.remove() }
+ let reader = try HistoryDatabase(directoryURL: directory.url)
+ try reader.execute("CREATE INDEX IF NOT EXISTS events_date ON events(date, position)")
+ try createLegacyThreadIndex(in: reader)
+ try reader.execute("DROP INDEX IF EXISTS codexbar_events_date_kind_position")
+ try reader.execute("DROP INDEX IF EXISTS codexbar_events_token_usage_thread")
+ try reader.execute("INSERT INTO days(date) VALUES ('2026-10-20')")
+ let schema = try values(in: directory, sql: "PRAGMA schema_version")
+ try reader.execute("BEGIN")
+ defer { try? reader.execute("ROLLBACK") }
+ _ = try reader.dates()
+
+ do {
+ _ = try HistoryDatabase(directoryURL: directory.url)
+ Issue.record("Expected the reader to prevent the index transaction from committing")
+ } catch let error as HistoryDatabase.Failure {
+ #expect(error.code == SQLITE_BUSY)
+ }
+ #expect(try values(in: directory, sql: "PRAGMA schema_version") == schema)
+ #expect(try values(in: directory, sql: "SELECT name FROM sqlite_schema WHERE name = 'events_date'") == ["events_date"])
+ #expect(try values(in: directory, sql: "SELECT name FROM sqlite_schema WHERE name = 'events_token_usage_thread'") == ["events_token_usage_thread"])
+ #expect(try values(in: directory, sql: "SELECT name FROM sqlite_schema WHERE name = 'codexbar_events_date_kind_position'").isEmpty)
+ #expect(try values(in: directory, sql: "SELECT name FROM sqlite_schema WHERE name = 'codexbar_events_token_usage_thread'").isEmpty)
+ #expect(try reader.dates() == ["2026-10-20"])
+ try reader.execute("ROLLBACK")
+
+ let reopened = try HistoryDatabase(directoryURL: directory.url)
+ #expect(try reopened.dates() == ["2026-10-20"])
+ #expect(try values(in: directory, sql: """
+ SELECT name FROM sqlite_schema WHERE name IN ('events_date', 'events_token_usage_thread')
+ """).isEmpty)
+ #expect(try values(in: directory, sql: "SELECT name FROM pragma_index_info('codexbar_events_date_kind_position') ORDER BY seqno") == ["date", "kind", "position"])
+ }
+
+ @Test func obsoleteManagedIndexesAreRemovedWithoutTouchingOtherIndexes() throws {
+ let directory = try TestDirectory()
+ defer { try? directory.remove() }
+ let database = try HistoryDatabase(directoryURL: directory.url)
+ try database.execute("CREATE INDEX codexbar_events_retired_v1 ON events(kind)")
+ try database.execute("CREATE INDEX codexbar_events_retired_v3 ON events(date)")
+ try database.execute("CREATE INDEX \"codexbar_events_retired\"\"name\" ON events(position)")
+ try database.execute("CREATE INDEX external_events_kind ON events(kind)")
+ try database.execute("CREATE INDEX codexbarXevents_kind ON events(kind)")
+ try database.execute("CREATE UNIQUE INDEX codexbar_events_unique_identity ON events(identity)")
+ try database.execute("CREATE INDEX codexbar_events_other_table ON days(date)")
+ let original = try Set(values(in: directory, sql: "SELECT name FROM sqlite_schema WHERE type = 'index'"))
+
+ _ = try HistoryDatabase(directoryURL: directory.url)
+ let remaining = try Set(values(in: directory, sql: "SELECT name FROM sqlite_schema WHERE type = 'index'"))
+ #expect(remaining == original.subtracting(["codexbar_events_retired_v1", "codexbar_events_retired_v3", "codexbar_events_retired\"name"]))
+ #expect(try values(in: directory, sql: "PRAGMA integrity_check") == ["ok"])
+ }
+
+ @Test func missingThreadIndexIsRestoredWithoutRebuildingCurrentIndexes() throws {
+ let directory = try TestDirectory()
+ defer { try? directory.remove() }
+ let database = try HistoryDatabase(directoryURL: directory.url)
+ try database.execute("DROP INDEX codexbar_events_token_usage_thread")
+ let original = try values(in: directory, sql: """
+ SELECT name || ':' || rootpage || ':' || sql FROM sqlite_schema
+ WHERE type = 'index' AND sql IS NOT NULL ORDER BY name
+ """)
+
+ _ = try HistoryDatabase(directoryURL: directory.url)
+ #expect(try values(in: directory, sql: """
+ SELECT name FROM pragma_index_list('events') WHERE name = 'codexbar_events_token_usage_thread' AND partial = 1
+ """) == ["codexbar_events_token_usage_thread"])
+ let remaining = try values(in: directory, sql: """
+ SELECT name || ':' || rootpage || ':' || sql FROM sqlite_schema
+ WHERE type = 'index' AND sql IS NOT NULL AND name != 'codexbar_events_token_usage_thread' ORDER BY name
+ """)
+ #expect(remaining == original)
+ }
+
+ @Test func legacyThreadIndexIsRemovedAfterOlderVersionRecreatesIt() throws {
+ let directory = try TestDirectory()
+ defer { try? directory.remove() }
+ let database = try HistoryDatabase(directoryURL: directory.url)
+ let original = try values(in: directory, sql: """
+ SELECT name || ':' || rootpage || ':' || sql FROM sqlite_schema
+ WHERE type = 'index' AND sql IS NOT NULL ORDER BY name
+ """)
+ try createLegacyThreadIndex(in: database)
+ #expect(try values(in: directory, sql: "SELECT name FROM sqlite_schema WHERE name = 'events_token_usage_thread'") == ["events_token_usage_thread"])
+
+ _ = try HistoryDatabase(directoryURL: directory.url)
+ let remaining = try values(in: directory, sql: """
+ SELECT name || ':' || rootpage || ':' || sql FROM sqlite_schema
+ WHERE type = 'index' AND sql IS NOT NULL ORDER BY name
+ """)
+ #expect(remaining == original)
+ }
+
+ @Test func indexNameConflictPreservesOldIndexesAndCanRetryAfterRecovery() throws {
+ let directory = try TestDirectory()
+ defer { try? directory.remove() }
+ let database = try HistoryDatabase(directoryURL: directory.url)
+ try database.execute("CREATE INDEX events_date ON events(date, position)")
+ try database.execute("DROP INDEX IF EXISTS codexbar_events_date_kind_position")
+ try database.execute("CREATE INDEX codexbar_events_date_kind_position ON days(date)")
+ try database.execute("INSERT INTO days(date) VALUES ('2026-10-20')")
+ let schema = try values(in: directory, sql: "PRAGMA schema_version")
+
+ #expect(throws: HistoryDatabase.Failure.self) { _ = try HistoryDatabase(directoryURL: directory.url) }
+ #expect(try values(in: directory, sql: "PRAGMA schema_version") == schema)
+ #expect(try values(in: directory, sql: "SELECT name FROM pragma_index_list('events') WHERE name = 'events_date'") == ["events_date"])
+ #expect(try values(in: directory, sql: "SELECT tbl_name FROM sqlite_schema WHERE name = 'codexbar_events_date_kind_position'") == ["days"])
+ #expect(try database.dates() == ["2026-10-20"])
+ try database.execute("DROP INDEX codexbar_events_date_kind_position")
+
+ let reopened = try HistoryDatabase(directoryURL: directory.url)
+ #expect(try reopened.dates() == ["2026-10-20"])
+ #expect(try values(in: directory, sql: "SELECT name FROM pragma_index_info('codexbar_events_date_kind_position') ORDER BY seqno") == ["date", "kind", "position"])
+ #expect(try values(in: directory, sql: "SELECT name FROM sqlite_schema WHERE name = 'events_date'").isEmpty)
+ }
+
+ @Test func concurrentOpensConvergeOnCurrentIndexes() async throws {
+ let directory = try TestDirectory()
+ defer { try? directory.remove() }
+ let database = try HistoryDatabase(directoryURL: directory.url)
+ try database.execute("CREATE INDEX events_date ON events(date, position)")
+ try createLegacyThreadIndex(in: database)
+ try database.execute("DROP INDEX IF EXISTS codexbar_events_date_kind_position")
+ try database.execute("DROP INDEX IF EXISTS codexbar_events_token_usage_thread")
+ try database.execute("INSERT INTO days(date) VALUES ('2026-10-20')")
+ let schemaValue = try #require(values(in: directory, sql: "PRAGMA schema_version").first)
+ let schema = try #require(Int(schemaValue))
+
+ try await withThrowingTaskGroup(of: [String].self) { group in
+ for _ in 0 ..< 8 {
+ group.addTask { try HistoryDatabase(directoryURL: directory.url).dates() }
+ }
+ for try await dates in group {
+ #expect(dates == ["2026-10-20"])
+ }
+ }
+ #expect(try values(in: directory, sql: "PRAGMA schema_version") == [String(schema + 4)])
+ #expect(try values(in: directory, sql: """
+ SELECT name FROM sqlite_schema WHERE name IN ('events_date', 'events_token_usage_thread')
+ """).isEmpty)
+ #expect(try values(in: directory, sql: "SELECT name FROM pragma_index_info('codexbar_events_date_kind_position') ORDER BY seqno") == ["date", "kind", "position"])
+ }
+
+ private func createLegacyThreadIndex(in database: HistoryDatabase) throws {
+ try database.execute("""
+ CREATE INDEX IF NOT EXISTS events_token_usage_thread
+ ON events(CASE WHEN json_valid(CAST(payload AS TEXT)) THEN json_extract(CAST(payload AS TEXT), '$.tokenUsage.threadID') END, position)
+ WHERE kind = 'tokenUsage'
+ """)
+ }
+
+ private func values(in directory: TestDirectory, sql: String) throws -> [String] {
+ var connection: OpaquePointer?
+ let opened = sqlite3_open_v2(directory.url.appendingPathComponent(HistoryDatabase.filename).path, &connection, SQLITE_OPEN_READONLY, nil)
+ defer { sqlite3_close(connection) }
+ try #require(opened == SQLITE_OK)
+ var statement: OpaquePointer?
+ let prepared = sqlite3_prepare_v2(connection, sql, -1, &statement, nil)
+ defer { sqlite3_finalize(statement) }
+ try #require(prepared == SQLITE_OK)
+ var result: [String] = []
+ while true {
+ let step = sqlite3_step(statement)
+ if step == SQLITE_DONE {
+ return result
+ }
+ try #require(step == SQLITE_ROW)
+ try result.append(String(cString: #require(sqlite3_column_text(statement, 0))))
+ }
+ }
+}
diff --git a/Tests/App/History/HistoryDatabaseTests.swift b/Tests/App/History/HistoryDatabaseTests.swift
index 91f170f..3ed14a1 100644
--- a/Tests/App/History/HistoryDatabaseTests.swift
+++ b/Tests/App/History/HistoryDatabaseTests.swift
@@ -440,6 +440,34 @@ extension HistoryDatabaseTests {
#expect(try await store.refresh(now: now) == initial)
}
+ @Test func tokenRebuildChecksOnlyRequestedDatesWithSourceEvents() async throws {
+ let directory = try TestDirectory()
+ defer { try? directory.remove() }
+ let database = try HistoryDatabase(directoryURL: directory.url)
+ let now = TestFixtures.now
+ let dates = (0 ..< 5).map { now.addingTimeInterval(Double($0) * 86400) }
+ let keys = dates.map(HistoryStorage.dateKey(for:))
+ for index in [0, 1, 2] {
+ try database.append(AppServerEventRecord(
+ tokenUsage: TestFixtures.tokenUsageObservation(at: dates[index], tokenUsage: tokenUsage(10)), recordedAt: now
+ ))
+ }
+ try database.append(event("activity-only", at: dates[3]))
+ try database.append(event("mixed", at: dates[0]))
+ let requested = [keys[2], keys[0], keys[3], keys[4], keys[2]]
+ #expect(try database.tokenUsageAggregates().isEmpty)
+ #expect(try database.tokenUsageDates(in: requested) == [keys[0], keys[2]])
+ #expect(try database.tokenUsageDates(in: []).isEmpty)
+
+ let store = TokenUsageHistoryStore(directoryURL: directory.url)
+ let rebuilt = try await store.rebuild(for: requested)
+ #expect(rebuilt.dateKeys == [keys[0], keys[2]])
+ #expect(rebuilt.eventCount == 2)
+ #expect(rebuilt.failedDateKeys.isEmpty)
+ #expect(try database.tokenUsageAggregates().map(\.date) == [keys[0], keys[2]])
+ #expect(try database.pendingTokenUsageDates() == [keys[1]])
+ }
+
@Test func observedDateSurvivesDelayedWriteAcrossMidnight() async throws {
let directory = try TestDirectory()
defer { try? directory.remove() }
diff --git a/appcast.xml b/appcast.xml
index b2fd131..5f79261 100644
--- a/appcast.xml
+++ b/appcast.xml
@@ -7,13 +7,24 @@
<link>https://codexbar.zabrian.app/appcast.xml</link>
<description>CodexBar appcast feed</description>
<language>zh-CN</language>
+ <item>
+ <title>CodexBar.app 5.0.1</title>
+ <sparkle:version>201</sparkle:version>
+ <sparkle:shortVersionString>5.0.1</sparkle:shortVersionString>
+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
+ <sparkle:informationalUpdate><sparkle:belowVersion>200</sparkle:belowVersion></sparkle:informationalUpdate>
+ <link>https://codexbar.zabrian.app/notes#5.0.0-Guide</link>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#5.0.1</sparkle:releaseNotesLink>
+ <pubDate>Tue, 20 Oct 2026 12:53:28 +0800</pubDate>
+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v5.0.1.dmg" sparkle:edSignature="yaEo8eL/wEbTlTDzR5qYKmyh2i6SmOBGgrWw3hYfkDhAm0e0bROxengeaOU877k1e4lCJnyl6GG9p8PJkA8HCw==" length="10164736" type="application/octet-stream"/>
+ </item>
<item>
<title>CodexBar.app 5.0.0</title>
<sparkle:version>200</sparkle:version>
<sparkle:shortVersionString>5.0.0</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
<sparkle:informationalUpdate><sparkle:belowVersion>200</sparkle:belowVersion></sparkle:informationalUpdate>
- <link>https://codexbar.zabrian.app/notes#5.0.0</link>
+ <link>https://codexbar.zabrian.app/notes#5.0.0-Guide</link>
<sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#5.0.0</sparkle:releaseNotesLink>
<pubDate>Mon, 19 Oct 2026 14:20:18 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v5.0.0.dmg" sparkle:edSignature="mNAWKIUQnsujXnLQlEtK/tGCkd/h774/uVJBtJS8tShImizRiJPCAlm383HoIzHEzrt0jByKb1L1Zje/2UzHAA==" length="10155520" type="application/octet-stream"/>