CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
feat: 添加全局快捷键和热力图详情
Bobd70cd71b12c4
diff --git a/AGENTS.md b/AGENTS.mdindex 1d0b88b..aee59d1 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -164,7 +164,7 @@ Hook 统计的配置、存储、保留策略和统计口径见 [Docs/CodexHook.m- 正常图标是 `person.fill.checkmark`, 错误图标是 `person.fill.xmark`。- 菜单栏不展示额度数字; 详情只在 popover 中展示。-- 左键切换 popover; 右键或 Control 点击显示「设置 / 日志 / 退出」。+- 左键或全局快捷键切换 popover; 右键或 Control 点击显示「设置 / 日志 / 退出」。Popover:@@ -182,22 +182,25 @@ Popover:- token 区域显示「单日峰值」和「全时累计」; `TokenCountText` 对 1K 以下显示完整整数, 1K 起显示 K/M/B。- token 区域还显示「当前连胜」、「最长连胜」和「最长任务」。- 热力图是近 30 周、30 列 x 7 行、周日到周六排列; Codex Hook 开启时包含今天, Hook 关闭时仅在 app-server 已返回当天 token bucket 时包含今天。-- Hook 关闭时热力图 tooltip 只显示日期和 token 数; 宽度使用 `tokenTooltipWidth`。-- Hook 开启时热力图 tooltip 首行左侧显示日期、右侧显示 token 数, 当天 token 数显示 `--`; 后续逐行显示「会话总数」、「对话轮次」、「子智能体」、「工具调用」、「权限请求」、「上下文压缩」。-- 工作流统计只展示在用量热力图 tooltip 中, 不再有单独的工作流统计区。+- 热力图 hover 使用 `HeatmapDetailPanelController` 展示侧边详情面板, 不是 popover 内 tooltip; 面板作为 popover child window, 不接收鼠标事件, 左右贴边展示并在屏幕可见区域内夹紧。+- Hook 关闭时详情面板显示日期、token 数和「用量强度」分段条, 尺寸 `212 x 84`。+- Hook 开启时详情面板首行左侧显示日期、右侧显示 token 数, 当天 token 数显示 `--`; 后续显示「用量强度」、「会话总数」、「对话轮次」、「子智能体」、「工具调用」、「权限请求」、「上下文压缩」, 尺寸 `212 x 189`。+- 工作流统计只展示在用量热力图详情面板中, 不再有单独的工作流统计区。设置窗口:- 通过右键菜单「设置」打开独立 `AppSettingsView` 窗口。- 不要恢复为 Option 点击或 popover 内设置区。-- 设置页包含「CodexBar 版本」和「Codex 版本」区域。+- 设置页包含「使用快捷键」行、「CodexBar 版本」和「Codex 版本」区域。- `Codex CLI` 行图标用 `terminal`; `Codex APP` 行图标用 `app.badge`。- 当前运行来源显示「当前使用」。- 当前行优先展示 app-server 握手自报版本; 非当前行展示磁盘安装版本。- 当前运行版本与磁盘安装版本不同时, 显示「已更新至 <version>」。- 路径点击复制到剪贴板, 对应来源显示「已复制」1.5 秒; 保留路径文本布局宽度避免跳动。+- 默认全局快捷键是 `⌘⇧W`; 快捷键录制至少需要两个修饰键, 不允许 Command-Space 或 Command-Tab; 注册冲突、无法识别和校验错误显示在快捷键行内。- 设置页包含「启用 Codex Hook」开关; 开启后会写入全局 Codex Hook 配置, 用于近 30 周数据展示更多本机统计数据。-- Codex Hook 开关下方说明文案为小号辅助文字; 不展示启用/关闭状态文案, 只在失败时展示错误消息。+- Codex Hook 开关下方说明文案为小号辅助文字; 不展示启用/关闭状态文案。+- 开机启动和 Codex Hook 错误显示在设置组与底部按钮组之间的独立错误组; 无错误时不展示该组, 退出和检查更新按钮之间不展示错误文案。日志窗口:diff --git a/CodexBar.xcodeproj/project.pbxproj b/CodexBar.xcodeproj/project.pbxprojindex f8b0516..1a8fa5b 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 = 18;+ CURRENT_PROJECT_VERSION = 19;DEVELOPMENT_TEAM = 4KJ362VJW5;ENABLE_APP_INTENTS_METADATA_GENERATION = NO;ENABLE_APP_SANDBOX = NO;@@ -290,7 +290,7 @@"$(inherited)","@executable_path/../Frameworks",);- MARKETING_VERSION = 2.4.2;+ MARKETING_VERSION = 2.4.3;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 = 18;+ CURRENT_PROJECT_VERSION = 19;DEVELOPMENT_TEAM = 4KJ362VJW5;ENABLE_APP_INTENTS_METADATA_GENERATION = NO;ENABLE_APP_SANDBOX = NO;@@ -327,7 +327,7 @@"$(inherited)","@executable_path/../Frameworks",);- MARKETING_VERSION = 2.4.2;+ MARKETING_VERSION = 2.4.3;PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;PRODUCT_NAME = "$(TARGET_NAME)";PROVISIONING_PROFILE_SPECIFIER = "";diff --git a/CodexBar/Controllers/GlobalHotKeyController.swift b/CodexBar/Controllers/GlobalHotKeyController.swiftnew file mode 100644index 0000000..792d377--- /dev/null+++ b/CodexBar/Controllers/GlobalHotKeyController.swift@@ -0,0 +1,110 @@+import Carbon.HIToolbox+import Foundation++final class GlobalHotKeyController {+ private let onPressed: @MainActor () -> Void+ private var eventHandler: EventHandlerUPP?+ private var eventHandlerRef: EventHandlerRef?+ private var hotKeyRef: EventHotKeyRef?+ private var nextHotKeyID: UInt32 = 1++ init(onPressed: @escaping @MainActor () -> Void) {+ self.onPressed = onPressed+ }++ deinit {+ uninstall()+ }++ func install(shortcut: GlobalHotKeyShortcut) -> Bool {+ let newEventHandler = Self.makeEventHandler()+ var eventType = EventTypeSpec(+ eventClass: OSType(kEventClassKeyboard),+ eventKind: UInt32(kEventHotKeyPressed)+ )+ let userData = UnsafeMutableRawPointer(Unmanaged.passUnretained(self).toOpaque())+ var installedHandlerRef: EventHandlerRef?++ guard InstallEventHandler(+ GetApplicationEventTarget(),+ newEventHandler,+ 1,+ &eventType,+ userData,+ &installedHandlerRef+ ) == noErr else {+ return false+ }++ let hotKeyID = EventHotKeyID(signature: Self.hotKeySignature, id: nextHotKeyID)+ var registeredHotKeyRef: EventHotKeyRef?+ let status = RegisterEventHotKey(+ shortcut.keyCode,+ shortcut.modifiers,+ hotKeyID,+ GetApplicationEventTarget(),+ 0,+ ®isteredHotKeyRef+ )++ guard status == noErr else {+ if let installedHandlerRef {+ RemoveEventHandler(installedHandlerRef)+ }+ return false+ }++ clearCurrentRegistration()++ eventHandler = newEventHandler+ eventHandlerRef = installedHandlerRef+ hotKeyRef = registeredHotKeyRef+ nextHotKeyID &+= 1+ return true+ }++ func uninstall() {+ clearCurrentRegistration()+ }++ private func clearCurrentRegistration() {+ if let hotKeyRef {+ UnregisterEventHotKey(hotKeyRef)+ self.hotKeyRef = nil+ }++ if let eventHandlerRef {+ RemoveEventHandler(eventHandlerRef)+ self.eventHandlerRef = nil+ }++ eventHandler = nil+ }++ private func handleHotKeyPressed() {+ Task { @MainActor [onPressed] in+ onPressed()+ }+ }++ private static func makeEventHandler() -> EventHandlerUPP {+ { _, _, userData in+ guard let userData else {+ return noErr+ }++ let controller = Unmanaged<GlobalHotKeyController>+ .fromOpaque(userData)+ .takeUnretainedValue()+ controller.handleHotKeyPressed()+ return noErr+ }+ }++ private static let hotKeySignature: OSType = {+ let scalars = Array("CDBR".unicodeScalars)+ return scalars.reduce(UInt32(0)) { result, scalar in+ (result << 8) + scalar.value+ }+ }()+}diff --git a/CodexBar/Controllers/HeatmapDetailPanelController.swift b/CodexBar/Controllers/HeatmapDetailPanelController.swiftnew file mode 100644index 0000000..d0dbf52--- /dev/null+++ b/CodexBar/Controllers/HeatmapDetailPanelController.swift@@ -0,0 +1,601 @@+import AppKit+import QuartzCore+import SwiftUI++private final class DetailPanel: NSPanel {+ override var canBecomeKey: Bool {+ false+ }++ override var canBecomeMain: Bool {+ false+ }+}++@MainActor+final class HeatmapDetailPanelController {+ private var panel: NSPanel?+ private var hostingController: NSHostingController<UsageHeatmapDayDetailView>?+ private var hideTask: Task<Void, Never>?+ private var currentSide = UsageHeatmapDetailSide.left+ private var visibilityGeneration = 0+ private var isSwitchingSide = false+ private var isDrawerHiding = false+ private var pendingSideSwitchRequest: PanelRequest?+ private weak var popoverWindow: NSWindow?++ func update(+ context: UsageHeatmapHoverContext?,+ relativeTo popoverWindow: NSWindow?,+ contentView: NSView?+ ) {+ guard let context else {+ hide()+ return+ }++ guard let popoverWindow else {+ hide(immediate: true)+ return+ }++ show(context: context, relativeTo: popoverWindow, contentView: contentView)+ }++ func hide(immediate: Bool = false, delayed: Bool = true) {+ cancelHideTask()+ visibilityGeneration += 1+ isSwitchingSide = false+ pendingSideSwitchRequest = nil++ guard let panel, panel.isVisible else {+ return+ }++ guard !immediate else {+ resetDrawerVisualState(for: panel)+ isDrawerHiding = false+ orderOut(panel)+ return+ }++ let generation = visibilityGeneration+ let side = currentSide+ hideTask = Task { @MainActor [weak self] in+ if delayed {+ try? await Task.sleep(for: .milliseconds(Metrics.hideDelayMilliseconds))+ }++ guard let self,+ !Task.isCancelled,+ generation == self.visibilityGeneration,+ let panel = self.panel,+ panel.isVisible else {+ return+ }++ self.isDrawerHiding = true+ let hidden = self.drawerHiddenTranslation(for: side, panelWidth: panel.frame.width)+ self.animateContentTranslation(+ to: hidden,+ duration: Metrics.drawerExitDuration,+ timing: .easeIn+ ) {+ Task { @MainActor [weak self] in+ guard let self,+ generation == self.visibilityGeneration else {+ return+ }++ self.orderOut(panel)+ self.setContentTranslation(0)+ self.isDrawerHiding = false+ self.hideTask = nil+ }+ }+ }+ }++ private func show(+ context: UsageHeatmapHoverContext,+ relativeTo popoverWindow: NSWindow,+ contentView: NSView?+ ) {+ cancelHideTask()++ let panel = ensurePanel()+ let wasVisible = panel.isVisible+ if wasVisible {+ attach(panel, to: popoverWindow)+ }++ let panelSize = UsageHeatmapDayDetailView.panelSize(showsWorkflowStats: context.showsWorkflowStats)+ let position = panelPosition(+ for: panelSize,+ relativeTo: popoverWindow,+ contentView: contentView,+ anchorScreenFrame: context.anchorScreenFrame,+ heatmapScreenFrame: context.heatmapScreenFrame,+ showsWorkflowStats: context.showsWorkflowStats,+ preferredSide: context.preferredSide+ )+ let request = PanelRequest(context: context, position: position)++ panel.level = popoverWindow.level+ defer {+ restorePopoverKeyWindow(popoverWindow)+ }++ if wasVisible && isSwitchingSide {+ pendingSideSwitchRequest = request+ return+ }++ if wasVisible && currentSide != position.side {+ beginSideSwitch(on: panel, from: currentSide, to: request)+ return+ }++ visibilityGeneration += 1+ let resumesDrawerHide = wasVisible && isDrawerHiding+ apply(request, to: panel)++ if resumesDrawerHide {+ isDrawerHiding = false+ animateContentTranslation(to: 0, duration: Metrics.drawerEnterDuration, timing: .easeOut)+ return+ }++ guard !wasVisible else {+ resetDrawerVisualState(for: panel)+ return+ }++ let generation = visibilityGeneration+ let hidden = drawerHiddenTranslation(for: position.side, panelWidth: panelSize.width)+ setContentTranslation(hidden)+ panel.alphaValue = 0+ attach(panel, to: popoverWindow)+ panel.order(.above, relativeTo: popoverWindow.windowNumber)+ animateContentTranslationAfterInitialLayout(+ from: hidden,+ panel: panel,+ generation: generation+ )+ }++ private func beginSideSwitch(+ on panel: NSPanel,+ from sourceSide: UsageHeatmapDetailSide,+ to request: PanelRequest+ ) {+ visibilityGeneration += 1+ let generation = visibilityGeneration+ isSwitchingSide = true+ isDrawerHiding = false+ pendingSideSwitchRequest = nil++ let hidden = drawerHiddenTranslation(for: sourceSide, panelWidth: panel.frame.width)+ animateContentTranslation(+ to: hidden,+ duration: Metrics.drawerExitDuration,+ timing: .easeIn+ ) {+ Task { @MainActor [weak self] in+ guard let self,+ generation == self.visibilityGeneration,+ self.isSwitchingSide,+ panel.isVisible else {+ return+ }++ self.showHiddenSideSwitchRequest(+ self.nextSideSwitchRequest(fallback: request),+ on: panel,+ generation: generation+ )+ }+ }+ }++ private func showHiddenSideSwitchRequest(_ request: PanelRequest, on panel: NSPanel, generation: Int) {+ let side = request.position.side+ let hidden = drawerHiddenTranslation(for: side, panelWidth: request.position.frame.width)+ setContentTranslation(hidden)+ apply(request, to: panel)+ setContentTranslation(hidden)++ animateContentTranslation(+ from: hidden,+ to: 0,+ duration: Metrics.drawerEnterDuration,+ timing: .easeOut+ ) {+ Task { @MainActor [weak self] in+ guard let self,+ generation == self.visibilityGeneration,+ panel.isVisible else {+ return+ }++ self.isSwitchingSide = false+ self.isDrawerHiding = false+ self.setContentTranslation(0)+ self.handlePendingSideSwitchRequest(on: panel)+ }+ }+ }++ private func nextSideSwitchRequest(fallback request: PanelRequest) -> PanelRequest {+ guard let pendingSideSwitchRequest,+ pendingSideSwitchRequest.position.side == request.position.side else {+ return request+ }++ self.pendingSideSwitchRequest = nil+ return pendingSideSwitchRequest+ }++ private func handlePendingSideSwitchRequest(on panel: NSPanel) {+ guard let pendingSideSwitchRequest else {+ return+ }++ self.pendingSideSwitchRequest = nil++ if pendingSideSwitchRequest.position.side != currentSide {+ beginSideSwitch(on: panel, from: currentSide, to: pendingSideSwitchRequest)+ } else {+ apply(pendingSideSwitchRequest, to: panel)+ resetDrawerVisualState(for: panel)+ }+ }++ private func ensurePanel() -> NSPanel {+ if let panel {+ return panel+ }++ let panel = DetailPanel(+ contentRect: NSRect(origin: .zero, size: UsageHeatmapDayDetailView.panelSize(showsWorkflowStats: true)),+ styleMask: [.borderless, .nonactivatingPanel],+ backing: .buffered,+ defer: false+ )+ panel.backgroundColor = .clear+ panel.collectionBehavior = [.transient, .canJoinAllSpaces, .fullScreenAuxiliary]+ panel.hasShadow = true+ panel.hidesOnDeactivate = false+ panel.ignoresMouseEvents = true+ panel.isFloatingPanel = true+ panel.isOpaque = false+ panel.isReleasedWhenClosed = false+ panel.animationBehavior = .none+ self.panel = panel+ return panel+ }++ private func attach(_ panel: NSPanel, to parentWindow: NSWindow) {+ popoverWindow = parentWindow+ guard panel.parent !== parentWindow else {+ return+ }++ panel.parent?.removeChildWindow(panel)+ parentWindow.addChildWindow(panel, ordered: .above)+ }++ private func orderOut(_ panel: NSPanel) {+ let parentWindow = panel.parent ?? popoverWindow+ panel.orderOut(nil)+ parentWindow?.removeChildWindow(panel)+ restorePopoverKeyWindow(parentWindow)+ }++ private func restorePopoverKeyWindow(_ popoverWindow: NSWindow?) {+ guard NSApplication.shared.isActive else {+ return+ }++ popoverWindow?.makeKey()+ }++ private func updateContent(_ context: UsageHeatmapHoverContext) {+ let rootView = UsageHeatmapDayDetailView(context: context)+ let size = UsageHeatmapDayDetailView.panelSize(showsWorkflowStats: context.showsWorkflowStats)++ if let hostingController {+ hostingController.rootView = rootView+ } else {+ let hostingController = NSHostingController(rootView: rootView)+ hostingController.sizingOptions = [.preferredContentSize]+ panel?.contentViewController = hostingController+ self.hostingController = hostingController+ }++ configurePanelLayers()+ panel?.setContentSize(size)+ }++ private func configurePanelLayers() {+ if let hostingView = hostingController?.view {+ configurePanelLayer(for: hostingView)+ }++ if let contentView = panel?.contentView {+ configurePanelLayer(for: contentView)+ if let frameView = contentView.superview {+ configurePanelLayer(for: frameView)+ }+ }+ }++ private func apply(_ request: PanelRequest, to panel: NSPanel) {+ updateContent(request.context)+ panel.setFrame(request.position.frame, display: true)+ panel.alphaValue = 1+ currentSide = request.position.side+ }++ private func configurePanelLayer(for view: NSView) {+ view.wantsLayer = true+ view.layer?.backgroundColor = NSColor.clear.cgColor+ view.layer?.masksToBounds = true+ view.layer?.cornerRadius = UsageHeatmapDayDetailView.panelCornerRadius+ view.layer?.cornerCurve = .continuous+ }++ private func panelPosition(+ for panelSize: CGSize,+ relativeTo popoverWindow: NSWindow,+ contentView: NSView?,+ anchorScreenFrame: CGRect?,+ heatmapScreenFrame: CGRect?,+ showsWorkflowStats: Bool,+ preferredSide: UsageHeatmapDetailSide+ ) -> PanelPosition {+ let popoverFrame = contentScreenFrame(for: contentView, in: popoverWindow) ?? popoverWindow.frame+ let visibleFrame = (popoverWindow.screen ?? NSScreen.main)?.visibleFrame ?? popoverFrame+ let leftX = popoverFrame.minX - Metrics.panelGap - panelSize.width+ let rightX = popoverFrame.maxX + Metrics.panelGap+ let horizontal = horizontalPlacement(+ preferredSide: preferredSide,+ left: HorizontalPlacement(+ x: leftX,+ side: .left,+ isAvailable: leftX >= visibleFrame.minX + Metrics.screenPadding+ ),+ right: HorizontalPlacement(+ x: rightX,+ side: .right,+ isAvailable: rightX + panelSize.width <= visibleFrame.maxX - Metrics.screenPadding+ )+ )++ let x = clamped(+ horizontal.x,+ lower: visibleFrame.minX + Metrics.screenPadding,+ upper: visibleFrame.maxX - panelSize.width - Metrics.screenPadding+ )+ let frame = NSRect(+ x: x,+ y: panelY(+ for: panelSize,+ popoverFrame: popoverFrame,+ visibleFrame: visibleFrame,+ anchorScreenFrame: anchorScreenFrame,+ heatmapScreenFrame: heatmapScreenFrame,+ showsWorkflowStats: showsWorkflowStats+ ),+ width: panelSize.width,+ height: panelSize.height+ )++ return PanelPosition(+ frame: frame,+ side: actualSide(+ forX: x,+ panelWidth: panelSize.width,+ popoverFrame: popoverFrame,+ fallback: horizontal.side+ )+ )+ }++ private func panelY(+ for panelSize: CGSize,+ popoverFrame: CGRect,+ visibleFrame: CGRect,+ anchorScreenFrame: CGRect?,+ heatmapScreenFrame: CGRect?,+ showsWorkflowStats: Bool+ ) -> CGFloat {+ let proposedY: CGFloat+ if showsWorkflowStats {+ proposedY = popoverFrame.minY+ } else if let heatmapScreenFrame {+ proposedY = heatmapScreenFrame.maxY - panelSize.height+ } else if let anchorScreenFrame {+ proposedY = anchorScreenFrame.maxY - panelSize.height+ } else {+ proposedY = popoverFrame.midY - panelSize.height / 2+ }++ return clamped(+ proposedY,+ lower: max(visibleFrame.minY + Metrics.screenPadding, popoverFrame.minY),+ upper: visibleFrame.maxY - panelSize.height - Metrics.screenPadding+ )+ }++ private func horizontalPlacement(+ preferredSide: UsageHeatmapDetailSide,+ left: HorizontalPlacement,+ right: HorizontalPlacement+ ) -> HorizontalPlacement {+ let primary = preferredSide == .left ? left : right+ let fallback = preferredSide == .left ? right : left++ if primary.isAvailable {+ return primary+ }+ return fallback.isAvailable ? fallback : primary+ }++ private func actualSide(+ forX x: CGFloat,+ panelWidth: CGFloat,+ popoverFrame: CGRect,+ fallback: UsageHeatmapDetailSide+ ) -> UsageHeatmapDetailSide {+ if x + panelWidth <= popoverFrame.minX {+ return .left+ }+ if x >= popoverFrame.maxX {+ return .right+ }+ return fallback+ }++ private func cancelHideTask() {+ hideTask?.cancel()+ hideTask = nil+ }++ private func drawerHiddenTranslation(for side: UsageHeatmapDetailSide, panelWidth: CGFloat) -> CGFloat {+ let distance = panelWidth + Metrics.drawerOverscan+ switch side {+ case .left:+ return distance+ case .right:+ return -distance+ }+ }++ private func setContentTranslation(_ translationX: CGFloat) {+ guard let layer = hostingController?.view.layer else {+ return+ }++ CATransaction.begin()+ CATransaction.setDisableActions(true)+ layer.removeAnimation(forKey: Metrics.drawerTransformAnimationKey)+ layer.transform = CATransform3DMakeTranslation(translationX, 0, 0)+ CATransaction.commit()+ }++ private func animateContentTranslation(+ from fromTranslationX: CGFloat? = nil,+ to translationX: CGFloat,+ duration: TimeInterval,+ timing: CAMediaTimingFunctionName,+ completion: (() -> Void)? = nil+ ) {+ guard let layer = hostingController?.view.layer else {+ completion?()+ return+ }++ let targetTransform = CATransform3DMakeTranslation(translationX, 0, 0)+ CATransaction.begin()+ CATransaction.setCompletionBlock(completion)++ let animation = CABasicAnimation(keyPath: "transform")+ animation.fromValue = fromTranslationX.map { CATransform3DMakeTranslation($0, 0, 0) }+ ?? layer.presentation()?.transform+ ?? layer.transform+ animation.toValue = targetTransform+ animation.duration = duration+ animation.timingFunction = CAMediaTimingFunction(name: timing)+ layer.add(animation, forKey: Metrics.drawerTransformAnimationKey)+ layer.transform = targetTransform++ CATransaction.commit()+ }++ private func animateContentTranslationAfterInitialLayout(+ from hiddenTranslationX: CGFloat,+ panel: NSPanel,+ generation: Int+ ) {+ panel.contentView?.layoutSubtreeIfNeeded()+ panel.displayIfNeeded()+ CATransaction.flush()++ Task { @MainActor [weak self, weak panel] in+ await Task.yield()+ guard let self,+ let panel,+ panel.isVisible,+ generation == self.visibilityGeneration else {+ return+ }++ self.setContentTranslation(hiddenTranslationX)+ panel.contentView?.layoutSubtreeIfNeeded()+ panel.displayIfNeeded()+ CATransaction.flush()+ panel.alphaValue = 1+ self.animateContentTranslation(+ from: hiddenTranslationX,+ to: 0,+ duration: Metrics.drawerEnterDuration,+ timing: .easeOut+ )+ }+ }++ private func resetDrawerVisualState(for panel: NSPanel) {+ setContentTranslation(0)+ panel.alphaValue = 1+ }++ private func contentScreenFrame(for contentView: NSView?, in window: NSWindow) -> CGRect? {+ guard let contentView else {+ return nil+ }++ contentView.layoutSubtreeIfNeeded()+ let frameInWindow = contentView.convert(contentView.bounds, to: nil)+ let screenFrame = window.convertToScreen(frameInWindow)+ guard screenFrame.width > 0, screenFrame.height > 0 else {+ return nil+ }++ return screenFrame+ }++ private func clamped(_ value: CGFloat, lower: CGFloat, upper: CGFloat) -> CGFloat {+ guard lower <= upper else {+ return lower+ }++ return min(max(value, lower), upper)+ }++ private enum Metrics {+ static let panelGap: CGFloat = 4+ static let screenPadding: CGFloat = 8+ static let hideDelayMilliseconds: UInt64 = 220+ static let drawerEnterDuration: TimeInterval = 0.18+ static let drawerExitDuration: TimeInterval = 0.12+ static let drawerOverscan: CGFloat = 1+ static let drawerTransformAnimationKey = "CodexBar.heatmapDetailDrawerTransform"+ }++ private struct PanelPosition {+ let frame: NSRect+ let side: UsageHeatmapDetailSide+ }++ private struct HorizontalPlacement {+ let x: CGFloat+ let side: UsageHeatmapDetailSide+ let isAvailable: Bool+ }++ private struct PanelRequest {+ let context: UsageHeatmapHoverContext+ let position: PanelPosition+ }+}diff --git a/CodexBar/Controllers/PopoverDismissMonitor.swift b/CodexBar/Controllers/PopoverDismissMonitor.swiftindex 3e473c0..cfe30f5 100644--- a/CodexBar/Controllers/PopoverDismissMonitor.swift+++ b/CodexBar/Controllers/PopoverDismissMonitor.swift@@ -10,6 +10,8 @@ final class PopoverDismissMonitor {private var workspaceActivateObserver: NSObjectProtocol?private var popoverWindowResignKeyObserver: NSObjectProtocol?private var deferredWindowFocusTask: Task<Void, Never>?+ private var suppressActivationDismissTask: Task<Void, Never>?+ private var suppressesActivationDismiss = falseprivate var onDismiss: (() -> Void)?init(@@ -47,7 +49,9 @@ final class PopoverDismissMonitor {object: NSApplication.shared,queue: .main) { [weak self] _ in- self?.scheduleDismiss()+ Task { @MainActor [weak self] in+ self?.scheduleDismissForActivationChange()+ }}workspaceActivateObserver = NSWorkspace.shared.notificationCenter.addObserver(@@ -79,6 +83,9 @@ final class PopoverDismissMonitor {onDismiss = nildeferredWindowFocusTask?.cancel()deferredWindowFocusTask = nil+ suppressActivationDismissTask?.cancel()+ suppressActivationDismissTask = nil+ suppressesActivationDismiss = falseremoveEventMonitor(&localEventMonitor)removeEventMonitor(&globalMouseEventMonitor)removeObserver(&appResignActiveObserver)@@ -102,7 +109,9 @@ final class PopoverDismissMonitor {object: popoverWindow,queue: .main) { [weak self] _ in- self?.scheduleDismiss()+ Task { @MainActor [weak self] in+ self?.scheduleDismissForActivationChange()+ }}}@@ -112,6 +121,14 @@ final class PopoverDismissMonitor {}}+ private func scheduleDismissForActivationChange() {+ guard !suppressesActivationDismiss else {+ return+ }++ scheduleDismiss()+ }+private func dismiss() {guard popover.isShown else {return@@ -121,6 +138,10 @@ final class PopoverDismissMonitor {}private func dismissIfDifferentApplication(processIdentifier: pid_t?) {+ guard !suppressesActivationDismiss else {+ return+ }+if let processIdentifier, processIdentifier == NSRunningApplication.current.processIdentifier {return}@@ -165,20 +186,32 @@ final class PopoverDismissMonitor {return true}- if isSystemDismissShortcut(event) {+ if isCommandShortcut(event, keyCode: Metrics.tabKeyCode) {dismiss()+ } else if isCommandShortcut(event, keyCode: Metrics.spaceKeyCode) {+ suppressNextActivationDismiss()}return false}- private func isSystemDismissShortcut(_ event: NSEvent) -> Bool {+ private func isCommandShortcut(_ event: NSEvent, keyCode: UInt16) -> Bool {let modifierFlags = event.modifierFlags.intersection(.deviceIndependentFlagsMask)- guard modifierFlags.contains(.command) else {- return false+ return modifierFlags.contains(.command) && event.keyCode == keyCode+ }++ private func suppressNextActivationDismiss() {+ suppressActivationDismissTask?.cancel()+ suppressesActivationDismiss = true+ suppressActivationDismissTask = Task { @MainActor [weak self] in+ try? await Task.sleep(for: .milliseconds(Metrics.activationDismissSuppressionMilliseconds))+ guard let self, !Task.isCancelled else {+ return+ }++ self.suppressesActivationDismiss = false+ self.suppressActivationDismissTask = nil}-- return event.keyCode == Metrics.tabKeyCode || event.keyCode == Metrics.spaceKeyCode}private func dismissIfNeeded(for event: NSEvent) {@@ -265,5 +298,6 @@ final class PopoverDismissMonitor {static let escapeKeyCode: UInt16 = 53static let tabKeyCode: UInt16 = 48static let spaceKeyCode: UInt16 = 49+ static let activationDismissSuppressionMilliseconds: UInt64 = 600}}diff --git a/CodexBar/Controllers/SettingsWindowController.swift b/CodexBar/Controllers/SettingsWindowController.swiftindex 74818d4..5995c2b 100644--- a/CodexBar/Controllers/SettingsWindowController.swift+++ b/CodexBar/Controllers/SettingsWindowController.swift@@ -6,24 +6,30 @@ final class SettingsWindowController: HostingWindowController {private let viewModel: CodexStatusViewModelprivate let appUpdater: AppUpdaterprivate let codexHookSettings: CodexHookSettings+ private let globalHotKeySettings: GlobalHotKeySettingsinit(viewModel: CodexStatusViewModel,appUpdater: AppUpdater,codexHookSettings: CodexHookSettings,+ globalHotKeySettings: GlobalHotKeySettings,screenProvider: @escaping () -> NSScreen?) {self.viewModel = viewModelself.appUpdater = appUpdaterself.codexHookSettings = codexHookSettings+ self.globalHotKeySettings = globalHotKeySettingssuper.init(screenProvider: screenProvider)}override func makeWindow() -> NSWindow {let hostingController = NSHostingController(- rootView: AppSettingsView(codexHookSettings: codexHookSettings)- .environmentObject(viewModel)- .environmentObject(appUpdater)+ rootView: AppSettingsView(+ codexHookSettings: codexHookSettings,+ globalHotKeySettings: globalHotKeySettings+ )+ .environmentObject(viewModel)+ .environmentObject(appUpdater))hostingController.sizingOptions = [.preferredContentSize]diff --git a/CodexBar/Controllers/StatusItemController.swift b/CodexBar/Controllers/StatusItemController.swiftindex 97aacc7..f43610a 100644--- a/CodexBar/Controllers/StatusItemController.swift+++ b/CodexBar/Controllers/StatusItemController.swift@@ -7,6 +7,7 @@ final class CodexBarAppDelegate: NSObject, NSApplicationDelegate {let viewModel = CodexStatusViewModel()let workflowStatsViewModel = WorkflowStatsViewModel()let codexHookSettings = CodexHookSettings()+ let globalHotKeySettings = GlobalHotKeySettings()let appUpdater = AppUpdater()private var statusItemController: StatusItemController?@@ -16,6 +17,7 @@ final class CodexBarAppDelegate: NSObject, NSApplicationDelegate {viewModel: viewModel,workflowStatsViewModel: workflowStatsViewModel,codexHookSettings: codexHookSettings,+ globalHotKeySettings: globalHotKeySettings,appUpdater: appUpdater)controller.install()@@ -32,15 +34,21 @@ private final class StatusItemController: NSObject {private let viewModel: CodexStatusViewModelprivate let workflowStatsViewModel: WorkflowStatsViewModelprivate let codexHookSettings: CodexHookSettings+ private let globalHotKeySettings: GlobalHotKeySettingsprivate let appUpdater: AppUpdaterprivate let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)private let popover = NSPopover()private let popoverVisibility = PopoverVisibilityState()+ private let heatmapDetailPanelController = HeatmapDetailPanelController()+ private lazy var globalHotKeyController = GlobalHotKeyController { [weak self] in+ self?.togglePopoverFromHotKey()+ }private lazy var settingsWindowController = SettingsWindowController(viewModel: viewModel,appUpdater: appUpdater,- codexHookSettings: codexHookSettings+ codexHookSettings: codexHookSettings,+ globalHotKeySettings: globalHotKeySettings) { [weak self] inself?.statusItem.button?.window?.screen}@@ -55,6 +63,7 @@ private final class StatusItemController: NSObject {private var popoverState = PopoverState.hiddenprivate var cancellables = Set<AnyCancellable>()private var isShowingErrorImage: Bool?+ private var registeredHotKeyShortcut: GlobalHotKeyShortcut?private static let normalImage = makeStatusImage("person.fill.checkmark")private static let errorImage = makeStatusImage("person.fill.xmark")@@ -63,11 +72,13 @@ private final class StatusItemController: NSObject {viewModel: CodexStatusViewModel,workflowStatsViewModel: WorkflowStatsViewModel,codexHookSettings: CodexHookSettings,+ globalHotKeySettings: GlobalHotKeySettings,appUpdater: AppUpdater) {self.viewModel = viewModelself.workflowStatsViewModel = workflowStatsViewModelself.codexHookSettings = codexHookSettings+ self.globalHotKeySettings = globalHotKeySettingsself.appUpdater = appUpdatersuper.init()}@@ -87,6 +98,7 @@ private final class StatusItemController: NSObject {func install() {configureStatusButton()configurePopover()+ observeGlobalHotKeySettings()observeViewModel()updateStatusImage()viewModel.startAutoRefresh()@@ -94,6 +106,7 @@ private final class StatusItemController: NSObject {func uninstall() {closePopover(animated: false)+ globalHotKeyController.uninstall()cancellables.removeAll()NSStatusBar.system.removeStatusItem(statusItem)}@@ -115,7 +128,10 @@ private final class StatusItemController: NSObject {viewModel: viewModel,workflowStatsViewModel: workflowStatsViewModel,codexHookSettings: codexHookSettings,- popoverVisibility: popoverVisibility+ popoverVisibility: popoverVisibility,+ onUsageHeatmapHoverChange: { [weak self] context in+ self?.updateHeatmapDetailPanel(context)+ }).environmentObject(appUpdater).frame(width: CodexStatusMenuView.menuWidth)@@ -150,6 +166,44 @@ private final class StatusItemController: NSObject {.store(in: &cancellables)}+ private func observeGlobalHotKeySettings() {+ globalHotKeySettings.$shortcut+ .removeDuplicates()+ .sink { [weak self] shortcut in+ self?.applyGlobalHotKey(shortcut)+ }+ .store(in: &cancellables)+ }++ private func applyGlobalHotKey(_ shortcut: GlobalHotKeyShortcut?) {+ guard shortcut != registeredHotKeyShortcut else {+ return+ }++ guard let shortcut else {+ globalHotKeyController.uninstall()+ registeredHotKeyShortcut = nil+ return+ }++ if globalHotKeyController.install(shortcut: shortcut) {+ registeredHotKeyShortcut = shortcut+ globalHotKeySettings.clearError()+ return+ }++ let message = hotKeyConflictMessage(for: shortcut)+ globalHotKeySettings.restoreShortcut(registeredHotKeyShortcut, message: message)+ }++ private func hotKeyConflictMessage(for shortcut: GlobalHotKeyShortcut) -> String {+ if shortcut == .default {+ return "默认快捷键 \(shortcut.label) 已被占用,请重新设置"+ }++ return "快捷键已被占用,请重新设置"+ }+private func updateStatusImage() {updateStatusImage(usesErrorImage: viewModel.usesErrorImage)}@@ -188,6 +242,14 @@ private final class StatusItemController: NSObject {}}+ private func togglePopoverFromHotKey() {+ guard let button = statusItem.button else {+ return+ }++ togglePopover(relativeTo: button)+ }+private func cancelPopoverTasks() {deferredRefreshTask?.cancel()deferredRefreshTask = nil@@ -219,34 +281,28 @@ private final class StatusItemController: NSObject {let menu = NSMenu()- let settingsItem = NSMenuItem(+ menu.addItem(menuItem(title: "设置",action: #selector(openSettings),- keyEquivalent: ","- )- settingsItem.image = NSImage(systemSymbolName: "gearshape", accessibilityDescription: nil)- settingsItem.target = self- menu.addItem(settingsItem)+ keyEquivalent: ",",+ symbolName: "gearshape"+ ))- let logItem = NSMenuItem(+ menu.addItem(menuItem(title: "日志",action: #selector(openLog),- keyEquivalent: "l"- )- logItem.image = NSImage(systemSymbolName: "doc.text.magnifyingglass", accessibilityDescription: nil)- logItem.target = self- menu.addItem(logItem)+ keyEquivalent: "l",+ symbolName: "doc.text.magnifyingglass"+ ))menu.addItem(.separator())- let quitItem = NSMenuItem(+ menu.addItem(menuItem(title: "退出",action: #selector(quit),- keyEquivalent: "q"- )- quitItem.image = NSImage(systemSymbolName: "power", accessibilityDescription: nil)- quitItem.target = self- menu.addItem(quitItem)+ keyEquivalent: "q",+ symbolName: "power"+ ))menu.popUp(positioning: nil,@@ -255,6 +311,22 @@ private final class StatusItemController: NSObject {)}+ private func menuItem(+ title: String,+ action: Selector,+ keyEquivalent: String,+ symbolName: String+ ) -> NSMenuItem {+ let item = NSMenuItem(+ title: title,+ action: action,+ keyEquivalent: keyEquivalent+ )+ item.image = NSImage(systemSymbolName: symbolName, accessibilityDescription: nil)+ item.target = self+ return item+ }+@objc private func openSettings() {settingsWindowController.open()}@@ -273,6 +345,7 @@ private final class StatusItemController: NSObject {}cancelPopoverTasks()+ heatmapDetailPanelController.hide(immediate: true, delayed: false)popoverDismissMonitor.remove()popoverVisibility.isVisible = false@@ -283,7 +356,7 @@ private final class StatusItemController: NSObject {}guard animated else {- finishPopoverClose()+ finishPopoverClose(hidesDetailPanel: false)return}@@ -297,8 +370,11 @@ private final class StatusItemController: NSObject {}}- private func finishPopoverClose() {+ private func finishPopoverClose(hidesDetailPanel: Bool = true) {cancelPopoverTasks()+ if hidesDetailPanel {+ heatmapDetailPanelController.hide(immediate: true)+ }popoverDismissMonitor.remove()if popover.isShown {@@ -329,6 +405,21 @@ private final class StatusItemController: NSObject {}}+ private func updateHeatmapDetailPanel(_ context: UsageHeatmapHoverContext?) {+ guard popover.isShown,+ let popoverContentView = popover.contentViewController?.view,+ let popoverWindow = popoverContentView.window else {+ heatmapDetailPanelController.hide(immediate: true)+ return+ }++ heatmapDetailPanelController.update(+ context: context,+ relativeTo: popoverWindow,+ contentView: popoverContentView+ )+ }+private enum Metrics {static let fadeInDuration: TimeInterval = 0.24static let fadeOutDuration: TimeInterval = 0.18diff --git a/CodexBar/Models/GlobalHotKeyShortcut.swift b/CodexBar/Models/GlobalHotKeyShortcut.swiftnew file mode 100644index 0000000..7414eea--- /dev/null+++ b/CodexBar/Models/GlobalHotKeyShortcut.swift@@ -0,0 +1,124 @@+import AppKit+import Carbon.HIToolbox++nonisolated struct GlobalHotKeyShortcut: Codable, Equatable, Sendable {+ let keyCode: UInt32+ let modifiers: UInt32+ let keyLabel: String++ static let `default` = GlobalHotKeyShortcut(+ keyCode: UInt32(kVK_ANSI_W),+ modifiers: UInt32(cmdKey | shiftKey),+ keyLabel: "W"+ )++ init(keyCode: UInt32, modifiers: UInt32, keyLabel: String) {+ self.keyCode = keyCode+ self.modifiers = modifiers+ self.keyLabel = keyLabel+ }++ init?(event: NSEvent) {+ let modifiers = Self.carbonModifiers(from: event.modifierFlags)+ let keyLabel = Self.keyLabel(for: event)+ guard !keyLabel.isEmpty else {+ return nil+ }++ self.init(+ keyCode: UInt32(event.keyCode),+ modifiers: modifiers,+ keyLabel: keyLabel+ )+ }++ var label: String {+ modifierSymbols + keyLabel+ }++ var validationError: String? {+ if modifierCount < 2 {+ return "至少需要两个修饰键"+ }++ if isReservedSystemShortcut {+ return "不可使用系统快捷键"+ }++ return nil+ }++ private var modifierSymbols: String {+ [+ hasModifier(controlKey) ? "⌃" : nil,+ hasModifier(optionKey) ? "⌥" : nil,+ hasModifier(shiftKey) ? "⇧" : nil,+ hasModifier(cmdKey) ? "⌘" : nil+ ]+ .compactMap { $0 }+ .joined()+ }++ private var modifierCount: Int {+ [controlKey, optionKey, shiftKey, cmdKey].filter(hasModifier).count+ }++ private var isReservedSystemShortcut: Bool {+ hasModifier(cmdKey) && Self.reservedSystemKeyCodes.contains(keyCode)+ }++ private func hasModifier(_ modifier: Int) -> Bool {+ modifiers & UInt32(modifier) != 0+ }++ private static func carbonModifiers(from flags: NSEvent.ModifierFlags) -> UInt32 {+ var modifiers: UInt32 = 0++ if flags.contains(.control) {+ modifiers |= UInt32(controlKey)+ }+ if flags.contains(.option) {+ modifiers |= UInt32(optionKey)+ }+ if flags.contains(.shift) {+ modifiers |= UInt32(shiftKey)+ }+ if flags.contains(.command) {+ modifiers |= UInt32(cmdKey)+ }++ return modifiers+ }++ private static func keyLabel(for event: NSEvent) -> String {+ if let specialLabel = specialKeyLabels[UInt32(event.keyCode)] {+ return specialLabel+ }++ return (event.charactersIgnoringModifiers ?? "")+ .uppercased()+ .trimmingCharacters(in: .whitespacesAndNewlines)+ }++ private static let specialKeyLabels: [UInt32: String] = [+ UInt32(kVK_Space): "Space",+ UInt32(kVK_Tab): "Tab",+ UInt32(kVK_Return): "Return",+ UInt32(kVK_Escape): "Esc",+ UInt32(kVK_Delete): "Delete",+ UInt32(kVK_ForwardDelete): "Forward Delete",+ UInt32(kVK_Home): "Home",+ UInt32(kVK_End): "End",+ UInt32(kVK_PageUp): "Page Up",+ UInt32(kVK_PageDown): "Page Down",+ UInt32(kVK_LeftArrow): "←",+ UInt32(kVK_RightArrow): "→",+ UInt32(kVK_UpArrow): "↑",+ UInt32(kVK_DownArrow): "↓"+ ]++ private static let reservedSystemKeyCodes: Set<UInt32> = [+ UInt32(kVK_Space),+ UInt32(kVK_Tab)+ ]+}diff --git a/CodexBar/Services/CodexStatus/RequestLog.swift b/CodexBar/Services/CodexStatus/RequestLog.swiftindex 72c6c7e..1ee946d 100644--- a/CodexBar/Services/CodexStatus/RequestLog.swift+++ b/CodexBar/Services/CodexStatus/RequestLog.swift@@ -36,9 +36,7 @@ nonisolated final class RequestLogStore: ObservableObject, @unchecked Sendable {private var storage: [RequestLogEntry] = []var entries: [RequestLogEntry] {- lock.lock()- defer { lock.unlock() }- return storage+ withLock { storage }}private init() {}@@ -104,36 +102,46 @@ nonisolated final class RequestLogStore: ObservableObject, @unchecked Sendable {}func clear() {- lock.lock()- storage.removeAll()- lock.unlock()+ withLock {+ storage.removeAll()+ }notifyChange()}private func append(_ entry: RequestLogEntry) {- lock.lock()- storage.insert(entry, at: 0)- if storage.count > Self.capacity {- storage.removeLast(storage.count - Self.capacity)+ withLock {+ storage.insert(entry, at: 0)+ if storage.count > Self.capacity {+ storage.removeLast(storage.count - Self.capacity)+ }}- lock.unlock()notifyChange()}private func update(_ id: UUID, _ mutate: (inout RequestLogEntry) -> Void) {- lock.lock()- guard let index = storage.firstIndex(where: { $0.id == id }) else {- lock.unlock()+ let didUpdate = withLock {+ guard let index = storage.firstIndex(where: { $0.id == id }) else {+ return false+ }+ mutate(&storage[index])+ return true+ }++ guard didUpdate else {return}- mutate(&storage[index])- lock.unlock()notifyChange()}+ private func withLock<T>(_ work: () -> T) -> T {+ lock.lock()+ defer { lock.unlock() }+ return work()+ }+private func notifyChange() {if Thread.isMainThread {objectWillChange.send()diff --git a/CodexBar/Services/Settings/GlobalHotKeySettings.swift b/CodexBar/Services/Settings/GlobalHotKeySettings.swiftnew file mode 100644index 0000000..6f9fd60--- /dev/null+++ b/CodexBar/Services/Settings/GlobalHotKeySettings.swift@@ -0,0 +1,80 @@+import Combine+import Foundation++@MainActor+final class GlobalHotKeySettings: ObservableObject {+ @Published private(set) var shortcut: GlobalHotKeyShortcut?+ @Published private(set) var errorMessage: String?++ private let defaults: UserDefaults+ private let encoder = JSONEncoder()++ init(defaults: UserDefaults = .standard) {+ self.defaults = defaults+ self.shortcut = Self.loadShortcut(from: defaults)+ }++ func setShortcut(_ shortcut: GlobalHotKeyShortcut) {+ if let validationError = shortcut.validationError {+ errorMessage = validationError+ return+ }++ self.shortcut = shortcut+ saveShortcut(shortcut)+ errorMessage = nil+ }++ func clearShortcut() {+ shortcut = nil+ saveShortcut(nil)+ errorMessage = nil+ }++ func restoreDefaultShortcut() {+ setShortcut(.default)+ }++ func setRegistrationError(_ message: String) {+ errorMessage = message+ }++ func restoreShortcut(_ shortcut: GlobalHotKeyShortcut?, message: String) {+ self.shortcut = shortcut+ saveShortcut(shortcut)+ errorMessage = message+ }++ func clearError() {+ errorMessage = nil+ }++ private func saveShortcut(_ shortcut: GlobalHotKeyShortcut?) {+ if let shortcut, let data = try? encoder.encode(shortcut) {+ defaults.set(true, forKey: Keys.isEnabled)+ defaults.set(data, forKey: Keys.shortcut)+ } else {+ defaults.set(false, forKey: Keys.isEnabled)+ defaults.removeObject(forKey: Keys.shortcut)+ }+ }++ private static func loadShortcut(from defaults: UserDefaults) -> GlobalHotKeyShortcut? {+ let hasEnabledValue = defaults.object(forKey: Keys.isEnabled) != nil+ guard !hasEnabledValue || defaults.bool(forKey: Keys.isEnabled) else {+ return nil+ }++ if let data = defaults.data(forKey: Keys.shortcut),+ let shortcut = try? JSONDecoder().decode(GlobalHotKeyShortcut.self, from: data) {+ return shortcut+ }++ return .default+ }++ private enum Keys {+ static let isEnabled = "GlobalHotKey.isEnabled"+ static let shortcut = "GlobalHotKey.shortcut"+ }+}diff --git a/CodexBar/Services/Updates/AppUpdater.swift b/CodexBar/Services/Updates/AppUpdater.swiftindex 45c878f..ebb695a 100644--- a/CodexBar/Services/Updates/AppUpdater.swift+++ b/CodexBar/Services/Updates/AppUpdater.swift@@ -1,5 +1,5 @@-import Combineimport AppKit+import Combineimport Sparkleimport SwiftUI@@ -79,7 +79,10 @@ final class AppUpdater: NSObject, ObservableObject {clearSettingsStatusMessageTask?.cancel()settingsStatusMessage = message- guard let autoDismissDelay else { return }+ guard let autoDismissDelay else {+ clearSettingsStatusMessageTask = nil+ return+ }clearSettingsStatusMessageTask = Task { [weak self] intry? await Task.sleep(for: autoDismissDelay)@@ -103,7 +106,7 @@ final class AppUpdater: NSObject, ObservableObject {}extension AppUpdater: SPUUpdaterDelegate {- func updater(_ updater: SPUUpdater, didFindValidUpdate item: SUAppcastItem) {+ func updater(_: SPUUpdater, didFindValidUpdate item: SUAppcastItem) {let message = "发现新版本: v\(item.displayVersionString)"availableUpdateMessage = message@@ -116,7 +119,7 @@ extension AppUpdater: SPUUpdaterDelegate {isManualCheckInProgress = false}- func updaterDidNotFindUpdate(_ updater: SPUUpdater, error: Error) {+ func updaterDidNotFindUpdate(_: SPUUpdater, error _: Error) {availableUpdateMessage = nilpanelUpdateMessage = nil@@ -127,7 +130,7 @@ extension AppUpdater: SPUUpdaterDelegate {isManualCheckInProgress = false}- func updater(_ updater: SPUUpdater, didAbortWithError error: Error) {+ func updater(_: SPUUpdater, didAbortWithError _: Error) {guard isManualCheckInProgress else {return}diff --git a/CodexBar/Services/WorkflowStats/WorkflowHookEventRecorder.swift b/CodexBar/Services/WorkflowStats/WorkflowHookEventRecorder.swiftindex 556e86b..e657f5d 100644--- a/CodexBar/Services/WorkflowStats/WorkflowHookEventRecorder.swift+++ b/CodexBar/Services/WorkflowStats/WorkflowHookEventRecorder.swift@@ -14,22 +14,23 @@ nonisolated enum WorkflowHookEventRecorder {private static func hookEventName(from arguments: [String]) -> String? {for argument in arguments.dropFirst() {if argument.hasPrefix("--hook-event=") {- let value = String(argument.dropFirst("--hook-event=".count))- .trimmingCharacters(in: .whitespacesAndNewlines)- return value.isEmpty ? nil : value+ return normalizedHookEventName(String(argument.dropFirst("--hook-event=".count)))}}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 normalizedHookEventName(arguments[arguments.index(after: optionIndex)])}return nil}+ private static func normalizedHookEventName(_ value: String) -> String? {+ let trimmedValue = value.trimmingCharacters(in: .whitespacesAndNewlines)+ return trimmedValue.isEmpty ? nil : trimmedValue+ }+private static func record(eventName: String) throws {let payload = stdinPayload()let timestamp = payload.date(for: "timestamp") ?? Date()diff --git a/CodexBar/Services/WorkflowStats/WorkflowStatsService.swift b/CodexBar/Services/WorkflowStats/WorkflowStatsService.swiftindex 0a879fa..7adc3c6 100644--- a/CodexBar/Services/WorkflowStats/WorkflowStatsService.swift+++ b/CodexBar/Services/WorkflowStats/WorkflowStatsService.swift@@ -82,13 +82,14 @@ nonisolated final class WorkflowStatsService: @unchecked Sendable {result[aggregate.date] = aggregate}- changedState = markRebuildDates(+ let changedByRebuild = markRebuildDates(eventDateKeys: eventDateKeys,dailyDecodeResult: dailyDecodeResult,dailyByDate: dailyByDate,state: &state- ) || changedState- changedState = reconcileEventFiles(eventDateKeys: eventDateKeys, state: &state) || changedState+ )+ let changedByReconcile = reconcileEventFiles(eventDateKeys: eventDateKeys, state: &state)+ changedState = changedState || changedByRebuild || changedByReconcilelet tasks = makeMaintenanceTasks(state: &state,@@ -568,19 +569,18 @@ nonisolated enum WorkflowStatsStorage {}static func retentionCutoffDate(today: Date = Date(), calendar: Calendar = .current) -> Date {- let todayStart = calendar.startOfDay(for: today)- return calendar.date(- byAdding: .day,- value: -(retentionDayCount - 1),- to: todayStart- ) ?? todayStart+ cutoffDate(dayCount: retentionDayCount, today: today, calendar: calendar)}static func identifierRetentionCutoffDate(today: Date = Date(), calendar: Calendar = .current) -> Date {+ cutoffDate(dayCount: identifierRetentionDayCount, today: today, calendar: calendar)+ }++ private static func cutoffDate(dayCount: Int, today: Date, calendar: Calendar) -> Date {let todayStart = calendar.startOfDay(for: today)return calendar.date(byAdding: .day,- value: -(identifierRetentionDayCount - 1),+ value: -(dayCount - 1),to: todayStart) ?? todayStart}diff --git a/CodexBar/Views/Menu/CodexStatusMenuView.swift b/CodexBar/Views/Menu/CodexStatusMenuView.swiftindex 9325b93..9bef567 100644--- a/CodexBar/Views/Menu/CodexStatusMenuView.swift+++ b/CodexBar/Views/Menu/CodexStatusMenuView.swift@@ -13,6 +13,7 @@ struct CodexStatusMenuView: View {@ObservedObject var workflowStatsViewModel: WorkflowStatsViewModel@ObservedObject var codexHookSettings: CodexHookSettings@ObservedObject var popoverVisibility: PopoverVisibilityState+ let onUsageHeatmapHoverChange: (UsageHeatmapHoverContext?) -> Void@EnvironmentObject private var appUpdater: AppUpdatervar body: some View {@@ -73,7 +74,8 @@ private extension CodexStatusMenuView {usage: usage,workflowStats: workflowStatsViewModel.snapshot,showsWorkflowStats: codexHookSettings.isEnabled,- isStale: snapshot.isUsageStale+ isStale: snapshot.isUsageStale,+ onHoverContextChange: onUsageHeatmapHoverChange)}}diff --git a/CodexBar/Views/Menu/QuotaRow.swift b/CodexBar/Views/Menu/QuotaRow.swiftindex 6491ed3..f16a5b0 100644--- a/CodexBar/Views/Menu/QuotaRow.swift+++ b/CodexBar/Views/Menu/QuotaRow.swift@@ -38,11 +38,7 @@ private extension QuotaRow {}var resetText: String {- guard window.hasData else {- return "--"- }-- guard let resetsAt = window.resetsAt else {+ guard window.hasData, let resetsAt = window.resetsAt else {return "--"}diff --git a/CodexBar/Views/Menu/TokenCountText.swift b/CodexBar/Views/Menu/TokenCountText.swiftindex 60476a5..63e74e2 100644--- a/CodexBar/Views/Menu/TokenCountText.swift+++ b/CodexBar/Views/Menu/TokenCountText.swift@@ -3,31 +3,80 @@ import SwiftUIstruct TokenCountText: View {let tokens: Intvar font: Font = .caption.monospacedDigit().weight(.semibold)+ var reservedNumericWidth: CGFloat?+ var reservedUnitWidth: CGFloat?var body: some View {- Text(TokenCountFormatter.string(from: tokens))+ content.font(font).lineLimit(1).minimumScaleFactor(0.8)}++ @ViewBuilder+ private var content: some View {+ let parts = TokenCountFormatter.parts(from: tokens)++ if let reservedNumericWidth {+ HStack(spacing: 0) {+ Text(parts.number)+ .numericRollTransition(value: Double(tokens))+ .frame(minWidth: reservedNumericWidth, alignment: .trailing)++ if let unit = parts.unit {+ Text(unit)+ .frame(width: reservedUnitWidth, alignment: .trailing)+ }+ }+ } else {+ Text(parts.text)+ }+ }+}++private struct NumericRollTransition: ViewModifier {+ let value: Double+ @State private var previous: Double?++ func body(content: Content) -> some View {+ content+ .contentTransition(.numericText(countsDown: countsDown))+ .onChange(of: value) { _, newValue in+ previous = newValue+ }+ }++ private var countsDown: Bool {+ guard let previous else {+ return false+ }+ return value < previous+ }+}++extension View {+ func numericRollTransition(value: Double) -> some View {+ modifier(NumericRollTransition(value: value))+ }}private enum TokenCountFormatter {- static func string(from tokens: Int) -> String {+ static func parts(from tokens: Int) -> TokenCountParts {switch tokens {case 1_000_000_000...:- return decimal(Double(tokens) / 1_000_000_000) + "B"+ return TokenCountParts(number: decimal(Double(tokens) / 1_000_000_000), unit: "B")case 1_000_000...:- return decimal(Double(tokens) / 1_000_000) + "M"+ return TokenCountParts(number: decimal(Double(tokens) / 1_000_000), unit: "M")case 1_000...:- return decimal(Double(tokens) / 1_000) + "K"+ return TokenCountParts(number: decimal(Double(tokens) / 1_000), unit: "K")default:- return String(tokens)+ return TokenCountParts(number: String(tokens), unit: nil)}}private static func decimal(_ value: Double) -> String {- let rounded = value >= 0.1 ? (value * 10).rounded() / 10 : (value * 100).rounded() / 100+ let roundingScale: Double = value >= 0.1 ? 10 : 100+ let rounded = (value * roundingScale).rounded() / roundingScalereturn formatter.string(from: NSNumber(value: rounded)) ?? String(format: "%.1f", rounded)}@@ -39,4 +88,13 @@ private enum TokenCountFormatter {formatter.maximumFractionDigits = 2return formatter}()++ struct TokenCountParts {+ let number: String+ let unit: String?++ var text: String {+ number + (unit ?? "")+ }+ }}diff --git a/CodexBar/Views/Menu/UsageHeatmap.swift b/CodexBar/Views/Menu/UsageHeatmap.swiftindex b493102..46543b5 100644--- a/CodexBar/Views/Menu/UsageHeatmap.swift+++ b/CodexBar/Views/Menu/UsageHeatmap.swift@@ -1,29 +1,57 @@+import AppKitimport SwiftUI+nonisolated struct UsageHeatmapHoverContext: Equatable {+ let day: UsageHeatmapDay+ let showsWorkflowStats: Bool+ let anchorScreenFrame: CGRect?+ let heatmapScreenFrame: CGRect?+ let preferredSide: UsageHeatmapDetailSide+ let peakTokens: Int+}++nonisolated enum UsageHeatmapDetailSide: Equatable {+ case left+ case right+}++nonisolated struct UsageHeatmapSelection: Equatable {+ let day: UsageHeatmapDay+ let column: Int+ let row: Int+}+struct UsageSummaryView: View {let usage: CodexUsageSnapshotlet isStale: Boollet showsWorkflowStats: Bool+ let onHoverContextChange: (UsageHeatmapHoverContext?) -> Voidprivate let days: [UsageHeatmapDay?]- @State private var hoveredDay: UsageHeatmapDay?+ private let peakTokens: Int+ @State private var hoverSelection: UsageHeatmapSelection?+ @State private var heatmapGridScreenFrame: CGRect?init(usage: CodexUsageSnapshot,workflowStats: WorkflowStatsSnapshot,showsWorkflowStats: Bool,- isStale: Bool = false+ isStale: Bool = false,+ onHoverContextChange: @escaping (UsageHeatmapHoverContext?) -> Void = { _ in }) {self.usage = usageself.isStale = isStaleself.showsWorkflowStats = showsWorkflowStats+ self.onHoverContextChange = onHoverContextChange- self.days = UsageHeatmapDay.grid(+ let days = UsageHeatmapDay.grid(usage: usage,workflowStats: workflowStats,showsWorkflowStats: showsWorkflowStats,columnCount: UsageHeatmap.Metrics.columnCount,today: Date())+ self.days = days+ self.peakTokens = max(days.lazy.compactMap { $0?.tokensForHeatmap }.max() ?? 0, 1)}var body: some View {@@ -32,35 +60,44 @@ struct UsageSummaryView: View {UsageHeatmap(days: days,- showsWorkflowStats: showsWorkflowStats,- hoveredDay: $hoveredDay+ selection: $hoverSelection,+ peakTokens: peakTokens,+ onScreenFrameChange: { frame in+ heatmapGridScreenFrame = frame+ })}.markStale(isStale).padding(10).liquidGlassSurface(cornerRadius: 8).onAppear {- hoveredDay = nil+ clearHover()+ }+ .onDisappear {+ clearHover()}.onChange(of: days) { _, newDays inrefreshHoveredDay(from: newDays)}+ .onChange(of: hoverContext) { _, context in+ onHoverContextChange(context)+ }.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)- tokenMetric(label: "单日峰值", value: usage.summary.peakDailyTokens, alignment: .center)+ tokenMetric(label: "全时累计", value: usage.summary.lifetimeTokens)+ tokenMetric(label: "单日峰值", value: usage.summary.peakDailyTokens)textMetric(label: "当前连胜", value: Self.dayText(usage.summary.currentStreakDays))textMetric(label: "最长连胜", value: Self.dayText(usage.summary.longestStreakDays))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) {+ private func tokenMetric(label: String, value: Int) -> some View {+ metric(label: label, alignment: .center) {TokenCountText(tokens: value)}}@@ -130,53 +167,95 @@ struct UsageSummaryView: View {static let statusAnimation = Animation.codexStatus}+ private var hoverContext: UsageHeatmapHoverContext? {+ hoverSelection.map {+ UsageHeatmapHoverContext(+ day: $0.day,+ showsWorkflowStats: showsWorkflowStats,+ anchorScreenFrame: hoveredSquareScreenFrame(for: $0),+ heatmapScreenFrame: heatmapGridScreenFrame,+ preferredSide: UsageHeatmap.Metrics.preferredDetailSide(for: $0.column),+ peakTokens: peakTokens+ )+ }+ }++ private func hoveredSquareScreenFrame(for selection: UsageHeatmapSelection) -> CGRect? {+ guard let heatmapGridScreenFrame else {+ return nil+ }++ let x = heatmapGridScreenFrame.minX + CGFloat(selection.column) * UsageHeatmap.Metrics.squarePitch+ let y = heatmapGridScreenFrame.maxY+ - CGFloat(selection.row) * UsageHeatmap.Metrics.squarePitch+ - UsageHeatmap.Metrics.squareSize++ return CGRect(+ x: x,+ y: y,+ width: UsageHeatmap.Metrics.squareSize,+ height: UsageHeatmap.Metrics.squareSize+ )+ }+private func refreshHoveredDay(from days: [UsageHeatmapDay?]) {- guard let hoveredDay,- let updatedDay = days.compactMap({ $0 }).first(where: { $0.id == hoveredDay.id }),- updatedDay != hoveredDay else {+ guard let hoverSelection else {+ return+ }++ guard let updatedDay = days.compactMap({ $0 }).first(where: { $0.id == hoverSelection.day.id }) else {+ withAnimation(Metrics.statusAnimation) {+ self.hoverSelection = nil+ }+ return+ }++ guard updatedDay != hoverSelection.day else {return}withAnimation(Metrics.statusAnimation) {- self.hoveredDay = updatedDay+ self.hoverSelection = UsageHeatmapSelection(+ day: updatedDay,+ column: hoverSelection.column,+ row: hoverSelection.row+ )}}++ private func clearHover() {+ hoverSelection = nil+ onHoverContextChange(nil)+ }}struct UsageHeatmap: View {let days: [UsageHeatmapDay?]- let showsWorkflowStats: Bool- @Binding var hoveredDay: UsageHeatmapDay?- @State private var hoveredSquareFrame: CGRect = .zero- // hover 期间 body 频繁重算, 峰值只在构建时求一次+ let onScreenFrameChange: (CGRect?) -> Void+ @Binding var selection: UsageHeatmapSelection?+ @State private var snapSelection: UsageHeatmapSelection?+ @State private var hoverClearTask: Task<Void, Never>?private let peakTokens: Intinit(days: [UsageHeatmapDay?],- showsWorkflowStats: Bool,- hoveredDay: Binding<UsageHeatmapDay?>+ selection: Binding<UsageHeatmapSelection?>,+ peakTokens: Int,+ onScreenFrameChange: @escaping (CGRect?) -> Void = { _ in }) {self.days = days- self.showsWorkflowStats = showsWorkflowStats- self._hoveredDay = hoveredDay- self.peakTokens = max(days.lazy.compactMap { $0?.tokensForHeatmap }.max() ?? 0, 1)+ self.onScreenFrameChange = onScreenFrameChange+ self._selection = selection+ self.peakTokens = peakTokens}var body: some View {- ZStack(alignment: .topLeading) {- heatmapGrid-- if let hoveredDay {- UsageHeatmapTooltip(day: hoveredDay, showsWorkflowStats: showsWorkflowStats)- .id(hoveredDay.id)- .allowsHitTesting(false)- .offset(tooltipOffset)- .zIndex(1)- .transition(.opacity)+ heatmapGrid+ .frame(height: Metrics.height)+ .onDisappear {+ cancelHoverClearTask()+ onScreenFrameChange(nil)}- }- .frame(height: Metrics.height)- .coordinateSpace(name: Metrics.coordinateSpaceName)}private var heatmapGrid: some View {@@ -188,8 +267,8 @@ struct UsageHeatmap: View {Spacer()- if let firstDate = visibleDays.first?.startDate, let lastDate = visibleDays.last?.startDate {- Text("\(firstDate) ~ \(lastDate)")+ if let dateRangeText {+ Text(dateRangeText).font(.caption2.monospacedDigit()).foregroundStyle(.tertiary).lineLimit(1)@@ -206,23 +285,8 @@ struct UsageHeatmap: View {UsageHeatmapSquare(day: day,percent: Double(day.tokensForHeatmap) / Double(peakTokens),- isHovered: hoveredDay?.id == day.id- ) { frame in- if hoveredDay?.id != day.id {- withAnimation(.easeInOut(duration: Metrics.tooltipFadeDuration)) {- hoveredDay = day- hoveredSquareFrame = frame- }- } else if hoveredSquareFrame != frame {- hoveredSquareFrame = frame- }- } onEnded: {- if hoveredDay?.id == day.id {- withAnimation(.easeInOut(duration: Metrics.tooltipFadeDuration)) {- hoveredDay = nil- }- }- }+ isHovered: snapSelection?.day.id == day.id+ )} else {Color.clear.frame(width: Metrics.squareSize, height: Metrics.squareSize)@@ -231,6 +295,19 @@ struct UsageHeatmap: View {}}}+ .frame(width: Metrics.totalWidth, height: Metrics.gridHeight, alignment: .topLeading)+ .contentShape(Rectangle())+ .onContinuousHover(coordinateSpace: .local) { phase in+ switch phase {+ case .active(let point):+ updatePointerLocation(point)+ case .ended:+ scheduleDeactivate()+ }+ }+ .background {+ HeatmapScreenFrameReader(onChange: onScreenFrameChange)+ }}.frame(maxWidth: .infinity, alignment: .leading)}@@ -239,63 +316,114 @@ struct UsageHeatmap: View {days.compactMap { $0 }}- private var tooltipOffset: CGSize {- let aboveY = hoveredSquareFrame.minY - Metrics.tooltipSquareSpacing - tooltipHeight- let tooltipY = aboveY >= 0 ? aboveY : hoveredSquareFrame.maxY + Metrics.tooltipSquareSpacing+ private var dateRangeText: String? {+ guard let firstDate = visibleDays.first?.startDate,+ let lastDate = visibleDays.last?.startDate else {+ return nil+ }- return CGSize(- width: tooltipX(for: hoveredSquareFrame),- height: min(max(tooltipY, 0), max(0, Metrics.height - tooltipHeight))- )+ return "\(firstDate) ~ \(lastDate)"}- private var tooltipHeight: CGFloat {- Metrics.tooltipHeight(showsWorkflowStats: showsWorkflowStats)+ private func updatePointerLocation(_ point: CGPoint) {+ guard let target = snappedSelection(at: point) else {+ scheduleDeactivate()+ return+ }++ cancelHoverClearTask()++ if !matches(snapSelection, target) {+ withAnimation(.snappy(duration: Metrics.snapAnimationDuration)) {+ snapSelection = target+ }+ }++ if !matches(selection, target) {+ activate(target)+ }}- 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)+ private func snappedSelection(at point: CGPoint) -> UsageHeatmapSelection? {+ let column = Int(((point.x - Metrics.squareSize / 2) / Metrics.squarePitch).rounded())+ let row = Int(((point.y - Metrics.squareSize / 2) / Metrics.squarePitch).rounded())- if leadingX >= 0 {- return leadingX+ guard (0..<Metrics.columnCount).contains(column),+ (0..<Metrics.rowCount).contains(row) else {+ return nil}- if trailingX + tooltipWidth <= Metrics.totalWidth {- return trailingX+ let center = CGPoint(+ x: CGFloat(column) * Metrics.squarePitch + Metrics.squareSize / 2,+ y: CGFloat(row) * Metrics.squarePitch + Metrics.squareSize / 2+ )+ guard abs(point.x - center.x) <= Metrics.snapHalfExtent,+ abs(point.y - center.y) <= Metrics.snapHalfExtent else {+ return nil}- return min(max(leadingX, 0), maxX)+ let index = column * Metrics.rowCount + row+ guard days.indices.contains(index), let day = days[index] else {+ return nil+ }++ return UsageHeatmapSelection(day: day, column: column, row: row)+ }++ private func activate(_ target: UsageHeatmapSelection) {+ withAnimation(.easeInOut(duration: Metrics.hoverFadeDuration)) {+ selection = target+ }+ }++ private func scheduleDeactivate() {+ cancelHoverClearTask()+ hoverClearTask = Task { @MainActor in+ try? await Task.sleep(for: .milliseconds(Metrics.hoverExitGraceMilliseconds))+ guard !Task.isCancelled else {+ return+ }++ withAnimation(.easeInOut(duration: Metrics.hoverFadeDuration)) {+ snapSelection = nil+ selection = nil+ }+ }+ }++ private func cancelHoverClearTask() {+ hoverClearTask?.cancel()+ hoverClearTask = nil+ }++ private func matches(_ lhs: UsageHeatmapSelection?, _ rhs: UsageHeatmapSelection) -> Bool {+ lhs?.day.id == rhs.day.id && lhs?.column == rhs.column && lhs?.row == rhs.row}}extension UsageHeatmap {enum Metrics {- static let coordinateSpaceName = "usageHeatmap"static let columnCount = 30static let rowCount = CodexWeekGrid.rowCountstatic let squareSize: CGFloat = 12static let squareSpacing: CGFloat = 3+ static let squarePitch = squareSize + squareSpacingstatic let height: CGFloat = 120- static let workflowTooltipWidth: CGFloat = 132- static let tokenTooltipWidth: CGFloat = 92- static let workflowTooltipHeight: CGFloat = 116- static let tokenTooltipHeight: CGFloat = 40- static let tooltipSquareSpacing: CGFloat = 2- static let tooltipFadeDuration: TimeInterval = 0.15+ static let snapAnimationDuration: TimeInterval = 0.12+ static let hoverFadeDuration: TimeInterval = 0.15+ static let hoverExitGraceMilliseconds: UInt64 = 160+ static let snapHalfExtent: CGFloat = squareSize / 2 + squareSpacingstatic var totalWidth: CGFloat {CGFloat(columnCount) * squareSize + CGFloat(columnCount - 1) * squareSpacing}- static func tooltipWidth(showsWorkflowStats: Bool) -> CGFloat {- showsWorkflowStats ? workflowTooltipWidth : tokenTooltipWidth+ static var gridHeight: CGFloat {+ CGFloat(rowCount) * squareSize + CGFloat(rowCount - 1) * squareSpacing}- static func tooltipHeight(showsWorkflowStats: Bool) -> CGFloat {- showsWorkflowStats ? workflowTooltipHeight : tokenTooltipHeight+ static func preferredDetailSide(for column: Int) -> UsageHeatmapDetailSide {+ column < columnCount / 2 ? .left : .right}}}@@ -304,31 +432,19 @@ private struct UsageHeatmapSquare: View {let day: UsageHeatmapDaylet percent: Doublelet isHovered: Bool- let onActive: (CGRect) -> Void- let onEnded: () -> Voidvar body: some View {- GeometryReader { proxy in- RoundedRectangle(cornerRadius: 4, style: .continuous)- .fill(fillColor)- .overlay {- RoundedRectangle(cornerRadius: 4, style: .continuous)- .stroke(borderColor, lineWidth: isHovered ? 1.2 : 0.7)- }- .shadow(color: .blue.opacity(0.22), radius: isHovered ? 5 : 0, y: isHovered ? 2 : 0)- .scaleEffect(isHovered ? 1.08 : 1)- .onContinuousHover { phase in- switch phase {- case .active:- onActive(proxy.frame(in: .named(UsageHeatmap.Metrics.coordinateSpaceName)))- case .ended:- onEnded()- }- }- }- .frame(width: UsageHeatmap.Metrics.squareSize, height: UsageHeatmap.Metrics.squareSize)- .contentShape(RoundedRectangle(cornerRadius: 4, style: .continuous))- .animation(.snappy(duration: 0.14), value: isHovered)+ RoundedRectangle(cornerRadius: 4, style: .continuous)+ .fill(fillColor)+ .overlay {+ RoundedRectangle(cornerRadius: 4, style: .continuous)+ .stroke(borderColor, lineWidth: isHovered ? 1.2 : 0.7)+ }+ .shadow(color: .blue.opacity(0.22), radius: isHovered ? 5 : 0, y: isHovered ? 2 : 0)+ .scaleEffect(isHovered ? 1.08 : 1)+ .frame(width: UsageHeatmap.Metrics.squareSize, height: UsageHeatmap.Metrics.squareSize)+ .contentShape(RoundedRectangle(cornerRadius: 4, style: .continuous))+ .animation(.snappy(duration: 0.14), value: isHovered)}private var clampedPercent: Double {@@ -354,67 +470,232 @@ private struct UsageHeatmapSquare: View {}}-private struct UsageHeatmapTooltip: View {- let day: UsageHeatmapDay- let showsWorkflowStats: Bool+private struct HeatmapScreenFrameReader: NSViewRepresentable {+ let onChange: (CGRect?) -> Void++ func makeNSView(context: Context) -> HeatmapScreenFrameReportingView {+ let view = HeatmapScreenFrameReportingView()+ view.onChange = onChange+ return view+ }++ func updateNSView(_ nsView: HeatmapScreenFrameReportingView, context: Context) {+ nsView.onChange = onChange+ nsView.scheduleReport()+ }+}++@MainActor+private final class HeatmapScreenFrameReportingView: NSView {+ var onChange: ((CGRect?) -> Void)?+ private var lastReportedFrame: CGRect?+ private var reportScheduled = false++ override func viewDidMoveToWindow() {+ super.viewDidMoveToWindow()+ scheduleReport()+ }++ override func layout() {+ super.layout()+ reportFrame()+ }++ func scheduleReport() {+ // updateNSView 每次 hover 重渲染都会调到这里, 合并掉重复的待执行 report, 至多保留一个。+ guard !reportScheduled else {+ return+ }+ reportScheduled = true+ Task { @MainActor [weak self] in+ await Task.yield()+ guard let self else {+ return+ }+ self.reportScheduled = false+ self.reportFrame()+ }+ }++ private func reportFrame() {+ guard let window else {+ updateFrame(nil)+ return+ }++ let frameInWindow = convert(bounds, to: nil)+ updateFrame(window.convertToScreen(frameInWindow))+ }++ private func updateFrame(_ frame: CGRect?) {+ guard frame != lastReportedFrame else {+ return+ }++ lastReportedFrame = frame+ onChange?(frame)+ }+}++struct UsageHeatmapDayDetailView: View {+ let context: UsageHeatmapHoverContext@Environment(\.colorScheme) private var colorSchemevar 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)- }- } else {- dateText- tokenText- }+ let panelSize = Self.panelSize(showsWorkflowStats: context.showsWorkflowStats)++ VStack(alignment: .leading, spacing: Metrics.sectionSpacing) {+ detailContent}.padding(.horizontal, Metrics.horizontalPadding).padding(.vertical, Metrics.verticalPadding).frame(- width: tooltipWidth,- height: tooltipHeight,- alignment: .leading+ width: panelSize.width,+ height: panelSize.height,+ alignment: .topLeading)+ .liquidGlassSurface(cornerRadius: Metrics.cornerRadius, isOuterSurface: true).background {RoundedRectangle(cornerRadius: Metrics.cornerRadius, style: .continuous)- .fill(tooltipFill)+ .fill(panelBackingFill)}- .liquidGlassSurface(cornerRadius: Metrics.cornerRadius)- .animation(Metrics.statusAnimation, value: day)+ .overlay {+ RoundedRectangle(cornerRadius: Metrics.cornerRadius, style: .continuous)+ .strokeBorder(panelBoundaryColor, lineWidth: Metrics.boundaryLineWidth)+ }+ .clipShape(RoundedRectangle(cornerRadius: Metrics.cornerRadius, style: .continuous))+ .animation(Metrics.statusAnimation, value: context)}- private var workflowMetricRows: [(label: String, value: String)] {- [- ("会话总数", "\(day.workflowStats.sessionCount)"),- ("对话轮次", "\(day.workflowStats.turnCount)"),- ("子智能体", "\(day.workflowStats.subagentCount)"),- ("工具调用", "\(day.workflowStats.toolCallCount)"),- ("权限请求", "\(day.workflowStats.permissionRequestCount)"),- ("上下文压缩", "\(day.workflowStats.contextCompactionCount)")- ]+ static var panelCornerRadius: CGFloat {+ Metrics.cornerRadius+ }++ static func panelSize(showsWorkflowStats: Bool) -> CGSize {+ showsWorkflowStats+ ? CGSize(width: Metrics.workflowPanelWidth, height: Metrics.workflowPanelHeight)+ : CGSize(width: Metrics.tokenPanelWidth, height: Metrics.tokenPanelHeight)+ }++ @ViewBuilder+ private var detailContent: some View {+ if context.showsWorkflowStats {+ workflowContent+ } else {+ tokenOnlyContent+ }+ }++ private var header: some View {+ HStack(alignment: .center, spacing: Metrics.headerSpacing) {+ VStack(alignment: .leading, spacing: 4) {+ dateText+ .padding(.horizontal, 7)+ .padding(.vertical, 3)+ .liquidGlassCapsule(tint: .accentColor)+ }++ Spacer(minLength: 8)++ tokenText+ .frame(minWidth: Metrics.tokenMinimumWidth, alignment: .trailing)+ }+ }++ private var workflowContent: some View {+ VStack(alignment: .leading, spacing: Metrics.sectionSpacing) {+ header++ LiquidGlassDivider()+ .opacity(0.72)++ VStack(alignment: .leading, spacing: Metrics.metricSpacing) {+ tokenIntensityMetricRow++ ForEach(workflowMetricRows) { row in+ metricRow(row)+ }+ }+ }+ }++ private var tokenOnlyContent: some View {+ VStack(alignment: .leading, spacing: Metrics.sectionSpacing) {+ header++ LiquidGlassDivider()+ .opacity(0.62)++ tokenOnlyFooter+ }+ }++ private var tokenOnlyFooter: some View {+ metricRowLayout {+ tokenIntensityDot+ Text("用量强度")+ .foregroundStyle(.secondary)++ Spacer(minLength: 8)++ tokenIntensityStrip+ .frame(width: Metrics.tokenIntensityStripWidth)+ }+ }++ private var tokenIntensityMetricRow: some View {+ metricRowLayout {+ tokenIntensityDot+ Text("用量强度")+ .foregroundStyle(.secondary)+ .frame(width: Metrics.metricLabelWidth, alignment: .leading)++ tokenIntensityStrip+ .frame(width: Metrics.tokenIntensityStripWidth)+ .frame(maxWidth: .infinity, alignment: .trailing)+ }+ }++ private var tokenIntensityDot: some View {+ metricDot(tint: tokenIntensityAccent, darkOpacity: 0.88, lightOpacity: 0.76)}- private var tooltipHeight: CGFloat {- UsageHeatmap.Metrics.tooltipHeight(showsWorkflowStats: showsWorkflowStats)+ private func metricRowLayout<Content: View>(@ViewBuilder content: () -> Content) -> some View {+ HStack(spacing: Metrics.metricRowSpacing, content: content)+ .font(.system(size: Metrics.workflowFontSize))+ .frame(height: Metrics.metricRowHeight)}- private var tooltipWidth: CGFloat {- UsageHeatmap.Metrics.tooltipWidth(showsWorkflowStats: showsWorkflowStats)+ private func metricDot(tint: Color, darkOpacity: Double = 0.86, lightOpacity: Double = 0.72) -> some View {+ Circle()+ .fill(tint.opacity(colorScheme == .dark ? darkOpacity : lightOpacity))+ .frame(width: Metrics.metricDotSize, height: Metrics.metricDotSize)+ }++ private var tokenIntensityStrip: some View {+ HStack(spacing: Metrics.tokenIntensitySegmentSpacing) {+ ForEach(0..<Metrics.tokenIntensitySegmentCount, id: \.self) { index in+ RoundedRectangle(cornerRadius: 2, style: .continuous)+ .fill(tokenIntensityFill(for: index))+ .frame(maxWidth: .infinity)+ }+ }+ .frame(height: Metrics.tokenIntensityStripHeight)+ }++ private var workflowMetricRows: [WorkflowMetricRow] {+ [+ WorkflowMetricRow(label: "会话总数", value: context.day.workflowStats.sessionCount, tint: .green),+ WorkflowMetricRow(label: "对话轮次", value: context.day.workflowStats.turnCount, tint: .teal),+ WorkflowMetricRow(label: "子智能体", value: context.day.workflowStats.subagentCount, tint: .indigo),+ WorkflowMetricRow(label: "工具调用", value: context.day.workflowStats.toolCallCount, tint: .orange),+ WorkflowMetricRow(label: "权限请求", value: context.day.workflowStats.permissionRequestCount, tint: .red),+ WorkflowMetricRow(label: "上下文压缩", value: context.day.workflowStats.contextCompactionCount, tint: .purple)+ ]}private var dateText: some View {- Text(day.startDate)- .font(dateFont)+ AnimatedDateText(startDate: context.day.startDate, font: dateFont).foregroundStyle(Color.codexSecondaryLabel).lineLimit(1).fixedSize(horizontal: true, vertical: false)@@ -423,10 +704,14 @@ private struct UsageHeatmapTooltip: View {@ViewBuilderprivate var tokenText: some View {- if let tokenCount = day.tokenCount {- TokenCountText(tokens: tokenCount, font: tokenFont)- .foregroundStyle(Color.codexLabel)- .contentTransition(.numericText())+ if let tokenCount = context.day.tokenCount {+ TokenCountText(+ tokens: tokenCount,+ font: tokenFont,+ reservedNumericWidth: Metrics.tokenMinimumWidth,+ reservedUnitWidth: Metrics.tokenUnitWidth+ )+ .foregroundStyle(Color.codexLabel)} else {Text("--").font(tokenFont)@@ -436,29 +721,58 @@ private struct UsageHeatmapTooltip: View {}private var dateFont: Font {- showsWorkflowStats- ? .system(size: Metrics.workflowFontSize).monospacedDigit()- : .caption2.monospacedDigit()+ .caption2.monospacedDigit()}private var tokenFont: Font {- showsWorkflowStats- ? .system(size: Metrics.workflowFontSize).monospacedDigit().weight(.semibold)- : .caption.monospacedDigit().weight(.semibold)+ .system(size: 14).monospacedDigit().weight(.semibold)}- private func metricRow(_ label: String, value: String) -> some View {- HStack(spacing: Metrics.metricRowSpacing) {- Text(label)+ private var tokenIntensityLevel: Int {+ guard context.day.tokensForHeatmap > 0 else {+ return 0+ }++ let percent = tokenIntensityPercent+ return min(+ Metrics.tokenIntensitySegmentCount,+ max(1, Int(ceil(percent * Double(Metrics.tokenIntensitySegmentCount))))+ )+ }++ private var tokenIntensityPercent: Double {+ guard context.peakTokens > 0 else {+ return 0+ }++ return min(max(Double(context.day.tokensForHeatmap) / Double(context.peakTokens), 0), 1)+ }++ private var tokenIntensityAccent: Color {+ tokenIntensityLevel >= Metrics.tokenIntensitySegmentCount ? .blue : .cyan+ }++ private func tokenIntensityFill(for index: Int) -> Color {+ guard index < tokenIntensityLevel else {+ return Color.blue.opacity(colorScheme == .dark ? 0.14 : 0.10)+ }++ let opacity = colorScheme == .dark ? 0.42 + Double(index) * 0.10 : 0.34 + Double(index) * 0.09+ return Color.blue.opacity(min(opacity, 0.88))+ }++ private func metricRow(_ row: WorkflowMetricRow) -> some View {+ metricRowLayout {+ metricDot(tint: row.tint)+ Text(row.label).foregroundStyle(.secondary).frame(width: Metrics.metricLabelWidth, alignment: .leading)- fittingMetricValue(value)+ fittingMetricValue("\(row.value)", comparison: Double(row.value))}- .font(.system(size: Metrics.workflowFontSize))}- private func fittingMetricValue(_ value: String) -> some View {+ private func fittingMetricValue(_ value: String, comparison: Double) -> some View {ViewThatFits(in: .horizontal) {metricValueText(value).fixedSize(horizontal: true, vertical: false)@@ -467,6 +781,7 @@ private struct UsageHeatmapTooltip: View {.minimumScaleFactor(Metrics.metricValueMinimumScale).allowsTightening(true)}+ .numericRollTransition(value: comparison).layoutPriority(1).frame(maxWidth: .infinity, alignment: .trailing)}@@ -474,27 +789,102 @@ private struct UsageHeatmapTooltip: View {private func metricValueText(_ value: String) -> some View {Text(value).foregroundStyle(Color.codexLabel)+ .fontWeight(.semibold).monospacedDigit().lineLimit(1)- .contentTransition(.numericText())}- private var tooltipFill: Color {+ private var panelBackingFill: Color {Color(nsColor: .windowBackgroundColor)- .opacity(colorScheme == .dark ? 0.88 : 0.82)+ .opacity(colorScheme == .dark ? 0.90 : 0.86)+ }++ private var panelBoundaryColor: Color {+ colorScheme == .dark+ ? .white.opacity(0.18)+ : .black.opacity(0.14)+ }++ private struct WorkflowMetricRow: Identifiable {+ let label: String+ let value: Int+ let tint: Color++ var id: String { label }}private enum Metrics {- static let rowSpacing: CGFloat = 3- static let headerSpacing: CGFloat = 4- static let headerMinimumSpacer: CGFloat = 4- static let horizontalPadding: CGFloat = 8- static let verticalPadding: CGFloat = 6- static let cornerRadius: CGFloat = 7+ static let workflowPanelWidth: CGFloat = 212+ static let workflowPanelHeight: CGFloat = 189+ static let tokenPanelWidth: CGFloat = 212+ static let tokenPanelHeight: CGFloat = 84+ static let sectionSpacing: CGFloat = 8+ static let headerSpacing: CGFloat = 10+ static let horizontalPadding: CGFloat = 12+ static let verticalPadding: CGFloat = 10+ static let cornerRadius: CGFloat = 12+ static let boundaryLineWidth: CGFloat = 0.8+ static let tokenMinimumWidth: CGFloat = 38+ static let tokenUnitWidth: CGFloat = 14+ static let metricSpacing: CGFloat = 5static let metricRowSpacing: CGFloat = 6- static let metricLabelWidth: CGFloat = 54+ static let metricDotSize: CGFloat = 5+ static let metricRowHeight: CGFloat = 14+ static let metricLabelWidth: CGFloat = 72static let metricValueMinimumScale: CGFloat = 0.60- static let workflowFontSize: CGFloat = 10+ static let workflowFontSize: CGFloat = 11+ static let tokenIntensitySegmentCount = 5+ static let tokenIntensitySegmentSpacing: CGFloat = 3+ static let tokenIntensityStripWidth: CGFloat = 74+ static let tokenIntensityStripHeight: CGFloat = 5static let statusAnimation = Animation.codexStatus}}++private struct AnimatedDateText: View {+ let startDate: String+ let font: Font++ var body: some View {+ if let components {+ HStack(spacing: 0) {+ Text(components.year)+ Text("-")+ Text(components.month)+ Text("-")+ Text(components.day)+ }+ .font(font)+ .numericRollTransition(value: dateValue(components))+ } else {+ Text(startDate)+ .font(font)+ .contentTransition(.numericText())+ }+ }++ private func dateValue(_ components: DateTextComponents) -> Double {+ guard let year = Int(components.year),+ let month = Int(components.month),+ let day = Int(components.day) else {+ return 0+ }+ return Double(year * 10_000 + month * 100 + day)+ }++ private var components: DateTextComponents? {+ let parts = startDate.split(separator: "-", omittingEmptySubsequences: false).map(String.init)+ guard parts.count == 3,+ parts.allSatisfy({ !$0.isEmpty && $0.allSatisfy(\.isNumber) }) else {+ return nil+ }++ return DateTextComponents(year: parts[0], month: parts[1], day: parts[2])+ }++ private struct DateTextComponents {+ let year: String+ let month: String+ let day: String+ }+}diff --git a/CodexBar/Views/Settings/AppSettingsView.swift b/CodexBar/Views/Settings/AppSettingsView.swiftindex 9a49fef..4b9975b 100644--- a/CodexBar/Views/Settings/AppSettingsView.swift+++ b/CodexBar/Views/Settings/AppSettingsView.swift@@ -7,6 +7,7 @@ struct AppSettingsView: View {@StateObject private var loginItemSettings = LoginItemSettings()@StateObject private var codexVersions = CodexCLIVersionViewModel()@ObservedObject var codexHookSettings: CodexHookSettings+ @ObservedObject var globalHotKeySettings: GlobalHotKeySettingsvar body: some View {VStack(alignment: .leading, spacing: Metrics.sectionSpacing) {@@ -15,6 +16,8 @@ struct AppSettingsView: View {LiquidGlassDivider()automaticUpdateCheckRowLiquidGlassDivider()+ hotKeyRow+ LiquidGlassDivider()codexHookRowLiquidGlassDivider()versionRow@@ -24,17 +27,18 @@ struct AppSettingsView: View {.padding(Metrics.panelPadding).liquidGlassSurface(cornerRadius: Metrics.panelCornerRadius)+ settingsErrorPanel+HStack(alignment: .center, spacing: 12) {quitButton- statusTextSpacer()checkUpdateButton}- .animation(Metrics.statusAnimation, value: loginItemSettings.errorMessage)- .animation(Metrics.statusAnimation, value: codexHookSettings.errorMessage).padding(Metrics.panelPadding).liquidGlassSurface(cornerRadius: Metrics.panelCornerRadius)}+ .animation(Metrics.statusAnimation, value: loginItemSettings.errorMessage)+ .animation(Metrics.statusAnimation, value: codexHookSettings.errorMessage).padding(Metrics.padding).frame(width: Metrics.windowWidth).liquidGlassSurface(@@ -94,6 +98,10 @@ private extension AppSettingsView {)}+ var hotKeyRow: some View {+ HotKeyRecorderRow(settings: globalHotKeySettings)+ }+var codexHookRow: some View {VStack(alignment: .leading, spacing: 4) {SettingsToggleRow(@@ -175,18 +183,15 @@ private extension AppSettingsView {}@ViewBuilder- var statusText: some View {- if let message = loginItemSettings.errorMessage {- Text(message)- .font(.caption)- .foregroundStyle(.red)- .fixedSize(horizontal: false, vertical: true)- .transition(.opacity)- } else if let message = codexHookSettings.errorMessage {+ var settingsErrorPanel: some View {+ if let message = settingsErrorMessage {Text(message).font(.caption).foregroundStyle(.red).fixedSize(horizontal: false, vertical: true)+ .frame(maxWidth: .infinity, alignment: .leading)+ .padding(Metrics.panelPadding)+ .liquidGlassSurface(cornerRadius: Metrics.panelCornerRadius).transition(.opacity)}}@@ -208,4 +213,8 @@ private extension AppSettingsView {.foregroundStyle(.red).keyboardShortcut("q")}++ var settingsErrorMessage: String? {+ loginItemSettings.errorMessage ?? codexHookSettings.errorMessage+ }}diff --git a/CodexBar/Views/Settings/HotKeyRecorderRow.swift b/CodexBar/Views/Settings/HotKeyRecorderRow.swiftnew file mode 100644index 0000000..4dfc938--- /dev/null+++ b/CodexBar/Views/Settings/HotKeyRecorderRow.swift@@ -0,0 +1,241 @@+import AppKit+import Carbon.HIToolbox+import SwiftUI++struct HotKeyRecorderRow: View {+ @ObservedObject var settings: GlobalHotKeySettings+ @State private var isRecording = false++ var body: some View {+ VStack(alignment: .leading, spacing: 4) {+ HStack(spacing: 10) {+ Image(systemName: "keyboard")+ .frame(width: Metrics.iconWidth)+ .foregroundStyle(.tint)++ Text("使用快捷键")++ Spacer()++ Button {+ startRecording()+ } label: {+ Text(shortcutLabel)+ .frame(minWidth: Metrics.shortcutButtonMinWidth)+ .contentShape(Rectangle())+ }+ .font(.body.monospacedDigit())+ .buttonStyle(.bordered)+ .controlSize(.small)+ .disabled(!canStartRecording)+ .background {+ HotKeyCaptureView(+ isRecording: $isRecording,+ onCapture: captureShortcut,+ onCancel: {+ stopRecording()+ },+ onWindowClose: {+ resetTransientState()+ }+ )+ .frame(width: 0, height: 0)+ }++ iconButton(+ systemName: "arrow.counterclockwise.circle",+ help: "恢复默认快捷键",+ isDisabled: !canRestoreDefaultShortcut+ ) {+ settings.restoreDefaultShortcut()+ stopRecording()+ }++ iconButton(+ systemName: "xmark.circle",+ help: "清除设置快捷键",+ isDisabled: !canClearShortcut+ ) {+ settings.clearShortcut()+ stopRecording()+ }+ }++ if let message = settings.errorMessage {+ errorMessageRow(message)+ }+ }+ .onDisappear {+ resetTransientState()+ }+ }++ private var shortcutLabel: String {+ if isRecording {+ return "请输入快捷键"+ }++ return settings.shortcut?.label ?? "未设置"+ }++ private var canStartRecording: Bool {+ !hasShortcut || isRecording+ }++ private var canRestoreDefaultShortcut: Bool {+ !hasShortcut+ }++ private var canClearShortcut: Bool {+ hasShortcut || isRecording+ }++ private var hasShortcut: Bool {+ settings.shortcut != nil+ }++ private func startRecording() {+ guard settings.shortcut == nil else {+ return+ }++ isRecording = true+ }++ private func stopRecording() {+ isRecording = false+ }++ private func resetTransientState() {+ stopRecording()+ settings.clearError()+ }++ private func captureShortcut(_ event: NSEvent) {+ guard event.keyCode != UInt16(kVK_Escape) else {+ stopRecording()+ return+ }++ guard let shortcut = GlobalHotKeyShortcut(event: event) else {+ settings.setRegistrationError("无法识别该快捷键")+ stopRecording()+ return+ }++ settings.setShortcut(shortcut)+ stopRecording()+ }++ private func errorMessageRow(_ message: String) -> some View {+ HStack(alignment: .top, spacing: 10) {+ Color.clear+ .frame(width: Metrics.iconWidth)++ Text(message)+ .font(.caption)+ .foregroundStyle(.red)+ .fixedSize(horizontal: false, vertical: true)+ }+ }++ private func iconButton(+ systemName: String,+ help: String,+ isDisabled: Bool,+ action: @escaping () -> Void+ ) -> some View {+ Button(action: action) {+ Image(systemName: systemName)+ }+ .buttonStyle(.plain)+ .foregroundStyle(.secondary)+ .help(help)+ .disabled(isDisabled)+ }++ private enum Metrics {+ static let iconWidth: CGFloat = 18+ static let shortcutButtonMinWidth: CGFloat = 78+ }+}++private struct HotKeyCaptureView: NSViewRepresentable {+ @Binding var isRecording: Bool+ let onCapture: (NSEvent) -> Void+ let onCancel: () -> Void+ let onWindowClose: () -> Void++ func makeNSView(context: Context) -> HotKeyCaptureNSView {+ let view = HotKeyCaptureNSView()+ view.onCapture = onCapture+ view.onCancel = onCancel+ view.onWindowClose = onWindowClose+ return view+ }++ func updateNSView(_ nsView: HotKeyCaptureNSView, context: Context) {+ nsView.onCapture = onCapture+ nsView.onCancel = onCancel+ nsView.onWindowClose = onWindowClose++ if isRecording {+ Task { @MainActor [weak nsView] in+ nsView?.window?.makeFirstResponder(nsView)+ }+ } else if nsView.window?.firstResponder === nsView {+ nsView.window?.makeFirstResponder(nil)+ }+ }+}++private final class HotKeyCaptureNSView: NSView {+ var onCapture: ((NSEvent) -> Void)?+ var onCancel: (() -> Void)?+ var onWindowClose: (() -> Void)?+ private var windowCloseObserver: NSObjectProtocol?++ override var acceptsFirstResponder: Bool {+ true+ }++ deinit {+ removeWindowCloseObserver()+ }++ override func viewDidMoveToWindow() {+ super.viewDidMoveToWindow()+ updateWindowCloseObserver()+ }++ override func keyDown(with event: NSEvent) {+ if event.keyCode == UInt16(kVK_Escape) {+ onCancel?()+ } else {+ onCapture?(event)+ }+ }++ private func updateWindowCloseObserver() {+ removeWindowCloseObserver()++ guard let window else {+ return+ }++ windowCloseObserver = NotificationCenter.default.addObserver(+ forName: NSWindow.willCloseNotification,+ object: window,+ queue: .main+ ) { [weak self] _ in+ self?.onWindowClose?()+ }+ }++ private func removeWindowCloseObserver() {+ if let windowCloseObserver {+ NotificationCenter.default.removeObserver(windowCloseObserver)+ self.windowCloseObserver = nil+ }+ }+}diff --git a/Docs/CodexHook.md b/Docs/CodexHook.mdindex 3e21a1a..9c0ef2f 100644--- a/Docs/CodexHook.md+++ b/Docs/CodexHook.md@@ -166,7 +166,7 @@ subagentStopCount, sessionCount, turnCount, projectCounts, sessionIds, turnIds| `daily.jsonl` 字段 | 从 `events/YYYY-MM-DD.jsonl` 读取什么 | 写入 / 更新规则 | 页面关系 || ------------------------ | ---------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------ |-| `date` | `timestamp` | Hook 写入时先把事件时间解析为绝对时间,再按当前本地时区格式化为 `yyyy-MM-dd` 选择日期文件。维护流程按当前处理的文件日期生成同名 `daily.jsonl` 行。早于最近 210 天保留窗口的日期不会进入聚合。 | 热力图日期键;tooltip 日期。 |+| `date` | `timestamp` | Hook 写入时先把事件时间解析为绝对时间,再按当前本地时区格式化为 `yyyy-MM-dd` 选择日期文件。维护流程按当前处理的文件日期生成同名 `daily.jsonl` 行。早于最近 210 天保留窗口的日期不会进入聚合。 | 热力图日期键;详情面板日期。 || `eventCount` | 每条成功解码并保留下来的事件行 | 每处理一条事件就 `+1`,发生在具体事件类型判断之前。因此 `UserPromptSubmit`、未知 `event`、`tool: null`、`session: null` 等行都会计入,只要 `timestamp` 和 `event` 可解析。 | 进入 `WorkflowDailyStats.eventCount`,当前页面不展示。 || `sessionStartCount` | `event` | `event` 归一化后等于 `sessionstart` 时 `+1`。不要求 `session` 非空。 | 作为「会话总数」兜底来源。 || `stopCount` | `event` | `event` 归一化后等于 `stop` 时 `+1`。不要求 `turn` 非空。 | 作为「对话轮次」兜底来源。 |@@ -202,24 +202,35 @@ UI 不直接展示所有原始字段,而是先生成 `WorkflowDailyStats`:用量热力图固定为近 30 周、30 列 x 7 行、周日到周六排列。`account/usage/read` 返回当天 `dailyUsageBuckets` 时, 热力图展示今天的小方块和对应 token 数; 没有当天 bucket 时再按 Hook 开关决定是否包含今天。+热力图 hover 时不在 popover 内绘制旧式 tooltip, 而是通过 `UsageHeatmapHoverContext` 通知 `HeatmapDetailPanelController` 展示侧边详情面板。指针会吸附到最近方块, 离开热力图后延迟 160 ms 清除选中状态。++详情面板是 popover 的 borderless nonactivating child panel:++- 不接收鼠标事件, 不抢走 popover key window+- 按悬停列优先显示在 popover 左侧或右侧, 左右空间不足时尝试另一侧+- 最终位置会被夹在当前屏幕可见区域内, 屏幕边缘保留 `8` px+- 与 popover 之间保留 `4` px gap+- 侧边切换使用抽屉动画: 收起 `0.12` 秒, 展开 `0.18` 秒+Codex Hook 关闭时:- 默认不包含今天-- tooltip 只显示日期和 token 数-- tooltip 固定为 `92 x 40`-- tooltip 横向 padding 为 `8`, 纵向 padding 为 `6`, 圆角为 `7`+- 详情面板显示日期, token 数和「用量强度」分段条+- 详情面板固定为 `212 x 84`+- 详情面板横向 padding 为 `12`, 纵向 padding 为 `10`, 圆角为 `12`- 日期使用 `.caption2.monospacedDigit()`-- token 数使用 `.caption.monospacedDigit().weight(.semibold)`+- token 数使用 `14pt` 等宽数字并加粗- token 数通过 `TokenCountText` 展示: `1K` 以下显示完整整数, `1K` 起显示 `K` / `M` / `B`, 不使用千位逗号; 文本自身允许缩小到 `0.8`Codex Hook 开启时:- 热力图包含今天- 没有当天 token bucket 时, 今天的 token 数显示为 `--`-- tooltip 首行左侧显示日期、右侧显示 token 数+- 详情面板首行左侧显示日期、右侧显示 token 数+- 第二行显示「用量强度」分段条- 后续逐行显示「会话总数」、「对话轮次」、「子智能体」、「工具调用」、「权限请求」、「上下文压缩」-- tooltip 固定为 `132 x 116`-- tooltip 横向 padding 为 `8`, 纵向 padding 为 `6`, 圆角为 `7`-- 日期和 token 数都使用 `10pt` 等宽数字; token 数额外加粗-- 工作流统计行整体使用 `10pt`; 左侧标签固定宽度 `54`, 标签和值之间 spacing 为 `6`-- 工作流统计行右侧数字优先使用正常 `10pt` 完整展示; 只有正常字号在横向剩余空间内放不下时, 才会启用自动缩小, 最小缩放比例为 `0.60`, 并允许字距收紧+- 详情面板固定为 `212 x 189`+- 详情面板横向 padding 为 `12`, 纵向 padding 为 `10`, 圆角为 `12`+- 日期使用 `.caption2.monospacedDigit()`, token 数使用 `14pt` 等宽数字并加粗+- 工作流统计行整体使用 `11pt`; 左侧标签固定宽度 `72`, 标签和值之间 spacing 为 `6`+- 工作流统计行右侧数字优先使用正常字号完整展示; 只有正常字号在横向剩余空间内放不下时, 才会启用自动缩小, 最小缩放比例为 `0.60`, 并允许字距收紧diff --git a/Docs/DevelopmentGuide.md b/Docs/DevelopmentGuide.mdindex 5a15d59..def0ed0 100644--- a/Docs/DevelopmentGuide.md+++ b/Docs/DevelopmentGuide.md@@ -66,11 +66,12 @@ sequenceDiagramend```-普通启动时, `CodexBarAppDelegate` 创建四个长期对象:+普通启动时, `CodexBarAppDelegate` 创建五个长期对象:- `CodexStatusViewModel`: app-server 刷新状态- `WorkflowStatsViewModel`: Hook 工作流统计快照- `CodexHookSettings`: Hook 配置状态和写入操作+- `GlobalHotKeySettings`: 全局快捷键配置和错误状态- `AppUpdater`: Sparkle 更新状态`StatusItemController.install()` 负责:@@ -78,9 +79,10 @@ sequenceDiagram- 配置菜单栏按钮图标, tooltip 和点击事件- 配置 popover 的 SwiftUI 根视图- 订阅状态变化并切换菜单栏图标+- 订阅全局快捷键配置并安装或移除 Carbon hot key- 开始每 60 秒自动刷新-App 退出时, `applicationWillTerminate` 调用 `StatusItemController.uninstall()`, 关闭 popover, 移除订阅并从系统状态栏移除 status item+App 退出时, `applicationWillTerminate` 调用 `StatusItemController.uninstall()`, 关闭 popover, 注销全局快捷键, 移除订阅并从系统状态栏移除 status item## 4. 菜单栏, Popover 与窗口流程@@ -100,10 +102,13 @@ App 退出时, `applicationWillTerminate` 调用 `StatusItemController.uninstall| 左键点击 | 切换 popover || 右键点击 | 打开上下文菜单 || Control + 点击 | 打开上下文菜单 |+| 全局快捷键 | 切换 popover || 上下文菜单"设置" | 打开独立设置窗口 || 上下文菜单"日志" | 打开独立日志窗口 || 上下文菜单"退出" | 终止 App |+全局快捷键由 `GlobalHotKeySettings` 和 `GlobalHotKeyController` 管理。没有用户设置时默认注册 `⌘⇧W`; 用户清除后不注册快捷键。注册冲突时恢复到上一个已注册快捷键, 并把错误显示在设置窗口的快捷键行内。+打开 popover 的顺序:- 取消正在等待的延迟刷新和淡入淡出任务@@ -124,11 +129,13 @@ App 退出时, `applicationWillTerminate` 调用 `StatusItemController.uninstall- popover 外部鼠标点击- Escape-- Command-Tab 或 Command-Space 等系统切换快捷键+- Command-Tab- App 失去 active- 其他应用被激活- popover window 失去 key+Command-Space 不直接关闭 popover, 只短暂抑制 600 ms 内的 active 变化关闭逻辑, 避免 Spotlight 或系统搜索抢焦点时误关弹窗。+设置窗口和日志窗口都继承 `HostingWindowController` 的行为: 懒创建, 关闭后不释放, 重新打开复用, 按当前屏幕居中, 重新打开时移动到当前桌面并置前## 5. Codex 状态刷新流程@@ -347,7 +354,8 @@ codex app-server --listen stdio://- Popover 只展示"未登录"和"初始化失败"两类特殊状态- 具体启动失败, 请求失败, 超时, 断连, 解析失败和业务错误进入日志窗口- 账户有效时, rate limits 和 usage 可以单独失败, 失败区域按缓存或无数据处理-- 涉及本机配置写入的错误显示在设置窗口底部状态区+- 登录项和 Hook 写入错误显示在设置窗口中部的独立错误组+- 全局快捷键录制, 校验和注册错误显示在快捷键行内- Hook 子进程尽量快速退出, 事件记录失败不会阻断 Codex 自身流程app-server 与状态刷新错误:@@ -383,19 +391,21 @@ app-server 与状态刷新错误:设置, Hook 和更新错误:-| 错误来源 | 检测位置 | 用户可见状态 | 重试或降级 |-| -------------------------------- | -------------------------------------------------------- | -------------------------------------- | ------------------------------------------------ |-| 登录项注册或取消失败 | `LoginItemSettings.setEnabled` | 设置窗口底部显示"设置开机启动失败" | 调用 `refresh()` 恢复实际状态 |-| `hooks.json` 读取失败或结构非法 | `CodexHookSettings.refresh` | Hook 开关视为关闭, 底部显示读取失败 | 不写配置 |-| Hook 开关写入失败 | `CodexHookSettings.setEnabled` | 底部显示"设置 Codex Hook 失败" | 调用 `refresh()` 恢复实际状态 |-| Hook 子进程 payload 不是 JSON | `WorkflowHookEventRecorder.stdinPayload` | 无 UI 提示 | 使用空 payload 和 fallback 字段继续记录 |-| Hook 子进程写入失败 | `WorkflowHookEventRecorder.handleIfRequested` | 无 UI 提示 | `try? record` 吞掉错误并正常退出, 避免阻断 Codex |-| `daily.jsonl` 缺失, 空文件或坏行 | `WorkflowStatsService.prepareMaintenanceTasksOnQueue` | tooltip 可能暂时显示 0 | 标记 dirty, 后续从 events 文件重建 |-| events 文件变小或 offset 不一致 | `WorkflowStatsService.reconcileEventFiles` | tooltip 可能暂时显示旧聚合 | 标记 dirty, 从头重建当天聚合 |-| 单个维护任务失败 | `WorkflowStatsService.performMaintenanceIfNeededOnQueue` | 使用已有 daily 或空 snapshot | 对应日期标记 dirty |-| Sparkle 配置缺失 | `AppUpdater.init` | 更新开关禁用, 操作显示"未配置更新资源" | 不创建 updater controller |-| 手动检查没有更新 | `updaterDidNotFindUpdate` | 显示"没有可用更新" | 1 秒后自动清理状态 |-| 手动检查失败 | `didAbortWithError` | 显示"检查更新失败" | 不展示底层错误细节 |+| 错误来源 | 检测位置 | 用户可见状态 | 重试或降级 |+| -------------------------------- | -------------------------------------------------------- | ----------------------------------------- | ------------------------------------------------ |+| 登录项注册或取消失败 | `LoginItemSettings.setEnabled` | 设置窗口中部错误组显示"设置开机启动失败" | 调用 `refresh()` 恢复实际状态 |+| `hooks.json` 读取失败或结构非法 | `CodexHookSettings.refresh` | Hook 开关视为关闭, 中部错误组显示读取失败 | 不写配置 |+| Hook 开关写入失败 | `CodexHookSettings.setEnabled` | 中部错误组显示"设置 Codex Hook 失败" | 调用 `refresh()` 恢复实际状态 |+| 快捷键无法识别或不符合规则 | `HotKeyRecorderRow` / `GlobalHotKeySettings.setShortcut` | 快捷键行内显示红色错误 | 用户清除后重新录制 |+| 快捷键注册冲突 | `StatusItemController.applyGlobalHotKey` | 快捷键行内显示占用提示 | 恢复上一个已注册快捷键 |+| Hook 子进程 payload 不是 JSON | `WorkflowHookEventRecorder.stdinPayload` | 无 UI 提示 | 使用空 payload 和 fallback 字段继续记录 |+| Hook 子进程写入失败 | `WorkflowHookEventRecorder.handleIfRequested` | 无 UI 提示 | `try? record` 吞掉错误并正常退出, 避免阻断 Codex |+| `daily.jsonl` 缺失, 空文件或坏行 | `WorkflowStatsService.prepareMaintenanceTasksOnQueue` | 热力图详情面板可能暂时显示 0 | 标记 dirty, 后续从 events 文件重建 |+| events 文件变小或 offset 不一致 | `WorkflowStatsService.reconcileEventFiles` | 热力图详情面板可能暂时显示旧聚合 | 标记 dirty, 从头重建当天聚合 |+| 单个维护任务失败 | `WorkflowStatsService.performMaintenanceIfNeededOnQueue` | 使用已有 daily 或空 snapshot | 对应日期标记 dirty |+| Sparkle 配置缺失 | `AppUpdater.init` | 更新开关禁用, 操作显示"未配置更新资源" | 不创建 updater controller |+| 手动检查没有更新 | `updaterDidNotFindUpdate` | 显示"没有可用更新" | 1 秒后自动清理状态 |+| 手动检查失败 | `didAbortWithError` | 显示"检查更新失败" | 不展示底层错误细节 |Codex 版本探测错误:@@ -501,14 +511,19 @@ flowchart TD- 指标行展示"全时累计", "单日峰值", "当前连胜", "最长连胜", "最长任务"- token 文本由 `TokenCountText` 格式化, 1K 以下完整显示, 1K 起显示 K/M/B- 热力图方块强度按当天 token 相对当前 30 周峰值计算, 并用 `pow(percent, 0.62)` 调整视觉强度-- hover 时显示 tooltip, 并根据方块位置自动放在左, 右, 上, 下的可用空间内+- hover 时通过 `UsageHeatmapHoverContext` 通知 `HeatmapDetailPanelController` 展示侧边详情面板+- 指针会吸附到最近方块, 吸附动画 0.12 秒; 离开热力图后延迟 160 ms 清除选中状态++热力图详情面板是 popover 的 borderless nonactivating child panel, 不接收鼠标事件, 按悬停列优先显示在 popover 左侧或右侧; 左右空间不足时尝试另一侧, 最终在当前屏幕可见区域内保留 8 px 边距。侧边切换时先以 0.12 秒抽屉动画收起, 再以 0.18 秒展开。++详情面板分两种:-tooltip 分两种:+| Hook 状态 | 内容 | 尺寸 |+| --------- | ---------------------------------------------------------------------------------------------- | ----------- |+| 关闭 | 日期, token 数和"用量强度"分段条 | `212 x 84` |+| 开启 | 日期, token 数, "用量强度"分段条, 会话总数, 对话轮次, 子智能体, 工具调用, 权限请求, 上下文压缩 | `212 x 189` |-| Hook 状态 | tooltip 内容 | 尺寸 |-| --------- | ---------------------------------------------------------------------------- | ----------- |-| 关闭 | 日期和 token 数 | `92 x 40` |-| 开启 | 日期, token 数, 会话总数, 对话轮次, 子智能体, 工具调用, 权限请求, 上下文压缩 | `132 x 116` |+Hook 开启且当天没有 token bucket 时, 今天的 token 数显示 `--`。日期使用 `AnimatedDateText` 做数字滚动, token 数使用 `TokenCountText` 并保留数字和单位宽度。更新时间行:@@ -538,7 +553,7 @@ sequenceDiagramparticipant HookApp as Hook 记录进程participant Store as 本机事件存储participant Stats as 统计维护- participant Tooltip as 热力图提示+ participant Detail as 热力图详情面板User->>Settings: 打开启用 HookSettings->>Config: 请求写入 Hook 配置@@ -590,11 +605,11 @@ sequenceDiagramStats->>Stats: 合并事件计数, 会话去重和工具统计alt 单日维护失败Stats->>Store: 标记当天下次重建- Stats-->>Tooltip: 继续使用已有聚合或空数据+ Stats-->>Detail: 继续使用已有聚合或空数据else 维护成功Stats->>Store: 原子写回每日聚合Stats->>Store: 更新维护状态并清理过期事件- Stats-->>Tooltip: 展示最新统计+ Stats-->>Detail: 展示最新统计endend```@@ -769,14 +784,16 @@ App 再次成为 active 时, 也会刷新 Codex 版本区| --------------- | ---------------------------------------------------- | ------------------------------------ || 开机自动启动 | `SMAppService.mainApp.status` | `register()` / `unregister()` || 自动检查更新 | Sparkle updater | 设置 `automaticallyChecksForUpdates` |+| 使用快捷键 | `GlobalHotKeySettings.shortcut` | 写入 `UserDefaults` 并注册 hot key || 启用 Codex Hook | `~/.codex/hooks.json` | 追加或移除当前 CodexBar command hook || CodexBar 版本 | Bundle + AppUpdater 状态 | 有更新状态时优先显示动态消息 || Codex 版本 | `CodexCLIVersionSnapshot` + 当前 app-server 握手信息 | 路径点击复制到剪贴板 |错误显示:-- 开机启动失败显示在底部状态区-- Hook 设置失败显示在底部状态区+- 开机启动失败和 Hook 设置失败显示在设置组与底部按钮组之间的独立错误组+- 没有登录项或 Hook 错误时不渲染错误组+- 快捷键无法识别, 规则不合法或注册冲突显示在快捷键行内- 更新检查状态显示在 CodexBar 版本行- Hook 开关说明只展示辅助说明, 不展示启用或关闭状态文案diff --git a/appcast.xml b/appcast.xmlindex c6688e7..63bd8dd 100644--- a/appcast.xml+++ b/appcast.xml@@ -7,6 +7,15 @@<link>https://codexbar.zabrian.app/appcast.xml</link><description>CodexBar appcast feed</description><language>zh-CN</language>+ <item>+ <title>CodexBar.app 2.4.3</title>+ <sparkle:version>19</sparkle:version>+ <sparkle:shortVersionString>2.4.3</sparkle:shortVersionString>+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#2.4.3</sparkle:releaseNotesLink>+ <pubDate>Mon, 22 Jun 2026 22:57:37 +0800</pubDate>+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v2.4.3.dmg" sparkle:edSignature="CMho4+yF++HMGdebevoxoS12vtvTDefc89Lu++musO9/3/rC7SE8ZRIHHqrn1YXqaS24kkwsKuXZNluMudlfAw==" length="3020530" type="application/octet-stream"/>+ </item><item><title>CodexBar.app 2.4.2</title><sparkle:version>18</sparkle:version>