CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
feat: 完善匿名任务处理
Bob4960be5fbd60
diff --git a/AGENTS.md b/AGENTS.mdindex f9de45a..3a8d9f1 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -35,7 +35,9 @@ CodexBar 是面向 macOS 15+ 的 `LSUIElement` 菜单栏应用, 使用 Swift 6,保持三条数据链路独立: app-server 额度与用量, Hook 历史聚合, `CodexActivityMonitor` 实时任务; helper 只能控制睡眠, 不得增加网络, 任意命令执行或额外文件访问; 修改 Hook 配置时必须保留用户和其他应用已有的 handler; 启用和校验 Hook 必须检查当前 app-server 的实际版本不低于 `0.145.0`; 新增网络访问, 日志数据或 CloudKit 字段前先核对隐私边界-`CodexActivityMonitor` 的异常会话保护跟随防睡眠主开关, 只判定运行中任务, 等待批准任务不参与判定. 静默阈值可选 30 分钟, 1, 2 或 4 小时, 默认 1 小时. Hook bootstrap, 系统睡眠, 唤醒恢复或 Hook 数据源不可用期间必须暂停判定, 数据恢复后统一无通知对账+缺少 session ID 的 Hook 事件使用匿名 project key. 匿名任务保留在实时快照和 UI 中, 活动卡片与任务中心统一显示橙色 `person.crop.circle.dashed` 图标, help 为 `匿名任务不参与防睡眠`; 不发布任务通知或触觉反馈, 不参与防睡眠和异常会话保护, 不生成保护状态持久化标识. 活动卡片的 `+N` 只显示其他活跃任务总数++`CodexActivityMonitor` 的异常会话保护跟随防睡眠主开关, 只判定非匿名运行中任务, 等待批准任务不参与判定. 静默阈值可选 30 分钟, 1, 2 或 4 小时, 默认 1 小时. Hook bootstrap, 系统睡眠, 唤醒恢复或 Hook 数据源不可用期间必须暂停判定, 数据恢复后统一无通知对账`HookEventTailReader.drainNow()` 是读取屏障, 每个调用方必须等待一轮在本次请求之后开始的读取. 系统唤醒只有在该轮读取成功后才执行 rollout 生命周期对账并恢复异常会话保护判定; reader 更换时丢弃旧结果, 数据源不可用或任务取消时不得使用旧快照继续判定diff --git a/CLAUDE.md b/CLAUDE.mdindex c1d1d05..1494fe4 100644--- a/CLAUDE.md+++ b/CLAUDE.md@@ -124,6 +124,8 @@ Hook 子进程按天写入 `~/Library/Application Support/CodexBar/HookEvents/ev- 任务监控只在 `codexHookSettings.isOperable` 为 true 时运行, 即本地已安装且最近一次明确校验没有失败; 链路失效时立即停 reader 并清空实时状态- `SessionEnd` 没有 `turn_id`, 收到后按 session 把对应任务立即移出活跃列表并放进 5 秒终态确认窗口; rollout 在窗口内补回准确的完成或终止分类, 超时后按终止处理- `HookEventTailReader.drainNow()` 是读取屏障, 每个调用方等待一轮在本次请求之后开始的读取, 返回 `completed` `sourceUnavailable` 或 `cancelled`+- 缺少 session ID 的 Hook 事件使用匿名 project key, `isAnonymous` 会保留到活动快照, 完成记录和终止记录; 活动卡片和任务中心显示橙色 `person.crop.circle.dashed` 图标, help 为 `匿名任务不参与防睡眠`, `+N` 只显示其他活跃任务总数+- 匿名任务不向通知消费者发布等待或完成 transition, 不触发触觉反馈, 不参与 KeepAlive 或异常会话保护, `activityProtectionIdentifier` 为 nil系统唤醒时 `NSWorkspace.didWakeNotification` 先暂停异常会话保护. 读取屏障成功时重置生命周期解析回退并完成 rollout 对账后恢复判定; 数据源不可用时继续由 source health 门槛暂停, reader generation 变化时旧结果直接丢弃@@ -131,7 +133,7 @@ Hook 子进程按天写入 `~/Library/Application Support/CodexBar/HookEvents/ev- `CodexActivityProtection.swift` 管理异常会话保护状态机, `ActivityProtectionSettings` 只保存静默阈值; 保护开关跟随用户保存的 KeepAlive 主开关, 不依赖 helper 是否已获系统授权- 静默阈值可选 30 分钟, 1, 2 或 4 小时, 默认 1 小时, UserDefaults key 固定为 `KeepAlive.abnormalTaskInactivitySeconds`-- 候选只包含 `.running` 任务, `.waitingApproval` 不参与异常判定; `lastProgressAt` 同时吸收 Hook 顶层事件, 子 Agent 事件与 rollout 行时间+- 候选只包含非匿名 `.running` 任务, `.waitingApproval` 不参与异常判定; `lastProgressAt` 同时吸收 Hook 顶层事件, 子 Agent 事件与 rollout 行时间- 达到阈值后先持久化候选记录并尝试提交本地通知, 通知使用系统默认声音且不重试; 最多等待 3 秒后无论通知是否提交成功都隐藏任务- 通知以 task ID 与 attempt ID 共同标识, 候选失效或任务恢复, 终止, 完成, 过期时会撤回仍可识别的待处理和已送达通知; 迟到的提交结果不得影响新的 attempt- 隐藏任务不进入 `CodexActivitySnapshot` 的运行中与等待批准列表, 因而不参与 UI 和 KeepAlive 的活跃任务计算; 后续进展会恢复任务并清除保护记录@@ -154,7 +156,7 @@ Hook 子进程按天写入 `~/Library/Application Support/CodexBar/HookEvents/ev关键约束- `shouldDisableSleep` 是用户意图与依赖可用性的唯一汇合点, 要求 `isStarted && !isPreparingForTermination && isEnabled && isHookEnabled && hasRunningTasks && helperStatus == .enabled && !isRefreshingHelper && !isLowBatteryActive && !hasReachedMaximumDuration` 同时成立; **依赖不满足只让效果失效, 绝不回写用户保存的 `isEnabled`**-- `hasRunningTasks` 只消费 `CodexActivitySnapshot` 中仍可见的运行中任务与按设置纳入的等待批准任务, 被异常会话保护隐藏的任务不参与防睡眠+- `hasRunningTasks` 只消费 `CodexActivitySnapshot` 中非匿名且仍可见的运行中任务与按设置纳入的等待批准任务, 被异常会话保护隐藏的任务也不参与防睡眠- Hook 状态在类内只认 `isHookEnabled` 这份镜像, 它跟的是 `codexHookSettings.isOperable`; 不要回读那个属性, 订阅回调跑在 `willSet`, 那一刻它的两个输入里正在变的那一项还是旧值, 只能认 `CombineLatest` 给的闭包参数- 新增拦截条件一律加进 `sleepBlockReason` 的顺序判断里, 它和 `shouldDisableSleep` 同源, 顺带保证日志的 `reason=` 不会漏项- UI 用的 `isLowBatteryBlocking` 与 `canShowOptions` 由 `reconcileSleepState` 从 `sleepBlockReason` 单点派生, 新增拦截条件时 `allowsOptions` 那个穷举 `switch` 会强制表态, 于是不会出现入口亮着却点不动@@ -210,6 +212,7 @@ Hook 子进程按天写入 `~/Library/Application Support/CodexBar/HookEvents/ev### 通知- `CodexNotificationService` 是集中式的 MainActor 服务, 订阅额度快照与实时活动, 负责阈值穿越判定, 去重, 额度重置识别, 触觉反馈和本地通知; dedup key 落 UserDefaults+- 匿名任务在 transition 入口被过滤, 不发送完成或等待批准通知, 也不触发任务触觉反馈- `send` 是唯一的提交入口, 返回一个 `Task<Bool, Never>?` 值, 需要等通知真的发出去再做下一步的调用方 `await` 它的 `value` 即可; 不要另开一条 async 通道, 那会悄悄少掉去重 时效判定与提交失败回调三项能力- 去重判定留在 `send` 的同步段而不是挪进 `Task` 内部, 这样连续两次调用的第二次一定被挡下, 不依赖任务调度顺序- 异常会话保护通知只依赖通知总开关与系统授权, 使用系统默认声音, `retryCount` 为 0; 提交前后都调用 monitor 的 relevance 检查, 过期通知立即撤回diff --git a/CodexBar/Models/CodexActivityModels.swift b/CodexBar/Models/CodexActivityModels.swiftindex 39dbae3..7f153d4 100644--- a/CodexBar/Models/CodexActivityModels.swift+++ b/CodexBar/Models/CodexActivityModels.swift@@ -27,6 +27,7 @@ nonisolated struct CodexActivityPromptReference: Hashable {/// 正在运行或等待批准的任务摘要, 不对 UI 暴露原始会话 IDnonisolated struct CodexActivityTaskSnapshot: Equatable, Identifiable {let id: UUID+ let isAnonymous: Boollet latestEvent: CodexActivityEventlet projectName: String?let modelName: String?@@ -42,6 +43,7 @@ nonisolated struct CodexActivityTaskSnapshot: Equatable, Identifiable {/// 最近确认结束的任务; 完成只表示一轮任务结束, 不代表执行成功nonisolated struct CodexActivityCompletion: Equatable, Identifiable {let id: UUID+ let isAnonymous: Boollet projectName: String?let modelName: String?let effort: String?@@ -52,6 +54,7 @@ nonisolated struct CodexActivityCompletion: Equatable, Identifiable {/// 最近确认终止的任务; 终止不会被视为完成, 也不会触发完成提醒nonisolated struct CodexActivityTermination: Equatable, Identifiable {let id: UUID+ let isAnonymous: Boollet projectName: String?let modelName: String?let effort: String?@@ -152,6 +155,13 @@ nonisolated enum CodexPrimaryActivity: Equatable {nonisolated enum CodexActivityTransition: Equatable {case waitingApproval(CodexActivityTaskSnapshot)case completed(CodexActivityCompletion)++ var isAnonymous: Bool {+ switch self {+ case let .waitingApproval(task): task.isAnonymous+ case let .completed(completion): completion.isAnonymous+ }+ }}nonisolated enum CodexDurationFormat {diff --git a/CodexBar/Resources/Localizable.xcstrings b/CodexBar/Resources/Localizable.xcstringsindex 22eea64..5e69b38 100644--- a/CodexBar/Resources/Localizable.xcstrings+++ b/CodexBar/Resources/Localizable.xcstrings@@ -2050,6 +2050,22 @@}}},+ "匿名任务不参与防睡眠" : {+ "localizations" : {+ "en" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "No keep-awake for anonymous tasks"+ }+ },+ "zh-Hans" : {+ "stringUnit" : {+ "state" : "translated",+ "value" : "匿名任务不参与防睡眠"+ }+ }+ }+ },"任务中心" : {"localizations" : {"en" : {diff --git a/CodexBar/Services/KeepAlive/KeepAliveController.swift b/CodexBar/Services/KeepAlive/KeepAliveController.swiftindex 5db0b49..1cd33e2 100644--- a/CodexBar/Services/KeepAlive/KeepAliveController.swift+++ b/CodexBar/Services/KeepAlive/KeepAliveController.swift@@ -499,8 +499,8 @@ final class KeepAliveController: ObservableObject {}private func handleActivitySnapshot(_ snapshot: CodexActivitySnapshot) {- let runningTaskIDs = Set(snapshot.runningTasks.map(\.id))- let currentWaitingTaskIDs = Set(snapshot.waitingTasks.map(\.id))+ let runningTaskIDs = keepAliveTaskIDs(in: snapshot.runningTasks)+ let currentWaitingTaskIDs = keepAliveTaskIDs(in: snapshot.waitingTasks)let activeTaskIDs = runningTaskIDs.union(currentWaitingTaskIDs)startedRunningTaskIDs.formIntersection(activeTaskIDs)@@ -520,6 +520,10 @@ final class KeepAliveController: ObservableObject {reconcileSleepState(trigger: .taskChanged)}+ private func keepAliveTaskIDs(in tasks: [CodexActivityTaskSnapshot]) -> Set<UUID> {+ Set(tasks.lazy.filter { !$0.isAnonymous }.map(\.id))+ }+/// 还没真正挡住睡眠时只清零不起表, 等禁用成功后由 begin 补上private func restartMaximumDurationPeriod() {guard isEnabled else {diff --git a/CodexBar/Services/Notifications/CodexNotificationService.swift b/CodexBar/Services/Notifications/CodexNotificationService.swiftindex 6b78536..55c0d17 100644--- a/CodexBar/Services/Notifications/CodexNotificationService.swift+++ b/CodexBar/Services/Notifications/CodexNotificationService.swift@@ -114,6 +114,9 @@ final class CodexNotificationService: NSObject {// MARK: - Hook 任务提醒private func handleActivityTransition(_ transition: CodexActivityTransition) {+ guard !transition.isAnonymous else {+ return+ }performTaskHapticFeedbackIfEnabled()guard settings.canDeliver else {diff --git a/CodexBar/Services/Workflow/CodexActivityMonitor.swift b/CodexBar/Services/Workflow/CodexActivityMonitor.swiftindex 908ba42..0d41aa2 100644--- a/CodexBar/Services/Workflow/CodexActivityMonitor.swift+++ b/CodexBar/Services/Workflow/CodexActivityMonitor.swift@@ -1018,6 +1018,7 @@ final class CodexActivityMonitor: ObservableObject {let duration = task?.preciseDuration(until: event.timestamp)let completion = storeCompletion(+ for: key,projectName: event.projectDisplayName ?? task?.projectName,modelName: event.modelName ?? task?.modelName,effort: event.effort ?? task?.effort,diff --git a/CodexBar/Services/Workflow/CodexActivityProtection.swift b/CodexBar/Services/Workflow/CodexActivityProtection.swiftindex 6992e4c..6b50d6b 100644--- a/CodexBar/Services/Workflow/CodexActivityProtection.swift+++ b/CodexBar/Services/Workflow/CodexActivityProtection.swift@@ -70,8 +70,8 @@ extension CodexActivityMonitor {}for (key, var task) in tasks {- let identifier = key.activityProtectionIdentifier- guard let record = activityProtectionRecords[identifier] else {+ guard let identifier = key.activityProtectionIdentifier,+ let record = activityProtectionRecords[identifier] else {continue}@@ -107,7 +107,8 @@ extension CodexActivityMonitor {let threshold = activityProtectionSettings.inactivityDuration.timeIntervallet restorableKeys = tasks.compactMap { key, task -> CodexActivityTaskKey? in- guard task.state == .suppressed,+ guard !key.isAnonymous,+ task.state == .suppressed,task.lastProgressAt.addingTimeInterval(threshold) > now else {return nil}@@ -118,7 +119,8 @@ extension CodexActivityMonitor {}let overdueKeys = tasks.compactMap { key, task -> CodexActivityTaskKey? in- guard task.state == .running,+ guard !key.isAnonymous,+ task.state == .running,task.lastProgressAt.addingTimeInterval(threshold) <= now else {return nil}@@ -138,7 +140,8 @@ extension CodexActivityMonitor {let threshold = activityProtectionSettings.inactivityDuration.timeIntervallet nextDeadline = tasks.compactMap { key, task -> Date? in- guard task.state == .running,+ guard !key.isAnonymous,+ task.state == .running,activityProtectionAttempts[key] == nil else {return nil}@@ -183,7 +186,8 @@ extension CodexActivityMonitor {let threshold = activityProtectionSettings.inactivityDuration.timeIntervallet candidates = tasks.compactMap { key, task -> ActivityProtectionCandidate? in- guard task.state == .running,+ guard !key.isAnonymous,+ task.state == .running,activityProtectionAttempts[key] == nil,task.lastProgressAt.addingTimeInterval(threshold) <= now else {return nil@@ -305,7 +309,9 @@ extension CodexActivityMonitor {markedAt: Date) {cancelActivityProtectionAttempt(for: key)- guard var task = tasks[key], task.state == .running else {+ guard !key.isAnonymous,+ var task = tasks[key],+ task.state == .running else {return}@@ -324,7 +330,8 @@ extension CodexActivityMonitor {_ key: CodexActivityTaskKey,now: Date) {- guard isStarted,+ guard !key.isAnonymous,+ isStarted,isActivityProtectionEnabled,tailReader != nil,!isBootstrapping,@@ -385,7 +392,8 @@ extension CodexActivityMonitor {_ candidate: ActivityProtectionCandidate,now: Date) -> Bool {- guard canEvaluateActivityProtection,+ guard !candidate.key.isAnonymous,+ canEvaluateActivityProtection,activityProtectionSettings.inactivityDuration == candidate.inactivityDuration,let task = tasks[candidate.key],task.displayID == candidate.taskID,@@ -414,7 +422,8 @@ extension CodexActivityMonitor {}let now = Date()- guard let task = tasks[attempt.candidate.key] else {+ guard !attempt.candidate.key.isAnonymous,+ let task = tasks[attempt.candidate.key] else {return false}return task.displayID == taskID@@ -429,7 +438,8 @@ extension CodexActivityMonitor {for key: CodexActivityTaskKey,progressAt: Date) -> Bool {- guard let record = activityProtectionRecords[key.activityProtectionIdentifier] else {+ guard let identifier = key.activityProtectionIdentifier,+ let record = activityProtectionRecords[identifier] else {return true}return progressAt > record.lastProgressAt@@ -441,9 +451,8 @@ extension CodexActivityMonitor {reason: ActivityProtectionClearReason) {cancelActivityProtectionAttempt(for: key)- let identifier = key.activityProtectionIdentifier- let record = activityProtectionRecords.removeValue(forKey: identifier)- if let record {+ if let identifier = key.activityProtectionIdentifier,+ let record = activityProtectionRecords.removeValue(forKey: identifier) {let matchingMarkedAt: Date? = switch reason {case .progress, .thresholdChange: record.markedAtcase .terminal, .retention: nil@@ -492,8 +501,8 @@ extension CodexActivityMonitor {attempt.timeoutTask.cancel()activityProtectionAttempts.removeValue(forKey: key)- let identifier = key.activityProtectionIdentifier- if let record = activityProtectionRecords[identifier],+ if let identifier = key.activityProtectionIdentifier,+ let record = activityProtectionRecords[identifier],record.markedAt == attempt.markedAt {activityProtectionRecords.removeValue(forKey: identifier)enqueueActivityProtectionPersistence(@@ -540,8 +549,11 @@ extension CodexActivityMonitor {lastProgressAt: Date,markedAt: Date) {+ guard let taskIdentifier = key.activityProtectionIdentifier else {+ return+ }let record = ActivityProtectionRecord(- taskIdentifier: key.activityProtectionIdentifier,+ taskIdentifier: taskIdentifier,lastProgressAt: lastProgressAt,markedAt: markedAt,expiresAt: lastProgressAt.addingTimeInterval(Self.activityRetention)diff --git a/CodexBar/Services/Workflow/CodexActivityTask.swift b/CodexBar/Services/Workflow/CodexActivityTask.swiftindex 5f1bbae..ddcf018 100644--- a/CodexBar/Services/Workflow/CodexActivityTask.swift+++ b/CodexBar/Services/Workflow/CodexActivityTask.swift@@ -37,14 +37,15 @@ enum CodexActivityTaskKey: Hashable {return false}- var activityProtectionIdentifier: String {- let value = switch self {+ var activityProtectionIdentifier: String? {+ let value: String+ switch self {case let .turn(session, turn):- "turn\u{0}\(session)\u{0}\(turn)"+ value = "turn\u{0}\(session)\u{0}\(turn)"case let .session(session):- "session\u{0}\(session)"- case let .anonymous(project):- "anonymous\u{0}\(project)"+ value = "session\u{0}\(session)"+ case .anonymous:+ return nil}let data = Data("CodexBar.ActivityProtection.v1\u{0}\(value)".utf8)return SHA256.hash(data: data).map {@@ -171,6 +172,7 @@ struct CodexActivityTask {var snapshot: CodexActivityTaskSnapshot {CodexActivityTaskSnapshot(id: displayID,+ isAnonymous: key.isAnonymous,latestEvent: latestEvent,projectName: projectName,modelName: modelName,diff --git a/CodexBar/Services/Workflow/CodexActivityTerminalResolution.swift b/CodexBar/Services/Workflow/CodexActivityTerminalResolution.swiftindex 5b39056..ee03a41 100644--- a/CodexBar/Services/Workflow/CodexActivityTerminalResolution.swift+++ b/CodexBar/Services/Workflow/CodexActivityTerminalResolution.swift@@ -19,6 +19,7 @@ extension CodexActivityMonitor {let wasWaiting = task.state == .waitingApprovaltask.confirmPendingApproval()if !wasWaiting,+ !task.key.isAnonymous,let sessionTransitionNotBefore,requestedAt >= sessionTransitionNotBefore {transitions.append(.waitingApproval(task.snapshot))@@ -55,7 +56,8 @@ extension CodexActivityMonitor {completedAt: completedAt,reportedDuration: duration)- if let sessionTransitionNotBefore,+ if !completion.isAnonymous,+ let sessionTransitionNotBefore,completion.completedAt >= sessionTransitionNotBefore {transitions.append(.completed(completion))}@@ -101,6 +103,7 @@ extension CodexActivityMonitor {// rollout 时间戳是整秒, 避免因为同一秒内的 Hook 毫秒时间戳而把完成时间记在最后活动之前let recordedCompletedAt = max(completedAt, task.lastActivityAt)let completion = storeCompletion(+ for: key,projectName: projectName ?? task.projectName,modelName: modelName ?? task.modelName,effort: effort ?? task.effort,@@ -112,6 +115,7 @@ extension CodexActivityMonitor {}func storeCompletion(+ for key: CodexActivityTaskKey,projectName: String?,modelName: String?,effort: String?,@@ -120,6 +124,7 @@ extension CodexActivityMonitor {) -> CodexActivityCompletion {let completion = CodexActivityCompletion(id: UUID(),+ isAnonymous: key.isAnonymous,projectName: projectName,modelName: modelName,effort: effort,@@ -137,6 +142,7 @@ extension CodexActivityMonitor {) {let termination = CodexActivityTermination(id: UUID(),+ isAnonymous: task.key.isAnonymous,projectName: task.projectName,modelName: task.modelName,effort: task.effort,@@ -259,14 +265,16 @@ extension CodexActivityMonitor {for (index, transition) in transitions.enumerated() {switch transition {case let .waitingApproval(key):- guard lastWaitingIndexByKey[key] == index,+ guard !key.isAnonymous,+ lastWaitingIndexByKey[key] == index,let task = tasks[key],task.state == .waitingApproval else {continue}transitionSubject.send(.waitingApproval(task.snapshot))case let .completed(completion):- guard publishedCompletionIDs.insert(completion.id).inserted else {+ guard !completion.isAnonymous,+ publishedCompletionIDs.insert(completion.id).inserted else {continue}transitionSubject.send(.completed(completion))diff --git a/CodexBar/Views/Menu/CodexActivityCard.swift b/CodexBar/Views/Menu/CodexActivityCard.swiftindex 2507f25..5e6d05a 100644--- a/CodexBar/Views/Menu/CodexActivityCard.swift+++ b/CodexBar/Views/Menu/CodexActivityCard.swift@@ -85,6 +85,11 @@ struct CodexActivityCard: View {Spacer(minLength: 0)+ if content.isAnonymous {+ CodexActivityAnonymousIcon()+ .transition(.opacity)+ }+if showsKeepAliveBadge {// 防睡眠只在任务运行期间生效, 所以状态挂在活动卡片上而不是单独占一行Image(systemName: "cup.and.saucer.fill")@@ -104,10 +109,11 @@ struct CodexActivityCard: View {.padding(.vertical, 3).background(.secondary.opacity(0.12), in: Capsule()).transition(.opacity)- .help("另有 \(content.otherTaskCount) 个任务")+ .help(String(localized: "另有 \(content.otherTaskCount) 个任务"))}}.animation(.codexStatus, value: showsKeepAliveBadge)+ .animation(.codexStatus, value: content.isAnonymous)// 任务数变化会让 +N 增删, 咖啡杯跟着横移; 两者一起纳入动画上下文才不会跳.animation(.codexStatus, value: content.otherTaskCount).padding(.horizontal, MenuMetrics.panelPadding)@@ -129,38 +135,26 @@ struct CodexActivityCard: View {private func content(at now: Date) -> ActivityCardContent {switch snapshot.primaryActivity {case let .waiting(task):- let details = activeDetailComponents(- CodexActivityDisplayFormat.waitingDetailComponents(for: task, now: now),- task: task- )- return ActivityCardContent(+ return activeContent(+ for: task,symbolName: "hand.raised.fill",tint: .orange,- title: activityTitle(- modelName: task.modelName,- effort: task.effort,- projectName: task.projectName,- fallback: "Codex 等待批准"- ),- detail: details.joined(separator: " • "),- otherTaskCount: otherTaskCount+ fallback: "Codex 等待批准",+ detailComponents: CodexActivityDisplayFormat.waitingDetailComponents(+ for: task,+ now: now+ ))case let .running(task):- let details = activeDetailComponents(- CodexActivityDisplayFormat.runningDetailComponents(for: task, now: now),- task: task- )- return ActivityCardContent(+ return activeContent(+ for: task,symbolName: "bolt.fill",tint: .blue,- title: activityTitle(- modelName: task.modelName,- effort: task.effort,- projectName: task.projectName,- fallback: "Codex"- ),- detail: details.joined(separator: " • "),- otherTaskCount: otherTaskCount+ fallback: "Codex",+ detailComponents: CodexActivityDisplayFormat.runningDetailComponents(+ for: task,+ now: now+ ))case let .completed(completion, _):let details = CodexActivityDisplayFormat.historyDetailComponents(@@ -177,7 +171,8 @@ struct CodexActivityCard: View {fallback: "Codex 任务已完成"),detail: details.joined(separator: " • "),- otherTaskCount: 0+ otherTaskCount: 0,+ isAnonymous: completion.isAnonymous)case let .terminated(termination):let details = CodexActivityDisplayFormat.historyDetailComponents(@@ -194,7 +189,8 @@ struct CodexActivityCard: View {fallback: "Codex 任务已终止"),detail: details.joined(separator: " • "),- otherTaskCount: 0+ otherTaskCount: 0,+ isAnonymous: termination.isAnonymous)case .idle:return ActivityCardContent(@@ -204,11 +200,35 @@ struct CodexActivityCard: View {? String(localized: "暂无数据"): String(localized: "暂无 Codex 活动"),detail: nil,- otherTaskCount: 0+ otherTaskCount: 0,+ isAnonymous: false)}}+ private func activeContent(+ for task: CodexActivityTaskSnapshot,+ symbolName: String,+ tint: Color,+ fallback: LocalizedStringResource,+ detailComponents: [String]+ ) -> ActivityCardContent {+ let details = activeDetailComponents(detailComponents, task: task)+ return ActivityCardContent(+ symbolName: symbolName,+ tint: tint,+ title: activityTitle(+ modelName: task.modelName,+ effort: task.effort,+ projectName: task.projectName,+ fallback: fallback+ ),+ detail: details.joined(separator: " • "),+ otherTaskCount: otherTaskCount,+ isAnonymous: task.isAnonymous+ )+ }+private func activityTitle(modelName: String?,effort: String?,@@ -260,4 +280,15 @@ private struct ActivityCardContent {let title: Stringlet detail: String?let otherTaskCount: Int+ let isAnonymous: Bool+}++struct CodexActivityAnonymousIcon: View {+ var body: some View {+ Image(systemName: "person.crop.circle.dashed")+ // 虚线圆形 symbol 留白较多, 13 pt 与 11 pt 咖啡图标的视觉面积更接近+ .font(.system(size: 13, weight: .semibold))+ .foregroundStyle(Color.orange)+ .help(String(localized: "匿名任务不参与防睡眠"))+ }}diff --git a/CodexBar/Views/Menu/CodexActivityCenterView.swift b/CodexBar/Views/Menu/CodexActivityCenterView.swiftindex cd8ee5a..0dbe117 100644--- a/CodexBar/Views/Menu/CodexActivityCenterView.swift+++ b/CodexBar/Views/Menu/CodexActivityCenterView.swift@@ -255,6 +255,7 @@ struct CodexActivityCenterView: View {projectName: task.projectName,modelName: task.modelName,effort: task.effort,+ isAnonymous: task.isAnonymous,detail: taskDetail(task, now: now, isWaiting: isWaiting))}@@ -266,6 +267,7 @@ struct CodexActivityCenterView: View {projectName: completion.projectName,modelName: completion.modelName,effort: completion.effort,+ isAnonymous: completion.isAnonymous,detail: historyDetail(duration: completion.duration,relativeText: CodexActivityDisplayFormat.completionRelativeText(@@ -283,6 +285,7 @@ struct CodexActivityCenterView: View {projectName: termination.projectName,modelName: termination.modelName,effort: termination.effort,+ isAnonymous: termination.isAnonymous,detail: historyDetail(duration: termination.duration,relativeText: CodexActivityDisplayFormat.terminationRelativeText(@@ -299,13 +302,19 @@ struct CodexActivityCenterView: View {projectName: String?,modelName: String?,effort: String?,+ isAnonymous: Bool,detail: String) -> some View {HStack(alignment: .top, spacing: 9) {- Image(systemName: symbolName)- .font(.system(size: 11, weight: .semibold))- .foregroundStyle(tint)- .frame(width: Metrics.symbolWidth, height: Metrics.titleLineHeight)+ if isAnonymous {+ CodexActivityAnonymousIcon()+ .frame(width: Metrics.symbolWidth, height: Metrics.titleLineHeight)+ } else {+ Image(systemName: symbolName)+ .font(.system(size: 11, weight: .semibold))+ .foregroundStyle(tint)+ .frame(width: Metrics.symbolWidth, height: Metrics.titleLineHeight)+ }VStack(alignment: .leading, spacing: 3) {titleLine(diff --git a/Config/Version.xcconfig b/Config/Version.xcconfigindex bcb198f..599156f 100644--- a/Config/Version.xcconfig+++ b/Config/Version.xcconfig@@ -1,2 +1,2 @@-MARKETING_VERSION = 3.6.0-CURRENT_PROJECT_VERSION = 67+MARKETING_VERSION = 3.6.1+CURRENT_PROJECT_VERSION = 68diff --git a/Docs/DeveloperGuide/activity-monitor.md b/Docs/DeveloperGuide/activity-monitor.mdindex 7407b97..01dd9df 100644--- a/Docs/DeveloperGuide/activity-monitor.md+++ b/Docs/DeveloperGuide/activity-monitor.md@@ -78,6 +78,16 @@ Hook 的 `Stop` 只是完成候选。rollout 中的 terminal 状态用于区分subagent 事件更新父任务的 subagent 活动,不创建独立顶层任务卡片。+### 匿名任务++`WorkflowHookEvent.sessionId` 缺失时, task key 使用匿名 project key. `isAnonymous` 会保留到 `CodexActivityTaskSnapshot`, `CodexActivityCompletion` 和 `CodexActivityTermination`++匿名任务仍进入活动快照和最近终态记录. 活动卡片与任务中心统一显示橙色 `person.crop.circle.dashed` 图标, help 为 `匿名任务不参与防睡眠`. 活动卡片的 `+N` 只表示其他活跃任务总数++匿名运行任务不展示精确运行时长, 匿名完成和终止记录也不包含精确耗时++匿名任务不向通知消费者发布等待批准或完成 transition, 不触发任务触觉反馈, 不进入 KeepAlive 的运行中或等待任务集合, 不参与异常会话保护. `activityProtectionIdentifier` 对匿名 key 返回 nil, 保护状态文件不会保存匿名任务记录+## 状态机内部活动任务主要有以下状态:@@ -129,7 +139,7 @@ subagent 事件更新父任务的 subagent 活动,不创建独立顶层任务## 异常会话保护-异常会话保护只在防睡眠主开关开启时工作,只处理 `running` 任务。+异常会话保护只在防睡眠主开关开启时工作, 只处理非匿名 `running` 任务等待批准任务不参与静默阈值判断。原因是等待批准本身就是一个合法的无进展状态。@@ -171,7 +181,7 @@ subagent 事件更新父任务的 subagent 活动,不创建独立顶层任务- Debug 与 Release 通过 `flock` 共用文件- 记录最长保留到最后进展后的 24 小时-任务身份使用 SHA-256 摘要,不把 session ID 或 turn ID 原文写入该状态文件。+任务身份使用 SHA-256 摘要, 不把 session ID 或 turn ID 原文写入该状态文件. 匿名任务没有保护标识, 不写入该文件## 代际和旧结果隔离diff --git a/Docs/DeveloperGuide/data-and-privacy.md b/Docs/DeveloperGuide/data-and-privacy.mdindex f378342..217773f 100644--- a/Docs/DeveloperGuide/data-and-privacy.md+++ b/Docs/DeveloperGuide/data-and-privacy.md@@ -82,6 +82,8 @@ Reset Credits 数量大于 `0` 时,App 读取现有 `auth.json` access token最近 3 天的日聚合可以保留 session 和 turn ID 明细用于准确去重。更早数据只保留计数。+匿名任务不生成异常会话保护标识, 因此不会写入 `ActivityProtection/state.json`+### UserDefaultsUserDefaults 保存:diff --git a/Docs/DeveloperGuide/notifications.md b/Docs/DeveloperGuide/notifications.mdindex deee02c..6ed7816 100644--- a/Docs/DeveloperGuide/notifications.md+++ b/Docs/DeveloperGuide/notifications.md@@ -62,6 +62,8 @@ View 和其他服务不直接创建系统通知。它们发布状态变化,通- 通知服务还维护自己的已发送 key- 同一 turn 的 `Stop` 和 rollout terminal 对账后只发送一次+匿名任务不会发布给任务通知消费者. 通知服务在 transition 入口再次过滤 `isAnonymous`, 因此匿名任务不发送完成或等待批准通知, 也不触发任务触觉反馈+任务完成最短持续时间可选 30, 60, 120 或 300 秒,默认 60 秒。持续时间较短的完成任务不会通知,但仍可以在 UI 中短暂展示。## 等待批准@@ -77,7 +79,7 @@ View 和其他服务不直接创建系统通知。它们发布状态变化,通## 异常会话保护-任务静默达到阈值时,Activity Protection 先保存保护记录并隐藏任务,然后请求通知。+非匿名任务静默达到阈值时, Activity Protection 先保存保护记录并隐藏任务, 然后请求通知. 匿名任务不进入保护候选, 也不会产生保护通知通知服务在提交前再次检查任务是否仍然被保护。如果 3 秒宽限内出现新进展,过时通知会被取消。diff --git a/Docs/DeveloperGuide/sleep-prevention.md b/Docs/DeveloperGuide/sleep-prevention.mdindex 8e56665..9d0246c 100644--- a/Docs/DeveloperGuide/sleep-prevention.md+++ b/Docs/DeveloperGuide/sleep-prevention.md@@ -33,6 +33,8 @@ CodexActivityMonitor等待批准任务默认不计入有效任务,用户可以单独开启。异常会话保护抑制的任务也不再维持防睡眠。+`KeepAliveController` 会先从运行中和等待批准快照中排除 `isAnonymous` 任务。只有非匿名任务能够进入运行任务集合,启动新一轮最长时长计时或维持防睡眠+控制器会发布明确的阻塞原因:| 原因 | 含义 |diff --git a/Docs/UserGuide/activity-and-hook.md b/Docs/UserGuide/activity-and-hook.mdindex ad3d86b..dc316d6 100644--- a/Docs/UserGuide/activity-and-hook.md+++ b/Docs/UserGuide/activity-and-hook.md@@ -69,6 +69,10 @@ CodexBar 使用 `$CODEX_HOME/hooks.json`,未设置 `CODEX_HOME` 时使用 `~/.子 Agent 事件会更新所属顶层任务,不会独立显示为另一条并发任务。+Hook 事件缺少 session ID 时, CodexBar 会按项目显示匿名任务. 匿名任务仍可出现在运行中, 等待批准, 最近完成和最近终止列表中, 但不触发任务通知或触觉反馈, 不参与防睡眠和异常会话保护++活动卡片和任务中心使用橙色匿名图标标记这类任务, 悬停显示 `匿名任务不参与防睡眠`+## Hook 事件与用途| 事件 | 主要用途 |diff --git a/Docs/UserGuide/main-panel.md b/Docs/UserGuide/main-panel.mdindex 4023932..d8133a4 100644--- a/Docs/UserGuide/main-panel.md+++ b/Docs/UserGuide/main-panel.md@@ -85,9 +85,14 @@ CodexBar Hook 开启且当天有数据时,日期详情还会显示以下统计- 已运行或已等待时间- 活跃子 Agent 数- 其他并发任务数+- 匿名任务图标防睡眠实际生效时,活动卡片右侧会显示咖啡杯标记。+Hook 事件缺少 session ID 时, 任务仍会显示在活动卡片和任务中心, 并带有橙色匿名图标. 悬停图标会显示 `匿名任务不参与防睡眠`++活动卡片的 `+N` 只表示其他活跃任务总数, 不拆分匿名任务数量+点击有内容的活动卡片可以打开任务中心。## 任务中心@@ -105,6 +110,8 @@ CodexBar Hook 开启且当天有数据时,日期详情还会显示以下统计终止不会触发任务完成通知。+匿名任务的运行中, 等待批准, 最近完成和最近终止记录都会显示同一个匿名图标+## 底部状态主面板底部包含以下信息:diff --git a/Docs/UserGuide/notifications.md b/Docs/UserGuide/notifications.mdindex 13650ae..e2bbd4b 100644--- a/Docs/UserGuide/notifications.md+++ b/Docs/UserGuide/notifications.md@@ -28,6 +28,8 @@即使系统通知没有发送成功,已确认超时的异常任务仍会被隐藏并停止参与防睡眠。+匿名任务不触发任务完成通知, 等待批准通知, 异常会话保护通知或任务触觉反馈, 但仍保留在活动卡片和任务中心中+## 可选阈值| 设置 | 可选值 |diff --git a/Docs/UserGuide/sleep-prevention.md b/Docs/UserGuide/sleep-prevention.mdindex 8144556..b965699 100644--- a/Docs/UserGuide/sleep-prevention.md+++ b/Docs/UserGuide/sleep-prevention.md@@ -17,7 +17,7 @@ CodexBar 会根据实时任务状态自动管理系统睡眠,让长任务在1. CodexBar 正在运行且没有进入退出流程2. `防止系统睡眠` 主开关已打开3. CodexBar Hook 已安装并通过最近一次明确校验-4. 至少有一个运行中任务,或已开启等待批准时保持且存在等待任务+4. 至少有一个非匿名运行中任务, 或已开启等待批准时保持且存在非匿名等待任务5. CodexBarHelper 已注册并获得系统批准6. CodexBarHelper 当前不在更新过程中7. 低电量保护当前没有生效@@ -27,6 +27,8 @@ CodexBar 会根据实时任务状态自动管理系统睡眠,让长任务在条件恢复后,仍有符合条件任务时会自动重新生效。+匿名任务即使显示为运行中或等待批准, 也不会计入防睡眠的有效任务+## 设置选项| 选项 | 作用 | 默认值 | 可选值 |@@ -73,7 +75,7 @@ CodexBar 会同时阻止显示器睡眠,并定期声明用户活动以压住异常会话保护用于处理任务已经没有真实进展,但缺少可靠终态而仍显示为运行中的情况:- 跟随防睡眠主开关,没有独立开关-- 只判断运行中任务+- 只判断非匿名运行中任务- 最近进展来自 Hook 事件,子 Agent 事件和本机会话生命周期- 达到阈值后保存保护记录,尝试通知并隐藏任务- 被隐藏任务不显示在活动卡片和任务中心,也不参与防睡眠diff --git a/Docs/UserGuide/sync-data-privacy.md b/Docs/UserGuide/sync-data-privacy.mdindex 556f911..a741916 100644--- a/Docs/UserGuide/sync-data-privacy.md+++ b/Docs/UserGuide/sync-data-privacy.md@@ -67,6 +67,8 @@CodexBarHelper 所有权文件由 root 持有,用于 App 或 CodexBarHelper 异常退出后的睡眠状态恢复。+匿名任务不参与异常会话保护, 因此不会生成哈希任务标识或写入保护状态文件+## CloudKit 上传字段每条每日聚合记录可能包含以下内容:diff --git a/appcast.xml b/appcast.xmlindex 7484fbb..bdadc7f 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.6.1</title>+ <sparkle:version>68</sparkle:version>+ <sparkle:shortVersionString>3.6.1</sparkle:shortVersionString>+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#3.6.1</sparkle:releaseNotesLink>+ <pubDate>Thu, 06 Aug 2026 17:45:27 +0800</pubDate>+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v3.6.1.dmg" sparkle:edSignature="AO+5lECGFAxG3GOjnKYDRdOKWF4oF/q9osp+DqossUtBPvfioPiI79UHGMhenfYbD8Kz9OqB0BmFrebpp0zkBw==" length="6962517" type="application/octet-stream"/>+ </item><item><title>CodexBar.app 3.6.0</title><sparkle:version>67</sparkle:version>