Skip to content

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

fix: 过滤自动审查产生的实时活动

Bob0b88bb327fa4
diff --git a/CodexBar/Models/CodexWorkflowModels.swift b/CodexBar/Models/CodexWorkflowModels.swift
index c2290e0..79742e6 100644
--- a/CodexBar/Models/CodexWorkflowModels.swift
+++ b/CodexBar/Models/CodexWorkflowModels.swift
@@ -67,10 +67,25 @@ private nonisolated enum WorkflowCountResolution {
// MARK: - Hook 原始事件
+/// Hook 事件来源的本地归一化分类, 不保留 rollout 中的原始 source 内容
+nonisolated enum WorkflowEventOrigin: String, Codable, Sendable {
+ case main
+ case autoReview
+ case auxiliary
+ case unknown
+
+ init(from decoder: Decoder) throws {
+ let container = try decoder.singleValueContainer()
+ let rawValue = try? container.decode(String.self)
+ self = rawValue.flatMap(Self.init(rawValue:)) ?? .unknown
+ }
+}
+
/// hooks 进程落盘的最小事件模型, 对历史字段缺失保持宽容
nonisolated struct WorkflowHookEvent: Decodable, Equatable {
let timestamp: Date
let name: String
+ let origin: WorkflowEventOrigin
let directoryPath: String?
let toolName: String?
let modelName: String?
@@ -84,6 +99,7 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {
init(
timestamp: Date,
name: String,
+ origin: WorkflowEventOrigin,
directoryPath: String?,
toolName: String?,
modelName: String?,
@@ -96,6 +112,7 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {
) {
self.timestamp = timestamp
self.name = name
+ self.origin = origin
self.directoryPath = directoryPath
self.toolName = toolName
self.modelName = modelName
@@ -123,6 +140,7 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {
self.timestamp = timestamp
self.name = name
+ origin = (try? container.decode(WorkflowEventOrigin.self, forKey: .origin)) ?? .unknown
directoryPath = Self.string(from: container, key: .cwd)
toolName = Self.string(from: container, key: .toolName)
modelName = Self.string(from: container, key: .modelName)
@@ -171,6 +189,7 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {
let fields = try [
WorkflowJSON.field("timestamp", CodexDateFormat.localTimestampString(from: timestamp)),
WorkflowJSON.field("event", name),
+ WorkflowJSON.field("origin", origin),
WorkflowJSON.field("model", modelName),
WorkflowJSON.field("effort", effort),
WorkflowJSON.field("permission", permissionMode),
@@ -188,6 +207,7 @@ nonisolated struct WorkflowHookEvent: Decodable, Equatable {
private enum CodingKeys: String, CodingKey {
case timestamp
case event
+ case origin
case cwd
case toolName = "tool"
case modelName = "model"
@@ -434,6 +454,7 @@ nonisolated struct WorkflowDailyAccumulator {
}
mutating func record(_ event: WorkflowHookEvent) {
+ // origin 只控制实时活动过滤, 历史统计按全部 Hook 事实保持原口径
Self.increment(&aggregate.eventCount)
switch event.hookEvent {
diff --git a/CodexBar/Services/Workflow/CodexActivityMonitor.swift b/CodexBar/Services/Workflow/CodexActivityMonitor.swift
index 8c1b807..8563ca3 100644
--- a/CodexBar/Services/Workflow/CodexActivityMonitor.swift
+++ b/CodexBar/Services/Workflow/CodexActivityMonitor.swift
@@ -26,6 +26,8 @@ final class CodexActivityMonitor: ObservableObject {
var terminations: [CodexActivityTermination] = []
var recentlyCompletedTaskAt: [CodexActivityTaskKey: Date] = [:]
var recentlyTerminatedTaskAt: [CodexActivityTaskKey: Date] = [:]
+ var terminalTaskKeyByID: [UUID: CodexActivityTaskKey] = [:]
+ var ignoredAutoReviewTaskAt: [CodexActivityTaskKey: Date] = [:]
var tailReader: HookEventTailReader?
private var tailReaderControlTask: Task<Void, Never>?
private var tailReaderGeneration: UInt64 = 0
@@ -619,6 +621,10 @@ final class CodexActivityMonitor: ObservableObject {
_ event: WorkflowHookEvent,
source: CodexActivityEventSource
) -> CodexActivityLiveTransition? {
+ guard !shouldIgnoreForActivity(event, source: source) else {
+ return nil
+ }
+
let isTopLevelEvent = event.agentId == nil
switch event.hookEvent {
case .userPromptSubmit:
@@ -1218,6 +1224,10 @@ final class CodexActivityMonitor: ObservableObject {
let historyCutoff = now.addingTimeInterval(-Self.recentHistoryRetention)
completions.removeAll { $0.completedAt <= historyCutoff }
terminations.removeAll { $0.terminatedAt <= historyCutoff }
+ let retainedTerminalIDs = Set(completions.map(\.id)).union(terminations.map(\.id))
+ terminalTaskKeyByID = terminalTaskKeyByID.filter {
+ retainedTerminalIDs.contains($0.key)
+ }
let completedTaskCutoff = now.addingTimeInterval(-Self.completedTaskRetention)
recentlyCompletedTaskAt = recentlyCompletedTaskAt.filter {
@@ -1226,6 +1236,9 @@ final class CodexActivityMonitor: ObservableObject {
recentlyTerminatedTaskAt = recentlyTerminatedTaskAt.filter {
$0.value > completedTaskCutoff
}
+ ignoredAutoReviewTaskAt = ignoredAutoReviewTaskAt.filter {
+ $0.value > activityCutoff
+ }
}
private func scheduleNextCleanup(
@@ -1248,6 +1261,9 @@ final class CodexActivityMonitor: ObservableObject {
deadlines.append(contentsOf: recentlyTerminatedTaskAt.values.map {
$0.addingTimeInterval(Self.completedTaskRetention)
})
+ deadlines.append(contentsOf: ignoredAutoReviewTaskAt.values.map {
+ $0.addingTimeInterval(Self.activityRetention)
+ })
deadlines.append(contentsOf: activityProtectionRecords.values.map(\.expiresAt))
if let mostRecentCompletion {
let highlightDeadline = mostRecentCompletion.completedAt
diff --git a/CodexBar/Services/Workflow/CodexActivityOriginFiltering.swift b/CodexBar/Services/Workflow/CodexActivityOriginFiltering.swift
new file mode 100644
index 0000000..675519f
--- /dev/null
+++ b/CodexBar/Services/Workflow/CodexActivityOriginFiltering.swift
@@ -0,0 +1,107 @@
+import Foundation
+import os
+
+extension CodexActivityMonitor {
+ /// Auto-review 事件只影响实时活动链路, 原始事件仍由历史聚合完整消费
+ func shouldIgnoreForActivity(
+ _ event: WorkflowHookEvent,
+ source: CodexActivityEventSource
+ ) -> Bool {
+ let exactKey = Self.exactTurnKey(for: event)
+ switch event.origin {
+ case .autoReview:
+ guard let exactKey else {
+ return true
+ }
+
+ let now = Date()
+ let observedAt = min(event.timestamp, now)
+ let wasAlreadyIgnored = ignoredAutoReviewTaskAt[exactKey] != nil
+ ignoredAutoReviewTaskAt[exactKey] = max(
+ ignoredAutoReviewTaskAt[exactKey] ?? .distantPast,
+ observedAt
+ )
+ discardAutoReviewActivity(for: exactKey)
+ if !wasAlreadyIgnored, source == .live {
+ AppLog.activity.notice("Auto-review 任务已过滤")
+ }
+ return true
+ case .main, .auxiliary:
+ if let exactKey {
+ ignoredAutoReviewTaskAt.removeValue(forKey: exactKey)
+ }
+ return false
+ case .unknown:
+ guard let exactKey,
+ let ignoredAt = ignoredAutoReviewTaskAt[exactKey] else {
+ return false
+ }
+ let cutoff = Date().addingTimeInterval(-Self.activityRetention)
+ guard ignoredAt > cutoff else {
+ ignoredAutoReviewTaskAt.removeValue(forKey: exactKey)
+ return false
+ }
+ return true
+ }
+ }
+
+ private static func exactTurnKey(for event: WorkflowHookEvent) -> CodexActivityTaskKey? {
+ guard let sessionId = event.sessionId,
+ let turnId = event.turnId else {
+ return nil
+ }
+ return .turn(session: sessionId, turn: turnId)
+ }
+
+ private func discardAutoReviewActivity(for key: CodexActivityTaskKey) {
+ var taskIDs = Set<UUID>()
+ if let task = tasks.removeValue(forKey: key) {
+ taskIDs.insert(task.displayID)
+ }
+ if let pending = pendingTerminalTasks.removeValue(forKey: key) {
+ taskIDs.insert(pending.task.displayID)
+ }
+
+ if taskIDs.isEmpty {
+ clearActivityProtection(for: key, taskID: nil, reason: .terminal)
+ } else {
+ for taskID in taskIDs {
+ clearActivityProtection(for: key, taskID: taskID, reason: .terminal)
+ }
+ }
+
+ completions.removeAll { terminalTaskKeyByID[$0.id] == key }
+ terminations.removeAll { terminalTaskKeyByID[$0.id] == key }
+ terminalTaskKeyByID = terminalTaskKeyByID.filter { $0.value != key }
+
+ Self.removeTerminalMemory(for: key, storedIn: &recentlyCompletedTaskAt)
+ Self.removeTerminalMemory(for: key, storedIn: &recentlyTerminatedTaskAt)
+ }
+
+ private static func removeTerminalMemory(
+ for key: CodexActivityTaskKey,
+ storedIn dates: inout [CodexActivityTaskKey: Date]
+ ) {
+ guard let removedAt = dates.removeValue(forKey: key),
+ let sessionId = key.sessionId else {
+ return
+ }
+
+ let sessionKey = CodexActivityTaskKey.session(sessionId)
+ guard dates[sessionKey] == removedAt else {
+ return
+ }
+ let remainingSessionDate = dates.compactMap { candidateKey, date -> Date? in
+ guard candidateKey != sessionKey,
+ candidateKey.sessionId == sessionId else {
+ return nil
+ }
+ return date
+ }.max()
+ if let remainingSessionDate {
+ dates[sessionKey] = remainingSessionDate
+ } else {
+ dates.removeValue(forKey: sessionKey)
+ }
+ }
+}
diff --git a/CodexBar/Services/Workflow/CodexActivityTerminalResolution.swift b/CodexBar/Services/Workflow/CodexActivityTerminalResolution.swift
index ee03a41..af4ba3f 100644
--- a/CodexBar/Services/Workflow/CodexActivityTerminalResolution.swift
+++ b/CodexBar/Services/Workflow/CodexActivityTerminalResolution.swift
@@ -132,6 +132,7 @@ extension CodexActivityMonitor {
duration: duration
)
completions.append(completion)
+ terminalTaskKeyByID[completion.id] = key
return completion
}
@@ -150,6 +151,7 @@ extension CodexActivityMonitor {
duration: includesDuration ? task.preciseDuration(until: terminatedAt) : nil
)
terminations.append(termination)
+ terminalTaskKeyByID[termination.id] = task.key
}
func recentCompletionDate(
@@ -203,6 +205,8 @@ extension CodexActivityMonitor {
terminations.removeAll()
recentlyCompletedTaskAt.removeAll()
recentlyTerminatedTaskAt.removeAll()
+ terminalTaskKeyByID.removeAll()
+ ignoredAutoReviewTaskAt.removeAll()
}
static func recentTerminalDate(
@@ -274,6 +278,7 @@ extension CodexActivityMonitor {
transitionSubject.send(.waitingApproval(task.snapshot))
case let .completed(completion):
guard !completion.isAnonymous,
+ terminalTaskKeyByID[completion.id] != nil,
publishedCompletionIDs.insert(completion.id).inserted else {
continue
}
diff --git a/CodexBar/Services/Workflow/WorkflowHookEventRecorder.swift b/CodexBar/Services/Workflow/WorkflowHookEventRecorder.swift
index 0c23aab..e4dc56e 100644
--- a/CodexBar/Services/Workflow/WorkflowHookEventRecorder.swift
+++ b/CodexBar/Services/Workflow/WorkflowHookEventRecorder.swift
@@ -42,14 +42,17 @@ nonisolated enum WorkflowHookEventRecorder {
let sessionId = payload.string(for: "session_id")
let turnId = payload.string(for: "turn_id")
let agentId = payload.string(for: "agent_id")
+ let transcriptPath = payload.string(for: "transcript_path")
+ let origin = WorkflowEventOriginReader.origin(transcriptPath: transcriptPath)
let turnContext = readTurnContext(
- from: payload,
+ transcriptPath: transcriptPath,
hookEvent: hookEvent,
turnId: turnId
)
let event = WorkflowHookEvent(
timestamp: timestamp,
name: eventName,
+ origin: origin,
directoryPath: cwd,
toolName: tool,
modelName: model,
@@ -68,14 +71,14 @@ nonisolated enum WorkflowHookEventRecorder {
}
private static func readTurnContext(
- from payload: WorkflowHookPayload,
+ transcriptPath: String?,
hookEvent: CodexHookEvent?,
turnId: String?
) -> WorkflowTurnContext? {
guard let hookEvent,
hookEvent == .userPromptSubmit || hookEvent == .permissionRequest,
let turnId,
- let transcriptPath = payload.string(for: "transcript_path") else {
+ let transcriptPath else {
return nil
}
return WorkflowTurnContextReader.context(
@@ -184,6 +187,135 @@ nonisolated enum WorkflowHookEventRecorder {
}
}
+/// rollout 格式不是稳定 Hook 接口, 只读取首条完整 session_meta 并在固定预算内失败开放
+private nonisolated enum WorkflowEventOriginReader {
+ static func origin(transcriptPath: String?) -> WorkflowEventOrigin {
+ guard let transcriptPath else {
+ return .unknown
+ }
+
+ let url = URL(fileURLWithPath: transcriptPath)
+ guard let handle = try? FileHandle(forReadingFrom: url) else {
+ return .unknown
+ }
+ defer {
+ try? handle.close()
+ }
+
+ var data = Data()
+ while data.count < firstLineByteLimit {
+ let readCount = min(readChunkByteCount, firstLineByteLimit - data.count)
+ guard let chunk = try? handle.read(upToCount: readCount),
+ !chunk.isEmpty else {
+ return .unknown
+ }
+ data.append(chunk)
+
+ guard let newlineIndex = data.firstIndex(of: JSONLines.newlineByte) else {
+ continue
+ }
+ let line = Data(data[..<newlineIndex])
+ guard let envelope = try? JSONDecoder().decode(
+ WorkflowRolloutMetadataEnvelope.self,
+ from: line
+ ), envelope.type == "session_meta" else {
+ return .unknown
+ }
+ return envelope.payload?.source?.origin ?? .unknown
+ }
+ return .unknown
+ }
+
+ private static let readChunkByteCount = 32 * 1024
+ private static let firstLineByteLimit = 256 * 1024
+}
+
+private nonisolated struct WorkflowRolloutMetadataEnvelope: Decodable {
+ let type: String
+ let payload: WorkflowRolloutMetadataPayload?
+}
+
+private nonisolated struct WorkflowRolloutMetadataPayload: Decodable {
+ let source: WorkflowRolloutSource?
+}
+
+private nonisolated struct WorkflowRolloutSource: Decodable {
+ let origin: WorkflowEventOrigin
+
+ init(from decoder: Decoder) throws {
+ if let name = try? decoder.singleValueContainer().decode(String.self) {
+ origin = Self.knownMainSourceNames.contains(name) ? .main : .unknown
+ return
+ }
+
+ guard let container = try? decoder.container(keyedBy: WorkflowRolloutSourceKey.self) else {
+ origin = .unknown
+ return
+ }
+ if let subagentKey = container.allKeys.first(where: { $0.stringValue == "subagent" }) {
+ origin = (try? container.decode(
+ WorkflowRolloutSubagentSource.self,
+ forKey: subagentKey
+ ))?.origin ?? .unknown
+ return
+ }
+ if let customKey = container.allKeys.first(where: { $0.stringValue == "custom" }),
+ let customSource = try? container.decode(String.self, forKey: customKey),
+ !customSource.isEmpty {
+ origin = .main
+ return
+ }
+ origin = .unknown
+ }
+
+ private static let knownMainSourceNames: Set<String> = [
+ "cli",
+ "exec",
+ "mcp",
+ "vscode"
+ ]
+}
+
+private nonisolated struct WorkflowRolloutSubagentSource: Decodable {
+ let origin: WorkflowEventOrigin
+
+ init(from decoder: Decoder) throws {
+ if let name = try? decoder.singleValueContainer().decode(String.self) {
+ origin = name.isEmpty ? .unknown : .auxiliary
+ return
+ }
+
+ guard let container = try? decoder.container(keyedBy: WorkflowRolloutSourceKey.self),
+ !container.allKeys.isEmpty else {
+ origin = .unknown
+ return
+ }
+ if let otherKey = container.allKeys.first(where: { $0.stringValue == "other" }) {
+ guard let name = try? container.decode(String.self, forKey: otherKey),
+ !name.isEmpty else {
+ origin = .unknown
+ return
+ }
+ origin = name == "guardian" ? .autoReview : .auxiliary
+ return
+ }
+ origin = .auxiliary
+ }
+}
+
+private nonisolated struct WorkflowRolloutSourceKey: CodingKey {
+ let stringValue: String
+ let intValue: Int? = nil
+
+ init?(stringValue: String) {
+ self.stringValue = stringValue
+ }
+
+ init?(intValue _: Int) {
+ nil
+ }
+}
+
/// Hook payload 不直接提供 reviewer 和 effort; 从当前 rollout 尾部只提取匹配 turn 的上下文
private nonisolated enum WorkflowTurnContextReader {
static func context(
diff --git a/Config/Version.xcconfig b/Config/Version.xcconfig
index 7399f3e..a0ec093 100644
--- a/Config/Version.xcconfig
+++ b/Config/Version.xcconfig
@@ -1,2 +1,2 @@
-MARKETING_VERSION = 3.6.7
-CURRENT_PROJECT_VERSION = 74
+MARKETING_VERSION = 3.6.8
+CURRENT_PROJECT_VERSION = 75
diff --git a/Docs/DeveloperGuide/activity-monitor.md b/Docs/DeveloperGuide/activity-monitor.md
index 9d6dabb..df0c233 100644
--- a/Docs/DeveloperGuide/activity-monitor.md
+++ b/Docs/DeveloperGuide/activity-monitor.md
@@ -192,6 +192,25 @@ subagent 事件更新父任务的 subagent 活动,不创建独立顶层任务
完全没有 session ID 时只能使用 project key。这个 key 可能把同项目并发匿名任务合并,所以匿名任务只承担可撤销的 UI 展示,不驱动通知、防睡眠或持久化保护。
+### Auto-review 来源过滤
+
+`CodexActivityMonitor.apply` 在任何状态转换之前检查 `WorkflowHookEvent.origin`。`autoReview` 不进入实时任务状态机,因此不会出现在菜单栏、活动卡片、任务中心和任务计数中,也不会产生通知、触觉反馈、等待批准、异常会话保护或防睡眠贡献。
+
+过滤使用精确的 `session ID + turn ID`,因为 Codex 的 subagent Hook 复用父 session ID。只按 session 过滤会连同真正的主任务一起隐藏。
+
+当一条精确 Auto-review 事件到达时,monitor 会:
+
+- 删除同 key 的活动任务和 terminal grace 候选
+- 删除同 key 的最近完成、最近终止和 terminal 去重记忆
+- 取消异常会话保护尝试、持久化记录和待处理通知
+- 在 24 小时有界表中记住该精确 key,让同一任务后续 `unknown` 事件无法恢复它
+
+明确的 `main` 或 `auxiliary` 事件随后命中同一 key 时,来源事实优先并清除这条忽略记忆。Auto-review 事件缺少 turn ID 时只忽略当前事件,不建立 session 级黑名单。
+
+其他 subagent 统一归类为 `auxiliary` 并保持原有行为,Memories 不因这项规则改变。原始 Hook 事件仍进入历史聚合,因此实时任务过滤不会改变统计或 CloudKit 数据。
+
+升级前已写入的事件没有 `origin`,会按 `unknown` 继续执行原行为。monitor 只回放最近 24 小时,所以最后一条旧事件离开窗口后最迟约 24 小时完成自然过渡;实现不扫描历史 rollout,也不按 model 名兼容。
+
### 为什么新 prompt 不直接把旧 turn 判为中断
同一 session 的 turn 顺序执行。新 prompt 到来时旧 turn 必须立即离开活跃列表,否则 UI 会短暂显示两个顶层任务。
diff --git a/Docs/DeveloperGuide/data-and-privacy.md b/Docs/DeveloperGuide/data-and-privacy.md
index 519ed2a..d65bd21 100644
--- a/Docs/DeveloperGuide/data-and-privacy.md
+++ b/Docs/DeveloperGuide/data-and-privacy.md
@@ -104,15 +104,17 @@ Hook 子进程从 stdin 提取:
- permission 和 reviewer
- session, turn 和 agent 身份
+`transcript_path` 可用时,Hook 子进程还会从 rollout 第一条完整 `session_meta` 中提取并归一化来源,只持久化 `main`, `autoReview`, `auxiliary` 或 `unknown`。读取按 32 KiB 分块且总计不超过 256 KiB。
+
不把 prompt, response, tool 参数或 tool 输出写入 CodexBar Hook 文件。
-工作目录只用于派生 project display name 和实时归属。原始 Hook JSONL 仍可能包含 `cwd`,因此它属于本地敏感上下文,受保留期和文件权限约束。CloudKit 只上传派生后的 project 名计数,并明确依赖用户 opt-in。
+工作目录只用于派生 project display name 和实时归属。原始 Hook JSONL 仍可能包含 `cwd`,因此它属于本地敏感上下文,受保留期和文件权限约束。rollout 路径、原始 source 和任意 subagent `other` 值不会持久化。CloudKit 只上传派生后的 project 名计数,并明确依赖用户 opt-in。
### Rollout 文件
-实时活动 reader 会访问 `$CODEX_HOME/sessions` 和 `$CODEX_HOME/archived_sessions`
+Hook recorder 通过 `transcript_path` 读取当前 rollout,实时活动 reader 还会访问 `$CODEX_HOME/sessions` 和 `$CODEX_HOME/archived_sessions`
-它只解析生命周期、时间、turn context, progress, effort 和 reviewer 等结构字段。不把对话正文复制到 CodexBar 存储或展示到 UI。
+这些读取只解析来源分类、生命周期、时间、turn context, progress, effort 和 reviewer 等结构字段,不把对话正文复制到 CodexBar 存储或展示到 UI。
rollout reader 从文件尾部按预算扫描,一方面减少 I/O,另一方面降低无关历史内容进入进程内存的范围。解析 DTO 只声明所需字段,JSONDecoder 自动忽略其余内容。
diff --git a/Docs/DeveloperGuide/hook-and-aggregation.md b/Docs/DeveloperGuide/hook-and-aggregation.md
index d0317fa..ff393f0 100644
--- a/Docs/DeveloperGuide/hook-and-aggregation.md
+++ b/Docs/DeveloperGuide/hook-and-aggregation.md
@@ -146,11 +146,11 @@ CodexBar 订阅以下 Hook 事件:
### 事件字段和用途并不完全相同
-历史计数需要事件名、日期、project、model 和身份集合。实时状态还需要 turn, reviewer, effort, tool 和 agent 关联。
+历史计数需要事件名、日期、project、model 和身份集合。实时状态还需要 turn, reviewer, effort, tool, agent 关联和归一化来源。
把两类需求统一在一条最小原始记录中,可以让 recorder 只写一次,两个下游各自选择所需字段。但新增字段前仍要证明至少有一个消费者需要它,不能因为 Hook payload 中存在就全部持久化。
-`PermissionRequest` 和 `UserPromptSubmit` 的 reviewer 或 effort 可能不在 Hook payload 中。recorder 只在这两个事件上按 turn 定向读取 rollout 尾部,避免所有事件都承担额外文件 I/O。
+`transcript_path` 可用时,recorder 会为来源分类有界读取 rollout 首行。`PermissionRequest` 和 `UserPromptSubmit` 的 reviewer 或 effort 可能不在 Hook payload 中,只有这两个事件还会按 turn 定向读取 rollout 尾部。
## Hook 子进程
@@ -223,6 +223,7 @@ Codex 对 `SessionEnd` 最多等待 3 秒,其他事件最多 5 秒。recorder
- permission 与 approval reviewer
- session ID 和 turn ID
- agent 与 parent 关系
+- 归一化来源 `origin`
对于 `UserPromptSubmit` 和 `PermissionRequest`,输入事件可能不包含 reviewer 或 effort。recorder 会在必要时从 rollout transcript 尾部回查匹配的 `turn_context`
@@ -232,6 +233,25 @@ Codex 对 `SessionEnd` 最多等待 3 秒,其他事件最多 5 秒。recorder
- 只提取 reviewer 和 effort 等结构字段
- 不把 prompt 或 response 内容写入 Hook 统计
+### 来源归一化
+
+`WorkflowHookEvent.origin` 是 CodexBar 自己维护的有限枚举,不是 rollout 原始 `source` 的副本:
+
+| `origin` | 判定 |
+| --- | --- |
+| `main` | `source` 是已知顶层字符串来源 `cli`, `vscode`, `exec`, `mcp`,或有效对象来源 `{ "custom": "..." }` |
+| `autoReview` | `source.subagent.other` 与 `guardian` 完全匹配 |
+| `auxiliary` | `source` 明确表示其他 subagent,包括 `review`, `thread_spawn` 和 Memories 相关来源 |
+| `unknown` | 字段缺失、结构损坏、无法读取或遇到未知顶层来源 |
+
+来源读取从文件起点按 32 KiB 分块,遇到第一个 newline 立即停止,总预算为 256 KiB。第一条完整记录不是 `session_meta`、超过预算或任何文件与解码操作失败时都回退到 `unknown`,不等待、不重试,也不能让 Hook 失败。
+
+原始 JSONL 只保存上述枚举值。`transcript_path`、原始 `source`、任意 `other` 字符串和 transcript 内容都不会写入 Hook 文件或系统日志。
+
+旧事件缺少 `origin`,以及未来版本写入当前 App 不认识的枚举值时,都解码为 `unknown`。CodexBar 不回填历史记录,也不使用 `model == "codex-auto-review"` 猜测来源。
+
+`origin` 只改变实时活动过滤,不改变历史统计输入。Auto-review 事件仍参与现有 session、turn、model、tool、project 和事件计数,因此这次改动不递增聚合 schema,也不改变 CloudKit 投影。
+
### 输入归一化
Hook payload 在不同版本中可能把标识或时间表示为不同 JSON 类型。`WorkflowHookPayload` 集中做宽松归一化:
diff --git a/Docs/UserGuide/activity-and-hook.md b/Docs/UserGuide/activity-and-hook.md
index e226c4f..87c0eef 100644
--- a/Docs/UserGuide/activity-and-hook.md
+++ b/Docs/UserGuide/activity-and-hook.md
@@ -71,6 +71,10 @@ CodexBar 使用 `$CODEX_HOME/hooks.json`,未设置 `CODEX_HOME` 时使用 `~/.
子 Agent 事件会更新所属顶层任务,不会独立显示为另一条并发任务。
+Codex Auto-review 使用独立 reviewer agent 处理权限审核。CodexBar 会识别并排除这个内部审核任务,因此它不会显示在菜单栏、活动卡片或任务中心,也不会触发通知、触觉反馈、异常会话保护或防睡眠。其他子 Agent 的现有行为不变。
+
+实时任务只回放最近 24 小时,这些旧记录会在最后一条旧事件之后最多约 24 小时自然退出。
+
Hook 事件缺少 session ID 时,CodexBar 会按项目显示匿名任务。匿名任务仍可出现在运行中、等待批准、最近完成和最近终止列表中,但不触发任务通知或触觉反馈,不参与防睡眠和异常会话保护。
活动卡片和任务中心使用橙色匿名图标标记这类任务,悬停时显示 `匿名任务不参与防睡眠`
@@ -100,6 +104,8 @@ Hook 事件缺少 session ID 时,CodexBar 会按项目显示匿名任务。匿
使用较大值可以在成对事件缺少一端时保留已经观察到的操作数量。
+Auto-review 只从实时任务链路中排除,其 Hook 事件仍参与上述每日统计。
+
## 关闭 Hook 的影响
关闭 Hook 后以下功能停止更新:
@@ -115,9 +121,9 @@ Hook 事件缺少 session ID 时,CodexBar 会按项目显示匿名任务。匿
## 数据边界
-Hook 原始事件只保存时间、事件名、模型、推理强度、权限模式、`reviewer`、`session`、`turn`、`agent`、工具名和工作目录等结构化字段。
+Hook 原始事件只保存时间、事件名、归一化来源 `origin`、模型、推理强度、权限模式、`reviewer`、`session`、`turn`、`agent`、工具名和工作目录等结构化字段。
-CodexBar 不保存 prompt 文本、Codex 回复、工具参数或工具输出。
+CodexBar 不保存 rollout 路径、原始来源值、prompt 文本、Codex 回复、工具参数或工具输出。
完整存储和同步边界见 [数据、同步与隐私](sync-data-privacy.md)
diff --git a/Docs/UserGuide/sync-data-privacy.md b/Docs/UserGuide/sync-data-privacy.md
index f14b313..0e2b399 100644
--- a/Docs/UserGuide/sync-data-privacy.md
+++ b/Docs/UserGuide/sync-data-privacy.md
@@ -109,9 +109,9 @@ CodexBar 会读取以下本机数据:
- 通过本机 app-server 获取账户、额度、Token 用量、手动重置次数明细和 Codex 配置
- 读取 Hook 原始事件以生成统计和实时任务
-- 读取本机 Codex rollout 的生命周期字段以区分完成与终止并补充进展时间
+- 读取本机 Codex rollout 的首条来源和生命周期字段,以排除 Auto-review 实时任务、区分完成与终止并补充进展时间
-rollout 读取只提取生命周期、时间和推理强度等字段,不展示或保存会话正文和工具内容。
+rollout 来源读取最多 256 KiB,只保存 `main`, `autoReview`, `auxiliary` 或 `unknown` 四种归一化结果。CodexBar 不保存 rollout 路径或原始来源值;其他 rollout 读取也只提取生命周期、时间和推理强度等字段,不展示或保存会话正文和工具内容。
用户主动开启自动重置后,CodexBar 通过同一个本机 app-server 使用明确列出的临期重置次数。原始 `creditId` 和幂等键不写入磁盘或 CloudKit;`UserDefaults` 只保存功能开关、提前量、自动重置通知开关、音效选择和哈希后的通知去重键。
diff --git a/Docs/en/DeveloperGuide/activity-monitor.md b/Docs/en/DeveloperGuide/activity-monitor.md
index 9f5bff0..ebe6787 100644
--- a/Docs/en/DeveloperGuide/activity-monitor.md
+++ b/Docs/en/DeveloperGuide/activity-monitor.md
@@ -192,6 +192,25 @@ Some events contain only session ID. A session key still participates in state,
Without a session ID, only a project key remains. It may merge concurrent anonymous tasks in one project, so anonymous tasks provide reversible UI visibility but cannot drive notifications, sleep prevention, or persisted protection.
+### Auto-review Origin Filtering
+
+`CodexActivityMonitor.apply` checks `WorkflowHookEvent.origin` before any state transition. An `autoReview` event never enters the live-task state machine, so it cannot appear in the menu bar, activity card, Task Center, or task counts and cannot produce notifications, haptics, approval waiting, Stalled Task Protection, or sleep-prevention contribution.
+
+Filtering uses the exact `session ID + turn ID` because Codex subagent Hooks reuse the parent session ID. Filtering by session alone would also hide the real main task.
+
+When an exact Auto-review event arrives, the monitor:
+
+- Removes the active task and terminal-grace candidate for that key
+- Removes recent completion, recent termination, and terminal-deduplication memory for that key
+- Cancels Stalled Task Protection attempts, persisted records, and pending notifications
+- Remembers the exact key in a 24-hour bounded table so later `unknown` events cannot revive the same task
+
+If an explicit `main` or `auxiliary` event later matches the same key, source truth wins and clears that ignored-key inference. An Auto-review event without a turn ID is ignored only for that event and never creates a session-wide blacklist.
+
+Other subagents normalize to `auxiliary` and retain their existing behavior; Memories does not change under this rule. Raw Hook events still enter historical aggregation, so live-task filtering does not change metrics or CloudKit data.
+
+Events written before the upgrade have no `origin` and continue under existing behavior as `unknown`. The monitor replays only the most recent 24 hours, so the transition completes naturally no later than about 24 hours after the final legacy event; the implementation neither scans historical rollouts nor falls back to model-name matching.
+
### Why a New Prompt Does Not Immediately Terminate the Old Turn
Turns in one session run sequentially. When a new prompt arrives, the old turn must leave the active list immediately or the UI briefly shows two top-level tasks.
diff --git a/Docs/en/DeveloperGuide/data-and-privacy.md b/Docs/en/DeveloperGuide/data-and-privacy.md
index 2ead95d..af1a076 100644
--- a/Docs/en/DeveloperGuide/data-and-privacy.md
+++ b/Docs/en/DeveloperGuide/data-and-privacy.md
@@ -104,15 +104,17 @@ The Hook subprocess extracts from stdin:
- Permission and reviewer
- Session, turn, and agent identities
+When `transcript_path` is available, the Hook subprocess also extracts and normalizes origin from the rollout's first complete `session_meta` record, persisting only `main`, `autoReview`, `auxiliary`, or `unknown`. It reads in 32 KiB chunks with a total limit of 256 KiB.
+
It does not write prompt text, responses, tool arguments, or tool output to CodexBar Hook files.
-The working directory is used only to derive a project display name and live-task ownership. Raw Hook JSONL may still include `cwd`, making it sensitive local context subject to retention and file-permission limits. CloudKit uploads only derived project-name counts and only after explicit opt-in.
+The working directory is used only to derive a project display name and live-task ownership. Raw Hook JSONL may still include `cwd`, making it sensitive local context subject to retention and file-permission limits. Rollout paths, raw source values, and arbitrary subagent `other` values are not persisted. CloudKit uploads only derived project-name counts and only after explicit opt-in.
### Rollout Files
-The live-activity reader accesses `$CODEX_HOME/sessions` and `$CODEX_HOME/archived_sessions`.
+The Hook recorder reads the current rollout through `transcript_path`, and the live-activity reader also accesses `$CODEX_HOME/sessions` and `$CODEX_HOME/archived_sessions`.
-It parses only structural fields such as lifecycle, time, turn context, progress, effort, and reviewer. It neither copies conversation text into CodexBar storage nor presents it in the UI.
+These reads parse only structural fields such as origin classification, lifecycle, time, turn context, progress, effort, and reviewer. They neither copy conversation text into CodexBar storage nor present it in the UI.
The rollout reader scans backward from file tails under a budget. This reduces I/O and limits how much unrelated historical content enters process memory. Parsing DTOs declare only required fields, and `JSONDecoder` ignores everything else.
diff --git a/Docs/en/DeveloperGuide/hook-and-aggregation.md b/Docs/en/DeveloperGuide/hook-and-aggregation.md
index ccb3f74..04a9634 100644
--- a/Docs/en/DeveloperGuide/hook-and-aggregation.md
+++ b/Docs/en/DeveloperGuide/hook-and-aggregation.md
@@ -146,11 +146,11 @@ CodexBar subscribes to:
### Event Fields Serve Different Uses
-Historical counts need event name, date, project, model, and identity sets. Live state additionally needs turn, reviewer, effort, tool, and agent relationships.
+Historical counts need event name, date, project, model, and identity sets. Live state additionally needs turn, reviewer, effort, tool, agent relationships, and normalized origin.
One minimal raw record lets the recorder write once while both consumers select their fields. A new field still requires a demonstrated consumer; its presence in the Hook payload does not justify persisting everything.
-Reviewer or effort for `PermissionRequest` and `UserPromptSubmit` may be absent from the Hook payload. Only for these two events, the recorder reads the rollout tail for that turn, avoiding extra file I/O on every event.
+When `transcript_path` is available, the recorder performs a bounded read of the rollout's first line to classify origin. Reviewer or effort for `PermissionRequest` and `UserPromptSubmit` may be absent from the Hook payload, so only those two events also read the rollout tail for that turn.
## Hook Subprocess
@@ -223,6 +223,7 @@ Raw records retain only information required for statistics and live state:
- Permission and approval reviewer
- Session and turn IDs
- Agent and parent relationships
+- Normalized `origin`
For `UserPromptSubmit` and `PermissionRequest`, input may omit reviewer or effort. When needed, the recorder looks for a matching `turn_context` near the end of the rollout transcript.
@@ -232,6 +233,25 @@ The lookup:
- Extracts only structural fields such as reviewer and effort
- Never writes prompt or response content to Hook statistics
+### Origin Normalization
+
+`WorkflowHookEvent.origin` is a finite CodexBar-owned enum, not a copy of the rollout's raw `source`:
+
+| `origin` | Classification |
+| --- | --- |
+| `main` | `source` is a known top-level string source `cli`, `vscode`, `exec`, or `mcp`, or a valid object source `{ "custom": "..." }` |
+| `autoReview` | `source.subagent.other` exactly equals `guardian` |
+| `auxiliary` | `source` explicitly represents another subagent, including `review`, `thread_spawn`, and Memories-related sources |
+| `unknown` | The field is missing, malformed, unreadable, or an unknown top-level source |
+
+Origin reading starts at byte zero in 32 KiB chunks, stops at the first newline, and has a total budget of 256 KiB. If the first complete record is not `session_meta`, exceeds the budget, or any file or decoding operation fails, classification falls back to `unknown` without waiting or retrying and without failing the Hook.
+
+Raw JSONL stores only this enum. It never stores `transcript_path`, raw `source`, arbitrary `other` strings, or transcript content, and none of those values enter system logs.
+
+Old events without `origin` and future enum values unknown to the current app both decode as `unknown`. CodexBar neither backfills historical records nor infers origin from `model == "codex-auto-review"`.
+
+`origin` changes only live-activity filtering, not historical aggregation input. Auto-review events continue to contribute to existing session, turn, model, tool, project, and event counts, so this change does not increment the aggregation schema or alter the CloudKit projection.
+
### Input Normalization
Hook payload versions may represent identifiers and time as different JSON types. `WorkflowHookPayload` centralizes permissive normalization:
diff --git a/Docs/en/UserGuide/activity-and-hook.md b/Docs/en/UserGuide/activity-and-hook.md
index 78a3ef5..5b7bd7b 100644
--- a/Docs/en/UserGuide/activity-and-hook.md
+++ b/Docs/en/UserGuide/activity-and-hook.md
@@ -71,6 +71,10 @@ Waiting for Approval applies only to approval requests that require user action.
Subagent events update their parent top-level task instead of appearing as separate concurrent tasks.
+Codex Auto-review uses a separate reviewer agent for permission review. CodexBar recognizes and excludes that internal review task, so it does not appear in the menu bar, activity card, or Task Center and cannot trigger notifications, haptics, Stalled Task Protection, or sleep prevention. Existing behavior for other subagents is unchanged.
+
+Hook events written before the upgrade have no origin classification and may still restore legacy Auto-review tasks. Live activity replays only the most recent 24 hours, so those old records age out naturally no later than about 24 hours after the final legacy event, without a historical migration.
+
When a Hook event has no session ID, CodexBar shows an anonymous task for its project. Anonymous tasks can still appear in Running, Waiting for Approval, Recently Completed, and Recently Terminated lists, but they do not trigger task notifications or haptic feedback and do not participate in sleep prevention or stalled task protection.
The activity card and Task Center mark these tasks with an orange anonymous icon. Hovering over it shows `Anonymous tasks do not prevent sleep`.
@@ -100,6 +104,8 @@ The activity card and Task Center mark these tasks with an orange anonymous icon
Using the larger count preserves observed operations when one side of an event pair is missing.
+Auto-review is excluded only from the live-task pipeline; its Hook events still contribute to these daily metrics.
+
## Effects of Disabling the Hook
Disabling CodexBar Hook stops updates to:
@@ -115,9 +121,9 @@ Account data, rate limits, the token heatmap, update checks, and the Logs window
## Data Boundaries
-Raw Hook events contain only structured fields such as time, event name, model, reasoning effort, approval mode, `reviewer`, `session`, `turn`, `agent`, tool name, and working directory.
+Raw Hook events contain only structured fields such as time, event name, normalized `origin`, model, reasoning effort, approval mode, `reviewer`, `session`, `turn`, `agent`, tool name, and working directory.
-CodexBar does not store prompt text, Codex responses, tool arguments, or tool output.
+CodexBar does not store rollout paths, raw source values, prompt text, Codex responses, tool arguments, or tool output.
See [Data, Sync, and Privacy](sync-data-privacy.md) for complete storage and sync boundaries.
diff --git a/Docs/en/UserGuide/sync-data-privacy.md b/Docs/en/UserGuide/sync-data-privacy.md
index 024dc36..858b071 100644
--- a/Docs/en/UserGuide/sync-data-privacy.md
+++ b/Docs/en/UserGuide/sync-data-privacy.md
@@ -109,9 +109,9 @@ CodexBar reads the following local data:
- Account, rate-limit, token usage, reset-credit details, and Codex configuration through the local app-server
- Raw Hook events to generate metrics and live tasks
-- Lifecycle fields from local Codex rollout files to distinguish completion from termination and supplement progress timestamps
+- The first origin and lifecycle fields from local Codex rollout files to exclude Auto-review live tasks, distinguish completion from termination, and supplement progress timestamps
-Rollout reading extracts only lifecycle, time, reasoning-effort, and similar fields. It does not display or store conversation text or tool content.
+Origin reading is limited to 256 KiB and stores only the normalized result `main`, `autoReview`, `auxiliary`, or `unknown`. CodexBar does not store rollout paths or raw source values; other rollout reads likewise extract only lifecycle, time, reasoning-effort, and similar fields and never display or store conversation text or tool content.
After you explicitly enable Automatic Reset, CodexBar uses reset credits that the same local app-server explicitly reports as near expiration. Raw `creditId` and idempotency keys are not written to disk or CloudKit. `UserDefaults` stores only the feature switch, lead time, notification switch, sound choice, and hashed notification-deduplication keys.
diff --git a/appcast.xml b/appcast.xml
index e2eb64f..b164804 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.8</title>
+ <sparkle:version>75</sparkle:version>
+ <sparkle:shortVersionString>3.6.8</sparkle:shortVersionString>
+ <sparkle:minimumSystemVersion>15.0</sparkle:minimumSystemVersion>
+ <sparkle:releaseNotesLink>https://codexbar.zabrian.app/notes#3.6.8</sparkle:releaseNotesLink>
+ <pubDate>Wed, 26 Aug 2026 17:01:45 +0800</pubDate>
+ <enclosure url="https://codexbar.zabrian.app/download/CodexBar-v3.6.8.dmg" sparkle:edSignature="JlqlNXyWcWthF3G6e2mAD/9ThhNR6jjzJZNMcUMStsCWSguVJ7vL7cc2uPJ3sO0u9vPk8mcZF2c+gbBL/9IOBQ==" length="7210307" type="application/octet-stream"/>
+ </item>
<item>
<title>CodexBar.app 3.6.7</title>
<sparkle:version>74</sparkle:version>