CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
chore: 发布 2.4.1 并调整 daily 聚合字段顺序
Bobbde0ffe96722
diff --git a/CodexBar.xcodeproj/project.pbxproj b/CodexBar.xcodeproj/project.pbxprojindex 788cbf4..4e74257 100644--- a/CodexBar.xcodeproj/project.pbxproj+++ b/CodexBar.xcodeproj/project.pbxproj@@ -275,7 +275,7 @@"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";CODE_SIGN_STYLE = Automatic;COMBINE_HIDPI_IMAGES = YES;- CURRENT_PROJECT_VERSION = 16;+ CURRENT_PROJECT_VERSION = 17;DEVELOPMENT_TEAM = 4KJ362VJW5;ENABLE_APP_INTENTS_METADATA_GENERATION = NO;ENABLE_APP_SANDBOX = NO;@@ -290,7 +290,7 @@"$(inherited)","@executable_path/../Frameworks",);- MARKETING_VERSION = 2.4.0;+ MARKETING_VERSION = 2.4.1;PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;PRODUCT_NAME = "$(TARGET_NAME)";REGISTER_APP_GROUPS = YES;@@ -312,7 +312,7 @@"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";CODE_SIGN_STYLE = Automatic;COMBINE_HIDPI_IMAGES = YES;- CURRENT_PROJECT_VERSION = 16;+ CURRENT_PROJECT_VERSION = 17;DEVELOPMENT_TEAM = 4KJ362VJW5;ENABLE_APP_INTENTS_METADATA_GENERATION = NO;ENABLE_APP_SANDBOX = NO;@@ -327,7 +327,7 @@"$(inherited)","@executable_path/../Frameworks",);- MARKETING_VERSION = 2.4.0;+ MARKETING_VERSION = 2.4.1;PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;PRODUCT_NAME = "$(TARGET_NAME)";PROVISIONING_PROFILE_SPECIFIER = "";diff --git a/CodexBar/Controllers/PopoverDismissMonitor.swift b/CodexBar/Controllers/PopoverDismissMonitor.swiftindex 20cfc73..a0a816b 100644--- a/CodexBar/Controllers/PopoverDismissMonitor.swift+++ b/CodexBar/Controllers/PopoverDismissMonitor.swift@@ -8,7 +8,7 @@ final class PopoverDismissMonitor {private var globalMouseEventMonitor: Any?private var appResignActiveObserver: NSObjectProtocol?private var popoverWindowResignKeyObserver: NSObjectProtocol?-+init(popover: NSPopover,statusButtonProvider: @escaping () -> NSStatusBarButton?@@ -16,30 +16,30 @@ final class PopoverDismissMonitor {self.popover = popoverself.statusButtonProvider = statusButtonProvider}-+func install(onDismiss: @escaping () -> Void) {remove()-+localEventMonitor = NSEvent.addLocalMonitorForEvents(matching: Metrics.dismissEventMask) { [weak self] event inguard let self else {return event}-+if self.dismissesKeyEvent(event, onDismiss: onDismiss) {return nil}-+self.dismissIfNeeded(for: event, onDismiss: onDismiss)self.restabilizePopoverChromeAfterEvent()return event}-+globalMouseEventMonitor = NSEvent.addGlobalMonitorForEvents(matching: Metrics.mouseDismissEventMask) { _ inTask { @MainActor inonDismiss()}}-+appResignActiveObserver = NotificationCenter.default.addObserver(forName: NSApplication.didResignActiveNotification,object: NSApplication.shared,@@ -47,7 +47,7 @@ final class PopoverDismissMonitor {) { _ inonDismiss()}-+if let popoverWindow = popover.contentViewController?.view.window {popoverWindowResignKeyObserver = NotificationCenter.default.addObserver(forName: NSWindow.didResignKeyNotification,@@ -58,102 +58,102 @@ final class PopoverDismissMonitor {}}}-+func remove() {removeEventMonitor(&localEventMonitor)removeEventMonitor(&globalMouseEventMonitor)removeObserver(&appResignActiveObserver)removeObserver(&popoverWindowResignKeyObserver)}-+private func removeEventMonitor(_ monitor: inout Any?) {if let currentMonitor = monitor {NSEvent.removeMonitor(currentMonitor)monitor = nil}}-+private func removeObserver(_ observer: inout NSObjectProtocol?) {if let currentObserver = observer {NotificationCenter.default.removeObserver(currentObserver)observer = nil}}-+private func dismissesKeyEvent(_ event: NSEvent, onDismiss: () -> Void) -> Bool {guard popover.isShown, event.type == .keyDown, event.keyCode == Metrics.escapeKeyCode else {return false}-+onDismiss()return true}-+private func dismissIfNeeded(for event: NSEvent, onDismiss: () -> Void) {guard popover.isShown else {return}-+if isEventInsidePopover(event) || isEventInsideStatusButton(event) {return}-+onDismiss()}-+private func restabilizePopoverChromeAfterEvent() {Task { @MainActor [weak self] inawait Task.yield()guard let self, self.popover.isShown else {return}-+self.stabilizePopoverChromeAppearance()}}-+private func stabilizePopoverChromeAppearance() {guard let rootView = popover.contentViewController?.view.window?.contentView else {return}-+// NSPopover 会在点击后重新强调 NSVisualEffectView, 这里固定为 inactive 避免背景明暗跳变stabilizeVisualEffectViews(in: rootView)}-+private func stabilizeVisualEffectViews(in view: NSView) {if let visualEffectView = view as? NSVisualEffectView {visualEffectView.state = .inactivevisualEffectView.isEmphasized = false}-+for subview in view.subviews {stabilizeVisualEffectViews(in: subview)}}-+private func isEventInsidePopover(_ event: NSEvent) -> Bool {guard let contentView = popover.contentViewController?.view,event.window == contentView.window else {return false}-+let point = contentView.convert(event.locationInWindow, from: nil)return contentView.bounds.contains(point)}-+private func isEventInsideStatusButton(_ event: NSEvent) -> Bool {guard let button = statusButtonProvider(),let buttonWindow = button.window else {return false}-+let eventScreenPoint = event.window?.convertPoint(toScreen: event.locationInWindow) ?? NSEvent.mouseLocationlet buttonRectInWindow = button.convert(button.bounds, to: nil)let buttonScreenRect = buttonWindow.convertToScreen(buttonRectInWindow)return buttonScreenRect.contains(eventScreenPoint)}-+private enum Metrics {static let mouseDismissEventMask: NSEvent.EventTypeMask = [.leftMouseDown,diff --git a/CodexBar/Models/CodexWorkflowStatsModels.swift b/CodexBar/Models/CodexWorkflowStatsModels.swiftindex d433cec..e337475 100644--- a/CodexBar/Models/CodexWorkflowStatsModels.swift+++ b/CodexBar/Models/CodexWorkflowStatsModels.swift@@ -11,7 +11,7 @@ nonisolated enum WorkflowEventKind: String {case postCompact = "postcompact"case subagentStart = "subagentstart"case subagentStop = "subagentstop"-+init?(normalizedName: String) {self.init(rawValue: normalizedName)}@@ -22,19 +22,19 @@ private nonisolated enum WorkflowStatsJSON {let json = "{\(fields.joined(separator: ","))}"return Data(json.utf8) + Data([0x0A])}-+static func field<T: Encodable>(_ name: String, _ value: T?) throws -> String {"\"\(name)\":\(try Self.value(value))"}-+static func value<T: Encodable>(_ value: T?) throws -> String {guard let value else {return "null"}-+return try Self.value(value)}-+static func value<T: Encodable>(_ value: T) throws -> String {let encoder = JSONEncoder()encoder.outputFormatting = [.sortedKeys, .withoutEscapingSlashes]@@ -52,7 +52,7 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {let permissionMode: String?let sessionId: String?let turnId: String?-+init(timestamp: Date,name: String,@@ -72,7 +72,7 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {self.sessionId = sessionIdself.turnId = turnId}-+init(from decoder: Decoder) throws {let container = try decoder.container(keyedBy: CodingKeys.self)guard let timestampString = Self.string(from: container, key: .timestamp),@@ -86,7 +86,7 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {.init(codingPath: decoder.codingPath, debugDescription: "Missing hook event name"))}-+self.timestamp = timestampself.name = nameself.directoryPath = Self.string(from: container, key: .cwd)@@ -96,28 +96,28 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {self.sessionId = Self.string(from: container, key: .sessionId)self.turnId = Self.string(from: container, key: .turnId)}-+var kind: WorkflowEventKind? {WorkflowEventKind(normalizedName: normalizedName)}-+var projectDisplayName: String? {guard let directoryPath, !directoryPath.isEmpty else {return nil}-+let url = URL(fileURLWithPath: directoryPath).standardizedFileURLlet lastComponent = url.lastPathComponentreturn lastComponent.isEmpty ? directoryPath : lastComponent}-+private var normalizedName: String {name.replacingOccurrences(of: "_", with: "").replacingOccurrences(of: "-", with: "").lowercased()}-+private static func string(from container: KeyedDecodingContainer<CodingKeys>,key: CodingKeys@@ -128,14 +128,14 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {return trimmedValue}}-+return nil}-+private static func date(from string: String) -> Date? {DateFormatter.codexLocalTimestamp.date(from: string)}-+func jsonLineData() throws -> Data {let fields = [try WorkflowStatsJSON.field("timestamp", DateFormatter.codexLocalTimestamp.string(from: timestamp)),@@ -147,10 +147,10 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {try WorkflowStatsJSON.field("tool", toolName),try WorkflowStatsJSON.field("cwd", directoryPath)]-+return WorkflowStatsJSON.lineData(fields)}-+private enum CodingKeys: String, CodingKey {case timestampcase event@@ -173,9 +173,9 @@ nonisolated struct WorkflowDailyStats: Equatable, Identifiable {let contextCompactionCount: Intlet subagentCount: Intlet eventCount: Int-+var id: String { startDate }-+static func empty(startDate: String) -> WorkflowDailyStats {WorkflowDailyStats(startDate: startDate,@@ -194,26 +194,26 @@ nonisolated struct WorkflowDailyStats: Equatable, Identifiable {nonisolated struct WorkflowStatsSnapshot: Equatable {let generatedAt: Datelet dailyStats: [WorkflowDailyStats]-+static let empty = WorkflowStatsSnapshot(generatedAt: Date(), dailyStats: [])-+init(generatedAt: Date = Date(), dailyStats: [WorkflowDailyStats]) {self.generatedAt = generatedAtself.dailyStats = dailyStats}-+init(dailyAggregates: [WorkflowDailyAggregate], generatedAt: Date = Date()) {self.generatedAt = generatedAtself.dailyStats = dailyAggregates.map(\.stats).sorted { $0.startDate < $1.startDate }}-+func recentWeekGrid(columnCount: Int, endingDaysAgo: Int = 0, today: Date = Date()) -> [WorkflowDailyStats?] {let statsByDate = dailyStats.reduce(into: [String: WorkflowDailyStats]()) { result, stats inresult[stats.startDate] = stats}-+return CodexWeekGrid.dates(columnCount: columnCount,endingDaysAgo: endingDaysAgo,@@ -231,7 +231,7 @@ nonisolated struct WorkflowStatsSnapshot: Equatable {nonisolated struct WorkflowDailyIdentifierCache {var sessionIds: Set<String>var turnIds: Set<String>-+init(aggregate: WorkflowDailyAggregate) {self.sessionIds = Set(aggregate.sessionIds ?? [])self.turnIds = Set(aggregate.turnIds ?? [])@@ -250,14 +250,14 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {var postCompactCount: Intvar subagentStartCount: Intvar subagentStopCount: Int- var sessionIds: [String]?- var turnIds: [String]?var sessionCount: Int?var turnCount: Int?var projectCounts: [String: Int]-+ var sessionIds: [String]?+ var turnIds: [String]?+var id: String { date }-+init(date: String) {self.date = dateself.eventCount = 0@@ -270,13 +270,13 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {self.postCompactCount = 0self.subagentStartCount = 0self.subagentStopCount = 0- self.sessionIds = []- self.turnIds = []self.sessionCount = nilself.turnCount = nilself.projectCounts = [:]+ self.sessionIds = []+ self.turnIds = []}-+init(from decoder: Decoder) throws {let container = try decoder.container(keyedBy: CodingKeys.self)self.date = try container.decode(String.self, forKey: .date)@@ -290,20 +290,20 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {self.postCompactCount = try container.decodeIfPresent(Int.self, forKey: .postCompactCount) ?? 0self.subagentStartCount = try container.decodeIfPresent(Int.self, forKey: .subagentStartCount) ?? 0self.subagentStopCount = try container.decodeIfPresent(Int.self, forKey: .subagentStopCount) ?? 0- self.sessionIds = try container.decodeIfPresent([String].self, forKey: .sessionIds)- self.turnIds = try container.decodeIfPresent([String].self, forKey: .turnIds)self.sessionCount = try container.decodeIfPresent(Int.self, forKey: .sessionCount)self.turnCount = try container.decodeIfPresent(Int.self, forKey: .turnCount)self.projectCounts = try container.decodeIfPresent([String: Int].self, forKey: .projectCounts) ?? [:]+ self.sessionIds = try container.decodeIfPresent([String].self, forKey: .sessionIds)+ self.turnIds = try container.decodeIfPresent([String].self, forKey: .turnIds)}-+mutating func record(_ event: WorkflowHookEvent,keepsIdentifiers: Bool,identifierCache: inout WorkflowDailyIdentifierCache) {eventCount += 1-+switch event.kind {case .sessionStart: sessionStartCount += 1case .stop: stopCount += 1@@ -316,51 +316,51 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {case .subagentStop: subagentStopCount += 1case .none: break}-+if keepsIdentifiers {if let sessionId = event.sessionId {Self.append(sessionId, to: &sessionIds, using: &identifierCache.sessionIds)}-+if let turnId = event.turnId {Self.append(turnId, to: &turnIds, using: &identifierCache.turnIds)}}-+if let projectDisplayName = event.projectDisplayName {projectCounts[projectDisplayName, default: 0] += 1}}-+mutating func compactIdentifiersIfNeeded(keepsIdentifiers: Bool) {guard !keepsIdentifiers else {sessionIds = Self.normalizedIdentifiers(sessionIds)turnIds = Self.normalizedIdentifiers(turnIds)return}-+sessionCount = resolvedSessionCountturnCount = resolvedTurnCountsessionIds = nilturnIds = nil}-+// 会话/轮次最终值: 优先使用去重/压缩后的数量, 起止事件计数只作为缺失兜底private var resolvedSessionCount: Int {sessionCount ?? sessionIds?.count ?? sessionStartCount}-+private var resolvedTurnCount: Int {turnCount ?? turnIds?.count ?? stopCount}-+var stats: WorkflowDailyStats {let sessionTotal = resolvedSessionCountlet turnTotal = resolvedTurnCountlet toolCallCount = max(preToolUseCount, postToolUseCount)let contextCompactionCount = max(preCompactCount, postCompactCount)let subagentCount = max(subagentStartCount, subagentStopCount)-+return WorkflowDailyStats(startDate: date,sessionCount: sessionTotal,@@ -373,7 +373,7 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {eventCount: eventCount)}-+static func normalized(aggregates: [WorkflowDailyAggregate],today: Date = Date(),@@ -381,29 +381,29 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {) -> [WorkflowDailyAggregate] {let retentionCutoffDate = WorkflowStatsStorage.retentionCutoffDate(today: today, calendar: calendar)let identifierCutoffDate = WorkflowStatsStorage.identifierRetentionCutoffDate(today: today, calendar: calendar)-+return aggregates.compactMap { aggregate inguard let date = Self.date(from: aggregate.date), date >= retentionCutoffDate else {return nil}-+var mutableAggregate = aggregatemutableAggregate.compactIdentifiersIfNeeded(keepsIdentifiers: date >= identifierCutoffDate)return mutableAggregate}.sorted { $0.date < $1.date }}-+static func decodeJSONLines(from data: Data) -> [WorkflowDailyAggregate] {JSONLines.decode(from: data)}-+static func encodeJSONLines(_ aggregates: [WorkflowDailyAggregate]) throws -> Data {try aggregates.reduce(into: Data()) { result, aggregate inresult.append(try aggregate.jsonLineData())}}-+func jsonLineData() throws -> Data {let fields = [try WorkflowStatsJSON.field("date", date),@@ -417,16 +417,16 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {try WorkflowStatsJSON.field("postCompactCount", postCompactCount),try WorkflowStatsJSON.field("subagentStartCount", subagentStartCount),try WorkflowStatsJSON.field("subagentStopCount", subagentStopCount),- try WorkflowStatsJSON.field("sessionIds", sessionIds),- try WorkflowStatsJSON.field("turnIds", turnIds),try WorkflowStatsJSON.field("sessionCount", sessionCount),try WorkflowStatsJSON.field("turnCount", turnCount),- try WorkflowStatsJSON.field("projectCounts", projectCounts)+ try WorkflowStatsJSON.field("projectCounts", projectCounts),+ try WorkflowStatsJSON.field("sessionIds", sessionIds),+ try WorkflowStatsJSON.field("turnIds", turnIds)]-+return WorkflowStatsJSON.lineData(fields)}-+private static func append(_ identifier: String,to identifiers: inout [String]?,@@ -435,34 +435,34 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {guard identifierSet.insert(identifier).inserted else {return}-+if identifiers == nil {identifiers = []}identifiers?.append(identifier)}-+private static func normalizedIdentifiers(_ identifiers: [String]?) -> [String] {Set(identifiers ?? []).sorted()}-+private var mostActiveProject: String? {projectCounts.sorted { lhs, rhs inif lhs.value != rhs.value {return lhs.value > rhs.value}-+return lhs.key.localizedStandardCompare(rhs.key) == .orderedAscending}.first?.key}-+private static func date(from string: String) -> Date? {DateFormatter.codexDay.date(from: string)}-+private enum CodingKeys: String, CodingKey {case datecase eventCount@@ -475,10 +475,10 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {case postCompactCountcase subagentStartCountcase subagentStopCount- case sessionIds- case turnIdscase sessionCountcase turnCountcase projectCounts+ case sessionIds+ case turnIds}}diff --git a/CodexBar/Services/CodexCLI/CodexCLIVersionService.swift b/CodexBar/Services/CodexCLI/CodexCLIVersionService.swiftindex 703efcc..a75fb36 100644--- a/CodexBar/Services/CodexCLI/CodexCLIVersionService.swift+++ b/CodexBar/Services/CodexCLI/CodexCLIVersionService.swift@@ -5,7 +5,7 @@ nonisolated struct CodexCLIVersionSnapshot: Equatable, Sendable {let global: CodexCLIVersionItemlet bundled: CodexCLIVersionItemlet refreshedAt: Date-+// 让首次 refresh 不受节流限制static let empty = CodexCLIVersionSnapshot(global: CodexCLIVersionItem(source: .global),@@ -19,9 +19,9 @@ nonisolated struct CodexCLIVersionItem: Equatable, Identifiable, Sendable {let path: String?let version: String?let errorMessage: String?-+var id: CodexCLIExecutableSource { source }-+init(source: CodexCLIExecutableSource,path: String? = nil,@@ -33,12 +33,12 @@ nonisolated struct CodexCLIVersionItem: Equatable, Identifiable, Sendable {self.version = versionself.errorMessage = errorMessage}-+var displayVersion: String {if path == nil {return "未找到 \(source.displayName)"}-+return version ?? errorMessage ?? "未知版本"}}@@ -52,19 +52,19 @@ nonisolated struct CodexCLIVersionDisplay: Equatable {let path: String?// 当前会话尚未重连到新安装版本时显示的新版本号let newerInstalledVersion: String?-+init(item: CodexCLIVersionItem, connection: CodexCLIConnectionInfo?) {let isCurrent = connection?.source == item.source// 当前来源优先显示正在运行的版本, 避免后台升级后误报已生效let runningVersion = isCurrent ? connection?.version : nillet version = runningVersion ?? item.version-+self.source = item.sourceself.isCurrent = isCurrentself.hasVersion = version != nilself.displayVersion = version ?? item.displayVersionself.path = (isCurrent ? connection?.executablePath : nil) ?? item.path-+if let runningVersion,let installed = item.version,Self.isInstalledVersionNewer(installed, than: runningVersion) {@@ -73,7 +73,7 @@ nonisolated struct CodexCLIVersionDisplay: Equatable {self.newerInstalledVersion = nil}}-+private static func isInstalledVersionNewer(_ installedVersion: String,than runningVersion: String@@ -82,10 +82,10 @@ nonisolated struct CodexCLIVersionDisplay: Equatable {let runningComponents = normalizedVersionComponents(from: runningVersion) else {return false}-+return runningComponents.lexicographicallyPrecedes(installedComponents)}-+private static func normalizedVersionComponents(from version: String) -> [Int]? {let components = version.components(separatedBy: CharacterSet.decimalDigits.inverted)@@ -93,7 +93,7 @@ nonisolated struct CodexCLIVersionDisplay: Equatable {guard !components.isEmpty else {return nil}-+return Array(components.reversed().drop(while: { $0 == 0 }).reversed())}}@@ -103,11 +103,11 @@ nonisolated final class CodexCLIVersionService: @unchecked Sendable {private let timeout: TimeIntervalprivate static let pipeDrainTimeout: TimeInterval = 0.25private static let maxPipeOutputBytes = 64 * 1024-+init(timeout: TimeInterval = 5) {self.timeout = timeout}-+func fetchSnapshot() async -> CodexCLIVersionSnapshot {await withCheckedContinuation { continuation inqueue.async {@@ -115,11 +115,11 @@ nonisolated final class CodexCLIVersionService: @unchecked Sendable {}}}-+private static func fetchSnapshotOnQueue(timeout: TimeInterval) -> CodexCLIVersionSnapshot {let environment = CodexCLIResolver.environmentlet installations = CodexCLIResolver.resolveInstallations(environment: environment)-+// 两个安装源互不依赖, 先并发启动再收集, 避免两个超时串行叠加let globalProbe = startProbe(source: .global,@@ -133,14 +133,14 @@ nonisolated final class CodexCLIVersionService: @unchecked Sendable {environment: environment,timeout: timeout)-+return CodexCLIVersionSnapshot(global: finishProbe(globalProbe),bundled: finishProbe(bundledProbe),refreshedAt: Date())}-+private struct RunningProbe {let source: CodexCLIExecutableSourcelet path: String@@ -150,12 +150,12 @@ nonisolated final class CodexCLIVersionService: @unchecked Sendable {let finished: DispatchSemaphorelet deadline: Date}-+private enum ProbeOutcome {case resolved(CodexCLIVersionItem)case running(RunningProbe)}-+private static func startProbe(source: CodexCLIExecutableSource,path: String?,@@ -165,12 +165,12 @@ nonisolated final class CodexCLIVersionService: @unchecked Sendable {guard let path else {return .resolved(CodexCLIVersionItem(source: source))}-+let process = Process()process.executableURL = URL(fileURLWithPath: path)process.arguments = ["--version"]process.environment = environment-+let standardOutput = Pipe()let standardError = Pipe()let outputCollector = PipeCollector(@@ -182,17 +182,17 @@ nonisolated final class CodexCLIVersionService: @unchecked Sendable {maxBytes: Self.maxPipeOutputBytes)let finished = DispatchSemaphore(value: 0)-+process.standardOutput = standardOutputprocess.standardError = standardErrorprocess.terminationHandler = { _ in finished.signal() }-+do {try process.run()} catch {return .resolved(CodexCLIVersionItem(source: source, path: path, errorMessage: "启动失败"))}-+return .running(RunningProbe(source: source,path: path,@@ -203,7 +203,7 @@ nonisolated final class CodexCLIVersionService: @unchecked Sendable {deadline: Date().addingTimeInterval(timeout)))}-+private static func finishProbe(_ outcome: ProbeOutcome) -> CodexCLIVersionItem {switch outcome {case .resolved(let item):@@ -213,18 +213,18 @@ nonisolated final class CodexCLIVersionService: @unchecked Sendable {terminateTimedOutProbe(probe)return CodexCLIVersionItem(source: probe.source, path: probe.path, errorMessage: "读取超时")}-+let output = collectedText(from: probe.outputCollector, deadline: probe.deadline)let errorOutput = collectedText(from: probe.errorCollector, deadline: probe.deadline)-+guard probe.process.terminationStatus == 0 else {return CodexCLIVersionItem(source: probe.source, path: probe.path, errorMessage: "读取失败")}-+guard let version = firstLine(in: output) ?? firstLine(in: errorOutput) else {return CodexCLIVersionItem(source: probe.source, path: probe.path, errorMessage: "版本未知")}-+return CodexCLIVersionItem(source: probe.source,path: probe.path,@@ -232,7 +232,7 @@ nonisolated final class CodexCLIVersionService: @unchecked Sendable {)}}-+private static func terminateTimedOutProbe(_ probe: RunningProbe) {_ = ProcessTermination.terminate(probe.process,@@ -241,25 +241,25 @@ nonisolated final class CodexCLIVersionService: @unchecked Sendable {)stopCollectors(for: probe)}-+private static func stopCollectors(for probe: RunningProbe) {_ = probe.outputCollector.stopAndRead()_ = probe.errorCollector.stopAndRead()}-+private static func collectedText(from collector: PipeCollector, deadline: Date) -> String {let drainTimeout = min(Self.pipeDrainTimeout, max(0, deadline.timeIntervalSinceNow))_ = collector.waitUntilClosed(timeout: drainTimeout)return String(data: collector.stopAndRead(), encoding: .utf8) ?? ""}-+private static func firstLine(in text: String) -> String? {text.split(whereSeparator: \.isNewline).map { $0.trimmingCharacters(in: .whitespacesAndNewlines) }.first { !$0.isEmpty }}-+}private nonisolated final class PipeCollector: @unchecked Sendable {@@ -269,7 +269,7 @@ private nonisolated final class PipeCollector: @unchecked Sendable {private let maxBytes: Intprivate var data = Data()private var isClosed = false-+init(fileHandle: FileHandle, maxBytes: Int) {self.fileHandle = fileHandleself.maxBytes = max(maxBytes, 0)@@ -280,47 +280,47 @@ private nonisolated final class PipeCollector: @unchecked Sendable {self?.markClosed()return}-+self?.append(availableData)}}-+func waitUntilClosed(timeout: TimeInterval) -> Bool {lock.lock()let closed = isClosedlock.unlock()-+guard !closed else {return true}-+return closedSemaphore.wait(timeout: .now() + max(0, timeout)) == .success}-+func stopAndRead() -> Data {fileHandle.readabilityHandler = niltry? fileHandle.close()-+lock.lock()let snapshot = dataisClosed = truelock.unlock()closedSemaphore.signal()-+return snapshot}-+private func append(_ chunk: Data) {lock.lock()defer { lock.unlock() }-+guard data.count < maxBytes else {return}-+data.append(chunk.prefix(maxBytes - data.count))}-+private func markClosed() {lock.lock()isClosed = true@@ -342,33 +342,33 @@ nonisolated enum CodexCLIVersionReader {final class CodexCLIVersionViewModel: ObservableObject {@Published private(set) var snapshot = CodexCLIVersionSnapshot.empty@Published private(set) var isRefreshing = false-+// onAppear 和 didBecomeActive 常连发, 版本探测需要节流以避免频繁启动子进程private static let refreshThrottle: TimeInterval = 60-+private let service: CodexCLIVersionServiceprivate var refreshTask: Task<Void, Never>?-+init(service: CodexCLIVersionService = CodexCLIVersionService()) {self.service = service}-+deinit {refreshTask?.cancel()}-+func refresh() {guard !isRefreshing,Date().timeIntervalSince(snapshot.refreshedAt) > Self.refreshThrottle else {return}isRefreshing = true-+refreshTask = Task {let snapshot = await service.fetchSnapshot()-+guard !Task.isCancelled else { return }-+self.snapshot = snapshotself.isRefreshing = false}diff --git a/CodexBar/Services/WorkflowStats/WorkflowHookEventRecorder.swift b/CodexBar/Services/WorkflowStats/WorkflowHookEventRecorder.swiftindex 2e8b5e6..556e86b 100644--- a/CodexBar/Services/WorkflowStats/WorkflowHookEventRecorder.swift+++ b/CodexBar/Services/WorkflowStats/WorkflowHookEventRecorder.swift@@ -6,11 +6,11 @@ nonisolated enum WorkflowHookEventRecorder {guard let eventName = hookEventName(from: arguments) else {return false}-+try? record(eventName: eventName)return true}-+private static func hookEventName(from arguments: [String]) -> String? {for argument in arguments.dropFirst() {if argument.hasPrefix("--hook-event=") {@@ -19,17 +19,17 @@ nonisolated enum WorkflowHookEventRecorder {return value.isEmpty ? nil : value}}-+if let optionIndex = arguments.firstIndex(of: "--hook-event"),arguments.indices.contains(arguments.index(after: optionIndex)) {let value = arguments[arguments.index(after: optionIndex)].trimmingCharacters(in: .whitespacesAndNewlines)return value.isEmpty ? nil : value}-+return nil}-+private static func record(eventName: String) throws {let payload = stdinPayload()let timestamp = payload.date(for: "timestamp") ?? Date()@@ -49,68 +49,68 @@ nonisolated enum WorkflowHookEventRecorder {sessionId: sessionId,turnId: turnId)-+try recordStatsTransaction(event: event)}-+private static func recordStatsTransaction(event: WorkflowHookEvent) throws {try WorkflowStatsStorage.withExclusiveLock {let dateKey = WorkflowStatsStorage.dateKey(for: event.timestamp)let eventLogURL = WorkflowStatsStorage.eventLogURL(for: dateKey)var maintenanceState = WorkflowStatsStorage.loadMaintenanceState()-+try append(event.jsonLineData(), to: eventLogURL)maintenanceState.markPending(dateKey)try WorkflowStatsStorage.saveMaintenanceState(maintenanceState)}}-+private static func append(_ data: Data, to url: URL) throws {try FileManager.default.createDirectory(at: url.deletingLastPathComponent(),withIntermediateDirectories: true)-+if !FileManager.default.fileExists(atPath: url.path) {FileManager.default.createFile(atPath: url.path, contents: nil)}-+let fileHandle = try FileHandle(forWritingTo: url)defer {try? fileHandle.close()}-+try fileHandle.seekToEnd()try fileHandle.write(contentsOf: data)}-+private static func stdinPayload() -> WorkflowHookPayload {guard isatty(STDIN_FILENO) == 0 else {return WorkflowHookPayload(values: [:])}-+let data = FileHandle.standardInput.readDataToEndOfFile()guard !data.isEmpty,let object = try? JSONSerialization.jsonObject(with: data),let values = object as? [String: Any] else {return WorkflowHookPayload(values: [:])}-+return WorkflowHookPayload(values: values)}}private nonisolated struct WorkflowHookPayload {let values: [String: Any]-+func string(for key: String) -> String? {Self.normalizedString(values[key])}-+func date(for key: String) -> Date? {Self.normalizedDate(values[key])}-+private static func normalizedString(_ value: Any?) -> String? {switch value {case let string as String:@@ -122,7 +122,7 @@ private nonisolated struct WorkflowHookPayload {return nil}}-+private static func normalizedDate(_ value: Any?) -> Date? {switch value {case let string as String:@@ -135,24 +135,24 @@ private nonisolated struct WorkflowHookPayload {return nil}}-+private static func date(from string: String) -> Date? {let trimmedString = string.trimmingCharacters(in: .whitespacesAndNewlines)guard !trimmedString.isEmpty else {return nil}-+if let date = ISO8601DateFormatter.codexFractional.date(from: trimmedString) {return date}-+if let date = DateFormatter.codexLocalTimestamp.date(from: trimmedString) {return date}-+return iso8601Formatter.date(from: trimmedString)}-+private static let iso8601Formatter: ISO8601DateFormatter = {let formatter = ISO8601DateFormatter()formatter.formatOptions = [.withInternetDateTime]diff --git a/CodexBar/Services/WorkflowStats/WorkflowStatsService.swift b/CodexBar/Services/WorkflowStats/WorkflowStatsService.swiftindex 42275fa..0a879fa 100644--- a/CodexBar/Services/WorkflowStats/WorkflowStatsService.swift+++ b/CodexBar/Services/WorkflowStats/WorkflowStatsService.swift@@ -7,7 +7,7 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {private let eventsDirectoryURL: URLprivate let dailyLogURL: URLprivate static let eventReadChunkSize = 64 * 1024-+init(eventsDirectoryURL: URL = WorkflowStatsStorage.eventsDirectoryURL(),dailyLogURL: URL = WorkflowStatsStorage.dailyURL()@@ -15,7 +15,7 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {self.eventsDirectoryURL = eventsDirectoryURLself.dailyLogURL = dailyLogURL}-+func loadSnapshot(performMaintenance: Bool = false) async -> WorkflowStatsSnapshot {await withCheckedContinuation { continuation inqueue.async {@@ -23,39 +23,39 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {}}}-+private func loadSnapshotOnQueue(performMaintenance: Bool) -> WorkflowStatsSnapshot {if performMaintenance {performMaintenanceIfNeededOnQueue()}-+if let aggregates = loadDailyAggregatesOnQueue(), !aggregates.isEmpty {return WorkflowStatsSnapshot(dailyAggregates: aggregates)}-+return .empty}-+private func loadDailyAggregatesOnQueue() -> [WorkflowDailyAggregate]? {guard let data = try? Data(contentsOf: dailyLogURL), !data.isEmpty else {return nil}-+let aggregates = WorkflowDailyAggregate.decodeJSONLines(from: data)guard !aggregates.isEmpty else {return nil}-+return WorkflowDailyAggregate.normalized(aggregates: aggregates)}-+private func performMaintenanceIfNeededOnQueue() {do {let tasks = try prepareMaintenanceTasksOnQueue()guard !tasks.isEmpty else {return}-+for task in tasks {do {let result = try buildDailyAggregate(for: task)@@ -64,24 +64,24 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {markDirtyOnQueue(task.dateKey)}}-+try pruneExpiredEventFilesOnQueue()} catch {return}}-+private func prepareMaintenanceTasksOnQueue() throws -> [WorkflowStatsMaintenanceTask] {let eventDateKeys = eventDateKeysOnQueue()let dailyDecodeResult = loadDailyAggregatesWithFailuresOnQueue()-+return try WorkflowStatsStorage.withExclusiveLock {var state = WorkflowStatsStorage.loadMaintenanceState()var changedState = state.normalize()let dailyByDate = dailyDecodeResult.values.reduce(into: [String: WorkflowDailyAggregate]()) { result, aggregate inresult[aggregate.date] = aggregate}-+changedState = markRebuildDates(eventDateKeys: eventDateKeys,dailyDecodeResult: dailyDecodeResult,@@ -89,21 +89,21 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {state: &state) || changedStatechangedState = reconcileEventFiles(eventDateKeys: eventDateKeys, state: &state) || changedState-+let tasks = makeMaintenanceTasks(state: &state,dailyByDate: dailyByDate,changedState: &changedState)-+if changedState {try WorkflowStatsStorage.saveMaintenanceState(state)}-+return tasks}}-+private func markRebuildDates(eventDateKeys: [String],dailyDecodeResult: JSONLinesDecodeResult<WorkflowDailyAggregate>,@@ -111,29 +111,29 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {state: inout WorkflowStatsMaintenanceState) -> Bool {var changed = false-+if state.schema != WorkflowStatsMaintenanceState.currentSchema {changed = markDirty(eventDateKeys, in: &state) || changedstate.schema = WorkflowStatsMaintenanceState.currentSchemachanged = true}-+if dailyDecodeResult.failedLineCount > 0 || (dailyDecodeResult.values.isEmpty && !eventDateKeys.isEmpty) {changed = markDirty(eventDateKeys, in: &state) || changed}-+changed = markDirty(eventDateKeys.filter { dailyByDate[$0] == nil }, in: &state) || changedchanged = markDirty(state.pending.filter { dailyByDate[$0] == nil }, in: &state) || changed-+return changed}-+private func reconcileEventFiles(eventDateKeys: [String],state: inout WorkflowStatsMaintenanceState) -> Bool {var changed = markDirty(eventDateKeys.filter { state.days[$0] == nil }, in: &state)-+for (dateKey, day) in state.days {let actualSize = eventLogSize(for: dateKey)if actualSize < day.offset || day.offset != day.size {@@ -146,10 +146,10 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {changed = true}}-+return changed}-+private func makeMaintenanceTasks(state: inout WorkflowStatsMaintenanceState,dailyByDate: [String: WorkflowDailyAggregate],@@ -157,7 +157,7 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {) -> [WorkflowStatsMaintenanceTask] {let dirty = Set(state.dirty)var tasks = state.dirty.map { dirtyTask(for: $0) }-+for dateKey in state.pending where !dirty.contains(dateKey) {let day = state.days[dateKey] ?? WorkflowStatsDayMaintenanceState()let size = eventLogSize(for: dateKey)@@ -166,14 +166,14 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {changedState = truecontinue}-+guard let baseAggregate = dailyByDate[dateKey] else {state.markDirty(dateKey)changedState = truetasks.append(dirtyTask(for: dateKey, size: size))continue}-+tasks.append(pendingTask(for: dateKey,@@ -183,24 +183,24 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {))}-+return tasks}-+private func markDirty(_ dateKeys: [String],in state: inout WorkflowStatsMaintenanceState) -> Bool {let previousDirty = state.dirtylet previousDays = state.days-+for dateKey in dateKeys {state.markDirty(dateKey)}-+return previousDirty != state.dirty || previousDays != state.days}-+private func dirtyTask(for dateKey: String, size: UInt64? = nil) -> WorkflowStatsMaintenanceTask {WorkflowStatsMaintenanceTask(dateKey: dateKey,@@ -210,7 +210,7 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {existingCorrupt: 0)}-+private func pendingTask(for dateKey: String,day: WorkflowStatsDayMaintenanceState,@@ -225,23 +225,23 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {existingCorrupt: day.corrupt)}-+private func eventLogURL(for dateKey: String) -> URL {eventsDirectoryURL.appendingPathComponent("\(dateKey).jsonl", isDirectory: false)}-+private func eventLogSize(for dateKey: String) -> UInt64 {WorkflowStatsStorage.fileSize(at: eventLogURL(for: dateKey))}-+private func loadDailyAggregatesWithFailuresOnQueue() -> JSONLinesDecodeResult<WorkflowDailyAggregate> {guard let data = try? Data(contentsOf: dailyLogURL), !data.isEmpty else {return JSONLinesDecodeResult(values: [], failedLineCount: 0)}-+return JSONLines.decodeWithFailures(from: data)}-+private func eventDateKeysOnQueue() -> [String] {guard let contents = try? FileManager.default.contentsOfDirectory(at: eventsDirectoryURL,@@ -249,14 +249,14 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {) else {return []}-+return contents.filter { $0.pathExtension == "jsonl" }.map { $0.deletingPathExtension().lastPathComponent }.filter { WorkflowStatsStorage.isValidDateKey($0) }.sorted()}-+private func buildDailyAggregate(for task: WorkflowStatsMaintenanceTask) throws -> WorkflowStatsMaintenanceResult {@@ -264,7 +264,7 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {var corrupt = task.existingCorruptvar identifierCache = WorkflowDailyIdentifierCache(aggregate: aggregate)let keepsIdentifiers = keepsIdentifiers(for: task.dateKey)-+corrupt += try readEvents(at: eventLogURL(for: task.dateKey),from: task.startOffset,@@ -276,7 +276,7 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {identifierCache: &identifierCache)}-+aggregate.compactIdentifiersIfNeeded(keepsIdentifiers: keepsIdentifiers)return WorkflowStatsMaintenanceResult(dateKey: task.dateKey,@@ -285,7 +285,7 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {corrupt: corrupt)}-+private func readEvents(at url: URL,from startOffset: UInt64,@@ -295,42 +295,42 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {guard size > startOffset else {return 0}-+let fileHandle = try FileHandle(forReadingFrom: url)defer {try? fileHandle.close()}-+try fileHandle.seek(toOffset: startOffset)-+let decoder = JSONDecoder()var remainingBytes = size - startOffsetvar buffer = Data()var corrupt = 0-+while remainingBytes > 0 {let readSize = min(Int(remainingBytes), Self.eventReadChunkSize)guard let chunk = try fileHandle.read(upToCount: readSize), !chunk.isEmpty else {break}-+remainingBytes -= UInt64(chunk.count)buffer.append(chunk)-+while let newlineIndex = buffer.firstIndex(of: 0x0A) {let lineData = buffer[..<newlineIndex]corrupt += decode(lineData, using: decoder, record: record)buffer.removeSubrange(...newlineIndex)}}-+if !buffer.isEmpty {corrupt += decode(buffer, using: decoder, record: record)}-+return corrupt}-+private func decode(_ lineData: Data.SubSequence,using decoder: JSONDecoder,@@ -341,81 +341,81 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {guard !line.isEmpty else {return 0}-+guard let data = line.data(using: .utf8),let event = try? decoder.decode(WorkflowHookEvent.self, from: data) else {return 1}-+record(event)return 0}-+private func commit(_ result: WorkflowStatsMaintenanceResult) throws {guard try eventLogHasNotShrunk(for: result) else {return}-+try writeDailyAggregate(result.aggregate)try commitMaintenanceState(result)}-+private func eventLogHasNotShrunk(for result: WorkflowStatsMaintenanceResult) throws -> Bool {try WorkflowStatsStorage.withExclusiveLock {let currentSize = WorkflowStatsStorage.fileSize(at: eventLogURL(for: result.dateKey))var state = WorkflowStatsStorage.loadMaintenanceState()-+guard currentSize >= result.size else {state.markDirty(result.dateKey)try WorkflowStatsStorage.saveMaintenanceState(state)return false}-+return true}}-+private func writeDailyAggregate(_ aggregate: WorkflowDailyAggregate) throws {try FileManager.default.createDirectory(at: dailyLogURL.deletingLastPathComponent(),withIntermediateDirectories: true)-+var aggregates = loadDailyAggregatesOnQueue() ?? []upsert(aggregate, into: &aggregates)aggregates = WorkflowDailyAggregate.normalized(aggregates: aggregates)let data = try WorkflowDailyAggregate.encodeJSONLines(aggregates)try data.write(to: dailyLogURL, options: .atomic)}-+private func commitMaintenanceState(_ result: WorkflowStatsMaintenanceResult) throws {try WorkflowStatsStorage.withExclusiveLock {let currentSize = WorkflowStatsStorage.fileSize(at: eventLogURL(for: result.dateKey))var state = WorkflowStatsStorage.loadMaintenanceState()-+guard currentSize >= result.size else {state.markDirty(result.dateKey)try WorkflowStatsStorage.saveMaintenanceState(state)return}-+state.days[result.dateKey] = WorkflowStatsDayMaintenanceState(offset: result.size,size: result.size,corrupt: result.corrupt)state.removeDirty(result.dateKey)-+if currentSize == result.size {state.removePending(result.dateKey)} else {state.markPending(result.dateKey)}-+try WorkflowStatsStorage.saveMaintenanceState(state)}}-+private func upsert(_ aggregate: WorkflowDailyAggregate, into aggregates: inout [WorkflowDailyAggregate]) {if let index = aggregates.firstIndex(where: { $0.date == aggregate.date }) {aggregates[index] = aggregate@@ -423,7 +423,7 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {aggregates.append(aggregate)}}-+private func markDirtyOnQueue(_ dateKey: String) {try? WorkflowStatsStorage.withExclusiveLock {var state = WorkflowStatsStorage.loadMaintenanceState()@@ -431,71 +431,71 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {try WorkflowStatsStorage.saveMaintenanceState(state)}}-+private func pruneExpiredEventFilesOnQueue() throws {let cutoffDate = WorkflowStatsStorage.retentionCutoffDate()let expiredDateKeys = eventDateKeysOnQueue().filter { dateKey inguard let date = DateFormatter.codexDay.date(from: dateKey) else {return false}-+return date < cutoffDate}-+guard !expiredDateKeys.isEmpty else {return}-+try WorkflowStatsStorage.withExclusiveLock {var state = WorkflowStatsStorage.loadMaintenanceState()for dateKey in expiredDateKeys {try? FileManager.default.removeItem(at: eventLogURL(for: dateKey))state.remove(dateKey)}-+try WorkflowStatsStorage.saveMaintenanceState(state)}}-+private func keepsIdentifiers(for dateKey: String) -> Bool {guard let date = DateFormatter.codexDay.date(from: dateKey) else {return true}-+return date >= WorkflowStatsStorage.identifierRetentionCutoffDate()}-+}nonisolated enum WorkflowStatsStorage {private static let retentionDayCount = 210private static let identifierRetentionDayCount = 7-+static func eventsDirectoryURL() -> URL {directoryURL().appendingPathComponent("events", isDirectory: true)}-+static func eventLogURL(for dateKey: String) -> URL {eventsDirectoryURL().appendingPathComponent("\(dateKey).jsonl", isDirectory: false)}-+static func dailyURL() -> URL {directoryURL().appendingPathComponent("daily.jsonl", isDirectory: false)}-+static func lockURL() -> URL {directoryURL().appendingPathComponent("stats.lock", isDirectory: false)}-+static func maintenanceURL() -> URL {directoryURL().appendingPathComponent("maintenance.json", isDirectory: false)}-+static func directoryURL() -> URL {let applicationSupportURL = FileManager.default.urls(for: .applicationSupportDirectory,@@ -503,70 +503,70 @@ nonisolated enum WorkflowStatsStorage {).first ?? URL(fileURLWithPath: NSHomeDirectory()).appendingPathComponent("Library", isDirectory: true).appendingPathComponent("Application Support", isDirectory: true)-+return applicationSupportURL.appendingPathComponent("CodexBar", isDirectory: true).appendingPathComponent("HookEvents", isDirectory: true)}-+static func withExclusiveLock<T>(_ work: () throws -> T) throws -> T {try FileManager.default.createDirectory(at: directoryURL(),withIntermediateDirectories: true)-+let lockURL = lockURL()if !FileManager.default.fileExists(atPath: lockURL.path) {FileManager.default.createFile(atPath: lockURL.path, contents: nil)}-+let lockHandle = try FileHandle(forUpdating: lockURL)defer {try? lockHandle.close()}-+if flock(lockHandle.fileDescriptor, LOCK_EX) != 0 {throw POSIXError(POSIXErrorCode(rawValue: errno) ?? .EIO)}-+defer {flock(lockHandle.fileDescriptor, LOCK_UN)}-+return try work()}-+static func loadMaintenanceState() -> WorkflowStatsMaintenanceState {let url = maintenanceURL()guard let data = try? Data(contentsOf: url), !data.isEmpty,let state = try? JSONDecoder().decode(WorkflowStatsMaintenanceState.self, from: data) else {return WorkflowStatsMaintenanceState()}-+return state}-+static func saveMaintenanceState(_ state: WorkflowStatsMaintenanceState) throws {try FileManager.default.createDirectory(at: directoryURL(),withIntermediateDirectories: true)-+let encoder = JSONEncoder()encoder.outputFormatting = [.sortedKeys, .withoutEscapingSlashes]let data = try encoder.encode(state)try data.write(to: maintenanceURL(), options: .atomic)}-+static func fileSize(at url: URL) -> UInt64 {guard let attributes = try? FileManager.default.attributesOfItem(atPath: url.path),let fileSize = attributes[.size] as? NSNumber else {return 0}-+return fileSize.uint64Value}-+static func retentionCutoffDate(today: Date = Date(), calendar: Calendar = .current) -> Date {let todayStart = calendar.startOfDay(for: today)return calendar.date(@@ -575,7 +575,7 @@ nonisolated enum WorkflowStatsStorage {to: todayStart) ?? todayStart}-+static func identifierRetentionCutoffDate(today: Date = Date(), calendar: Calendar = .current) -> Date {let todayStart = calendar.startOfDay(for: today)return calendar.date(@@ -584,11 +584,11 @@ nonisolated enum WorkflowStatsStorage {to: todayStart) ?? todayStart}-+static func dateKey(for date: Date) -> String {DateFormatter.codexDay.string(from: date)}-+static func isValidDateKey(_ dateKey: String) -> Bool {DateFormatter.codexDay.date(from: dateKey) != nil}@@ -598,7 +598,7 @@ nonisolated struct WorkflowStatsDayMaintenanceState: Codable, Equatable {var offset: UInt64var size: UInt64var corrupt: Int-+init(offset: UInt64 = 0, size: UInt64 = 0, corrupt: Int = 0) {self.offset = offsetself.size = size@@ -608,12 +608,12 @@ nonisolated struct WorkflowStatsDayMaintenanceState: Codable, Equatable {nonisolated struct WorkflowStatsMaintenanceState: Codable, Equatable {static let currentSchema = 2-+var schema: Intvar pending: [String]var dirty: [String]var days: [String: WorkflowStatsDayMaintenanceState]-+init(schema: Int = Self.currentSchema,pending: [String] = [],@@ -625,7 +625,7 @@ nonisolated struct WorkflowStatsMaintenanceState: Codable, Equatable {self.dirty = Self.normalizedDates(dirty)self.days = days}-+init(from decoder: Decoder) throws {let container = try decoder.container(keyedBy: CodingKeys.self)self.schema = try container.decodeIfPresent(Int.self, forKey: .schema) ?? Self.currentSchema@@ -633,53 +633,53 @@ nonisolated struct WorkflowStatsMaintenanceState: Codable, Equatable {self.dirty = Self.normalizedDates(try container.decodeIfPresent([String].self, forKey: .dirty) ?? [])self.days = try container.decodeIfPresent([String: WorkflowStatsDayMaintenanceState].self, forKey: .days) ?? [:]}-+mutating func markPending(_ dateKey: String) {pending = Self.inserting(dateKey, into: pending)ensureDayState(for: dateKey)}-+mutating func markDirty(_ dateKey: String) {dirty = Self.inserting(dateKey, into: dirty)ensureDayState(for: dateKey)}-+mutating func removePending(_ dateKey: String) {pending.removeAll { $0 == dateKey }}-+mutating func removeDirty(_ dateKey: String) {dirty.removeAll { $0 == dateKey }}-+mutating func remove(_ dateKey: String) {removePending(dateKey)removeDirty(dateKey)days.removeValue(forKey: dateKey)}-+mutating func normalize() -> Bool {let previousPending = pendinglet previousDirty = dirtylet previousDays = days-+pending = Self.normalizedDates(pending)dirty = Self.normalizedDates(dirty)days = days.filter { WorkflowStatsStorage.isValidDateKey($0.key) }-+return previousPending != pending || previousDirty != dirty || previousDays != days}-+private mutating func ensureDayState(for dateKey: String) {if days[dateKey] == nil {days[dateKey] = WorkflowStatsDayMaintenanceState()}}-+private static func inserting(_ dateKey: String, into dates: [String]) -> [String] {normalizedDates(dates + [dateKey])}-+private static func normalizedDates(_ dates: [String]) -> [String] {Array(Set(dates.filter { WorkflowStatsStorage.isValidDateKey($0) })).sorted()}@@ -703,32 +703,32 @@ private nonisolated struct WorkflowStatsMaintenanceResult {@MainActorfinal class WorkflowStatsViewModel: ObservableObject {@Published private(set) var snapshot = WorkflowStatsSnapshot.empty-+private static let minimumRefreshInterval: TimeInterval = 5-+private let service: WorkflowStatsServiceprivate var isRefreshing = falseprivate var lastRefreshedAt: Date?-+init(service: WorkflowStatsService = WorkflowStatsService()) {self.service = service}-+func refreshIfNeeded(performMaintenance: Bool = false) {guard performMaintenance || Date().timeIntervalSince(lastRefreshedAt ?? .distantPast) > Self.minimumRefreshInterval else {return}-+refresh(performMaintenance: performMaintenance)}-+func refresh(performMaintenance: Bool = false) {guard !isRefreshing else {return}-+isRefreshing = true-+Task {snapshot = await service.loadSnapshot(performMaintenance: performMaintenance)lastRefreshedAt = Date()diff --git a/CodexBar/Views/Menu/UsageHeatmap.swift b/CodexBar/Views/Menu/UsageHeatmap.swiftindex 9d4928c..b493102 100644--- a/CodexBar/Views/Menu/UsageHeatmap.swift+++ b/CodexBar/Views/Menu/UsageHeatmap.swift@@ -6,7 +6,7 @@ struct UsageSummaryView: View {let showsWorkflowStats: Boolprivate let days: [UsageHeatmapDay?]@State private var hoveredDay: UsageHeatmapDay?-+init(usage: CodexUsageSnapshot,workflowStats: WorkflowStatsSnapshot,@@ -16,7 +16,7 @@ struct UsageSummaryView: View {self.usage = usageself.isStale = isStaleself.showsWorkflowStats = showsWorkflowStats-+self.days = UsageHeatmapDay.grid(usage: usage,workflowStats: workflowStats,@@ -25,11 +25,11 @@ struct UsageSummaryView: View {today: Date())}-+var body: some View {VStack(alignment: .leading, spacing: 8) {metricsGrid-+UsageHeatmap(days: days,showsWorkflowStats: showsWorkflowStats,@@ -48,7 +48,7 @@ struct UsageSummaryView: View {.animation(Metrics.statusAnimation, value: usage).animation(Metrics.statusAnimation, value: days)}-+private var metricsGrid: some View {HStack(alignment: .firstTextBaseline, spacing: Metrics.metricSpacing) {tokenMetric(label: "全时累计", value: usage.summary.lifetimeTokens, alignment: .center)@@ -58,13 +58,13 @@ struct UsageSummaryView: View {textMetric(label: "最长任务", value: Self.durationText(seconds: usage.summary.longestRunningTurnSec))}}-+private func tokenMetric(label: String, value: Int, alignment: Alignment) -> some View {metric(label: label, alignment: alignment) {TokenCountText(tokens: value)}}-+private func textMetric(label: String, value: String) -> some View {metric(label: label, alignment: .center) {Text(value)@@ -73,7 +73,7 @@ struct UsageSummaryView: View {.minimumScaleFactor(0.8)}}-+private func metric<Content: View>(label: String,alignment: Alignment,@@ -84,59 +84,59 @@ struct UsageSummaryView: View {.font(.caption2).foregroundStyle(.secondary).frame(maxWidth: .infinity, alignment: alignment)-+value().frame(maxWidth: .infinity, alignment: alignment)}.frame(maxWidth: .infinity)}-+private static func dayText(_ days: Int?) -> String {guard let days else {return "--"}-+return "\(max(days, 0))天"}-+private static func durationText(seconds: Int?) -> String {guard let seconds else {return "--"}-+let duration = max(seconds, 0)let days = duration / 86_400let hours = duration % 86_400 / 3_600let minutes = duration % 3_600 / 60let remainingSeconds = duration % 60-+if days > 0 {return "\(days) 天 \(hours) 时 \(minutes) 分 \(remainingSeconds) 秒"}-+if hours > 0 {return "\(hours) 时 \(minutes) 分 \(remainingSeconds) 秒"}-+if minutes > 0 {return "\(minutes) 分 \(remainingSeconds) 秒"}-+return "\(remainingSeconds) 秒"}-+private enum Metrics {static let metricSpacing: CGFloat = 8static let statusAnimation = Animation.codexStatus}-+private func refreshHoveredDay(from days: [UsageHeatmapDay?]) {guard let hoveredDay,let updatedDay = days.compactMap({ $0 }).first(where: { $0.id == hoveredDay.id }),updatedDay != hoveredDay else {return}-+withAnimation(Metrics.statusAnimation) {self.hoveredDay = updatedDay}@@ -150,7 +150,7 @@ struct UsageHeatmap: View {@State private var hoveredSquareFrame: CGRect = .zero// hover 期间 body 频繁重算, 峰值只在构建时求一次private let peakTokens: Int-+init(days: [UsageHeatmapDay?],showsWorkflowStats: Bool,@@ -161,11 +161,11 @@ struct UsageHeatmap: View {self._hoveredDay = hoveredDayself.peakTokens = max(days.lazy.compactMap { $0?.tokensForHeatmap }.max() ?? 0, 1)}-+var body: some View {ZStack(alignment: .topLeading) {heatmapGrid-+if let hoveredDay {UsageHeatmapTooltip(day: hoveredDay, showsWorkflowStats: showsWorkflowStats).id(hoveredDay.id)@@ -178,16 +178,16 @@ struct UsageHeatmap: View {.frame(height: Metrics.height).coordinateSpace(name: Metrics.coordinateSpaceName)}-+private var heatmapGrid: some View {VStack(alignment: .leading, spacing: 6) {HStack(alignment: .firstTextBaseline) {Text("近 \(Metrics.columnCount) 周").font(.caption2.weight(.medium)).foregroundStyle(.secondary)-+Spacer()-+if let firstDate = visibleDays.first?.startDate, let lastDate = visibleDays.last?.startDate {Text("\(firstDate) ~ \(lastDate)").font(.caption2.monospacedDigit())@@ -195,13 +195,13 @@ struct UsageHeatmap: View {.lineLimit(1)}}-+HStack(alignment: .top, spacing: Metrics.squareSpacing) {ForEach(0..<Metrics.columnCount, id: \.self) { column inVStack(spacing: Metrics.squareSpacing) {ForEach(0..<Metrics.rowCount, id: \.self) { row inlet index = column * Metrics.rowCount + row-+if days.indices.contains(index), let day = days[index] {UsageHeatmapSquare(day: day,@@ -234,39 +234,39 @@ struct UsageHeatmap: View {}.frame(maxWidth: .infinity, alignment: .leading)}-+private var visibleDays: [UsageHeatmapDay] {days.compactMap { $0 }}-+private var tooltipOffset: CGSize {let aboveY = hoveredSquareFrame.minY - Metrics.tooltipSquareSpacing - tooltipHeightlet tooltipY = aboveY >= 0 ? aboveY : hoveredSquareFrame.maxY + Metrics.tooltipSquareSpacing-+return CGSize(width: tooltipX(for: hoveredSquareFrame),height: min(max(tooltipY, 0), max(0, Metrics.height - tooltipHeight)))}-+private var tooltipHeight: CGFloat {Metrics.tooltipHeight(showsWorkflowStats: showsWorkflowStats)}-+private func tooltipX(for squareFrame: CGRect) -> CGFloat {let trailingX = squareFrame.maxX + Metrics.tooltipSquareSpacinglet tooltipWidth = Metrics.tooltipWidth(showsWorkflowStats: showsWorkflowStats)let leadingX = squareFrame.minX - Metrics.tooltipSquareSpacing - tooltipWidthlet maxX = max(0, Metrics.totalWidth - tooltipWidth)-+if leadingX >= 0 {return leadingX}-+if trailingX + tooltipWidth <= Metrics.totalWidth {return trailingX}-+return min(max(leadingX, 0), maxX)}}@@ -285,15 +285,15 @@ extension UsageHeatmap {static let tokenTooltipHeight: CGFloat = 40static let tooltipSquareSpacing: CGFloat = 2static let tooltipFadeDuration: TimeInterval = 0.15-+static var totalWidth: CGFloat {CGFloat(columnCount) * squareSize + CGFloat(columnCount - 1) * squareSpacing}-+static func tooltipWidth(showsWorkflowStats: Bool) -> CGFloat {showsWorkflowStats ? workflowTooltipWidth : tokenTooltipWidth}-+static func tooltipHeight(showsWorkflowStats: Bool) -> CGFloat {showsWorkflowStats ? workflowTooltipHeight : tokenTooltipHeight}@@ -306,7 +306,7 @@ private struct UsageHeatmapSquare: View {let isHovered: Boollet onActive: (CGRect) -> Voidlet onEnded: () -> Void-+var body: some View {GeometryReader { proxy inRoundedRectangle(cornerRadius: 4, style: .continuous)@@ -330,26 +330,26 @@ private struct UsageHeatmapSquare: View {.contentShape(RoundedRectangle(cornerRadius: 4, style: .continuous)).animation(.snappy(duration: 0.14), value: isHovered)}-+private var clampedPercent: Double {min(max(percent, 0), 1)}-+private var fillColor: Color {guard day.tokensForHeatmap > 0 else {return Color.blue.opacity(isHovered ? 0.16 : 0.08)}-+let intensity = pow(clampedPercent, 0.62)let opacity = 0.18 + intensity * 0.68return Color.blue.opacity(isHovered ? min(opacity + 0.10, 1.0) : opacity)}-+private var borderColor: Color {if isHovered {return Color.blue.opacity(0.78)}-+return Color.blue.opacity(day.tokensForHeatmap > 0 ? 0.18 : 0.10)}}@@ -358,18 +358,18 @@ private struct UsageHeatmapTooltip: View {let day: UsageHeatmapDaylet showsWorkflowStats: Bool@Environment(\.colorScheme) private var colorScheme-+var body: some View {VStack(alignment: .leading, spacing: Metrics.rowSpacing) {if showsWorkflowStats {HStack(alignment: .firstTextBaseline, spacing: Metrics.headerSpacing) {dateText-+Spacer(minLength: Metrics.headerMinimumSpacer)-+tokenText}-+ForEach(workflowMetricRows, id: \.label) { row inmetricRow(row.label, value: row.value)}@@ -392,7 +392,7 @@ private struct UsageHeatmapTooltip: View {.liquidGlassSurface(cornerRadius: Metrics.cornerRadius).animation(Metrics.statusAnimation, value: day)}-+private var workflowMetricRows: [(label: String, value: String)] {[("会话总数", "\(day.workflowStats.sessionCount)"),@@ -403,15 +403,15 @@ private struct UsageHeatmapTooltip: View {("上下文压缩", "\(day.workflowStats.contextCompactionCount)")]}-+private var tooltipHeight: CGFloat {UsageHeatmap.Metrics.tooltipHeight(showsWorkflowStats: showsWorkflowStats)}-+private var tooltipWidth: CGFloat {UsageHeatmap.Metrics.tooltipWidth(showsWorkflowStats: showsWorkflowStats)}-+private var dateText: some View {Text(day.startDate).font(dateFont)@@ -420,7 +420,7 @@ private struct UsageHeatmapTooltip: View {.fixedSize(horizontal: true, vertical: false).layoutPriority(1)}-+@ViewBuilderprivate var tokenText: some View {if let tokenCount = day.tokenCount {@@ -434,35 +434,35 @@ private struct UsageHeatmapTooltip: View {.contentTransition(.opacity)}}-+private var dateFont: Font {showsWorkflowStats? .system(size: Metrics.workflowFontSize).monospacedDigit(): .caption2.monospacedDigit()}-+private var tokenFont: Font {showsWorkflowStats? .system(size: Metrics.workflowFontSize).monospacedDigit().weight(.semibold): .caption.monospacedDigit().weight(.semibold)}-+private func metricRow(_ label: String, value: String) -> some View {HStack(spacing: Metrics.metricRowSpacing) {Text(label).foregroundStyle(.secondary).frame(width: Metrics.metricLabelWidth, alignment: .leading)-+fittingMetricValue(value)}.font(.system(size: Metrics.workflowFontSize))}-+private func fittingMetricValue(_ value: String) -> some View {ViewThatFits(in: .horizontal) {metricValueText(value).fixedSize(horizontal: true, vertical: false)-+metricValueText(value).minimumScaleFactor(Metrics.metricValueMinimumScale).allowsTightening(true)@@ -470,7 +470,7 @@ private struct UsageHeatmapTooltip: View {.layoutPriority(1).frame(maxWidth: .infinity, alignment: .trailing)}-+private func metricValueText(_ value: String) -> some View {Text(value).foregroundStyle(Color.codexLabel)@@ -478,12 +478,12 @@ private struct UsageHeatmapTooltip: View {.lineLimit(1).contentTransition(.numericText())}-+private var tooltipFill: Color {Color(nsColor: .windowBackgroundColor).opacity(colorScheme == .dark ? 0.88 : 0.82)}-+private enum Metrics {static let rowSpacing: CGFloat = 3static let headerSpacing: CGFloat = 4diff --git a/appcast.xml b/appcast.xmlindex dc170f1..d4da1a2 100644--- a/appcast.xml+++ b/appcast.xml@@ -7,6 +7,15 @@<link>https://codexbar.zabrian.app/appcast.xml</link><description>CodexBar appcast feed</description><language>zh-CN</language>+ <item>+ <title>CodexBar.app 2.4.1</title>+ <sparkle:version>17</sparkle:version>+ <sparkle:shortVersionString>2.4.1</sparkle:shortVersionString>+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#2.4.1</sparkle:releaseNotesLink>+ <pubDate>Sun, 21 Jun 2026 23:11:45 +0800</pubDate>+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v2.4.1.dmg" sparkle:edSignature="TBEbo3dJ65fTF3RotYnDQXBhZCk0SKGy0V5NN/YPNTiQY11xhFT6Z+w1luumWdEZJqZuSXC+vbLmiDZYh2dkDw==" length="2887949" type="application/octet-stream"/>+ </item><item><title>CodexBar.app 2.4.0</title><sparkle:version>16</sparkle:version>