CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
refactor: 统一本地存储路径与锁文件组织
Boba76cbc17653f
diff --git a/CodexBar/App/CodexBarApp.swift b/CodexBar/App/CodexBarApp.swiftindex 9048213..e3a2812 100644--- a/CodexBar/App/CodexBarApp.swift+++ b/CodexBar/App/CodexBarApp.swift@@ -12,7 +12,7 @@ nonisolated enum CodexBarMain {do {// 在 SwiftUI 创建 AppDelegate 前互斥, 避免重复实例初始化服务guard let descriptor = try JSONFileStorage.acquireLock(- in: AppStorage.directoryURL(), name: "app.lock", nonblocking: true+ at: AppStorage().lockURL(.appInstance), nonblocking: true) else { return }defer { JSONFileStorage.releaseLock(descriptor) }diff --git a/CodexBar/Services/Activity/ActivityMonitor.swift b/CodexBar/Services/Activity/ActivityMonitor.swiftindex b3131e7..5636690 100644--- a/CodexBar/Services/Activity/ActivityMonitor.swift+++ b/CodexBar/Services/Activity/ActivityMonitor.swift@@ -89,7 +89,7 @@ final class ActivityMonitor: ObservableObject {init(protectionSettings: ProtectionSettings,protectionStore: ProtectionStore = ProtectionStore(),- activityDataDirectoryURL: URL = HistoryStorage.directoryURL()+ activityDataDirectoryURL: URL = AppStorage.directoryURL()) {self.protectionSettings = protectionSettingsself.protectionStore = protectionStorediff --git a/CodexBar/Services/Activity/ProtectionStore.swift b/CodexBar/Services/Activity/ProtectionStore.swiftindex 3407b05..ec6947f 100644--- a/CodexBar/Services/Activity/ProtectionStore.swift+++ b/CodexBar/Services/Activity/ProtectionStore.swift@@ -28,10 +28,10 @@ actor ProtectionStore {init(directoryURL: URL? = nil, fileManager: FileManager = .default) {self.fileManager = fileManager- self.directoryURL = directoryURL ?? AppStorage.directoryURL(fileManager: fileManager)- .appendingPathComponent("Protection", isDirectory: true)- stateURL = self.directoryURL.appendingPathComponent("state.json", isDirectory: false)- lockURL = self.directoryURL.appendingPathComponent("state.lock", isDirectory: false)+ let storage = AppStorage(rootURL: directoryURL ?? AppStorage.directoryURL(fileManager: fileManager))+ self.directoryURL = storage.protectionStateURL.deletingLastPathComponent()+ stateURL = storage.protectionStateURL+ lockURL = storage.lockURL(.protectionState)}func load(now: Date = Date()) throws -> [String: ProtectionRecord] {@@ -83,7 +83,7 @@ actor ProtectionStore {private func withExclusiveLock<T>(_ work: () throws -> T) throws -> T {try fileManager.createDirectory(- at: directoryURL,+ at: lockURL.deletingLastPathComponent(),withIntermediateDirectories: true)@@ -144,6 +144,7 @@ actor ProtectionStore {let encoder = JSONEncoder()encoder.outputFormatting = [.sortedKeys, .withoutEscapingSlashes]let data = try encoder.encode(state)+ try fileManager.createDirectory(at: directoryURL, withIntermediateDirectories: true)try data.write(to: stateURL, options: .atomic)chmod(stateURL.path, 0o600)}diff --git a/CodexBar/Services/AppServer/AppServerLogStore.swift b/CodexBar/Services/AppServer/AppServerLogStore.swiftindex 76297e7..8c8bee2 100644--- a/CodexBar/Services/AppServer/AppServerLogStore.swift+++ b/CodexBar/Services/AppServer/AppServerLogStore.swift@@ -19,7 +19,7 @@ final nonisolated class AppServerLogStore: @unchecked Sendable {#endifstatic var defaultDirectory: URL {- AppStorage.directoryURL().appendingPathComponent("Logs", isDirectory: true)+ AppStorage().logDirectoryURL}static let databaseName = "app.db"diff --git a/CodexBar/Services/History/ActivityDataRecorder.swift b/CodexBar/Services/History/ActivityDataRecorder.swiftindex acad0f1..3838690 100644--- a/CodexBar/Services/History/ActivityDataRecorder.swift+++ b/CodexBar/Services/History/ActivityDataRecorder.swift@@ -4,7 +4,7 @@ import Foundationnonisolated struct ActivityDataRecorder: Sendable {private let database: HistoryDatabaseStore- init(directoryURL: URL = HistoryStorage.directoryURL()) {+ init(directoryURL: URL = AppStorage.directoryURL()) {database = HistoryDatabaseStore.shared(in: directoryURL)}diff --git a/CodexBar/Services/History/HistoryDatabase.swift b/CodexBar/Services/History/HistoryDatabase.swiftindex 6fab95f..4fa8e3b 100644--- a/CodexBar/Services/History/HistoryDatabase.swift+++ b/CodexBar/Services/History/HistoryDatabase.swift@@ -3,7 +3,6 @@ import SQLite3/// SQLite 操作同步完成, 应用通过 HistoryDatabaseStore 串行访问共享连接final nonisolated class HistoryDatabase {- static let filename = "event.db"private static let schemaVersion: Int32 = 1private static let transient = unsafeBitCast(-1, to: sqlite3_destructor_type.self)private static let eventIndexPrefix = "codexbar_events_"@@ -55,8 +54,8 @@ final nonisolated class HistoryDatabase {}init(directoryURL: URL) throws {- try FileManager.default.createDirectory(at: directoryURL, withIntermediateDirectories: true)- let url = directoryURL.appendingPathComponent(Self.filename)+ let url = AppStorage(rootURL: directoryURL).historyDatabaseURL+ try FileManager.default.createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true)let result = sqlite3_open_v2(url.path, &connection, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE | SQLITE_OPEN_FULLMUTEX, nil)guard result == SQLITE_OK else {let error = failure(result)diff --git a/CodexBar/Services/History/HistoryDatabaseStore.swift b/CodexBar/Services/History/HistoryDatabaseStore.swiftindex a16e8aa..2cde2a8 100644--- a/CodexBar/Services/History/HistoryDatabaseStore.swift+++ b/CodexBar/Services/History/HistoryDatabaseStore.swift@@ -3,7 +3,7 @@ import os/// 同一目录共用连接, 每次访问在数据库 actor 内同步完成, 事务不跨 awaitactor HistoryDatabaseStore {- private static let applicationStore = HistoryDatabaseStore(directoryURL: HistoryStorage.directoryURL().standardizedFileURL)+ private static let applicationStore = HistoryDatabaseStore(directoryURL: AppStorage.directoryURL().standardizedFileURL)private static let stores = OSAllocatedUnfairLock(initialState: [URL: WeakStore]())private struct WeakStore {diff --git a/CodexBar/Services/History/HistoryService.swift b/CodexBar/Services/History/HistoryService.swiftindex 14f39e9..9a67dcd 100644--- a/CodexBar/Services/History/HistoryService.swift+++ b/CodexBar/Services/History/HistoryService.swift@@ -29,9 +29,9 @@ actor HistoryService {private var idleMaintenanceRounds = 0private var lastRetentionCutoff: Date?- init(directoryURL: URL = HistoryStorage.directoryURL(), syncService: SyncService? = nil, tokenUsageHistory: TokenUsageHistoryStore? = nil) {+ init(directoryURL: URL = AppStorage.directoryURL(), syncService: SyncService? = nil, tokenUsageHistory: TokenUsageHistoryStore? = nil) {database = HistoryDatabaseStore.shared(in: directoryURL)- self.syncService = syncService ?? SyncService(directoryURL: HistoryStorage.syncDirectoryURL(in: directoryURL))+ self.syncService = syncService ?? SyncService(directoryURL: directoryURL)self.tokenUsageHistory = tokenUsageHistory ?? TokenUsageHistoryStore(directoryURL: directoryURL)}diff --git a/CodexBar/Services/History/HistoryStorage.swift b/CodexBar/Services/History/HistoryStorage.swiftindex 7f0c1a3..1a8ab9d 100644--- a/CodexBar/Services/History/HistoryStorage.swift+++ b/CodexBar/Services/History/HistoryStorage.swift@@ -5,15 +5,7 @@ nonisolated enum HistoryStorage {private static let retentionDayCount = 210private static let identifierRetentionDayCount = 3- static func directoryURL() -> URL {- AppStorage.directoryURL()- }-- static func syncDirectoryURL(in root: URL = directoryURL()) -> URL {- root.appendingPathComponent("Sync", isDirectory: true)- }-- static func rebuildableEventDateKeys(in directoryURL: URL = directoryURL()) async -> [String] {+ static func rebuildableEventDateKeys(in directoryURL: URL = AppStorage.directoryURL()) async -> [String] {let cutoff = dateKey(for: retentionCutoffDate())let dates = try? await HistoryDatabaseStore.shared(in: directoryURL).access { try $0.dates() }return (dates ?? []).filter { $0 >= cutoff }diff --git a/CodexBar/Services/History/TokenUsageHistoryStore.swift b/CodexBar/Services/History/TokenUsageHistoryStore.swiftindex 251ecfe..771da31 100644--- a/CodexBar/Services/History/TokenUsageHistoryStore.swift+++ b/CodexBar/Services/History/TokenUsageHistoryStore.swift@@ -7,7 +7,7 @@ final nonisolated class TokenUsageHistoryStore: Sendable {private let database: HistoryDatabaseStoreprivate let recordingLease = OSAllocatedUnfairLock<Int32?>(initialState: nil)- init(directoryURL: URL = HistoryStorage.directoryURL()) {+ init(directoryURL: URL = AppStorage.directoryURL()) {self.directoryURL = directoryURLdatabase = HistoryDatabaseStore.shared(in: directoryURL)}@@ -26,7 +26,7 @@ final nonisolated class TokenUsageHistoryStore: Sendable {if lease != nil {return true}- lease = try JSONFileStorage.acquireLock(in: directoryURL.appendingPathComponent("Locks"), name: "tokenUsage.lock", nonblocking: true)+ lease = try JSONFileStorage.acquireLock(at: AppStorage(rootURL: directoryURL).lockURL(.tokenUsageRecording), nonblocking: true)return lease != nil}}@@ -163,6 +163,7 @@ nonisolated struct TokenUsageFileCache<Value: Codable & Equatable> {}let encoded = try JSONLines.stableEncoder.encode(updated)if current != encoded {+ try FileManager.default.createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true)try encoded.write(to: url, options: .atomic)}data = encodeddiff --git a/CodexBar/Services/Support/AppStorage.swift b/CodexBar/Services/Support/AppStorage.swiftindex 7e1f634..ccbbf89 100644--- a/CodexBar/Services/Support/AppStorage.swift+++ b/CodexBar/Services/Support/AppStorage.swift@@ -1,6 +1,46 @@import Foundation-nonisolated enum AppStorage {+/// App 数据根目录下的文件和锁路径在这里统一定义+nonisolated struct AppStorage {+ enum Lock: String {+ case appInstance+ case tokenUsageRecording+ case protectionState+ case activityDataSyncCache+ case tokenUsageSyncCache+ case tokenUsageSync+ }++ let rootURL: URL++ init(rootURL: URL = Self.directoryURL()) {+ self.rootURL = rootURL+ }++ var historyDatabaseURL: URL {+ rootURL.appendingPathComponent("event.db")+ }++ var logDirectoryURL: URL {+ rootURL.appendingPathComponent("Logs", isDirectory: true)+ }++ var protectionStateURL: URL {+ rootURL.appendingPathComponent("Protection/state.json")+ }++ var activityDataSyncCacheURL: URL {+ rootURL.appendingPathComponent("Sync/activityData.json")+ }++ var tokenUsageSyncCacheURL: URL {+ rootURL.appendingPathComponent("Sync/tokenUsage.json")+ }++ func lockURL(_ lock: Lock) -> URL {+ rootURL.appendingPathComponent("Locks/\(lock.rawValue).lock")+ }+#if DEBUGstatic let directoryName = "CodexBar Data Debug"#elsediff --git a/CodexBar/Services/Support/JSONFileStorage.swift b/CodexBar/Services/Support/JSONFileStorage.swiftindex 4306363..6356813 100644--- a/CodexBar/Services/Support/JSONFileStorage.swift+++ b/CodexBar/Services/Support/JSONFileStorage.swift@@ -2,16 +2,16 @@ import Darwinimport Foundationnonisolated enum JSONFileStorage {- static func withLock<T>(in directory: URL, name: String = "store.lock", _ operation: () throws -> T) throws -> T {- guard let descriptor = try acquireLock(in: directory, name: name) else { throw POSIXError(.EIO) }+ static func withLock<T>(at url: URL, _ operation: () throws -> T) throws -> T {+ guard let descriptor = try acquireLock(at: url) else { throw POSIXError(.EIO) }defer { releaseLock(descriptor) }return try operation()}- static func acquireLock(in directory: URL, name: String = "store.lock", nonblocking: Bool = false) throws -> Int32? {- try FileManager.default.createDirectory(at: directory, withIntermediateDirectories: true)+ static func acquireLock(at url: URL, nonblocking: Bool = false) throws -> Int32? {+ try FileManager.default.createDirectory(at: url.deletingLastPathComponent(), withIntermediateDirectories: true)// 原子创建并打开锁文件, 避免替换其他进程已锁定的 inode- let descriptor = open(directory.appendingPathComponent(name).path, O_RDWR | O_CREAT | O_CLOEXEC, 0o600)+ let descriptor = open(url.path, O_RDWR | O_CREAT | O_CLOEXEC, 0o600)guard descriptor >= 0 else { throw POSIXError(POSIXErrorCode(rawValue: errno) ?? .EIO) }guard flock(descriptor, LOCK_EX | (nonblocking ? LOCK_NB : 0)) == 0 else {let code = errnodiff --git a/CodexBar/Services/Sync/ActivityDataSyncStore.swift b/CodexBar/Services/Sync/ActivityDataSyncStore.swiftindex 3eb8238..3eacc4e 100644--- a/CodexBar/Services/Sync/ActivityDataSyncStore.swift+++ b/CodexBar/Services/Sync/ActivityDataSyncStore.swift@@ -4,16 +4,16 @@ import Foundationnonisolated struct ActivityDataSyncStore {let directoryURL: URL- private var cacheDirectoryURL: URL {- directoryURL.appendingPathComponent("activityData", isDirectory: true)+ private var cacheURL: URL {+ AppStorage(rootURL: directoryURL).activityDataSyncCacheURL}- private var cacheURL: URL {- cacheDirectoryURL.appendingPathComponent("cache.json", isDirectory: false)+ private var lockURL: URL {+ AppStorage(rootURL: directoryURL).lockURL(.activityDataSyncCache)}func load() throws -> ActivityDataSyncCache {- try JSONFileStorage.withLock(in: cacheDirectoryURL) { try read() }+ try JSONFileStorage.withLock(at: lockURL) { try read() }}func loadState() -> ActivityDataSyncState {@@ -49,7 +49,7 @@ nonisolated struct ActivityDataSyncStore {}func prune(now: Date) throws {- try JSONFileStorage.withLock(in: cacheDirectoryURL) {+ try JSONFileStorage.withLock(at: lockURL) {var cache = try read()if cache.prune(now: now) {try JSONFileStorage.save(cache, to: cacheURL)@@ -79,7 +79,7 @@ nonisolated struct ActivityDataSyncStore {}private func update(_ body: (inout ActivityDataSyncCache) throws -> Void) throws {- try JSONFileStorage.withLock(in: cacheDirectoryURL) {+ try JSONFileStorage.withLock(at: lockURL) {var cache = try read()try body(&cache)cache.prune()diff --git a/CodexBar/Services/Sync/SyncService.swift b/CodexBar/Services/Sync/SyncService.swiftindex 9db0d3c..d776077 100644--- a/CodexBar/Services/Sync/SyncService.swift+++ b/CodexBar/Services/Sync/SyncService.swift@@ -33,7 +33,7 @@ actor SyncService {private let directoryURL: URLprivate let isEnabled: @Sendable () -> Boolprivate lazy var tokenUsageSync = TokenUsageSync(- database: database, directoryURL: directoryURL.appendingPathComponent("tokenUsage"), isEnabled: isEnabled+ database: database, directoryURL: directoryURL, isEnabled: isEnabled)// zone 存在性跨轮缓存, 共享故障后重新确认@@ -45,7 +45,7 @@ actor SyncService {init(container: CKContainer? = nil,database: (any SyncDatabase)? = nil,- directoryURL: URL = HistoryStorage.syncDirectoryURL(),+ directoryURL: URL = AppStorage.directoryURL(),isEnabled: @escaping @Sendable () -> Bool = { SyncSettings.isEnabled() }) {self.container = container@@ -68,7 +68,7 @@ actor SyncService {}if lastTokenUsageCacheRetentionCutoff != cutoff {do {- try TokenUsageSync.pruneLocalCache(in: directoryURL.appendingPathComponent("tokenUsage"), now: now)+ try TokenUsageSync.pruneLocalCache(in: directoryURL, now: now)lastTokenUsageCacheRetentionCutoff = cutoff} catch {AppLog.sync.error("Token 同步缓存过期清理失败")@@ -819,7 +819,7 @@ private extension SyncService {extension SyncService {/// 设置页读取最近上传时间, 与内部 loadState 使用同一 schemaVersion 校验口径nonisolated static func loadLastUploadAt() -> Date? {- ActivityDataSyncStore(directoryURL: HistoryStorage.syncDirectoryURL()).loadState().lastUploadAt+ ActivityDataSyncStore(directoryURL: AppStorage.directoryURL()).loadState().lastUploadAt}}diff --git a/CodexBar/Services/Sync/TokenUsageSync.swift b/CodexBar/Services/Sync/TokenUsageSync.swiftindex 1124ee9..fe9a0cd 100644--- a/CodexBar/Services/Sync/TokenUsageSync.swift+++ b/CodexBar/Services/Sync/TokenUsageSync.swift@@ -4,7 +4,7 @@ import Foundation/// 按设备和日期覆盖每日数量, 本机数据与其他设备的汇总分别保留actor TokenUsageSync {private let database: any SyncDatabase- private let directoryURL: URL+ private let storage: AppStorageprivate let isEnabled: @Sendable () -> Boolprivate var fileCache: TokenUsageFileCache<TokenUsageSyncCache>static let recordType = "TokenUsage"@@ -12,9 +12,9 @@ actor TokenUsageSync {init(database: any SyncDatabase, directoryURL: URL, isEnabled: @escaping @Sendable () -> Bool = { SyncSettings.isEnabled() }) {self.database = database- self.directoryURL = directoryURL+ storage = AppStorage(rootURL: directoryURL)self.isEnabled = isEnabled- fileCache = TokenUsageFileCache(url: directoryURL.appendingPathComponent("cache.json"))+ fileCache = TokenUsageFileCache(url: AppStorage(rootURL: directoryURL).tokenUsageSyncCacheURL)}func snapshot(local: [TokenUsageAggregate], accountScopedDeviceID: String?) throws -> [String: TokenUsage] {@@ -37,11 +37,11 @@ actor TokenUsageSync {func resetCache() throws {try SyncCancellation.check(isEnabled: isEnabled)- guard let lock = try JSONFileStorage.acquireLock(in: directoryURL, name: "sync.lock", nonblocking: true) else {+ guard let lock = try JSONFileStorage.acquireLock(at: storage.lockURL(.tokenUsageSync), nonblocking: true) else {throw POSIXError(.EWOULDBLOCK)}defer { JSONFileStorage.releaseLock(lock) }- try JSONFileStorage.withLock(in: directoryURL) {+ try JSONFileStorage.withLock(at: storage.lockURL(.tokenUsageSyncCache)) {do { _ = try Self.loadCache(&fileCache) } catch is DecodingError {// 已知格式损坏可清除, 未知版本继续向上抛出}@@ -55,7 +55,7 @@ actor TokenUsageSync {func synchronize(local: [TokenUsageAggregate], accountScopedDeviceID: String, zoneID: CKRecordZone.ID, canUpload: Bool = true) async throws {try SyncCancellation.check(isEnabled: isEnabled)// 整轮同步共用非阻塞锁, 防止另一个进程用较早的快照覆盖游标, 界面读取不等待网络- guard let lock = try JSONFileStorage.acquireLock(in: directoryURL, name: "sync.lock", nonblocking: true) else { return }+ guard let lock = try JSONFileStorage.acquireLock(at: storage.lockURL(.tokenUsageSync), nonblocking: true) else { return }defer { JSONFileStorage.releaseLock(lock) }var cache: TokenUsageSyncCachedo {@@ -186,7 +186,7 @@ actor TokenUsageSync {}private func load() throws -> TokenUsageSyncCache? {- try JSONFileStorage.withLock(in: directoryURL) { try Self.loadCache(&fileCache) }+ try JSONFileStorage.withLock(at: storage.lockURL(.tokenUsageSyncCache)) { try Self.loadCache(&fileCache) }}private nonisolated static func loadCache(_ fileCache: inout TokenUsageFileCache<TokenUsageSyncCache>) throws -> TokenUsageSyncCache? {@@ -196,7 +196,7 @@ actor TokenUsageSync {}private func save(_ cache: TokenUsageSyncCache) throws {- try JSONFileStorage.withLock(in: directoryURL) {+ try JSONFileStorage.withLock(at: storage.lockURL(.tokenUsageSyncCache)) {var cache = cachecache.prune()try fileCache.save(cache)@@ -204,8 +204,9 @@ actor TokenUsageSync {}nonisolated static func pruneLocalCache(in directoryURL: URL, now: Date) throws {- try JSONFileStorage.withLock(in: directoryURL) {- var fileCache = TokenUsageFileCache<TokenUsageSyncCache>(url: directoryURL.appendingPathComponent("cache.json"))+ let storage = AppStorage(rootURL: directoryURL)+ try JSONFileStorage.withLock(at: storage.lockURL(.tokenUsageSyncCache)) {+ var fileCache = TokenUsageFileCache<TokenUsageSyncCache>(url: AppStorage(rootURL: directoryURL).tokenUsageSyncCacheURL)if var cache = try loadCache(&fileCache), cache.prune(now: now) {try fileCache.save(cache)}diff --git a/Config/Version.xcconfig b/Config/Version.xcconfigindex 0cdb281..f2e91b1 100644--- a/Config/Version.xcconfig+++ b/Config/Version.xcconfig@@ -1,2 +1,2 @@-MARKETING_VERSION = 5.0.3-CURRENT_PROJECT_VERSION = 203+MARKETING_VERSION = 5.0.4+CURRENT_PROJECT_VERSION = 204diff --git a/Tests/App/Activity/ActivityIsolationTests.swift b/Tests/App/Activity/ActivityIsolationTests.swiftindex 181b7da..f8ad42b 100644--- a/Tests/App/Activity/ActivityIsolationTests.swift+++ b/Tests/App/Activity/ActivityIsolationTests.swift@@ -136,7 +136,7 @@ struct ActivityIsolationTests {func fullStorageBufferKeepsLiveReadingAndRetainsAcceptedEvents(byteLimit: Bool) async throws {let directory = try TestDirectory()defer { try? directory.remove() }- let blocker = try directory.write("blocked", to: HistoryDatabase.filename)+ let blocker = try directory.write("blocked", to: "event.db")let now = Date().addingTimeInterval(-60)let server = try SharedServerFixture { peer inlet initialize = try peer.readMessage()@@ -412,7 +412,7 @@ extension ActivityIsolationTests {@Test func fullObservationQueueContinuesBaselineAfterStorageRecovery() async throws {let directory = try TestDirectory()defer { try? directory.remove() }- let blocker = try directory.write("blocked", to: HistoryDatabase.filename)+ let blocker = try directory.write("blocked", to: "event.db")let phase = Mutex(0)let server = try Self.tokenServer(now: Date().addingTimeInterval(-60), phase: { phase.withLock { $0 } })defer { server.close() }@@ -439,7 +439,7 @@ extension ActivityIsolationTests {#expect(await reader.drainNow().status == .completed)#expect(observed == 2)try FileManager.default.removeItem(at: blocker)- for _ in 0 ..< 200 where !FileManager.default.fileExists(atPath: directory.url.appendingPathComponent(HistoryDatabase.filename).path) {+ for _ in 0 ..< 200 where !FileManager.default.fileExists(atPath: directory.url.appendingPathComponent("event.db").path) {try await Task.sleep(for: .milliseconds(10))}#expect(await reader.drainNow().status == .completed)diff --git a/Tests/App/Activity/ActivitySchedulingTests.swift b/Tests/App/Activity/ActivitySchedulingTests.swiftindex 46a4310..7040fcf 100644--- a/Tests/App/Activity/ActivitySchedulingTests.swift+++ b/Tests/App/Activity/ActivitySchedulingTests.swift@@ -178,7 +178,7 @@ struct ActivitySchedulingTests {@Test func persistedEventIsPublishedOnceAfterMaintenanceWriteRecovers() async throws {let directory = try TestDirectory()defer { try? directory.remove() }- let blocker = try directory.write("block maintenance directory", to: HistoryDatabase.filename)+ let blocker = try directory.write("block maintenance directory", to: "event.db")let release = DispatchSemaphore(value: 0)defer { release.signal() }let server = try SharedServerFixture { peer in@@ -530,7 +530,7 @@ extension ActivitySchedulingTests {func stopWaitsForPendingWritesAndReportsPersistenceFailure(failFirstStop: Bool) async throws {let directory = try TestDirectory()defer { try? directory.remove() }- let blocker = try directory.write("block maintenance directory", to: HistoryDatabase.filename)+ let blocker = try directory.write("block maintenance directory", to: "event.db")let release = DispatchSemaphore(value: 0)defer { release.signal() }let server = try SharedServerFixture { peer indiff --git a/Tests/App/Activity/ProtectionRecoveryTests.swift b/Tests/App/Activity/ProtectionRecoveryTests.swiftindex 1b1f058..b7e56f4 100644--- a/Tests/App/Activity/ProtectionRecoveryTests.swift+++ b/Tests/App/Activity/ProtectionRecoveryTests.swift@@ -8,7 +8,7 @@ struct ProtectionRecoveryTests {defer { try? directory.remove() }let preferences = try TestPreferences()defer { preferences.remove() }- let bad = try directory.write("broken", to: "state.json")+ let bad = try directory.write("broken", to: "Protection/state.json")let monitor = makeMonitor(directory: directory, preferences: preferences)monitor.isStarted = truemonitor.loadProtectionState()@@ -26,7 +26,7 @@ struct ProtectionRecoveryTests {defer { try? directory.remove() }let preferences = try TestPreferences()defer { preferences.remove() }- let path = directory.url.appendingPathComponent("state.json")+ let path = directory.url.appendingPathComponent("Protection/state.json")try FileManager.default.createDirectory(at: path, withIntermediateDirectories: true)let monitor = makeMonitor(directory: directory, preferences: preferences)monitor.isStarted = truediff --git a/Tests/App/Activity/ProtectionStoreTests.swift b/Tests/App/Activity/ProtectionStoreTests.swiftindex eb974b4..3fbf533 100644--- a/Tests/App/Activity/ProtectionStoreTests.swift+++ b/Tests/App/Activity/ProtectionStoreTests.swift@@ -43,12 +43,12 @@ struct ProtectionStoreTests {func invalidStateIsPreservedAndRejectsWrites(_ content: String) async throws {let directory = try TestDirectory()defer { try? directory.remove() }- _ = try directory.write(content, to: "state.json")+ _ = try directory.write(content, to: "Protection/state.json")let store = ProtectionStore(directoryURL: directory.url)await #expect(throws: (any Error).self) { try await store.load(now: TestFixtures.now) }let record = makeRecord("task", markedAfter: 0)await #expect(throws: (any Error).self) { try await store.apply(upserts: [record], now: TestFixtures.now) }- #expect(try String(contentsOf: directory.url.appendingPathComponent("state.json"), encoding: .utf8) == content)+ #expect(try String(contentsOf: directory.url.appendingPathComponent("Protection/state.json"), encoding: .utf8) == content)}@Test func duplicateStoredIdentifiersChooseLatestMarkAndFileIsPrivate() async throws {@@ -57,7 +57,7 @@ struct ProtectionStoreTests {let older = makeRecord("task", markedAfter: 0)let newer = makeRecord("task", markedAfter: 5)let records = try #require(String(data: JSONEncoder().encode([newer, older]), encoding: .utf8))- let url = try directory.write("{\"schemaVersion\":1,\"records\":\(records)}", to: "state.json")+ let url = try directory.write("{\"schemaVersion\":1,\"records\":\(records)}", to: "Protection/state.json")let store = ProtectionStore(directoryURL: directory.url)#expect(try await store.load(now: TestFixtures.now)["task"] == newer)try await store.apply(now: TestFixtures.now)diff --git a/Tests/App/History/HistoryAggregationTests.swift b/Tests/App/History/HistoryAggregationTests.swiftindex a519d16..6c6577c 100644--- a/Tests/App/History/HistoryAggregationTests.swift+++ b/Tests/App/History/HistoryAggregationTests.swift@@ -71,13 +71,13 @@ struct HistoryAggregationTests {defer { try? directory.remove() }let debugRoot = directory.url.appendingPathComponent("CodexBar Data Debug", isDirectory: true)let releaseRoot = directory.url.appendingPathComponent("CodexBar Data", isDirectory: true)- let debugStore = ActivityDataSyncStore(directoryURL: HistoryStorage.syncDirectoryURL(in: debugRoot))- let releaseStore = ActivityDataSyncStore(directoryURL: HistoryStorage.syncDirectoryURL(in: releaseRoot))+ let debugStore = ActivityDataSyncStore(directoryURL: debugRoot)+ let releaseStore = ActivityDataSyncStore(directoryURL: releaseRoot)try releaseStore.saveState(ActivityDataSyncState(deviceID: "release"))#expect(debugStore.loadState().deviceID == nil)try debugStore.saveState(ActivityDataSyncState(deviceID: "debug"))#expect(releaseStore.loadState().deviceID == "release")- let restored = ActivityDataSyncStore(directoryURL: HistoryStorage.syncDirectoryURL(in: debugRoot))+ let restored = ActivityDataSyncStore(directoryURL: debugRoot)#expect(restored.loadState().deviceID == "debug")#expect(SyncCloudKit.zoneName == "CodexBarAppZone")let root = AppStorage.directoryURL()@@ -86,8 +86,6 @@ struct HistoryAggregationTests {#else#expect(root.lastPathComponent == "CodexBar Data")#endif- #expect(HistoryStorage.directoryURL() == root)- #expect(HistoryStorage.syncDirectoryURL() == root.appendingPathComponent("Sync", isDirectory: true))#expect(AppServerLogStore.defaultDirectory == root.appendingPathComponent("Logs", isDirectory: true))}diff --git a/Tests/App/History/HistoryDatabaseIndexTests.swift b/Tests/App/History/HistoryDatabaseIndexTests.swiftindex d6bd35c..2098ec7 100644--- a/Tests/App/History/HistoryDatabaseIndexTests.swift+++ b/Tests/App/History/HistoryDatabaseIndexTests.swift@@ -216,7 +216,7 @@ struct HistoryDatabaseIndexTests {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)+ let opened = sqlite3_open_v2(directory.url.appendingPathComponent("event.db").path, &connection, SQLITE_OPEN_READONLY, nil)defer { sqlite3_close(connection) }try #require(opened == SQLITE_OK)var statement: OpaquePointer?diff --git a/Tests/App/History/HistoryDatabaseStoreTests.swift b/Tests/App/History/HistoryDatabaseStoreTests.swiftindex 763006f..cacb417 100644--- a/Tests/App/History/HistoryDatabaseStoreTests.swift+++ b/Tests/App/History/HistoryDatabaseStoreTests.swift@@ -35,7 +35,7 @@ struct HistoryDatabaseStoreTests {defer { try? directory.remove() }let now = Date()let store = HistoryDatabaseStore.shared(in: directory.url)- let sync = SyncService(directoryURL: HistoryStorage.syncDirectoryURL(in: directory.url), isEnabled: { false })+ let sync = SyncService(directoryURL: directory.url, isEnabled: { false })let history = HistoryService(directoryURL: directory.url, syncService: sync)let event = Self.event(at: now)try await ActivityDataRecorder(directoryURL: directory.url).record(event: event)@@ -102,7 +102,7 @@ struct HistoryDatabaseStoreTests {@Test func failedOpenCanRecoverOnTheSameStore() async throws {let directory = try TestDirectory()defer { try? directory.remove() }- let blocker = try directory.write("not a database", to: HistoryDatabase.filename)+ let blocker = try directory.write("not a database", to: "event.db")let store = HistoryDatabaseStore.shared(in: directory.url)await #expect(throws: (any Error).self) { try await store.access { try $0.dates() } }try FileManager.default.removeItem(at: blocker)@@ -134,9 +134,9 @@ struct HistoryDatabaseStoreTests {let replacementDirectory = directory.url.appendingPathComponent("replacement", isDirectory: true)let replacement = Self.observation(tokens: 20, at: now)try HistoryDatabase(directoryURL: replacementDirectory).append(AppServerEventRecord(tokenUsage: replacement, recordedAt: now))- let url = directory.url.appendingPathComponent(HistoryDatabase.filename)+ let url = directory.url.appendingPathComponent("event.db")try FileManager.default.moveItem(at: url, to: directory.url.appendingPathComponent("previous.db"))- try FileManager.default.moveItem(at: replacementDirectory.appendingPathComponent(HistoryDatabase.filename), to: url)+ try FileManager.default.moveItem(at: replacementDirectory.appendingPathComponent("event.db"), to: url)#expect(try await tokens.snapshot(threadID: "thread").turns["turn"]?.totalTokens == 20)#expect(try await store.access { try $0.dates() } == [HistoryStorage.dateKey(for: now)])}diff --git a/Tests/App/History/HistoryDatabaseTests.swift b/Tests/App/History/HistoryDatabaseTests.swiftindex 6f97941..0e4e4d1 100644--- a/Tests/App/History/HistoryDatabaseTests.swift+++ b/Tests/App/History/HistoryDatabaseTests.swift@@ -265,7 +265,7 @@ extension HistoryDatabaseTests {try database.append(event("one", at: now))let aggregate = try database.aggregateActivityData(date: HistoryStorage.dateKey(for: now))var connection: OpaquePointer?- #expect(sqlite3_open_v2(directory.url.appendingPathComponent(HistoryDatabase.filename).path, &connection, SQLITE_OPEN_READONLY, nil) == SQLITE_OK)+ #expect(sqlite3_open_v2(directory.url.appendingPathComponent("event.db").path, &connection, SQLITE_OPEN_READONLY, nil) == SQLITE_OK)defer { sqlite3_close(connection) }var statement: OpaquePointer?let sql = """diff --git a/Tests/App/History/StorageRetentionTests.swift b/Tests/App/History/StorageRetentionTests.swiftindex bb806af..8628aa4 100644--- a/Tests/App/History/StorageRetentionTests.swift+++ b/Tests/App/History/StorageRetentionTests.swift@@ -21,8 +21,8 @@ struct StorageRetentionTests {let tokenUsageCacheData = try JSONLines.stableEncoder.encode(TokenUsageSyncCache(state: TokenUsageSyncState(deviceID: "device"), records: [tokenUsageRecord.id: tokenUsageRecord]))- let activityDataURL = try directory.write(activityDataCache, to: "activityData/cache.json")- let tokenUsageURL = try directory.write(Data(#"{"schemaVersion":999}"#.utf8), to: "tokenUsage/cache.json")+ let activityDataURL = try directory.write(activityDataCache, to: "Sync/activityData.json")+ let tokenUsageURL = try directory.write(Data(#"{"schemaVersion":999}"#.utf8), to: "Sync/tokenUsage.json")let sync = SyncService(directoryURL: directory.url, isEnabled: { false })await sync.pruneLocalCaches(now: now)#expect(try JSONLines.decoder.decode(ActivityDataSyncCache.self, from: Data(contentsOf: activityDataURL)).records.isEmpty)@@ -89,7 +89,7 @@ struct StorageRetentionTests {state: ActivityDataSyncState(deviceID: "device"),records: Dictionary(uniqueKeysWithValues: records.map { ($0.id, $0) }))- _ = try directory.write(JSONLines.stableEncoder.encode(cache), to: "Sync/activityData/cache.json")+ _ = try directory.write(JSONLines.stableEncoder.encode(cache), to: "Sync/activityData.json")let days = [TokenUsageSyncRecord(deviceID: "device", date: expiredKey, tokenUsage: .zero),TokenUsageSyncRecord(deviceID: "device", date: retainedKey, tokenUsage: .zero),@@ -99,15 +99,15 @@ struct StorageRetentionTests {state: TokenUsageSyncState(deviceID: "device"), records: Dictionary(uniqueKeysWithValues: days.map { ($0.id, $0) }),cursor: Data("cursor".utf8))- _ = try directory.write(JSONLines.stableEncoder.encode(tokenUsageCache), to: "Sync/tokenUsage/cache.json")- let sync = SyncService(directoryURL: HistoryStorage.syncDirectoryURL(in: directory.url), isEnabled: { false })+ _ = try directory.write(JSONLines.stableEncoder.encode(tokenUsageCache), to: "Sync/tokenUsage.json")+ let sync = SyncService(directoryURL: directory.url, isEnabled: { false })let service = HistoryService(directoryURL: directory.url, syncService: sync)_ = await service.loadSnapshotWithMaintenance(synchronize: false, trigger: .manual)- let activityData = try Data(contentsOf: directory.url.appendingPathComponent("Sync/activityData/cache.json"))+ let activityData = try Data(contentsOf: directory.url.appendingPathComponent("Sync/activityData.json"))let activityDataCache = try JSONLines.decoder.decode(ActivityDataSyncCache.self, from: activityData)#expect(activityDataCache.sortedRecords.map(\.date) == [retainedKey])#expect(activityDataCache.state.deviceID == "device")- let tokenUsageData = try Data(contentsOf: directory.url.appendingPathComponent("Sync/tokenUsage/cache.json"))+ let tokenUsageData = try Data(contentsOf: directory.url.appendingPathComponent("Sync/tokenUsage.json"))let tokenUsageCacheData = try JSONLines.decoder.decode(TokenUsageSyncCache.self, from: tokenUsageData)#expect(Set(tokenUsageCacheData.records.keys) == ["tokenUsage_device_\(retainedKey)", "tokenUsage_other_\(retainedKey)"])#expect(tokenUsageCacheData.cursor == nil)diff --git a/Tests/App/Support/JSONFileStorageTests.swift b/Tests/App/Support/JSONFileStorageTests.swiftindex fb5f612..fae706a 100644--- a/Tests/App/Support/JSONFileStorageTests.swift+++ b/Tests/App/Support/JSONFileStorageTests.swift@@ -8,11 +8,11 @@ struct JSONFileStorageTests {defer { try? directory.remove() }do {- let descriptor = try #require(try JSONFileStorage.acquireLock(in: directory.url, name: "sync.lock", nonblocking: true))+ let descriptor = try #require(try JSONFileStorage.acquireLock(at: directory.url.appendingPathComponent("sync.lock"), nonblocking: true))defer { JSONFileStorage.releaseLock(descriptor) }let started = ContinuousClock.now- let duplicate = try JSONFileStorage.acquireLock(in: directory.url, name: "sync.lock", nonblocking: true)+ let duplicate = try JSONFileStorage.acquireLock(at: directory.url.appendingPathComponent("sync.lock"), nonblocking: true)defer {if let duplicate {JSONFileStorage.releaseLock(duplicate)@@ -20,17 +20,17 @@ struct JSONFileStorageTests {}#expect(duplicate == nil)#expect(started.duration(to: .now) < .seconds(1))- try JSONFileStorage.withLock(in: directory.url) {}+ try JSONFileStorage.withLock(at: directory.url.appendingPathComponent("store.lock")) {}}- let replacement = try #require(try JSONFileStorage.acquireLock(in: directory.url, name: "sync.lock", nonblocking: true))+ let replacement = try #require(try JSONFileStorage.acquireLock(at: directory.url.appendingPathComponent("sync.lock"), nonblocking: true))JSONFileStorage.releaseLock(replacement)}@Test nonisolated func lockDoesNotSurviveExec() throws {let directory = try TestDirectory()defer { try? directory.remove() }- let descriptor = try #require(try JSONFileStorage.acquireLock(in: directory.url, nonblocking: true))+ let descriptor = try #require(try JSONFileStorage.acquireLock(at: directory.url.appendingPathComponent("store.lock"), nonblocking: true))defer { JSONFileStorage.releaseLock(descriptor) }let flags = fcntl(descriptor, F_GETFD)@@ -42,9 +42,9 @@ struct JSONFileStorageTests {let directory = try TestDirectory()defer { try? directory.remove() }- let first = try #require(try JSONFileStorage.acquireLock(in: directory.url.appendingPathComponent("first"), nonblocking: true))+ let first = try #require(try JSONFileStorage.acquireLock(at: directory.url.appendingPathComponent("first/store.lock"), nonblocking: true))defer { JSONFileStorage.releaseLock(first) }- let second = try #require(try JSONFileStorage.acquireLock(in: directory.url.appendingPathComponent("second"), nonblocking: true))+ let second = try #require(try JSONFileStorage.acquireLock(at: directory.url.appendingPathComponent("second/store.lock"), nonblocking: true))defer { JSONFileStorage.releaseLock(second) }}@@ -54,7 +54,7 @@ struct JSONFileStorageTests {let fileURL = try directory.write(Data(), to: "file")#expect(throws: (any Error).self) {- try JSONFileStorage.acquireLock(in: fileURL, nonblocking: true)+ try JSONFileStorage.acquireLock(at: fileURL.appendingPathComponent("store.lock"), nonblocking: true)}}}diff --git a/Tests/App/Sync/SyncRecoveryTests.swift b/Tests/App/Sync/SyncRecoveryTests.swiftindex 3878a48..224def2 100644--- a/Tests/App/Sync/SyncRecoveryTests.swift+++ b/Tests/App/Sync/SyncRecoveryTests.swift@@ -78,7 +78,7 @@ struct SyncRecoveryTests {isEnabled: { true })_ = await service.synchronizeIfEnabled(localActivityDataAggregates: [], trigger: .manual)- let url = directory.url.appendingPathComponent("activityData/cache.json")+ let url = directory.url.appendingPathComponent("Sync/activityData.json")var json = try #require(JSONSerialization.jsonObject(with: Data(contentsOf: url)) as? [String: Any])json["cursor"] = Data("broken cursor".utf8).base64EncodedString()try JSONSerialization.data(withJSONObject: json).write(to: url)@@ -108,7 +108,7 @@ struct SyncRecoveryTests {let daily = TestFixtures.activityDataAggregate(date: date).syncedAggregatelet stale = try ActivityDataSyncRecord(deviceID: "stale", activityData: daily, recordName: "activityData_stale_\(date)")try store.saveFetchedRecords([stale.id: stale], cursor: nil)- let url = directory.url.appendingPathComponent("activityData/cache.json")+ let url = directory.url.appendingPathComponent("Sync/activityData.json")let original = try Data(contentsOf: url)let remote = CKRecord(recordType: "ActivityData", recordID: CKRecord.ID(recordName: "activityData_remote_\(date)", zoneID: Self.zone))try ActivityDataRecordCodec.apply(daily, deviceID: "remote", to: remote)@@ -149,7 +149,7 @@ struct SyncRecoveryTests {let database = SyncDatabaseFixture()let service = TokenUsageSync(database: database, directoryURL: directory.url, isEnabled: { true })try await service.synchronize(local: [Self.turn(0)], accountScopedDeviceID: "device", zoneID: Self.zone)- let url = directory.url.appendingPathComponent("cache.json")+ let url = directory.url.appendingPathComponent("Sync/tokenUsage.json")if cursorOnly {var json = try #require(JSONSerialization.jsonObject(with: Data(contentsOf: url)) as? [String: Any])json["cursor"] = Data("broken cursor".utf8).base64EncodedString()@@ -166,7 +166,7 @@ struct SyncRecoveryTests {let directory = try TestDirectory()defer { try? directory.remove() }let original = Data("broken cache".utf8)- let url = try directory.write(original, to: "cache.json")+ let url = try directory.write(original, to: "Sync/tokenUsage.json")let database = SyncDatabaseFixture(changesFail: true)let service = TokenUsageSync(database: database, directoryURL: directory.url, isEnabled: { true })await #expect(throws: (any Error).self) {@@ -261,7 +261,7 @@ struct SyncRecoveryTests {let database = SyncDatabaseFixture()let service = TokenUsageSync(database: database, directoryURL: directory.url, isEnabled: { true })try await service.synchronize(local: [Self.turn(0)], accountScopedDeviceID: "device", zoneID: Self.zone)- let url = directory.url.appendingPathComponent("cache.json")+ let url = directory.url.appendingPathComponent("Sync/tokenUsage.json")let original = try Data(contentsOf: url)await database.failChangesRecord()await #expect(throws: (any Error).self) {@@ -276,7 +276,7 @@ struct SyncRecoveryTests {let database = SyncDatabaseFixture()let service = TokenUsageSync(database: database, directoryURL: directory.url, isEnabled: { true })try await service.synchronize(local: [], accountScopedDeviceID: "device", zoneID: Self.zone)- let url = directory.url.appendingPathComponent("cache.json")+ let url = directory.url.appendingPathComponent("Sync/tokenUsage.json")let original = Data(#"{"schemaVersion":999,"futureField":"unsupported"}"#.utf8)try original.write(to: url)await #expect(throws: (any Error).self) {@@ -291,7 +291,7 @@ struct SyncRecoveryTests {let store = ActivityDataSyncStore(directoryURL: directory.url)let state = ActivityDataSyncState(deviceID: "device")try store.saveState(state)- let url = directory.url.appendingPathComponent("activityData/cache.json")+ let url = directory.url.appendingPathComponent("Sync/activityData.json")var json = try #require(JSONSerialization.jsonObject(with: Data(contentsOf: url)) as? [String: Any])json["cursor"] = Data("previous cursor".utf8).base64EncodedString()try JSONSerialization.data(withJSONObject: json).write(to: url)@@ -314,7 +314,7 @@ struct SyncRecoveryTests {#expect(reopened.sortedRecords == [record])#expect(reopened.cursor == nil)let files = try FileManager.default.contentsOfDirectory(atPath: url.deletingLastPathComponent().path)- #expect(Set(files) == ["cache.json", "store.lock"])+ #expect(Set(files) == ["activityData.json"])try store.reset(state: ActivityDataSyncState())#expect(try store.load() == ActivityDataSyncCache(state: ActivityDataSyncState()))}@@ -325,7 +325,7 @@ struct SyncRecoveryTests {defer { try? directory.remove() }let store = ActivityDataSyncStore(directoryURL: directory.url)try store.saveState(ActivityDataSyncState(deviceID: "device"))- let url = directory.url.appendingPathComponent("activityData/cache.json")+ let url = directory.url.appendingPathComponent("Sync/activityData.json")var json = try #require(JSONSerialization.jsonObject(with: Data(contentsOf: url)) as? [String: Any])json["cursor"] = Data("stale cursor".utf8).base64EncodedString()var record: [String: Any] = [@@ -350,7 +350,7 @@ struct SyncRecoveryTests {let directory = try TestDirectory()defer { try? directory.remove() }let original = Data(#"{"schemaVersion":999,"futureField":"unsupported"}"#.utf8)- let url = try directory.write(original, to: "activityData/cache.json")+ let url = try directory.write(original, to: "Sync/activityData.json")let store = ActivityDataSyncStore(directoryURL: directory.url)#expect(throws: SyncRecovery.Failure.self) { try store.saveState(ActivityDataSyncState()) }#expect(throws: SyncRecovery.Failure.self) { try store.reset(state: ActivityDataSyncState()) }@@ -362,7 +362,7 @@ struct SyncRecoveryTests {defer { try? directory.remove() }let store = ActivityDataSyncStore(directoryURL: directory.url)try store.saveState(ActivityDataSyncState(deviceID: "device"))- let url = directory.url.appendingPathComponent("activityData/cache.json")+ let url = directory.url.appendingPathComponent("Sync/activityData.json")var json = try #require(JSONSerialization.jsonObject(with: Data(contentsOf: url)) as? [String: Any])json["cursor"] = Data("previous cursor".utf8).base64EncodedString()let original = try JSONSerialization.data(withJSONObject: json)@@ -456,7 +456,7 @@ struct SyncRecoveryTests {@Test func unknownCloudVersionPreservesCacheAndPreventsActivityDataUpload() async throws {let fixture = try await HistoryRebuildFixture()defer { try? fixture.directory.remove() }- let cacheURL = HistoryStorage.syncDirectoryURL(in: fixture.directory.url).appendingPathComponent("activityData/cache.json")+ let cacheURL = fixture.directory.url.appendingPathComponent("Sync/activityData.json")let before = try Data(contentsOf: cacheURL)let unsupported = CKRecord(recordType: "ActivityData", recordID: CKRecord.ID(recordName: "future", zoneID: Self.zone))unsupported["schemaVersion"] = 999 as CKRecordValue@@ -472,7 +472,7 @@ struct SyncRecoveryTests {let directory = try TestDirectory()defer { try? directory.remove() }let original = Data("{\"schemaVersion\":999}".utf8)- let url = try directory.write(original, to: "activityData/cache.json")+ let url = try directory.write(original, to: "Sync/activityData.json")let database = SyncDatabaseFixture()let service = SyncService(database: database, directoryURL: directory.url, isEnabled: { true })let result = await service.synchronizeIfEnabled(localActivityDataAggregates: [], localTokenUsageAggregates: [Self.turn(0)], trigger: .manual)@@ -488,7 +488,7 @@ struct SyncRecoveryTests {}private static func cachedDailyCount(in directory: URL) throws -> Int {- let data = try Data(contentsOf: directory.appendingPathComponent("cache.json"))+ let data = try Data(contentsOf: directory.appendingPathComponent("Sync/tokenUsage.json"))let json = try #require(JSONSerialization.jsonObject(with: data) as? [String: Any])return try #require(json["records"] as? [[String: Any]]).count}@@ -715,7 +715,7 @@ extension SyncRecoveryTests {@Test func disabledSyncKeepsUpdatedAggregateForNextEnabledRun() async throws {let fixture = try await HistoryRebuildFixture()defer { try? fixture.directory.remove() }- let disabled = SyncService(database: fixture.database, directoryURL: HistoryStorage.syncDirectoryURL(in: fixture.directory.url), isEnabled: { false })+ let disabled = SyncService(database: fixture.database, directoryURL: fixture.directory.url, isEnabled: { false })let history = HistoryService(directoryURL: fixture.directory.url, syncService: disabled)_ = try await history.rebuildData(for: [fixture.date], synchronize: true)#expect(try await Self.activityDataEventCount(fixture.database.activityDataRecords().first) == 9)@@ -753,7 +753,7 @@ extension SyncRecoveryTests {defer { try? fixture.directory.remove() }let brokenDirectory = try TestDirectory()defer { try? brokenDirectory.remove() }- _ = try brokenDirectory.write(Data("broken".utf8), to: HistoryDatabase.filename)+ _ = try brokenDirectory.write(Data("broken".utf8), to: "event.db")let history = HistoryService(directoryURL: fixture.directory.url, syncService: fixture.sync,tokenUsageHistory: TokenUsageHistoryStore(directoryURL: brokenDirectory.url)@@ -800,7 +800,7 @@ private struct HistoryRebuildFixture {init() async throws {directory = try TestDirectory()database = SyncDatabaseFixture()- sync = SyncService(database: database, directoryURL: HistoryStorage.syncDirectoryURL(in: directory.url), isEnabled: { true })+ sync = SyncService(database: database, directoryURL: directory.url, isEnabled: { true })history = HistoryService(directoryURL: directory.url, syncService: sync)let now = Date()date = HistoryStorage.dateKey(for: now)@@ -849,7 +849,7 @@ extension SyncRecoveryTests {deviceID: "other", activityData: remote.syncedAggregate,recordName: ActivityDataSyncRecord.recordName(deviceID: "other", date: date))- let root = HistoryStorage.syncDirectoryURL(in: directory.url)+ let root = directory.urllet store = ActivityDataSyncStore(directoryURL: root)try store.saveState(ActivityDataSyncState(deviceID: "local"))try store.saveFetchedRecords([record.id: record], cursor: nil)@@ -1032,7 +1032,7 @@ extension SyncRecoveryTests {old.tokenUsage = Self.counts(120)try directory.seedTokenUsageAggregates([old])let database = SyncDatabaseFixture()- let sync = TokenUsageSync(database: database, directoryURL: directory.url.appendingPathComponent("Sync/tokenUsage"), isEnabled: { true })+ let sync = TokenUsageSync(database: database, directoryURL: directory.url, isEnabled: { true })try await sync.synchronize(local: [old], accountScopedDeviceID: "device", zoneID: Self.zone)let date = HistoryStorage.dateKey(for: now)_ = try await store.rebuild(for: [date])@@ -1054,7 +1054,7 @@ extension SyncRecoveryTests {let directory = try TestDirectory()defer { try? directory.remove() }let database = SyncDatabaseFixture()- let sync = SyncService(database: database, directoryURL: HistoryStorage.syncDirectoryURL(in: directory.url), isEnabled: { true })+ let sync = SyncService(database: database, directoryURL: directory.url, isEnabled: { true })let history = HistoryService(directoryURL: directory.url, syncService: sync)let now = Date()let date = HistoryStorage.dateKey(for: now)@@ -1065,7 +1065,7 @@ extension SyncRecoveryTests {try directory.replaceHistory(entry("first", count: 100) + entry("second", count: 200), date: date)let initial = await history.loadSnapshot(synchronize: true)#expect(initial.tokenUsageByDate[date] == Self.counts(300))- let deviceID = try #require(ActivityDataSyncStore(directoryURL: HistoryStorage.syncDirectoryURL(in: directory.url)).loadState().deviceID)+ let deviceID = try #require(ActivityDataSyncStore(directoryURL: directory.url).loadState().deviceID)let recordID = TokenUsageSync.recordID("tokenUsage_\(deviceID)_\(date)", zoneID: Self.zone)try HistoryDatabase(directoryURL: directory.url).execute("""UPDATE aggregates SET tokenUsage = NULL@@ -1105,7 +1105,7 @@ extension SyncRecoveryTests {var deviceIDs: [String] = []for kind in ["activityData", "tokenUsage"] {- let data = try Data(contentsOf: directory.url.appendingPathComponent("\(kind)/cache.json"))+ let data = try Data(contentsOf: directory.url.appendingPathComponent("Sync/\(kind).json"))let cache = try #require(JSONSerialization.jsonObject(with: data) as? [String: Any])#expect(Set(cache.keys) == ["schemaVersion", "state", "cursor", "records"])let state = try #require(cache["state"] as? [String: Any])@@ -1137,7 +1137,7 @@ extension SyncRecoveryTests {let local = Self.turn(0)let service = TokenUsageSync(database: database, directoryURL: directory.url, isEnabled: { true })try await service.synchronize(local: [local], accountScopedDeviceID: "device", zoneID: Self.zone)- let url = directory.url.appendingPathComponent("cache.json")+ let url = directory.url.appendingPathComponent("Sync/tokenUsage.json")let first = try JSONLines.decoder.decode(TokenUsageSyncCache.self, from: Data(contentsOf: url))let before = try #require(first.sortedRecords.first)#expect(before.updatedAt != nil)diff --git a/Tests/App/Sync/ZoneRecoveryTests.swift b/Tests/App/Sync/ZoneRecoveryTests.swiftindex ef7ced8..4e9f28d 100644--- a/Tests/App/Sync/ZoneRecoveryTests.swift+++ b/Tests/App/Sync/ZoneRecoveryTests.swift@@ -12,8 +12,8 @@ struct ZoneRecoveryTests {defer { try? directory.remove() }let database = ZoneDatabase()await database.removeZone(code: code, wrapped: wrapped)- _ = try directory.write("invalid activityData cache", to: "activityData/cache.json")- _ = try directory.write("invalid token cache", to: "tokenUsage/cache.json")+ _ = try directory.write("invalid activityData cache", to: "Sync/activityData.json")+ _ = try directory.write("invalid token cache", to: "Sync/tokenUsage.json")let service = service(database, directory)let snapshot = await service.synchronizeIfEnabled(localActivityDataAggregates: [aggregate(0)],@@ -150,12 +150,12 @@ struct ZoneRecoveryTests {let service = service(database, directory)_ = await service.synchronizeIfEnabled(localActivityDataAggregates: [aggregate(0)], localTokenUsageAggregates: [turn(0)], trigger: .manual)let before = ActivityDataSyncStore(directoryURL: directory.url).loadState()- let tokens = try Data(contentsOf: directory.url.appendingPathComponent("tokenUsage/cache.json"))+ let tokens = try Data(contentsOf: directory.url.appendingPathComponent("Sync/tokenUsage.json"))await database.rejectChanges(code)_ = await service.synchronizeIfEnabled(localActivityDataAggregates: [aggregate(0)], localTokenUsageAggregates: [turn(0)], trigger: .manual)#expect(await database.creations == 0)#expect(ActivityDataSyncStore(directoryURL: directory.url).loadState() == before)- #expect(try Data(contentsOf: directory.url.appendingPathComponent("tokenUsage/cache.json")) == tokens)+ #expect(try Data(contentsOf: directory.url.appendingPathComponent("Sync/tokenUsage.json")) == tokens)}@Test func switchingSyncOffDuringFailurePreventsZoneCreation() async throws {@@ -184,7 +184,7 @@ struct ZoneRecoveryTests {let stale = aggregate(0).syncedAggregatelet record = try ActivityDataSyncRecord(deviceID: "stale", activityData: stale, recordName: ActivityDataSyncRecord.recordName(deviceID: "stale", date: stale.date))try store.saveFetchedRecords([record.id: record], cursor: nil)- let blocked = directory.url.appendingPathComponent("tokenUsage/store.lock")+ let blocked = directory.url.appendingPathComponent("Locks/tokenUsageSyncCache.lock")try FileManager.default.createDirectory(at: blocked, withIntermediateDirectories: true)_ = await service(database, directory).synchronizeIfEnabled(localActivityDataAggregates: [aggregate(0)], trigger: .manual)#expect(store.loadState().deviceID == nil)@@ -233,7 +233,7 @@ struct ZoneRecoveryTests {}private func cachedTokenUsageCount(_ directory: TestDirectory) throws -> Int {- let data = try Data(contentsOf: directory.url.appendingPathComponent("tokenUsage/cache.json"))+ let data = try Data(contentsOf: directory.url.appendingPathComponent("Sync/tokenUsage.json"))let json = try #require(JSONSerialization.jsonObject(with: data) as? [String: Any])return try #require(json["records"] as? [[String: Any]]).count}diff --git a/appcast.xml b/appcast.xmlindex 3d996e5..04916ac 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.4</title>+ <sparkle:version>204</sparkle:version>+ <sparkle:shortVersionString>5.0.4</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.4</sparkle:releaseNotesLink>+ <sparkle:releaseNotesLink xml:lang="zh-CN">https://codexbar.zabrian.app/notes?lang=zh-CN#5.0.4</sparkle:releaseNotesLink>+ <pubDate>Fri, 23 Oct 2026 16:03:28 +0800</pubDate>+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v5.0.4.dmg" sparkle:edSignature="gv/hhtrCqrEnVW2bVIk2gxnoVrVcFQHGj+XjMf3FQedYvGoUjnt4um8h2gbpHbOb0tbraU94dT7VRe1S8YU8AA==" length="10167296" type="application/octet-stream"/>+ </item><item><title>CodexBar.app 5.0.3</title><sparkle:version>203</sparkle:version>