CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息
Swift appkitcodexcodex-clideveloper-toolsmacosmacos-appmenu-bar-appopenai-codexproductivityswiftswiftuiusage-tracker
docs: 精简项目注释与用户文案
Bob8880bf3531d7
diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.ymlindex 6651fd9..7c9249c 100644--- a/.github/ISSUE_TEMPLATE/bug.yml+++ b/.github/ISSUE_TEMPLATE/bug.yml@@ -26,7 +26,7 @@ body:attributes:label: CodexBar 版本 / CodexBar versiondescription: |- 在 "菜单栏 CodexBar 图标右键 → 设置 → 关于选项卡" 中查看。+ 右键点击菜单栏中的 CodexBar 图标,在“设置 → 关于”中查看。Right-click the CodexBar menu bar icon → Settings → About tab.validations:@@ -60,7 +60,7 @@ body:attributes:label: Codex CLI 版本 / Codex CLI versiondescription: |- 在 "菜单栏 CodexBar 图标右键 → 设置 → 关于选项卡" 中查看,或在终端运行 `codex --version`(未安装可留空)。+ 右键点击菜单栏中的 CodexBar 图标,在“设置 → 关于”中查看,或在终端运行 `codex --version`(未安装可留空)。Right-click the CodexBar menu bar icon → Settings → About tab. You can also run `codex --version` in Terminal (leave blank if not installed).validations:@@ -71,7 +71,7 @@ body:attributes:label: Codex App 版本 / Codex App versiondescription: |- 在 "菜单栏 CodexBar 图标右键 → 设置 → 关于选项卡" 或 Codex App 中查看(未使用可留空)。+ 在 CodexBar 的“设置 → 关于”或 Codex App 中查看(未使用可留空)。Right-click the CodexBar menu bar icon → Settings → About tab, or check Codex App (leave blank if not used).validations:diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.ymlindex f42e50b..8a6cef8 100644--- a/.github/ISSUE_TEMPLATE/question.yml+++ b/.github/ISSUE_TEMPLATE/question.yml@@ -37,7 +37,7 @@ body:attributes:label: CodexBar 版本 / CodexBar versiondescription: |- 在 "菜单栏 CodexBar 图标右键 → 设置 → 关于选项卡" 中查看。+ 右键点击菜单栏中的 CodexBar 图标,在“设置 → 关于”中查看。Right-click the CodexBar menu bar icon → Settings → About tab.validations:@@ -67,7 +67,7 @@ body:attributes:label: Codex CLI 版本 / Codex CLI versiondescription: |- 在 "菜单栏 CodexBar 图标右键 → 设置 → 关于选项卡" 中查看,或在终端运行 `codex --version`+ 右键点击菜单栏中的 CodexBar 图标,在“设置 → 关于”中查看,或在终端运行 `codex --version`Right-click the CodexBar menu bar icon → Settings → About tab. You can also run `codex --version` in Terminal.validations:@@ -78,7 +78,7 @@ body:attributes:label: Codex App 版本 / Codex App versiondescription: |- 在 "菜单栏 CodexBar 图标右键 → 设置 → 关于选项卡" 或 Codex App 中查看。+ 在 CodexBar 的“设置 → 关于”或 Codex App 中查看。Right-click the CodexBar menu bar icon → Settings → About tab, or check Codex App.validations:diff --git a/.github/workflows/issue-notification.yml b/.github/workflows/issue-notification.ymlindex 3dc4c7a..1fe759a 100644--- a/.github/workflows/issue-notification.yml+++ b/.github/workflows/issue-notification.yml@@ -33,7 +33,7 @@ jobs:case "$GITHUB_EVENT_NAME" inissues)issue_title="$(jq -r '.issue.title' "$GITHUB_EVENT_PATH")"- title="CodexBar 有新的 Issues"+ title="CodexBar 收到新 Issue"body="$issue_title";;issue_comment)@@ -50,11 +50,11 @@ jobs:fiissue_title="$(jq -r '.issue.title' "$GITHUB_EVENT_PATH")"- title="CodexBar Issues 有新的评论"+ title="CodexBar Issue 收到新评论"body="$issue_title";;workflow_dispatch)- title="CodexBar Issues 通知测试"+ title="CodexBar Issue 通知测试"body="Bark 配置有效";;*)diff --git a/AGENTS.md b/AGENTS.mdindex c39e511..4bc80de 100644--- a/AGENTS.md+++ b/AGENTS.md@@ -13,7 +13,7 @@- 保持核心逻辑易于理解和验证,模块边界明确、职责合理,优先复用已有能力- 处理必要的边界条件和异常场景,为可预见的变化保留空间- 对生命周期短、影响范围小或需求高度不确定的问题控制前期投入,不为假设中的需求设计复杂架构-- 让实现和维护成本与业务价值相匹配;长期收益与当前简洁性发生冲突时,说明生命周期、变更概率、影响范围、可逆性和未来修正成本等权衡依据+- 让实现和维护成本与业务价值相匹配;长期收益与当前简洁性难以兼顾时,结合生命周期、变更概率、影响范围、可逆性和未来修正成本说明取舍## 判断与行动原则@@ -40,7 +40,7 @@### 给出可验证的判断-能量化时使用数字,能形成明确结论时直接表态,不用模糊措辞或表面中立代替判断。根据问题需要,说明结论及适用边界、事实依据与推导、关键风险与失败条件、实施步骤、验证方法和验收标准。+能量化时使用数字,有明确结论时直接说明,不用模糊措辞或表面中立代替判断。按问题需要,说明结论的适用范围、事实依据和推导过程、主要风险与失败条件,以及实施步骤、验证方法和验收标准。## 沟通原则@@ -50,13 +50,12 @@- 挑战时说明事实依据、推导和实际影响,并给出可执行的替代方案;不机械质疑,不揣测用户动机- 根据事实和可验证的推理作出判断,不因用户预期或表面中立改变结论;讨论具体分歧,避免立场对抗- 保持尊重、直接和坚定;用户提供更可靠的事实或推导后,及时修正结论并说明依据,不作无意义的辩护-- 讨论应有助于得到准确、成本合理且能落地的结果## 项目结构与模块组织CodexBar 是面向 macOS 的 `LSUIElement` 菜单栏应用,使用 Swift 6, SwiftUI, AppKit 和 MVVM。工程只有 `CodexBar` scheme,包含主 App、`CodexBarPowerHelperManager`、`CodexBarPowerHelper`、`CodexBarTests` 和 `CodexBarPowerHelperTests` 五个 target。-`CodexBar/` 按 `App/` `Views/` `Controllers/` `Models/` `Services/` 和 `Resources/` 分层。`CodexBarHelper/` 按职责组织 Helper;其中 `Power/Daemon/` 提供电源管理的 root LaunchDaemon,主 App 直接与其通信;`Power/Manager/` 提供嵌入主 App 的管理 App,拥有该 daemon 的注册与授权归属;`Power/Shared/` 存放跨 target 协议与身份定义。通用跨 target 工具位于 `Shared/`。测试统一放在 `Tests/`,按被测模块划分为 `App/` 和 `Helpers/`。`Scripts/` 提供发布和 Helper 清理工具,`Images/` 存放 README 资源,`Design/` 统一存放主 App 和 Helper 的原始设计图、图标工程等设计素材。+`CodexBar/` 按 `App/` `Views/` `Controllers/` `Models/` `Services/` 和 `Resources/` 分层。`CodexBarHelper/` 按职责组织 Helper。其中,`Power/Daemon/` 提供电源管理的 root LaunchDaemon,主 App 直接与其通信;`Power/Manager/` 提供嵌入主 App 的管理 App,负责该 daemon 的注册,系统授权也归属于它;`Power/Shared/` 存放跨 target 协议与身份定义。通用跨 target 工具位于 `Shared/`。测试统一放在 `Tests/`,按被测模块划分为 `App/` 和 `Helpers/`。`Scripts/` 提供发布和 Helper 清理工具,`Images/` 存放 README 资源,`Design/` 统一存放主 App 和 Helper 的原始设计图、图标工程等设计素材。## 构建、测试与开发命令@@ -90,7 +89,7 @@ CodexBar 是面向 macOS 的 `LSUIElement` 菜单栏应用,使用 Swift 6, Swi- 注释清晰简洁、通俗易懂,优先说明代码中不明显的原因和约束,避免复述实现- 一个注释段只解释一件事,长注释按主题分段;需要列出独立条件或步骤时使用简短列表- 按职责边界适当使用 `// MARK: - 名称`,帮助浏览较长文件;不为每个属性或短函数单独添加标记-- 不在注释中重复容易变化的展示数量、尺寸或动画参数;涉及数据处理时直接说明字段和操作,避免使用各种笼统表述+- 不在注释中重复容易变化的展示数量、尺寸或动画参数;涉及数据处理时说明具体字段和操作### 项目文档@@ -106,7 +105,7 @@ CodexBar 是面向 macOS 的 `LSUIElement` 菜单栏应用,使用 Swift 6, Swi- 如果一行以 Markdown 格式的链接或行内代码结尾,后面不加任何标点;链接或行内代码位于句中时仍按句子结构使用中文标点- Markdown 语法、代码块、命令、路径、URL、版本号和程序标识符内部的符号保持原样- 如果某句话的作用只是防止被质疑,而不是推进论证,请删除这句话-- 文档只描述当前行为,不记录或者强调变更过程,同时删除没有实质信息的防御性表述+- 文档只描述当前行为,不记录变更过程,删除没有实质信息的辩解## 架构与编码约定@@ -170,7 +169,7 @@ CodexBar 是面向 macOS 的 `LSUIElement` 菜单栏应用,使用 Swift 6, Swi- 标题概括本次提交最主要的问题或目标,不用次要交互细节或局部实现代替核心目的- body 围绕核心目的解释必要的原因、关键行为变化和影响;实现细节仅在有助于理解目的或评估影响时保留-- 只保留代码最终的行为以及状态,不要把代码变化的中间的状态作为变更记录+- 只描述代码最终的行为和状态,不记录开发过程中的中间状态- 不把文件清单、函数改动清单或开发过程直接作为提交说明,也不为覆盖每一处 diff 而堆砌条目提交标题使用 `<type>: <中文描述>` 格式:diff --git a/CodexBar/Controllers/ScreenGeometry.swift b/CodexBar/Controllers/ScreenGeometry.swiftindex 3d8f9bf..2168fc0 100644--- a/CodexBar/Controllers/ScreenGeometry.swift+++ b/CodexBar/Controllers/ScreenGeometry.swift@@ -26,7 +26,7 @@ nonisolated extension CGRect {@MainActorextension NSWindow {- /// LSUIElement 应用无 Dock 图标, 把窗口可靠拉到最前依赖这套固定激活序列+ /// LSUIElement 应用没有 Dock 图标, 需按此顺序激活才能将窗口置于最前func bringToFrontActivatingApp() {orderFrontRegardless()NSRunningApplication.current.activate(options: [])diff --git a/CodexBar/Controllers/StatusItemController.swift b/CodexBar/Controllers/StatusItemController.swiftindex 375de04..f6f5b51 100644--- a/CodexBar/Controllers/StatusItemController.swift+++ b/CodexBar/Controllers/StatusItemController.swift@@ -181,7 +181,7 @@ final class StatusItemController: NSObject, NSMenuDelegate {openSettings()}- /// 通知点击回调: 面板未展示时按快捷键路径打开(含 fallback 面板兜底)+ /// 点击通知时, 按快捷键的处理流程打开尚未显示的面板, 必要时使用 fallback 面板func openMenuSurfaceFromNotification() {guard menuSurfaceWillOpenOnToggle else {returndiff --git a/CodexBar/Models/ActivityModels.swift b/CodexBar/Models/ActivityModels.swiftindex 3e2e7f0..fd339ef 100644--- a/CodexBar/Models/ActivityModels.swift+++ b/CodexBar/Models/ActivityModels.swift@@ -15,7 +15,7 @@ nonisolated struct ActivityTaskSnapshot: Equatable, Identifiable {let effort: String?let startedAt: Date?let stateChangedAt: Date- /// nil 表示 活动字段不足, 无法可靠统计; 0 表示已确认当前没有活跃子 Agent+ /// nil 表示活动字段不足, 无法可靠统计; 0 表示已确认当前没有活跃子 Agentlet activeSubagentCount: Int?var tokenUsage: TokenUsage?var approvalActionText: String?diff --git a/CodexBar/Models/HistorySnapshot.swift b/CodexBar/Models/HistorySnapshot.swiftindex fdd9d52..53a3639 100644--- a/CodexBar/Models/HistorySnapshot.swift+++ b/CodexBar/Models/HistorySnapshot.swift@@ -1,6 +1,6 @@// MARK: - 每日聚合指标-/// 热力图详情面板直接消费的每日统计+/// 热力图详情面板直接读取的每日统计nonisolated struct ActivityDataMetrics: Equatable {let startDate: Stringlet threadCount: Int?diff --git a/CodexBar/Resources/Localizable.xcstrings b/CodexBar/Resources/Localizable.xcstringsindex 140ad3c..3b09584 100644--- a/CodexBar/Resources/Localizable.xcstrings+++ b/CodexBar/Resources/Localizable.xcstrings@@ -828,7 +828,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "认证恢复流程已结束"+ "value" : "认证恢复已结束"}}}@@ -1228,7 +1228,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "正在执行 %@ 等多个命令"+ "value" : "正在执行 %@ 等命令"}}}@@ -1356,7 +1356,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "Hook 执行已完成"+ "value" : "Hook 执行完成"}}}@@ -1372,7 +1372,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "Hook 执行已失败"+ "value" : "Hook 执行失败"}}}@@ -1388,7 +1388,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "Hook 执行已停止"+ "value" : "Hook 已停止执行"}}}@@ -1510,7 +1510,7 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "%@ command execution completed"+ "value" : "%@ command completed"}},"zh-Hans" : {@@ -1542,7 +1542,7 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "%@ command execution failed"+ "value" : "%@ command failed"}},"zh-Hans" : {@@ -2012,7 +2012,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "%@ 等多个命令执行完成"+ "value" : "%@ 等命令执行完成"}}}@@ -2028,7 +2028,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "%@ 等多个命令被拒绝执行"+ "value" : "%@ 等命令被拒绝执行"}}}@@ -2044,7 +2044,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "%@ 等多个命令执行失败"+ "value" : "%@ 等命令执行失败"}}}@@ -2444,7 +2444,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "开启后, CodexBar 在手动重置临近过期时, 按设置的临期时间提前自动使用重置; 并可能短暂唤醒 Mac"+ "value" : "开启后, CodexBar 会按设定的临期时间自动使用即将过期的手动重置, 期间可能短暂唤醒 Mac"}}}@@ -2668,7 +2668,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "未知过期时间"+ "value" : "过期时间未知"}}}@@ -2732,7 +2732,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "Codex app-server 连接已经断开"+ "value" : "Codex app-server 连接已断开"}}}@@ -3734,13 +3734,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Recalculate historical statistics for a selected date or date range using the collected source data. This can restore missing or incomplete statistics. Rebuilt results are synced if sync is enabled. Lost source data cannot be recovered"+ "value" : "Choose a date or date range to recalculate historical statistics from collected source data. This can restore missing or incomplete statistics. Results are synced if sync is enabled. Lost source data cannot be recovered"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "选择指定的日期或者日期范围,根据采集到的原始数据重新计算历史统计。可用于修复缺失或不完整的数据,开启同步时会同步重建结果;已丢失的原始数据无法恢复"+ "value" : "选择日期或日期范围,用采集到的原始数据重新计算历史统计,可修复缺失或不完整的统计结果。开启同步时,重建结果也会同步。已丢失的原始数据无法恢复"}}}@@ -4060,7 +4060,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "仅在使用电池供电时生效;电量降至阈值时停止防睡眠,接通电源后自动恢复防睡眠"+ "value" : "使用电池供电时,电量降至阈值便停止防睡眠;接通电源后自动恢复防睡眠"}}}@@ -4140,7 +4140,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "Codex 任务在等待用户回应期间也防止系统睡眠"+ "value" : "Codex 任务等待你回应时,继续防止系统睡眠"}}}@@ -4844,7 +4844,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "有 %1$lld 个重置次数将于 %2$@ 过期"+ "value" : "%1$lld 次重置将于 %2$@ 过期"}}}@@ -4876,7 +4876,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "已达防睡眠上限 %@, 已停止防睡眠"+ "value" : "已达到防睡眠上限 %@, 停止防睡眠"}}}@@ -4956,7 +4956,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "Codex 任务已静默 %@, 已隐藏并停止参与防睡眠"+ "value" : "Codex 任务已连续 %@ 没有进展, 已隐藏并不再计入防睡眠"}}}@@ -4972,7 +4972,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "%1$@ 已静默 %2$@, 已隐藏并停止参与防睡眠"+ "value" : "%1$@ 已连续 %2$@ 没有进展, 已隐藏并不再计入防睡眠"}}}@@ -5110,13 +5110,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Codex is awaiting a response to continue"+ "value" : "Codex needs your response to continue"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "Codex 正在等待回应以继续"+ "value" : "Codex 需要你的回应才能继续"}}}@@ -5142,13 +5142,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "A task in \"%@\" is awaiting a response to continue"+ "value" : "A task in \"%@\" needs your response to continue"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "「%@」正在等待回应以继续"+ "value" : "「%@」中的任务需要你的回应才能继续"}}}@@ -5324,7 +5324,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "需要授权允许 CodexBar Power Helper 后台运行"+ "value" : "请允许 CodexBar Power Helper 在后台运行"}}}@@ -5340,7 +5340,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "需要安装并授权 CodexBar Power Helper 后台运行"+ "value" : "请安装 CodexBar Power Helper 并允许其在后台运行"}}}@@ -5356,7 +5356,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "已安装 CodexBar Power Helper 但需要授权允许后台运行"+ "value" : "CodexBar Power Helper 已安装, 请允许其在后台运行"}}}@@ -5430,13 +5430,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Hide running tasks that have made no progress for an extended period and stop counting them as tasks that keep your Mac awake. This check does not apply to tasks waiting for your response"+ "value" : "Hide running tasks that have made no progress for an extended period and exclude them from sleep prevention. Tasks waiting for your response are excluded from this check"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "隐藏长时间未取得进展的运行中任务,并停止将其计入防止睡眠的任务。等待用户回应的任务不参与此判定"+ "value" : "隐藏长时间没有进展的运行中任务,不再将其计入防睡眠。等待你回应的任务不参与此判定"}}}@@ -5830,13 +5830,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Enable/Disable automatic use of banked resets that are about to expire"+ "value" : "Automatically use banked resets that are about to expire"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "启用/禁用 自动使用临近过期的留存重置"+ "value" : "自动使用即将过期的留存重置"}}}@@ -5852,7 +5852,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "重新建立连接"+ "value" : "重新连接"}}}@@ -5990,13 +5990,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Enable/Disable automatic checks for new versions of CodexBar. You can still check for updates manually from the About page when this is disabled"+ "value" : "Automatically check for new versions of CodexBar. When this is off, you can still check manually from the About page"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "启用/禁用 自动检查是否有新的 CodexBar 版本,关闭后仍可在关于页面手动检查更新"+ "value" : "自动检查 CodexBar 新版本,关闭后仍可在关于页面手动检查更新"}}}@@ -6028,7 +6028,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "需要授权允许 CodexBar 后台运行"+ "value" : "请允许 CodexBar 在后台运行"}}}@@ -6054,13 +6054,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Enable/Disable launching CodexBar automatically when you log in to macOS"+ "value" : "Launch CodexBar automatically when you log in to macOS"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "启用/禁用 登录 macOS 后自动启动 CodexBar"+ "value" : "登录 macOS 后自动启动 CodexBar"}}}@@ -6150,13 +6150,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Enable/Disable sleep prevention while Codex tasks are running"+ "value" : "Keep your Mac awake while Codex tasks are running"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "启用/禁用 Codex 任务运行期间防止系统睡眠"+ "value" : "Codex 任务运行时防止系统睡眠"}}}@@ -6182,13 +6182,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Enable/Disable animations in the app"+ "value" : "Show animations in the app"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "启用/禁用 App 内动画效果"+ "value" : "显示 App 内动画效果"}}}@@ -6220,7 +6220,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "调整主面板各模块的显示和顺序,拖动模块左侧图标可调节顺序;需要至少保留一个模块"+ "value" : "选择主面板中显示的模块,拖动模块左侧图标调整顺序。至少保留一个模块"}}}@@ -6342,13 +6342,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Enable/Disable menu bar indicators"+ "value" : "Show indicators in the menu bar"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "启用/禁用 菜单栏指示器"+ "value" : "显示菜单栏指示器"}}}@@ -6444,7 +6444,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "Codex TUI 通知,独立于 CodexBar 的通知类型"+ "value" : "Codex TUI 的通知与 CodexBar 通知独立控制"}}}@@ -6470,13 +6470,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Notify you when the keep-awake time limit is reached and normal sleep resumes. Sleep prevention must be enabled and the time limit must be set to a value other than Unlimited"+ "value" : "Notify you when the keep-awake time limit is reached and normal sleep resumes. Requires sleep prevention to be enabled with a time limit"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "达到最长防睡眠时间并恢复系统睡眠时发送通知。需要启用防睡眠功能,且时长上限不是无限制"+ "value" : "达到最长防睡眠时间并恢复系统睡眠时发送通知。需要开启防睡眠,并设置时长上限"}}}@@ -6508,7 +6508,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "因电量过低而停止防睡眠时发送通知,需要启用防睡眠功能,且启用低电量保护"+ "value" : "因电量过低而停止防睡眠时发送通知。需要同时开启防睡眠和低电量保护"}}}@@ -6588,7 +6588,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "当额度已重置时发送通知"+ "value" : "额度重置时发送通知"}}}@@ -6662,13 +6662,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Enable/Disable CodexBar notifications. The first time you turn this on, you'll need to grant notification permission in macOS"+ "value" : "Send CodexBar notifications. The first time you turn this on, you need to grant notification permission in macOS"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "启用/禁用 CodexBar 发送通知,首次开启需要 macOS 通知授权"+ "value" : "允许 CodexBar 发送通知,首次开启需要 macOS 通知授权"}}}@@ -6716,7 +6716,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "Codex 任务完成时发送通知,运行时长低于设置阈值的 Codex 任务不会发送通知"+ "value" : "Codex 任务完成且运行时长达到设置阈值时发送通知"}}}@@ -6748,7 +6748,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "任务完成或等待回应时触发触摸板触觉反馈"+ "value" : "任务完成或等待回应时触发触控板触觉反馈"}}}@@ -6780,7 +6780,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "Codex 任务需要用户回应时发送通知"+ "value" : "Codex 任务需要你回应时发送通知"}}}@@ -6806,13 +6806,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Enable/Disable data syncing across devices using your iCloud account"+ "value" : "Sync data across devices through your iCloud account"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "启用/禁用 通过 iCloud 账户同步不同设备的数据"+ "value" : "通过 iCloud 账户同步不同设备的数据"}}}@@ -6886,13 +6886,13 @@"en" : {"stringUnit" : {"state" : "translated",- "value" : "Enable/Disable the glow at the top of the screen that shows Codex task status"+ "value" : "Show Codex task status with a glow at the top of the screen"}},"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "启用/禁用 屏幕顶部通过流光展示 Codex 任务状态"+ "value" : "在屏幕顶部用流光显示 Codex 任务状态"}}}@@ -7116,7 +7116,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "调整流光效果的亮度"+ "value" : "调整流光亮度"}}}@@ -7228,7 +7228,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "任务完成或终止后,对应流光效果展示时长"+ "value" : "设置任务完成或终止后,流光继续显示的时长"}}}@@ -7308,7 +7308,7 @@"zh-Hans" : {"stringUnit" : {"state" : "translated",- "value" : "调整流光动画的运动速度"+ "value" : "调整流光动画速度"}}}diff --git a/CodexBar/Services/Activity/ActivityMonitor.swift b/CodexBar/Services/Activity/ActivityMonitor.swiftindex c58f535..6a3d3ab 100644--- a/CodexBar/Services/Activity/ActivityMonitor.swift+++ b/CodexBar/Services/Activity/ActivityMonitor.swift@@ -3,7 +3,7 @@ import Combineimport Foundationimport os-/// 从 Codex 后台服务维护实时任务状态, 是菜单栏, 活动卡片, 通知和触觉反馈的任务来源+/// 根据 Codex 后台服务更新实时任务状态, 供菜单栏, 活动卡片, 通知和触觉反馈使用@MainActorfinal class ActivityMonitor: ObservableObject {@Published private(set) var snapshot = ActivitySnapshot.emptydiff --git a/CodexBar/Services/Activity/AppServerActivityModels.swift b/CodexBar/Services/Activity/AppServerActivityModels.swiftindex dd7ea98..d2945fd 100644--- a/CodexBar/Services/Activity/AppServerActivityModels.swift+++ b/CodexBar/Services/Activity/AppServerActivityModels.swift@@ -253,7 +253,7 @@ private nonisolated struct WireActivityInput: Decodable {}if kind == .usageUpdated,params.tokenUsage == nil || params.threadId?.isEmpty != false {- throw DecodingError.dataCorruptedError(forKey: .params, in: container, debugDescription: "Missing token tokenUsage or thread identity")+ throw DecodingError.dataCorruptedError(forKey: .params, in: container, debugDescription: "Missing tokenUsage or thread identity")}if [.commandApprovalRequested, .fileApprovalRequested, .permissionsRequested].contains(kind),params.itemId == nil || params.startedAtMs == nil {diff --git a/CodexBar/Services/AppServer/AppServerStartup.swift b/CodexBar/Services/AppServer/AppServerStartup.swiftindex 00c2b97..a0338bc 100644--- a/CodexBar/Services/AppServer/AppServerStartup.swift+++ b/CodexBar/Services/AppServer/AppServerStartup.swift@@ -1,7 +1,7 @@import Foundationimport os-/// 启动与连接恢复共用的有界准备, 只启动明确缺失的 Codex 后台服务+/// App 启动和连接恢复共用的准备流程, 有时间上限, 只启动明确缺失的 Codex 后台服务actor AppServerStartup {private let environment: [String: String]private let installations: CodexInstallations?diff --git a/CodexBar/Services/CodexStatus/AutoResetController.swift b/CodexBar/Services/CodexStatus/AutoResetController.swiftindex 8dcecbb..698e461 100644--- a/CodexBar/Services/CodexStatus/AutoResetController.swift+++ b/CodexBar/Services/CodexStatus/AutoResetController.swift@@ -12,7 +12,7 @@ protocol AutoResetWakeActivity: AnyObject {extension SystemSleepService: AutoResetWakeActivity {}-/// 定时器只负责触发, 凭证预算和执行结果由控制器拥有+/// 定时器只负责触发, 控制器管理凭证的尝试预算和执行结果@MainActorfinal class AutoResetController {struct Dependencies {diff --git a/CodexBar/Services/CodexStatus/CodexStatusService.swift b/CodexBar/Services/CodexStatus/CodexStatusService.swiftindex 414c9c1..092d417 100644--- a/CodexBar/Services/CodexStatus/CodexStatusService.swift+++ b/CodexBar/Services/CodexStatus/CodexStatusService.swift@@ -67,7 +67,7 @@ private nonisolated struct SupplementalDataCache {var rateLimits: AccountRateLimitsResponse?var usage: AccountUsageResponse?- /// 返回是否因为换账号而丢弃了缓存, 调用方据此记日志, 不必再比一遍账号+ /// 返回缓存是否因账户变化而被丢弃, 调用方直接据此记录日志@discardableResultmutating func useAccount(_ account: CodexAccount) -> Bool {guard self.account != account else { return false }@@ -120,7 +120,7 @@ actor CodexStatusService {return change} catch {teardownConnection()- // 一次断线触发一次有界重连, 失败后仍由定时刷新兜底+ // 每次断线触发一次有界重连, 失败后由定时刷新继续重试return .account}}diff --git a/CodexBar/Services/CodexStatus/CodexStatusViewModel.swift b/CodexBar/Services/CodexStatus/CodexStatusViewModel.swiftindex f42580d..d7b145a 100644--- a/CodexBar/Services/CodexStatus/CodexStatusViewModel.swift+++ b/CodexBar/Services/CodexStatus/CodexStatusViewModel.swift@@ -26,7 +26,7 @@ nonisolated enum DataUpdateInterval: Int, CaseIterable, Sendable {}}-/// UI 级状态; 更细的连接和接口错误由服务层归并到日志+/// UI 展示状态, 具体的连接和接口错误由服务层汇总到日志nonisolated enum CodexLoadState: Equatable {case loadingcase loaded@@ -42,7 +42,7 @@ nonisolated enum CodexLoadState: Equatable {}}-/// 菜单面板主状态模型, 将服务层结果转换为 SwiftUI 可发布状态+/// 菜单面板主状态模型, 将服务层结果转换为状态并发布给 SwiftUI@MainActorfinal class CodexStatusViewModel: ObservableObject {@Published private(set) var snapshot: CodexQuotaSnapshot?diff --git a/CodexBar/Services/KeepAlive/KeepAliveController.swift b/CodexBar/Services/KeepAlive/KeepAliveController.swiftindex fe046ff..945fe05 100644--- a/CodexBar/Services/KeepAlive/KeepAliveController.swift+++ b/CodexBar/Services/KeepAlive/KeepAliveController.swift@@ -74,7 +74,7 @@ final class KeepAliveController: ObservableObject {/// 达到防睡眠时长上限且系统睡眠策略恢复后回调, 每个计时周期触发一次var onKeepAliveLimitTriggered: ((MaximumDuration) async -> Bool)?- /// 同时检查用户开关和实际状态, 覆盖关开关后等待 Power Helper 回复的异步窗口+ /// 同时检查用户开关和实际状态, 包括关闭开关后仍在等待 Power Helper 回复的阶段var isActivelyPreventingSleep: Bool {isEnabled && isPreventingSleep}@@ -1369,7 +1369,7 @@ final class KeepAliveController: ObservableObject {// MARK: - 防睡眠条件判定- /// 用户意图 (isEnabled) 与依赖可用性在这里汇合+ /// 同时检查用户开关 isEnabled 和依赖是否可用/// 依赖不满足只让效果失效, 不回写 isEnabledprivate var shouldDisableSleep: Bool {sleepBlockReason == nil@@ -1417,7 +1417,7 @@ final class KeepAliveController: ObservableObject {private static let lowBatteryThresholdKey = "KeepAlive.lowBatteryThresholdPercent"private static let keepsAwakeWhileWaitingKey = "KeepAlive.keepsAwakeWhileWaiting"private static let keepsDisplayAwakeKey = "KeepAlive.keepsDisplayAwake"- /// 解除门槛比触发门槛高这么多个百分点, 避免电量在阈值附近抖动导致反复切换+ /// 解除门槛比触发门槛高出的百分点数, 避免电量在阈值附近波动时反复切换private static let lowBatteryHysteresis = 5}diff --git a/CodexBar/Services/KeepAlive/PowerSourceMonitor.swift b/CodexBar/Services/KeepAlive/PowerSourceMonitor.swiftindex 5a790c5..0caf002 100644--- a/CodexBar/Services/KeepAlive/PowerSourceMonitor.swift+++ b/CodexBar/Services/KeepAlive/PowerSourceMonitor.swift@@ -55,7 +55,7 @@ final class PowerSourceMonitor {/// 曾检测到内置电池后, 空列表按读取失败处理, 避免暂时枚举不到电池时解除保护private var hasSeenBattery = false- /// 回调里持有的是 unretained 指针, 停止监听必须显式做, 由持有者在 stop 时调用+ /// 回调持有 unretained 指针, 持有者必须在 stop 时显式停止监听/// 在此释放资源, 因为 Swift 6 的 nonisolated deinit 无法访问这些非 Sendable 属性func stop() {isMonitoring = false@@ -142,7 +142,7 @@ final class PowerSourceMonitor {onChange?()}- /// 注册失败后的兜底轮询+ /// 注册失败后改用轮询/// 防睡眠生效期间没有唤醒通知, 需通过轮询继续读取电源状态private func startPolling() {pollTask?.cancel()diff --git a/CodexBar/Services/KeepAlive/SystemSleepService.swift b/CodexBar/Services/KeepAlive/SystemSleepService.swiftindex 76d2a61..19a7f01 100644--- a/CodexBar/Services/KeepAlive/SystemSleepService.swift+++ b/CodexBar/Services/KeepAlive/SystemSleepService.swift@@ -156,7 +156,7 @@ final class SystemSleepService {}}- /// 屏保与闲置锁屏跟的是系统 idle 计时, 显示断言只保证屏幕不睡, 挡不住它们+ /// 屏保与闲置锁屏由系统 idle 计时触发, 显示断言只能阻止屏幕睡眠private func startUserActivityTicks() {// 断言仍有效但定时声明中断时也会重新调用, 先取消旧 Task 以免空转userActivityTask?.cancel()@@ -190,6 +190,6 @@ final class SystemSleepService {}}- /// 节拍取得比系统能设的最短屏保等待时间 (1 分钟) 小+ /// 声明间隔小于系统支持的最短屏保等待时间 (1 分钟)private static let userActivityInterval = Duration.seconds(30)}diff --git a/CodexBar/Services/Notifications/NotificationContent.swift b/CodexBar/Services/Notifications/NotificationContent.swiftindex 64ec8a0..88ae213 100644--- a/CodexBar/Services/Notifications/NotificationContent.swift+++ b/CodexBar/Services/Notifications/NotificationContent.swift@@ -1,7 +1,7 @@import Foundationnonisolated struct NotificationContent: Equatable {- /// 只用于日志分类, 由各静态工厂带出, 保证与实际内容不会错位+ /// 只用于日志分类, 由静态工厂与通知内容一起生成, 避免分类与内容不匹配let kind: Stringlet title: Stringlet body: Stringdiff --git a/CodexBar/Services/Notifications/NotificationService.swift b/CodexBar/Services/Notifications/NotificationService.swiftindex 5d977a7..26f29c5 100644--- a/CodexBar/Services/Notifications/NotificationService.swift+++ b/CodexBar/Services/Notifications/NotificationService.swift@@ -297,7 +297,7 @@ final class NotificationService: NSObject {}}- /// 枚举可信快照中有数据的额度窗口, 在此统一定义窗口过滤和 stateKey 生成规则+ /// 枚举可信快照中有数据的额度窗口, 共用窗口过滤和 stateKey 生成规则private func forEachQuotaWindowWithData(in snapshot: CodexQuotaSnapshot,_ body: (QuotaWindow, CodexQuotaLimitSnapshot, String) -> Void@@ -407,7 +407,7 @@ final class NotificationService: NSObject {quotaWindowObservations[stateKey]?.hasObservedConsumption = true} else if usedPercent == 0,quotaWindowObservations[stateKey]?.hasObservedConsumption == true {- // 归零即消费待重置状态; 开关或授权此刻不可用时不保留补发+ // 归零时清除待重置状态, 若此时开关或授权不可用, 不再补发通知quotaWindowObservations[stateKey]?.hasObservedConsumption = falseguard settings.canDeliver,settings.isQuotaResetEnabled,@@ -477,8 +477,8 @@ final class NotificationService: NSObject {// MARK: - 低电量保护- /// 由 KeepAliveController 在低电量导致睡眠恢复成功之后调用, 恢复失败不会走到这里- /// 调用方保证同一轮低电量只发一次, 电量回到解除门槛以上才开始下一轮, 此处无需再次去重+ /// 由 KeepAliveController 在低电量触发睡眠恢复且恢复成功后调用+ /// 调用方负责每轮低电量只通知一次, 电量回到解除门槛以上才开始下一轮, 此处无需再次去重/// 调用方在提交完成前保留空闲断言, 避免系统先进入空闲睡眠/// 返回提交结果, 调用方仅在成功时标记本轮已通知func notifyLowBatteryProtection(percent: Int) async -> Bool {@@ -824,7 +824,7 @@ extension NotificationService: UNUserNotificationCenterDelegate {}}-/// 单一待办时刻的重检调度: 目标时刻未变化时不重建 Task, 避免每个快照 tick 都 cancel/respawn+/// 只调度一个待检查时刻, 目标时刻不变时复用 Task, 避免每次快照更新都取消并重建任务@MainActorprivate final class ReminderCheckScheduler {private var task: Task<Void, Never>?diff --git a/CodexBar/Services/Notifications/NotificationSoundOption.swift b/CodexBar/Services/Notifications/NotificationSoundOption.swiftindex a7f30ad..b7a3f7e 100644--- a/CodexBar/Services/Notifications/NotificationSoundOption.swift+++ b/CodexBar/Services/Notifications/NotificationSoundOption.swift@@ -41,7 +41,7 @@ struct NotificationSoundOption: Identifiable, Hashable {return categories.lazy.flatMap(\.sounds).first { $0.id == id }}- /// 声音列表会缓存, 文件可能在加载后被删除, 发送通知前检查并显式回退默认音+ /// 缓存列表中的声音文件可能已被删除, 发送通知前检查文件, 缺失时回退到默认音var notificationSound: UNNotificationSound? {switch source {case .silent:diff --git a/CodexBar/Services/Settings/TUINotificationSettings.swift b/CodexBar/Services/Settings/TUINotificationSettings.swiftindex 5e5cbc4..35a36c8 100644--- a/CodexBar/Services/Settings/TUINotificationSettings.swift+++ b/CodexBar/Services/Settings/TUINotificationSettings.swift@@ -47,7 +47,7 @@ final class TUINotificationSettings: ObservableObject {}}- /// 集中定义操作文案与日志标题, 两者使用固定字面量, 便于直接 grep 日志标题+ /// 操作文案和日志阶段在这里定义, 使用固定字面量方便检索private enum ConfigOperation {case readcase writediff --git a/CodexBar/Services/Updates/AppUpdater.swift b/CodexBar/Services/Updates/AppUpdater.swiftindex 7668787..dc41167 100644--- a/CodexBar/Services/Updates/AppUpdater.swift+++ b/CodexBar/Services/Updates/AppUpdater.swift@@ -39,7 +39,7 @@ final class AppUpdater: NSObject, ObservableObject {private static let missingUpdateConfigurationMessage = String(localized: "updater.status.missing-configuration")/// Sparkle 启动失败时检查请求可能直接返回, 不触发完成回调- /// 兜底复位手动检查状态, 避免后续后台结果被误认为手动检查+ /// 此时也要清除手动检查状态, 避免将后续后台检查结果误认为手动检查结果private static let manualCheckTimeout = Duration.seconds(30)init(bundle: Bundle = .main) {diff --git a/CodexBar/Views/Settings/NotificationOptionsView.swift b/CodexBar/Views/Settings/NotificationOptionsView.swiftindex c9ce77c..b654893 100644--- a/CodexBar/Views/Settings/NotificationOptionsView.swift+++ b/CodexBar/Views/Settings/NotificationOptionsView.swift@@ -171,7 +171,7 @@ struct NotificationOptionsView: View {)}- /// 自动重置关着时显示为关闭并置灰, 不修改持久化的 isAutoResetEnabled+ /// 自动重置关闭时, 通知开关显示为关闭并置灰, 不修改持久化的 isAutoResetEnabledprivate var autoResetNotificationRow: some View {let isFeatureEnabled = autoResetSettings.isEnabledlet isDisplayedOn = isFeatureEnabled && notificationSettings.isAutoResetEnabled@@ -191,7 +191,7 @@ struct NotificationOptionsView: View {)}- /// 防睡眠关着或低电量保护关着时显示为关闭并置灰, 不修改持久化的 isLowBatteryEnabled+ /// 防睡眠或低电量保护关闭时, 通知开关显示为关闭并置灰, 不修改持久化的 isLowBatteryEnabled/// 保护默认关闭, 此时通知无法触发, 选项也应置灰/// 可用性由 KeepAliveController 判定, 包括台式机从笔记本迁入非 off 阈值的情况/// 台式机的防睡眠面板隐藏低电量保护行@@ -214,7 +214,7 @@ struct NotificationOptionsView: View {)}- /// 防睡眠关着或选了无限制时显示为关闭并置灰, 不修改持久化的 isKeepAliveLimitEnabled+ /// 防睡眠关闭或时长设为无限制时, 通知开关显示为关闭并置灰, 不修改持久化的 isKeepAliveLimitEnabled/// 与低电量通知一样, 可用性由 KeepAliveController 判定private var keepAliveLimitRow: some View {let hasLimit = keepAliveController.isMaximumDurationEnableddiff --git a/CodexBar/Views/Shared/AppearanceTransition.swift b/CodexBar/Views/Shared/AppearanceTransition.swiftindex 89bd99a..57535bb 100644--- a/CodexBar/Views/Shared/AppearanceTransition.swift+++ b/CodexBar/Views/Shared/AppearanceTransition.swift@@ -69,7 +69,7 @@ final class AppearanceTransition {if isPrior {self.capture()} else {- // App 的通知先于窗口外观更新, 等本轮赋值和面板同步完成后再揭示新画面+ // App 的通知先于窗口外观更新, 等本轮赋值和面板同步完成后再显示新画面DispatchQueue.main.async { self.reveal() }}}diff --git a/CodexBarHelper/Power/Daemon/PowerHelperRuntime.swift b/CodexBarHelper/Power/Daemon/PowerHelperRuntime.swiftindex 935ff4f..c9b98c9 100644--- a/CodexBarHelper/Power/Daemon/PowerHelperRuntime.swift+++ b/CodexBarHelper/Power/Daemon/PowerHelperRuntime.swift@@ -585,7 +585,7 @@ final class PowerHelperRuntime: NSObject, NSXPCListenerDelegate, @unchecked Senddo {try persistOwnership(.restoring)} catch {- // 写恢复中标记失败也必须继续尝试写回 0, 否则记录故障本身会把机器永久卡在 1+ // 写入恢复中标记失败后仍需尝试写回 0, 否则记录写入故障会使系统一直禁止睡眠logOwnershipWriteFailure(error)}diff --git a/README.en.md b/README.en.mdindex 67e285b..387651c 100644--- a/README.en.md+++ b/README.en.md@@ -71,11 +71,11 @@ Download the latest version from [GitHub Releases](https://github.com/bob-zebedy- macOS 15.0 or later- [Codex CLI](https://github.com/openai/codex) version `0.162.0` or later installed and signed in with OpenAI-- For cross-device sync, the Mac must be signed in to an available iCloud account+- Sign in to an available iCloud account on your Mac to sync across devices## Privacy-CodexBar processes raw activity events and live tasks on your Mac. When you enable cross-device sync, it uploads daily activity aggregates and token usage records to your private iCloud database.+CodexBar processes raw activity events and live tasks on your Mac. When you enable cross-device sync, it uploads daily activity summaries and token usage records to your private iCloud database.## Feedbackdiff --git a/Scripts/dmg.sh b/Scripts/dmg.shindex 01b922f..0759bf7 100755--- a/Scripts/dmg.sh+++ b/Scripts/dmg.sh@@ -15,10 +15,10 @@ usage: Scripts/dmg.sh [options] [App.app] [Output.dmg]Options:--layout PATH Layout template to read, or save with --copy-layoutDefaults to Scripts/resources/layout- --copy-layout Configure the layout with Finder, save it, and build the DMG+ --copy-layout Configure the layout with Finder, save it, and build the DMG-h, --help Show this help-Without --copy-layout, the template is copied without calling Finder+By default, the script copies the template without calling FinderThe template must match the App name, volume name, and .background/arrow.tiff pathRelative paths are resolved from the project directory@@ -308,7 +308,7 @@ if [[ "${COPY_LAYOUT}" == "1" ]]; thenMOUNT_POINT=""fi-echo "==> Compressed DMG"+echo "==> Compressing DMG"run_quietly diskutil image create from \--format UDZO \"${RW_DMG}" \diff --git a/Tests/App/Sync/ZoneRecoveryTests.swift b/Tests/App/Sync/ZoneRecoveryTests.swiftindex 4ba130d..06656a1 100644--- a/Tests/App/Sync/ZoneRecoveryTests.swift+++ b/Tests/App/Sync/ZoneRecoveryTests.swift@@ -45,7 +45,7 @@ struct ZoneRecoveryTests {state.lastPrunedDate = niltry store.saveState(state)}- // 保留 salt 可以验证恢复不依赖设备 ID 碰巧变化+ // 保留 salt, 验证设备 ID 不变时也能恢复await database.failOnce(at: point, wrapped: wrapped, preservingSalt: true)let snapshot = await service.synchronizeIfEnabled(localActivityDataAggregates: [aggregate(0, events: 3)],