Skip to content

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

fix: 重写了 Codex Hook 统计的本地数据存储格式

Bob5c29f8a51d40
diff --git a/AGENTS.md b/AGENTS.md
index 89234dc..1d0b88b 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -82,7 +82,7 @@ CodexStatusService(JSON-RPC app-server)
Codex Hook
-> WorkflowHookEventRecorder(--hook-event)
- -> WorkflowStatsStorage(events.jsonl / daily.jsonl)
+ -> WorkflowStatsStorage(events/YYYY-MM-DD.jsonl / daily.jsonl)
-> WorkflowStatsService
-> WorkflowStatsViewModel
-> UsageSummaryView / UsageHeatmap
@@ -112,7 +112,7 @@ Hook 统计的配置、存储、保留策略和统计口径见 [Docs/CodexHook.m
- 设置开关只能追加或移除 CodexBar 自己的 Hook 处理器, 不能破坏用户已有 Hook。
- Hook 命令只支持 `--hook-event`。
- Hook 数据只保存在 `~/Library/Application Support/CodexBar/HookEvents/`。
-- Hook 写入可能并发触发, 更新 `events.jsonl`、`daily.jsonl` 和 `maintenance.json` 时必须通过 `stats.lock` 加锁。
+- Hook 写入可能并发触发, 追加 `events/YYYY-MM-DD.jsonl` 并更新 `maintenance.json` 时必须通过 `stats.lock` 加锁。
## UI 状态与日志
@@ -156,7 +156,7 @@ Hook 统计的配置、存储、保留策略和统计口径见 [Docs/CodexHook.m
- `CodexCLIVersionService` 使用 `CodexBar.codex-version` 队列, 全局和内置版本探测先并发启动再收集。
- `RequestLogStore` 可从后台队列写入, storage 用锁保护, SwiftUI 通知切回主线程发送。
- `WorkflowStatsService` 使用 `CodexBar.workflow-stats` 队列读取快照。
-- Hook 写入可能由多个 Codex 进程并发触发, 必须通过 `stats.lock` 和 `flock` 保护 `events.jsonl`、`daily.jsonl`、`maintenance.json` 的一致性。
+- Hook 写入可能由多个 Codex 进程并发触发, 必须通过 `stats.lock` 和 `flock` 保护 `events/YYYY-MM-DD.jsonl` 和 `maintenance.json` 的一致性; `daily.jsonl` 由主 App 刷新维护流程写回。
## UI 约束
@@ -196,7 +196,7 @@ Popover:
- 当前行优先展示 app-server 握手自报版本; 非当前行展示磁盘安装版本。
- 当前运行版本与磁盘安装版本不同时, 显示「已更新至 <version>」。
- 路径点击复制到剪贴板, 对应来源显示「已复制」1.5 秒; 保留路径文本布局宽度避免跳动。
-- 设置页包含「启用 Codex Hook」开关; 开启后会写入全局 Codex Hook 配置, 用于热力图展示更多本机统计数据。
+- 设置页包含「启用 Codex Hook」开关; 开启后会写入全局 Codex Hook 配置, 用于近 30 周数据展示更多本机统计数据。
- Codex Hook 开关下方说明文案为小号辅助文字; 不展示启用/关闭状态文案, 只在失败时展示错误消息。
日志窗口:
diff --git a/CLAUDE.md b/CLAUDE.md
index b9ce415..5a3da25 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -48,13 +48,13 @@ CodexStatusService (JSON-RPC over `codex app-server --listen stdio://`)
```
WorkflowHookEventRecorder (--hook-event 子进程)
- → WorkflowStatsStorage (events.jsonl / daily.jsonl,~/Library/Application Support/CodexBar/HookEvents/)
+ → WorkflowStatsStorage (events/YYYY-MM-DD.jsonl / daily.jsonl,~/Library/Application Support/CodexBar/HookEvents/)
→ WorkflowStatsService → WorkflowStatsViewModel
→ UsageSummaryView / UsageHeatmap (统计只在热力图 tooltip 中展示)
```
- 设置开关只能追加/移除 CodexBar 自己的 Hook 处理器,绝不破坏用户已有 Hook。
-- Hook 写入可能由多个 Codex 进程并发触发,更新 `events.jsonl`/`daily.jsonl`/`maintenance.json` 必须经 `stats.lock` + `flock` 加锁。
+- Hook 写入可能由多个 Codex 进程并发触发,追加 `events/YYYY-MM-DD.jsonl` 并更新 `maintenance.json` 必须经 `stats.lock` + `flock` 加锁;`daily.jsonl` 由主 App 刷新维护流程写回。
- 字段兼容、保留策略、统计口径见 `Docs/CodexHook.md`。
## 并发分工
diff --git a/CodexBar.xcodeproj/project.pbxproj b/CodexBar.xcodeproj/project.pbxproj
index d1db2f8..788cbf4 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 = 15;
+ CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_TEAM = 4KJ362VJW5;
ENABLE_APP_INTENTS_METADATA_GENERATION = NO;
ENABLE_APP_SANDBOX = NO;
@@ -290,7 +290,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MARKETING_VERSION = 2.3.2;
+ MARKETING_VERSION = 2.4.0;
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 = 15;
+ CURRENT_PROJECT_VERSION = 16;
DEVELOPMENT_TEAM = 4KJ362VJW5;
ENABLE_APP_INTENTS_METADATA_GENERATION = NO;
ENABLE_APP_SANDBOX = NO;
@@ -327,7 +327,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MARKETING_VERSION = 2.3.2;
+ MARKETING_VERSION = 2.4.0;
PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/CodexBar/Controllers/PopoverDismissMonitor.swift b/CodexBar/Controllers/PopoverDismissMonitor.swift
index 5292be7..20cfc73 100644
--- a/CodexBar/Controllers/PopoverDismissMonitor.swift
+++ b/CodexBar/Controllers/PopoverDismissMonitor.swift
@@ -4,9 +4,11 @@ import AppKit
final class PopoverDismissMonitor {
private let popover: NSPopover
private let statusButtonProvider: () -> NSStatusBarButton?
- private var localMouseEventMonitor: Any?
+ private var localEventMonitor: Any?
private var globalMouseEventMonitor: Any?
-
+ private var appResignActiveObserver: NSObjectProtocol?
+ private var popoverWindowResignKeyObserver: NSObjectProtocol?
+
init(
popover: NSPopover,
statusButtonProvider: @escaping () -> NSStatusBarButton?
@@ -14,103 +16,151 @@ final class PopoverDismissMonitor {
self.popover = popover
self.statusButtonProvider = statusButtonProvider
}
-
+
func install(onDismiss: @escaping () -> Void) {
remove()
-
- localMouseEventMonitor = NSEvent.addLocalMonitorForEvents(matching: Metrics.dismissEventMask) { [weak self] event in
- self?.dismissIfNeeded(for: event, onDismiss: onDismiss)
- self?.restabilizePopoverChromeAfterEvent()
+
+ localEventMonitor = NSEvent.addLocalMonitorForEvents(matching: Metrics.dismissEventMask) { [weak self] event in
+ guard 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.dismissEventMask) { _ in
+
+ globalMouseEventMonitor = NSEvent.addGlobalMonitorForEvents(matching: Metrics.mouseDismissEventMask) { _ in
+ Task { @MainActor in
+ onDismiss()
+ }
+ }
+
+ appResignActiveObserver = NotificationCenter.default.addObserver(
+ forName: NSApplication.didResignActiveNotification,
+ object: NSApplication.shared,
+ queue: .main
+ ) { _ in
onDismiss()
}
+
+ if let popoverWindow = popover.contentViewController?.view.window {
+ popoverWindowResignKeyObserver = NotificationCenter.default.addObserver(
+ forName: NSWindow.didResignKeyNotification,
+ object: popoverWindow,
+ queue: .main
+ ) { _ in
+ onDismiss()
+ }
+ }
}
-
+
func remove() {
- if let localMouseEventMonitor {
- NSEvent.removeMonitor(localMouseEventMonitor)
- self.localMouseEventMonitor = nil
+ removeEventMonitor(&localEventMonitor)
+ removeEventMonitor(&globalMouseEventMonitor)
+ removeObserver(&appResignActiveObserver)
+ removeObserver(&popoverWindowResignKeyObserver)
+ }
+
+ private func removeEventMonitor(_ monitor: inout Any?) {
+ if let currentMonitor = monitor {
+ NSEvent.removeMonitor(currentMonitor)
+ monitor = nil
}
-
- if let globalMouseEventMonitor {
- NSEvent.removeMonitor(globalMouseEventMonitor)
- self.globalMouseEventMonitor = 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] in
await 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 = .inactive
visualEffectView.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.mouseLocation
let buttonRectInWindow = button.convert(button.bounds, to: nil)
let buttonScreenRect = buttonWindow.convertToScreen(buttonRectInWindow)
return buttonScreenRect.contains(eventScreenPoint)
}
-
+
private enum Metrics {
- static let dismissEventMask: NSEvent.EventTypeMask = [
+ static let mouseDismissEventMask: NSEvent.EventTypeMask = [
.leftMouseDown,
.rightMouseDown,
.otherMouseDown
]
+ static let dismissEventMask: NSEvent.EventTypeMask = mouseDismissEventMask.union(.keyDown)
+ static let escapeKeyCode: UInt16 = 53
}
}
diff --git a/CodexBar/Controllers/StatusItemController.swift b/CodexBar/Controllers/StatusItemController.swift
index 2fcce39..97aacc7 100644
--- a/CodexBar/Controllers/StatusItemController.swift
+++ b/CodexBar/Controllers/StatusItemController.swift
@@ -142,10 +142,10 @@ private final class StatusItemController: NSObject {
viewModel.$autoRefreshCountdownStartedAt
.compactMap { $0 }
.sink { [weak self] _ in
- guard let self, self.popover.isShown else {
+ guard let self else {
return
}
- self.refreshWorkflowStatsIfHookEnabled()
+ self.refreshWorkflowStatsIfHookEnabled(performMaintenance: true)
}
.store(in: &cancellables)
}
@@ -202,7 +202,7 @@ private final class StatusItemController: NSObject {
popoverFadeCoordinator.prepareForFadeIn()
popover.show(relativeTo: button.bounds, of: button, preferredEdge: .minY)
popoverVisibility.isVisible = true
- refreshWorkflowStatsIfHookEnabled()
+ refreshWorkflowStatsIfHookEnabled(performMaintenance: false)
popoverDismissMonitor.install { [weak self] in
self?.closePopover()
}
@@ -322,10 +322,10 @@ private final class StatusItemController: NSObject {
}
}
- private func refreshWorkflowStatsIfHookEnabled() {
+ private func refreshWorkflowStatsIfHookEnabled(performMaintenance: Bool) {
codexHookSettings.refresh()
if codexHookSettings.isEnabled {
- workflowStatsViewModel.refreshIfNeeded()
+ workflowStatsViewModel.refreshIfNeeded(performMaintenance: performMaintenance)
}
}
diff --git a/CodexBar/Models/CodexWorkflowStatsModels.swift b/CodexBar/Models/CodexWorkflowStatsModels.swift
index 498e138..d433cec 100644
--- a/CodexBar/Models/CodexWorkflowStatsModels.swift
+++ b/CodexBar/Models/CodexWorkflowStatsModels.swift
@@ -11,14 +11,40 @@ nonisolated enum WorkflowEventKind: String {
case postCompact = "postcompact"
case subagentStart = "subagentstart"
case subagentStop = "subagentstop"
-
+
init?(normalizedName: String) {
self.init(rawValue: normalizedName)
}
}
+private nonisolated enum WorkflowStatsJSON {
+ static func lineData(_ fields: [String]) -> Data {
+ 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]
+ let data = try encoder.encode(value)
+ return String(decoding: data, as: UTF8.self)
+ }
+}
+
nonisolated struct WorkflowHookEvent: Decodable, Equatable {
- let occurredAt: Date
+ let timestamp: Date
let name: String
let directoryPath: String?
let toolName: String?
@@ -26,9 +52,9 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {
let permissionMode: String?
let sessionId: String?
let turnId: String?
-
+
init(
- occurredAt: Date,
+ timestamp: Date,
name: String,
directoryPath: String?,
toolName: String?,
@@ -37,7 +63,7 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {
sessionId: String?,
turnId: String?
) {
- self.occurredAt = occurredAt
+ self.timestamp = timestamp
self.name = name
self.directoryPath = directoryPath
self.toolName = toolName
@@ -46,11 +72,11 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {
self.sessionId = sessionId
self.turnId = turnId
}
-
+
init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)
- guard let timestamp = Self.string(from: container, key: .timestamp),
- let occurredAt = Self.date(from: timestamp) else {
+ guard let timestampString = Self.string(from: container, key: .timestamp),
+ let timestamp = Self.date(from: timestampString) else {
throw DecodingError.dataCorrupted(
.init(codingPath: decoder.codingPath, debugDescription: "Missing or invalid hook event timestamp")
)
@@ -60,8 +86,8 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {
.init(codingPath: decoder.codingPath, debugDescription: "Missing hook event name")
)
}
-
- self.occurredAt = occurredAt
+
+ self.timestamp = timestamp
self.name = name
self.directoryPath = Self.string(from: container, key: .cwd)
self.toolName = Self.string(from: container, key: .toolName)
@@ -70,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).standardizedFileURL
let lastComponent = url.lastPathComponent
return 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
@@ -102,67 +128,29 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {
return trimmedValue
}
}
-
+
return nil
}
-
+
private static func date(from string: String) -> Date? {
- if let date = ISO8601DateFormatter.codexFractional.date(from: string) {
- return date
- }
-
- if let date = iso8601Formatter.date(from: string) {
- return date
- }
-
- return nil
- }
-
- static func decodeJSONLines(from data: Data) -> [WorkflowHookEvent] {
- JSONLines.decode(from: data)
+ DateFormatter.codexLocalTimestamp.date(from: string)
}
-
- static func decodeJSONLinesWithFailures(from data: Data) -> JSONLinesDecodeResult<WorkflowHookEvent> {
- JSONLines.decodeWithFailures(from: data)
- }
-
+
func jsonLineData() throws -> Data {
let fields = [
- "\"timestamp\":\(try Self.jsonValue(ISO8601DateFormatter.codexFractional.string(from: occurredAt)))",
- "\"event\":\(try Self.jsonValue(name))",
- "\"model\":\(try Self.jsonValue(modelName))",
- "\"permission\":\(try Self.jsonValue(permissionMode))",
- "\"session\":\(try Self.jsonValue(sessionId))",
- "\"turn\":\(try Self.jsonValue(turnId))",
- "\"cwd\":\(try Self.jsonValue(directoryPath))",
- "\"tool\":\(try Self.jsonValue(toolName))"
+ try WorkflowStatsJSON.field("timestamp", DateFormatter.codexLocalTimestamp.string(from: timestamp)),
+ try WorkflowStatsJSON.field("event", name),
+ try WorkflowStatsJSON.field("model", modelName),
+ try WorkflowStatsJSON.field("permission", permissionMode),
+ try WorkflowStatsJSON.field("session", sessionId),
+ try WorkflowStatsJSON.field("turn", turnId),
+ try WorkflowStatsJSON.field("tool", toolName),
+ try WorkflowStatsJSON.field("cwd", directoryPath)
]
- let json = "{\(fields.joined(separator: ","))}"
-
- return Data(json.utf8) + Data([0x0A])
- }
-
- private static func jsonValue(_ value: String?) throws -> String {
- guard let value else {
- return "null"
- }
-
- return try jsonValue(value)
- }
-
- private static func jsonValue(_ value: String) throws -> String {
- let encoder = JSONEncoder()
- encoder.outputFormatting = [.withoutEscapingSlashes]
- let data = try encoder.encode(value)
- return String(decoding: data, as: UTF8.self)
+
+ return WorkflowStatsJSON.lineData(fields)
}
-
- private static let iso8601Formatter: ISO8601DateFormatter = {
- let formatter = ISO8601DateFormatter()
- formatter.formatOptions = [.withInternetDateTime]
- return formatter
- }()
-
+
private enum CodingKeys: String, CodingKey {
case timestamp
case event
@@ -185,9 +173,9 @@ nonisolated struct WorkflowDailyStats: Equatable, Identifiable {
let contextCompactionCount: Int
let subagentCount: Int
let eventCount: Int
-
+
var id: String { startDate }
-
+
static func empty(startDate: String) -> WorkflowDailyStats {
WorkflowDailyStats(
startDate: startDate,
@@ -206,33 +194,26 @@ nonisolated struct WorkflowDailyStats: Equatable, Identifiable {
nonisolated struct WorkflowStatsSnapshot: Equatable {
let generatedAt: Date
let dailyStats: [WorkflowDailyStats]
-
+
static let empty = WorkflowStatsSnapshot(generatedAt: Date(), dailyStats: [])
-
+
init(generatedAt: Date = Date(), dailyStats: [WorkflowDailyStats]) {
self.generatedAt = generatedAt
self.dailyStats = dailyStats
}
-
+
init(dailyAggregates: [WorkflowDailyAggregate], generatedAt: Date = Date()) {
self.generatedAt = generatedAt
self.dailyStats = dailyAggregates
.map(\.stats)
.sorted { $0.startDate < $1.startDate }
}
-
- init(events: [WorkflowHookEvent], generatedAt: Date = Date()) {
- self.init(
- dailyAggregates: WorkflowDailyAggregate.aggregates(from: events),
- generatedAt: generatedAt
- )
- }
-
+
func recentWeekGrid(columnCount: Int, endingDaysAgo: Int = 0, today: Date = Date()) -> [WorkflowDailyStats?] {
let statsByDate = dailyStats.reduce(into: [String: WorkflowDailyStats]()) { result, stats in
result[stats.startDate] = stats
}
-
+
return CodexWeekGrid.dates(
columnCount: columnCount,
endingDaysAgo: endingDaysAgo,
@@ -247,6 +228,16 @@ 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 ?? [])
+ }
+}
+
nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {
let date: String
var eventCount: Int
@@ -264,9 +255,9 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {
var sessionCount: Int?
var turnCount: Int?
var projectCounts: [String: Int]
-
+
var id: String { date }
-
+
init(date: String) {
self.date = date
self.eventCount = 0
@@ -285,7 +276,7 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {
self.turnCount = nil
self.projectCounts = [:]
}
-
+
init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)
self.date = try container.decode(String.self, forKey: .date)
@@ -305,10 +296,14 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {
self.turnCount = try container.decodeIfPresent(Int.self, forKey: .turnCount)
self.projectCounts = try container.decodeIfPresent([String: Int].self, forKey: .projectCounts) ?? [:]
}
-
- mutating func record(_ event: WorkflowHookEvent, keepsIdentifiers: Bool) {
+
+ mutating func record(
+ _ event: WorkflowHookEvent,
+ keepsIdentifiers: Bool,
+ identifierCache: inout WorkflowDailyIdentifierCache
+ ) {
eventCount += 1
-
+
switch event.kind {
case .sessionStart: sessionStartCount += 1
case .stop: stopCount += 1
@@ -321,51 +316,51 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {
case .subagentStop: subagentStopCount += 1
case .none: break
}
-
+
if keepsIdentifiers {
if let sessionId = event.sessionId {
- sessionIds = Self.inserting(sessionId, into: sessionIds)
+ Self.append(sessionId, to: &sessionIds, using: &identifierCache.sessionIds)
}
-
+
if let turnId = event.turnId {
- turnIds = Self.inserting(turnId, into: turnIds)
+ 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 = sessionIds ?? []
- turnIds = turnIds ?? []
+ sessionIds = Self.normalizedIdentifiers(sessionIds)
+ turnIds = Self.normalizedIdentifiers(turnIds)
return
}
-
+
sessionCount = resolvedSessionCount
turnCount = resolvedTurnCount
sessionIds = nil
turnIds = nil
}
-
- // 会话/轮次最终值: 在 id 集合、已压缩计数、起止事件计数之间取最大, 三处来源互为兜底
+
+ // 会话/轮次最终值: 优先使用去重/压缩后的数量, 起止事件计数只作为缺失兜底
private var resolvedSessionCount: Int {
- max(sessionCount ?? 0, sessionIds?.count ?? 0, sessionStartCount)
+ sessionCount ?? sessionIds?.count ?? sessionStartCount
}
-
+
private var resolvedTurnCount: Int {
- max(turnCount ?? 0, turnIds?.count ?? 0, stopCount)
+ turnCount ?? turnIds?.count ?? stopCount
}
-
+
var stats: WorkflowDailyStats {
let sessionTotal = resolvedSessionCount
let turnTotal = resolvedTurnCount
let toolCallCount = max(preToolUseCount, postToolUseCount)
let contextCompactionCount = max(preCompactCount, postCompactCount)
let subagentCount = max(subagentStartCount, subagentStopCount)
-
+
return WorkflowDailyStats(
startDate: date,
sessionCount: sessionTotal,
@@ -378,33 +373,7 @@ nonisolated struct WorkflowDailyAggregate: Codable, Equatable, Identifiable {
eventCount: eventCount
)
}
-
- static func aggregates(
- from events: [WorkflowHookEvent],
- today: Date = Date(),
- calendar: Calendar = .current
- ) -> [WorkflowDailyAggregate] {
- let retentionCutoffDate = WorkflowStatsStorage.retentionCutoffDate(today: today, calendar: calendar)
- let identifierCutoffDate = WorkflowStatsStorage.identifierRetentionCutoffDate(today: today, calendar: calendar)
-
- let aggregates = events.reduce(into: [String: WorkflowDailyAggregate]()) { result, event in
- let eventStartDate = calendar.startOfDay(for: event.occurredAt)
- guard eventStartDate >= retentionCutoffDate else {
- return
- }
-
- let startDate = DateFormatter.codexDay.string(from: eventStartDate)
- result[startDate, default: WorkflowDailyAggregate(date: startDate)]
- .record(event, keepsIdentifiers: eventStartDate >= identifierCutoffDate)
- }
-
- return normalized(
- aggregates: Array(aggregates.values),
- today: today,
- calendar: calendar
- )
- }
-
+
static func normalized(
aggregates: [WorkflowDailyAggregate],
today: Date = Date(),
@@ -412,57 +381,88 @@ 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 in
guard let date = Self.date(from: aggregate.date), date >= retentionCutoffDate else {
return nil
}
-
+
var mutableAggregate = aggregate
mutableAggregate.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 {
- let encoder = JSONEncoder()
- encoder.outputFormatting = [.sortedKeys, .withoutEscapingSlashes]
-
- return try aggregates.reduce(into: Data()) { result, aggregate in
- let lineData = try encoder.encode(aggregate)
- result.append(lineData)
- result.append(0x0A)
+ try aggregates.reduce(into: Data()) { result, aggregate in
+ result.append(try aggregate.jsonLineData())
}
}
-
- private static func inserting(_ identifier: String, into identifiers: [String]?) -> [String] {
- var identifierSet = Set(identifiers ?? [])
- identifierSet.insert(identifier)
- return identifierSet.sorted()
+
+ func jsonLineData() throws -> Data {
+ let fields = [
+ try WorkflowStatsJSON.field("date", date),
+ try WorkflowStatsJSON.field("eventCount", eventCount),
+ try WorkflowStatsJSON.field("sessionStartCount", sessionStartCount),
+ try WorkflowStatsJSON.field("stopCount", stopCount),
+ try WorkflowStatsJSON.field("preToolUseCount", preToolUseCount),
+ try WorkflowStatsJSON.field("postToolUseCount", postToolUseCount),
+ try WorkflowStatsJSON.field("permissionRequestCount", permissionRequestCount),
+ try WorkflowStatsJSON.field("preCompactCount", preCompactCount),
+ 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)
+ ]
+
+ return WorkflowStatsJSON.lineData(fields)
}
-
+
+ private static func append(
+ _ identifier: String,
+ to identifiers: inout [String]?,
+ using identifierSet: inout Set<String>
+ ) {
+ 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 in
if 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 date
case eventCount
diff --git a/CodexBar/Models/DateFormatter.swift b/CodexBar/Models/DateFormatter.swift
index 5d0d019..5f40f2d 100644
--- a/CodexBar/Models/DateFormatter.swift
+++ b/CodexBar/Models/DateFormatter.swift
@@ -5,13 +5,23 @@ extension DateFormatter {
nonisolated static let codexDay: DateFormatter = {
let formatter = DateFormatter()
formatter.locale = Locale(identifier: "en_US_POSIX")
+ formatter.timeZone = .autoupdatingCurrent
formatter.dateFormat = "yyyy-MM-dd"
return formatter
}()
+
+ // yyyy-MM-dd HH:mm:ss.SSS, Hook 原始事件写入本机时间字符串
+ nonisolated static let codexLocalTimestamp: DateFormatter = {
+ let formatter = DateFormatter()
+ formatter.locale = Locale(identifier: "en_US_POSIX")
+ formatter.timeZone = .autoupdatingCurrent
+ formatter.dateFormat = "yyyy-MM-dd HH:mm:ss.SSS"
+ return formatter
+ }()
}
extension ISO8601DateFormatter {
- // 带小数秒的 ISO8601, Hook 事件时间戳的统一读写格式
+ // 带小数秒的 ISO8601, 用于读取 Hook payload 中的原始时间戳
nonisolated static let codexFractional: ISO8601DateFormatter = {
let formatter = ISO8601DateFormatter()
formatter.formatOptions = [.withInternetDateTime, .withFractionalSeconds]
diff --git a/CodexBar/Services/CodexCLI/CodexCLIVersionService.swift b/CodexBar/Services/CodexCLI/CodexCLIVersionService.swift
index aaf5671..703efcc 100644
--- a/CodexBar/Services/CodexCLI/CodexCLIVersionService.swift
+++ b/CodexBar/Services/CodexCLI/CodexCLIVersionService.swift
@@ -5,7 +5,7 @@ nonisolated struct CodexCLIVersionSnapshot: Equatable, Sendable {
let global: CodexCLIVersionItem
let bundled: CodexCLIVersionItem
let 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 = version
self.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 : nil
let version = runningVersion ?? item.version
-
+
self.source = item.source
self.isCurrent = isCurrent
self.hasVersion = version != nil
self.displayVersion = version ?? item.displayVersion
self.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())
}
}
@@ -101,11 +101,13 @@ nonisolated struct CodexCLIVersionDisplay: Equatable {
nonisolated final class CodexCLIVersionService: @unchecked Sendable {
private let queue = DispatchQueue(label: "CodexBar.codex-version", qos: .utility)
private let timeout: TimeInterval
-
+ private static let pipeDrainTimeout: TimeInterval = 0.25
+ private static let maxPipeOutputBytes = 64 * 1024
+
init(timeout: TimeInterval = 5) {
self.timeout = timeout
}
-
+
func fetchSnapshot() async -> CodexCLIVersionSnapshot {
await withCheckedContinuation { continuation in
queue.async {
@@ -113,11 +115,11 @@ nonisolated final class CodexCLIVersionService: @unchecked Sendable {
}
}
}
-
+
private static func fetchSnapshotOnQueue(timeout: TimeInterval) -> CodexCLIVersionSnapshot {
let environment = CodexCLIResolver.environment
let installations = CodexCLIResolver.resolveInstallations(environment: environment)
-
+
// 两个安装源互不依赖, 先并发启动再收集, 避免两个超时串行叠加
let globalProbe = startProbe(
source: .global,
@@ -131,29 +133,29 @@ 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: CodexCLIExecutableSource
let path: String
let process: Process
- let standardOutput: Pipe
- let standardError: Pipe
+ let outputCollector: PipeCollector
+ let errorCollector: PipeCollector
let finished: DispatchSemaphore
- let deadline: DispatchTime
+ let deadline: Date
}
-
+
private enum ProbeOutcome {
case resolved(CodexCLIVersionItem)
case running(RunningProbe)
}
-
+
private static func startProbe(
source: CodexCLIExecutableSource,
path: String?,
@@ -163,64 +165,66 @@ 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(
+ fileHandle: standardOutput.fileHandleForReading,
+ maxBytes: Self.maxPipeOutputBytes
+ )
+ let errorCollector = PipeCollector(
+ fileHandle: standardError.fileHandleForReading,
+ maxBytes: Self.maxPipeOutputBytes
+ )
let finished = DispatchSemaphore(value: 0)
-
+
process.standardOutput = standardOutput
process.standardError = standardError
process.terminationHandler = { _ in finished.signal() }
-
+
do {
try process.run()
} catch {
return .resolved(CodexCLIVersionItem(source: source, path: path, errorMessage: "启动失败"))
}
-
+
return .running(RunningProbe(
source: source,
path: path,
process: process,
- standardOutput: standardOutput,
- standardError: standardError,
+ outputCollector: outputCollector,
+ errorCollector: errorCollector,
finished: finished,
- deadline: .now() + timeout
+ deadline: Date().addingTimeInterval(timeout)
))
}
-
+
private static func finishProbe(_ outcome: ProbeOutcome) -> CodexCLIVersionItem {
switch outcome {
case .resolved(let item):
return item
case .running(let probe):
- guard probe.finished.wait(timeout: probe.deadline) == .success else {
- probe.process.terminate()
+ guard probe.finished.wait(timeout: .now() + max(0, probe.deadline.timeIntervalSinceNow)) == .success else {
+ terminateTimedOutProbe(probe)
return CodexCLIVersionItem(source: probe.source, path: probe.path, errorMessage: "读取超时")
}
-
- let output = String(
- data: probe.standardOutput.fileHandleForReading.readDataToEndOfFile(),
- encoding: .utf8
- ) ?? ""
- let errorOutput = String(
- data: probe.standardError.fileHandleForReading.readDataToEndOfFile(),
- encoding: .utf8
- ) ?? ""
-
+
+ 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,
@@ -228,14 +232,101 @@ nonisolated final class CodexCLIVersionService: @unchecked Sendable {
)
}
}
-
+
+ private static func terminateTimedOutProbe(_ probe: RunningProbe) {
+ _ = ProcessTermination.terminate(
+ probe.process,
+ gracefulTimeout: 0.2,
+ killTimeout: 0.2
+ )
+ 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 {
+ private let lock = NSLock()
+ private let closedSemaphore = DispatchSemaphore(value: 0)
+ private let fileHandle: FileHandle
+ private let maxBytes: Int
+ private var data = Data()
+ private var isClosed = false
+
+ init(fileHandle: FileHandle, maxBytes: Int) {
+ self.fileHandle = fileHandle
+ self.maxBytes = max(maxBytes, 0)
+ fileHandle.readabilityHandler = { [weak self] handle in
+ let availableData = handle.availableData
+ guard !availableData.isEmpty else {
+ handle.readabilityHandler = nil
+ self?.markClosed()
+ return
+ }
+
+ self?.append(availableData)
+ }
+ }
+
+ func waitUntilClosed(timeout: TimeInterval) -> Bool {
+ lock.lock()
+ let closed = isClosed
+ lock.unlock()
+
+ guard !closed else {
+ return true
+ }
+
+ return closedSemaphore.wait(timeout: .now() + max(0, timeout)) == .success
+ }
+
+ func stopAndRead() -> Data {
+ fileHandle.readabilityHandler = nil
+ try? fileHandle.close()
+
+ lock.lock()
+ let snapshot = data
+ isClosed = true
+ lock.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
+ lock.unlock()
+ closedSemaphore.signal()
+ }
}
nonisolated enum CodexCLIVersionReader {
@@ -251,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: CodexCLIVersionService
private 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 = snapshot
self.isRefreshing = false
}
diff --git a/CodexBar/Services/CodexStatus/AppServerSession.swift b/CodexBar/Services/CodexStatus/AppServerSession.swift
index eaaae79..27a6604 100644
--- a/CodexBar/Services/CodexStatus/AppServerSession.swift
+++ b/CodexBar/Services/CodexStatus/AppServerSession.swift
@@ -9,6 +9,8 @@ nonisolated final class AppServerSession {
private static let writeFailureMessage = "连接已断开, 无法发送请求"
private static let responseConnectionClosedMessage = "连接已断开, 等待响应失败"
private static let responseTimeoutMessage = "等待响应超时"
+ private static let closeGracefulTimeout: TimeInterval = 1.0
+ private static let closeKillTimeout: TimeInterval = 0.5
private let input: Pipe
private let lineReader: JSONLineReader
@@ -37,7 +39,18 @@ nonisolated final class AppServerSession {
try? input.fileHandleForWriting.close()
if process.isRunning {
- process.terminate()
+ switch ProcessTermination.terminate(
+ process,
+ gracefulTimeout: Self.closeGracefulTimeout,
+ killTimeout: Self.closeKillTimeout
+ ) {
+ case .alreadyExited, .terminated:
+ break
+ case .killed:
+ RequestLogStore.shared.recordFailure(message: "app-server 退出超时, 已强制结束")
+ case .stillRunning:
+ RequestLogStore.shared.recordFailure(message: "app-server 退出超时, 可能仍在后台运行")
+ }
}
}
diff --git a/CodexBar/Services/Process/ProcessTermination.swift b/CodexBar/Services/Process/ProcessTermination.swift
new file mode 100644
index 0000000..ba925cb
--- /dev/null
+++ b/CodexBar/Services/Process/ProcessTermination.swift
@@ -0,0 +1,44 @@
+import Darwin
+import Foundation
+
+nonisolated enum ProcessTerminationResult: Equatable {
+ case alreadyExited
+ case terminated
+ case killed
+ case stillRunning
+}
+
+nonisolated enum ProcessTermination {
+ private static let pollInterval: TimeInterval = 0.02
+
+ static func terminate(
+ _ process: Process,
+ gracefulTimeout: TimeInterval,
+ killTimeout: TimeInterval
+ ) -> ProcessTerminationResult {
+ guard process.isRunning else {
+ return .alreadyExited
+ }
+
+ process.terminate()
+ if waitUntilExit(process, timeout: gracefulTimeout) {
+ return .terminated
+ }
+
+ kill(process.processIdentifier, SIGKILL)
+ if waitUntilExit(process, timeout: killTimeout) {
+ return .killed
+ }
+
+ return .stillRunning
+ }
+
+ private static func waitUntilExit(_ process: Process, timeout: TimeInterval) -> Bool {
+ let deadline = Date().addingTimeInterval(max(timeout, 0))
+ while process.isRunning, Date() < deadline {
+ Thread.sleep(forTimeInterval: pollInterval)
+ }
+
+ return !process.isRunning
+ }
+}
diff --git a/CodexBar/Services/WorkflowStats/WorkflowHookEventRecorder.swift b/CodexBar/Services/WorkflowStats/WorkflowHookEventRecorder.swift
index 85d4faa..2e8b5e6 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,20 +19,20 @@ 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 occurredAt = Date()
let payload = stdinPayload()
+ let timestamp = payload.date(for: "timestamp") ?? Date()
let cwd = payload.string(for: "cwd") ?? FileManager.default.currentDirectoryPath
let tool = payload.string(for: "tool_name")
let model = payload.string(for: "model")
@@ -40,7 +40,7 @@ nonisolated enum WorkflowHookEventRecorder {
let sessionId = payload.string(for: "session_id")
let turnId = payload.string(for: "turn_id")
let event = WorkflowHookEvent(
- occurredAt: occurredAt,
+ timestamp: timestamp,
name: eventName,
directoryPath: cwd,
toolName: tool,
@@ -49,200 +49,68 @@ nonisolated enum WorkflowHookEventRecorder {
sessionId: sessionId,
turnId: turnId
)
-
+
try recordStatsTransaction(event: event)
}
-
+
private static func recordStatsTransaction(event: WorkflowHookEvent) throws {
try WorkflowStatsStorage.withExclusiveLock {
- let eventLogURL = WorkflowStatsStorage.eventsURL()
- let dailyLogURL = WorkflowStatsStorage.dailyURL()
+ let dateKey = WorkflowStatsStorage.dateKey(for: event.timestamp)
+ let eventLogURL = WorkflowStatsStorage.eventLogURL(for: dateKey)
var maintenanceState = WorkflowStatsStorage.loadMaintenanceState()
- let eventLogSizeBeforeAppend = WorkflowStatsStorage.fileSize(at: eventLogURL)
- let needsDailyRebuild = maintenanceState.needsDailyRebuild(
- eventLogSize: eventLogSizeBeforeAppend,
- dailyLogURL: dailyLogURL
- )
- let maintenanceDate = DateFormatter.codexDay.string(from: Calendar.current.startOfDay(for: event.occurredAt))
- let shouldRunMaintenance = maintenanceState.lastMaintenanceDate != maintenanceDate
-
+
try append(event.jsonLineData(), to: eventLogURL)
- if shouldRunMaintenance {
- try pruneExpiredEventsIfNeeded(at: eventLogURL)
- maintenanceState.lastMaintenanceDate = maintenanceDate
- }
-
- guard !needsDailyRebuild else {
- maintenanceState.markDailyRebuildNeeded()
- try WorkflowStatsStorage.saveMaintenanceState(maintenanceState)
- return
- }
-
- do {
- try updateDailyAggregates(
- with: event,
- eventLogURL: eventLogURL,
- dailyLogURL: dailyLogURL,
- runsMaintenance: shouldRunMaintenance
- )
-
- maintenanceState.markDailyCacheUpdated(eventLogSize: WorkflowStatsStorage.fileSize(at: eventLogURL))
- try WorkflowStatsStorage.saveMaintenanceState(maintenanceState)
- } catch {
- maintenanceState.markDailyRebuildNeeded(error: error)
- try? WorkflowStatsStorage.saveMaintenanceState(maintenanceState)
- throw error
- }
+ 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 pruneExpiredEventsIfNeeded(at url: URL) throws {
- guard FileManager.default.fileExists(atPath: url.path) else {
- return
- }
-
- let fileHandle = try FileHandle(forUpdating: url)
- defer {
- try? fileHandle.close()
- }
-
- let cutoffDate = WorkflowStatsStorage.retentionCutoffDate()
- guard try shouldPruneEvents(in: fileHandle, cutoffDate: cutoffDate) else {
- return
- }
-
- try fileHandle.seek(toOffset: 0)
- let currentData = try fileHandle.readToEnd() ?? Data()
- let retainedData = try retainedEventLogData(from: currentData, cutoffDate: cutoffDate)
-
- try fileHandle.truncate(atOffset: 0)
- try fileHandle.seek(toOffset: 0)
- try fileHandle.write(contentsOf: retainedData)
- }
-
- private static func shouldPruneEvents(in fileHandle: FileHandle, cutoffDate: Date) throws -> Bool {
- try fileHandle.seek(toOffset: 0)
- guard let firstChunk = try fileHandle.read(upToCount: 64 * 1024), !firstChunk.isEmpty else {
- return false
- }
-
- let firstLineEnd = firstChunk.firstIndex(of: 0x0A) ?? firstChunk.endIndex
- let firstLine = Data(firstChunk[..<firstLineEnd])
- guard !firstLine.isEmpty else {
- return false
- }
-
- guard let event = try? JSONDecoder().decode(WorkflowHookEvent.self, from: firstLine) else {
- return true
- }
-
- return event.occurredAt < cutoffDate
- }
-
- private static func retainedEventLogData(from data: Data, cutoffDate: Date) throws -> Data {
- var retainedData = Data()
- for event in WorkflowHookEvent.decodeJSONLines(from: data) where event.occurredAt >= cutoffDate {
- retainedData.append(try event.jsonLineData())
- }
-
- return retainedData
- }
-
- private static func updateDailyAggregates(
- with event: WorkflowHookEvent,
- eventLogURL: URL,
- dailyLogURL: URL,
- runsMaintenance: Bool
- ) throws {
- var aggregates = loadDailyAggregates(from: dailyLogURL)
-
- if aggregates.isEmpty {
- aggregates = rebuildDailyAggregates(from: eventLogURL)
- } else {
- aggregates = adding(event, to: aggregates)
- aggregates = runsMaintenance
- ? WorkflowDailyAggregate.normalized(aggregates: aggregates)
- : aggregates.sorted { $0.date < $1.date }
- }
-
- let data = try WorkflowDailyAggregate.encodeJSONLines(aggregates)
- try data.write(to: dailyLogURL, options: .atomic)
- }
-
- private static func adding(
- _ event: WorkflowHookEvent,
- to aggregates: [WorkflowDailyAggregate]
- ) -> [WorkflowDailyAggregate] {
- let calendar = Calendar.current
- let eventStartDate = calendar.startOfDay(for: event.occurredAt)
- guard eventStartDate >= WorkflowStatsStorage.retentionCutoffDate(calendar: calendar) else {
- return WorkflowDailyAggregate.normalized(aggregates: aggregates, calendar: calendar)
- }
-
- let startDate = DateFormatter.codexDay.string(from: eventStartDate)
- let keepsIdentifiers = eventStartDate >= WorkflowStatsStorage.identifierRetentionCutoffDate(calendar: calendar)
- var aggregatesByDate = aggregates.reduce(into: [String: WorkflowDailyAggregate]()) { result, aggregate in
- result[aggregate.date] = aggregate
- }
- aggregatesByDate[startDate, default: WorkflowDailyAggregate(date: startDate)]
- .record(event, keepsIdentifiers: keepsIdentifiers)
-
- return Array(aggregatesByDate.values)
- }
-
- private static func loadDailyAggregates(from url: URL) -> [WorkflowDailyAggregate] {
- guard let data = try? Data(contentsOf: url), !data.isEmpty else {
- return []
- }
-
- return WorkflowDailyAggregate.decodeJSONLines(from: data)
- }
-
- private static func rebuildDailyAggregates(from url: URL) -> [WorkflowDailyAggregate] {
- guard let data = try? Data(contentsOf: url), !data.isEmpty else {
- return []
- }
-
- return WorkflowDailyAggregate.aggregates(from: WorkflowHookEvent.decodeJSONLines(from: 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:
@@ -254,4 +122,40 @@ private nonisolated struct WorkflowHookPayload {
return nil
}
}
+
+ private static func normalizedDate(_ value: Any?) -> Date? {
+ switch value {
+ case let string as String:
+ return date(from: string)
+ case let number as NSNumber:
+ let rawValue = number.doubleValue
+ let seconds = rawValue > 10_000_000_000 ? rawValue / 1000 : rawValue
+ return Date(timeIntervalSince1970: seconds)
+ default:
+ 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]
+ return formatter
+ }()
}
diff --git a/CodexBar/Services/WorkflowStats/WorkflowStatsService.swift b/CodexBar/Services/WorkflowStats/WorkflowStatsService.swift
index 73d68c4..42275fa 100644
--- a/CodexBar/Services/WorkflowStats/WorkflowStatsService.swift
+++ b/CodexBar/Services/WorkflowStats/WorkflowStatsService.swift
@@ -3,193 +3,499 @@ import Darwin
import Foundation
nonisolated final class WorkflowStatsService: @unchecked Sendable {
- private static let maxEventLogReadSize: UInt64 = 5 * 1024 * 1024
-
private let queue = DispatchQueue(label: "CodexBar.workflow-stats", qos: .utility)
- private let eventLogURL: URL
+ private let eventsDirectoryURL: URL
private let dailyLogURL: URL
-
+ private static let eventReadChunkSize = 64 * 1024
+
init(
- eventLogURL: URL = WorkflowStatsStorage.eventsURL(),
+ eventsDirectoryURL: URL = WorkflowStatsStorage.eventsDirectoryURL(),
dailyLogURL: URL = WorkflowStatsStorage.dailyURL()
) {
- self.eventLogURL = eventLogURL
+ self.eventsDirectoryURL = eventsDirectoryURL
self.dailyLogURL = dailyLogURL
}
-
- func loadSnapshot() async -> WorkflowStatsSnapshot {
+
+ func loadSnapshot(performMaintenance: Bool = false) async -> WorkflowStatsSnapshot {
await withCheckedContinuation { continuation in
queue.async {
- continuation.resume(returning: self.loadSnapshotOnQueue())
+ continuation.resume(returning: self.loadSnapshotOnQueue(performMaintenance: performMaintenance))
}
}
}
-
- private func loadSnapshotOnQueue() -> WorkflowStatsSnapshot {
- if let repairedSnapshot = repairDailyCacheIfNeededOnQueue() {
- return repairedSnapshot
+
+ private func loadSnapshotOnQueue(performMaintenance: Bool) -> WorkflowStatsSnapshot {
+ if performMaintenance {
+ performMaintenanceIfNeededOnQueue()
}
-
+
if let aggregates = loadDailyAggregatesOnQueue(), !aggregates.isEmpty {
return WorkflowStatsSnapshot(dailyAggregates: aggregates)
}
-
- guard let data = loadEventLogDataOnQueue(), !data.isEmpty else {
- return .empty
- }
-
- return WorkflowStatsSnapshot(events: WorkflowHookEvent.decodeJSONLines(from: data))
+
+ return .empty
}
-
- private func repairDailyCacheIfNeededOnQueue() -> WorkflowStatsSnapshot? {
- guard dailyCacheNeedsRebuildOnQueue() else {
+
+ 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 eventLogData = try loadEventLogDataForRebuildOnQueue()
- let eventLogStateAfterRead = WorkflowStatsStorage.fileState(at: eventLogURL)
- guard eventLogStateAfterRead.size == UInt64(eventLogData.count) else {
- throw WorkflowStatsRebuildError.eventsChangedDuringRebuild
+ let tasks = try prepareMaintenanceTasksOnQueue()
+ guard !tasks.isEmpty else {
+ return
}
-
- let decodedEvents = WorkflowHookEvent.decodeJSONLinesWithFailures(from: eventLogData)
- if eventLogStateAfterRead.size > 0,
- decodedEvents.values.isEmpty,
- decodedEvents.failedLineCount > 0 {
- throw WorkflowStatsRebuildError.noReadableEvents(corruptLineCount: decodedEvents.failedLineCount)
- }
-
- let aggregates = WorkflowDailyAggregate.aggregates(from: decodedEvents.values)
-
- return try WorkflowStatsStorage.withExclusiveLock {
- let currentEventLogState = WorkflowStatsStorage.fileState(at: eventLogURL)
- guard currentEventLogState == eventLogStateAfterRead else {
- throw WorkflowStatsRebuildError.eventsChangedDuringRebuild
- }
-
- var state = WorkflowStatsStorage.loadMaintenanceState()
- guard state.needsDailyRebuild(
- eventLogSize: currentEventLogState.size,
- dailyLogURL: dailyLogURL
- ) else {
- return loadDailyAggregatesOnQueue().map { WorkflowStatsSnapshot(dailyAggregates: $0) } ?? .empty
+
+ for task in tasks {
+ do {
+ let result = try buildDailyAggregate(for: task)
+ try commit(result)
+ } catch {
+ markDirtyOnQueue(task.dateKey)
}
-
- let data = try WorkflowDailyAggregate.encodeJSONLines(aggregates)
- try data.write(to: dailyLogURL, options: .atomic)
-
- state.markDailyRebuildSucceeded(
- eventLogSize: currentEventLogState.size,
- corruptEventLineCount: decodedEvents.failedLineCount
- )
- try WorkflowStatsStorage.saveMaintenanceState(state)
-
- return WorkflowStatsSnapshot(dailyAggregates: aggregates)
}
+
+ try pruneExpiredEventFilesOnQueue()
} catch {
- recordDailyRebuildFailureOnQueue(error)
- return nil
+ return
}
}
-
- private func dailyCacheNeedsRebuildOnQueue() -> Bool {
- WorkflowStatsStorage.loadMaintenanceState().needsDailyRebuild(
- eventLogSize: WorkflowStatsStorage.fileSize(at: eventLogURL),
- dailyLogURL: dailyLogURL
- )
+
+ 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 in
+ result[aggregate.date] = aggregate
+ }
+
+ changedState = markRebuildDates(
+ eventDateKeys: eventDateKeys,
+ dailyDecodeResult: dailyDecodeResult,
+ dailyByDate: dailyByDate,
+ state: &state
+ ) || changedState
+ changedState = 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 loadEventLogDataForRebuildOnQueue() throws -> Data {
- guard FileManager.default.fileExists(atPath: eventLogURL.path) else {
- return Data()
+
+ private func markRebuildDates(
+ eventDateKeys: [String],
+ dailyDecodeResult: JSONLinesDecodeResult<WorkflowDailyAggregate>,
+ dailyByDate: [String: WorkflowDailyAggregate],
+ state: inout WorkflowStatsMaintenanceState
+ ) -> Bool {
+ var changed = false
+
+ if state.schema != WorkflowStatsMaintenanceState.currentSchema {
+ changed = markDirty(eventDateKeys, in: &state) || changed
+ state.schema = WorkflowStatsMaintenanceState.currentSchema
+ changed = true
}
-
- return try Data(contentsOf: eventLogURL)
+
+ if dailyDecodeResult.failedLineCount > 0 || (dailyDecodeResult.values.isEmpty && !eventDateKeys.isEmpty) {
+ changed = markDirty(eventDateKeys, in: &state) || changed
+ }
+
+ changed = markDirty(eventDateKeys.filter { dailyByDate[$0] == nil }, in: &state) || changed
+ changed = markDirty(state.pending.filter { dailyByDate[$0] == nil }, in: &state) || changed
+
+ return changed
}
-
- private func recordDailyRebuildFailureOnQueue(_ error: Error) {
- try? WorkflowStatsStorage.withExclusiveLock {
- var state = WorkflowStatsStorage.loadMaintenanceState()
- state.markDailyRebuildNeeded(error: error)
- try WorkflowStatsStorage.saveMaintenanceState(state)
+
+ 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 {
+ state.markDirty(dateKey)
+ changed = true
+ } else if actualSize > day.offset,
+ !state.pending.contains(dateKey),
+ !state.dirty.contains(dateKey) {
+ state.markPending(dateKey)
+ changed = true
+ }
}
+
+ return changed
}
-
- private func loadDailyAggregatesOnQueue() -> [WorkflowDailyAggregate]? {
- guard let data = try? Data(contentsOf: dailyLogURL), !data.isEmpty else {
- return nil
+
+ private func makeMaintenanceTasks(
+ state: inout WorkflowStatsMaintenanceState,
+ dailyByDate: [String: WorkflowDailyAggregate],
+ changedState: inout Bool
+ ) -> [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)
+ guard size > day.offset else {
+ state.removePending(dateKey)
+ changedState = true
+ continue
+ }
+
+ guard let baseAggregate = dailyByDate[dateKey] else {
+ state.markDirty(dateKey)
+ changedState = true
+ tasks.append(dirtyTask(for: dateKey, size: size))
+ continue
+ }
+
+ tasks.append(
+ pendingTask(
+ for: dateKey,
+ day: day,
+ size: size,
+ baseAggregate: baseAggregate
+ )
+ )
}
-
- let aggregates = WorkflowDailyAggregate.decodeJSONLines(from: data)
- guard !aggregates.isEmpty else {
- return nil
+
+ return tasks
+ }
+
+ private func markDirty(
+ _ dateKeys: [String],
+ in state: inout WorkflowStatsMaintenanceState
+ ) -> Bool {
+ let previousDirty = state.dirty
+ let previousDays = state.days
+
+ for dateKey in dateKeys {
+ state.markDirty(dateKey)
}
-
- return WorkflowDailyAggregate.normalized(aggregates: aggregates)
+
+ return previousDirty != state.dirty || previousDays != state.days
}
-
- private func loadEventLogDataOnQueue() -> Data? {
- guard let attributes = try? FileManager.default.attributesOfItem(atPath: eventLogURL.path),
- let fileSize = attributes[.size] as? NSNumber else {
- return try? Data(contentsOf: eventLogURL)
+
+ private func dirtyTask(for dateKey: String, size: UInt64? = nil) -> WorkflowStatsMaintenanceTask {
+ WorkflowStatsMaintenanceTask(
+ dateKey: dateKey,
+ startOffset: 0,
+ size: size ?? eventLogSize(for: dateKey),
+ baseAggregate: nil,
+ existingCorrupt: 0
+ )
+ }
+
+ private func pendingTask(
+ for dateKey: String,
+ day: WorkflowStatsDayMaintenanceState,
+ size: UInt64,
+ baseAggregate: WorkflowDailyAggregate
+ ) -> WorkflowStatsMaintenanceTask {
+ WorkflowStatsMaintenanceTask(
+ dateKey: dateKey,
+ startOffset: day.offset,
+ size: size,
+ baseAggregate: baseAggregate,
+ 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)
}
-
- let size = fileSize.uint64Value
- guard size > Self.maxEventLogReadSize else {
- return try? Data(contentsOf: eventLogURL)
+
+ return JSONLines.decodeWithFailures(from: data)
+ }
+
+ private func eventDateKeysOnQueue() -> [String] {
+ guard let contents = try? FileManager.default.contentsOfDirectory(
+ at: eventsDirectoryURL,
+ includingPropertiesForKeys: nil
+ ) else {
+ return []
}
-
- guard let fileHandle = try? FileHandle(forReadingFrom: eventLogURL) else {
- return nil
+
+ return contents
+ .filter { $0.pathExtension == "jsonl" }
+ .map { $0.deletingPathExtension().lastPathComponent }
+ .filter { WorkflowStatsStorage.isValidDateKey($0) }
+ .sorted()
+ }
+
+ private func buildDailyAggregate(
+ for task: WorkflowStatsMaintenanceTask
+ ) throws -> WorkflowStatsMaintenanceResult {
+ var aggregate = task.baseAggregate ?? WorkflowDailyAggregate(date: task.dateKey)
+ var corrupt = task.existingCorrupt
+ var identifierCache = WorkflowDailyIdentifierCache(aggregate: aggregate)
+ let keepsIdentifiers = keepsIdentifiers(for: task.dateKey)
+
+ corrupt += try readEvents(
+ at: eventLogURL(for: task.dateKey),
+ from: task.startOffset,
+ upTo: task.size
+ ) { event in
+ aggregate.record(
+ event,
+ keepsIdentifiers: keepsIdentifiers,
+ identifierCache: &identifierCache
+ )
+ }
+
+ aggregate.compactIdentifiersIfNeeded(keepsIdentifiers: keepsIdentifiers)
+ return WorkflowStatsMaintenanceResult(
+ dateKey: task.dateKey,
+ aggregate: aggregate,
+ size: task.size,
+ corrupt: corrupt
+ )
+ }
+
+ private func readEvents(
+ at url: URL,
+ from startOffset: UInt64,
+ upTo size: UInt64,
+ record: (WorkflowHookEvent) -> Void
+ ) throws -> Int {
+ guard size > startOffset else {
+ return 0
}
+
+ let fileHandle = try FileHandle(forReadingFrom: url)
defer {
try? fileHandle.close()
}
-
- guard (try? fileHandle.seek(toOffset: size - Self.maxEventLogReadSize)) != nil,
- let tailData = try? fileHandle.readToEnd() else {
- return nil
+
+ try fileHandle.seek(toOffset: startOffset)
+
+ let decoder = JSONDecoder()
+ var remainingBytes = size - startOffset
+ var 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 Self.droppingPartialFirstLine(from: tailData)
+
+ return corrupt
}
-
- private static func droppingPartialFirstLine(from data: Data) -> Data {
- guard let newlineIndex = data.firstIndex(of: 0x0A),
- newlineIndex < data.endIndex else {
- return data
+
+ private func decode(
+ _ lineData: Data.SubSequence,
+ using decoder: JSONDecoder,
+ record: (WorkflowHookEvent) -> Void
+ ) -> Int {
+ let line = String(decoding: lineData, as: UTF8.self)
+ .trimmingCharacters(in: .whitespacesAndNewlines)
+ guard !line.isEmpty else {
+ return 0
}
-
- return Data(data[data.index(after: newlineIndex)...])
+
+ 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
+ } else {
+ aggregates.append(aggregate)
+ }
+ }
+
+ private func markDirtyOnQueue(_ dateKey: String) {
+ try? WorkflowStatsStorage.withExclusiveLock {
+ var state = WorkflowStatsStorage.loadMaintenanceState()
+ state.markDirty(dateKey)
+ try WorkflowStatsStorage.saveMaintenanceState(state)
+ }
+ }
+
+ private func pruneExpiredEventFilesOnQueue() throws {
+ let cutoffDate = WorkflowStatsStorage.retentionCutoffDate()
+ let expiredDateKeys = eventDateKeysOnQueue().filter { dateKey in
+ guard 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 = 210
private static let identifierRetentionDayCount = 7
-
- static func eventsURL() -> URL {
+
+ static func eventsDirectoryURL() -> URL {
directoryURL()
- .appendingPathComponent("events.jsonl", isDirectory: false)
+ .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,
@@ -197,77 +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 {
- fileState(at: url).size
- }
-
- static func fileState(at url: URL) -> WorkflowStatsFileState {
guard let attributes = try? FileManager.default.attributesOfItem(atPath: url.path),
let fileSize = attributes[.size] as? NSNumber else {
- return WorkflowStatsFileState(size: 0, modifiedAt: nil)
+ return 0
}
-
- return WorkflowStatsFileState(
- size: fileSize.uint64Value,
- modifiedAt: attributes[.modificationDate] as? Date
- )
+
+ return fileSize.uint64Value
}
-
+
static func retentionCutoffDate(today: Date = Date(), calendar: Calendar = .current) -> Date {
let todayStart = calendar.startOfDay(for: today)
return calendar.date(
@@ -276,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(
@@ -285,156 +584,153 @@ 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
+ }
}
-nonisolated struct WorkflowStatsFileState: Equatable {
- let size: UInt64
- let modifiedAt: Date?
+nonisolated struct WorkflowStatsDayMaintenanceState: Codable, Equatable {
+ var offset: UInt64
+ var size: UInt64
+ var corrupt: Int
+
+ init(offset: UInt64 = 0, size: UInt64 = 0, corrupt: Int = 0) {
+ self.offset = offset
+ self.size = size
+ self.corrupt = corrupt
+ }
}
nonisolated struct WorkflowStatsMaintenanceState: Codable, Equatable {
- private static let maxErrorSummaryLength = 240
-
- var lastMaintenanceDate: String?
- var lastAggregatedEventLogSize: UInt64?
- var needsDailyRebuild: Bool
- var lastDailyRebuildAt: String?
- var lastDailyRebuildFailedAt: String?
- var lastDailyRebuildError: String?
- var corruptEventLineCount: Int
-
+ static let currentSchema = 2
+
+ var schema: Int
+ var pending: [String]
+ var dirty: [String]
+ var days: [String: WorkflowStatsDayMaintenanceState]
+
init(
- lastMaintenanceDate: String? = nil,
- lastAggregatedEventLogSize: UInt64? = nil,
- needsDailyRebuild: Bool = false,
- lastDailyRebuildAt: String? = nil,
- lastDailyRebuildFailedAt: String? = nil,
- lastDailyRebuildError: String? = nil,
- corruptEventLineCount: Int = 0
+ schema: Int = Self.currentSchema,
+ pending: [String] = [],
+ dirty: [String] = [],
+ days: [String: WorkflowStatsDayMaintenanceState] = [:]
) {
- self.lastMaintenanceDate = lastMaintenanceDate
- self.lastAggregatedEventLogSize = lastAggregatedEventLogSize
- self.needsDailyRebuild = needsDailyRebuild
- self.lastDailyRebuildAt = lastDailyRebuildAt
- self.lastDailyRebuildFailedAt = lastDailyRebuildFailedAt
- self.lastDailyRebuildError = lastDailyRebuildError
- self.corruptEventLineCount = corruptEventLineCount
- }
-
+ self.schema = schema
+ self.pending = Self.normalizedDates(pending)
+ self.dirty = Self.normalizedDates(dirty)
+ self.days = days
+ }
+
init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)
- self.lastMaintenanceDate = try container.decodeIfPresent(String.self, forKey: .lastMaintenanceDate)
- self.lastAggregatedEventLogSize = try container.decodeIfPresent(UInt64.self, forKey: .lastAggregatedEventLogSize)
- self.needsDailyRebuild = try container.decodeIfPresent(Bool.self, forKey: .needsDailyRebuild) ?? false
- self.lastDailyRebuildAt = try container.decodeIfPresent(String.self, forKey: .lastDailyRebuildAt)
- self.lastDailyRebuildFailedAt = try container.decodeIfPresent(String.self, forKey: .lastDailyRebuildFailedAt)
- self.lastDailyRebuildError = try container.decodeIfPresent(String.self, forKey: .lastDailyRebuildError)
- self.corruptEventLineCount = try container.decodeIfPresent(Int.self, forKey: .corruptEventLineCount) ?? 0
- }
-
- func needsDailyRebuild(eventLogSize: UInt64, dailyLogURL: URL) -> Bool {
- if needsDailyRebuild {
- return true
- }
-
- guard eventLogSize > 0 else {
- return false
- }
-
- guard let lastAggregatedEventLogSize else {
- return true
- }
-
- if lastAggregatedEventLogSize != eventLogSize {
- return true
- }
-
- return WorkflowStatsStorage.fileSize(at: dailyLogURL) == 0
- }
-
- mutating func markDailyCacheUpdated(eventLogSize: UInt64) {
- needsDailyRebuild = false
- lastAggregatedEventLogSize = eventLogSize
- }
-
- mutating func markDailyRebuildSucceeded(eventLogSize: UInt64, corruptEventLineCount: Int) {
- markDailyCacheUpdated(eventLogSize: eventLogSize)
- lastDailyRebuildAt = Self.timestampString()
- lastDailyRebuildFailedAt = nil
- lastDailyRebuildError = nil
- self.corruptEventLineCount = corruptEventLineCount
- }
-
- mutating func markDailyRebuildNeeded(error: Error? = nil) {
- needsDailyRebuild = true
-
- guard let error else {
- return
- }
-
- lastDailyRebuildFailedAt = Self.timestampString()
- lastDailyRebuildError = Self.errorSummary(error)
+ self.schema = try container.decodeIfPresent(Int.self, forKey: .schema) ?? Self.currentSchema
+ self.pending = Self.normalizedDates(try container.decodeIfPresent([String].self, forKey: .pending) ?? [])
+ 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)
}
-
- static func timestampString(from date: Date = Date()) -> String {
- ISO8601DateFormatter.codexFractional.string(from: date)
+
+ mutating func markDirty(_ dateKey: String) {
+ dirty = Self.inserting(dateKey, into: dirty)
+ ensureDayState(for: dateKey)
}
-
- private static func errorSummary(_ error: Error) -> String {
- let message = error.localizedDescription
- guard message.count > maxErrorSummaryLength else {
- return message
- }
-
- return String(message.prefix(maxErrorSummaryLength))
+
+ 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 = pending
+ let previousDirty = dirty
+ let 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 nonisolated enum WorkflowStatsRebuildError: LocalizedError {
- case eventsChangedDuringRebuild
- case noReadableEvents(corruptLineCount: Int)
-
- var errorDescription: String? {
- switch self {
- case .eventsChangedDuringRebuild:
- return "events.jsonl changed during daily rebuild"
- case .noReadableEvents(let corruptLineCount):
- return "events.jsonl has no readable events (\(corruptLineCount) corrupt lines)"
+ 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()
+ }
+}
+
+private nonisolated struct WorkflowStatsMaintenanceTask {
+ let dateKey: String
+ let startOffset: UInt64
+ let size: UInt64
+ let baseAggregate: WorkflowDailyAggregate?
+ let existingCorrupt: Int
+}
+
+private nonisolated struct WorkflowStatsMaintenanceResult {
+ let dateKey: String
+ let aggregate: WorkflowDailyAggregate
+ let size: UInt64
+ let corrupt: Int
}
@MainActor
final class WorkflowStatsViewModel: ObservableObject {
@Published private(set) var snapshot = WorkflowStatsSnapshot.empty
-
+
private static let minimumRefreshInterval: TimeInterval = 5
-
+
private let service: WorkflowStatsService
private var isRefreshing = false
private var lastRefreshedAt: Date?
-
+
init(service: WorkflowStatsService = WorkflowStatsService()) {
self.service = service
}
-
- func refreshIfNeeded() {
- guard Date().timeIntervalSince(lastRefreshedAt ?? .distantPast) > Self.minimumRefreshInterval else {
+
+ func refreshIfNeeded(performMaintenance: Bool = false) {
+ guard performMaintenance || Date().timeIntervalSince(lastRefreshedAt ?? .distantPast) > Self.minimumRefreshInterval else {
return
}
-
- refresh()
+
+ refresh(performMaintenance: performMaintenance)
}
-
- func refresh() {
+
+ func refresh(performMaintenance: Bool = false) {
guard !isRefreshing else {
return
}
-
+
isRefreshing = true
-
+
Task {
- snapshot = await service.loadSnapshot()
+ snapshot = await service.loadSnapshot(performMaintenance: performMaintenance)
lastRefreshedAt = Date()
isRefreshing = false
}
diff --git a/CodexBar/Views/Menu/UsageHeatmap.swift b/CodexBar/Views/Menu/UsageHeatmap.swift
index f33c100..9d4928c 100644
--- a/CodexBar/Views/Menu/UsageHeatmap.swift
+++ b/CodexBar/Views/Menu/UsageHeatmap.swift
@@ -6,7 +6,7 @@ struct UsageSummaryView: View {
let showsWorkflowStats: Bool
private let days: [UsageHeatmapDay?]
@State private var hoveredDay: UsageHeatmapDay?
-
+
init(
usage: CodexUsageSnapshot,
workflowStats: WorkflowStatsSnapshot,
@@ -16,7 +16,7 @@ struct UsageSummaryView: View {
self.usage = usage
self.isStale = isStale
self.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,
@@ -42,8 +42,13 @@ struct UsageSummaryView: View {
.onAppear {
hoveredDay = nil
}
+ .onChange(of: days) { _, newDays in
+ refreshHoveredDay(from: newDays)
+ }
+ .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)
@@ -53,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)
@@ -68,7 +73,7 @@ struct UsageSummaryView: View {
.minimumScaleFactor(0.8)
}
}
-
+
private func metric<Content: View>(
label: String,
alignment: Alignment,
@@ -79,49 +84,62 @@ 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_400
let hours = duration % 86_400 / 3_600
let minutes = duration % 3_600 / 60
let 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 = 8
+ static 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
+ }
}
}
@@ -132,7 +150,7 @@ struct UsageHeatmap: View {
@State private var hoveredSquareFrame: CGRect = .zero
// hover 期间 body 频繁重算, 峰值只在构建时求一次
private let peakTokens: Int
-
+
init(
days: [UsageHeatmapDay?],
showsWorkflowStats: Bool,
@@ -143,11 +161,11 @@ struct UsageHeatmap: View {
self._hoveredDay = hoveredDay
self.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)
@@ -160,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())
@@ -177,13 +195,13 @@ struct UsageHeatmap: View {
.lineLimit(1)
}
}
-
+
HStack(alignment: .top, spacing: Metrics.squareSpacing) {
ForEach(0..<Metrics.columnCount, id: \.self) { column in
VStack(spacing: Metrics.squareSpacing) {
ForEach(0..<Metrics.rowCount, id: \.self) { row in
let index = column * Metrics.rowCount + row
-
+
if days.indices.contains(index), let day = days[index] {
UsageHeatmapSquare(
day: day,
@@ -216,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 - tooltipHeight
let 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.tooltipSquareSpacing
let tooltipWidth = Metrics.tooltipWidth(showsWorkflowStats: showsWorkflowStats)
let leadingX = squareFrame.minX - Metrics.tooltipSquareSpacing - tooltipWidth
let maxX = max(0, Metrics.totalWidth - tooltipWidth)
-
+
if leadingX >= 0 {
return leadingX
}
-
+
if trailingX + tooltipWidth <= Metrics.totalWidth {
return trailingX
}
-
+
return min(max(leadingX, 0), maxX)
}
}
@@ -267,15 +285,15 @@ extension UsageHeatmap {
static let tokenTooltipHeight: CGFloat = 40
static let tooltipSquareSpacing: CGFloat = 2
static 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
}
@@ -288,7 +306,7 @@ private struct UsageHeatmapSquare: View {
let isHovered: Bool
let onActive: (CGRect) -> Void
let onEnded: () -> Void
-
+
var body: some View {
GeometryReader { proxy in
RoundedRectangle(cornerRadius: 4, style: .continuous)
@@ -312,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.68
return 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)
}
}
@@ -340,18 +358,18 @@ private struct UsageHeatmapTooltip: View {
let day: UsageHeatmapDay
let 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 in
metricRow(row.label, value: row.value)
}
@@ -372,8 +390,9 @@ private struct UsageHeatmapTooltip: View {
.fill(tooltipFill)
}
.liquidGlassSurface(cornerRadius: Metrics.cornerRadius)
+ .animation(Metrics.statusAnimation, value: day)
}
-
+
private var workflowMetricRows: [(label: String, value: String)] {
[
("会话总数", "\(day.workflowStats.sessionCount)"),
@@ -384,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)
@@ -401,47 +420,49 @@ private struct UsageHeatmapTooltip: View {
.fixedSize(horizontal: true, vertical: false)
.layoutPriority(1)
}
-
+
@ViewBuilder
private var tokenText: some View {
if let tokenCount = day.tokenCount {
TokenCountText(tokens: tokenCount, font: tokenFont)
.foregroundStyle(Color.codexLabel)
+ .contentTransition(.numericText())
} else {
Text("--")
.font(tokenFont)
.foregroundStyle(Color.codexLabel)
+ .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)
@@ -449,19 +470,20 @@ private struct UsageHeatmapTooltip: View {
.layoutPriority(1)
.frame(maxWidth: .infinity, alignment: .trailing)
}
-
+
private func metricValueText(_ value: String) -> some View {
Text(value)
.foregroundStyle(Color.codexLabel)
.monospacedDigit()
.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 = 3
static let headerSpacing: CGFloat = 4
@@ -473,5 +495,6 @@ private struct UsageHeatmapTooltip: View {
static let metricLabelWidth: CGFloat = 54
static let metricValueMinimumScale: CGFloat = 0.60
static let workflowFontSize: CGFloat = 10
+ static let statusAnimation = Animation.codexStatus
}
}
diff --git a/CodexBar/Views/Settings/AppSettingsView.swift b/CodexBar/Views/Settings/AppSettingsView.swift
index 19bcfb2..9a49fef 100644
--- a/CodexBar/Views/Settings/AppSettingsView.swift
+++ b/CodexBar/Views/Settings/AppSettingsView.swift
@@ -109,7 +109,7 @@ private extension AppSettingsView {
Color.clear
.frame(width: Metrics.iconWidth)
- Text("开启后将会写入全局 Codex Hook 配置\n用于热力图中展示更多数据, 数据仅保存在本机")
+ Text("开启后将会写入全局 Codex Hook 配置\n用于近 30 周数据中展示更多统计数据\n该数据仅保存在本机")
.font(.caption)
.foregroundStyle(.secondary)
.fixedSize(horizontal: false, vertical: true)
diff --git a/Docs/AppServer.md b/Docs/AppServer.md
index 23f1d16..0d5bc64 100644
--- a/Docs/AppServer.md
+++ b/Docs/AppServer.md
@@ -85,6 +85,7 @@ Invalid request: unknown variant
- `SIGPIPE` 已被忽略,写入断管后应由 `write` 抛错并走重建。
- 复用连接出现传输故障时只重建重试一次。
- 全新连接初始化失败直接返回「初始化失败」,不重复完整握手。
+- 关闭会话时先停止 stdout/stderr reader 并关闭 stdin,然后对 app-server 进程执行有界退出: 先 `terminate()` 等待 1 秒,仍未退出再 `SIGKILL` 并等待 0.5 秒;被强制结束或仍未退出时写入请求日志。
## UI 状态
diff --git a/Docs/CodexHook.md b/Docs/CodexHook.md
index dda5e27..a617d28 100644
--- a/Docs/CodexHook.md
+++ b/Docs/CodexHook.md
@@ -60,11 +60,11 @@ Hook stdin 会尝试解析为 Codex 官方 JSON 对象,只读取顶层字段
- 目录: `cwd`
- 工具: `tool_name`
- 模型: `model`
-- 权限模式: `permission_mode`,写入 `events.jsonl` 时保存为 `permission`
+- 权限模式: `permission_mode`,写入 `events/YYYY-MM-DD.jsonl` 时保存为 `permission`
- 会话: `session_id`
- 轮次: `turn_id`
-事件名来自 Hook 命令参数 `--hook-event`,时间戳由 CodexBar 记录时生成。`events.jsonl` 每行按固定顺序写入 `timestamp`、`event`、`model`、`permission`、`session`、`turn`、`cwd`、`tool`;缺失值写为 `null`。每日维护裁剪 `events.jsonl` 时也会用同一编码入口重写保留行,确保字段顺序稳定。
+事件名来自 Hook 命令参数 `--hook-event`。事件时间优先读取 payload 顶层 `timestamp`,解析后按本机时区写成 `yyyy-MM-dd HH:mm:ss.SSS`;如果 payload 缺失或无法解析,记录当前时间作为兜底。同一个事件时间也会按本机时区格式化为 `yyyy-MM-dd` 的 date key,用于选择 `events/YYYY-MM-DD.jsonl` 文件。每行按固定顺序写入 `timestamp`、`event`、`model`、`permission`、`session`、`turn`、`tool`、`cwd`;缺失值写为 `null`。
事件名统计时会去掉 `_` 和 `-` 并转小写,因此 `PreToolUse`、`pre_tool_use`、`pre-tool-use` 会归为同一个事件。
@@ -80,89 +80,121 @@ Hook 数据目录:
文件职责:
-- `events.jsonl`: 原始 Hook 事件日志
+- `events/YYYY-MM-DD.jsonl`: 按本机日期拆分的原始 Hook 事件日志
- `daily.jsonl`: 每日聚合结果,UI 优先读取它
- `stats.lock`: 并发写入锁文件,只用于 `flock`
-- `maintenance.json`: 记录上次每日维护日期、`daily.jsonl` 重建标记、事件日志聚合高水位和最近重建错误
+- `maintenance.json`: 记录待整理日期、需要重建日期和每个日期的处理进度
+
+`maintenance.json` 当前结构:
+
+```json
+{
+ "schema": 2,
+ "pending": ["2026-06-21"],
+ "dirty": [],
+ "days": {
+ "2026-06-21": {
+ "offset": 102400,
+ "size": 122880,
+ "corrupt": 0
+ }
+ }
+}
+```
+
+`pending` 表示有新增事件等待整理的日期;`dirty` 表示需要从头重建 `daily.jsonl` 对应日期的日期;`offset` 是当天 events 文件已经处理到的字节位置;`size` 是上次处理完成时当天 events 文件大小;`corrupt` 是当天解析失败的 JSONL 行数。
+
+`WorkflowStatsStorage` 定义这些路径和保留策略。UI 读取时优先加载 `daily.jsonl`;原始事件文件不再作为 UI 临时快照回退源。
-`WorkflowStatsStorage` 定义这些路径和保留策略。UI 读取时优先加载 `daily.jsonl`;如果聚合文件缺失、为空、事件日志高水位不一致或已标记为 dirty,会先尝试后台重建,重建失败时再回退读取 `events.jsonl` 末尾 5MB 生成临时快照。
+旧版单文件 `HookEvents/events.jsonl` 不参与新版统计、迁移或清理。
## 写入事务
Hook 可能由多个 Codex 进程并发触发。`WorkflowHookEventRecorder` 会在同一个 `flock(LOCK_EX)` 中完成轻量写入事务:
-1. 追加当前事件到 `events.jsonl`
-2. 如当天第一次写入,裁剪超过 210 天的 `events.jsonl` 并更新 `maintenance.json` 中的维护日期
-3. 如果 `daily.jsonl` 可信,增量更新当天聚合并记录 `lastAggregatedEventLogSize`
-4. 如果发现 `daily.jsonl` 缺失、为空、事件日志高水位不一致或之前已标记 dirty,只写入 `needsDailyRebuild = true`
+1. 解析事件时间并格式化为本机时间戳与 date key
+2. 追加当前事件到 `events/YYYY-MM-DD.jsonl`
+3. 将 date key 加入 `maintenance.json` 的 `pending`
-这样可以避免并发写入导致 `events.jsonl` 或 `daily.jsonl` 丢失数据,也避免在 Hook timeout 内执行全量重建。
+Hook 写入路径不更新 `daily.jsonl`,也不执行重建或清理旧文件,避免在 Hook timeout 内持锁执行重活。
-`WorkflowStatsService` 在 App 自动刷新、手动刷新或打开 popover 读取工作流统计时检查 `maintenance.json`。如果 `needsDailyRebuild = true` 或事件日志高水位不一致,会在 `CodexBar.workflow-stats` 后台队列中从 `events.jsonl` 重建 `daily.jsonl`。重建时逐行容错,坏行会被跳过并计入 `corruptEventLineCount`; 重建失败时保留旧 `daily.jsonl` 和 dirty 标记, 下次刷新继续重试。
+`WorkflowStatsService` 只在现有自动刷新或手动刷新触发工作流统计刷新时检查 `maintenance.json`。打开 popover 时只读取现有 `daily.jsonl`。如果没有 `pending` 或 `dirty`,服务不会执行维护。
+
+维护时优先处理 `dirty`,从对应日期文件第一行开始流式重建当天聚合;再处理 `pending`,从 `days[date].offset` 开始流式读取新增事件并合并到已有当天聚合。每条坏行会被跳过并计入 `days[date].corrupt`。处理完成后先在 `stats.lock` 外原子写回 `daily.jsonl`,再短暂持有 `stats.lock` 更新 `maintenance.json`,避免主 App 写 daily 时阻塞 Hook 追加事件。
## 保留策略
CodexBar 最多保留最近 210 天数据。
-最近 7 天的每日聚合保留 `sessionIds` 和 `turnIds`,用于继续去重。7 天前的日期会把 ID 集合压缩成 `sessionCount` 和 `turnCount`,之后不再保存 ID。210 天外的数据会在每天第一次 Hook 写入时删除。
+最近 7 天的每日聚合保留 `sessionIds` 和 `turnIds`,用于继续去重。7 天前的日期会把 ID 集合压缩成 `sessionCount` 和 `turnCount`,之后不再保存 ID。210 天外的 `events/YYYY-MM-DD.jsonl` 会在主 App 维护流程中删除。
-如果 `daily.jsonl` 缺失、为空、事件日志高水位不一致或之前已标记 dirty,Hook 只会标记 `needsDailyRebuild`; 后续 App 自动刷新、手动刷新或打开 popover 时由后台服务重建每日聚合。
+如果 `daily.jsonl` 缺失、为空、解析失败、缺少对应日期摘要,或者某天 events 文件状态和 `maintenance.json` 不一致,主 App 会把对应日期加入 `dirty` 并在刷新维护时按天重建。
## 统计口径
-`events.jsonl` 是统计源。重建或增量更新 `daily.jsonl` 时,每条事件先按 `timestamp` 落到本地时区的自然日,再按 `event` 名称归类。`event` 归类时会去掉 `_` 和 `-` 并转小写,例如 `PreToolUse`、`pre_tool_use`、`pre-tool-use` 都会归为 `pretooluse`。
+`events/YYYY-MM-DD.jsonl` 是统计源。Hook 写入时已经按事件自身 `timestamp` 选择对应本地日期文件;重建或增量更新 `daily.jsonl` 时,维护流程按当前处理的文件日期生成当天聚合,再按每行的 `event` 名称归类。`event` 归类时会去掉 `_` 和 `-` 并转小写,例如 `PreToolUse`、`pre_tool_use`、`pre-tool-use` 都会归为 `pretooluse`。
+
+`daily.jsonl` 每一行 JSON 的字段顺序固定为:
+
+```text
+date, eventCount, sessionStartCount, stopCount, preToolUseCount, postToolUseCount,
+permissionRequestCount, preCompactCount, postCompactCount, subagentStartCount,
+subagentStopCount, sessionIds, turnIds, sessionCount, turnCount, projectCounts
+```
+
+其中 `sessionIds` / `turnIds` / `sessionCount` / `turnCount` 没有值时写为 `null`,`projectCounts` 内部项目名按稳定顺序写出。
能参与统计的事件行必须至少满足:
-- `timestamp` 能解析为 ISO8601 时间
+- `timestamp` 能解析为 `yyyy-MM-dd HH:mm:ss.SSS` 本机时间
- `event` 是非空字符串
不满足这两个条件的坏行在重建时会被跳过。其他字段缺失不会阻断统计,只会影响依赖该字段的去重或项目统计。
-从 `events.jsonl` 到页面指标的判定规则如下:
+从 `events/YYYY-MM-DD.jsonl` 到页面指标的判定规则如下:
-| 页面展示名 | 会被计入的 `events.jsonl` 行 | 不会计入的典型情况 | 计数方式 |
-| ---------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------- | ------------------------------------------------------------- |
-| 会话总数 | 最近 7 天内,任意带非空 `session` 的事件行都会把该 `session` 加入当天去重集合;另外 `event` 归一化为 `sessionstart` 的行会增加 `sessionStartCount`。 | `session` 为 `null` 且 `event` 不是 `SessionStart`;坏行。 | `max(sessionCount ?? 0, sessionIds.count, sessionStartCount)` |
-| 对话轮次 | 最近 7 天内,任意带非空 `turn` 的事件行都会把该 `turn` 加入当天去重集合;另外 `event` 归一化为 `stop` 的行会增加 `stopCount`。 | `turn` 为 `null` 且 `event` 不是 `Stop`;坏行。 | `max(turnCount ?? 0, turnIds.count, stopCount)` |
-| 子智能体 | `event` 归一化为 `subagentstart` 或 `subagentstop` 的行。 | 其他事件名;坏行。 | `max(subagentStartCount, subagentStopCount)` |
-| 工具调用 | `event` 归一化为 `pretooluse` 的行会增加 `preToolUseCount`;归一化为 `posttooluse` 的行会增加 `postToolUseCount`。`tool` 可以是具体工具名,也可以是 `null`。 | `SessionStart` 这类非工具事件,即使 `tool` 是 `null` 或存在也不会计入;坏行。 | `max(preToolUseCount, postToolUseCount)` |
-| 权限请求 | `event` 归一化为 `permissionrequest` 的行。 | `permission` 字段本身不会触发计数;只有事件名是 `PermissionRequest` 才计入。 | `permissionRequestCount` |
-| 上下文压缩 | `event` 归一化为 `precompact` 或 `postcompact` 的行。 | 其他事件名;坏行。 | `max(preCompactCount, postCompactCount)` |
+| 页面展示名 | 会被计入的 `events/YYYY-MM-DD.jsonl` 行 | 不会计入的典型情况 | 计数方式 |
+| ---------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
+| 会话总数 | 最近 7 天内,任意带非空 `session` 的事件行都会把该 `session` 加入当天去重集合;另外 `event` 归一化为 `sessionstart` 的行会增加 `sessionStartCount`。 | `session` 为 `null` 且 `event` 不是 `SessionStart`;坏行。 | 优先 `sessionCount`,其次 `sessionIds.count`,最后 `sessionStartCount` |
+| 对话轮次 | 最近 7 天内,任意带非空 `turn` 的事件行都会把该 `turn` 加入当天去重集合;另外 `event` 归一化为 `stop` 的行会增加 `stopCount`。 | `turn` 为 `null` 且 `event` 不是 `Stop`;坏行。 | 优先 `turnCount`,其次 `turnIds.count`,最后 `stopCount` |
+| 子智能体 | `event` 归一化为 `subagentstart` 或 `subagentstop` 的行。 | 其他事件名;坏行。 | `max(subagentStartCount, subagentStopCount)` |
+| 工具调用 | `event` 归一化为 `pretooluse` 的行会增加 `preToolUseCount`;归一化为 `posttooluse` 的行会增加 `postToolUseCount`。`tool` 可以是具体工具名,也可以是 `null`。 | `SessionStart` 这类非工具事件,即使 `tool` 是 `null` 或存在也不会计入;坏行。 | `max(preToolUseCount, postToolUseCount)` |
+| 权限请求 | `event` 归一化为 `permissionrequest` 的行。 | `permission` 字段本身不会触发计数;只有事件名是 `PermissionRequest` 才计入。 | `permissionRequestCount` |
+| 上下文压缩 | `event` 归一化为 `precompact` 或 `postcompact` 的行。 | 其他事件名;坏行。 | `max(preCompactCount, postCompactCount)` |
逐字段统计口径如下:
-| `daily.jsonl` 字段 | 从 `events.jsonl` 读取什么 | 写入 / 更新规则 | 页面关系 |
-| ------------------------ | ---------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------ |
-| `date` | `timestamp` | 先把事件时间解析为绝对时间,再用 `Calendar.current.startOfDay(for:)` 落到当前本地时区的自然日,最后格式化为 `yyyy-MM-dd`。同一天所有事件合并到同一行。早于最近 210 天保留窗口的事件不会进入聚合。 | 热力图日期键;tooltip 日期。 |
-| `eventCount` | 每条成功解码并保留下来的事件行 | 每处理一条事件就 `+1`,发生在具体事件类型判断之前。因此 `UserPromptSubmit`、未知 `event`、`tool: null`、`session: null` 等行都会计入,只要 `timestamp` 和 `event` 可解析。 | 进入 `WorkflowDailyStats.eventCount`,当前页面不展示。 |
-| `sessionStartCount` | `event` | `event` 归一化后等于 `sessionstart` 时 `+1`。不要求 `session` 非空。 | 作为「会话总数」兜底来源。 |
-| `stopCount` | `event` | `event` 归一化后等于 `stop` 时 `+1`。不要求 `turn` 非空。 | 作为「对话轮次」兜底来源。 |
-| `preToolUseCount` | `event` | `event` 归一化后等于 `pretooluse` 时 `+1`。不读取 `tool` 做过滤,`tool` 为 `null` 也计入。 | 参与「工具调用」。 |
-| `postToolUseCount` | `event` | `event` 归一化后等于 `posttooluse` 时 `+1`。不读取 `tool` 做过滤,`tool` 为 `null` 也计入。 | 参与「工具调用」。 |
-| `permissionRequestCount` | `event` | `event` 归一化后等于 `permissionrequest` 时 `+1`。不读取 `permission` 字段做过滤,`permission` 只是记录当时的权限模式。 | 直接显示为「权限请求」。 |
-| `preCompactCount` | `event` | `event` 归一化后等于 `precompact` 时 `+1`。 | 参与「上下文压缩」。 |
-| `postCompactCount` | `event` | `event` 归一化后等于 `postcompact` 时 `+1`。 | 参与「上下文压缩」。 |
-| `subagentStartCount` | `event` | `event` 归一化后等于 `subagentstart` 时 `+1`。 | 参与「子智能体」。 |
-| `subagentStopCount` | `event` | `event` 归一化后等于 `subagentstop` 时 `+1`。 | 参与「子智能体」。 |
-| `sessionIds` | `session` | 仅最近 7 个本地自然日保留。任意事件行只要 `session` 是非空字符串,就插入当天集合并去重、排序;不要求事件类型是 `SessionStart`。超过 7 天后会被压缩为 `sessionCount` 并写成 `null` / 缺失。 | 参与「会话总数」去重。 |
-| `turnIds` | `turn` | 仅最近 7 个本地自然日保留。任意事件行只要 `turn` 是非空字符串,就插入当天集合并去重、排序;不要求事件类型是 `Stop`。超过 7 天后会被压缩为 `turnCount` 并写成 `null` / 缺失。 | 参与「对话轮次」去重。 |
-| `sessionCount` | `sessionIds`、旧 `sessionCount`、`sessionStartCount` | 最近 7 天通常为 `null`;日期进入 7 天外窗口后,归一化时写成 `max(sessionCount ?? 0, sessionIds.count, sessionStartCount)`,然后移除 `sessionIds`。这样旧日期不用继续保存完整 ID,也能保留会话总数。 | 参与「会话总数」。 |
-| `turnCount` | `turnIds`、旧 `turnCount`、`stopCount` | 最近 7 天通常为 `null`;日期进入 7 天外窗口后,归一化时写成 `max(turnCount ?? 0, turnIds.count, stopCount)`,然后移除 `turnIds`。这样旧日期不用继续保存完整 ID,也能保留轮次总数。 | 参与「对话轮次」。 |
-| `projectCounts` | `cwd` | 任意事件行只要 `cwd` 非空,就取标准化路径的最后一层目录名作为项目名并 `+1`;如果最后一层为空,回退使用完整路径字符串。统计的是事件数,不是会话数或工具调用数。未知事件也会计入。 | 用于计算 `mostActiveProject`,当前页面不展示。 |
+| `daily.jsonl` 字段 | 从 `events/YYYY-MM-DD.jsonl` 读取什么 | 写入 / 更新规则 | 页面关系 |
+| ------------------------ | ---------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------ |
+| `date` | `timestamp` | Hook 写入时先把事件时间解析为绝对时间,再按当前本地时区格式化为 `yyyy-MM-dd` 选择日期文件。维护流程按当前处理的文件日期生成同名 `daily.jsonl` 行。早于最近 210 天保留窗口的日期不会进入聚合。 | 热力图日期键;tooltip 日期。 |
+| `eventCount` | 每条成功解码并保留下来的事件行 | 每处理一条事件就 `+1`,发生在具体事件类型判断之前。因此 `UserPromptSubmit`、未知 `event`、`tool: null`、`session: null` 等行都会计入,只要 `timestamp` 和 `event` 可解析。 | 进入 `WorkflowDailyStats.eventCount`,当前页面不展示。 |
+| `sessionStartCount` | `event` | `event` 归一化后等于 `sessionstart` 时 `+1`。不要求 `session` 非空。 | 作为「会话总数」兜底来源。 |
+| `stopCount` | `event` | `event` 归一化后等于 `stop` 时 `+1`。不要求 `turn` 非空。 | 作为「对话轮次」兜底来源。 |
+| `preToolUseCount` | `event` | `event` 归一化后等于 `pretooluse` 时 `+1`。不读取 `tool` 做过滤,`tool` 为 `null` 也计入。 | 参与「工具调用」。 |
+| `postToolUseCount` | `event` | `event` 归一化后等于 `posttooluse` 时 `+1`。不读取 `tool` 做过滤,`tool` 为 `null` 也计入。 | 参与「工具调用」。 |
+| `permissionRequestCount` | `event` | `event` 归一化后等于 `permissionrequest` 时 `+1`。不读取 `permission` 字段做过滤,`permission` 只是记录当时的权限模式。 | 直接显示为「权限请求」。 |
+| `preCompactCount` | `event` | `event` 归一化后等于 `precompact` 时 `+1`。 | 参与「上下文压缩」。 |
+| `postCompactCount` | `event` | `event` 归一化后等于 `postcompact` 时 `+1`。 | 参与「上下文压缩」。 |
+| `subagentStartCount` | `event` | `event` 归一化后等于 `subagentstart` 时 `+1`。 | 参与「子智能体」。 |
+| `subagentStopCount` | `event` | `event` 归一化后等于 `subagentstop` 时 `+1`。 | 参与「子智能体」。 |
+| `sessionIds` | `session` | 仅最近 7 个本地自然日保留。任意事件行只要 `session` 是非空字符串,就插入当天集合并去重、排序;不要求事件类型是 `SessionStart`。超过 7 天后会被压缩为 `sessionCount` 并写成 `null`。 | 参与「会话总数」去重。 |
+| `turnIds` | `turn` | 仅最近 7 个本地自然日保留。任意事件行只要 `turn` 是非空字符串,就插入当天集合并去重、排序;不要求事件类型是 `Stop`。超过 7 天后会被压缩为 `turnCount` 并写成 `null`。 | 参与「对话轮次」去重。 |
+| `sessionCount` | `sessionIds`、旧 `sessionCount`、`sessionStartCount` | 最近 7 天通常为 `null`;日期进入 7 天外窗口后,归一化时优先沿用已有 `sessionCount`,否则使用 `sessionIds.count`,再否则使用 `sessionStartCount`,然后移除 `sessionIds`。这样旧日期不用继续保存完整 ID,也能保留会话总数。 | 参与「会话总数」。 |
+| `turnCount` | `turnIds`、旧 `turnCount`、`stopCount` | 最近 7 天通常为 `null`;日期进入 7 天外窗口后,归一化时优先沿用已有 `turnCount`,否则使用 `turnIds.count`,再否则使用 `stopCount`,然后移除 `turnIds`。这样旧日期不用继续保存完整 ID,也能保留轮次总数。 | 参与「对话轮次」。 |
+| `projectCounts` | `cwd` | 任意事件行只要 `cwd` 非空,就取标准化路径的最后一层目录名作为项目名并 `+1`;如果最后一层为空,回退使用完整路径字符串。统计的是事件数,不是会话数或工具调用数。未知事件也会计入。 | 用于计算 `mostActiveProject`,当前页面不展示。 |
读取旧 `daily.jsonl` 时,缺失的数字字段按 `0` 处理,缺失的 `projectCounts` 按空字典处理,缺失的 `sessionIds` / `turnIds` / `sessionCount` / `turnCount` 保持为 `nil`。后续归一化会按当前保留策略补齐或压缩这些字段。
UI 不直接展示所有原始字段,而是先生成 `WorkflowDailyStats`:
-| 页面展示名 | 生成规则 |
-| ---------- | ------------------------------------------------------------- |
-| 会话总数 | `max(sessionCount ?? 0, sessionIds.count, sessionStartCount)` |
-| 对话轮次 | `max(turnCount ?? 0, turnIds.count, stopCount)` |
-| 子智能体 | `max(subagentStartCount, subagentStopCount)` |
-| 工具调用 | `max(preToolUseCount, postToolUseCount)` |
-| 权限请求 | `permissionRequestCount` |
-| 上下文压缩 | `max(preCompactCount, postCompactCount)` |
+| 页面展示名 | 生成规则 |
+| ---------- | ------------------------------------------------------- |
+| 会话总数 | `sessionCount ?? sessionIds.count ?? sessionStartCount` |
+| 对话轮次 | `turnCount ?? turnIds.count ?? stopCount` |
+| 子智能体 | `max(subagentStartCount, subagentStopCount)` |
+| 工具调用 | `max(preToolUseCount, postToolUseCount)` |
+| 权限请求 | `permissionRequestCount` |
+| 上下文压缩 | `max(preCompactCount, postCompactCount)` |
`mostActiveProject` 和 `eventCount` 会进入 `WorkflowDailyStats`,但当前页面没有展示。`UserPromptSubmit` 和未知事件不会增加上述 6 个页面指标,只会进入 `eventCount`,有 `cwd` 时也会进入 `projectCounts`。
diff --git a/Scripts/appcast.sh b/Scripts/appcast.sh
index 32cc976..edfff61 100755
--- a/Scripts/appcast.sh
+++ b/Scripts/appcast.sh
@@ -22,7 +22,8 @@ Environment:
APPCAST_PATH Path to appcast.xml. Defaults to appcast.xml.
DOWNLOAD_BASE_URL Base URL for DMG downloads.
Defaults to https://codexbar.zabrian.app/download.
- RELEASE_NOTES_BASE_URL Base URL for release notes.
+ RELEASE_NOTES_BASE_URL Base URL for release notes. The version is appended
+ as a fragment anchor (BASE#X.Y.Z).
Defaults to https://codexbar.zabrian.app/notes.
INCLUDE_RELEASE_NOTES Set to 0 to omit sparkle:releaseNotesLink.
MINIMUM_SYSTEM_VERSION Defaults to 15.0.
@@ -198,7 +199,7 @@ MIN_SYSTEM_ESCAPED="$(printf '%s' "${MINIMUM_SYSTEM_VERSION}" | xml_escape)"
RELEASE_NOTES_XML=""
if [[ "${INCLUDE_RELEASE_NOTES}" != "0" ]]; then
- RELEASE_NOTES_URL="${RELEASE_NOTES_BASE_URL%/}/${SHORT_VERSION}.html"
+ RELEASE_NOTES_URL="${RELEASE_NOTES_BASE_URL%/}#${SHORT_VERSION}"
RELEASE_NOTES_URL_ESCAPED="$(printf '%s' "${RELEASE_NOTES_URL}" | xml_escape)"
RELEASE_NOTES_XML="<sparkle:releaseNotesLink>${RELEASE_NOTES_URL_ESCAPED}</sparkle:releaseNotesLink>
"
diff --git a/appcast.xml b/appcast.xml
index 6342d1f..dc170f1 100644
--- a/appcast.xml
+++ b/appcast.xml
@@ -7,12 +7,21 @@
<link>https://codexbar.zabrian.app/appcast.xml</link>
<description>CodexBar appcast feed</description>
<language>zh-CN</language>
+ <item>
+ <title>CodexBar.app 2.4.0</title>
+ <sparkle:version>16</sparkle:version>
+ <sparkle:shortVersionString>2.4.0</sparkle:shortVersionString>
+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#2.4.0</sparkle:releaseNotesLink>
+ <pubDate>Sun, 21 Jun 2026 22:32:31 +0800</pubDate>
+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v2.4.0.dmg" sparkle:edSignature="h375ImnKqMc1M+q26ouBl/wlEMoaoMC2vSBHqFEIu106ShDdr2UaKF/6i9ms10qiItyNVDjspv6bQFVIlJ0qBA==" length="2887904" type="application/octet-stream"/>
+ </item>
<item>
<title>CodexBar.app 2.3.2</title>
<sparkle:version>15</sparkle:version>
<sparkle:shortVersionString>2.3.2</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/2.3.2.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#2.3.2</sparkle:releaseNotesLink>
<pubDate>Sun, 21 Jun 2026 15:00:26 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v2.3.2.dmg" sparkle:edSignature="bfK4ho9NjcsCywJjT7aZltj6WDdZH3i4dvygfW2QL2+K+dO16OhsFWwTacV5MXPYDEpcCWSWZtWknZngv0p5Ag==" length="2850099" type="application/octet-stream"/>
</item>
@@ -21,7 +30,7 @@
<sparkle:version>13</sparkle:version>
<sparkle:shortVersionString>2.3.0</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/2.3.0.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#2.3.0</sparkle:releaseNotesLink>
<pubDate>Sun, 21 Jun 2026 11:46:37 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v2.3.0.dmg" sparkle:edSignature="n8vjt1rxRaJwa261pU5Fo0BNaETL6nygdfkLLfnK+K+fd1XWk8SJMzVCp/w536MTWtSN8W3+L118jCb8LV+QDA==" length="2849403" type="application/octet-stream"/>
</item>
@@ -30,7 +39,7 @@
<sparkle:version>12</sparkle:version>
<sparkle:shortVersionString>2.2.0</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/2.2.0.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#2.2.0</sparkle:releaseNotesLink>
<pubDate>Fri, 19 Jun 2026 15:36:20 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v2.2.0.dmg" sparkle:edSignature="L/6jFdturq7Mz31UItkx5aO6uPu7uOKfFdHEvov44W+PZVLD1BDf/jiSujDED9xuBnvXk8GoIg5mRAFnoIo5Dw==" length="2681727" type="application/octet-stream"/>
</item>
@@ -39,7 +48,7 @@
<sparkle:version>11</sparkle:version>
<sparkle:shortVersionString>2.1.0</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/2.1.0.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#2.1.0</sparkle:releaseNotesLink>
<pubDate>Thu, 18 Jun 2026 16:05:00 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v2.1.0.dmg" sparkle:edSignature="2FBNtL8I4tLW1hfkA6kDgLaShjnGw55q3qQbaUwW2238ulf8IzJeLemzGju0b9LRdrSVQoavheydTljCHJyMDQ==" length="1564567" type="application/octet-stream"/>
</item>
@@ -48,7 +57,7 @@
<sparkle:version>10</sparkle:version>
<sparkle:shortVersionString>2.0.0</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/2.0.0.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#2.0.0</sparkle:releaseNotesLink>
<pubDate>Mon, 15 Jun 2026 22:25:38 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v2.0.0.dmg" sparkle:edSignature="cSN94/EgbLzV9LvRznE+dsrSlUpIPT9ustcr28E+fZa/0VEz9wtLC3OUriYTZXHvFnixmjHJBaF0s6G+unSUDg==" length="1492881" type="application/octet-stream"/>
</item>
@@ -57,7 +66,7 @@
<sparkle:version>9</sparkle:version>
<sparkle:shortVersionString>1.3.6</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/1.3.6.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#1.3.6</sparkle:releaseNotesLink>
<pubDate>Mon, 15 Jun 2026 16:06:15 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v1.3.6.dmg" sparkle:edSignature="xkRTJRxVthwJw1oIUZMmSmJ3UDCqDP3YREuK1Qf+zBbeEx2UWcJBuDQW5BNxC3lZ+krPqgz/oWySGwbJfjyVAw==" length="1482951" type="application/octet-stream"/>
</item>
@@ -66,7 +75,7 @@
<sparkle:version>8</sparkle:version>
<sparkle:shortVersionString>1.3.5</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/1.3.5.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#1.3.5</sparkle:releaseNotesLink>
<pubDate>Mon, 15 Jun 2026 14:45:43 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v1.3.5.dmg" sparkle:edSignature="+O1seqtfFeoNPUjkzdu+h3gMm6wTkWExRtyOObZNqnDu3FPiOxhqWT/Zm/AKSw091CyFmG1rhwYQfmafFwJwBA==" length="1461278" type="application/octet-stream"/>
</item>
@@ -75,7 +84,7 @@
<sparkle:version>7</sparkle:version>
<sparkle:shortVersionString>1.3.4</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/1.3.4.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#1.3.4</sparkle:releaseNotesLink>
<pubDate>Mon, 15 Jun 2026 13:59:04 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v1.3.4.dmg" sparkle:edSignature="1Eozkv41L4r7ecCVr6wpAeOR2ZPLcnKOfGEtsFv6EZZuNaFSpMw5EUvc1KESoReaxVZU7PkpVGhZrCw4FexPAA==" length="1461243" type="application/octet-stream"/>
</item>
@@ -84,7 +93,7 @@
<sparkle:version>6</sparkle:version>
<sparkle:shortVersionString>1.3.3</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/1.3.3.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#1.3.3</sparkle:releaseNotesLink>
<pubDate>Sun, 14 Jun 2026 22:10:39 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v1.3.3.dmg" sparkle:edSignature="1auvaT2F0dJ4GOQAN7CpC1cFWBRq+eZGzjj6lIFj0iI4vwMVuUl4QcY9usI9UpfSOPDyJniARYkEXrIJoJZYCQ==" length="1405208" type="application/octet-stream"/>
</item>
@@ -93,7 +102,7 @@
<sparkle:version>5</sparkle:version>
<sparkle:shortVersionString>1.3.2</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/1.3.2.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#1.3.2</sparkle:releaseNotesLink>
<pubDate>Sun, 14 Jun 2026 15:12:18 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v1.3.2.dmg" sparkle:edSignature="FWk4PT/QIvq17Z3NzHZD7hao5NEhpLMsoOL3UMHl5l08nFZINtrUj4w4Hapkh8V4rkk6BbxN08kayns5L73wAg==" length="1396203" type="application/octet-stream"/>
</item>
@@ -102,7 +111,7 @@
<sparkle:version>4</sparkle:version>
<sparkle:shortVersionString>1.3.1</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/1.3.1.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#1.3.1</sparkle:releaseNotesLink>
<pubDate>Sat, 13 Jun 2026 11:54:40 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v1.3.1.dmg" sparkle:edSignature="1WyJkqYmdHveZMBB7Ne+GLwz6agqklZ6F+RXqLiu3l30cXo9PnsnDOiyjEC8Dl5Sb4oFo+7oGjSZoZci0tdBCg==" length="1331802" type="application/octet-stream"/>
</item>
@@ -111,7 +120,7 @@
<sparkle:version>3</sparkle:version>
<sparkle:shortVersionString>1.3.0</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/1.3.0.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#1.3.0</sparkle:releaseNotesLink>
<pubDate>Fri, 12 Jun 2026 16:48:27 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v1.3.0.dmg" sparkle:edSignature="9d/fZdrMGXjOlKoKOTRutWZcNIdjxxQEbK0WqV+vg2rlEyaUYK973gD/JlX6S6+mhrSFQjAPdw5nd3y/C4j0CA==" length="1330236" type="application/octet-stream"/>
</item>
@@ -120,7 +129,7 @@
<sparkle:version>2</sparkle:version>
<sparkle:shortVersionString>1.2.1</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/1.2.1.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#1.2.1</sparkle:releaseNotesLink>
<pubDate>Thu, 11 Jun 2026 21:47:07 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v1.2.1.dmg" sparkle:edSignature="28wK6sVULaMiv6vL2nG+I2AYVtgJN1AKVDWhfYebKYdldbKmz4aOmggolKlXk9F2p1IlctC+713KIvPeRwWcCw==" length="1323377" type="application/octet-stream"/>
</item>
@@ -129,7 +138,7 @@
<sparkle:version>1</sparkle:version>
<sparkle:shortVersionString>1.2.0</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
- <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes/1.2.0.html</sparkle:releaseNotesLink>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#1.2.0</sparkle:releaseNotesLink>
<pubDate>Thu, 11 Jun 2026 21:19:36 +0800</pubDate>
<enclosure url="https://codexbar.zabrian.app/download/CodexBar-v1.2.0.dmg" sparkle:edSignature="uwe29fAr5NHr+Id4H0cEMqVDmFxWZb/R+GE0yxvbqKDet+NvY6tlWphl9GxbEW8FwVow5B9BF0nsg1PSJ7NIDQ==" length="1323252" type="application/octet-stream"/>
</item>