CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
chore: 清理侧边面板与构建产物
Bobf4096443c4bd
diff --git a/AGENTS.md b/AGENTS.mdindex 0605125..8b5b765 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -92,7 +92,7 @@ Codex Hook目录职责:- `App/`: 入口和全局启动分支。-- `Controllers/`: 菜单栏、菜单面板、设置窗口和日志窗口控制。+- `Controllers/`: 菜单栏、菜单面板、侧边 child panel、设置窗口和日志窗口控制。- `Models/`: account、quota、usage、workflow、共享日期网格和错误模型。- `Services/`: app-server、Codex CLI、设置、Hook 统计、更新和日志服务。- `Views/`: 菜单面板、设置、日志和共享 Liquid Glass 样式。@@ -198,6 +198,7 @@ Hook 统计的配置、存储、保留策略和统计口径见 [Docs/CodexHook.m- token 区域还显示「当前连胜」、「最长连胜」和「最长任务」。- 热力图是近 30 周、30 列 x 7 行、周日到周六排列; Codex Hook 开启时包含今天, Hook 关闭时仅在 app-server 已返回当天 token bucket 时包含今天。- 热力图 hover 使用 `HeatmapDetailPanelController` 展示侧边详情面板, 不是菜单面板内 tooltip; 面板作为菜单面板 child window, 不接收鼠标事件, 左右贴边展示并在屏幕可见区域内夹紧。热力图详情面板和重置次数详情面板都被 `MenuSurfaceDismissMonitor` 视为允许点击区域。+- 热力图详情面板和重置次数详情面板共用 `SidePanelSupport.swift` 中的 `NonactivatingSidePanel`、`SidePanelDrawerAnimator` 和定位/挂载/layer 辅助逻辑; 修改 child panel attach/orderOut、抽屉动画、圆角 layer 或左右定位语义时必须同步检查两个控制器。- 详情面板内容更新时保留 `NSPanel` / `NSHostingController`, 但每次替换 `hostingController.rootView` 并同步 `setContentSize`; 不用常驻 `ObservableObject` model 推送 hover context, 避免 Hook 开关切换 token-only / workflow 布局后触发 AppKit 递归布局。- Hook 关闭时详情面板显示日期、token 数和「用量强度」分段条, 尺寸 `212 x 84`。- Hook 开启时详情面板首行左侧显示日期、右侧显示 token 数, 当天 token 数显示 `--`; 后续显示「用量强度」、「会话总数」、「对话轮次」、「子智能体」、「工具调用」、「权限请求」、「上下文压缩」, 尺寸 `212 x 189`。@@ -253,9 +254,10 @@ Hook 统计的配置、存储、保留策略和统计口径见 [Docs/CodexHook.m## 发布脚本+- `Scripts/build.sh [options] [Output.app]` 生成 Developer ID App, 默认输出 `build/CodexBar.app`; 成功校验最终 App 后清理 `build/` 下 archive、DerivedData 等中间产物, 默认只保留 `.app`; 构建、notary 或校验失败时保留中间产物便于排查。- `Scripts/dmg.sh [App.app] [Output.dmg]` 创建带 `/Applications` Finder alias 的 DMG, 会尝试写 Finder 布局。- `Scripts/appcast.sh [CodexBar-vX.Y.Z.dmg]` 更新 `appcast.xml`, 需要 Sparkle `sign_update`。-- 改发布脚本后至少运行 `bash -n Scripts/dmg.sh` 和 `bash -n Scripts/appcast.sh`。+- 改发布脚本后至少运行对应脚本的 `bash -n`; 改 DMG 或 appcast 脚本后还要运行 `bash -n Scripts/dmg.sh` 和 `bash -n Scripts/appcast.sh`。- 更新 appcast、tag、push、上传 DMG 都必须先得到用户明确同意。## Git 规则diff --git a/CLAUDE.md b/CLAUDE.mdindex 070e09e..76d7fa8 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -65,11 +65,13 @@ WorkflowHookEventRecorder (--hook-event stdin hook_event_name 子进程)服务层对外暴露 async API,主要共享状态由 actor 隔离:`CodexStatusService` 管理 app-server 连接和缓存,`CodexCLIVersionService` 用 `async let` 并发探测全局/内置版本,`WorkflowService`(actor)串行维护本机统计、`WorkflowStorage`(`nonisolated enum`,与服务同文件)封装 HookEvents 目录与 `stats.lock`。工作流维护/同步刷新的并发由 `WorkflowSyncScheduler`(MainActor,冷却合并 + `isRunning` 串行)单点裁判;`WorkflowViewModel` 不自判维护并发,只执行一次明确的维护刷新(quick-refresh 路径仍走自身 `isRefreshing` + `RefreshTaskCoordinator`,不经 scheduler)。`RequestLogStorage` 可后台同步写入并用 `OSAllocatedUnfairLock` 保护,`RequestLogStore` 只在 MainActor 发布 SwiftUI 快照。`PipeReadBuffer` 是底层 `FileHandle` / `DispatchSourceRead` / semaphore 的唯一 `@unchecked Sendable` 边界。+热力图详情和重置次数详情的 nonactivating child panel、抽屉动画、child window 挂载、圆角 layer 和左右定位共用 `CodexBar/Controllers/SidePanelSupport.swift`;两个具体 controller 主要保留各自的触发、内容尺寸、锚点校验、状态编排和互斥状态。+## 外部依赖与更新- 唯一外部依赖:Sparkle(SwiftPM)。- `AppUpdater` 初始化先校验 `SUFeedURL` 与 `SUPublicEDKey`,缺失则不创建 updater 并提示「未配置更新资源」。当前 `SUFeedURL = https://codexbar.zabrian.app/appcast.xml`。-- 发布:`Scripts/dmg.sh` 打 DMG、`Scripts/appcast.sh` 更新 `appcast.xml`(需 Sparkle `sign_update`)。tag、push、上传 DMG、改 appcast **均需用户明确同意**。+- 发布:`Scripts/build.sh` 生成 Developer ID App, 成功后 `build/` 默认只保留最终 `.app`; `Scripts/dmg.sh` 打 DMG;`Scripts/appcast.sh` 更新 `appcast.xml`(需 Sparkle `sign_update`)。tag、push、上传 DMG、改 appcast **均需用户明确同意**。## Gitdiff --git a/CodexBar.xcodeproj/project.pbxproj b/CodexBar.xcodeproj/project.pbxprojindex b3ce10e..5e9f46c 100644--- a/CodexBar.xcodeproj/project.pbxproj+++ b/CodexBar.xcodeproj/project.pbxproj@@ -282,7 +282,7 @@"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";CODE_SIGN_STYLE = Automatic;COMBINE_HIDPI_IMAGES = YES;- CURRENT_PROJECT_VERSION = 35;+ CURRENT_PROJECT_VERSION = 36;DEAD_CODE_STRIPPING = YES;DEVELOPMENT_TEAM = 4KJ362VJW5;ENABLE_APP_INTENTS_METADATA_GENERATION = NO;@@ -298,7 +298,7 @@"$(inherited)","@executable_path/../Frameworks",);- MARKETING_VERSION = 3.2.7;+ MARKETING_VERSION = 3.2.8;PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;PRODUCT_NAME = "$(TARGET_NAME)";REGISTER_APP_GROUPS = YES;@@ -321,7 +321,7 @@"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";CODE_SIGN_STYLE = Automatic;COMBINE_HIDPI_IMAGES = YES;- CURRENT_PROJECT_VERSION = 35;+ CURRENT_PROJECT_VERSION = 36;DEAD_CODE_STRIPPING = YES;DEVELOPMENT_TEAM = 4KJ362VJW5;ENABLE_APP_INTENTS_METADATA_GENERATION = NO;@@ -337,7 +337,7 @@"$(inherited)","@executable_path/../Frameworks",);- MARKETING_VERSION = 3.2.7;+ MARKETING_VERSION = 3.2.8;PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;PRODUCT_NAME = "$(TARGET_NAME)";PROVISIONING_PROFILE_SPECIFIER = "";diff --git a/CodexBar/Controllers/HeatmapDetailPanelController.swift b/CodexBar/Controllers/HeatmapDetailPanelController.swiftindex feb4ffd..f41676c 100644--- a/CodexBar/Controllers/HeatmapDetailPanelController.swift+++ b/CodexBar/Controllers/HeatmapDetailPanelController.swift@@ -2,22 +2,18 @@ import AppKitimport QuartzCoreimport SwiftUI-/// 详情面板不接收焦点, 只作为菜单面板的跟随子窗口-private final class DetailPanel: NSPanel {- override var canBecomeKey: Bool {- false- }-- override var canBecomeMain: Bool {- false- }-}-/// 热力图 hover 详情控制器, 负责左右贴边定位和抽屉式切换动画@MainActorfinal class HeatmapDetailPanelController {private var panel: NSPanel?private var hostingController: NSHostingController<UsageHeatmapDayDetailView>?+ private lazy var drawerAnimator = SidePanelDrawerAnimator(+ contentViewProvider: { [weak self] in+ self?.hostingController?.view+ },+ animationKey: Metrics.drawerTransformAnimationKey,+ overscan: Metrics.drawerOverscan+ )private var hideTask: Task<Void, Never>?private var currentSide = UsageHeatmapDetailSide.leftprivate var visibilityGeneration = 0@@ -62,7 +58,7 @@ final class HeatmapDetailPanelController {}guard !immediate else {- resetDrawerVisualState(for: panel)+ drawerAnimator.resetVisualState(for: panel)drawerTransition = .idleorderOut(panel)return@@ -84,8 +80,8 @@ final class HeatmapDetailPanelController {}drawerTransition = .exiting- let hidden = drawerHiddenTranslation(for: side, panelWidth: panel.frame.width)- animateContentTranslation(+ let hidden = drawerAnimator.hiddenTranslation(for: side, panelWidth: panel.frame.width)+ drawerAnimator.animateTranslation(to: hidden,duration: Metrics.drawerExitDuration,timing: .easeIn@@ -97,7 +93,7 @@ final class HeatmapDetailPanelController {}orderOut(panel)- setContentTranslation(0)+ drawerAnimator.setTranslation(0)drawerTransition = .idlehideTask = nil}@@ -132,7 +128,7 @@ final class HeatmapDetailPanelController {panel.level = menuSurfaceWindow.leveldefer {- restoreMenuSurfaceKeyWindow(menuSurfaceWindow)+ SidePanelSupport.restoreMenuSurfaceKeyWindow(menuSurfaceWindow)}if wasVisible {@@ -169,25 +165,36 @@ final class HeatmapDetailPanelController {returncase .exiting:drawerTransition = .idle- animateContentTranslation(to: 0, duration: Metrics.drawerEnterDuration, timing: .easeOut)+ drawerAnimator.animateTranslation(to: 0, duration: Metrics.drawerEnterDuration, timing: .easeOut)case .idle, .switchingSide:drawerTransition = .idle- resetDrawerVisualState(for: panel)+ drawerAnimator.resetVisualState(for: panel)}}private func showPanelWithDrawerAnimation(_ panel: NSPanel, relativeTo menuSurfaceWindow: NSWindow) {let generation = visibilityGeneration- let hidden = drawerHiddenTranslation(for: currentSide, panelWidth: panel.frame.width)- setContentTranslation(hidden)+ let hidden = drawerAnimator.hiddenTranslation(for: currentSide, panelWidth: panel.frame.width)+ drawerAnimator.setTranslation(hidden)panel.alphaValue = 0attach(panel, to: menuSurfaceWindow)panel.order(.above, relativeTo: menuSurfaceWindow.windowNumber)drawerTransition = .entering- animateContentTranslationAfterInitialLayout(+ drawerAnimator.animateEntryAfterInitialLayout(from: hidden,panel: panel,- generation: generation+ duration: Metrics.drawerEnterDuration,+ isCurrent: { [weak self] in+ self?.visibilityGeneration == generation+ },+ completion: { [weak self] in+ guard let self else {+ return+ }++ drawerTransition = .idle+ drawerAnimator.setTranslation(0)+ })}@@ -201,8 +208,8 @@ final class HeatmapDetailPanelController {drawerTransition = .switchingSidependingSideSwitchRequest = nil- let hidden = drawerHiddenTranslation(for: sourceSide, panelWidth: panel.frame.width)- animateContentTranslation(+ let hidden = drawerAnimator.hiddenTranslation(for: sourceSide, panelWidth: panel.frame.width)+ drawerAnimator.animateTranslation(to: hidden,duration: Metrics.drawerExitDuration,timing: .easeIn@@ -226,12 +233,12 @@ final class HeatmapDetailPanelController {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)+ let hidden = drawerAnimator.hiddenTranslation(for: side, panelWidth: request.position.frame.width)+ drawerAnimator.setTranslation(hidden)apply(request, to: panel)- setContentTranslation(hidden)+ drawerAnimator.setTranslation(hidden)- animateContentTranslation(+ drawerAnimator.animateTranslation(from: hidden,to: 0,duration: Metrics.drawerEnterDuration,@@ -245,7 +252,7 @@ final class HeatmapDetailPanelController {}drawerTransition = .idle- setContentTranslation(0)+ drawerAnimator.setTranslation(0)handlePendingSideSwitchRequest(on: panel)}}@@ -272,7 +279,7 @@ final class HeatmapDetailPanelController {beginSideSwitch(on: panel, from: currentSide, to: pendingSideSwitchRequest)} else {apply(pendingSideSwitchRequest, to: panel)- resetDrawerVisualState(for: panel)+ drawerAnimator.resetVisualState(for: panel)}}@@ -281,7 +288,7 @@ final class HeatmapDetailPanelController {return panel}- let panel = DetailPanel(+ let panel = NonactivatingSidePanel(contentRect: NSRect(origin: .zero, size: UsageHeatmapDayDetailView.panelSize(showsWorkflow: true)),styleMask: [.borderless, .nonactivatingPanel],backing: .buffered,@@ -302,27 +309,11 @@ final class HeatmapDetailPanelController {private func attach(_ panel: NSPanel, to parentWindow: NSWindow) {menuSurfaceWindow = parentWindow- guard panel.parent !== parentWindow else {- return- }-- panel.parent?.removeChildWindow(panel)- parentWindow.addChildWindow(panel, ordered: .above)+ SidePanelSupport.attach(panel, to: parentWindow)}private func orderOut(_ panel: NSPanel) {- let parentWindow = panel.parent ?? menuSurfaceWindow- panel.orderOut(nil)- parentWindow?.removeChildWindow(panel)- restoreMenuSurfaceKeyWindow(parentWindow)- }-- private func restoreMenuSurfaceKeyWindow(_ menuSurfaceWindow: NSWindow?) {- guard NSApplication.shared.isActive else {- return- }-- menuSurfaceWindow?.makeKey()+ SidePanelSupport.orderOut(panel, menuSurfaceWindow: menuSurfaceWindow)}private func updateContent(_ context: UsageHeatmapHoverContext) {@@ -338,23 +329,14 @@ final class HeatmapDetailPanelController {self.hostingController = hostingController}- configurePanelLayers()+ SidePanelSupport.configureLayers(+ hostingView: hostingController?.view,+ contentView: panel?.contentView,+ cornerRadius: UsageHeatmapDayDetailView.panelCornerRadius+ )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)@@ -362,14 +344,6 @@ final class HeatmapDetailPanelController {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 menuSurfaceWindow: NSWindow,@@ -380,25 +354,25 @@ final class HeatmapDetailPanelController {preferredSide: UsageHeatmapDetailSide) -> PanelPosition {// 优先贴在请求侧, 空间不足时换边, 最后仍夹紧到屏幕可见区域- let menuSurfaceFrame = contentScreenFrame(for: contentView, in: menuSurfaceWindow) ?? menuSurfaceWindow.frame+ let menuSurfaceFrame = SidePanelSupport.contentScreenFrame(for: contentView, in: menuSurfaceWindow) ?? menuSurfaceWindow.framelet visibleFrame = (menuSurfaceWindow.screen ?? NSScreen.main)?.visibleFrame ?? menuSurfaceFramelet leftX = menuSurfaceFrame.minX - Metrics.panelGap - panelSize.widthlet rightX = menuSurfaceFrame.maxX + Metrics.panelGap- let horizontal = horizontalPlacement(+ let horizontal = SidePanelSupport.horizontalPlacement(preferredSide: preferredSide,- left: HorizontalPlacement(+ left: SidePanelHorizontalPlacement(x: leftX,side: .left,isAvailable: leftX >= visibleFrame.minX + Metrics.screenPadding),- right: HorizontalPlacement(+ right: SidePanelHorizontalPlacement(x: rightX,side: .right,isAvailable: rightX + panelSize.width <= visibleFrame.maxX - Metrics.screenPadding))- let x = clamped(+ let x = SidePanelSupport.clamped(horizontal.x,lower: visibleFrame.minX + Metrics.screenPadding,upper: visibleFrame.maxX - panelSize.width - Metrics.screenPadding@@ -419,7 +393,7 @@ final class HeatmapDetailPanelController {return PanelPosition(frame: frame,- side: actualSide(+ side: SidePanelSupport.actualSide(forX: x,panelWidth: panelSize.width,menuSurfaceFrame: menuSurfaceFrame,@@ -446,168 +420,18 @@ final class HeatmapDetailPanelController {menuSurfaceFrame.midY - panelSize.height / 2}- return clamped(+ return SidePanelSupport.clamped(proposedY,lower: max(visibleFrame.minY + Metrics.screenPadding, menuSurfaceFrame.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,- menuSurfaceFrame: CGRect,- fallback: UsageHeatmapDetailSide- ) -> UsageHeatmapDetailSide {- if x + panelWidth <= menuSurfaceFrame.minX {- return .left- }- if x >= menuSurfaceFrame.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 == visibilityGeneration else {- return- }-- setContentTranslation(hiddenTranslationX)- panel.contentView?.layoutSubtreeIfNeeded()- panel.displayIfNeeded()- CATransaction.flush()- panel.alphaValue = 1- animateContentTranslation(- from: hiddenTranslationX,- to: 0,- duration: Metrics.drawerEnterDuration,- timing: .easeOut- ) {- Task { @MainActor [weak self] in- guard let self,- generation == visibilityGeneration else {- return- }-- drawerTransition = .idle- setContentTranslation(0)- }- }- }- }-- 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 = 4static let screenPadding: CGFloat = 8@@ -630,12 +454,6 @@ final class HeatmapDetailPanelController {let side: UsageHeatmapDetailSide}- private struct HorizontalPlacement {- let x: CGFloat- let side: UsageHeatmapDetailSide- let isAvailable: Bool- }-private struct PanelRequest {let context: UsageHeatmapHoverContextlet position: PanelPositiondiff --git a/CodexBar/Controllers/ResetCreditsPanelController.swift b/CodexBar/Controllers/ResetCreditsPanelController.swiftindex 8b26924..f575278 100644--- a/CodexBar/Controllers/ResetCreditsPanelController.swift+++ b/CodexBar/Controllers/ResetCreditsPanelController.swift@@ -2,22 +2,18 @@ import AppKitimport QuartzCoreimport SwiftUI-/// 重置次数详情面板不接收焦点, 只作为菜单面板的跟随子窗口-private final class ResetCreditsPanel: NSPanel {- override var canBecomeKey: Bool {- false- }-- override var canBecomeMain: Bool {- false- }-}-/// 重置次数详情控制器, 复用热力图详情的侧边抽屉动效@MainActorfinal class ResetCreditsPanelController {private var panel: NSPanel?private var hostingController: NSHostingController<ResetCreditsPanelView>?+ private lazy var drawerAnimator = SidePanelDrawerAnimator(+ contentViewProvider: { [weak self] in+ self?.hostingController?.view+ },+ animationKey: Metrics.drawerTransformAnimationKey,+ overscan: Metrics.drawerOverscan+ )private var visibilityGeneration = 0private var currentSide = UsageHeatmapDetailSide.rightprivate weak var menuSurfaceWindow: NSWindow?@@ -59,15 +55,15 @@ final class ResetCreditsPanelController {}guard !immediate else {- resetDrawerVisualState(for: panel)+ drawerAnimator.resetVisualState(for: panel)orderOut(panel)return}let generation = visibilityGenerationlet side = currentSide- let hidden = drawerHiddenTranslation(for: side, panelWidth: panel.frame.width)- animateContentTranslation(+ let hidden = drawerAnimator.hiddenTranslation(for: side, panelWidth: panel.frame.width)+ drawerAnimator.animateTranslation(to: hidden,duration: Metrics.drawerExitDuration,timing: .easeIn@@ -79,7 +75,7 @@ final class ResetCreditsPanelController {}orderOut(panel)- setContentTranslation(0)+ drawerAnimator.setTranslation(0)}}}@@ -95,7 +91,7 @@ final class ResetCreditsPanelController {}let panel = ensurePanel()- let menuSurfaceFrame = contentScreenFrame(for: contentView, in: menuSurfaceWindow) ?? menuSurfaceWindow.frame+ let menuSurfaceFrame = SidePanelSupport.contentScreenFrame(for: contentView, in: menuSurfaceWindow) ?? menuSurfaceWindow.framelet alignmentScreenFrame = validAlignmentScreenFrame(context.alignmentScreenFrame,menuSurfaceFrame: menuSurfaceFrame@@ -118,7 +114,7 @@ final class ResetCreditsPanelController {panel.level = menuSurfaceWindow.leveldefer {- restoreMenuSurfaceKeyWindow(menuSurfaceWindow)+ SidePanelSupport.restoreMenuSurfaceKeyWindow(menuSurfaceWindow)}visibilityGeneration += 1@@ -131,7 +127,7 @@ final class ResetCreditsPanelController {return panel}- let panel = ResetCreditsPanel(+ let panel = NonactivatingSidePanel(contentRect: NSRect(origin: .zero,size: ResetCreditsPanelView.initialPanelSize@@ -165,7 +161,11 @@ final class ResetCreditsPanelController {self.hostingController = hostingController}- configurePanelLayers()+ SidePanelSupport.configureLayers(+ hostingView: hostingController?.view,+ contentView: panel?.contentView,+ cornerRadius: ResetCreditsPanelView.panelCornerRadius+ )panel?.setContentSize(size)}@@ -183,62 +183,31 @@ final class ResetCreditsPanelController {private func showPanelWithDrawerAnimation(_ panel: NSPanel, relativeTo menuSurfaceWindow: NSWindow) {let generation = visibilityGeneration- let hidden = drawerHiddenTranslation(for: currentSide, panelWidth: panel.frame.width)- setContentTranslation(hidden)+ let hidden = drawerAnimator.hiddenTranslation(for: currentSide, panelWidth: panel.frame.width)+ drawerAnimator.setTranslation(hidden)panel.alphaValue = 0attach(panel, to: menuSurfaceWindow)panel.order(.above, relativeTo: menuSurfaceWindow.windowNumber)- animateContentTranslationAfterInitialLayout(+ drawerAnimator.animateEntryAfterInitialLayout(from: hidden,panel: panel,- generation: generation+ duration: Metrics.drawerEnterDuration,+ isCurrent: { [weak self] in+ self?.visibilityGeneration == generation+ },+ completion: { [weak self] in+ self?.drawerAnimator.setTranslation(0)+ })}private func attach(_ panel: NSPanel, to parentWindow: NSWindow) {menuSurfaceWindow = parentWindow- guard panel.parent !== parentWindow else {- return- }-- panel.parent?.removeChildWindow(panel)- parentWindow.addChildWindow(panel, ordered: .above)+ SidePanelSupport.attach(panel, to: parentWindow)}private func orderOut(_ panel: NSPanel) {- let parentWindow = panel.parent ?? menuSurfaceWindow- panel.orderOut(nil)- parentWindow?.removeChildWindow(panel)- restoreMenuSurfaceKeyWindow(parentWindow)- }-- private func restoreMenuSurfaceKeyWindow(_ menuSurfaceWindow: NSWindow?) {- guard NSApplication.shared.isActive else {- return- }-- menuSurfaceWindow?.makeKey()- }-- 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 configurePanelLayer(for view: NSView) {- view.wantsLayer = true- view.layer?.backgroundColor = NSColor.clear.cgColor- view.layer?.masksToBounds = true- view.layer?.cornerRadius = ResetCreditsPanelView.panelCornerRadius- view.layer?.cornerCurve = .continuous+ SidePanelSupport.orderOut(panel, menuSurfaceWindow: menuSurfaceWindow)}private func panelPosition(@@ -250,26 +219,26 @@ final class ResetCreditsPanelController {) -> PanelPosition {let leftX = menuSurfaceFrame.minX - Metrics.panelGap - panelSize.widthlet rightX = menuSurfaceFrame.maxX + Metrics.panelGap- let horizontal = horizontalPlacement(+ let horizontal = SidePanelSupport.horizontalPlacement(preferredSide: preferredSide,- left: HorizontalPlacement(+ left: SidePanelHorizontalPlacement(x: leftX,side: .left,isAvailable: leftX >= visibleFrame.minX + Metrics.screenPadding),- right: HorizontalPlacement(+ right: SidePanelHorizontalPlacement(x: rightX,side: .right,isAvailable: rightX + panelSize.width <= visibleFrame.maxX - Metrics.screenPadding))- let x = clamped(+ let x = SidePanelSupport.clamped(horizontal.x,lower: visibleFrame.minX + Metrics.screenPadding,upper: visibleFrame.maxX - panelSize.width - Metrics.screenPadding)- let y = clamped(+ let y = SidePanelSupport.clamped(proposedY(for: panelSize,menuSurfaceFrame: menuSurfaceFrame,@@ -282,7 +251,7 @@ final class ResetCreditsPanelController {return PanelPosition(frame: frame,- side: actualSide(+ side: SidePanelSupport.actualSide(forX: x,panelWidth: panelSize.width,menuSurfaceFrame: menuSurfaceFrame,@@ -349,155 +318,6 @@ final class ResetCreditsPanelController {&& frame.height > 0}- 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,- menuSurfaceFrame: CGRect,- fallback: UsageHeatmapDetailSide- ) -> UsageHeatmapDetailSide {- if x + panelWidth <= menuSurfaceFrame.minX {- return .left- }- if x >= menuSurfaceFrame.maxX {- return .right- }- return fallback- }-- 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 == visibilityGeneration else {- return- }-- setContentTranslation(hiddenTranslationX)- panel.contentView?.layoutSubtreeIfNeeded()- panel.displayIfNeeded()- CATransaction.flush()- panel.alphaValue = 1- animateContentTranslation(- from: hiddenTranslationX,- to: 0,- duration: Metrics.drawerEnterDuration,- timing: .easeOut- ) {- Task { @MainActor [weak self] in- guard let self,- generation == visibilityGeneration else {- return- }-- setContentTranslation(0)- }- }- }- }-- 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 = 4static let screenPadding: CGFloat = 8@@ -512,10 +332,4 @@ final class ResetCreditsPanelController {let frame: NSRectlet side: UsageHeatmapDetailSide}-- private struct HorizontalPlacement {- let x: CGFloat- let side: UsageHeatmapDetailSide- let isAvailable: Bool- }}diff --git a/CodexBar/Controllers/SidePanelSupport.swift b/CodexBar/Controllers/SidePanelSupport.swiftnew file mode 100644index 0000000..363951b--- /dev/null+++ b/CodexBar/Controllers/SidePanelSupport.swift@@ -0,0 +1,240 @@+import AppKit+import QuartzCore++/// 侧边详情面板不接收焦点, 只作为菜单面板的跟随子窗口+@MainActor+final class NonactivatingSidePanel: NSPanel {+ override var canBecomeKey: Bool {+ false+ }++ override var canBecomeMain: Bool {+ false+ }+}++@MainActor+final class SidePanelDrawerAnimator {+ private let contentViewProvider: @MainActor () -> NSView?+ private let animationKey: String+ private let overscan: CGFloat++ init(+ contentViewProvider: @escaping @MainActor () -> NSView?,+ animationKey: String,+ overscan: CGFloat+ ) {+ self.contentViewProvider = contentViewProvider+ self.animationKey = animationKey+ self.overscan = overscan+ }++ func hiddenTranslation(for side: UsageHeatmapDetailSide, panelWidth: CGFloat) -> CGFloat {+ let distance = panelWidth + overscan+ switch side {+ case .left:+ return distance+ case .right:+ return -distance+ }+ }++ func setTranslation(_ translationX: CGFloat) {+ guard let layer = contentViewProvider()?.layer else {+ return+ }++ CATransaction.begin()+ CATransaction.setDisableActions(true)+ layer.removeAnimation(forKey: animationKey)+ layer.transform = CATransform3DMakeTranslation(translationX, 0, 0)+ CATransaction.commit()+ }++ func animateTranslation(+ from fromTranslationX: CGFloat? = nil,+ to translationX: CGFloat,+ duration: TimeInterval,+ timing: CAMediaTimingFunctionName,+ completion: (() -> Void)? = nil+ ) {+ guard let layer = contentViewProvider()?.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: animationKey)+ layer.transform = targetTransform++ CATransaction.commit()+ }++ func animateEntryAfterInitialLayout(+ from hiddenTranslationX: CGFloat,+ panel: NSPanel,+ duration: TimeInterval,+ isCurrent: @escaping @MainActor () -> Bool,+ completion: @escaping @MainActor () -> Void+ ) {+ panel.contentView?.layoutSubtreeIfNeeded()+ panel.displayIfNeeded()+ CATransaction.flush()++ Task { @MainActor [weak self, weak panel] in+ await Task.yield()+ // 过期请求的隐藏和清理由调用方的 generation 流程负责。+ guard let self,+ let panel,+ panel.isVisible,+ isCurrent() else {+ return+ }++ setTranslation(hiddenTranslationX)+ panel.contentView?.layoutSubtreeIfNeeded()+ panel.displayIfNeeded()+ CATransaction.flush()+ panel.alphaValue = 1+ animateTranslation(+ from: hiddenTranslationX,+ to: 0,+ duration: duration,+ timing: .easeOut+ ) {+ Task { @MainActor in+ guard isCurrent() else {+ return+ }++ completion()+ }+ }+ }+ }++ func resetVisualState(for panel: NSPanel) {+ setTranslation(0)+ panel.alphaValue = 1+ }+}++@MainActor+enum SidePanelSupport {+ static func attach(_ panel: NSPanel, to parentWindow: NSWindow) {+ guard panel.parent !== parentWindow else {+ return+ }++ panel.parent?.removeChildWindow(panel)+ parentWindow.addChildWindow(panel, ordered: .above)+ }++ static func orderOut(_ panel: NSPanel, menuSurfaceWindow: NSWindow?) {+ let parentWindow = panel.parent ?? menuSurfaceWindow+ panel.orderOut(nil)+ parentWindow?.removeChildWindow(panel)+ restoreMenuSurfaceKeyWindow(parentWindow)+ }++ static func restoreMenuSurfaceKeyWindow(_ menuSurfaceWindow: NSWindow?) {+ guard NSApplication.shared.isActive else {+ return+ }++ menuSurfaceWindow?.makeKey()+ }++ static func configureLayers(+ hostingView: NSView?,+ contentView: NSView?,+ cornerRadius: CGFloat+ ) {+ if let hostingView {+ configureLayer(for: hostingView, cornerRadius: cornerRadius)+ }++ if let contentView {+ configureLayer(for: contentView, cornerRadius: cornerRadius)+ if let frameView = contentView.superview {+ configureLayer(for: frameView, cornerRadius: cornerRadius)+ }+ }+ }++ static 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+ }++ static func clamped(_ value: CGFloat, lower: CGFloat, upper: CGFloat) -> CGFloat {+ guard lower <= upper else {+ return lower+ }++ return min(max(value, lower), upper)+ }++ static func horizontalPlacement(+ preferredSide: UsageHeatmapDetailSide,+ left: SidePanelHorizontalPlacement,+ right: SidePanelHorizontalPlacement+ ) -> SidePanelHorizontalPlacement {+ let primary = preferredSide == .left ? left : right+ let fallback = preferredSide == .left ? right : left++ if primary.isAvailable {+ return primary+ }+ return fallback.isAvailable ? fallback : primary+ }++ static func actualSide(+ forX x: CGFloat,+ panelWidth: CGFloat,+ menuSurfaceFrame: CGRect,+ fallback: UsageHeatmapDetailSide+ ) -> UsageHeatmapDetailSide {+ if x + panelWidth <= menuSurfaceFrame.minX {+ return .left+ }+ if x >= menuSurfaceFrame.maxX {+ return .right+ }+ return fallback+ }++ private static func configureLayer(for view: NSView, cornerRadius: CGFloat) {+ view.wantsLayer = true+ view.layer?.backgroundColor = NSColor.clear.cgColor+ view.layer?.masksToBounds = true+ view.layer?.cornerRadius = cornerRadius+ view.layer?.cornerCurve = .continuous+ }+}++nonisolated struct SidePanelHorizontalPlacement {+ let x: CGFloat+ let side: UsageHeatmapDetailSide+ let isAvailable: Bool+}diff --git a/Docs/CodexHook.md b/Docs/CodexHook.mdindex 8b8506b..a2c7029 100644--- a/Docs/CodexHook.md+++ b/Docs/CodexHook.md@@ -292,7 +292,7 @@ UI 不直接展示所有原始字段,而是先生成 `WorkflowDailyMetrics`:用量热力图固定为近 30 周、30 列 x 7 行、周日到周六排列。`account/usage/read` 返回当天 `dailyUsageBuckets` 时, 热力图展示今天的小方块和对应 token 数; 没有当天 bucket 时再按 Hook 开关决定是否包含今天。-热力图 hover 时不在菜单面板内绘制旧式 tooltip, 而是通过 `UsageHeatmapHoverContext` 通知 `HeatmapDetailPanelController` 展示侧边详情面板。指针会吸附到最近方块, 离开热力图后延迟 160 ms 清除选中状态。+热力图 hover 时不在菜单面板内绘制旧式 tooltip, 而是通过 `UsageHeatmapHoverContext` 通知 `HeatmapDetailPanelController` 展示侧边详情面板。指针会吸附到最近方块, 离开热力图后 `UsageHeatmap` 延迟 160 ms 清除选中状态; 控制器收到空 hover context 后默认再延迟 220 ms 收起侧边详情面板, 菜单关闭或互斥面板切换时走立即隐藏。热力图详情面板和额度区的重置次数详情面板互斥。hover 热力图时会隐藏重置次数详情面板; 点击重置次数按钮时会立即隐藏热力图详情面板。@@ -304,6 +304,7 @@ UI 不直接展示所有原始字段,而是先生成 `WorkflowDailyMetrics`:- 与菜单面板之间保留 `4` px gap- 侧边切换使用抽屉动画: 收起 `0.12` 秒, 展开 `0.18` 秒- 内容更新保留 `NSPanel` / `NSHostingController`, 但每次替换 `hostingController.rootView` 并同步 `setContentSize`; 不使用常驻 `ObservableObject` model 复用 SwiftUI 布局树, 避免 Hook 开关切换详情面板高度后触发 AppKit 递归布局+- nonactivating panel、抽屉动画、child window 挂载、圆角 layer 和左右定位的共用实现位于 `SidePanelSupport.swift`, 同时服务热力图详情面板和重置次数详情面板Codex Hook 关闭时:diff --git a/Docs/DevelopmentGuide.md b/Docs/DevelopmentGuide.mdindex e4718d4..85b3c38 100644--- a/Docs/DevelopmentGuide.md+++ b/Docs/DevelopmentGuide.md@@ -24,7 +24,7 @@ App 通过本机 Codex app-server 读取账号, 额度和 token 用量, 通过 C| 目录 | 职责 || ----------------------- | ----------------------------------------------------------------------- || `CodexBar/App/` | SwiftUI 入口和 AppDelegate 启动分支 |-| `CodexBar/Controllers/` | 菜单栏, 菜单面板, 设置窗口, 日志窗口和窗口行为 |+| `CodexBar/Controllers/` | 菜单栏, 菜单面板, 侧边 child panel, 设置窗口, 日志窗口和窗口行为 || `CodexBar/Models/` | account, quota, usage, workflow, 日期网格和错误模型 || `CodexBar/Services/` | app-server, Codex CLI 解析, 版本探测, Hook 设置, 统计维护, 更新, 登录项 || `CodexBar/Views/` | 菜单面板, 设置窗口, 日志窗口和共享 Liquid Glass 样式 |@@ -157,6 +157,8 @@ Command-Space 不直接关闭菜单面板, 只短暂抑制 600 ms 内的 active热力图详情面板和重置次数详情面板都会通过 `containsScreenPoint(_:)` 告诉关闭监听器自己的屏幕区域, 因此点击这些 child panel 内部不会触发主菜单面板关闭。重置次数详情面板可接收鼠标事件用于滚动; 热力图详情面板不接收鼠标事件。+两个侧边详情面板的共同行为集中在 `CodexBar/Controllers/SidePanelSupport.swift`: `NonactivatingSidePanel` 固定不能成为 key/main window, `SidePanelDrawerAnimator` 管理内容 view 的横向抽屉 transform, `SidePanelSupport` 管理 child window 挂载/移除、菜单面板 key window 恢复、圆角 layer 配置、屏幕 frame 换算、左右侧选择和坐标夹紧。`HeatmapDetailPanelController` 主要保留 hover 请求、侧边切换队列和 token/workflow 内容更新; `ResetCreditsPanelController` 主要保留重置次数内容、额度区锚点校验、最大高度和点击切换状态。+设置窗口和日志窗口都继承 `HostingWindowController` 的行为: 懒创建, 关闭后不释放, 重新打开复用, 按当前屏幕居中, 重新打开对应入口时只移动和置前对应窗口。窗口 level 保持 `.normal`; 置前时先恢复 `AuxiliaryHostingWindow.allowsKeyFocus`, 再 `orderFrontRegardless()`, `NSRunningApplication.current.activate(options: [])` 和 `makeKeyAndOrderFront(nil)`, 只做一次性置前, 不持续置顶。CodexBar 是 `LSUIElement` 菜单栏 App, 首次懒创建辅助窗口时需要通过当前运行中应用激活, 避免设置或日志窗口第一次打开时没有稳定拉到最前。设置窗口和日志窗口使用 `AuxiliaryHostingWindow`; 窗口可以成为 key window, 但不能成为 main window。关闭菜单面板期间会临时禁止成为 key window, 避免菜单面板收起时抢焦点。通过快捷键打开或关闭菜单面板时, 只激活并置前当前面板, 不主动置前已有的设置窗口或日志窗口。@@ -571,9 +573,9 @@ flowchart TD- token 文本由 `TokenCountText` 格式化, 1K 以下完整显示, 1K 起显示 K/M/B- 热力图方块强度按当天 token 相对当前 30 周峰值计算, 并用 `pow(percent, 0.62)` 调整视觉强度- hover 时通过 `UsageHeatmapHoverContext` 通知 `HeatmapDetailPanelController` 展示侧边详情面板-- 指针会吸附到最近方块, 吸附动画 0.12 秒; 离开热力图后延迟 160 ms 清除选中状态+- 指针会吸附到最近方块, 吸附动画 0.12 秒; 离开热力图后 `UsageHeatmap` 延迟 160 ms 清除选中状态, 控制器收到空 hover context 后默认再延迟 220 ms 执行侧边面板收起动画-热力图详情面板是菜单面板的 borderless nonactivating child panel, 不接收鼠标事件, 按悬停列优先显示在菜单面板左侧或右侧; 左右空间不足时尝试另一侧, 最终在当前屏幕可见区域内保留 8 px 边距。侧边切换时先以 0.12 秒抽屉动画收起, 再以 0.18 秒展开。热力图详情面板和重置次数详情面板互斥, hover 热力图会立即隐藏重置次数详情面板。+热力图详情面板是菜单面板的 borderless nonactivating child panel, 不接收鼠标事件, 按悬停列优先显示在菜单面板左侧或右侧; 左右空间不足时尝试另一侧, 最终在当前屏幕可见区域内保留 8 px 边距。侧边切换时先以 0.12 秒抽屉动画收起, 再以 0.18 秒展开。热力图详情面板和重置次数详情面板互斥, hover 热力图会立即隐藏重置次数详情面板。nonactivating panel、抽屉 transform、child window 挂载和圆角 layer 配置复用 `SidePanelSupport.swift`。`HeatmapDetailPanelController` 会复用同一个 `NSPanel` 和 `NSHostingController`, 但每次 hover 内容变化时必须替换 `hostingController.rootView` 并同步 `setContentSize`。不要用常驻 `ObservableObject` model 持续推送 `UsageHeatmapHoverContext`; Hook 开关会让详情面板在 `212 x 84` 和 `212 x 189` 两种布局之间切换, 复用同一棵 SwiftUI 布局树容易触发 AppKit constraint/layout 递归。相关回归路径是: 先 hover 出详情面板, 打开设置切换 Hook, 再回到主面板 hover 热力图。@@ -1010,6 +1012,7 @@ App 再次成为 active 时, 也会刷新 Codex 版本区、同步可用性, 并- 将导出的 App 压缩后提交 `xcrun notarytool submit --wait`, 成功后对 App 执行 `stapler staple` 和 `stapler validate`- 通过 `codesign --verify --deep --strict` 校验导出 App 和最终 App; 默认额外执行 `spctl --assess`- 成功后把最终 App 写入 `build/CodexBar.app` 或传入的 `Output.app`; notary 失败时不替换最终 App+- 最终 App 校验通过后清理 `build/` 下的 archive、DerivedData 等中间产物, 默认只保留 `build/CodexBar.app`; 如果构建或 notary 失败, 保留中间产物便于排查- 可用 `--skip-notarization` 只执行 archive/export/signature verify, 便于本地调试脚本`Scripts/dmg.sh [App.app] [Output.dmg]`:diff --git a/Scripts/build.sh b/Scripts/build.shindex 62de146..7264232 100755--- a/Scripts/build.sh+++ b/Scripts/build.sh@@ -29,6 +29,7 @@ usage: Scripts/build.sh [options] [Output.app]Builds a Release archive, exports a Developer ID app, submits it to Applenotarization, staples the ticket, and writes the final app to build/.+After a successful build, build/ keeps only the final .app.Options:--project PATH Xcode project. Defaults to CodexBar.xcodeproj.@@ -421,6 +422,35 @@ clean_build_dir() {mkdir -p "${BUILD_DIR}"}+clean_intermediate_build_artifacts() {+ local output_parent=""+ local output_resolved=""+ local entry=""+ local entry_parent=""+ local entry_resolved=""++ output_parent="$(cd "$(dirname "${OUTPUT_APP_PATH}")" && pwd)"+ output_resolved="${output_parent}/$(basename "${OUTPUT_APP_PATH}")"++ echo "==> Cleaning intermediate build artifacts"+ while IFS= read -r -d '' entry; do+ entry_parent="$(cd "$(dirname "${entry}")" && pwd)"+ entry_resolved="${entry_parent}/$(basename "${entry}")"++ if [[ "${entry_resolved}" == "${output_resolved}" ]]; then+ continue+ fi++ case "${output_resolved}" in+ "${entry_resolved}"/*)+ continue+ ;;+ esac++ safe_remove_path "${entry_resolved}"+ done < <(find "${BUILD_DIR}" -mindepth 1 -maxdepth 1 -print0)+}+write_export_options() {local path="$1"@@ -641,5 +671,7 @@ if [[ "${SKIP_NOTARIZATION}" != "1" && "${SPCTL_ASSESS}" == "1" ]]; thenspctl --assess --type execute --verbose=4 "${OUTPUT_APP_PATH}"fi+clean_intermediate_build_artifacts+echo "==> Built ${OUTPUT_APP_PATH}"echo "==> Next: Scripts/dmg.sh \"${OUTPUT_APP_PATH}\""diff --git a/appcast.xml b/appcast.xmlindex 7a9f865..0995d0c 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 3.2.8</title>+ <sparkle:version>36</sparkle:version>+ <sparkle:shortVersionString>3.2.8</sparkle:shortVersionString>+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#3.2.8</sparkle:releaseNotesLink>+ <pubDate>Tue, 30 Jun 2026 22:23:34 +0800</pubDate>+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v3.2.8.dmg" sparkle:edSignature="ZHmnBkhfSld8TGsxIS2ZrcZNX4MNdEIGfWkUswBdZyz6Rb3GWCiFvrDB/+utQW+MfkfkNSFLif0/UCeM6DHmAQ==" length="3480360" type="application/octet-stream"/>+ </item><item><title>CodexBar.app 3.2.7</title><sparkle:version>35</sparkle:version>