CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
refactor: 降低 Token 历史处理开销并统一代码语义
Bob8cb6d39a95b5
diff --git a/CodexBar/App/CodexBarApp.swift b/CodexBar/App/CodexBarApp.swiftindex 058c6fa..4240e38 100644--- a/CodexBar/App/CodexBarApp.swift+++ b/CodexBar/App/CodexBarApp.swift@@ -2,7 +2,7 @@ import AppKitimport Darwinimport SwiftUI-// 无宿主测试编译同一份源码, 仅移除可执行入口以避免启动常驻服务+// 测试时禁用应用入口#if !CODEXBAR_TESTING@main#endifdiff --git a/CodexBar/Controllers/ActivityCenterPanelController.swift b/CodexBar/Controllers/ActivityCenterPanelController.swiftindex 4f1df55..d83884d 100644--- a/CodexBar/Controllers/ActivityCenterPanelController.swift+++ b/CodexBar/Controllers/ActivityCenterPanelController.swift@@ -20,7 +20,6 @@ final class ActivityCenterPanelController {private var cancellables = Set<AnyCancellable>()private var presentationTask: Task<Void, Never>?private var panelUpdateTask: Task<Void, Never>?- private var panelUpdateGeneration = 0private lazy var presenter = SidePanelDrawerPresenter(animationKey: Metrics.drawerTransformAnimationKey,contentViewProvider: { [weak self] in@@ -221,7 +220,6 @@ final class ActivityCenterPanelController {private func schedulePanelUpdate(hasContent: Bool) {cancelScheduledPanelUpdate()- let generation = panelUpdateGenerationpanelUpdateTask = Task { @MainActor [weak self] inif hasContent {await Task.yield()@@ -229,8 +227,7 @@ final class ActivityCenterPanelController {try? await Task.sleep(for: .seconds(Metrics.contentUpdateDuration))}- guard let self, !Task.isCancelled,- generation == panelUpdateGeneration else {+ guard let self, !Task.isCancelled else {return}let snapshot = activityMonitor.snapshot@@ -248,7 +245,6 @@ final class ActivityCenterPanelController {}private func cancelScheduledPanelUpdate() {- panelUpdateGeneration += 1panelUpdateTask?.cancel()panelUpdateTask = nil}diff --git a/CodexBar/Models/CodexActivityModels.swift b/CodexBar/Models/CodexActivityModels.swiftindex 0b1c86a..e3c9e5e 100644--- a/CodexBar/Models/CodexActivityModels.swift+++ b/CodexBar/Models/CodexActivityModels.swift@@ -21,8 +21,8 @@ nonisolated enum CodexActivityEvent: Equatable {/// bootstrap 后需要向更早日期定向查找 Prompt 起点的精确任务引用nonisolated struct CodexActivityPromptReference: Hashable {- let sessionId: String- let turnId: String+ let sessionID: String+ let turnID: String}/// 正在运行或等待批准的任务摘要, 不对 UI 暴露原始会话 IDdiff --git a/CodexBar/Models/DateFormatter.swift b/CodexBar/Models/CodexDateFormat.swiftsimilarity index 100%rename from CodexBar/Models/DateFormatter.swiftrename to CodexBar/Models/CodexDateFormat.swiftdiff --git a/CodexBar/Models/CodexQuotaModels.swift b/CodexBar/Models/CodexQuotaModels.swiftindex b8477f0..9cde7b2 100644--- a/CodexBar/Models/CodexQuotaModels.swift+++ b/CodexBar/Models/CodexQuotaModels.swift@@ -39,7 +39,7 @@ nonisolated struct CodexQuotaSnapshot: Equatable {var codexLimit: CodexQuotaLimitSnapshot? {limits.first {- $0.limitId.compare("codex", options: [.caseInsensitive]) == .orderedSame+ $0.limitID.compare("codex", options: [.caseInsensitive]) == .orderedSame}}@@ -54,12 +54,12 @@ nonisolated struct CodexQuotaSnapshot: Equatable {/// 单个额度类型的展示快照, 例如 codex 或其他 limit idnonisolated struct CodexQuotaLimitSnapshot: Equatable, Identifiable {- let limitId: String+ let limitID: Stringlet limitName: String?let windows: [QuotaWindow]var id: String {- limitId+ limitID}func window(ofKind kind: QuotaWindowKind) -> QuotaWindow? {@@ -71,7 +71,7 @@ nonisolated struct CodexQuotaLimitSnapshot: Equatable, Identifiable {return limitName.capitalizingFirstLetter()}- return limitId.capitalizingFirstLetter()+ return limitID.capitalizingFirstLetter()}}@@ -139,8 +139,14 @@ nonisolated struct QuotaWindow: Equatable, Identifiable {/// app-server account/rateLimits 原始响应模型nonisolated struct AccountRateLimitsResponse: Decodable {let rateLimits: RateLimitSnapshot- let rateLimitsByLimitId: [String: RateLimitSnapshot]?+ let rateLimitsByLimitID: [String: RateLimitSnapshot]?let rateLimitResetCredits: RateLimitResetCreditsSummary?++ private enum CodingKeys: String, CodingKey {+ case rateLimits+ case rateLimitsByLimitID = "rateLimitsByLimitId"+ case rateLimitResetCredits+ }}/// app-server 返回的可用额度重置次数和明细@@ -233,12 +239,17 @@ nonisolated enum AutoResetServiceError: Error, Sendable {/// app-server 返回的单个 limit, primary/secondary 可能独立缺失nonisolated struct RateLimitSnapshot: Decodable {- let limitId: String?+ let limitID: String?let limitName: String?let planType: String?let primary: RateLimitWindow?let secondary: RateLimitWindow?let credits: RateLimitCreditsSnapshot?++ private enum CodingKeys: String, CodingKey {+ case limitID = "limitId"+ case limitName, planType, primary, secondary, credits+ }}/// app-server 返回的 Credits 余额状态@@ -275,7 +286,7 @@ nonisolated extension CodexQuotaSnapshot {let limits = rateLimitsResponse.map { response inSelf.orderedSnapshots(from: response).compactMap { entry in- CodexQuotaLimitSnapshot(limitId: entry.limitId, snapshot: entry.snapshot)+ CodexQuotaLimitSnapshot(limitID: entry.limitID, snapshot: entry.snapshot)}} ?? []@@ -308,41 +319,41 @@ nonisolated extension CodexQuotaSnapshot {}private static func primaryCredits(from response: AccountRateLimitsResponse) -> RateLimitCreditsSnapshot? {- let primaryLimitId = response.rateLimits.limitId ?? "codex"- return response.rateLimitsByLimitId?[primaryLimitId]?.credits ?? response.rateLimits.credits+ let primaryLimitID = response.rateLimits.limitID ?? "codex"+ return response.rateLimitsByLimitID?[primaryLimitID]?.credits ?? response.rateLimits.credits}// 展示顺序: 顶层 rateLimits 指向的主 limit 置顶, 其余按名称排序private static func orderedSnapshots(from response: AccountRateLimitsResponse- ) -> [(limitId: String, snapshot: RateLimitSnapshot)] {- let primaryLimitId = response.rateLimits.limitId ?? "codex"+ ) -> [(limitID: String, snapshot: RateLimitSnapshot)] {+ let primaryLimitID = response.rateLimits.limitID ?? "codex"- guard let byLimitId = response.rateLimitsByLimitId, !byLimitId.isEmpty else {- return [(primaryLimitId, response.rateLimits)]+ guard let byLimitID = response.rateLimitsByLimitID, !byLimitID.isEmpty else {+ return [(primaryLimitID, response.rateLimits)]}- return byLimitId- .map { (limitId: $0.key, snapshot: $0.value) }+ return byLimitID+ .map { (limitID: $0.key, snapshot: $0.value) }.sorted { lhs, rhs in- if (lhs.limitId == primaryLimitId) != (rhs.limitId == primaryLimitId) {- return lhs.limitId == primaryLimitId+ if (lhs.limitID == primaryLimitID) != (rhs.limitID == primaryLimitID) {+ return lhs.limitID == primaryLimitID}- let lhsName = lhs.snapshot.limitName ?? lhs.limitId- let rhsName = rhs.snapshot.limitName ?? rhs.limitId+ let lhsName = lhs.snapshot.limitName ?? lhs.limitID+ let rhsName = rhs.snapshot.limitName ?? rhs.limitIDlet nameOrder = lhsName.localizedStandardCompare(rhsName)if nameOrder != .orderedSame {return nameOrder == .orderedAscending}- return lhs.limitId.localizedStandardCompare(rhs.limitId) == .orderedAscending+ return lhs.limitID.localizedStandardCompare(rhs.limitID) == .orderedAscending}}}nonisolated extension CodexQuotaLimitSnapshot {- init?(limitId: String, snapshot: RateLimitSnapshot) {+ init?(limitID: String, snapshot: RateLimitSnapshot) {let windows = [(QuotaWindowKind.primary, snapshot.primary), (.secondary, snapshot.secondary)].compactMap { kind, window inwindow.map { QuotaWindow(kind: kind, window: $0) }@@ -353,7 +364,7 @@ nonisolated extension CodexQuotaLimitSnapshot {}self.init(- limitId: limitId,+ limitID: limitID,limitName: snapshot.limitName,windows: windows)diff --git a/CodexBar/Models/CodexTokenHistory.swift b/CodexBar/Models/CodexTokenHistory.swiftindex 1a168d8..f47242f 100644--- a/CodexBar/Models/CodexTokenHistory.swift+++ b/CodexBar/Models/CodexTokenHistory.swift@@ -13,7 +13,18 @@ nonisolated struct CodexTokenTurn: Codable, Equatable, Identifiable {static func identifier(thread: String, turn: String) -> String {// 哈希身份域是固定输入, 不随存储 schema 变化, 避免同一轮次生成多个身份let data = (try? JSONEncoder().encode(["token-turn-v1", thread, turn])) ?? Data()- return SHA256.hash(data: data).map { String(format: "%02x", $0) }.joined()+ return hexString(SHA256.hash(data: data))+ }++ static func hexString(_ bytes: some Sequence<UInt8>) -> String {+ let digits = Array("0123456789abcdef".utf8)+ var result: [UInt8] = []+ result.reserveCapacity(bytes.underestimatedCount * 2)+ for byte in bytes {+ result.append(digits[Int(byte >> 4)])+ result.append(digits[Int(byte & 0x0F)])+ }+ return String(bytes: result, encoding: .utf8) ?? ""}func merging(_ other: Self) -> Self {@@ -75,11 +86,33 @@ nonisolated struct CodexTokenTurn: Codable, Equatable, Identifiable {}func pseudonymized(salt: Data) -> Self {- func hash(_ value: String) -> String {- HMAC<SHA256>.authenticationCode(for: Data(value.utf8), using: SymmetricKey(data: salt))- .map { String(format: "%02x", $0) }.joined()+ let key = SymmetricKey(data: salt)+ return pseudonymized { value in+ Self.hexString(HMAC<SHA256>.authenticationCode(for: Data(value.utf8), using: key))}- return Self(id: hash(id), rootID: hash(rootID), startedAt: startedAt, updatedAt: updatedAt, usage: usage, rebuiltAt: rebuiltAt)+ }++ static func pseudonymized(_ records: [Self], salt: Data) -> [Self] {+ let key = SymmetricKey(data: salt)+ var identities: [String: String] = [:]+ return records.map { record in+ record.pseudonymized { value in+ if let cached = identities[value] {+ return cached+ }+ let hashed = hexString(HMAC<SHA256>.authenticationCode(for: Data(value.utf8), using: key))+ identities[value] = hashed+ return hashed+ }+ }+ }++ private func pseudonymized(hash: (String) -> String) -> Self {+ let exportedID = hash(id)+ return Self(+ id: exportedID, rootID: rootID == id ? exportedID : hash(rootID),+ startedAt: startedAt, updatedAt: updatedAt, usage: usage, rebuiltAt: rebuiltAt+ )}static func syncable(_ records: [Self]) -> [Self] {@@ -102,9 +135,17 @@ nonisolated struct CodexTokenTurn: Codable, Equatable, Identifiable {/// 云端身份只通过账户 salt 与本地已发现的轮次匹配, 不导入其他设备的轮次nonisolated struct CodexTokenHistoryBaseline {let salt: Data- let turns: [String: CodexTokenTurn]+ private let turns: [String: CodexTokenTurn]+ private let latestRebuiltAt: Date?++ init(salt: Data, turns: [String: CodexTokenTurn]) {+ self.salt = salt+ self.turns = turns.filter { $0.value.rebuiltAt != nil }+ latestRebuiltAt = self.turns.values.compactMap(\.rebuiltAt).max()+ }func replacement(for local: CodexTokenTurn) -> CodexTokenTurn? {+ guard let latestRebuiltAt, latestRebuiltAt > (local.rebuiltAt ?? .distantPast) else { return nil }let exported = local.pseudonymized(salt: salt)guard let remote = turns[exported.id], let rebuiltAt = remote.rebuiltAt,rebuiltAt > (local.rebuiltAt ?? .distantPast), remote.rootID == exported.rootID else { return nil }diff --git a/CodexBar/Models/CodexTokenUsage.swift b/CodexBar/Models/CodexTokenUsage.swiftindex ab058e6..14caf27 100644--- a/CodexBar/Models/CodexTokenUsage.swift+++ b/CodexBar/Models/CodexTokenUsage.swift@@ -52,19 +52,19 @@ nonisolated struct CodexRolloutTokenUsageRecord: Decodable {}nonisolated struct CodexRolloutTokenUsagePayload: Decodable {- let threadId: String- let sessionId: String- let turnId: String- let rootTurnId: String- let responseId: String+ let threadID: String+ let sessionID: String+ let turnID: String+ let rootTurnID: String+ let responseID: Stringlet turnTokenUsage: CodexTokenUsageprivate enum CodingKeys: String, CodingKey {- case threadId = "thread_id"- case sessionId = "session_id"- case turnId = "turn_id"- case rootTurnId = "root_turn_id"- case responseId = "response_id"+ case threadID = "thread_id"+ case sessionID = "session_id"+ case turnID = "turn_id"+ case rootTurnID = "root_turn_id"+ case responseID = "response_id"case turnTokenUsage = "turn_token_usage"}}diff --git a/CodexBar/Models/CodexWorkflowModels.swift b/CodexBar/Models/CodexWorkflowModels.swiftindex 8f7fb8e..e2225ff 100644--- a/CodexBar/Models/CodexWorkflowModels.swift+++ b/CodexBar/Models/CodexWorkflowModels.swift@@ -92,9 +92,9 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {let effort: String?let permissionMode: String?let approvalReviewer: CodexApprovalReviewer?- let sessionId: String?- let turnId: String?- let agentId: String?+ let sessionID: String?+ let turnID: String?+ let agentID: String?init(timestamp: Date,@@ -106,9 +106,9 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {effort: String?,permissionMode: String?,approvalReviewer: CodexApprovalReviewer?,- sessionId: String?,- turnId: String?,- agentId: String?+ sessionID: String?,+ turnID: String?,+ agentID: String?) {self.timestamp = timestampself.name = name@@ -119,9 +119,9 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {self.effort = effortself.permissionMode = permissionModeself.approvalReviewer = approvalReviewer- self.sessionId = sessionId- self.turnId = turnId- self.agentId = agentId+ self.sessionID = sessionID+ self.turnID = turnID+ self.agentID = agentID}init(from decoder: Decoder) throws {@@ -153,9 +153,9 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {CodexApprovalReviewer.self,forKey: .approvalReviewer)- sessionId = Self.string(from: container, key: .sessionId)- turnId = Self.string(from: container, key: .turnId)- agentId = Self.string(from: container, key: .agentId)+ sessionID = Self.string(from: container, key: .sessionID)+ turnID = Self.string(from: container, key: .turnID)+ agentID = Self.string(from: container, key: .agentID)}var hookEvent: CodexHookEvent? {@@ -209,9 +209,9 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {WorkflowJSON.field("effort", effort),WorkflowJSON.field("permission", permissionMode),WorkflowJSON.field("approval", approvalReviewer),- WorkflowJSON.field("session", sessionId),- WorkflowJSON.field("turn", turnId),- WorkflowJSON.field("agent", agentId),+ WorkflowJSON.field("session", sessionID),+ WorkflowJSON.field("turn", turnID),+ WorkflowJSON.field("agent", agentID),WorkflowJSON.field("tool", toolName),WorkflowJSON.field("cwd", directoryPath)]@@ -229,9 +229,9 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {case effortcase permissionMode = "permission"case approvalReviewer = "approval"- case sessionId = "session"- case turnId = "turn"- case agentId = "agent"+ case sessionID = "session"+ case turnID = "turn"+ case agentID = "agent"}private static let autoReviewModelName = "codex-auto-review"@@ -360,13 +360,13 @@ nonisolated struct WorkflowSnapshot: Equatable {init(localAggregates: [WorkflowDailyAggregate],syncedRecords: [WorkflowSyncedDailyRecord],- currentDeviceId: String?+ currentDeviceID: String?) {var metricsByDate = [String: WorkflowDailyMetrics]()let localByDate = Dictionary(uniqueKeysWithValues: localAggregates.map { ($0.date, $0) })- let currentDeviceRecords = syncedRecords.filter { $0.deviceId == currentDeviceId }- let otherDeviceRecords = syncedRecords.filter { $0.deviceId != currentDeviceId }+ let currentDeviceRecords = syncedRecords.filter { $0.deviceID == currentDeviceID }+ let otherDeviceRecords = syncedRecords.filter { $0.deviceID != currentDeviceID }Self.merge(otherDeviceRecords, into: &metricsByDate)@@ -447,8 +447,8 @@ nonisolated enum WorkflowIdentifierStorage {/// 全量和增量路径都收集 ID, 只有 finalize 时才按保留策略决定是否落盘nonisolated struct WorkflowDailyAccumulator {private var aggregate: WorkflowDailyAggregate- private var sessionIds: Set<String> = []- private var turnIds: Set<String> = []+ private var sessionIDs: Set<String> = []+ private var turnIDs: Set<String> = []init(rebuilding date: String,@@ -473,8 +473,8 @@ nonisolated struct WorkflowDailyAccumulator {aggregate.sourceGeneration = sourceGenerationaggregate.sourceIsFresh = sourceIsFreshself.aggregate = aggregate- sessionIds = Set(aggregate.sessionIds ?? [])- turnIds = Set(aggregate.turnIds ?? [])+ sessionIDs = Set(aggregate.sessionIDs ?? [])+ turnIDs = Set(aggregate.turnIDs ?? [])}mutating func record(_ event: WorkflowHookEvent) {@@ -498,11 +498,11 @@ nonisolated struct WorkflowDailyAccumulator {}// 终态事件不单独构成对应的当日活跃轮次- if event.hookEvent != .sessionEnd, let sessionId = event.sessionId {- sessionIds.insert(sessionId)+ if event.hookEvent != .sessionEnd, let sessionID = event.sessionID {+ sessionIDs.insert(sessionID)}- if event.hookEvent != .stop, event.hookEvent != .interrupt, let turnId = event.turnId {- turnIds.insert(turnId)+ if event.hookEvent != .stop, event.hookEvent != .interrupt, let turnID = event.turnID {+ turnIDs.insert(turnID)}if let projectDisplayName = event.projectDisplayName {@@ -519,13 +519,13 @@ nonisolated struct WorkflowDailyAccumulator {case .retained:aggregate.sessionCount = nilaggregate.turnCount = nil- aggregate.sessionIds = Self.normalizedIdentifiers(sessionIds)- aggregate.turnIds = Self.normalizedIdentifiers(turnIds)+ aggregate.sessionIDs = Self.normalizedIdentifiers(sessionIDs)+ aggregate.turnIDs = Self.normalizedIdentifiers(turnIDs)case .compacted:- aggregate.sessionCount = sessionIds.count- aggregate.turnCount = turnIds.count- aggregate.sessionIds = nil- aggregate.turnIds = nil+ aggregate.sessionCount = sessionIDs.count+ aggregate.turnCount = turnIDs.count+ aggregate.sessionIDs = nil+ aggregate.turnIDs = nil}return aggregate}@@ -595,8 +595,8 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable {var turnCount: Int?var projectCounts: [String: Int]var modelCounts: [String: Int]- var sessionIds: [String]?- var turnIds: [String]?+ var sessionIDs: [String]?+ var turnIDs: [String]?/// 增量路径只有在完整 ID 集合仍然存在时才能继续安全去重var supportsIncrementalAggregation: Bool {@@ -629,8 +629,8 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable {turnCount = nilprojectCounts = [:]modelCounts = [:]- sessionIds = []- turnIds = []+ sessionIDs = []+ turnIDs = []}init(from decoder: Decoder) throws {@@ -655,27 +655,27 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable {turnCount = try container.decodeIfPresent(Int.self, forKey: .turnCount)projectCounts = try container.decodeIfPresent([String: Int].self, forKey: .projectCounts) ?? [:]modelCounts = try container.decodeIfPresent([String: Int].self, forKey: .modelCounts) ?? [:]- sessionIds = try container.decodeIfPresent([String].self, forKey: .sessionIds)- turnIds = try container.decodeIfPresent([String].self, forKey: .turnIds)+ sessionIDs = try container.decodeIfPresent([String].self, forKey: .sessionIDs)+ turnIDs = try container.decodeIfPresent([String].self, forKey: .turnIDs)}mutating func normalizeIdentifierStorage(retainsIdentifiers: Bool) {guard !retainsIdentifiers else {- sessionIds = Self.normalizedIdentifiers(sessionIds)- turnIds = Self.normalizedIdentifiers(turnIds)+ sessionIDs = Self.normalizedIdentifiers(sessionIDs)+ turnIDs = Self.normalizedIdentifiers(turnIDs)return}sessionCount = WorkflowCountResolution.preferredCount(compactedCount: sessionCount,- identifiers: sessionIds+ identifiers: sessionIDs) ?? sessionStartCountturnCount = WorkflowCountResolution.preferredCount(compactedCount: turnCount,- identifiers: turnIds+ identifiers: turnIDs) ?? stopCount- sessionIds = nil- turnIds = nil+ sessionIDs = nil+ turnIDs = nil}var metrics: WorkflowDailyMetrics {@@ -722,8 +722,8 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable {WorkflowJSON.field("turnCount", turnCount),WorkflowJSON.field("projectCounts", projectCounts),WorkflowJSON.field("modelCounts", modelCounts),- WorkflowJSON.field("sessionIds", sessionIds),- WorkflowJSON.field("turnIds", turnIds)+ WorkflowJSON.field("sessionIds", sessionIDs),+ WorkflowJSON.field("turnIds", turnIDs)])return WorkflowJSON.lineData(fields)@@ -777,14 +777,14 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable {private var syncedSessionCount: Int? {WorkflowCountResolution.preferredCount(compactedCount: sessionCount,- identifiers: sessionIds+ identifiers: sessionIDs)}private var syncedTurnCount: Int? {WorkflowCountResolution.preferredCount(compactedCount: turnCount,- identifiers: turnIds+ identifiers: turnIDs)}@@ -835,8 +835,8 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable {case turnCountcase projectCountscase modelCounts- case sessionIds- case turnIds+ case sessionIDs = "sessionIds"+ case turnIDs = "turnIds"}}@@ -984,20 +984,25 @@ extension WorkflowSyncedDailyAggregate {}nonisolated struct WorkflowSyncedDailyRecord: Codable, Equatable, Identifiable {- let deviceId: String+ let deviceID: Stringlet daily: WorkflowSyncedDailyAggregatevar updatedAt: Date?var recordName: String?+ private enum CodingKeys: String, CodingKey {+ case deviceID = "deviceId"+ case daily, updatedAt, recordName+ }+var id: String {- recordName ?? Self.legacyRecordName(deviceId: deviceId, date: daily.date)+ recordName ?? Self.legacyRecordName(deviceID: deviceID, date: daily.date)}var date: String {daily.date}- static func legacyRecordName(deviceId: String, date: String) -> String {- "\(deviceId)_\(date)"+ static func legacyRecordName(deviceID: String, date: String) -> String {+ "\(deviceID)_\(date)"}}diff --git a/CodexBar/Resources/Localizable.xcstrings b/CodexBar/Resources/Localizable.xcstringsindex 0ad890c..6026896 100644--- a/CodexBar/Resources/Localizable.xcstrings+++ b/CodexBar/Resources/Localizable.xcstrings@@ -721,7 +721,7 @@}}},- "activity.tokens.cache-write" : {+ "activity.tokens.cache-write-input" : {"localizations" : {"en" : {"stringUnit" : {@@ -737,7 +737,7 @@}}},- "activity.tokens.cached-read" : {+ "activity.tokens.cached-input" : {"localizations" : {"en" : {"stringUnit" : {@@ -753,7 +753,7 @@}}},- "activity.tokens.reasoning" : {+ "activity.tokens.reasoning-output" : {"localizations" : {"en" : {"stringUnit" : {@@ -1185,7 +1185,7 @@}}},- "codex-hook.version.unavailable" : {+ "hook.version.unavailable" : {"localizations" : {"en" : {"stringUnit" : {@@ -1201,7 +1201,7 @@}}},- "codex-hook.version.unsupported" : {+ "hook.version.unsupported" : {"localizations" : {"en" : {"stringUnit" : {@@ -2337,7 +2337,7 @@}}},- "keep-alive.error.auto-reset-wake-schedule-failed" : {+ "auto-reset.error.wake-schedule-failed" : {"localizations" : {"en" : {"stringUnit" : {@@ -4369,7 +4369,7 @@}}},- "settings.main-panel.entrance-animations" : {+ "settings.main-panel.animations" : {"localizations" : {"en" : {"stringUnit" : {@@ -4785,7 +4785,7 @@}}},- "settings.screen-edge-indicator.title" : {+ "settings.task-glow.title" : {"localizations" : {"en" : {"stringUnit" : {@@ -5366,13 +5366,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Session token data"+ "value" : "Session data"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "会话 Token 数据"+ "value" : "会话数据"}}}@@ -5425,7 +5425,7 @@}}},- "usage.status.updated" : {+ "usage.status.last-updated" : {"localizations" : {"en" : {"stringUnit" : {@@ -5638,13 +5638,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Recalculate activity data and session token data for %@ from local Hook events and rollouts.\nAfter syncing, local data will be replaced and cloud data updated."+ "value" : "Recalculate activity data and session data for %@ from local Hook events and rollouts.\nAfter syncing, local data will be replaced and cloud data updated"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "将从本机 Hook 事件和 rollout 重新统计 %@ 的活动数据和会话 Token 数据\n同步后将替换本机数据并更新云端数据"+ "value" : "将从本机 Hook 事件和 rollout 重新统计 %@ 的活动数据和会话数据\n同步后将替换本机数据并更新云端数据"}}}@@ -5857,50 +5857,50 @@}}},- "workflow.rebuild.summary.tokens" : {+ "workflow.rebuild.summary.token-record-count" : {"localizations" : {"en" : {"stringUnit" : {"state" : "translated",- "value" : "; %lld session token records"+ "value" : "; %lld session data records"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "; 会话 Token 数据 %lld 条"+ "value" : "; 会话数据 %lld 条"}}}},- "workflow.rebuild.summary.tokens-failed" : {+ "workflow.rebuild.summary.token-history-incomplete" : {"localizations" : {"en" : {"stringUnit" : {"state" : "translated",- "value" : "; session token data rebuild incomplete, please retry"+ "value" : "; session data rebuild incomplete, please retry"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "; 会话 Token 数据重建未完成, 请重试"+ "value" : "; 会话数据重建未完成, 请重试"}}}},- "workflow.rebuild.error.already-running" : {+ "workflow.rebuild.error.token-history-already-running" : {"localizations" : {"en" : {"stringUnit" : {"state" : "translated",- "value" : "Session token data is already being rebuilt"+ "value" : "Session data is already being rebuilt"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "会话 Token 数据正在重建中"+ "value" : "会话数据正在重建中"}}}diff --git a/CodexBar/Services/CodexStatus/AppServerSession.swift b/CodexBar/Services/CodexStatus/AppServerSession.swiftindex 9da1d1f..0e3cbc1 100644--- a/CodexBar/Services/CodexStatus/AppServerSession.swift+++ b/CodexBar/Services/CodexStatus/AppServerSession.swift@@ -21,7 +21,7 @@ final nonisolated class AppServerSession {private let timeout: TimeIntervalprivate let deadline: Date?private let logStorage: RequestLogStorage?- private var nextId = 1+ private var nextID = 1private var unsupportedMethods: Set<String> = []private init(@@ -217,8 +217,8 @@ final nonisolated class AppServerSession {params: [String: Any]? = nil,as type: Response.Type) throws -> Response {- let id = nextId- nextId += 1+ let id = nextID+ nextID += 1let encoded = try encodeMessage(method: method, id: id, params: params)let token = logStorage?.beginRequest(method: method, payload: encoded.text) ?? UUID()diff --git a/CodexBar/Services/KeepAlive/KeepAliveModels.swift b/CodexBar/Services/KeepAlive/KeepAliveModels.swiftindex 4c4f6cb..7746cd3 100644--- a/CodexBar/Services/KeepAlive/KeepAliveModels.swift+++ b/CodexBar/Services/KeepAlive/KeepAliveModels.swift@@ -167,7 +167,7 @@ nonisolated enum KeepAliveLocalizedMessage {static let retryLimitReached = String(localized: "keep-alive.error.retry-limit-reached")static let invalidHelperInterface = String(localized: "keep-alive.error.invalid-helper-interface")static let connectionInterrupted = String(localized: "keep-alive.error.connection-interrupted")- static let autoResetWakeScheduleFailed = String(localized: "keep-alive.error.auto-reset-wake-schedule-failed")+ static let autoResetWakeScheduleFailed = String(localized: "auto-reset.error.wake-schedule-failed")}nonisolated enum KeepAliveError: LocalizedError {diff --git a/CodexBar/Services/Notifications/CodexNotificationService.swift b/CodexBar/Services/Notifications/CodexNotificationService.swiftindex 75d0f3d..3435d2e 100644--- a/CodexBar/Services/Notifications/CodexNotificationService.swift+++ b/CodexBar/Services/Notifications/CodexNotificationService.swift@@ -303,8 +303,8 @@ final class CodexNotificationService: NSObject {for window in limit.windows where window.hasData {let stateKey = Self.quotaWindowStateKey(accountKey: accountKey,- limitId: limit.limitId,- windowId: window.id+ limitID: limit.limitID,+ windowID: window.id)body(window, limit, stateKey)}@@ -724,10 +724,10 @@ final class CodexNotificationService: NSObject {private nonisolated static func quotaWindowStateKey(accountKey: String,- limitId: String,- windowId: String+ limitID: String,+ windowID: String) -> String {- "\(accountKey)|\(limitId)|\(windowId)"+ "\(accountKey)|\(limitID)|\(windowID)"}private nonisolated static func creditExpiryReminderDates(for expirationDate: Date) -> [Date] {diff --git a/CodexBar/Services/Settings/CodexHookSettings.swift b/CodexBar/Services/Settings/CodexHookSettings.swiftindex cde9631..99203a1 100644--- a/CodexBar/Services/Settings/CodexHookSettings.swift+++ b/CodexBar/Services/Settings/CodexHookSettings.swift@@ -398,12 +398,12 @@ private extension CodexHookSettings {String(localized: "hook.status.disabled-by-codex")case let .codexVersionUnavailable(minimum):String(- localized: "codex-hook.version.unavailable",+ localized: "hook.version.unavailable",defaultValue: "\(minimum)")case let .unsupportedCodexVersion(minimum):String(- localized: "codex-hook.version.unsupported",+ localized: "hook.version.unsupported",defaultValue: "\(minimum)")case let .hookValidationFailed(message):diff --git a/CodexBar/Services/Settings/MainPanelSettings.swift b/CodexBar/Services/Settings/MainPanelSettings.swiftindex 335e52e..5f1418f 100644--- a/CodexBar/Services/Settings/MainPanelSettings.swift+++ b/CodexBar/Services/Settings/MainPanelSettings.swift@@ -65,7 +65,7 @@ nonisolated struct MainPanelLayout: Equatable, Sendable {@MainActorfinal class MainPanelSettings: ObservableObject {@Published private(set) var layout: MainPanelLayout- @Published private(set) var areEntranceAnimationsEnabled: Bool+ @Published private(set) var areAnimationsEnabled: Boolprivate let defaults: UserDefaultsprivate var isHookEnabled: Bool?@@ -73,13 +73,13 @@ final class MainPanelSettings: ObservableObject {init(defaults: UserDefaults = .standard) {self.defaults = defaultslayout = Self.loadLayout(from: defaults)- areEntranceAnimationsEnabled = Self.loadEntranceAnimationsEnabled(from: defaults)+ areAnimationsEnabled = Self.loadAnimationsEnabled(from: defaults)}func refresh() {- let loadedEntranceAnimationsEnabled = Self.loadEntranceAnimationsEnabled(from: defaults)- if loadedEntranceAnimationsEnabled != areEntranceAnimationsEnabled {- areEntranceAnimationsEnabled = loadedEntranceAnimationsEnabled+ let loadedAnimationsEnabled = Self.loadAnimationsEnabled(from: defaults)+ if loadedAnimationsEnabled != areAnimationsEnabled {+ areAnimationsEnabled = loadedAnimationsEnabled}let loadedLayout = Self.loadLayout(from: defaults)@@ -118,14 +118,14 @@ final class MainPanelSettings: ObservableObject {saveAndPublish(updatedLayout)}- func setEntranceAnimationsEnabled(_ enabled: Bool) {- guard enabled != areEntranceAnimationsEnabled else {+ func setAnimationsEnabled(_ enabled: Bool) {+ guard enabled != areAnimationsEnabled else {return}AppLog.settings.notice("动画效果变更: enabled=\(enabled ? 1 : 0)")- defaults.set(enabled, forKey: Self.entranceAnimationsEnabledKey)- areEntranceAnimationsEnabled = enabled+ defaults.set(enabled, forKey: Self.animationsEnabledKey)+ areAnimationsEnabled = enabled}func setSection(@@ -236,12 +236,12 @@ final class MainPanelSettings: ObservableObject {)}- private static func loadEntranceAnimationsEnabled(from defaults: UserDefaults) -> Bool {- guard defaults.object(forKey: entranceAnimationsEnabledKey) != nil else {+ private static func loadAnimationsEnabled(from defaults: UserDefaults) -> Bool {+ guard defaults.object(forKey: animationsEnabledKey) != nil else {return true}- return defaults.bool(forKey: entranceAnimationsEnabledKey)+ return defaults.bool(forKey: animationsEnabledKey)}private static func orderLogValue(for layout: MainPanelLayout) -> String {@@ -250,5 +250,5 @@ final class MainPanelSettings: ObservableObject {private static let sectionOrderKey = "MainPanel.sectionOrder"private static let hiddenSectionsKey = "MainPanel.hiddenSections"- private static let entranceAnimationsEnabledKey = "MainPanel.entranceAnimationsEnabled"+ private static let animationsEnabledKey = "MainPanel.entranceAnimationsEnabled"}diff --git a/CodexBar/Services/Updates/AppUpdater.swift b/CodexBar/Services/Updates/AppUpdater.swiftindex 6306ada..4b531dc 100644--- a/CodexBar/Services/Updates/AppUpdater.swift+++ b/CodexBar/Services/Updates/AppUpdater.swift@@ -18,9 +18,12 @@ final class AppUpdater: NSObject, ObservableObject {private var updaterController: SPUStandardUpdaterController?private var clearSettingsStatusMessageTask: Task<Void, Never>?- private var isManualCheckInProgress = falseprivate var manualCheckTimeoutTask: Task<Void, Never>?+ private var isManualCheckInProgress: Bool {+ manualCheckTimeoutTask != nil+ }+private static let missingUpdateConfigurationMessage = String(localized: "updater.status.missing-configuration")/// Sparkle 可能既不回调 didFindValidUpdate / didNotFindUpdate 也不回调 didAbortWithError/// (后台检查已在进行, 或 feed 请求被放弃), 超时复位避免永久停留在手动检查态@@ -90,8 +93,6 @@ final class AppUpdater: NSObject, ObservableObject {}private func beginManualCheck() {- isManualCheckInProgress = true-manualCheckTimeoutTask?.cancel()manualCheckTimeoutTask = Task { [weak self] intry? await Task.sleep(for: Self.manualCheckTimeout)@@ -99,7 +100,6 @@ final class AppUpdater: NSObject, ObservableObject {return}- isManualCheckInProgress = falsemanualCheckTimeoutTask = nil}}@@ -113,7 +113,6 @@ final class AppUpdater: NSObject, ObservableObject {private func finishManualCheck() {manualCheckTimeoutTask?.cancel()manualCheckTimeoutTask = nil- isManualCheckInProgress = false}private func showSettingsStatusMessage(_ message: String, autoDismissDelay: Duration? = .seconds(3)) {diff --git a/CodexBar/Services/Workflow/CodexActivityMonitor.swift b/CodexBar/Services/Workflow/CodexActivityMonitor.swiftindex 3f7432b..5c8ea06 100644--- a/CodexBar/Services/Workflow/CodexActivityMonitor.swift+++ b/CodexBar/Services/Workflow/CodexActivityMonitor.swift@@ -299,7 +299,7 @@ final class CodexActivityMonitor: ObservableObject {into transitions: inout [CodexActivityTransition]) -> Bool {guard !terminalOnly || (state.readStatus == .complete && state.terminal != nil) else { return false }- let exact = CodexActivityTaskKey.turn(session: state.sessionId, turn: state.turnId)+ let exact = CodexActivityTaskKey.turn(session: state.requestedThreadID, turn: state.turnID)let key = tasks.first(where: { $0.value.resolvedTurnKey == exact })?.key?? pendingTerminalTasks.first(where: { $0.value.task.resolvedTurnKey == exact })?.key ?? exactif var pending = pendingTerminalTasks[key] {@@ -358,7 +358,7 @@ final class CodexActivityMonitor: ObservableObject {return true}- task.mergeExecutionLifecycle(state, owner: CodexActivityExecutionKey(agentId: nil, turnId: state.turnId))+ task.mergeExecutionLifecycle(state, owner: CodexActivityExecutionKey(agentID: nil, turnID: state.turnID))let wasSuppressedBeforeApproval = task.state == .suppressedif resolvePendingApprovalIfPossible(@@ -446,7 +446,7 @@ final class CodexActivityMonitor: ObservableObject {private func lifecycleReferences(now: Date, includeAll: Bool) -> [CodexActivityTurnReference] {var references = activeTokenUsageReferences()references.append(contentsOf: subagentLifecycleReferences())- references.append(contentsOf: terminalTokenUsageReferences(now: now))+ references.append(contentsOf: prepareTerminalTokenUsageReadBatch(now: now))let due = pendingTerminalTasks.filter { includeAll || $0.value.nextPollAt <= now }.sorted { $0.value.nextPollAt < $1.value.nextPollAt }for (key, var pending) in due.prefix(16) {@@ -689,7 +689,7 @@ final class CodexActivityMonitor: ObservableObject {private func backfillStartTimes(_ startTimes: [CodexActivityPromptReference: Date]) {var didChange = falsefor (reference, startedAt) in startTimes {- let key = CodexActivityTaskKey.turn(session: reference.sessionId, turn: reference.turnId)+ let key = CodexActivityTaskKey.turn(session: reference.sessionID, turn: reference.turnID)guard var task = tasks[key],task.startedAt == nil,startedAt <= task.lastActivityAt else {@@ -715,7 +715,7 @@ final class CodexActivityMonitor: ObservableObject {if deferUnassociatedSubagentEvent(event, source: source) {return nil}- let isTopLevelEvent = event.agentId == nil+ let isTopLevelEvent = event.agentID == nilswitch event.hookEvent {case .userPromptSubmit:guard isTopLevelEvent else { return nil }@@ -784,7 +784,7 @@ final class CodexActivityMonitor: ObservableObject {guard !updateAliasedPrompt(from: event, key: key) else { return }preserveSupersededSessionTask(from: event, key: key)if let pending = pendingTerminalTasks[key] {- guard key.turnId == nil, event.timestamp > pending.supersededAt else { return }+ guard key.turnID == nil, event.timestamp > pending.supersededAt else { return }pendingTerminalTasks.removeValue(forKey: key)if let resolved = pending.task.resolvedTurnKey {pendingTerminalTasks[resolved] = pending@@ -807,16 +807,16 @@ final class CodexActivityMonitor: ObservableObject {return}- if let sessionId = key.sessionId {+ if let sessionID = key.sessionID {// 同一 session 的 turn 按顺序执行. 新 prompt 让旧 turn 立即退出活动列表// 但保留短暂终态确认窗口, 避免把迟到的正常完成误记为终止guard !tasks.values.contains(where: {- $0.key.sessionId == sessionId && $0.lastMainHookEventAt > event.timestamp+ $0.key.sessionID == sessionID && $0.lastMainHookEventAt > event.timestamp}) else {return}let supersededTasks = tasks.values.filter {- $0.key != key && $0.key.sessionId == sessionId+ $0.key != key && $0.key.sessionID == sessionID}for task in supersededTasks {clearActivityProtection(for: task.key, taskID: task.displayID, reason: .terminal)@@ -827,7 +827,7 @@ final class CodexActivityMonitor: ObservableObject {)}tasks = tasks.filter { taskKey, _ in- taskKey == key || taskKey.sessionId != sessionId+ taskKey == key || taskKey.sessionID != sessionID}}@@ -840,9 +840,9 @@ final class CodexActivityMonitor: ObservableObject {}recentlyEndedTaskAt.removeValue(forKey: key)- if let sessionId = key.sessionId {+ if let sessionID = key.sessionID {// 缺少 turn 的事件复用 session 键; 新 turn 开始后清除上一轮的终态记忆- recentlyEndedTaskAt.removeValue(forKey: .session(sessionId))+ recentlyEndedTaskAt.removeValue(forKey: .session(sessionID))}if resumePromptInSameTurn(from: event, existing: existingTask) {@@ -869,7 +869,7 @@ final class CodexActivityMonitor: ObservableObject {source: CodexActivityEventSource) {let eventKey = CodexActivityTaskKey(event: event)- let matchedKey = event.agentId == nil+ let matchedKey = event.agentID == nil? matchingActiveTaskKey(for: event): matchingSubagentParentTaskKey(for: event)@@ -941,7 +941,7 @@ final class CodexActivityMonitor: ObservableObject {}task.recordSubagentActivity(- agentId: event.agentId,+ agentID: event.agentID,isStarting: isStarting,hasEnded: task.executions[task.executionKey(for: event)]?.isTerminal == true,at: event.timestamp@@ -964,7 +964,7 @@ final class CodexActivityMonitor: ObservableObject {source: CodexActivityEventSource) -> CodexActivityTaskKey? {let eventKey = CodexActivityTaskKey(event: event)- let matchedKey = event.agentId == nil+ let matchedKey = event.agentID == nil? matchingActiveTaskKey(for: event): matchingSubagentParentTaskKey(for: event)@@ -994,7 +994,7 @@ final class CodexActivityMonitor: ObservableObject {return enteredWaiting ? key : nil}- guard event.agentId == nil,+ guard event.agentID == nil,recentEndedDate(for: eventKey) == nil,pendingTerminalTasks[eventKey] == nil,!pendingTerminalTasks.values.contains(where: { $0.task.resolvedTurnKey == eventKey }) else {@@ -1030,7 +1030,7 @@ final class CodexActivityMonitor: ObservableObject {return}- let match = matchingTerminalTask(for: event, allowsAnonymousFallback: event.sessionId == nil)+ let match = matchingTerminalTask(for: event, allowsAnonymousFallback: event.sessionID == nil)switch match {case .ambiguous:AppLog.activity.error("任务终态已延后: reason=ambiguousStop")@@ -1073,13 +1073,13 @@ final class CodexActivityMonitor: ObservableObject {/// SessionEnd 没有 turn_id, 以 session 为边界把活跃任务移入终态确认窗口/// 任务立即退出活跃列表, 后续继续从 rollout 确认完成或终止分类private func terminateSession(from event: WorkflowHookEvent) {- guard let sessionId = event.sessionId else {+ guard let sessionID = event.sessionID else {return}let deadline = Date().addingTimeInterval(Self.supersededTerminalGracePeriod)let matchingPendingTasks = pendingTerminalTasks.filter { key, pending in- key.sessionId == sessionId && pending.task.lastMainHookEventAt <= event.timestamp+ key.sessionID == sessionID && pending.task.lastMainHookEventAt <= event.timestamp}for (key, pending) in matchingPendingTasks {pendingTerminalTasks[key] = PendingTerminalTask(@@ -1090,7 +1090,7 @@ final class CodexActivityMonitor: ObservableObject {}let matchingActiveTasks = tasks.filter { key, task in- key.sessionId == sessionId && task.lastMainHookEventAt <= event.timestamp+ key.sessionID == sessionID && task.lastMainHookEventAt <= event.timestamp}for (key, task) in matchingActiveTasks {tasks.removeValue(forKey: key)@@ -1113,15 +1113,15 @@ final class CodexActivityMonitor: ObservableObject {return exactKey}- if let sessionId = event.sessionId {+ if let sessionID = event.sessionID {guard !pendingTerminalTasks.values.contains(where: {- $0.task.key.sessionId == sessionId+ $0.task.key.sessionID == sessionID}) else {return nil}let candidates = tasks.values.filter { task in- task.key.sessionId == sessionId- && (event.turnId == nil || task.associatedTurnId == nil)+ task.key.sessionID == sessionID+ && (event.turnID == nil || task.associatedTurnID == nil)}guard candidates.count == 1 else {return nil@@ -1150,15 +1150,15 @@ final class CodexActivityMonitor: ObservableObject {return .pending(exactKey)}if tasks[exactKey] != nil,- event.turnId != nil || event.sessionId == nil {+ event.turnID != nil || event.sessionID == nil {return .active(exactKey)}- if let sessionId = event.sessionId {+ if let sessionID = event.sessionID {let pendingCandidates = pendingTerminalTasks.filter {- $0.value.task.key.sessionId == sessionId+ $0.value.task.key.sessionID == sessionID&& $0.value.task.lastMainHookEventAt <= event.timestamp- && (event.turnId == nil || $0.value.task.associatedTurnId == nil)+ && (event.turnID == nil || $0.value.task.associatedTurnID == nil)}if pendingCandidates.count == 1, let key = pendingCandidates.keys.first {return .pending(key)@@ -1168,9 +1168,9 @@ final class CodexActivityMonitor: ObservableObject {}let activeCandidates = tasks.values.filter {- $0.key.sessionId == sessionId+ $0.key.sessionID == sessionID&& $0.lastMainHookEventAt <= event.timestamp- && (event.turnId == nil || $0.associatedTurnId == nil)+ && (event.turnID == nil || $0.associatedTurnID == nil)}if activeCandidates.count == 1 {return .active(activeCandidates[0].key)@@ -1330,7 +1330,7 @@ final class CodexActivityMonitor: ObservableObject {private extension CodexActivityMonitor {func resumePromptInSameTurn(from event: WorkflowHookEvent, existing: CodexActivityTask?) -> Bool {- guard var task = existing, let turnId = event.turnId, task.associatedTurnId == turnId else { return false }+ guard var task = existing, let turnID = event.turnID, task.associatedTurnID == turnID else { return false }task.resumeExecution(from: event, latestEvent: .promptSubmitted)task.mergeMetadata(from: event)task.recordHookEvent(at: event.timestamp)diff --git a/CodexBar/Services/Workflow/CodexActivityOriginFiltering.swift b/CodexBar/Services/Workflow/CodexActivityOriginFiltering.swiftindex 6055e0f..492b1df 100644--- a/CodexBar/Services/Workflow/CodexActivityOriginFiltering.swift+++ b/CodexBar/Services/Workflow/CodexActivityOriginFiltering.swift@@ -10,7 +10,7 @@ extension CodexActivityMonitor {timestamp: event.timestamp, name: event.name, origin: origin,directoryPath: event.directoryPath, toolName: event.toolName, modelName: event.modelName,effort: event.effort, permissionMode: event.permissionMode, approvalReviewer: event.approvalReviewer,- sessionId: event.sessionId, turnId: event.turnId, agentId: event.agentId+ sessionID: event.sessionID, turnID: event.turnID, agentID: event.agentID)}@@ -67,11 +67,11 @@ extension CodexActivityMonitor {}private static func exactTurnKey(for event: WorkflowHookEvent) -> CodexActivityTaskKey? {- guard let sessionId = event.sessionId,- let turnId = event.turnId else {+ guard let sessionID = event.sessionID,+ let turnID = event.turnID else {return nil}- return .turn(session: sessionId, turn: turnId)+ return .turn(session: sessionID, turn: turnID)}private func discardExcludedActivity(for key: CodexActivityTaskKey) {@@ -100,17 +100,17 @@ extension CodexActivityMonitor {private func removeTerminalMemory(for key: CodexActivityTaskKey) {guard let removedAt = recentlyEndedTaskAt.removeValue(forKey: key),- let sessionId = key.sessionId else {+ let sessionID = key.sessionID else {return}- let sessionKey = CodexActivityTaskKey.session(sessionId)+ let sessionKey = CodexActivityTaskKey.session(sessionID)guard recentlyEndedTaskAt[sessionKey] == removedAt else {return}let remainingSessionDate = recentlyEndedTaskAt.compactMap { candidateKey, date -> Date? inguard candidateKey != sessionKey,- candidateKey.sessionId == sessionId else {+ candidateKey.sessionID == sessionID else {return nil}return datediff --git a/CodexBar/Services/Workflow/CodexActivitySubagentTracking.swift b/CodexBar/Services/Workflow/CodexActivitySubagentTracking.swiftindex 21859c8..8654c7c 100644--- a/CodexBar/Services/Workflow/CodexActivitySubagentTracking.swift+++ b/CodexBar/Services/Workflow/CodexActivitySubagentTracking.swift@@ -11,19 +11,19 @@ extension CodexActivityMonitor {for event: WorkflowHookEvent) -> CodexActivityTaskKey? {guard let reference = subagentReference(for: event),- let rootKey = subagentTurnLinks[reference], rootKey.sessionId == event.sessionId else { return nil }+ let rootKey = subagentTurnLinks[reference], rootKey.sessionID == event.sessionID else { return nil }return tasks.first(where: { $0.value.resolvedTurnKey == rootKey })?.key}func subagentReference(for event: WorkflowHookEvent) -> CodexActivityTurnReference? {- guard let agentId = event.agentId, let turnId = event.turnId else { return nil }+ guard let agentID = event.agentID, let turnID = event.turnID else { return nil }// 引用的相等性只由线程和轮次决定, 时间只用于文件定位- return CodexActivityTurnReference(sessionId: agentId, turnId: turnId, startedAt: event.timestamp)+ return CodexActivityTurnReference(threadID: agentID, turnID: turnID, startedAt: event.timestamp)}func deferUnassociatedSubagentEvent(_ event: WorkflowHookEvent, source: CodexActivityEventSource) -> Bool {guard let reference = subagentReference(for: event), subagentTurnLinks[reference] == nil else { return false }- guard event.sessionId != nil else { return true }+ guard event.sessionID != nil else { return true }if !pendingSubagentEvents.contains(where: { $0.event == event }) {pendingSubagentEvents.append(CodexPendingSubagentEvent(event: event, source: source))}@@ -38,8 +38,8 @@ extension CodexActivityMonitor {var references = pendingSubagentEvents.compactMap { subagentReference(for: $0.event) }for task in tasks.values {for (owner, execution) in task.executions where !execution.isTerminal {- guard let agentId = owner.agentId, let turnId = owner.turnId else { continue }- references.append(CodexActivityTurnReference(sessionId: agentId, turnId: turnId, startedAt: execution.lastHookEventAt))+ guard let agentID = owner.agentID, let turnID = owner.turnID else { continue }+ references.append(CodexActivityTurnReference(threadID: agentID, turnID: turnID, startedAt: execution.lastHookEventAt))}}return Array(Set(references))@@ -51,24 +51,24 @@ extension CodexActivityMonitor {into transitions: inout [CodexActivityTransition]) -> Bool {guard state.readStatus == .complete,- state.threadId == state.sessionId,- let rootTurnId = state.rootTurnId,- let parentThreadId = state.parentThreadId, parentThreadId != state.sessionId else { return false }- let reference = CodexActivityTurnReference(sessionId: state.sessionId, turnId: state.turnId, startedAt: state.startedAt ?? Date())+ state.recordedThreadID == state.requestedThreadID,+ let rootTurnID = state.rootTurnID,+ let parentThreadID = state.parentThreadID, parentThreadID != state.requestedThreadID else { return false }+ let reference = CodexActivityTurnReference(threadID: state.requestedThreadID, turnID: state.turnID, startedAt: state.startedAt ?? Date())let hookSessions = Set(pendingSubagentEvents.compactMap { pending -> String? in- subagentReference(for: pending.event) == reference ? pending.event.sessionId : nil+ subagentReference(for: pending.event) == reference ? pending.event.sessionID : nil})- let rootSessionId = state.rootSessionId ?? subagentTurnLinks[reference]?.sessionId+ let rootSessionID = state.rootSessionID ?? subagentTurnLinks[reference]?.sessionID?? (hookSessions.count == 1 ? hookSessions.first : nil)- guard let rootSessionId, rootSessionId != state.sessionId,- hookSessions.isEmpty || hookSessions == [rootSessionId] else { return false }- let rootKey = CodexActivityTaskKey.turn(session: rootSessionId, turn: rootTurnId)+ guard let rootSessionID, rootSessionID != state.requestedThreadID,+ hookSessions.isEmpty || hookSessions == [rootSessionID] else { return false }+ let rootKey = CodexActivityTaskKey.turn(session: rootSessionID, turn: rootTurnID)guard subagentTurnLinks[reference].map({ $0 == rootKey }) ?? true else { return false }subagentTurnLinks[reference] = rootKeyguard !terminalOnly || state.terminal != nil,let key = tasks.first(where: { $0.value.resolvedTurnKey == rootKey })?.key,var task = tasks[key] else { return false }- let owner = CodexActivityExecutionKey(agentId: state.sessionId, turnId: state.turnId)+ let owner = CodexActivityExecutionKey(agentID: state.requestedThreadID, turnID: state.turnID)let wasWaiting = task.state == .waitingApprovaltask.mergeExecutionLifecycle(state, owner: owner)_ = resolvePendingApprovalIfPossible(for: &task, into: &transitions)@@ -96,7 +96,7 @@ extension CodexActivityMonitor {var waitingKeys: [CodexActivityTaskKey] = []for pending in ready {guard let reference = subagentReference(for: pending.event),- subagentTurnLinks[reference]?.sessionId == pending.event.sessionId else { continue }+ subagentTurnLinks[reference]?.sessionID == pending.event.sessionID else { continue }if let key = apply(pending.event, source: pending.source), pending.source == .live {waitingKeys.append(key)}diff --git a/CodexBar/Services/Workflow/CodexActivityTask.swift b/CodexBar/Services/Workflow/CodexActivityTask.swiftindex 02f2c0e..74f23cf 100644--- a/CodexBar/Services/Workflow/CodexActivityTask.swift+++ b/CodexBar/Services/Workflow/CodexActivityTask.swift@@ -7,23 +7,23 @@ enum CodexActivityTaskKey: Hashable {case anonymous(project: String)init(event: WorkflowHookEvent) {- if let sessionId = event.sessionId, let turnId = event.turnId {- self = .turn(session: sessionId, turn: turnId)- } else if let sessionId = event.sessionId {- self = .session(sessionId)+ if let sessionID = event.sessionID, let turnID = event.turnID {+ self = .turn(session: sessionID, turn: turnID)+ } else if let sessionID = event.sessionID {+ self = .session(sessionID)} else {self = .anonymous(project: Self.projectIdentifier(event.projectDisplayName))}}- var sessionId: String? {+ var sessionID: String? {switch self {case let .turn(session, _), let .session(session): sessioncase .anonymous: nil}}- var turnId: String? {+ var turnID: String? {if case let .turn(_, turn) = self {return turn}@@ -119,7 +119,7 @@ struct PendingTerminalTask {struct CodexActivityTask {let displayID: UUIDlet key: CodexActivityTaskKey- var associatedTurnId: String?+ var associatedTurnID: String?var lifecycleCoverageCheckedAt: Date?var incompleteTailCheckedAt: Date?var incompleteTailUnchangedSince: Date?@@ -150,7 +150,7 @@ struct CodexActivityTask {) {self.displayID = displayIDself.key = key- associatedTurnId = key.turnId+ associatedTurnID = key.turnIDself.state = stateself.latestEvent = latestEventprojectName = event.projectDisplayName@@ -197,26 +197,26 @@ struct CodexActivityTask {}var turnReference: CodexActivityTurnReference? {- guard let sessionId = key.sessionId, let turnId = associatedTurnId else {+ guard let sessionID = key.sessionID, let turnID = associatedTurnID else {return nil}return CodexActivityTurnReference(- sessionId: sessionId,- turnId: turnId,+ threadID: sessionID,+ turnID: turnID,startedAt: startedAt ?? lastActivityAt)}var promptReference: CodexActivityPromptReference? {guard startedAt == nil,- let sessionId = key.sessionId, let turnId = associatedTurnId else {+ let sessionID = key.sessionID, let turnID = associatedTurnID else {return nil}- return CodexActivityPromptReference(sessionId: sessionId, turnId: turnId)+ return CodexActivityPromptReference(sessionID: sessionID, turnID: turnID)}var resolvedTurnKey: CodexActivityTaskKey? {- guard let session = key.sessionId, let turn = associatedTurnId else { return nil }+ guard let session = key.sessionID, let turn = associatedTurnID else { return nil }return .turn(session: session, turn: turn)}@@ -250,8 +250,8 @@ struct CodexActivityTask {}mutating func mergeMetadata(from event: WorkflowHookEvent) {- if associatedTurnId == nil, !key.isAnonymous, event.agentId == nil {- associatedTurnId = event.turnId+ if associatedTurnID == nil, !key.isAnonymous, event.agentID == nil {+ associatedTurnID = event.turnID}projectName = event.projectDisplayName ?? projectNamemodelName = event.modelName ?? modelName@@ -287,24 +287,24 @@ struct CodexActivityTask {}mutating func recordSubagentActivity(- agentId: String?,+ agentID: String?,isStarting: Bool,hasEnded: Bool = false,at timestamp: Date) {- guard let agentId else {+ guard let agentID else {isSubagentCountReliable = falsereturn}- let previous = subagentsByID[agentId]+ let previous = subagentsByID[agentID]if let previous, timestamp < previous.timestamp {return}if !isStarting, previous == nil {isSubagentCountReliable = false}- subagentsByID[agentId] = CodexSubagentObservation(+ subagentsByID[agentID] = CodexSubagentObservation(isRunning: isStarting && !hasEnded,timestamp: timestamp)@@ -343,14 +343,14 @@ struct CodexActivityTask {func executionKey(for event: WorkflowHookEvent) -> CodexActivityExecutionKey {CodexActivityExecutionKey(- agentId: event.agentId,- turnId: event.turnId,- isUnattributed: event.agentId == nil && event.origin != .main+ agentID: event.agentID,+ turnID: event.turnID,+ isUnattributed: event.agentID == nil && event.origin != .main)}var lastMainHookEventAt: Date {- executions.filter { $0.key.agentId == nil && !$0.key.isUnattributed }+ executions.filter { $0.key.agentID == nil && !$0.key.isUnattributed }.values.map(\.lastHookEventAt).max() ?? startedAt ?? .distantPast}@@ -466,12 +466,12 @@ struct CodexActivityTask {}struct CodexActivityExecutionKey: Hashable {- let agentId: String?- let turnId: String?+ let agentID: String?+ let turnID: String?var isUnattributed = falsevar isReliable: Bool {- turnId != nil && !isUnattributed+ turnID != nil && !isUnattributed}}diff --git a/CodexBar/Services/Workflow/CodexActivityTerminalResolution.swift b/CodexBar/Services/Workflow/CodexActivityTerminalResolution.swiftindex 2f0db88..992fe17 100644--- a/CodexBar/Services/Workflow/CodexActivityTerminalResolution.swift+++ b/CodexBar/Services/Workflow/CodexActivityTerminalResolution.swift@@ -11,7 +11,7 @@ extension CodexActivityMonitor {return}- let match = matchingTerminalTask(for: event, allowsAnonymousFallback: event.sessionId == nil)+ let match = matchingTerminalTask(for: event, allowsAnonymousFallback: event.sessionID == nil)let key: CodexActivityTaskKeylet task: CodexActivityTask?switch match {@@ -245,8 +245,8 @@ extension CodexActivityMonitor {func recordEndedTask(_ key: CodexActivityTaskKey, at date: Date) {recentlyEndedTaskAt[key] = max(recentlyEndedTaskAt[key] ?? .distantPast, date)- if let sessionId = key.sessionId {- let sessionKey = CodexActivityTaskKey.session(sessionId)+ if let sessionID = key.sessionID {+ let sessionKey = CodexActivityTaskKey.session(sessionID)recentlyEndedTaskAt[sessionKey] = max(recentlyEndedTaskAt[sessionKey] ?? .distantPast, date)}}diff --git a/CodexBar/Services/Workflow/CodexActivityTokenUsage.swift b/CodexBar/Services/Workflow/CodexActivityTokenUsage.swiftindex 081e824..a886581 100644--- a/CodexBar/Services/Workflow/CodexActivityTokenUsage.swift+++ b/CodexBar/Services/Workflow/CodexActivityTokenUsage.swift@@ -8,14 +8,14 @@ struct CodexTaskTokenUsageRequest {var nextReadAt = Date.distantPastfunc usage(from states: [CodexSessionTaskLifecycleState], requiresFinalUsage: Bool = true) -> CodexTokenUsage? {- let agentIDs = Set(references.filter { $0 != root }.map(\.sessionId))+ let agentIDs = Set(references.filter { $0 != root }.map(\.threadID))guard !requiresFinalUsage || expectedAgentIDs.isSubset(of: agentIDs) else { return nil }var total: CodexTokenUsage?for reference in references {- guard let state = states.first(where: { $0.sessionId == reference.sessionId && $0.turnId == reference.turnId }),- state.readStatus == .complete, state.threadId == reference.sessionId,- state.rootTurnId == root.turnId,- (state.rootSessionId ?? state.threadId) == root.sessionId,+ guard let state = states.first(where: { $0.requestedThreadID == reference.threadID && $0.turnID == reference.turnID }),+ state.readStatus == .complete, state.recordedThreadID == reference.threadID,+ state.rootTurnID == root.turnID,+ (state.rootSessionID ?? state.recordedThreadID) == root.threadID,!requiresFinalUsage || reference == root || state.terminal != nil,let usage = state.tokenUsage else {if requiresFinalUsage {@@ -38,10 +38,10 @@ extension CodexActivityMonitor {func registerTerminalTokenUsage(id: UUID, key: CodexActivityTaskKey, task: CodexActivityTask?, endedAt: Date, now: Date = Date()) {- guard let session = key.sessionId, let turn = task?.associatedTurnId ?? key.turnId else { return }+ guard let session = key.sessionID, let turn = task?.associatedTurnID ?? key.turnID else { return }// 缺少子 Agent 身份时不能把主线程小计展示为整项任务总量guard task?.executions.keys.contains(where: \.isUnattributed) != true else { return }- let root = CodexActivityTurnReference(sessionId: session, turnId: turn, startedAt: task?.startedAt ?? endedAt)+ let root = CodexActivityTurnReference(threadID: session, turnID: turn, startedAt: task?.startedAt ?? endedAt)terminalTokenUsageRequests[id] = tokenUsageRequest(root: root, task: task, deadline: now.addingTimeInterval(30))}@@ -49,12 +49,12 @@ extension CodexActivityMonitor {root: CodexActivityTurnReference, task: CodexActivityTask?, deadline: Date) -> CodexTaskTokenUsageRequest {var references: Set = [root]- let rootKey = CodexActivityTaskKey.turn(session: root.sessionId, turn: root.turnId)+ let rootKey = CodexActivityTaskKey.turn(session: root.threadID, turn: root.turnID)references.formUnion(subagentTurnLinks.filter { $0.value == rootKey }.map(\.key))if let task {for owner in task.executions.keys {- guard let agent = owner.agentId, let turn = owner.turnId else { continue }- references.insert(CodexActivityTurnReference(sessionId: agent, turnId: turn, startedAt: root.startedAt))+ guard let agent = owner.agentID, let turn = owner.turnID else { continue }+ references.insert(CodexActivityTurnReference(threadID: agent, turnID: turn, startedAt: root.startedAt))}}return CodexTaskTokenUsageRequest(@@ -89,13 +89,13 @@ extension CodexActivityMonitor {}/// 结束后有界重读, Interrupt Hook 可能先于最后一条用量落盘- func terminalTokenUsageReferences(now: Date) -> [CodexActivityTurnReference] {+ func prepareTerminalTokenUsageReadBatch(now: Date) -> [CodexActivityTurnReference] {terminalTokenUsageRequests = terminalTokenUsageRequests.filter { $0.value.deadline > now }let due = terminalTokenUsageRequests.filter { $0.value.nextReadAt <= now }.sorted { $0.value.nextReadAt < $1.value.nextReadAt }.prefix(16)var references: Set<CodexActivityTurnReference> = []for (id, var request) in due {- let rootKey = CodexActivityTaskKey.turn(session: request.root.sessionId, turn: request.root.turnId)+ let rootKey = CodexActivityTaskKey.turn(session: request.root.threadID, turn: request.root.turnID)request.references.formUnion(subagentTurnLinks.filter { $0.value == rootKey }.map(\.key))request.nextReadAt = now.addingTimeInterval(2)terminalTokenUsageRequests[id] = request@@ -108,8 +108,8 @@ extension CodexActivityMonitor {func applyTerminalTokenUsage(_ states: [CodexSessionTaskLifecycleState]) -> Bool {var changed = falsefor (id, var request) in terminalTokenUsageRequests {- guard states.contains(where: { $0.sessionId == request.root.sessionId && $0.turnId == request.root.turnId }) else { continue }- let rootKey = CodexActivityTaskKey.turn(session: request.root.sessionId, turn: request.root.turnId)+ guard states.contains(where: { $0.requestedThreadID == request.root.threadID && $0.turnID == request.root.turnID }) else { continue }+ let rootKey = CodexActivityTaskKey.turn(session: request.root.threadID, turn: request.root.turnID)request.references.formUnion(subagentTurnLinks.filter { $0.value == rootKey }.map(\.key))terminalTokenUsageRequests[id] = request// 仅汇总已确认属于本轮的线程, 临时读取不完整时保留上次结果diff --git a/CodexBar/Services/Workflow/CodexSessionLifecycleReader.swift b/CodexBar/Services/Workflow/CodexSessionLifecycleReader.swiftindex 49eb6b2..e915c31 100644--- a/CodexBar/Services/Workflow/CodexSessionLifecycleReader.swift+++ b/CodexBar/Services/Workflow/CodexSessionLifecycleReader.swift@@ -1,18 +1,18 @@import Foundation-/// 活跃 turn 的最小定位信息, 只在进程内用于关联 Codex session 生命周期事件+/// 活跃轮次的线程定位信息, 用于关联 rollout 生命周期事件nonisolated struct CodexActivityTurnReference: Hashable {- let sessionId: String- let turnId: String+ let threadID: String+ let turnID: Stringlet startedAt: Datestatic func == (lhs: Self, rhs: Self) -> Bool {- lhs.sessionId == rhs.sessionId && lhs.turnId == rhs.turnId+ lhs.threadID == rhs.threadID && lhs.turnID == rhs.turnID}func hash(into hasher: inout Hasher) {- hasher.combine(sessionId)- hasher.combine(turnId)+ hasher.combine(threadID)+ hasher.combine(turnID)}}@@ -22,9 +22,9 @@ actor CodexSessionLifecycleReader {private let archivedSessionsRootURL: URLprivate let fileManager: FileManagerprivate var roundRobinOffset = 0- private var cursorsBySession: [String: SessionFileCursor] = [:]- private var lastResolutionAttemptBySession: [String: Date] = [:]- private var lastRecursiveAttemptBySession: [String: Date] = [:]+ private var cursorsByThread: [String: SessionFileCursor] = [:]+ private var lastResolutionAttemptByThread: [String: Date] = [:]+ private var lastRecursiveAttemptByThread: [String: Date] = [:]init(codexHomeURL: URL = CodexCLIResolver.codexHomeDirectory(), fileManager: FileManager = .default) {sessionsRootURL = codexHomeURL.appendingPathComponent("sessions", isDirectory: true)@@ -33,30 +33,30 @@ actor CodexSessionLifecycleReader {}func lifecycleStates(for references: [CodexActivityTurnReference], now: Date = Date()) -> [CodexSessionTaskLifecycleState] {- let grouped = Dictionary(grouping: references, by: \.sessionId)+ let grouped = Dictionary(grouping: references, by: \.threadID)let cutoff = now.addingTimeInterval(-CodexActivityRetention.window)- cursorsBySession = cursorsBySession.filter { $0.value.lastReadAt > cutoff }- lastResolutionAttemptBySession = lastResolutionAttemptBySession.filter { $0.value > cutoff }- lastRecursiveAttemptBySession = lastRecursiveAttemptBySession.filter { $0.value > cutoff }+ cursorsByThread = cursorsByThread.filter { $0.value.lastReadAt > cutoff }+ lastResolutionAttemptByThread = lastResolutionAttemptByThread.filter { $0.value > cutoff }+ lastRecursiveAttemptByThread = lastRecursiveAttemptByThread.filter { $0.value > cutoff }var budget = Self.contextByteLimitvar performedBackfill = falsevar states: [CodexSessionTaskLifecycleState] = []- let sessions = grouped.keys.sorted()- let start = sessions.isEmpty ? 0 : roundRobinOffset % sessions.count- let ordered = Array(sessions.dropFirst(start)) + Array(sessions.prefix(start))- roundRobinOffset = sessions.isEmpty ? 0 : (start + 1) % sessions.count- for sessionId in ordered {- guard let sessionReferences = grouped[sessionId],- let latest = sessionReferences.max(by: { $0.startedAt < $1.startedAt }) else { continue }+ let threadIDs = grouped.keys.sorted()+ let start = threadIDs.isEmpty ? 0 : roundRobinOffset % threadIDs.count+ let ordered = Array(threadIDs.dropFirst(start)) + Array(threadIDs.prefix(start))+ roundRobinOffset = threadIDs.isEmpty ? 0 : (start + 1) % threadIDs.count+ for threadID in ordered {+ guard let threadReferences = grouped[threadID],+ let latest = threadReferences.max(by: { $0.startedAt < $1.startedAt }) else { continue }var status = CodexSessionReadStatus.notFoundif var cursor = cursor(for: latest) {status = scan(into: &cursor, limit: min(Self.incrementalByteLimit, budget), now: now)- if cursor.metadata?.id != sessionId {+ if cursor.metadata?.id != threadID {status = .unavailable}budget -= min(budget, cursor.lastReadByteCount)- let needsContext = sessionReferences.contains {- let known = cursor.lifecycleByTurnId[$0.turnId]+ let needsContext = threadReferences.contains {+ let known = cursor.lifecycleByTurnID[$0.turnID]return known?.terminal == nil && (known?.hasContext != true || known?.effort == nil || known?.approvalReviewer == nil)}if status == .complete, needsContext, cursor.historicalOffset > 0,@@ -65,28 +65,28 @@ actor CodexSessionLifecycleReader {performedBackfill = true}cursor.lastReadAt = now- let referencedTurns = Set(sessionReferences.map(\.turnId))- cursor.lifecycleByTurnId = cursor.lifecycleByTurnId.filter {+ let referencedTurns = Set(threadReferences.map(\.turnID))+ cursor.lifecycleByTurnID = cursor.lifecycleByTurnID.filter {referencedTurns.contains($0.key) || ($0.value.lastProgressAt ?? .distantPast) > cutoff}- cursorsBySession[sessionId] = cursor+ cursorsByThread[threadID] = cursor}- let cursor = cursorsBySession[sessionId]- for reference in sessionReferences {- let known = cursor?.lifecycleByTurnId[reference.turnId]+ let cursor = cursorsByThread[threadID]+ for reference in threadReferences {+ let known = cursor?.lifecycleByTurnID[reference.turnID]let hasReadGap = known?.hasReadGap ?? (cursor?.hasDecodeFailures == true)let turnStatus: CodexSessionReadStatus = status == .complete && hasReadGap && known?.terminal == nil? .incomplete : statusstates.append(CodexSessionTaskLifecycleState(- sessionId: sessionId, turnId: reference.turnId, startedAt: known?.startedAt,+ requestedThreadID: threadID, turnID: reference.turnID, startedAt: known?.startedAt,approvalReviewer: known?.approvalReviewer, effort: known?.effort,lastProgressAt: known?.lastProgressAt, terminal: turnStatus == .complete ? known?.terminal : nil,readStatus: turnStatus, hasContext: known?.hasContext == true,contextObservedAt: known?.contextObservedAt,- rootTurnId: known?.rootTurnId,- threadId: cursor?.metadata?.id,- rootSessionId: cursor?.metadata?.sessionId,- parentThreadId: cursor?.metadata?.parentThreadId,+ rootTurnID: known?.rootTurnID,+ recordedThreadID: cursor?.metadata?.id,+ rootSessionID: cursor?.metadata?.sessionID,+ parentThreadID: cursor?.metadata?.parentThreadID,lastExecutionProgressAt: known?.lastExecutionProgressAt,incompleteTailUnchangedSince: status == .incomplete && !hasReadGap && known?.hasContext == true && known?.terminal == nil? cursor?.incompleteTailUnchangedSince : nil,@@ -98,61 +98,61 @@ actor CodexSessionLifecycleReader {}func resetResolutionFallbacks() {- lastResolutionAttemptBySession.removeAll()- lastRecursiveAttemptBySession.removeAll()+ lastResolutionAttemptByThread.removeAll()+ lastRecursiveAttemptByThread.removeAll()}private func cursor(for reference: CodexActivityTurnReference) -> SessionFileCursor? {- if let cursor = cursorsBySession[reference.sessionId],- matchingFile(in: cursor.url.deletingLastPathComponent(), threadId: reference.sessionId) == cursor.url {+ if let cursor = cursorsByThread[reference.threadID],+ matchingFile(in: cursor.url.deletingLastPathComponent(), threadID: reference.threadID) == cursor.url {return cursor}- if cursorsBySession.removeValue(forKey: reference.sessionId) != nil {- lastResolutionAttemptBySession.removeValue(forKey: reference.sessionId)- lastRecursiveAttemptBySession.removeValue(forKey: reference.sessionId)+ if cursorsByThread.removeValue(forKey: reference.threadID) != nil {+ lastResolutionAttemptByThread.removeValue(forKey: reference.threadID)+ lastRecursiveAttemptByThread.removeValue(forKey: reference.threadID)}let now = Date()- if let last = lastResolutionAttemptBySession[reference.sessionId], now.timeIntervalSince(last) < 10 {+ if let last = lastResolutionAttemptByThread[reference.threadID], now.timeIntervalSince(last) < 10 {return nil}- lastResolutionAttemptBySession[reference.sessionId] = now+ lastResolutionAttemptByThread[reference.threadID] = nowfor directory in [sessionDirectory(for: reference.startedAt), sessionDirectory(for: now), archivedSessionsRootURL] {- if let url = matchingFile(in: directory, threadId: reference.sessionId) {+ if let url = matchingFile(in: directory, threadID: reference.threadID) {let cursor = initialCursor(for: url)- if cursor.metadata?.id == reference.sessionId {+ if cursor.metadata?.id == reference.threadID {return cursor}}}- if let last = lastRecursiveAttemptBySession[reference.sessionId], now.timeIntervalSince(last) < 60 {+ if let last = lastRecursiveAttemptByThread[reference.threadID], now.timeIntervalSince(last) < 60 {return nil}- lastRecursiveAttemptBySession[reference.sessionId] = now+ lastRecursiveAttemptByThread[reference.threadID] = nowguard let enumerator = fileManager.enumerator(at: sessionsRootURL, includingPropertiesForKeys: [.isRegularFileKey],options: [.skipsHiddenFiles, .skipsPackageDescendants]) else { return nil }- let matches = enumerator.compactMap { $0 as? URL }.filter { Self.matchesFile($0, threadId: reference.sessionId) }+ let matches = enumerator.compactMap { $0 as? URL }.filter { Self.matchesFile($0, threadID: reference.threadID) }guard matches.count == 1, let url = matches.first else { return nil }let cursor = initialCursor(for: url)- return cursor.metadata?.id == reference.sessionId ? cursor : nil+ return cursor.metadata?.id == reference.threadID ? cursor : nil}- private func matchingFile(in directory: URL, threadId: String) -> URL? {+ private func matchingFile(in directory: URL, threadID: String) -> URL? {let matches = (try? fileManager.contentsOfDirectory(at: directory, includingPropertiesForKeys: nil, options: [.skipsHiddenFiles]))?- .filter { Self.matchesFile($0, threadId: threadId) } ?? []+ .filter { Self.matchesFile($0, threadID: threadID) } ?? []return matches.count == 1 ? matches.first : nil}- private static func matchesFile(_ url: URL, threadId: String) -> Bool {+ private static func matchesFile(_ url: URL, threadID: String) -> Bool {let name = url.lastPathComponentguard name.hasPrefix("rollout-"), name.hasSuffix(".jsonl") else { return false }let stem = String(name.dropLast(6))- if stem.hasSuffix("-\(threadId)") {+ if stem.hasSuffix("-\(threadID)") {return true}guard let separator = stem.lastIndex(of: "_"), UUID(uuidString: String(stem[stem.index(after: separator)...])) != nil else { return false }- return stem[..<separator].hasSuffix("-\(threadId)")+ return stem[..<separator].hasSuffix("-\(threadID)")}private func sessionDirectory(for date: Date) -> URL {@@ -232,8 +232,8 @@ private nonisolated struct SessionFileCursor {let historicalOffset: UInt64var isDiscardingLine: Boolvar metadata: WorkflowRolloutMetadataPayload?- var currentTurnId: String?- var lifecycleByTurnId: [String: SessionTurnLifecycle] = [:]+ var currentTurnID: String?+ var lifecycleByTurnID: [String: SessionTurnLifecycle] = [:]var partialLineData = Data()var didBackfill = falsevar hasDecodeFailures = false@@ -296,19 +296,19 @@ private nonisolated struct SessionFileCursor {}for envelope in decoded.values {apply(envelope)- if envelope.type == "token_usage_record", let turnId = envelope.payload?.turnId {+ if envelope.type == "token_usage_record", let turnID = envelope.payload?.turnID {// 用量字段损坏不能影响生命周期解码, 也不能沿用上一条累计值- var state = lifecycleByTurnId[turnId] ?? SessionTurnLifecycle()+ var state = lifecycleByTurnID[turnID] ?? SessionTurnLifecycle()state.tokenUsage = nilif let record = try? JSONDecoder().decode(CodexRolloutTokenUsageRecord.self, from: partialLineData).payload,- record.threadId == metadata?.id,- record.sessionId == (metadata?.sessionId ?? metadata?.id),- !record.responseId.isEmpty, !record.rootTurnId.isEmpty,- !turnId.isEmpty, record.turnTokenUsage.isValid {+ record.threadID == metadata?.id,+ record.sessionID == (metadata?.sessionID ?? metadata?.id),+ !record.responseID.isEmpty, !record.rootTurnID.isEmpty,+ !turnID.isEmpty, record.turnTokenUsage.isValid {state.tokenUsage = record.turnTokenUsage- state.rootTurnId = record.rootTurnId+ state.rootTurnID = record.rootTurnID}- lifecycleByTurnId[turnId] = state+ lifecycleByTurnID[turnID] = state}}}@@ -318,44 +318,44 @@ private nonisolated struct SessionFileCursor {/// 损坏可能遮住 turn 边界, 只保留已明确结束的事实, 后续新 turn 独立建立覆盖mutating func markReadGap() {hasDecodeFailures = true- currentTurnId = nil- for turnId in lifecycleByTurnId.keys {- lifecycleByTurnId[turnId]?.tokenUsage = nil- if lifecycleByTurnId[turnId]?.terminal == nil {- lifecycleByTurnId[turnId]?.hasReadGap = true+ currentTurnID = nil+ for turnID in lifecycleByTurnID.keys {+ lifecycleByTurnID[turnID]?.tokenUsage = nil+ if lifecycleByTurnID[turnID]?.terminal == nil {+ lifecycleByTurnID[turnID]?.hasReadGap = true}}}mutating func apply(_ envelope: CodexRolloutLineEnvelope) {if envelope.startsTurnContext {- currentTurnId = envelope.payload?.turnId.flatMap { $0.isEmpty ? nil : $0 }- if let turnId = currentTurnId, let rootTurnId = envelope.payload?.rootTurnId, !rootTurnId.isEmpty {- var state = lifecycleByTurnId[turnId] ?? SessionTurnLifecycle()- state.rootTurnId = rootTurnId- lifecycleByTurnId[turnId] = state+ currentTurnID = envelope.payload?.turnID.flatMap { $0.isEmpty ? nil : $0 }+ if let turnID = currentTurnID, let rootTurnID = envelope.payload?.rootTurnID, !rootTurnID.isEmpty {+ var state = lifecycleByTurnID[turnID] ?? SessionTurnLifecycle()+ state.rootTurnID = rootTurnID+ lifecycleByTurnID[turnID] = state}}- if let event = envelope.progressEvent(currentTurnId: currentTurnId) {+ if let event = envelope.progressEvent(currentTurnID: currentTurnID) {apply(event)}if let event = envelope.lifecycleEvent {apply(event)}- if envelope.type == "turn_context", let turnId = currentTurnId {- var state = lifecycleByTurnId[turnId] ?? SessionTurnLifecycle()+ if envelope.type == "turn_context", let turnID = currentTurnID {+ var state = lifecycleByTurnID[turnID] ?? SessionTurnLifecycle()state.hasContext = true- lifecycleByTurnId[turnId] = state+ lifecycleByTurnID[turnID] = state}- if envelope.endsTurnContext, envelope.payload?.turnId == currentTurnId {- currentTurnId = nil+ if envelope.endsTurnContext, envelope.payload?.turnID == currentTurnID {+ currentTurnID = nil}}mutating func apply(_ event: SessionLifecycleEvent) {- var state = lifecycleByTurnId[event.turnId] ?? SessionTurnLifecycle()+ var state = lifecycleByTurnID[event.turnID] ?? SessionTurnLifecycle()state.apply(event.change)- lifecycleByTurnId[event.turnId] = state+ lifecycleByTurnID[event.turnID] = state}}@@ -371,8 +371,8 @@ nonisolated struct CodexRolloutLineEnvelope: Decodable {nonisolated struct CodexRolloutLinePayload: Decodable {let type: String?- let turnId: String?- let rootTurnId: String?+ let turnID: String?+ let rootTurnID: String?let messageMetadata: CodexRolloutMessageMetadata?let role: String?let startedAt: Double?@@ -391,8 +391,8 @@ nonisolated struct CodexRolloutLinePayload: Decodable {private enum CodingKeys: String, CodingKey {case type, role- case turnId = "turn_id"- case rootTurnId = "root_turn_id"+ case turnID = "turn_id"+ case rootTurnID = "root_turn_id"case messageMetadata = "internal_chat_message_metadata_passthrough"case startedAt = "started_at"case completedAt = "completed_at"@@ -403,10 +403,10 @@ nonisolated struct CodexRolloutLinePayload: Decodable {}nonisolated struct CodexRolloutMessageMetadata: Decodable {- let turnId: String?+ let turnID: String?private enum CodingKeys: String, CodingKey {- case turnId = "turn_id"+ case turnID = "turn_id"}}@@ -419,7 +419,7 @@ private nonisolated extension CodexRolloutLineEnvelope {type == "event_msg" && ["task_complete", "turn_complete", "turn_aborted"].contains(payload?.type ?? "")}- func progressEvent(currentTurnId: String?) -> SessionLifecycleEvent? {+ func progressEvent(currentTurnID: String?) -> SessionLifecycleEvent? {let progressTypes: Set = ["token_count", "item_completed", "agent_message", "agent_reasoning","task_started", "turn_started", "task_complete", "turn_complete", "turn_aborted"@@ -435,8 +435,8 @@ private nonisolated extension CodexRolloutLineEnvelope {return nil}- let explicitTurnId = type == "response_item" ? payload?.messageMetadata?.turnId : payload?.turnId- guard let turnId = explicitTurnId ?? currentTurnId, !turnId.isEmpty else {+ let explicitTurnID = type == "response_item" ? payload?.messageMetadata?.turnID : payload?.turnID+ guard let turnID = explicitTurnID ?? currentTurnID, !turnID.isEmpty else {return nil}let isExecutionProgress = if type == "response_item" {@@ -444,13 +444,13 @@ private nonisolated extension CodexRolloutLineEnvelope {} else {type == "event_msg" && ["agent_message", "agent_reasoning"].contains(payload?.type ?? "")}- return SessionLifecycleEvent(turnId: turnId, change: .progress(at: eventDate, resumesApproval: isExecutionProgress))+ return SessionLifecycleEvent(turnID: turnID, change: .progress(at: eventDate, resumesApproval: isExecutionProgress))}var lifecycleEvent: SessionLifecycleEvent? {guard let payload,- let turnId = payload.turnId,- !turnId.isEmpty else {+ let turnID = payload.turnID,+ !turnID.isEmpty else {return nil}@@ -460,7 +460,7 @@ private nonisolated extension CodexRolloutLineEnvelope {return nil}return SessionLifecycleEvent(- turnId: turnId,+ turnID: turnID,change: .context(approvalReviewer: payload.approvalReviewer,effort: effort,@@ -478,7 +478,7 @@ private nonisolated extension CodexRolloutLineEnvelope {guard let startedAt = payload.startedAt.flatMap(Self.date) else {return nil}- return SessionLifecycleEvent(turnId: turnId, change: .started(at: startedAt))+ return SessionLifecycleEvent(turnID: turnID, change: .started(at: startedAt))case "task_complete", "turn_complete":guard let completedAt = payload.completedAt.flatMap(Self.date) ?? timestamp.flatMap(CodexDateFormat.iso8601Date) else {return nil@@ -486,10 +486,10 @@ private nonisolated extension CodexRolloutLineEnvelope {let duration = payload.durationMilliseconds.flatMap { milliseconds inmilliseconds.isFinite && milliseconds >= 0 ? milliseconds / 1000 : nil}- return SessionLifecycleEvent(turnId: turnId, change: .completed(at: completedAt, duration: duration))+ return SessionLifecycleEvent(turnID: turnID, change: .completed(at: completedAt, duration: duration))case "turn_aborted":return SessionLifecycleEvent(- turnId: turnId,+ turnID: turnID,change: .aborted(at: timestamp.flatMap(CodexDateFormat.iso8601Date)))default:@@ -506,7 +506,7 @@ private nonisolated extension CodexRolloutLineEnvelope {}private nonisolated struct SessionLifecycleEvent {- let turnId: String+ let turnID: Stringlet change: SessionLifecycleChange}@@ -520,7 +520,7 @@ private nonisolated enum SessionLifecycleChange {private nonisolated struct SessionTurnLifecycle {var tokenUsage: CodexTokenUsage?- var rootTurnId: String?+ var rootTurnID: String?var hasReadGap = falsevar contextObservedAt: Date?var hasContext = false@@ -558,8 +558,8 @@ private nonisolated struct SessionTurnLifecycle {}nonisolated struct CodexSessionTaskLifecycleState {- let sessionId: String- let turnId: String+ let requestedThreadID: String+ let turnID: Stringlet startedAt: Date?let approvalReviewer: CodexApprovalReviewer?let effort: String?@@ -568,10 +568,10 @@ nonisolated struct CodexSessionTaskLifecycleState {var readStatus: CodexSessionReadStatus = .completevar hasContext = falsevar contextObservedAt: Date?- var rootTurnId: String?- var threadId: String?- var rootSessionId: String?- var parentThreadId: String?+ var rootTurnID: String?+ var recordedThreadID: String?+ var rootSessionID: String?+ var parentThreadID: String?var lastExecutionProgressAt: Date?var incompleteTailUnchangedSince: Date?var tokenUsage: CodexTokenUsage?diff --git a/CodexBar/Services/Workflow/CodexTokenHistoryStore.swift b/CodexBar/Services/Workflow/CodexTokenHistoryStore.swiftindex e4234b0..71ac25c 100644--- a/CodexBar/Services/Workflow/CodexTokenHistoryStore.swift+++ b/CodexBar/Services/Workflow/CodexTokenHistoryStore.swift@@ -40,14 +40,14 @@ actor CodexTokenHistoryStore {ledger.files.removeAll()}let cutoff = WorkflowStorage.retentionCutoffDate(today: now)- let files = rolloutFiles(since: cutoff)+ let files = rolloutFiles(since: cutoff).map { (url: $0, key: fileKey($0)) }var remaining = byteBudget// 每轮先处理上次尚未扫描的文件, 防止大型活跃文件让历史补读饥饿let ordered = files.map { file in(- url: file,- lastReadAt: ledger.files[fileKey(file)]?.lastReadAt ?? .distantPast,- modifiedAt: (try? file.resourceValues(forKeys: [.contentModificationDateKey]))?.contentModificationDate ?? .distantPast+ file: file,+ lastReadAt: ledger.files[file.key]?.lastReadAt ?? .distantPast,+ modifiedAt: (try? file.url.resourceValues(forKeys: [.contentModificationDateKey]))?.contentModificationDate ?? .distantPast)}.sorted { lhs, rhs inif lhs.lastReadAt != rhs.lastReadAt {@@ -57,17 +57,17 @@ actor CodexTokenHistoryStore {if lhs.modifiedAt != rhs.modifiedAt {return lhs.modifiedAt > rhs.modifiedAt}- return lhs.url.path < rhs.url.path- }.map(\.url)+ return lhs.file.url.path < rhs.file.url.path+ }.map(\.file)var results: [String: TokenHistoryScanResult] = [:]for file in ordered where remaining > 0 {try Task.checkCancellation()- results[fileKey(file)] = try scan(file, ledger: &ledger, remaining: &remaining, now: now, baseline: baseline)+ results[file.key] = try scan(file.url, key: file.key, ledger: &ledger, remaining: &remaining, now: now, baseline: baseline)}let roots = Set(ledger.turns.values.filter { $0.updatedAt >= cutoff }.map(\.rootID))ledger.turns = ledger.turns.filter { $0.value.updatedAt >= cutoff || roots.contains($0.key) }ledger.recoveryCutoffs = ledger.recoveryCutoffs?.filter { ledger.turns[$0.key] != nil }- let fileKeys = Set(files.map(fileKey))+ let fileKeys = Set(files.map(\.key))ledger.files = ledger.files.filter { fileKeys.contains($0.key) }try CodexTokenFileStorage.save(ledger, to: url)let progress = replayProgress(files: files, ledger: ledger, results: results, batchBytes: byteBudget - remaining, duration: duration)@@ -77,12 +77,11 @@ actor CodexTokenHistoryStore {}private func replayProgress(- files: [URL], ledger: TokenHistoryLedger, results: [String: TokenHistoryScanResult], batchBytes: Int, duration: LogDuration+ files: [(url: URL, key: String)], ledger: TokenHistoryLedger, results: [String: TokenHistoryScanResult], batchBytes: Int, duration: LogDuration) -> CodexTokenReplayProgress {var progress = CodexTokenReplayProgress(totalFiles: files.count, batchBytes: batchBytes, elapsed: duration.elapsed)- for file in files {- let key = fileKey(file)- guard let stat = WorkflowStorage.fileStat(at: file) else {+ for (url, key) in files {+ guard let stat = WorkflowStorage.fileStat(at: url) else {progress.unavailableFiles += 1continue}@@ -130,7 +129,7 @@ actor CodexTokenHistoryStore {@discardableResultprivate func scan(- _ url: URL, ledger: inout TokenHistoryLedger, remaining: inout Int, now: Date,+ _ url: URL, key: String? = nil, ledger: inout TokenHistoryLedger, remaining: inout Int, now: Date,snapshot: WorkflowFileStat? = nil, baseline: CodexTokenHistoryBaseline? = nil) throws -> TokenHistoryScanResult {guard let source = try openSource(url, snapshot: snapshot) else { return .unavailable }@@ -138,7 +137,7 @@ actor CodexTokenHistoryStore {defer { try? handle.close() }let size = snapshot?.size ?? source.stat.sizelet inode = source.stat.identifier- let key = fileKey(url)+ let key = key ?? fileKey(url)var cursor = ledger.files[key] ?? TokenHistoryCursor(inode: inode)if cursor.inode != inode || cursor.offset > size {cursor = TokenHistoryCursor(inode: inode)@@ -228,14 +227,14 @@ actor CodexTokenHistoryStore {}return nil}- return TokenHistoryReadSource(stat: stat, thread: thread, session: metadata.sessionId ?? thread, handle: handle)+ return TokenHistoryReadSource(stat: stat, thread: thread, session: metadata.sessionID ?? thread, handle: handle)}private func boundaryHash(_ handle: FileHandle, at offset: UInt64) throws -> String {let count = min(offset, 512)try handle.seek(toOffset: offset - count)let data = try handle.read(upToCount: Int(count)) ?? Data()- return SHA256.hash(data: data).map { String(format: "%02x", $0) }.joined()+ return CodexTokenTurn.hexString(SHA256.hash(data: data))}private func consume(@@ -245,12 +244,12 @@ actor CodexTokenHistoryStore {guard let envelope = try? JSONDecoder().decode(TokenHistoryLine.self, from: line) else { return }if envelope.type == "token_usage_record" {guard let payload = try? JSONDecoder().decode(CodexRolloutTokenUsageRecord.self, from: line).payload,- payload.threadId == thread, payload.sessionId == session,- !payload.turnId.isEmpty, !payload.rootTurnId.isEmpty, !payload.responseId.isEmpty,+ payload.threadID == thread, payload.sessionID == session,+ !payload.turnID.isEmpty, !payload.rootTurnID.isEmpty, !payload.responseID.isEmpty,payload.turnTokenUsage.isValid, let timestamp = envelope.date else { return }- let id = CodexTokenTurn.identifier(thread: thread, turn: payload.turnId)+ let id = CodexTokenTurn.identifier(thread: thread, turn: payload.turnID)var value = CodexTokenTurn(- id: id, rootID: CodexTokenTurn.identifier(thread: session, turn: payload.rootTurnId),+ id: id, rootID: CodexTokenTurn.identifier(thread: session, turn: payload.rootTurnID),startedAt: ledger.turns[id]?.startedAt, updatedAt: timestamp,usage: payload.turnTokenUsage, rebuiltAt: ledger.turns[id]?.rebuiltAt)@@ -262,7 +261,7 @@ actor CodexTokenHistoryStore {guard timestamp > (ledger.recoveryCutoffs?[id] ?? .distantPast) else { return }ledger.turns[id] = ledger.turns[id]?.merging(value) ?? value} else if envelope.type == "event_msg", ["task_started", "turn_started"].contains(envelope.payload?.type ?? ""),- let turn = envelope.payload?.turnId, !turn.isEmpty,+ let turn = envelope.payload?.turnID, !turn.isEmpty,let timestamp = envelope.payload?.startedAt.flatMap(TokenHistoryLine.eventDate) ?? envelope.date {let id = CodexTokenTurn.identifier(thread: thread, turn: turn)let value = CodexTokenTurn(@@ -277,7 +276,7 @@ actor CodexTokenHistoryStore {}private func fileKey(_ url: URL) -> String {- SHA256.hash(data: Data(url.path.utf8)).map { String(format: "%02x", $0) }.joined()+ CodexTokenTurn.hexString(SHA256.hash(data: Data(url.path.utf8)))}}@@ -383,7 +382,7 @@ private nonisolated enum CodexTokenRebuildError: LocalizedError {var errorDescription: String? {switch self {case .sourceChanged: String(localized: "workflow.rebuild.error.source-changed")- case .alreadyRunning: String(localized: "workflow.rebuild.error.already-running")+ case .alreadyRunning: String(localized: "workflow.rebuild.error.token-history-already-running")}}}@@ -507,11 +506,11 @@ private nonisolated struct TokenHistoryLine: Decodable {private nonisolated struct TokenHistoryEvent: Decodable {let type: String?- let turnId: String?+ let turnID: String?let startedAt: Double?enum CodingKeys: String, CodingKey {case type- case turnId = "turn_id"+ case turnID = "turn_id"case startedAt = "started_at"}}@@ -550,6 +549,48 @@ nonisolated enum CodexTokenFileStorage {}static func save(_ value: some Encodable, to url: URL) throws {- try JSONLines.stableEncoder.encode(value).write(to: url, options: .atomic)+ let data = try JSONLines.stableEncoder.encode(value)+ guard (try? Data(contentsOf: url)) != data else { return }+ try data.write(to: url, options: .atomic)+ }+}++/// 调用方持有文件锁, 每次核对磁盘字节后复用解码结果, 不依赖 mtime 判断跨进程修改+nonisolated struct CodexTokenFileCache<Value: Codable & Equatable> {+ let url: URL+ private var data: Data?+ private var value: Value?++ init(url: URL) {+ self.url = url+ }++ mutating func load() throws -> Value? {+ guard FileManager.default.fileExists(atPath: url.path) else {+ data = nil+ value = nil+ return nil+ }+ let current = try Data(contentsOf: url)+ if current == data {+ return value+ }+ let decoded = try JSONDecoder().decode(Value.self, from: current)+ data = current+ value = decoded+ return decoded+ }++ mutating func save(_ updated: Value) throws {+ let current = try? Data(contentsOf: url)+ if let current, current == data, updated == value {+ return+ }+ let encoded = try JSONLines.stableEncoder.encode(updated)+ if current != encoded {+ try encoded.write(to: url, options: .atomic)+ }+ data = encoded+ value = updated}}diff --git a/CodexBar/Services/Workflow/CodexTokenHistorySync.swift b/CodexBar/Services/Workflow/CodexTokenHistorySync.swiftindex e97caf3..2c12fb0 100644--- a/CodexBar/Services/Workflow/CodexTokenHistorySync.swift+++ b/CodexBar/Services/Workflow/CodexTokenHistorySync.swift@@ -5,29 +5,31 @@ import Foundationactor CodexTokenHistorySync {private let database: CKDatabaseprivate let directoryURL: URL+ private var fileCache: CodexTokenFileCache<TokenSyncCache>static let recordType = "CodexBarTokenTurn"private static let currentSchema = 1init(database: CKDatabase, directoryURL: URL) {self.database = databaseself.directoryURL = directoryURL+ fileCache = CodexTokenFileCache(url: directoryURL.appendingPathComponent("cache.json"))}- func recoveryBaseline(accountID: String?) -> CodexTokenHistoryBaseline? {- guard let accountID, let cache = try? load(), cache.accountID == accountID else { return nil }+ func recoveryBaseline(accountScopedDeviceID: String?) -> CodexTokenHistoryBaseline? {+ guard let accountScopedDeviceID, let cache = try? load(), cache.accountScopedDeviceID == accountScopedDeviceID else { return nil }return CodexTokenHistoryBaseline(salt: cache.salt, turns: cache.turns)}- func snapshot(local: [CodexTokenTurn], accountID: String?) -> [String: CodexTokenUsage] {- guard let cache = try? load(), cache.accountID == accountID else {+ func snapshot(local: [CodexTokenTurn], accountScopedDeviceID: String?) -> [String: CodexTokenUsage] {+ guard let cache = try? load(), cache.accountScopedDeviceID == accountScopedDeviceID else {return CodexTokenTurn.dailyUsage(local)}- return CodexTokenTurn.dailyUsage(local.map { $0.pseudonymized(salt: cache.salt) } + Array(cache.turns.values))+ return CodexTokenTurn.dailyUsage(CodexTokenTurn.pseudonymized(local, salt: cache.salt) + Array(cache.turns.values))}- func hasPendingUpdates(local: [CodexTokenTurn], accountID: String?) -> Bool {+ func hasPendingUpdates(local: [CodexTokenTurn], accountScopedDeviceID: String?) -> Bool {let records = CodexTokenTurn.syncable(local)- guard let cache = try? load(), cache.accountID == accountID else { return !records.isEmpty }+ guard let cache = try? load(), cache.accountScopedDeviceID == accountScopedDeviceID else { return !records.isEmpty }return records.contains { turn inlet candidate = turn.pseudonymized(salt: cache.salt)guard let remote = cache.turns[candidate.id] else { return true }@@ -35,13 +37,13 @@ actor CodexTokenHistorySync {}}- func synchronize(local: [CodexTokenTurn], accountID: String, salt: Data, zoneID: CKRecordZone.ID) async throws {+ func synchronize(local: [CodexTokenTurn], accountScopedDeviceID: String, salt: Data, zoneID: CKRecordZone.ID) async throws {// 整轮同步共用非阻塞锁, 防止另一个进程用较早的快照覆盖游标, 界面读取不等待网络guard let lock = try CodexTokenFileStorage.acquireLock(in: directoryURL, name: "sync.lock", nonblocking: true) else { return }defer { CodexTokenFileStorage.releaseLock(lock) }- var cache = try load() ?? TokenSyncCache(accountID: accountID, salt: salt)- if cache.accountID != accountID || cache.salt != salt {- cache = TokenSyncCache(accountID: accountID, salt: salt)+ var cache = try load() ?? TokenSyncCache(accountScopedDeviceID: accountScopedDeviceID, salt: salt)+ if cache.accountScopedDeviceID != accountScopedDeviceID || cache.salt != salt {+ cache = TokenSyncCache(accountScopedDeviceID: accountScopedDeviceID, salt: salt)}do {try await fetch(into: &cache, zoneID: zoneID)@@ -80,7 +82,7 @@ actor CodexTokenHistorySync {}private func upload(local: [CodexTokenTurn], cache: inout TokenSyncCache, zoneID: CKRecordZone.ID) async throws {- let pending = CodexTokenTurn.syncable(local).map { $0.pseudonymized(salt: cache.salt) }+ let pending = CodexTokenTurn.pseudonymized(CodexTokenTurn.syncable(local), salt: cache.salt).filter { candidate inguard let remote = cache.turns[candidate.id] else { return true }return remote.merging(candidate) != remote@@ -157,7 +159,7 @@ actor CodexTokenHistorySync {private func load() throws -> TokenSyncCache? {try CodexTokenFileStorage.withLock(in: directoryURL) {- let cache = try CodexTokenFileStorage.load(TokenSyncCache.self, from: directoryURL.appendingPathComponent("cache.json"))+ let cache = try fileCache.load()guard cache == nil || cache?.schema == TokenSyncCache.currentSchema else { throw CocoaError(.fileReadCorruptFile) }return cache}@@ -165,7 +167,7 @@ actor CodexTokenHistorySync {private func save(_ cache: TokenSyncCache) throws {try CodexTokenFileStorage.withLock(in: directoryURL) {- try CodexTokenFileStorage.save(cache, to: directoryURL.appendingPathComponent("cache.json"))+ try fileCache.save(cache)}}@@ -207,13 +209,19 @@ actor CodexTokenHistorySync {}}-private nonisolated struct TokenSyncCache: Codable {+private nonisolated struct TokenSyncCache: Codable, Equatable {static let currentSchema = 1var schema = currentSchema- let accountID: String+ let accountScopedDeviceID: Stringlet salt: Datavar turns: [String: CodexTokenTurn] = [:]var cursor: Data?++ private enum CodingKeys: String, CodingKey {+ case schema+ case accountScopedDeviceID = "accountID"+ case salt, turns, cursor+ }}private nonisolated enum TokenHistorySyncError: Error {diff --git a/CodexBar/Services/Workflow/HookEventTailReader.swift b/CodexBar/Services/Workflow/HookEventTailReader.swiftindex ec2cea6..39a76fa 100644--- a/CodexBar/Services/Workflow/HookEventTailReader.swift+++ b/CodexBar/Services/Workflow/HookEventTailReader.swift@@ -432,10 +432,10 @@ actor HookEventTailReader {for event in JSONLines.decode(WorkflowHookEvent.self, from: completeData)where event.hookEvent == .userPromptSubmit && event.timestamp < cutoff {- guard let sessionId = event.sessionId, let turnId = event.turnId else {+ guard let sessionID = event.sessionID, let turnID = event.turnID else {continue}- let key = CodexActivityPromptReference(sessionId: sessionId, turnId: turnId)+ let key = CodexActivityPromptReference(sessionID: sessionID, turnID: turnID)guard unresolvedKeys.remove(key) != nil else {continue}diff --git a/CodexBar/Services/Workflow/WorkflowHookEventRecorder.swift b/CodexBar/Services/Workflow/WorkflowHookEventRecorder.swiftindex 76436e1..f30dc12 100644--- a/CodexBar/Services/Workflow/WorkflowHookEventRecorder.swift+++ b/CodexBar/Services/Workflow/WorkflowHookEventRecorder.swift@@ -42,9 +42,9 @@ nonisolated enum WorkflowHookEventRecorder {let tool = payload.string(for: "tool_name")let model = payload.string(for: "model")let permission = payload.string(for: "permission_mode")- let sessionId = payload.string(for: "session_id")- let turnId = payload.string(for: "turn_id")- let agentId = payload.string(for: "agent_id")+ let sessionID = payload.string(for: "session_id")+ let turnID = payload.string(for: "turn_id")+ let agentID = payload.string(for: "agent_id")let transcriptPath = payload.string(for: "transcript_path")let sourcePath = hookEvent == .subagentStop? payload.string(for: "agent_transcript_path") : transcriptPath@@ -52,7 +52,7 @@ nonisolated enum WorkflowHookEventRecorder {let turnContext = readTurnContext(transcriptPath: transcriptPath,hookEvent: hookEvent,- turnId: turnId+ turnID: turnID)let event = WorkflowHookEvent(timestamp: timestamp,@@ -64,9 +64,9 @@ nonisolated enum WorkflowHookEventRecorder {effort: turnContext?.effort,permissionMode: permission,approvalReviewer: turnContext?.approvalReviewer,- sessionId: sessionId,- turnId: turnId,- agentId: agentId+ sessionID: sessionID,+ turnID: turnID,+ agentID: agentID)try recordWorkflowTransaction(@@ -78,17 +78,17 @@ nonisolated enum WorkflowHookEventRecorder {private static func readTurnContext(transcriptPath: String?,hookEvent: CodexHookEvent?,- turnId: String?+ turnID: String?) -> WorkflowTurnContext? {guard let hookEvent,hookEvent == .userPromptSubmit || hookEvent == .permissionRequest,- let turnId,+ let turnID,let transcriptPath else {return nil}return WorkflowTurnContextReader.context(transcriptPath: transcriptPath,- turnId: turnId+ turnID: turnID)}@@ -301,24 +301,24 @@ private nonisolated struct WorkflowRolloutMetadataEnvelope: Decodable {nonisolated struct WorkflowRolloutMetadataPayload: Decodable {let id: String?- let sessionId: String?- private let explicitParentThreadId: String?- var parentThreadId: String? {- explicitParentThreadId ?? source?.parentThreadId+ let sessionID: String?+ private let explicitParentThreadID: String?+ var parentThreadID: String? {+ explicitParentThreadID ?? source?.parentThreadID}let source: WorkflowRolloutSource?private enum CodingKeys: String, CodingKey {case id, source- case sessionId = "session_id"- case explicitParentThreadId = "parent_thread_id"+ case sessionID = "session_id"+ case explicitParentThreadID = "parent_thread_id"}}nonisolated struct WorkflowRolloutSource: Decodable {let origin: WorkflowEventOrigin- var parentThreadId: String?+ var parentThreadID: String?init(from decoder: Decoder) throws {if let name = try? decoder.singleValueContainer().decode(String.self) {@@ -333,7 +333,7 @@ nonisolated struct WorkflowRolloutSource: Decodable {if let subagentKey = container.allKeys.first(where: { $0.stringValue == "subagent" }) {let subagent = try? container.decode(WorkflowRolloutSubagentSource.self, forKey: subagentKey)origin = subagent?.origin ?? .unknown- parentThreadId = subagent?.parentThreadId+ parentThreadID = subagent?.parentThreadIDreturn}if let customKey = container.allKeys.first(where: { $0.stringValue == "custom" }),@@ -355,7 +355,7 @@ nonisolated struct WorkflowRolloutSource: Decodable {private nonisolated struct WorkflowRolloutSubagentSource: Decodable {let origin: WorkflowEventOrigin- var parentThreadId: String?+ var parentThreadID: String?init(from decoder: Decoder) throws {if let name = try? decoder.singleValueContainer().decode(String.self) {@@ -371,7 +371,7 @@ private nonisolated struct WorkflowRolloutSubagentSource: Decodable {if let spawnKey = container.allKeys.first(where: { $0.stringValue == "thread_spawn" }),let spawn = try? container.nestedContainer(keyedBy: WorkflowRolloutSourceKey.self, forKey: spawnKey),let parentKey = spawn.allKeys.first(where: { $0.stringValue == "parent_thread_id" }) {- parentThreadId = try? spawn.decode(String.self, forKey: parentKey)+ parentThreadID = try? spawn.decode(String.self, forKey: parentKey)}if let otherKey = container.allKeys.first(where: { $0.stringValue == "other" }) {guard let name = try? container.decode(String.self, forKey: otherKey),@@ -403,7 +403,7 @@ private nonisolated struct WorkflowRolloutSourceKey: CodingKey {private nonisolated enum WorkflowTurnContextReader {static func context(transcriptPath: String,- turnId: String+ turnID: String) -> WorkflowTurnContext? {let url = URL(fileURLWithPath: transcriptPath)let size = WorkflowStorage.fileSize(at: url)@@ -428,7 +428,7 @@ private nonisolated enum WorkflowTurnContextReader {.reversed() {guard envelope.type == "turn_context",let payload = envelope.payload,- payload.turnId == turnId else {+ payload.turnID == turnID else {continue}return WorkflowTurnContext(diff --git a/CodexBar/Services/Workflow/WorkflowService.swift b/CodexBar/Services/Workflow/WorkflowService.swiftindex 4227595..315e417 100644--- a/CodexBar/Services/Workflow/WorkflowService.swift+++ b/CodexBar/Services/Workflow/WorkflowService.swift@@ -108,7 +108,7 @@ actor WorkflowService {var snapshot = WorkflowSnapshot(localAggregates: localAggregates,syncedRecords: syncSnapshot.records,- currentDeviceId: syncSnapshot.currentDeviceId+ currentDeviceID: syncSnapshot.currentDeviceID)snapshot.tokenUsageByDate = syncSnapshot.tokenUsageByDate ?? CodexTokenTurn.dailyUsage(tokenTurns)return snapshotdiff --git a/CodexBar/Services/Workflow/WorkflowSyncService.swift b/CodexBar/Services/Workflow/WorkflowSyncService.swiftindex 8185d3f..7ccc969 100644--- a/CodexBar/Services/Workflow/WorkflowSyncService.swift+++ b/CodexBar/Services/Workflow/WorkflowSyncService.swift@@ -83,11 +83,11 @@ actor WorkflowSyncService {func tokenRecoveryBaselineIfEnabled() async -> CodexTokenHistoryBaseline? {guard WorkflowSyncSettings.isEnabled() else { return nil }- return await tokenHistorySync.recoveryBaseline(accountID: loadState().deviceId)+ return await tokenHistorySync.recoveryBaseline(accountScopedDeviceID: loadState().deviceID)}func hasPendingTokenUpdates(local: [CodexTokenTurn]) async -> Bool {- await tokenHistorySync.hasPendingUpdates(local: local, accountID: loadState().deviceId)+ await tokenHistorySync.hasPendingUpdates(local: local, accountScopedDeviceID: loadState().deviceID)}func synchronizeIfEnabled(@@ -119,15 +119,15 @@ actor WorkflowSyncService {do {try await ensureSyncZoneExists()stage = .device- let deviceId = try await resolveCurrentDeviceId()- try resetStateIfDeviceChanged(deviceId, state: &state)+ let deviceID = try await resolveCurrentDeviceID()+ try resetStateIfDeviceChanged(deviceID, state: &state)try await migrateStateIfNeeded(&state)stage = .fetchlet localByDate = Self.syncedAggregatesByDate(localAggregates)try await refreshCacheBeforeUpload(localByDate: localByDate,- deviceId: deviceId,+ deviceID: deviceID,state: &state)@@ -145,11 +145,11 @@ actor WorkflowSyncService {try await refreshCacheFromRemote()stage = .tokenstry await tokenHistorySync.synchronize(- local: localTokenTurns, accountID: deviceId, salt: accountSalt(), zoneID: syncZoneID+ local: localTokenTurns, accountScopedDeviceID: deviceID, salt: accountSalt(), zoneID: syncZoneID)stage = .prunelet deletedCount = try await pruneCurrentDeviceRecordsIfNeeded(- deviceId: deviceId,+ deviceID: deviceID,state: &state)try saveState(state)@@ -227,7 +227,7 @@ actor WorkflowSyncService {private func refreshCacheBeforeUpload(localByDate: [String: LocalSyncAggregate],- deviceId: String,+ deviceID: String,state: inout WorkflowSyncState) async throws {guard !state.replacementDates.isEmpty else {@@ -239,7 +239,7 @@ actor WorkflowSyncService {try await rebuildCacheFromRemote()try await preparePendingReplacements(localByDate: localByDate,- deviceId: deviceId,+ deviceID: deviceID,state: &state)}@@ -256,10 +256,10 @@ actor WorkflowSyncService {}private func resetStateIfDeviceChanged(- _ deviceId: String,+ _ deviceID: String,state: inout WorkflowSyncState) throws {- guard state.deviceId != deviceId else {+ guard state.deviceID != deviceID else {return}@@ -267,7 +267,7 @@ actor WorkflowSyncService {try saveCachedRecords([])let resetState = WorkflowSyncState(- deviceId: deviceId,+ deviceID: deviceID,replacementDates: state.replacementDates)try saveState(resetState)@@ -286,19 +286,19 @@ actor WorkflowSyncService {}private func snapshot(from state: WorkflowSyncState, localTokenTurns: [CodexTokenTurn]) async -> WorkflowSyncSnapshot {- guard let deviceId = state.deviceId else {+ guard let deviceID = state.deviceID else {return .disabled}let replacementDates = Set(state.replacementDates)let records = Self.filteredRetained(records: loadCachedRecords()).filter { record in- record.deviceId != deviceId || !replacementDates.contains(record.date)+ record.deviceID != deviceID || !replacementDates.contains(record.date)}return await WorkflowSyncSnapshot(records: records,- currentDeviceId: deviceId,- tokenUsageByDate: tokenHistorySync.snapshot(local: localTokenTurns, accountID: deviceId)+ currentDeviceID: deviceID,+ tokenUsageByDate: tokenHistorySync.snapshot(local: localTokenTurns, accountScopedDeviceID: deviceID))}}@@ -351,7 +351,7 @@ private extension WorkflowSyncService {enum FieldKeys {static let salt = "salt"static let schemaVersion = "schemaVersion"- static let deviceId = "deviceId"+ static let deviceID = "deviceId"static let date = "date"static let sourceGeneration = "sourceGeneration"static let eventCount = "eventCount"@@ -407,7 +407,7 @@ private extension WorkflowSyncService {remoteRecords: [WorkflowSyncedDailyRecord],state: inout WorkflowSyncState) async throws -> Set<String> {- guard let deviceId = state.deviceId else {+ guard let deviceID = state.deviceID else {return []}@@ -442,7 +442,7 @@ private extension WorkflowSyncService {do {confirmedBatch = try await processUploadBatch(batch,- deviceId: deviceId,+ deviceID: deviceID,remoteRecords: remoteRecords)} catch {@@ -469,7 +469,7 @@ private extension WorkflowSyncService {func preparePendingReplacements(localByDate: [String: LocalSyncAggregate],- deviceId: String,+ deviceID: String,state: inout WorkflowSyncState) async throws {let replacementDates = Set(state.replacementDates).intersection(localByDate.keys)@@ -479,23 +479,23 @@ private extension WorkflowSyncService {let cachedRecords = loadCachedRecords()let recordsToReplace = cachedRecords.filter {- $0.deviceId == deviceId && replacementDates.contains($0.date)+ $0.deviceID == deviceID && replacementDates.contains($0.date)}var recordIDs = Set(recordsToReplace.map {CKRecord.ID(recordName: $0.id, zoneID: syncZoneID)})for date in replacementDates {- recordIDs.insert(recordID(deviceId: deviceId, date: date))+ recordIDs.insert(recordID(deviceID: deviceID, date: date))if let generation = localByDate[date]?.aggregate.sourceGeneration {- recordIDs.insert(recordID(deviceId: deviceId, date: date, generation: generation))+ recordIDs.insert(recordID(deviceID: deviceID, date: date, generation: generation))}}try await deleteRecords(Array(recordIDs))try saveCachedRecords(cachedRecords.filter {- $0.deviceId != deviceId || !replacementDates.contains($0.date)+ $0.deviceID != deviceID || !replacementDates.contains($0.date)})for date in replacementDates {state.hashByDate.removeValue(forKey: date)@@ -578,7 +578,7 @@ private extension WorkflowSyncService {/// 远端已有更完整的同源聚合, 或者同日已有记录且本地不是新鲜来源时都不覆盖private func resolveUploadTarget(_ pendingRecord: PendingRecord,- deviceId: String,+ deviceID: String,remoteRecords: [WorkflowSyncedDailyRecord],existingRecords: [CKRecord.ID: Result<CKRecord, any Error>]) throws -> UploadTarget {@@ -611,7 +611,7 @@ private extension WorkflowSyncService {// 上面两个分支都用不到它; 放在早退之后, 命中缓存的那些 pending 就不必扫一遍全量远端记录var knownRemoteRecords = remoteRecords.filter {- $0.deviceId == deviceId && $0.date == pendingRecord.upload.date+ $0.deviceID == deviceID && $0.date == pendingRecord.upload.date}for record in fetchedRecords.compactMap({ Self.remoteDailyRecord(from: $0) })where !knownRemoteRecords.contains(where: { $0.id == record.id }) {@@ -639,15 +639,15 @@ private extension WorkflowSyncService {func processUploadBatch(_ pendingUploads: [PendingUpload],- deviceId: String,+ deviceID: String,remoteRecords: [WorkflowSyncedDailyRecord]) async throws -> [ConfirmedHash] {let pendingRecords: [PendingRecord] = pendingUploads.map { upload inPendingRecord(upload: upload,- legacyRecordID: recordID(deviceId: deviceId, date: upload.date),+ legacyRecordID: recordID(deviceID: deviceID, date: upload.date),generationRecordID: upload.aggregate.sourceGeneration.map { generation in- recordID(deviceId: deviceId, date: upload.date, generation: generation)+ recordID(deviceID: deviceID, date: upload.date, generation: generation)})}@@ -661,7 +661,7 @@ private extension WorkflowSyncService {for pendingRecord in pendingRecords {switch try resolveUploadTarget(pendingRecord,- deviceId: deviceId,+ deviceID: deviceID,remoteRecords: remoteRecords,existingRecords: existingRecords) {@@ -674,7 +674,7 @@ private extension WorkflowSyncService {))case let .save(record):- apply(pendingRecord.upload.aggregate, deviceId: deviceId, to: record)+ apply(pendingRecord.upload.aggregate, deviceID: deviceID, to: record)recordsToSave.append(RecordToSave(upload: pendingRecord.upload, record: record))@@ -786,7 +786,7 @@ private extension WorkflowSyncService {predicate: NSPredicate(format: "TRUEPREDICATE"))query.sortDescriptors = [- NSSortDescriptor(key: FieldKeys.deviceId, ascending: true),+ NSSortDescriptor(key: FieldKeys.deviceID, ascending: true),NSSortDescriptor(key: FieldKeys.date, ascending: true)]@@ -795,15 +795,15 @@ private extension WorkflowSyncService {}func fetchCurrentDeviceRecordIDsToPrune(- deviceId: String,+ deviceID: String,cutoffKey: String) async throws -> [CKRecord.ID] {let query = CKQuery(recordType: RecordTypes.dailyAggregate,predicate: NSPredicate(format: "%K == %@",- FieldKeys.deviceId,- deviceId+ FieldKeys.deviceID,+ deviceID))@@ -894,7 +894,7 @@ private extension WorkflowSyncService {@discardableResultfunc pruneCurrentDeviceRecordsIfNeeded(- deviceId: String,+ deviceID: String,state: inout WorkflowSyncState) async throws -> Int {let today = WorkflowStorage.dateKey(for: Date())@@ -907,7 +907,7 @@ private extension WorkflowSyncService {state.replacementDates.removeAll { $0 < cutoffKey }var recordIDs = try await Set(fetchCurrentDeviceRecordIDsToPrune(- deviceId: deviceId,+ deviceID: deviceID,cutoffKey: cutoffKey))@@ -915,7 +915,7 @@ private extension WorkflowSyncService {recordIDs.insert(CKRecord.ID(recordName: WorkflowSyncedDailyRecord.legacyRecordName(- deviceId: deviceId,+ deviceID: deviceID,date: date),zoneID: syncZoneID@@ -938,7 +938,7 @@ private extension WorkflowSyncService {// MARK: - 账号与设备标识- func resolveCurrentDeviceId() async throws -> String {+ func resolveCurrentDeviceID() async throws -> String {let salt = try await accountSalt()let uuid = try Self.ioPlatformUUID()let mac = HMAC<SHA256>.authenticationCode(@@ -1046,11 +1046,11 @@ private extension WorkflowSyncService {func apply(_ aggregate: WorkflowSyncedDailyAggregate,- deviceId: String,+ deviceID: String,to record: CKRecord) {record[FieldKeys.schemaVersion] = Metrics.syncSchemaVersion as CKRecordValue- record[FieldKeys.deviceId] = deviceId as CKRecordValue+ record[FieldKeys.deviceID] = deviceID as CKRecordValuerecord[FieldKeys.date] = aggregate.date as CKRecordValuerecord[FieldKeys.sourceGeneration] = aggregate.sourceGeneration as CKRecordValue?record[FieldKeys.eventCount] = aggregate.eventCount as CKRecordValue?@@ -1073,28 +1073,28 @@ private extension WorkflowSyncService {record[FieldKeys.updatedAt] = Date() as CKRecordValue}- func recordID(deviceId: String, date: String) -> CKRecord.ID {- recordID(deviceId: deviceId, date: date, generation: nil)+ func recordID(deviceID: String, date: String) -> CKRecord.ID {+ recordID(deviceID: deviceID, date: date, generation: nil)}func recordID(- deviceId: String,+ deviceID: String,date: String,generation: String?) -> CKRecord.ID {CKRecord.ID(- recordName: recordName(deviceId: deviceId, date: date, generation: generation),+ recordName: recordName(deviceID: deviceID, date: date, generation: generation),zoneID: syncZoneID)}func recordName(- deviceId: String,+ deviceID: String,date: String,generation: String?) -> String {let legacyName = WorkflowSyncedDailyRecord.legacyRecordName(- deviceId: deviceId,+ deviceID: deviceID,date: date)return generation.map { "\(legacyName)_\($0)" } ?? legacyName@@ -1188,13 +1188,13 @@ private extension WorkflowSyncService {let encoder = JSONLines.stableEncoderlet data = try records.sorted { lhs, rhs in- if lhs.deviceId == rhs.deviceId {+ if lhs.deviceID == rhs.deviceID {if lhs.date == rhs.date {return lhs.id < rhs.id}return lhs.date < rhs.date}- return lhs.deviceId < rhs.deviceId+ return lhs.deviceID < rhs.deviceID}.reduce(into: Data()) { result, record intry result.append(encoder.encode(record))@@ -1246,7 +1246,7 @@ private extension WorkflowSyncService {static func remoteDailyRecord(from record: CKRecord) -> WorkflowSyncedDailyRecord? {guard record.recordType == RecordTypes.dailyAggregate,- let deviceId = record[FieldKeys.deviceId] as? String,+ let deviceID = record[FieldKeys.deviceID] as? String,let date = record[FieldKeys.date] as? String,WorkflowStorage.isValidDateKey(date) else {return nil@@ -1275,7 +1275,7 @@ private extension WorkflowSyncService {)return WorkflowSyncedDailyRecord(- deviceId: deviceId,+ deviceID: deviceID,daily: aggregate,updatedAt: record[FieldKeys.updatedAt] as? Date ?? record.modificationDate,recordName: record.recordID.recordName@@ -1378,10 +1378,10 @@ private extension WorkflowSyncService {/// currentDeviceId 用于展示时替换本机云端副本, 避免重复计数nonisolated struct WorkflowSyncSnapshot: Equatable {let records: [WorkflowSyncedDailyRecord]- let currentDeviceId: String?+ let currentDeviceID: String?var tokenUsageByDate: [String: CodexTokenUsage]?- static let disabled = WorkflowSyncSnapshot(records: [], currentDeviceId: nil)+ static let disabled = WorkflowSyncSnapshot(records: [], currentDeviceID: nil)}private nonisolated struct WorkflowSyncState: Codable, Equatable {@@ -1393,7 +1393,7 @@ private nonisolated struct WorkflowSyncState: Codable, Equatable {}var schema: Int- var deviceId: String?+ var deviceID: String?var hashByDate: [String: String]var replacementDates: [String]var lastUploadAt: Date?@@ -1401,14 +1401,14 @@ private nonisolated struct WorkflowSyncState: Codable, Equatable {init(schema: Int = Self.currentSchema,- deviceId: String? = nil,+ deviceID: String? = nil,hashByDate: [String: String] = [:],replacementDates: [String] = [],lastUploadAt: Date? = nil,lastPrunedDate: String? = nil) {self.schema = schema- self.deviceId = deviceId+ self.deviceID = deviceIDself.hashByDate = hashByDateself.replacementDates = replacementDatesself.lastUploadAt = lastUploadAt@@ -1419,7 +1419,7 @@ private nonisolated struct WorkflowSyncState: Codable, Equatable {let container = try decoder.container(keyedBy: CodingKeys.self)schema = try container.decodeIfPresent(Int.self, forKey: .schema) ?? Self.currentSchema- deviceId = try container.decodeIfPresent(String.self, forKey: .deviceId)+ deviceID = try container.decodeIfPresent(String.self, forKey: .deviceID)hashByDate = try container.decodeIfPresent([String: String].self, forKey: .hashByDate)?? [:]let decodedReplacementDates = try container.decodeIfPresent(@@ -1435,7 +1435,7 @@ private nonisolated struct WorkflowSyncState: Codable, Equatable {private enum CodingKeys: String, CodingKey {case schema- case deviceId+ case deviceID = "deviceId"case hashByDatecase replacementDatescase lastUploadAtdiff --git a/CodexBar/Views/Menu/CodexActivityCard.swift b/CodexBar/Views/Menu/CodexActivityCard.swiftindex 9c29256..2d8445f 100644--- a/CodexBar/Views/Menu/CodexActivityCard.swift+++ b/CodexBar/Views/Menu/CodexActivityCard.swift@@ -165,8 +165,8 @@ struct CodexActivityCard: View {tokenMetric("activity.tokens.total", tokens: usage.totalTokens)tokenMetric("activity.tokens.input", tokens: usage.inputTokens)tokenMetric("activity.tokens.output", tokens: usage.outputTokens)- tokenMetric("activity.tokens.cached-read", tokens: usage.cachedInputTokens)- tokenMetric("activity.tokens.cache-write", tokens: usage.cacheWriteInputTokens)+ tokenMetric("activity.tokens.cached-input", tokens: usage.cachedInputTokens)+ tokenMetric("activity.tokens.cache-write-input", tokens: usage.cacheWriteInputTokens)VStack(spacing: 3) {Text("activity.tokens.cache-hit-rate").font(.caption2)@@ -178,7 +178,7 @@ struct CodexActivityCard: View {.contentTransition(.numericText(value: usage.cacheHitRate ?? 0))}.frame(minWidth: 0, maxWidth: .infinity)- tokenMetric("activity.tokens.reasoning", tokens: usage.reasoningOutputTokens)+ tokenMetric("activity.tokens.reasoning-output", tokens: usage.reasoningOutputTokens)}.lineLimit(1).animation(.codexStatus, value: usage)diff --git a/CodexBar/Views/Menu/CodexActivityCenterView.swift b/CodexBar/Views/Menu/CodexActivityCenterView.swiftindex 01a0bc4..c9fed8c 100644--- a/CodexBar/Views/Menu/CodexActivityCenterView.swift+++ b/CodexBar/Views/Menu/CodexActivityCenterView.swift@@ -336,7 +336,7 @@ struct CodexActivityCenterView: View {text: detail,tint: tint,effect: presentationState.isPresented- && mainPanelSettings.areEntranceAnimationsEnabled+ && mainPanelSettings.areAnimationsEnabled? effect : .none)if let tokenUsage {diff --git a/CodexBar/Views/Menu/CodexStatusMenuSections.swift b/CodexBar/Views/Menu/CodexStatusMenuSections.swiftindex 2a0d6bc..c7d0b10 100644--- a/CodexBar/Views/Menu/CodexStatusMenuSections.swift+++ b/CodexBar/Views/Menu/CodexStatusMenuSections.swift@@ -275,7 +275,7 @@ struct UpdatedAtRow: View {color: .blue)- Text("usage.status.updated")+ Text("usage.status.last-updated").foregroundStyle(Self.secondaryTextColor)Text(Self.timeFormatter.string(from: snapshot.generatedAt))diff --git a/CodexBar/Views/Menu/CodexStatusMenuView.swift b/CodexBar/Views/Menu/CodexStatusMenuView.swiftindex 0226c01..59e329d 100644--- a/CodexBar/Views/Menu/CodexStatusMenuView.swift+++ b/CodexBar/Views/Menu/CodexStatusMenuView.swift@@ -56,11 +56,11 @@ struct CodexStatusMenuView: View {}.environment(\.mainPanelAnimationsEnabled,- animationState.allowsAnimations && mainPanelSettings.areEntranceAnimationsEnabled+ animationState.allowsAnimations && mainPanelSettings.areAnimationsEnabled).environment(\.mainPanelEntranceAnimationsEnabled,- mainPanelSettings.areEntranceAnimationsEnabled+ mainPanelSettings.areAnimationsEnabled).padding(Metrics.padding).liquidGlassSurface(cornerRadius: Metrics.surfaceCornerRadius, isOuterSurface: true)diff --git a/CodexBar/Views/Menu/UsageHeatmap.swift b/CodexBar/Views/Menu/UsageHeatmap.swiftindex cc6ba53..4bf5726 100644--- a/CodexBar/Views/Menu/UsageHeatmap.swift+++ b/CodexBar/Views/Menu/UsageHeatmap.swift@@ -119,7 +119,7 @@ struct UsageSummaryView: View {value: Self.dayText(usage?.summary.longestStreakDays))textMetric(- label: "usage.summary.longest-chat",+ label: "usage.summary.longest-turn-duration",value: Self.durationText(seconds: usage?.summary.longestRunningTurnSec))}@@ -669,8 +669,8 @@ struct UsageHeatmapDayDetailView: View {dailyTokenRow("activity.tokens.total", tokens: usage?.totalTokens, tint: .blue)dailyTokenRow("activity.tokens.input", tokens: usage?.inputTokens, tint: .indigo)dailyTokenRow("activity.tokens.output", tokens: usage?.outputTokens, tint: .orange)- dailyTokenRow("activity.tokens.cached-read", tokens: usage?.cachedInputTokens, tint: .green)- dailyTokenRow("activity.tokens.cache-write", tokens: usage?.cacheWriteInputTokens, tint: .purple)+ dailyTokenRow("activity.tokens.cached-input", tokens: usage?.cachedInputTokens, tint: .green)+ dailyTokenRow("activity.tokens.cache-write-input", tokens: usage?.cacheWriteInputTokens, tint: .purple)metricRowLayout {metricDot(tint: .teal)Text("activity.tokens.cache-hit-rate")@@ -682,7 +682,7 @@ struct UsageHeatmapDayDetailView: View {comparison: cacheHitRate)}- dailyTokenRow("activity.tokens.reasoning", tokens: usage?.reasoningOutputTokens, tint: .cyan)+ dailyTokenRow("activity.tokens.reasoning-output", tokens: usage?.reasoningOutputTokens, tint: .cyan)}}diff --git a/CodexBar/Views/Settings/AppSettingsView.swift b/CodexBar/Views/Settings/AppSettingsView.swiftindex 94cc1ac..859fd3c 100644--- a/CodexBar/Views/Settings/AppSettingsView.swift+++ b/CodexBar/Views/Settings/AppSettingsView.swift@@ -267,7 +267,7 @@ private extension AppSettingsView {VStack(alignment: .leading, spacing: Metrics.rowSpacing) {mainPanelLayoutRowLiquidGlassDivider()- MainPanelEntranceAnimationsSettingsRow(settings: mainPanelSettings)+ MainPanelAnimationsSettingsRow(settings: mainPanelSettings)LiquidGlassDivider()TaskGlowSettingsRow(settings: taskGlowSettings,@@ -835,9 +835,9 @@ private extension AppSettingsView {localized: "workflow.rebuild.summary.completed",defaultValue: "\(summary.rebuiltDateCount, specifier: "%lld")\(summary.eventCount, specifier: "%lld")")- message += String(localized: "workflow.rebuild.summary.tokens", defaultValue: "\(summary.tokenTurnCount, specifier: "%lld")")+ message += String(localized: "workflow.rebuild.summary.token-record-count", defaultValue: "\(summary.tokenTurnCount, specifier: "%lld")")if summary.didFailTokenRebuild {- message += String(localized: "workflow.rebuild.summary.tokens-failed")+ message += String(localized: "workflow.rebuild.summary.token-history-incomplete")}if summary.corruptLineCount > 0 {message += String(localized: "workflow.rebuild.summary.skipped-invalid-events", defaultValue: "\(summary.corruptLineCount, specifier: "%lld")")diff --git a/CodexBar/Views/Settings/AppearanceSettingsRows.swift b/CodexBar/Views/Settings/AppearanceSettingsRows.swiftindex 9a03118..81b444d 100644--- a/CodexBar/Views/Settings/AppearanceSettingsRows.swift+++ b/CodexBar/Views/Settings/AppearanceSettingsRows.swift@@ -1,15 +1,15 @@import SwiftUI-struct MainPanelEntranceAnimationsSettingsRow: View {+struct MainPanelAnimationsSettingsRow: View {@ObservedObject var settings: MainPanelSettingsvar body: some View {SettingsToggleRow(icon: "sparkles",- title: "settings.main-panel.entrance-animations",+ title: "settings.main-panel.animations",isOn: Binding(- get: { settings.areEntranceAnimationsEnabled },- set: { settings.setEntranceAnimationsEnabled($0) }+ get: { settings.areAnimationsEnabled },+ set: { settings.setAnimationsEnabled($0) }))}@@ -28,7 +28,7 @@ struct TaskGlowSettingsRow: View {var body: some View {SettingsToggleRow(icon: "light.max",- title: "settings.screen-edge-indicator.title",+ title: "settings.task-glow.title",isOn: Binding(get: { codexHookSettings.isOperable && settings.isEnabled },set: { settings.setEnabled($0) }diff --git a/CodexBarTests/CodexActivityTaskTests.swift b/CodexBarTests/CodexActivityTaskTests.swiftindex 86b5438..7108f3e 100644--- a/CodexBarTests/CodexActivityTaskTests.swift+++ b/CodexBarTests/CodexActivityTaskTests.swift@@ -11,7 +11,7 @@ struct CodexActivityTaskTests {}@Test func taskIdentitySeparatesSessionsTurnsAndAnonymousProjects() {- #expect(CodexActivityTaskKey(event: TestFixtures.event()).sessionId == "session-a")+ #expect(CodexActivityTaskKey(event: TestFixtures.event()).sessionID == "session-a")#expect(CodexActivityTaskKey(event: TestFixtures.event(turn: nil)).isSessionOnly)let first = CodexActivityTaskKey.turn(session: "ab", turn: "c").activityProtectionIdentifierlet second = CodexActivityTaskKey.turn(session: "a", turn: "bc").activityProtectionIdentifier@@ -83,7 +83,7 @@ struct CodexActivityTaskTests {let now = TestFixtures.now.addingTimeInterval(3600)var state = incompleteTail(since: TestFixtures.now)state.lastExecutionProgressAt = now- let owner = CodexActivityExecutionKey(agentId: nil, turnId: "turn-a")+ let owner = CodexActivityExecutionKey(agentID: nil, turnID: "turn-a")task.recordLifecycleRead(state, at: now)task.mergeExecutionLifecycle(state, owner: owner)#expect(task.state == .waitingApproval)@@ -100,7 +100,7 @@ struct CodexActivityTaskTests {private func incompleteTail(since date: Date) -> CodexSessionTaskLifecycleState {CodexSessionTaskLifecycleState(- sessionId: "session-a", turnId: "turn-a", startedAt: nil, approvalReviewer: nil, effort: nil,+ requestedThreadID: "session-a", turnID: "turn-a", startedAt: nil, approvalReviewer: nil, effort: nil,lastProgressAt: nil, terminal: nil, readStatus: .incomplete, hasContext: true,incompleteTailUnchangedSince: date)@@ -213,20 +213,20 @@ struct CodexActivityTaskTests {@Test func subagentCountDeduplicatesAndRejectsOlderEvents() {var task = makeTask()#expect(task.snapshot.activeSubagentCount == 0)- task.recordSubagentActivity(agentId: "agent", isStarting: true, at: TestFixtures.now)- task.recordSubagentActivity(agentId: "agent", isStarting: true, at: TestFixtures.now)+ task.recordSubagentActivity(agentID: "agent", isStarting: true, at: TestFixtures.now)+ task.recordSubagentActivity(agentID: "agent", isStarting: true, at: TestFixtures.now)#expect(task.snapshot.activeSubagentCount == 1)- task.recordSubagentActivity(agentId: "agent", isStarting: false, at: TestFixtures.now.addingTimeInterval(2))- task.recordSubagentActivity(agentId: "agent", isStarting: true, at: TestFixtures.now.addingTimeInterval(1))+ task.recordSubagentActivity(agentID: "agent", isStarting: false, at: TestFixtures.now.addingTimeInterval(2))+ task.recordSubagentActivity(agentID: "agent", isStarting: true, at: TestFixtures.now.addingTimeInterval(1))#expect(task.snapshot.activeSubagentCount == 0)}@Test func missingSubagentIdentityAndUnmatchedStopMakeCountUnavailable() {var missing = makeTask()- missing.recordSubagentActivity(agentId: nil, isStarting: true, at: TestFixtures.now)+ missing.recordSubagentActivity(agentID: nil, isStarting: true, at: TestFixtures.now)#expect(missing.snapshot.activeSubagentCount == nil)var unmatched = makeTask()- unmatched.recordSubagentActivity(agentId: "unknown", isStarting: false, at: TestFixtures.now)+ unmatched.recordSubagentActivity(agentID: "unknown", isStarting: false, at: TestFixtures.now)#expect(unmatched.snapshot.activeSubagentCount == nil)}@@ -243,12 +243,12 @@ struct CodexActivityTaskTests {var task = makeTask(TestFixtures.event(reviewer: nil))let requestedWaiting = task.recordApprovalRequest(from: TestFixtures.event(.permissionRequest, reviewer: nil))#expect(!requestedWaiting)- let otherOwner = CodexActivityExecutionKey(agentId: "other", turnId: "turn-a")+ let otherOwner = CodexActivityExecutionKey(agentID: "other", turnID: "turn-a")task.mergeApprovalContext(reviewer: .user, observedAt: TestFixtures.now, owner: otherOwner)let resolvedOtherExecution = task.resolvePendingApprovals()#expect(!resolvedOtherExecution)#expect(task.state == .running)- let owner = CodexActivityExecutionKey(agentId: nil, turnId: "turn-a")+ let owner = CodexActivityExecutionKey(agentID: nil, turnID: "turn-a")task.mergeApprovalContext(reviewer: .user, observedAt: TestFixtures.now, owner: owner)let resolvedOwner = task.resolvePendingApprovals()#expect(resolvedOwner)@@ -273,10 +273,10 @@ struct CodexActivityTaskTests {let agentRequest = TestFixtures.event(.permissionRequest, at: TestFixtures.now.addingTimeInterval(1), agent: "agent", origin: .auxiliary)let agentEnteredWaiting = task.recordApprovalRequest(from: agentRequest)#expect(!agentEnteredWaiting)- task.finishExecution(CodexActivityExecutionKey(agentId: nil, turnId: "turn-a"), at: TestFixtures.now.addingTimeInterval(2))+ task.finishExecution(CodexActivityExecutionKey(agentID: nil, turnID: "turn-a"), at: TestFixtures.now.addingTimeInterval(2))#expect(task.state == .waitingApproval)#expect(task.displayedApproval?.requestedAt == TestFixtures.now.addingTimeInterval(1))- task.finishExecution(CodexActivityExecutionKey(agentId: "agent", turnId: "turn-a"), at: TestFixtures.now.addingTimeInterval(3))+ task.finishExecution(CodexActivityExecutionKey(agentID: "agent", turnID: "turn-a"), at: TestFixtures.now.addingTimeInterval(3))#expect(task.state == .running)}@@ -287,14 +287,14 @@ struct CodexActivityTaskTests {let lateRequestChanged = task.recordApprovalRequest(from: TestFixtures.event(.permissionRequest))#expect(!lateRequestChanged)#expect(task.state == .running)- task.finishExecution(CodexActivityExecutionKey(agentId: nil, turnId: "turn-a"), at: progress)+ task.finishExecution(CodexActivityExecutionKey(agentID: nil, turnID: "turn-a"), at: progress)#expect(!task.acceptsExecutionEvent(TestFixtures.event(.preToolUse, at: progress.addingTimeInterval(1))))}@Test func equalTimestampRolloutProgressDoesNotDismissApproval() {var task = makeTask()_ = task.recordApprovalRequest(from: TestFixtures.event(.permissionRequest))- let owner = CodexActivityExecutionKey(agentId: nil, turnId: "turn-a")+ let owner = CodexActivityExecutionKey(agentID: nil, turnID: "turn-a")task.mergeExecutionProgress(at: TestFixtures.now, owner: owner)#expect(task.state == .waitingApproval)task.mergeExecutionProgress(at: TestFixtures.now.addingTimeInterval(0.001), owner: owner)diff --git a/CodexBarTests/CodexActivityTokenUsageTests.swift b/CodexBarTests/CodexActivityTokenUsageTests.swiftindex c4a9f38..02ff068 100644--- a/CodexBarTests/CodexActivityTokenUsageTests.swift+++ b/CodexBarTests/CodexActivityTokenUsageTests.swift@@ -37,8 +37,8 @@ struct CodexActivityTokenUsageTests {var childState = state(child)switch scenario {case "unavailable": childState.readStatus = .unavailable- case "other-root": childState.rootTurnId = "other-root"- case "other-session": childState.rootSessionId = "other-session"+ case "other-root": childState.rootTurnID = "other-root"+ case "other-session": childState.rootSessionID = "other-session"case "missing-usage": childState.tokenUsage = nilcase "running-child": childState = state(child, terminal: nil)default: break@@ -76,9 +76,9 @@ struct CodexActivityTokenUsageTests {let request = request(root: root, children: [child])var childState = state(child, terminal: nil)switch scenario {- case "other-root": childState.rootTurnId = "other-root"- case "other-session": childState.rootSessionId = "other-session"- case "other-thread": childState.threadId = "other-thread"+ case "other-root": childState.rootTurnID = "other-root"+ case "other-session": childState.rootSessionID = "other-session"+ case "other-thread": childState.recordedThreadID = "other-thread"case "unavailable": childState.readStatus = .unavailabledefault: childState.tokenUsage = nil}@@ -143,7 +143,7 @@ struct CodexActivityTokenUsageTests {#expect(!monitor.applyActiveTokenUsage([state(reference("session-a", "turn-a"))]))#expect(monitor.tasks[key]?.tokenUsage == nil)var current = state(reference("session-a", "turn-b"), terminal: nil)- current.rootTurnId = "turn-b"+ current.rootTurnID = "turn-b"#expect(monitor.applyActiveTokenUsage([current]))#expect(monitor.tasks[key]?.tokenUsage?.totalTokens == 110)current.readStatus = .unavailable@@ -195,7 +195,7 @@ struct CodexActivityTokenUsageTests {#expect(monitor.terminations.first?.tokenUsage == nil)var stopped = state(reference("session-a", "turn-b"), input: 200, terminal: nil)- stopped.rootTurnId = "turn-b"+ stopped.rootTurnID = "turn-b"let states = [state(reference("session-a", "turn-a")), stopped]#expect(monitor.applyTerminalTokenUsage(states))#expect(monitor.completions.first?.tokenUsage?.totalTokens == 110)@@ -206,7 +206,7 @@ struct CodexActivityTokenUsageTests {stopped.readStatus = .unavailable#expect(!monitor.applyTerminalTokenUsage([stopped]))#expect(monitor.terminations.first?.tokenUsage?.totalTokens == 210)- _ = monitor.terminalTokenUsageReferences(now: Date().addingTimeInterval(31))+ _ = monitor.prepareTerminalTokenUsageReadBatch(now: Date().addingTimeInterval(31))#expect(monitor.terminalTokenUsageRequests.isEmpty)#expect(monitor.completions.first?.tokenUsage?.totalTokens == 110)monitor.clearCollectedActivityState()@@ -249,17 +249,17 @@ struct CodexActivityTokenUsageTests {var unavailable = firstStateunavailable.readStatus = .unavailable#expect(!monitor.applyTerminalTokenUsage([unavailable]))- _ = monitor.terminalTokenUsageReferences(now: Date().addingTimeInterval(31))+ _ = monitor.prepareTerminalTokenUsageReadBatch(now: Date().addingTimeInterval(31))#expect(monitor.completions.first?.tokenUsage?.totalTokens == 320)}private func reference(_ thread: String, _ turn: String) -> CodexActivityTurnReference {- CodexActivityTurnReference(sessionId: thread, turnId: turn, startedAt: TestFixtures.now)+ CodexActivityTurnReference(threadID: thread, turnID: turn, startedAt: TestFixtures.now)}private func request(root: CodexActivityTurnReference, children: [CodexActivityTurnReference]) -> CodexTaskTokenUsageRequest {CodexTaskTokenUsageRequest(- root: root, expectedAgentIDs: Set(children.map(\.sessionId)), references: Set([root] + children), deadline: TestFixtures.now+ root: root, expectedAgentIDs: Set(children.map(\.threadID)), references: Set([root] + children), deadline: TestFixtures.now)}@@ -268,9 +268,9 @@ struct CodexActivityTokenUsageTests {terminal: CodexSessionTaskTerminalState? = .completed(at: TestFixtures.now, duration: 1)) -> CodexSessionTaskLifecycleState {CodexSessionTaskLifecycleState(- sessionId: reference.sessionId, turnId: reference.turnId, startedAt: TestFixtures.now,+ requestedThreadID: reference.threadID, turnID: reference.turnID, startedAt: TestFixtures.now,approvalReviewer: nil, effort: nil, lastProgressAt: TestFixtures.now, terminal: terminal,- rootTurnId: "turn-a", threadId: reference.sessionId, rootSessionId: "session-a",+ rootTurnID: "turn-a", recordedThreadID: reference.threadID, rootSessionID: "session-a",tokenUsage: CodexTokenUsage(inputTokens: input, cachedInputTokens: 20, cacheWriteInputTokens: 0,outputTokens: 10, reasoningOutputTokens: 2, totalTokens: input + 10diff --git a/CodexBarTests/CodexQuotaAndIdentityTests.swift b/CodexBarTests/CodexQuotaAndIdentityTests.swiftindex f014316..c7a9924 100644--- a/CodexBarTests/CodexQuotaAndIdentityTests.swift+++ b/CodexBarTests/CodexQuotaAndIdentityTests.swift@@ -43,8 +43,10 @@ struct CodexQuotaAndIdentityTests {"zeta":{"secondary":{"usedPercent":30}}}}""")+ #expect(response.rateLimits.limitID == "codex")+ #expect(response.rateLimitsByLimitID?.count == 4)let snapshot = try CodexQuotaSnapshot(accountResponse: accountResponse, rateLimitsResponse: response)- #expect(snapshot.limits.map(\.limitId) == ["codex", "alpha", "zeta"])+ #expect(snapshot.limits.map(\.limitID) == ["codex", "alpha", "zeta"])#expect(snapshot.codexLimit?.window(ofKind: .primary)?.usedPercent == 20)#expect(snapshot.credits?.balance == "12")}diff --git a/CodexBarTests/CodexSessionLifecycleReaderTests.swift b/CodexBarTests/CodexSessionLifecycleReaderTests.swiftindex 3cf6a98..ca983d0 100644--- a/CodexBarTests/CodexSessionLifecycleReaderTests.swift+++ b/CodexBarTests/CodexSessionLifecycleReaderTests.swift@@ -9,7 +9,7 @@ struct CodexSessionLifecycleReaderTests {let reader = CodexSessionLifecycleReader(codexHomeURL: directory.url)let state = try #require(await reader.lifecycleStates(for: [reference]).first)#expect(state.readStatus == .complete)- #expect(state.threadId == "session-a")+ #expect(state.recordedThreadID == "session-a")#expect(state.startedAt == Date(timeIntervalSince1970: 1789459200))#expect(state.approvalReviewer == .user)#expect(state.effort == "high")@@ -239,7 +239,7 @@ struct CodexSessionLifecycleReaderTests {}private var reference: CodexActivityTurnReference {- CodexActivityTurnReference(sessionId: "session-a", turnId: "turn-a", startedAt: TestFixtures.now)+ CodexActivityTurnReference(threadID: "session-a", turnID: "turn-a", startedAt: TestFixtures.now)}@Test func tokenUsageUpdatesIncrementallyBeforeTaskCompletion() async throws {@@ -270,7 +270,7 @@ struct CodexSessionLifecycleReaderTests {let state = try #require(await reader.lifecycleStates(for: [reference]).first)#expect(state.tokenUsage?.inputTokens == 200)#expect(state.tokenUsage?.totalTokens == 210)- #expect(state.rootTurnId == "turn-a")+ #expect(state.rootTurnID == "turn-a")}@Test func lateUsageAfterAbortIsReadWithoutIncludingNextTurn() async throws {@@ -388,11 +388,11 @@ struct CodexSessionLifecycleReaderTests {to: "sessions/\(datePath)/rollout-test-child-a.jsonl")let reader = CodexSessionLifecycleReader(codexHomeURL: directory.url)- let child = CodexActivityTurnReference(sessionId: "child-a", turnId: "child-turn", startedAt: TestFixtures.now)+ let child = CodexActivityTurnReference(threadID: "child-a", turnID: "child-turn", startedAt: TestFixtures.now)let state = try #require(await reader.lifecycleStates(for: [child]).first)- #expect(state.threadId == "child-a")- #expect(state.rootSessionId == "session-a")- #expect(state.rootTurnId == "turn-a")+ #expect(state.recordedThreadID == "child-a")+ #expect(state.rootSessionID == "session-a")+ #expect(state.rootTurnID == "turn-a")#expect(state.tokenUsage?.totalTokens == 110)}diff --git a/CodexBarTests/CodexTokenHistoryTests.swift b/CodexBarTests/CodexTokenHistoryTests.swiftindex 06c6e48..b0b583c 100644--- a/CodexBarTests/CodexTokenHistoryTests.swift+++ b/CodexBarTests/CodexTokenHistoryTests.swift@@ -1,9 +1,111 @@import CloudKit+import CryptoKitimport Foundationimport Synchronizationimport Testingstruct CodexTokenHistoryTests {+ @Test func unchangedTokenStorageDoesNotReplaceFile() throws {+ let directory = try TestDirectory()+ defer { try? directory.remove() }+ let url = directory.url.appendingPathComponent("cache.json")+ let values = [turn("main", "a", input: 100)]+ try CodexTokenFileStorage.save(values, to: url)+ let before = try #require(WorkflowStorage.fileStat(at: url))+ try CodexTokenFileStorage.save(values, to: url)+ let after = try #require(WorkflowStorage.fileStat(at: url))+ #expect(after.identifier == before.identifier)+ #expect(after.modifiedAtNanoseconds == before.modifiedAtNanoseconds)+ #expect(try CodexTokenFileStorage.load([CodexTokenTurn].self, from: url) == values)+ }++ @Test func tokenIdentitiesMatchExistingEncodingExactly() throws {+ let bytes = Data((0 ... 255).map(UInt8.init))+ #expect(CodexTokenTurn.hexString(bytes) == bytes.map { String(format: "%02x", $0) }.joined())+ #expect(CodexTokenTurn.hexString(Data()).isEmpty)+ let salt = Data((0 ... 255).map(UInt8.init))+ for thread in ["", "thread", "中文/路径", "a\u{0000}b", String(repeating: "x", count: 1024)] {+ let data = try JSONEncoder().encode(["token-turn-v1", thread, "turn"])+ let expected = SHA256.hash(data: data).map { String(format: "%02x", $0) }.joined()+ #expect(CodexTokenTurn.identifier(thread: thread, turn: "turn") == expected)+ for root in [expected, "other-root"] {+ let value = CodexTokenTurn(id: expected, rootID: root, updatedAt: TestFixtures.now)+ let exported = value.pseudonymized(salt: salt)+ func legacyHash(_ text: String) -> String {+ HMAC<SHA256>.authenticationCode(for: Data(text.utf8), using: SymmetricKey(data: salt))+ .map { String(format: "%02x", $0) }.joined()+ }+ #expect(exported.id == legacyHash(expected))+ #expect(exported.rootID == legacyHash(root))+ #expect(exported.updatedAt == value.updatedAt)+ }+ }+ }++ @Test func batchPseudonymsPreserveUpdatedValuesAndAccountIsolation() {+ let root = turn("main", "a", input: 100)+ let child = turn("child", "b", root: root.id, input: 200)+ var updated = child+ updated.usage = usage(input: 50)+ updated.rebuiltAt = TestFixtures.now.addingTimeInterval(60)+ let records = [root, child, updated]+ for salt in [Data("account-a".utf8), Data("account-b".utf8), Data()] {+ #expect(CodexTokenTurn.pseudonymized(records, salt: salt) == records.map { $0.pseudonymized(salt: salt) })+ }+ }++ @Test func cachedTokenFileChecksBytesAcrossExternalWritesAndDeletion() throws {+ let directory = try TestDirectory()+ defer { try? directory.remove() }+ let url = directory.url.appendingPathComponent("cache.json")+ var first = CodexTokenFileCache<[String: Int]>(url: url)+ var second = CodexTokenFileCache<[String: Int]>(url: url)+ try first.save(["cursor": 1])+ #expect(try first.load() == ["cursor": 1])+ #expect(try second.load() == ["cursor": 1])+ let initial = try #require(WorkflowStorage.fileStat(at: url))+ try first.save(["cursor": 1])+ #expect(WorkflowStorage.fileStat(at: url)?.identifier == initial.identifier)+ let modifiedAt = try FileManager.default.attributesOfItem(atPath: url.path)[.modificationDate]+ try Data("{\"cursor\":2}".utf8).write(to: url)+ if let modifiedAt {+ try FileManager.default.setAttributes([.modificationDate: modifiedAt], ofItemAtPath: url.path)+ }+ #expect(WorkflowStorage.fileStat(at: url)?.size == initial.size)+ #expect(try first.load() == ["cursor": 2])+ #expect(try second.load() == ["cursor": 2])+ try second.save(["cursor": 3])+ #expect(try first.load() == ["cursor": 3])+ // 内存命中不能跳过另一进程修改后的保存检查点+ try second.save(["cursor": 4])+ try first.save(["cursor": 3])+ #expect(try second.load() == ["cursor": 3])+ try Data("invalid".utf8).write(to: url)+ #expect(throws: (any Error).self) { try first.load() }+ try FileManager.default.removeItem(at: url)+ #expect(try first.load() == nil)+ try first.save(["cursor": 3])+ #expect(try second.load() == ["cursor": 3])+ }++ @Test func idleRefreshPreservesResultsAndPersistedScanScheduling() async throws {+ let directory = try TestDirectory()+ defer { try? directory.remove() }+ let source = try directory.write(lines(input: 100), to: "sessions/rollout-main.jsonl")+ let store = makeStore(directory)+ let original = try await store.refresh(now: TestFixtures.now)+ let later = TestFixtures.now.addingTimeInterval(60)+ #expect(try await store.refresh(now: later) == original)+ let ledgerURL = directory.url.appendingPathComponent("history/ledger.json")+ let json = try #require(JSONSerialization.jsonObject(with: Data(contentsOf: ledgerURL)) as? [String: Any])+ let cursors = try #require(json["files"] as? [String: [String: Any]])+ let cursor = try #require(cursors.values.first)+ #expect(cursor["lastReadAt"] as? Double == later.timeIntervalSinceReferenceDate)+ let sourceSize = try Data(contentsOf: source).count+ #expect(cursor["offset"] as? Int == sourceSize)+ #expect(try await makeStore(directory).refresh(now: later) == original)+ }+@Test func replayProgressReportsBackfillAndCompletionWithoutIdleOrIncrementalSpam() async throws {let directory = try TestDirectory()defer { try? directory.remove() }diff --git a/CodexBarTests/HookEventTailReaderTests.swift b/CodexBarTests/HookEventTailReaderTests.swiftindex 1df8bb8..a012def 100644--- a/CodexBarTests/HookEventTailReaderTests.swift+++ b/CodexBarTests/HookEventTailReaderTests.swift@@ -13,7 +13,7 @@ struct HookEventTailReaderTests {let url = try directory.write(old.jsonLineData() + current.jsonLineData(), to: path)let reader = HookEventTailReader(eventsDirectoryURL: directory.url, now: { now }, onBatch: recorder.receive)await reader.start()- #expect(recorder.bootstrapEvents.map(\.turnId) == ["current"])+ #expect(recorder.bootstrapEvents.map(\.turnID) == ["current"])#expect(recorder.liveEvents.isEmpty)let live = TestFixtures.event(.preToolUse, at: now.addingTimeInterval(1), turn: "live")try append(live.jsonLineData(), to: url)@@ -22,7 +22,7 @@ struct HookEventTailReaderTests {await reader.stop()#expect(first == .completed)#expect(second == .completed)- #expect(recorder.liveEvents.map(\.turnId) == ["live"])+ #expect(recorder.liveEvents.map(\.turnID) == ["live"])}@Test func partialLiveLineWaitsForNewlineAndIsDeliveredOnce() async throws {@@ -57,7 +57,7 @@ struct HookEventTailReaderTests {await reader.stop()#expect(result == .completed)#expect(recorder.bootstrapCount == 2)- #expect(recorder.bootstrapEvents.map(\.turnId) == ["replacement"])+ #expect(recorder.bootstrapEvents.map(\.turnID) == ["replacement"])#expect(recorder.liveEvents.isEmpty)}diff --git a/CodexBarTests/JSONLinesAndHookTests.swift b/CodexBarTests/JSONLinesAndHookTests.swiftindex e3296e4..d80319f 100644--- a/CodexBarTests/JSONLinesAndHookTests.swift+++ b/CodexBarTests/JSONLinesAndHookTests.swift@@ -30,7 +30,7 @@ struct JSONLinesAndHookTests {""")#expect(event.hookEvent == .userPromptSubmit)#expect(event.origin == .unknown)- #expect(event.sessionId == nil)+ #expect(event.sessionID == nil)#expect(event.toolName == nil)}@@ -46,7 +46,7 @@ struct JSONLinesAndHookTests {timestamp: TestFixtures.now, name: "PreToolUse", origin: .main,directoryPath: "/projects/a\"b", toolName: "line\nbreak", modelName: nil,effort: nil, permissionMode: nil, approvalReviewer: nil,- sessionId: "session", turnId: "turn", agentId: "agent"+ sessionID: "session", turnID: "turn", agentID: "agent")let data = try event.jsonLineData()#expect(data.filter { $0 == JSONLines.newlineByte }.count == 1)diff --git a/CodexBarTests/SettingsAndMaintenanceTests.swift b/CodexBarTests/SettingsAndMaintenanceTests.swiftindex e332b35..3a9f0e0 100644--- a/CodexBarTests/SettingsAndMaintenanceTests.swift+++ b/CodexBarTests/SettingsAndMaintenanceTests.swift@@ -2,6 +2,21 @@ import Foundationimport Testingstruct SettingsAndMaintenanceTests {+ @Test func mainPanelAnimationsPreserveStoredPreferenceAndDefault() throws {+ let preferences = try TestPreferences()+ defer { preferences.remove() }+ let defaults = preferences.defaults+ #expect(MainPanelSettings(defaults: defaults).areAnimationsEnabled)+ defaults.set(false, forKey: "MainPanel.entranceAnimationsEnabled")+ let settings = MainPanelSettings(defaults: defaults)+ #expect(!settings.areAnimationsEnabled)+ settings.setAnimationsEnabled(true)+ #expect(defaults.bool(forKey: "MainPanel.entranceAnimationsEnabled"))+ defaults.set(false, forKey: "MainPanel.entranceAnimationsEnabled")+ settings.refresh()+ #expect(!settings.areAnimationsEnabled)+ }+@Test func rebuildRangeIncludesDatesWithoutHookEvents() {let range = RebuildDateRange.starting(at: "2026-09-15").completing(with: "2026-09-17")#expect(range.dateKeys == ["2026-09-15", "2026-09-16", "2026-09-17"])diff --git a/CodexBarTests/TestSupport.swift b/CodexBarTests/TestSupport.swiftindex 73df5b3..3bdc178 100644--- a/CodexBarTests/TestSupport.swift+++ b/CodexBarTests/TestSupport.swift@@ -21,7 +21,7 @@ nonisolated enum TestFixtures {timestamp: timestamp, name: name.rawValue, origin: origin,directoryPath: "/projects/example", toolName: "exec_command", modelName: "gpt-5",effort: "high", permissionMode: nil, approvalReviewer: reviewer,- sessionId: session, turnId: turn, agentId: agent+ sessionID: session, turnID: turn, agentID: agent)}@@ -35,8 +35,8 @@ nonisolated enum TestFixtures {aggregate.eventCount = eventsaggregate.turnCount = turnsaggregate.sessionCount = 1- aggregate.sessionIds = nil- aggregate.turnIds = nil+ aggregate.sessionIDs = nil+ aggregate.turnIDs = nilreturn aggregate}}diff --git a/CodexBarTests/WorkflowAggregationTests.swift b/CodexBarTests/WorkflowAggregationTests.swiftindex aad4aa2..5aca1ce 100644--- a/CodexBarTests/WorkflowAggregationTests.swift+++ b/CodexBarTests/WorkflowAggregationTests.swift@@ -2,6 +2,25 @@ import Foundationimport Testingstruct WorkflowAggregationTests {+ @Test func identifierFieldsKeepTheirStoredNames() throws {+ let aggregate = try TestFixtures.decode(WorkflowDailyAggregate.self, #"{"date":"2026-09-15","sessionIds":["session-a"],"turnIds":["turn-a"]}"#)+ #expect(aggregate.sessionIDs == ["session-a"])+ #expect(aggregate.turnIDs == ["turn-a"])+ let encoded = try JSONEncoder().encode(aggregate)+ let fields = try #require(JSONSerialization.jsonObject(with: encoded) as? [String: Any])+ #expect(fields["sessionIds"] as? [String] == ["session-a"])+ #expect(fields["turnIds"] as? [String] == ["turn-a"])+ #expect(fields["sessionIDs"] == nil)+ #expect(fields["turnIDs"] == nil)++ let record = try TestFixtures.decode(WorkflowSyncedDailyRecord.self, #"{"deviceId":"device-a","daily":{"date":"2026-09-15"}}"#)+ #expect(record.deviceID == "device-a")+ let recordData = try JSONEncoder().encode(record)+ let recordFields = try #require(JSONSerialization.jsonObject(with: recordData) as? [String: Any])+ #expect(recordFields["deviceId"] as? String == "device-a")+ #expect(recordFields["deviceID"] == nil)+ }+@Test func missingHookCountsRemainUnavailableThroughBothStorageFormats() throws {let aggregate = try TestFixtures.decode(WorkflowDailyAggregate.self, #"{"date":"2026-09-15","stopCount":0}"#)#expect(aggregate.eventCount == nil)@@ -24,15 +43,15 @@ struct WorkflowAggregationTests {let retained = accumulator.finalized(identifierStorage: .retained)let compacted = accumulator.finalized(identifierStorage: .compacted)#expect(retained.eventCount == 10)- #expect(retained.sessionIds == ["interrupt-only", "session-a", "terminal-only"])- #expect(retained.turnIds == ["turn-a"])+ #expect(retained.sessionIDs == ["interrupt-only", "session-a", "terminal-only"])+ #expect(retained.turnIDs == ["turn-a"])#expect(retained.metrics.toolCallCount == 1)#expect(retained.metrics.contextCompactionCount == 1)#expect(retained.metrics.subagentCount == 1)#expect(retained.metrics.interruptCount == 1)#expect(retained.metrics == compacted.metrics)- #expect(compacted.sessionIds == nil)- #expect(compacted.turnIds == nil)+ #expect(compacted.sessionIDs == nil)+ #expect(compacted.turnIDs == nil)#expect(!compacted.supportsIncrementalAggregation)}@@ -89,7 +108,7 @@ struct WorkflowAggregationTests {aggregate.normalizeIdentifierStorage(retainsIdentifiers: false)#expect(aggregate.sessionCount == 2)#expect(aggregate.turnCount == 1)- #expect(aggregate.sessionIds == nil)+ #expect(aggregate.sessionIDs == nil)}@Test func syncExportContainsCountsWithoutRawTaskIdentifiers() throws {@@ -135,15 +154,15 @@ struct WorkflowMergeTests {}@Test func remoteOnlyDaysRemainVisible() {- let result = WorkflowSnapshot(localAggregates: [], syncedRecords: [record(TestFixtures.aggregate(turns: 4))], currentDeviceId: "device")+ let result = WorkflowSnapshot(localAggregates: [], syncedRecords: [record(TestFixtures.aggregate(turns: 4))], currentDeviceID: "device")#expect(result.dailyMetrics.first?.turnCount == 4)}private func record(_ aggregate: WorkflowDailyAggregate, device: String = "device") -> WorkflowSyncedDailyRecord {- WorkflowSyncedDailyRecord(deviceId: device, daily: aggregate.syncedAggregate)+ WorkflowSyncedDailyRecord(deviceID: device, daily: aggregate.syncedAggregate)}private func snapshot(_ local: WorkflowDailyAggregate, _ remote: [WorkflowSyncedDailyRecord]) -> WorkflowSnapshot {- WorkflowSnapshot(localAggregates: [local], syncedRecords: remote, currentDeviceId: "device")+ WorkflowSnapshot(localAggregates: [local], syncedRecords: remote, currentDeviceID: "device")}}diff --git a/Docs/DeveloperGuide/ui-and-lifecycle.md b/Docs/DeveloperGuide/ui-and-lifecycle.mdindex c5b9720..cafd123 100644--- a/Docs/DeveloperGuide/ui-and-lifecycle.md+++ b/Docs/DeveloperGuide/ui-and-lifecycle.md@@ -164,7 +164,7 @@ popover 和备用面板分别持有 `MenuSurfaceAnimationState`。展示前将 ``CodexActivityCard` 使用 `primaryActivity`,优先显示等待批准,其次是运行中;无活跃任务时按结束时间选择最新的完成或终止,时间相同优先终止。`isActivelyPreventingSleep` 为 `true` 且卡片数据可用时显示青绿色 `sun.max.fill`,tooltip 按 `sleepPreventionSource` 显示来源。所属宿主的 `mainPanelAnimationsEnabled` 开启时,太阳徽标匀速顺时针旋转;关闭时移除旋转视图并显示静态图标。-活动卡片和任务中心共用 `CodexActivityStatusText`,文字颜色跟随任务状态。运行时显示扫光,等待批准时显示橙色粒子,完成和终止时静态显示。卡片状态文字动画由 `mainPanelAnimationsEnabled` 控制,任务中心状态文字动画要求 `presentationState.isPresented` 和 `MainPanelSettings.areEntranceAnimationsEnabled` 同时开启。每个面板共用一条粒子时间线,只从可见的等待文字发射粒子,按面板边界裁剪;没有发射源时移除时间线。+活动卡片和任务中心共用 `CodexActivityStatusText`,文字颜色跟随任务状态。运行时显示扫光,等待批准时显示橙色粒子,完成和终止时静态显示。卡片状态文字动画由 `mainPanelAnimationsEnabled` 控制,任务中心状态文字动画要求 `presentationState.isPresented` 和 `MainPanelSettings.areAnimationsEnabled` 同时开启。每个面板共用一条粒子时间线,只从可见的等待文字发射粒子,按面板边界裁剪;没有发射源时移除时间线。活动卡片在 `primaryActivity.tokenUsage` 可用时展示 Token 指标和分割线。状态行固定在卡片顶部,卡片高度随 Token 区域显隐调整。diff --git a/Docs/UserGuide/README.md b/Docs/UserGuide/README.mddeleted file mode 100644index c194302..0000000--- a/Docs/UserGuide/README.md+++ /dev/null@@ -1,23 +0,0 @@-# CodexBar 用户指南--简体中文 | [English](../en/UserGuide/README.md)--## 文档目录--| 文档 | 内容 |-| --- | --- |-| [安装与快速开始](getting-started.md) | 运行要求、安装方式、基本操作和功能依赖 |-| [主面板与菜单栏](main-panel.md) | 菜单栏状态、账户、额度、Token 热力图和任务中心 |-| [实时任务与 CodexBar Hook](activity-and-hook.md) | Hook 的作用、启用方式、任务状态和历史统计 |-| [通知与提醒](notifications.md) | 每类通知的触发条件、默认值、音效和触觉反馈 |-| [防止系统睡眠](sleep-prevention.md) | 生效条件、全部保护选项、CodexBarHelper 授权和外部来源共存 |-| [数据、同步与隐私](sync-data-privacy.md) | 本机数据、iCloud 同步、重建数据和网络边界 |-| [设置参考](settings.md) | 通用、高级和关于页面中每一个设置的作用,包括自动重置 |-| [常见问题与排查](troubleshooting.md) | 登录、Hook、通知、自动重置、防睡眠、同步和日志问题 |--## 常用名称--- CodexBar Hook:开启实时任务与每日活动统计的功能-- CodexBarHelper:随 App 安装的后台服务,用于防睡眠和自动重置唤醒--返回 [CodexBar README](../../README.md)diff --git a/Docs/UserGuide/sync-data-privacy.md b/Docs/UserGuide/sync-data-privacy.mdindex fc85a16..6771fb2 100644--- a/Docs/UserGuide/sync-data-privacy.md+++ b/Docs/UserGuide/sync-data-privacy.md@@ -58,7 +58,7 @@ App 在历史统计刷新时自动读取本机 Codex 的 rollout,逐步补全统计异常时,可在 `设置 > 高级 > 重建数据` 选择日期范围并确认。可选范围为最近 210 天,有本机 Hook 记录或已发现 Token 轮次的日期会显示标记;未标记的日期也可以选择。-重建使用保留的本机 Hook 事件和 rollout,重新计算所选日期的活动统计与 Token 用量。Token 按根轮次开始日期归属,同一轮及其子线程不会重复累计。日期没有 Hook 事件时,也可以重建本机 rollout 中的 Token 数据。+重建使用保留的本机 Hook 事件和 rollout,重新计算所选日期的活动统计与 Token 用量。Token 按根轮次开始日期归属,同一轮及其子线程不会重复累计。日期没有 Hook 事件时,也可以重建本机 rollout 中的 会话数据。重建在后台运行,可以继续使用主面板或关闭设置窗口。Token 按批读取,扫描完整成功后一次更新;取消或读取失败不会发布部分结果。退出 App 会停止本次重建,未完成的 Token 重建需要重新发起。完成后通过弹窗显示处理天数、Hook 事件数和 Token 轮次数。@@ -70,7 +70,7 @@ App 在历史统计刷新时自动读取本机 Codex 的 rollout,逐步补全| --- | --- || Codex 服务 | 获取账户、额度和用量,执行自动重置 || 更新服务 | 检查并下载 CodexBar 更新 |-| iCloud | 开启同步后传输每日 Hook 统计和会话 Token 数据 |+| iCloud | 开启同步后传输每日 Hook 统计和会话数据 |代理只用于 CodexBar 的 Codex 服务连接,不影响更新、iCloud 或其他 App。diff --git a/Docs/en/DeveloperGuide/ui-and-lifecycle.md b/Docs/en/DeveloperGuide/ui-and-lifecycle.mdindex eeea320..6723539 100644--- a/Docs/en/DeveloperGuide/ui-and-lifecycle.md+++ b/Docs/en/DeveloperGuide/ui-and-lifecycle.md@@ -164,7 +164,7 @@ The main panel root view uses a fixed width and its ideal content height. The po`CodexActivityCard` uses `primaryActivity`, prioritizing waiting for approval, then running, then the latest completion or termination by end time, with termination taking precedence on ties. When `isActivelyPreventingSleep` is `true` and card data is available, it shows a teal `sun.max.fill`; the tooltip identifies `sleepPreventionSource`. While the host's `mainPanelAnimationsEnabled` is true, the sun badge rotates clockwise at a constant speed. Disabling permission removes the rotating view and shows a static icon.-The activity card and Task Center share `CodexActivityStatusText`, whose color follows task state. Running text shimmers, approval-waiting text emits orange particles, and completed or terminated text stays static. Status-text animations in the card use `mainPanelAnimationsEnabled`; those in Task Center require both `presentationState.isPresented` and `MainPanelSettings.areEntranceAnimationsEnabled`. Each panel shares one particle timeline, emits only from visible waiting text, clips particles to the panel bounds, and removes the timeline when no emitters remain.+The activity card and Task Center share `CodexActivityStatusText`, whose color follows task state. Running text shimmers, approval-waiting text emits orange particles, and completed or terminated text stays static. Status-text animations in the card use `mainPanelAnimationsEnabled`; those in Task Center require both `presentationState.isPresented` and `MainPanelSettings.areAnimationsEnabled`. Each panel shares one particle timeline, emits only from visible waiting text, clips particles to the panel bounds, and removes the timeline when no emitters remain.The activity card shows token metrics and a divider when `primaryActivity.tokenUsage` is available. The status row stays anchored at the top, and the card height adjusts as the token area appears or disappears.diff --git a/Docs/en/UserGuide/sync-data-privacy.md b/Docs/en/UserGuide/sync-data-privacy.mdindex 41374df..27a5aad 100644--- a/Docs/en/UserGuide/sync-data-privacy.md+++ b/Docs/en/UserGuide/sync-data-privacy.md@@ -70,7 +70,7 @@ With sync enabled, rebuilding replaces this device's activity statistics and the| --- | --- || Codex service | Read account, quota, and usage data; perform Automatic Reset || Update service | Check for and download CodexBar updates |-| iCloud | After enabling synchronization, transmit daily Hook statistics and session token data |+| iCloud | After enabling synchronization, transmit daily Hook statistics and session data |The proxy applies only to CodexBar’s Codex service connection, not updates, iCloud, or other apps.