Skip to content

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

feat: 增加任务中心显示设置并发布 3.3.9

Bob73c03ed221d6
diff --git a/CodexBar.xcodeproj/project.pbxproj b/CodexBar.xcodeproj/project.pbxproj
index e7743d4..5fc6b74 100644
--- a/CodexBar.xcodeproj/project.pbxproj
+++ b/CodexBar.xcodeproj/project.pbxproj
@@ -274,7 +274,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 46;
+ CURRENT_PROJECT_VERSION = 47;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 4KJ362VJW5;
ENABLE_APP_INTENTS_METADATA_GENERATION = NO;
@@ -290,7 +290,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MARKETING_VERSION = 3.3.8;
+ MARKETING_VERSION = 3.3.9;
PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;
PRODUCT_NAME = "$(TARGET_NAME)";
REGISTER_APP_GROUPS = YES;
@@ -313,7 +313,7 @@
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 46;
+ CURRENT_PROJECT_VERSION = 47;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = 4KJ362VJW5;
ENABLE_APP_INTENTS_METADATA_GENERATION = NO;
@@ -329,7 +329,7 @@
"$(inherited)",
"@executable_path/../Frameworks",
);
- MARKETING_VERSION = 3.3.8;
+ MARKETING_VERSION = 3.3.9;
PRODUCT_BUNDLE_IDENTIFIER = app.zabrian.codexbar;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/CodexBar/Controllers/SettingsWindowController.swift b/CodexBar/Controllers/SettingsWindowController.swift
index abb6f9a..1a130bd 100644
--- a/CodexBar/Controllers/SettingsWindowController.swift
+++ b/CodexBar/Controllers/SettingsWindowController.swift
@@ -10,6 +10,7 @@ final class SettingsWindowController: HostingWindowController {
private let syncSettings: WorkflowSyncSettings
private let globalHotKeySettings: GlobalHotKeySettings
private let menuBarQuotaSettings: MenuBarQuotaSettings
+ private let mainPanelSettings: MainPanelSettings
private let notificationSettings: NotificationSettings
private let onSyncChanged: (Bool) -> Void
private lazy var notificationOptionsPanelController = NotificationOptionsPanelController(
@@ -24,6 +25,7 @@ final class SettingsWindowController: HostingWindowController {
syncSettings: WorkflowSyncSettings,
globalHotKeySettings: GlobalHotKeySettings,
menuBarQuotaSettings: MenuBarQuotaSettings,
+ mainPanelSettings: MainPanelSettings,
notificationSettings: NotificationSettings,
screenProvider: @escaping () -> NSScreen?,
onSyncChanged: @escaping (Bool) -> Void
@@ -34,6 +36,7 @@ final class SettingsWindowController: HostingWindowController {
self.syncSettings = syncSettings
self.globalHotKeySettings = globalHotKeySettings
self.menuBarQuotaSettings = menuBarQuotaSettings
+ self.mainPanelSettings = mainPanelSettings
self.notificationSettings = notificationSettings
self.onSyncChanged = onSyncChanged
super.init(screenProvider: screenProvider)
@@ -51,6 +54,7 @@ final class SettingsWindowController: HostingWindowController {
syncSettings: syncSettings,
globalHotKeySettings: globalHotKeySettings,
menuBarQuotaSettings: menuBarQuotaSettings,
+ mainPanelSettings: mainPanelSettings,
notificationSettings: notificationSettings,
onSyncChanged: onSyncChanged,
onNotificationOptionsAction: { [weak self] action in
@@ -88,6 +92,7 @@ final class SettingsWindowController: HostingWindowController {
codexHookSettings.verifyInstalledHooks()
syncSettings.refresh()
menuBarQuotaSettings.refresh()
+ mainPanelSettings.refresh()
}
private func handleNotificationOptionsAction(_ action: NotificationOptionsPanelAction) {
diff --git a/CodexBar/Controllers/SidePanelSupport.swift b/CodexBar/Controllers/SidePanelSupport.swift
index c02f4d7..fb6e691 100644
--- a/CodexBar/Controllers/SidePanelSupport.swift
+++ b/CodexBar/Controllers/SidePanelSupport.swift
@@ -272,7 +272,7 @@ final class SidePanelContentHost<Root: View> {
self.cornerRadius = cornerRadius
}
- // Swift 6.3.3 的 EarlyPerfInliner 会在优化该泛型类型的合成析构函数时崩溃。
+ /// Swift 6.3.3 的 EarlyPerfInliner 会在优化该泛型类型的合成析构函数时崩溃。
@_optimize(none)
deinit {}
diff --git a/CodexBar/Controllers/StatusItemController.swift b/CodexBar/Controllers/StatusItemController.swift
index 972e5d5..3abb57b 100644
--- a/CodexBar/Controllers/StatusItemController.swift
+++ b/CodexBar/Controllers/StatusItemController.swift
@@ -13,6 +13,7 @@ final class CodexBarAppDelegate: NSObject, NSApplicationDelegate {
let syncSettings = WorkflowSyncSettings()
let globalHotKeySettings = GlobalHotKeySettings()
let menuBarQuotaSettings = MenuBarQuotaSettings()
+ let mainPanelSettings = MainPanelSettings()
let notificationSettings = NotificationSettings()
let appUpdater = AppUpdater()
@@ -28,6 +29,7 @@ final class CodexBarAppDelegate: NSObject, NSApplicationDelegate {
syncSettings: syncSettings,
globalHotKeySettings: globalHotKeySettings,
menuBarQuotaSettings: menuBarQuotaSettings,
+ mainPanelSettings: mainPanelSettings,
notificationSettings: notificationSettings,
appUpdater: appUpdater
)
@@ -66,6 +68,7 @@ private final class StatusItemController: NSObject, NSMenuDelegate {
private let syncSettings: WorkflowSyncSettings
private let globalHotKeySettings: GlobalHotKeySettings
private let menuBarQuotaSettings: MenuBarQuotaSettings
+ private let mainPanelSettings: MainPanelSettings
private let notificationSettings: NotificationSettings
private let appUpdater: AppUpdater
private let statusItem = NSStatusBar.system.statusItem(withLength: NSStatusItem.variableLength)
@@ -94,6 +97,7 @@ private final class StatusItemController: NSObject, NSMenuDelegate {
syncSettings: syncSettings,
globalHotKeySettings: globalHotKeySettings,
menuBarQuotaSettings: menuBarQuotaSettings,
+ mainPanelSettings: mainPanelSettings,
notificationSettings: notificationSettings
) { [weak self] in
self?.statusItem.button?.window?.screen
@@ -153,6 +157,7 @@ private final class StatusItemController: NSObject, NSMenuDelegate {
syncSettings: WorkflowSyncSettings,
globalHotKeySettings: GlobalHotKeySettings,
menuBarQuotaSettings: MenuBarQuotaSettings,
+ mainPanelSettings: MainPanelSettings,
notificationSettings: NotificationSettings,
appUpdater: AppUpdater
) {
@@ -163,6 +168,7 @@ private final class StatusItemController: NSObject, NSMenuDelegate {
self.syncSettings = syncSettings
self.globalHotKeySettings = globalHotKeySettings
self.menuBarQuotaSettings = menuBarQuotaSettings
+ self.mainPanelSettings = mainPanelSettings
self.notificationSettings = notificationSettings
self.appUpdater = appUpdater
super.init()
@@ -501,6 +507,7 @@ private final class StatusItemController: NSObject, NSMenuDelegate {
viewModel: viewModel,
workflowViewModel: workflowViewModel,
codexHookSettings: codexHookSettings,
+ mainPanelSettings: mainPanelSettings,
activityMonitor: activityMonitor,
syncSettings: syncSettings,
menuSurfaceVisibility: menuSurfaceVisibility,
@@ -530,13 +537,27 @@ private final class StatusItemController: NSObject, NSMenuDelegate {
.map { $0 != nil }
.removeDuplicates()
- Publishers.CombineLatest3(
+ let hasTaskCenterContent = activityMonitor.$snapshot
+ .map(\.hasTaskCenterContent)
+ .removeDuplicates()
+
+ let isTaskCenterVisible = Publishers.CombineLatest(
+ codexHookSettings.$isEnabled,
+ mainPanelSettings.$showsTaskCenter
+ )
+ .map { isHookEnabled, showsTaskCenter in
+ isHookEnabled && showsTaskCenter
+ }
+ .removeDuplicates()
+
+ Publishers.CombineLatest4(
menuSurfaceVisibility.$isVisible,
hasQuotaSnapshot,
- activityMonitor.$snapshot.map(\.hasTaskCenterContent)
+ hasTaskCenterContent,
+ isTaskCenterVisible
)
- .map { isMenuVisible, hasQuotaSnapshot, hasActivity in
- isMenuVisible && hasQuotaSnapshot && hasActivity
+ .map { isMenuVisible, hasQuotaSnapshot, hasActivity, isTaskCenterVisible in
+ isMenuVisible && hasQuotaSnapshot && hasActivity && isTaskCenterVisible
}
.removeDuplicates()
.sink { [weak self] isActive in
@@ -581,6 +602,13 @@ private final class StatusItemController: NSObject, NSMenuDelegate {
activityCenterPanelController.hide(immediate: true)
}
.store(in: &cancellables)
+
+ mainPanelSettings.$showsTaskCenter
+ .filter { !$0 }
+ .sink { [weak self] _ in
+ self?.activityCenterPanelController.hide(immediate: true)
+ }
+ .store(in: &cancellables)
}
private func observeWorkflowSyncState() {
diff --git a/CodexBar/Services/Settings/MainPanelSettings.swift b/CodexBar/Services/Settings/MainPanelSettings.swift
new file mode 100644
index 0000000..c68042f
--- /dev/null
+++ b/CodexBar/Services/Settings/MainPanelSettings.swift
@@ -0,0 +1,43 @@
+import Combine
+import Foundation
+
+/// 主面板内容偏好
+@MainActor
+final class MainPanelSettings: ObservableObject {
+ @Published private(set) var showsTaskCenter: Bool
+
+ private let defaults: UserDefaults
+
+ init(defaults: UserDefaults = .standard) {
+ self.defaults = defaults
+ showsTaskCenter = Self.loadShowsTaskCenter(from: defaults)
+ }
+
+ func refresh() {
+ let showsTaskCenter = Self.loadShowsTaskCenter(from: defaults)
+ guard showsTaskCenter != self.showsTaskCenter else {
+ return
+ }
+
+ self.showsTaskCenter = showsTaskCenter
+ }
+
+ func setShowsTaskCenter(_ showsTaskCenter: Bool) {
+ guard showsTaskCenter != self.showsTaskCenter else {
+ return
+ }
+
+ defaults.set(showsTaskCenter, forKey: Self.showsTaskCenterKey)
+ self.showsTaskCenter = showsTaskCenter
+ }
+
+ private static func loadShowsTaskCenter(from defaults: UserDefaults) -> Bool {
+ guard defaults.object(forKey: showsTaskCenterKey) != nil else {
+ return true
+ }
+
+ return defaults.bool(forKey: showsTaskCenterKey)
+ }
+
+ private static let showsTaskCenterKey = "MainPanel.showsTaskCenter"
+}
diff --git a/CodexBar/Views/Menu/CodexStatusMenuView.swift b/CodexBar/Views/Menu/CodexStatusMenuView.swift
index 42bd076..f560b1d 100644
--- a/CodexBar/Views/Menu/CodexStatusMenuView.swift
+++ b/CodexBar/Views/Menu/CodexStatusMenuView.swift
@@ -14,6 +14,7 @@ struct CodexStatusMenuView: View {
@ObservedObject var viewModel: CodexStatusViewModel
@ObservedObject var workflowViewModel: WorkflowViewModel
@ObservedObject var codexHookSettings: CodexHookSettings
+ @ObservedObject var mainPanelSettings: MainPanelSettings
// 活动状态与逐秒时间只被活动卡片消费, 由卡片自行观察, 避免 1Hz tick 让整个菜单树每秒重算
let activityMonitor: CodexActivityMonitor
@ObservedObject var syncSettings: WorkflowSyncSettings
@@ -32,6 +33,7 @@ struct CodexStatusMenuView: View {
.liquidGlassSurface(cornerRadius: Metrics.surfaceCornerRadius, isOuterSurface: true)
.animation(Metrics.statusAnimation, value: viewModel.loadState)
.animation(Metrics.statusAnimation, value: codexHookSettings.isEnabled)
+ .animation(Metrics.statusAnimation, value: mainPanelSettings.showsTaskCenter)
.animation(Metrics.statusAnimation, value: syncSettings.isEnabled)
.animation(Metrics.statusAnimation, value: syncSettings.isSyncing)
.animation(Metrics.statusAnimation, value: syncSettings.hasSyncFailure)
@@ -74,7 +76,7 @@ private extension CodexStatusMenuView {
@ViewBuilder
var activityCard: some View {
- if codexHookSettings.isEnabled {
+ if codexHookSettings.isEnabled, mainPanelSettings.showsTaskCenter {
CodexActivityCard(
activityMonitor: activityMonitor,
presentationState: activityCenterPresentationState,
diff --git a/CodexBar/Views/Menu/ResetCreditsPanelView.swift b/CodexBar/Views/Menu/ResetCreditsPanelView.swift
index 2942c3d..a4cd031 100644
--- a/CodexBar/Views/Menu/ResetCreditsPanelView.swift
+++ b/CodexBar/Views/Menu/ResetCreditsPanelView.swift
@@ -164,7 +164,13 @@ struct ResetCreditsPanelView: View {
}
private func availableValue(for group: ResetCreditExpirationGroup) -> some View {
- let tint: Color = group.isExpiringSoon ? .orange : .green
+ let tint: Color = if group.isExpiringUrgently {
+ .red
+ } else if group.isExpiringSoon {
+ .orange
+ } else {
+ .green
+ }
return Text("可用: \(group.count)")
.font(.caption2.monospacedDigit().weight(.semibold))
@@ -197,6 +203,7 @@ private struct ResetCreditExpirationGroup: Identifiable, Equatable {
let expirationText: String
var count: Int
let isExpiringSoon: Bool
+ let isExpiringUrgently: Bool
var id: String {
expirationText
@@ -210,11 +217,13 @@ private struct ResetCreditExpirationGroup: Identifiable, Equatable {
groups[lastIndex].count += 1
} else {
let remainingTime = date.timeIntervalSince(now)
+ let isExpiringSoon = remainingTime > 0 && remainingTime <= expiringSoonInterval
groups.append(
Self(
expirationText: expirationText,
count: 1,
- isExpiringSoon: remainingTime > 0 && remainingTime <= expiringSoonInterval
+ isExpiringSoon: isExpiringSoon,
+ isExpiringUrgently: isExpiringSoon && remainingTime < expiringUrgentlyInterval
)
)
}
@@ -222,4 +231,5 @@ private struct ResetCreditExpirationGroup: Identifiable, Equatable {
}
private static let expiringSoonInterval: TimeInterval = 7 * 24 * 60 * 60
+ private static let expiringUrgentlyInterval: TimeInterval = 24 * 60 * 60
}
diff --git a/CodexBar/Views/Settings/AppSettingsView.swift b/CodexBar/Views/Settings/AppSettingsView.swift
index a02aa30..1364db8 100644
--- a/CodexBar/Views/Settings/AppSettingsView.swift
+++ b/CodexBar/Views/Settings/AppSettingsView.swift
@@ -1,7 +1,7 @@
import AppKit
import SwiftUI
-/// 设置窗口根视图, 汇总启动项、更新、Hook、跨设备同步、快捷键和版本信息
+/// 设置窗口根视图, 汇总启动项、显示、Hook、同步、通知、快捷键和版本信息
struct AppSettingsView: View {
@EnvironmentObject private var statusViewModel: CodexStatusViewModel
@EnvironmentObject private var appUpdater: AppUpdater
@@ -11,6 +11,7 @@ struct AppSettingsView: View {
@ObservedObject var syncSettings: WorkflowSyncSettings
@ObservedObject var globalHotKeySettings: GlobalHotKeySettings
@ObservedObject var menuBarQuotaSettings: MenuBarQuotaSettings
+ @ObservedObject var mainPanelSettings: MainPanelSettings
@ObservedObject var notificationSettings: NotificationSettings
let onSyncChanged: (Bool) -> Void
let onNotificationOptionsAction: (NotificationOptionsPanelAction) -> Void
@@ -28,6 +29,8 @@ struct AppSettingsView: View {
LiquidGlassDivider()
codexHookRow
LiquidGlassDivider()
+ taskCenterRow
+ LiquidGlassDivider()
syncRow
LiquidGlassDivider()
notificationRow
@@ -66,6 +69,7 @@ struct AppSettingsView: View {
loginItemSettings.refresh()
syncSettings.refresh()
menuBarQuotaSettings.refresh()
+ mainPanelSettings.refresh()
appUpdater.refreshAutomaticCheckSetting()
refreshCodexVersionSection()
notificationSettings.refreshAuthorizationStatus()
@@ -74,6 +78,7 @@ struct AppSettingsView: View {
codexHookSettings.refresh()
syncSettings.refresh()
menuBarQuotaSettings.refresh()
+ mainPanelSettings.refresh()
codexHookSettings.verifyInstalledHooks()
refreshCodexVersionSection()
notificationSettings.refreshAuthorizationStatus()
@@ -181,6 +186,21 @@ private extension AppSettingsView {
menuBarQuotaSettings.selection != .off
}
+ /// Hook 未开启时显示为关闭并置灰, 不修改持久化的 showsTaskCenter。
+ var taskCenterRow: some View {
+ let isDisplayedOn = codexHookSettings.isEnabled && mainPanelSettings.showsTaskCenter
+
+ return SettingsToggleRow(
+ icon: "list.bullet.rectangle",
+ title: "主面板任务中心",
+ isOn: Binding(
+ get: { isDisplayedOn },
+ set: { mainPanelSettings.setShowsTaskCenter($0) }
+ ),
+ isEnabled: codexHookSettings.isEnabled && !codexHookSettings.isUpdating
+ )
+ }
+
var codexHookRow: some View {
VStack(alignment: .leading, spacing: 4) {
SettingsToggleRow(
diff --git a/Docs/DevelopmentGuide.md b/Docs/DevelopmentGuide.md
index bcd11d7..8984724 100644
--- a/Docs/DevelopmentGuide.md
+++ b/Docs/DevelopmentGuide.md
@@ -102,9 +102,9 @@ App 退出时, `applicationWillTerminate` 调用 `StatusItemController.uninstall
设置页「菜单栏额度指示」默认开启, 使用独立开关控制启用状态; 缺失持久化选择时默认使用 `.primary`, 关闭时显式持久化 `.off`。开启后在同一行显示额度窗口菜单, 可选择当前账号 Codex limit 返回的额度窗口, 当前保留选择不在返回窗口中时用 fallback 标题追加到菜单。最后一次非关闭的窗口选择由 `MenuBarQuotaSettings` 以 `MenuBarQuota.lastWindowSelection` 键随偏好持久化: 关闭开关时它继续参与菜单淡出避免过渡期间回退, 重新开启时(含重开设置窗口或重启应用后)恢复该选择, 无记录时回退 `.primary`。开启后 `StatusItemController` 会把所选 Codex 窗口的剩余额度进度条绘制在图标左侧, 以竖条形式与 `person.fill.checkmark` / `person.fill.xmark` 合成为单个 `NSImage`, 并随 `CodexStatusViewModel` 自动刷新。合成图尺寸为 `27 x 17`, 图标本体保持原始 `24 x 17`, 左侧竖条轨道为 `2 x 15`, 状态点位于小人右下角。额度显隐或状态点变化时, `StatusItemController` 合并为同一个逐帧重绘任务,在 0.18 秒内同时插值竖条与状态点的透明度以及状态点颜色,避免两个动画任务竞争;过渡期间合成图宽度和绘制坐标保持固定。活动期间 tooltip 每分钟更新一次耗时并合并并发数量与额度,活动结束后取消刷新任务。
-Hook 开启时,账号卡片下方始终显示固定高度 `CodexActivityCard`。`CodexQuotaSnapshot` 为 `nil` 时,卡片显示「暂无数据」且不开放任务中心;Monitor 继续维护实时状态。快照可用时,卡片按等待、运行、最近完成、最近终止、空闲的顺序展示项目最后一级名称、模型或工具、耗时及其他活动任务数量;只有终止历史时显示最近一项灰色终止状态。存在任务中心内容时,卡片可点击,其他活动任务数量使用右侧 `+N` 徽标,hover 和选中反馈作用于卡片描边。
+Hook 开启且 `MainPanelSettings.showsTaskCenter` 为 `true` 时,账号卡片下方显示固定高度 `CodexActivityCard`;该偏好缺失时默认开启。`CodexQuotaSnapshot` 为 `nil` 时,卡片显示「暂无数据」且不开放任务中心;Monitor 继续维护实时状态。快照可用时,卡片按等待、运行、最近完成、最近终止、空闲的顺序展示项目最后一级名称、模型或工具、耗时及其他活动任务数量;只有终止历史时显示最近一项灰色终止状态。存在任务中心内容时,卡片可点击,其他活动任务数量使用右侧 `+N` 徽标,hover 和选中反馈作用于卡片描边。关闭展示偏好只移除活动卡片和任务中心入口,不影响 Monitor、菜单栏状态点、通知或触觉反馈。
-`ActivityCenterPanelController` 展示 `CodexActivitySnapshot` 的完整等待、运行、最近完成和最近终止列表。等待和运行按最后活动时间倒序,完成和终止按各自结束时间倒序;列表身份使用进程内 opaque UUID,不向 UI 暴露 session/turn ID。最近完成和最近终止保留 10 分钟。活动 Monitor 和 `CodexActivityCenterPresentationState` 作为普通引用传入菜单根视图,再由活动卡片自身观察;这样共享逐秒时间只让卡片失效,不会带动整个菜单树每秒重算。卡片与任务中心观察同一个 Monitor,并在菜单可见、额度快照可用且存在任务中心内容时使用 presentation state 的共享逐秒时间。任务中心打开期间额度快照变为 `nil` 时立即关闭。
+`ActivityCenterPanelController` 展示 `CodexActivitySnapshot` 的完整等待、运行、最近完成和最近终止列表。等待和运行按最后活动时间倒序,完成和终止按各自结束时间倒序;列表身份使用进程内 opaque UUID,不向 UI 暴露 session/turn ID。最近完成和最近终止保留 10 分钟。活动 Monitor 和 `CodexActivityCenterPresentationState` 作为普通引用传入菜单根视图,再由活动卡片自身观察;这样共享逐秒时间只让卡片失效,不会带动整个菜单树每秒重算。卡片与任务中心观察同一个 Monitor,并在菜单可见、额度快照可用、`MainPanelSettings` 允许展示且存在任务中心内容时使用 presentation state 的共享逐秒时间。任务中心打开期间额度快照变为 `nil`、Hook 关闭或展示偏好关闭时立即关闭。
错误图标触发条件:
@@ -121,7 +121,7 @@ Hook 开启时,账号卡片下方始终显示固定高度 `CodexActivityCard`
| 全局快捷键 | 切换菜单面板 |
| 系统 `⌘,` | 打开独立设置窗口 |
| 菜单面板内 `⌘L` | 打开独立日志窗口 |
-| 点击活动卡片 | 切换并发任务中心 |
+| 点击可见活动卡片 | 切换并发任务中心 |
| 上下文菜单"设置" | 打开独立设置窗口 |
| 上下文菜单"日志" | 打开独立日志窗口 |
| 上下文菜单"退出" | 终止 App |
@@ -563,7 +563,7 @@ flowchart TD
额度区:
- 多个 limit 间用 `LiquidGlassDivider` 分隔
-- 如果 `resetCreditsAvailableCount > 0`, 只在置顶主 limit 标题右侧显示 `重置次数: N`; 该控件是 plain button, 点击后通过重置次数侧边详情面板展示过期时间。`resetCreditExpirationDates` 非空时按 `yyyy-MM-dd HH:mm:ss` 升序逐行展示, 相同展示时间合并数量, 单个显示 `可用: 1`, 多行之间显示渐变分隔线; 没有过期时间时显示「未知过期时间」
+- 如果 `resetCreditsAvailableCount > 0`, 只在置顶主 limit 标题右侧显示 `重置次数: N`; 该控件是 plain button, 点击后通过重置次数侧边详情面板展示过期时间。`resetCreditExpirationDates` 非空时按 `yyyy-MM-dd HH:mm:ss` 升序逐行展示, 相同展示时间合并数量, 单个显示 `可用: 1`; 剩余时间不超过 7 天时徽标为橙色, 少于 24 小时时为红色, 两个阈值均按精确秒数计算; 多行之间显示渐变分隔线; 没有过期时间时显示「未知过期时间」
- 每个 quota window 展示标签, 50 个固定胶囊组成的电量条, 剩余百分比和重置时间
- 胶囊宽度为 `3.5`, 间距为 `2`, 高度为 `12`
- 额度行标签列宽 `34`, 居中显示, 标签允许最小缩放到 `0.75`, 标签到电量条间距 `12`, 电量条到百分比间距 `8`, 百分比列宽 `37`, 百分比到重置时间最小间距 `6`, 重置时间列宽 `75`
@@ -907,6 +907,7 @@ UI 展示指标来自 `WorkflowDailyAggregate.metrics`:
- `CodexHookSettings.verifyInstalledHooks()`
- `WorkflowSyncSettings.refresh()`
- `MenuBarQuotaSettings.refresh()`
+- `MainPanelSettings.refresh()`
设置窗口按 SwiftUI 内容 `fittingSize` 自适应高度, 但必须校验尺寸有限且夹紧到当前屏幕可见区域内的安全上限, 避免 SwiftUI 初始化或状态刷新重入时给出异常尺寸导致空白大窗口。`MenuBarQuotaSettings.refresh()` 可能被设置页 `onAppear` 和 `didBecomeActive` 调用, 发布 `selection` 时需要延后到下一轮 MainActor, 避免在 SwiftUI view update 中同步发布造成未定义布局行为。
@@ -915,6 +916,7 @@ UI 展示指标来自 `WorkflowDailyAggregate.metrics`:
- `LoginItemSettings.refresh()`
- `WorkflowSyncSettings.refresh()`
- `MenuBarQuotaSettings.refresh()`
+- `MainPanelSettings.refresh()`
- `AppUpdater.refreshAutomaticCheckSetting()`
- `CodexCLIVersionViewModel.refresh()`
- `CodexStatusViewModel.refreshCodexConnectionInfo()`
@@ -930,6 +932,7 @@ App 再次成为 active 时, 也会刷新 Codex 版本区、同步可用性, 并
| 开机自动启动 | `SMAppService.mainApp.status` | `register()` / `unregister()` |
| 自动检查更新 | Sparkle updater | 设置 `automaticallyChecksForUpdates` |
| 菜单栏额度指示 | `MenuBarQuotaSettings.selection` / `MenuBarQuota.lastWindowSelection` | 开关写入 `.off` 或恢复持久化的上次窗口选择, 窗口菜单写入所选窗口并同步记住; 标签优先来自当前账号 Codex limit 返回的额度窗口, 缺失时使用 fallback 标题 |
+| 主面板任务中心 | `MainPanelSettings.showsTaskCenter` + Codex Hook 状态 | 写入 `MainPanel.showsTaskCenter`; 缺失时默认开启。Hook 关闭时显示为关闭并置灰但保留偏好, 重新开启后恢复 |
| 系统通知 | `NotificationSettings` + `UNUserNotificationCenter` | 总开关、五类通知子开关、任务触觉开关与阈值写入 `UserDefaults`; 首次开启时请求系统通知授权 |
| 使用快捷键 | `GlobalHotKeySettings.shortcut` | 写入 `UserDefaults` 并注册 hot key |
| 启用 Codex Hook | app-server `config/read` / `hooks/list` / `config/batchWrite`, `~/.codex/hooks.json` | 检查全局 Hook 开关后追加或移除当前 CodexBar command hook, 并维护对应 `hooks.state` 信任状态 |
@@ -1112,7 +1115,7 @@ App 再次成为 active 时, 也会刷新 Codex 版本区、同步可用性, 并
活动并发以 session 为边界:不同 session 可以同时运行;同一 session 的 turn 按顺序执行。收到新的 `UserPromptSubmit` 时,monitor 会让该 session 中更早且缺少结束信号的 turn 立即退出活动列表,但保留为等待终态确认任务并触发一次即时 rollout 查询;5 秒内收到 Hook `Stop`、rollout `task_complete` 或 `turn_aborted` 时按真实终态归类,到期仍无终态才生成灰色最近终止记录。子 Agent 事件只能通过共享 session 关联父任务,早于当前顶层任务可信开始时间的事件会被当作上一 turn 的迟到事件忽略。已完成和已终止任务键分别保留 24 小时 tombstone,避免迟到事件恢复旧任务或误操作同 session 的新 turn。终止不会触发绿色完成状态、长任务通知或完成触觉反馈。Hook `Stop` 与 rollout `task_complete` 均视为完成信号,先到者生效,后到者按任务键和 session 回退键去重;重复完成不会覆盖首次确认结果,也不会缩短去重窗口或再次触发反馈。
-设置页交互: 「系统通知」主开关行保留在设置窗口内, 子选项 (五类通知子开关、任务触觉开关与两个阈值 Picker) 在主选项右侧的子面板中展开 (`NotificationOptionsPanelController`, 复用 SidePanelSupport 抽屉机制挂在设置窗口上, 内容用常驻 hosting controller + ObservableObject 驱动, 面板尺寸在 Hook 开/关两种状态下保持不变)。「任务等待通知」和「任务触觉反馈」依次排列在「任务完成通知」下方。主开关开启后仅在系统授权允许时展开, 首次授权场景会等待授权结果; 点击行内滑杆按钮可手动展开; 设置窗口 resign key/关闭、主开关关闭或授权变为被拒时自动收起。任务完成、任务等待与任务触觉子项在 Hook 未开启时显示为关闭并置灰, 不修改各自持久化偏好, Hook 重新开启后恢复用户原选择。授权被拒的引导文案与"打开系统设置"按钮仍内联显示在主开关行下方, 插入提示时不触发设置项纵向动画。
+设置页交互: 「系统通知」主开关行保留在设置窗口内, 子选项 (五类通知子开关、任务触觉开关与两个阈值 Picker) 在主选项右侧的子面板中展开 (`NotificationOptionsPanelController`, 复用 SidePanelSupport 抽屉机制挂在设置窗口上, 内容用常驻 hosting controller + ObservableObject 驱动, 面板尺寸在 Hook 开/关两种状态下保持不变)。「任务等待通知」和「任务触觉反馈」依次排列在「任务完成通知」下方。主开关开启后仅在系统授权允许时展开, 首次授权场景会等待授权结果; 点击行内滑杆按钮可手动展开; 设置窗口 resign key/关闭、主开关关闭或授权变为被拒时自动收起。任务完成、任务等待与任务触觉子项在 Hook 未开启时显示为关闭并置灰, 不修改各自持久化偏好, Hook 重新开启后恢复用户原选择。「主面板任务中心」沿用相同依赖语义;关闭只隐藏活动卡片和任务中心入口,不停止 Monitor、状态点、通知或触觉反馈。授权被拒的引导文案与"打开系统设置"按钮仍内联显示在主开关行下方, 插入提示时不触发设置项纵向动画。
五类通知的触发与去重:
diff --git a/README.md b/README.md
index 114eb95..395a35c 100644
--- a/README.md
+++ b/README.md
@@ -41,11 +41,11 @@ CodexBar 是一个无 Dock 图标的 macOS 菜单栏应用。
开启 Codex Hook 后,菜单栏小人右下角的状态点会反映实时任务状态:运行中为蓝色、等待批准为橙色、刚完成为绿色,暂无活动时不显示。主面板额度快照不可用时也不显示状态点,与活动卡片的「暂无数据」状态保持一致。状态优先级依次为等待批准、运行中、刚完成和暂无活动;小人保持系统前景色,账号异常仍使用带叉图标表示,额度竖条也保持自己的颜色。
-菜单面板账号卡片下方会固定显示活动卡片,汇总当前项目、模型、推理强度、工具、耗时和其他并发任务数量;可可靠统计且存在活跃子 Agent 时还会显示其数量。模型、推理强度与项目等同一行信息统一使用 ` • ` 连接。主面板快照不可用时,活动卡片显示「暂无数据」且不开放任务中心;快照可用并存在活动任务、最近完成或最近终止记录时,点击卡片会打开并发任务中心,按等待确认、运行中、最近完成和最近终止分组展示全部任务,其中模型后的推理强度同样使用 ` • ` 连接。只有终止历史时,卡片显示最近一项灰色终止状态。面板优先在菜单右侧展开,空间不足时自动切换到左侧,并优先与活动卡片顶边对齐;暂时无法取得有效位置时会等待布局更新后重试,仍然失败才在主面板旁垂直居中。绿色完成状态保留 30 秒,最近完成和最近终止记录保留 10 分钟;终止记录不触发完成提醒。
+菜单面板账号卡片下方默认显示活动卡片,汇总当前项目、模型、推理强度、工具、耗时和其他并发任务数量;可可靠统计且存在活跃子 Agent 时还会显示其数量。可在设置中关闭「主面板任务中心」来隐藏活动卡片及任务中心入口;该选项依赖 Codex Hook,Hook 关闭时显示为关闭并置灰,但会保留原偏好。隐藏只影响主面板展示,不停止 Hook 记录、菜单栏任务状态点、任务通知或触觉反馈。模型、推理强度与项目等同一行信息统一使用 `•` 连接。主面板快照不可用时,活动卡片显示「暂无数据」且不开放任务中心;快照可用并存在活动任务、最近完成或最近终止记录时,点击卡片会打开并发任务中心,按等待确认、运行中、最近完成和最近终止分组展示全部任务,其中模型后的推理强度同样使用 `•` 连接。只有终止历史时,卡片显示最近一项灰色终止状态。面板优先在菜单右侧展开,空间不足时自动切换到左侧,并优先与活动卡片顶边对齐;暂时无法取得有效位置时会等待布局更新后重试,仍然失败才在主面板旁垂直居中。绿色完成状态保留 30 秒,最近完成和最近终止记录保留 10 分钟;终止记录不触发完成提醒。
### 额度与重置时间一眼可见
-额度区用分段电量条展示不同时间窗口的剩余额度,并显示剩余百分比和重置时间。存在可用手动重置机会时,主 limit 标题右侧会显示 `重置次数: N`,点击后通过侧边详情面板按过期时间展示各重置机会的数量。
+额度区用分段电量条展示不同时间窗口的剩余额度,并显示剩余百分比和重置时间。存在可用手动重置机会时,主 limit 标题右侧会显示 `重置次数: N`,点击后通过侧边详情面板按过期时间展示各重置机会的数量;未来 7 天内过期的次数显示为橙色,少于 24 小时过期的次数显示为红色。
### 近 30 周 Token 热力图
diff --git a/appcast.xml b/appcast.xml
index 0c893fb..704266d 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.3.9</title>
+ <sparkle:version>47</sparkle:version>
+ <sparkle:shortVersionString>3.3.9</sparkle:shortVersionString>
+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#3.3.9</sparkle:releaseNotesLink>
+ <pubDate>Mon, 20 Jul 2026 11:15:50 +0800</pubDate>
+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v3.3.9.dmg" sparkle:edSignature="1xAbFt/eCKbbbW5BQo0o23jEDYAUXBixoeqHOqdexFMMTr7oH9e3rZZ9migi37Sv8MWHf5WO063SPjEq/X2eBA==" length="4021546" type="application/octet-stream"/>
+ </item>
<item>
<title>CodexBar.app 3.3.8</title>
<sparkle:version>46</sparkle:version>