ccus-cli 0.1.26 → 0.2.2

package/README.md

@@ -162,7 +162,7 @@ ccus aggregate serve --input-dir ./team-exports
 - 默认输出一个 `json` 数据包，里面同时包含 `rawEvents`、`weeklySummary`、`dailySummaries`
 - 导出文件内容为**紧凑 JSON**（无缩进），并默认 **gzip 压缩**后写成 `.json.gz`；gzip 与紧凑化都只是存储/展示层变化，解压后的字段集合与 `schemaVersion` 不变
 - 默认写 `.json.gz`；若用 `--out` 指定一个非 `.gz` 结尾的路径，则按明文 JSON 写出（不压缩）
-- 当前导出 bundle / weeklySummary 的 `schemaVersion` 为 `6`，用于标识已使用 `fiveHourLatestUsagePct`、`fiveHourPeakUsagePct`、`sevenDayLatestUsagePct`、`sevenDayPeakUsagePct` 字段的新导出契约
+- 当前导出 bundle / weeklySummary 的 `schemaVersion` 为 `8`：v7 起新增 `weeklySummary.codex` 与 `dailySummaries[].codex`（Codex CLI 的消息/请求/token 统计），v8 起该 codex 段再加 5h/7d 的 peak/latest 额度（从 `source="codex"` 事件重算、与 Claude 额度分开看）；aggregate daily/weekly CSV 的主字段（消息/请求/token/额度）已把 Codex **叠加进 Claude 合计**（累加量相加、额度 peak 取两源 max、latest 两源相加、7d 累计含两源读数），不再单列 `codex*` 列，detail.csv 加 `source` 列区分来源
 - 默认文件名会带 git email 的帐号名前缀和起止日期，例如：`alice_export_2026-05-26_to_2026-06-01.json.gz`
 - `userMessageCount` 来自 `~/.claude/projects/**/*.jsonl` 的非 meta `type:user` 事件
 - `apiRequestCount` 与 token 指标来自 `~/.claude/projects/**/*.jsonl` 中带 `message.usage` 的 `type:assistant` 事件
@@ -172,15 +172,15 @@ ccus aggregate serve --input-dir ./team-exports
 ## 多人汇总
 
 - 输入目录放很多通过 `ccus export` 导出的 bundle 文件，`.json.gz`（gzip 压缩）与明文 `.json` 都能识别，gzip 文件读取时自动解压
-- `aggregate` 目前只接受 `schemaVersion: 6` 的 bundle；旧导出请先用当前版本重新 `ccus export`
-- 同一个人在多台电脑上各自导出 bundle 时会自动合并去重：去重以**天**为粒度，对每个「同人同天」取 `generatedAt` 最新的那份导出，避免同一台机器重复导出或周与周重叠造成翻倍；**周汇总不取整周单份，而是把按天去重后的各天数据上卷累加**，所以多台电脑在不同天产生的用量会正确合进同一周。usage（5h / 7d）从选中事件按真实时间戳重算（peak 取 max、latest 取最新）
+- `aggregate` 接受 `schemaVersion: 6/7/8` 的 bundle（v8 含 codex 额度，v7/v6 容错回退 null/零值）；更旧的导出请先用当前版本重新 `ccus export`
+- 同一个人在多台电脑上各自导出 bundle 时会自动合并去重：去重以**天**为粒度，对每个「同人同天」取 `generatedAt` 最新的那份导出，避免同一台机器重复导出或周与周重叠造成翻倍；**周汇总不取整周单份，而是把按天去重后的各天数据上卷累加**，所以多台电脑在不同天产生的用量会正确合进同一周。usage（5h / 7d）从选中事件按真实时间戳重算，Claude+Codex 合并：peak 取两源 max、latest 两源相加
 - `ccus aggregate --input-dir DIR --out-dir DIR`
 - 输出三个文件：
   - `detail.csv`：来自 winner bundle 的 `rawEvents`（同人同天只展开最新那份的事件），`contextUsedM` / `contextMaxM` 为单条事件的 context window token；另附带 `inputTokensM` / `outputTokensM` / `cacheReadInputTokensM`（按 `date` 取自当天 `dailySummaries` 的日总量，同一天多行会重复，不能按行求和）
   - `daily.csv`：同人同天取最新导出 bundle 的 `dailySummaries`，usage 从该 bundle 当天事件重算
   - `weekly.csv`：把同人同周的各天 winner（已按天去重）上卷累加得到，usage 从该周全部 winner 天的事件重算
 - `daily.csv` / `weekly.csv` 还各带一列 `sevenDayCumulativeUsagePct`：7 天额度的**累计真实使用量**，把锯齿波（涨到峰值→窗口重置归零→再涨）还原成实际消耗。计算分两层：先**去毛刺**（把持续短于 2 分钟的 stale 瞬时读数尖峰抹平，只保留真实持续的水平），再做**分段峰谷和**（按 reset 跌破段峰值一半切成上升段，每段累加「段内峰值−谷值」）。以百分比累加表达、可大于 100（用掉多于一个 7d 额度）。对 ±1 采样抖动和 stale 读数尖峰都鲁棒，不会被噪声虚增
-  - 该列**绕开按天 winner**，对同一个人**所有机器、所有周**的 bundle `rawEvents` 先按时间合并去重成一条账号级曲线再算，绝不分机相加（同账号 7d 额度共享）
+  - 该列**绕开按天 winner**，对同一个人**所有机器、所有周**的 bundle `rawEvents`（含 Claude 与 Codex 两源 7d 读数，codex 事件不再过滤）先按时间合并去重成一条账号级曲线再算，绝不分机相加（同账号 7d 额度共享）
   - 区间内第一个有效样本无前值、不贡献增量，所以 **`daily.csv` 逐行相加只是对全局总量的近似**（跨天边界增量不计入单天）；`weekly.csv` 在整周连续算、把跨天增量也计入，更连续，恒有 `weekly ≥ Σ 同周 daily`，想要更准的总量请看 weekly 这列
   - 无有效样本写空（`null`），有样本但无净增长写 `0`；`detail.csv` 不含此列（单事件行不承载区间累计语义）
 - CSV 里所有以 token 计的列（context 与 in/out/cache）都以百万（M）为单位（原始值除以 1,000,000），列名统一带 `M` 后缀；`contextWindowPct` 仍是百分比
@@ -255,6 +255,53 @@ ccus api config    # 不带参数：打印当前配置
 
 > API 模式填充的 5h/7d 会和官方 `rate_limits` 走同一条聚合管线（含 7d 累计去毛刺算法，该算法针对 Claude 官方锯齿波设计）；不同厂商的额度曲线语义可能不完全一致，混用聚合时注意。
 
+## Codex 额度采集（Codex CLI）
+
+ccus 也能采集 Codex CLI 的 5 小时 / 周额度，复用同一条 statusline 落盘管线。Codex 没有 statusline hook，改用它的 **hooks.json `Stop` 事件**（每个 turn 结束触发）调起 ccus 的隐藏命令，再 spawn `codex app-server` 走 JSON-RPC `account/rateLimits/read` 拉额度。
+
+**一键安装（推荐）**：
+
+```bash
+ccus install --codex                      # 把 Stop hook 挂进 ~/.codex/hooks.json
+ccus install --codex --data-dir <目录>    # 让 Codex 事件落到指定数据目录
+ccus install --codex --uninstall          # 移除 ccus 的 Stop hook
+```
+
+装完**重启 Codex** 后会弹出 `hook need review` 审查提示，二选一通过即可：
+
+- 选 `Trust all and continue`，直接信任全部 hook 并继续；
+- 或选 `1 Review hooks`，在列表里找到 ccus 的 `Stop` hook，按 `t` 允许。
+
+也可启动 Codex 时加 `--dangerously-bypass-hook-trust` 跳过审查。
+
+或手动在 `~/.codex/hooks.json` 的 `Stop` 事件加一条 hook（与一键等价）：
+
+```json
+{
+  "hooks": {
+    "Stop": [
+      { "hooks": [ { "type": "command", "command": "ccus __codex-hook", "timeout": 60 } ] }
+    ]
+  }
+}
+```
+
+之后每个 Codex turn 结束都会调起 `ccus __codex-hook`，把 hook payload（含 `cwd`、`session_id`，不含 usage）作为 stdin 的一个 JSON 对象传入。ccus 拉额度、落盘一条 `source="codex"` 的事件，**不写 stdout、不干预 Codex**（Stop 要求 stdout 空或 JSON，ccus 选空 + exit 0 = success；失败静默退出 0）。`ccus install --codex` 只往 `Stop` 追加一条 hook，保留其它事件 / 其它 hook / description / 格式；已是目标则提示已配置、不动文件。
+
+> **为什么是 hooks.json 而不是 config.toml 的 notify？** Codex 原生也支持 `config.toml` 的 `notify`，但 orca 等会重写 `config.toml`（实测把 ccus 的 notify 顶成它自己的弹窗 notify，ccus 永远收不到回调）。hooks.json 不被频繁重写，是 hook-only 环境的持久触发入口；同一 `Stop` 事件下多条 hook 由 Codex 并发执行，ccus 与 orca 自带的 hook 互不干扰。
+
+要点：
+
+- **只支持 Codex CLI**：hooks 与 `codex app-server` 都是 CLI 能力。Codex 桌面版 app（已并入 ChatGPT 桌面 app）不一定触发 CLI 的 hooks、也不一定随附可 spawn 的 `codex` 二进制，不在本期范围。
+- **代理继承**：ccus 由 Codex 直接 spawn，已继承 Codex 的代理 / `CODEX_HOME`；它再 spawn `codex app-server` 时透传 `process.env`，整条链同环境。必须让 codex 子进程发请求（它读 `HTTP_PROXY`/`HTTPS_PROXY`），不能用 ccus 自己的 Node `fetch`（裸 fetch 不读代理、代理环境下直连失败）。
+- **定时同步**：Stop hook 还兜底触发 `ccus sync`（与 Claude statusline 对称）——配过 `ccus sync config --target` 后，Codex 每 turn 结束都会检查 3h 周期，到期自动 export + 复制 bundle（含 Codex token/消息）到目标目录。只用 Codex、不开 Claude Code 时也能自动同步。
+- **缓存节流**：Stop 每 turn 触发，额度按 5 分钟 TTL 缓存（`codex-quota-cache.json`），命中秒回不 spawn；过期才拉一次（带 ~10s 超时），失败回退旧缓存。
+- **字段映射**：app-server 返回 `primary`（5h）/ `secondary`（weekly）两窗口，取各自的 `usedPercent`（驼峰，clamp 0–100）；ccus 填进 `rate_limits.five_hour` / `seven_day` 的 `used_percentage`，`computeStatuslineEvent` 读时自动算出 usage。
+- **token / 消息 / 额度都进 export / aggregate**：Codex 的 token、用户消息数、API 请求数从 `<CODEX_HOME>/sessions` 的 rollout 统计，进 `ccus export` 的 `weeklySummary.codex` / `dailySummaries[].codex` 段；Stop 落盘的额度快照（`source="codex"` 事件）也进 export/aggregate——export bundle 里 Codex 额度单列到 codex 段、与 Claude 分开看，aggregate daily/weekly CSV 则把 Codex **叠加进 Claude 主字段**合计（累加量相加、额度 peak 取两源 max、latest 两源相加、7d 累计含两源），不再单列 `codex*` 列；detail.csv 的 `source` 列区分来源。
+- **Windows**：`install --codex` 在 Windows 写 `ccus.cmd __codex-hook`（npm 全局装会生成 `ccus.cmd`）；Windows 上 Stop hook 偶发收到非法 JSON（已知 bug #23784），ccus 容错按无 payload 处理、仍照常拉额度 + 落盘。
+
+> 该路径依赖 Codex 内部 app-server 协议（`account/rateLimits/read` 的返回结构）与 hooks payload schema，随版本变；解析层宽松，字段缺失返回 null、失败静默。
+
 ## 调试
 
 出问题时（比如 statusline 不出数据、导出/聚合结果不对），可以打开详细日志：

package/dist/cli.js

@@ -38,12 +38,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveExportOptions = resolveExportOptions;
+exports.handleCodexHook = handleCodexHook;
+exports.main = main;
 const node_http_1 = __importDefault(require("node:http"));
 const node_path_1 = __importDefault(require("node:path"));
 const dashboard_1 = require("./lib/dashboard");
 const dashboard_2 = require("./lib/dashboard");
 const aggregate_dashboard_1 = require("./lib/aggregate-dashboard");
 const claude_1 = require("./lib/claude");
+const codex_sessions_1 = require("./lib/codex-sessions");
 const export_1 = require("./lib/export");
 const aggregate_1 = require("./lib/aggregate");
 const debug_1 = require("./lib/debug");
@@ -55,6 +58,8 @@ const payload_1 = require("./lib/payload");
 const paths_1 = require("./lib/paths");
 const scheduler_1 = require("./lib/scheduler");
 const api_mode_1 = require("./lib/api-mode");
+const codex_fetcher_1 = require("./lib/codex-fetcher");
+const codex_install_1 = require("./lib/codex-install");
 const sync_1 = require("./lib/sync");
 const storage_1 = require("./lib/storage");
 const time_1 = require("./lib/time");
@@ -62,7 +67,7 @@ const update_check_1 = require("./lib/update-check");
 const version_1 = require("./lib/version");
 /** CLI 帮助信息保持简洁，方便直接挂到 README 或终端里查看。 */
 function printHelp() {
-    process.stdout.write(`ccus\n\nCommands:\n  ccus install [--settings PATH] [--command CMD] [--data-dir PATH]\n  ccus statusline emit [--data-dir PATH] [--input FILE] [--no-store]\n  ccus dashboard build [--range today|this-week|last-week|5h] [--out FILE] [--data-dir PATH]\n  ccus dashboard open [--range today|this-week|last-week|5h] [--out FILE] [--data-dir PATH]\n  ccus dashboard serve [--range today|this-week|last-week|5h] [--port 0] [--host 127.0.0.1] [--open] [--data-dir PATH]\n  ccus export [RANGE] [--out FILE] [--data-dir PATH]   (RANGE: this-week|tw, last-week|lw, today, 5h; e.g. ccus export lw)\n  ccus sessions [RANGE] [--out FILE] [--data-dir PATH]   (把 ~/.claude/projects 本周活跃 session 打包成 zip，名如 projects_<dates>_<user>.zip)\n  ccus aggregate --input-dir DIR [--out-dir DIR]\n  ccus aggregate serve --input-dir DIR [--port 0] [--host 127.0.0.1]\n  ccus sync [--data-dir PATH]\n  ccus sync config [--target DIR] [--interval 3h|daily|<N>h|<N>m] [--range this-week] [--suffix NAME | --no-suffix] [--data-dir PATH]\n  ccus sync install [--print] [--data-dir PATH]   (注册每周五 18:00 的系统调度器)\n  ccus sync uninstall [--print]   (卸载系统调度器)\n  ccus sync status [--data-dir PATH]\n  ccus api config [--enable|--disable] [--provider zhipu|custom] [--token-env NAME] [--token VAL] [--url URL] [--project P] [--organization O] [--ttl 5m] [--extractor-file FILE] [--data-dir PATH]\n  ccus api test [--data-dir PATH]   (立即拉取第三方额度并打印，验证配置是否生效)\n  ccus api status [--data-dir PATH]\n  ccus open [--data-dir PATH] [--print]\n  ccus update [--data-dir PATH]\n  ccus --version\n\nGlobal flags:\n  --verbose | --debug | -v   输出详细调试日志到 stderr（等价于设置 CCUS_DEBUG=1），方便排查问题\n`);
+    process.stdout.write(`ccus\n\nCommands:\n  ccus install [--settings PATH] [--command CMD] [--data-dir PATH]   (默认装 Claude statusLine；--codex 改写 Codex 的 ~/.codex/config.toml notify，配 --uninstall 移除)\n  ccus statusline emit [--data-dir PATH] [--input FILE] [--no-store]\n  ccus dashboard build [--range today|this-week|last-week|5h] [--out FILE] [--data-dir PATH]\n  ccus dashboard open [--range today|this-week|last-week|5h] [--out FILE] [--data-dir PATH]\n  ccus dashboard serve [--range today|this-week|last-week|5h] [--port 0] [--host 127.0.0.1] [--open] [--data-dir PATH]\n  ccus export [RANGE] [--out FILE] [--data-dir PATH]   (RANGE: this-week|tw, last-week|lw, today, 5h; e.g. ccus export lw)\n  ccus sessions [RANGE] [--out FILE] [--data-dir PATH]   (把 ~/.claude/projects 本周活跃 session 打包成 zip，名如 projects_<dates>_<user>.zip)\n  ccus aggregate --input-dir DIR [--out-dir DIR]\n  ccus aggregate serve --input-dir DIR [--port 0] [--host 127.0.0.1]\n  ccus sync [--data-dir PATH]\n  ccus sync config [--target DIR] [--interval 3h|daily|<N>h|<N>m] [--range this-week] [--suffix NAME | --no-suffix] [--data-dir PATH]\n  ccus sync install [--print] [--data-dir PATH]   (注册每周五 18:00 的系统调度器)\n  ccus sync uninstall [--print]   (卸载系统调度器)\n  ccus sync status [--data-dir PATH]\n  ccus api config [--enable|--disable] [--provider zhipu|custom] [--token-env NAME] [--token VAL] [--url URL] [--project P] [--organization O] [--ttl 5m] [--extractor-file FILE] [--data-dir PATH]\n  ccus api test [--data-dir PATH]   (立即拉取第三方额度并打印，验证配置是否生效)\n  ccus api status [--data-dir PATH]\n  ccus open [--data-dir PATH] [--print]\n  ccus update [--data-dir PATH]\n  ccus --version\n\nGlobal flags:\n  --verbose | --debug | -v   输出详细调试日志到 stderr（等价于设置 CCUS_DEBUG=1），方便排查问题\n`);
 }
 /** 一个轻量的参数解析器，当前命令面不复杂，没必要引入额外依赖。 */
 function parseOptions(args) {
@@ -125,6 +130,9 @@ function buildDefaultStatuslineCommand(dataDir) {
  * 默认写 `~/.claude/settings.json`，只覆盖 statusLine 字段，其它设置原样保留。
  */
 async function handleInstall(options) {
+    if (getBooleanOption(options, "codex")) {
+        return handleCodexInstall(options);
+    }
     const settingsPath = node_path_1.default.resolve(getStringOption(options, "settings") ?? (0, paths_1.getClaudeSettingsPath)());
     const explicitCommand = getStringOption(options, "command");
     const dataDirOption = getStringOption(options, "data-dir");
@@ -140,6 +148,37 @@ async function handleInstall(options) {
         process.stdout.write(`  replaced: ${result.previousCommand}\n`);
     }
 }
+/**
+ * `ccus install --codex`：把 Stop hook 挂进 Codex 的 hooks.json，让 Codex 每 turn 结束调起 ccus 采集额度。
+ *
+ * 默认挂 `ccus __codex-hook`（Windows 用 `ccus.cmd`）到 `hooks.Stop`；带 `--data-dir` 时追加，让事件落到指定目录。
+ * `--codex --uninstall` 移除 ccus 的 Stop hook；`--config PATH` 覆盖 hooks.json 路径。
+ * hooks.json 是 orca 等 hook-only 环境的持久触发入口（config.toml 的 notify 会被 orca 覆盖，hooks.json 不会频繁重写）。
+ */
+async function handleCodexInstall(options) {
+    const hooksPath = node_path_1.default.resolve(getStringOption(options, "config") ?? (0, paths_1.getCodexHooksPath)());
+    const dataDirOption = getStringOption(options, "data-dir");
+    const uninstall = getBooleanOption(options, "uninstall");
+    const baseArgs = dataDirOption
+        ? `__codex-hook --data-dir ${node_path_1.default.resolve(dataDirOption).replaceAll("\\", "/")}`
+        : `__codex-hook`;
+    const command = process.platform === "win32" ? `ccus.cmd ${baseArgs}` : `ccus ${baseArgs}`;
+    if (uninstall) {
+        const result = await (0, codex_install_1.uninstallCodexHook)(hooksPath);
+        process.stdout.write(result.removed
+            ? `已从 Codex hooks.json 移除 Stop hook：${result.hooksPath}\n`
+            : `Codex hooks.json 里未找到 ccus Stop hook：${result.hooksPath}\n`);
+        return;
+    }
+    const result = await (0, codex_install_1.installCodexHook)(hooksPath, command);
+    const header = result.created
+        ? `已创建 Codex hooks.json 并挂载 Stop hook：${result.hooksPath}`
+        : result.unchanged
+            ? `Codex Stop hook 已挂载：${result.hooksPath}`
+            : `已在 Codex hooks.json 挂载 Stop hook：${result.hooksPath}`;
+    process.stdout.write(`${header}\n  Stop → ${JSON.stringify(command)}\n`);
+    process.stdout.write(`  首次需在 Codex 用 /hooks 信任该 hook；若 hooks.json 被 orca 等外部工具覆盖，重新执行本命令即可。\n`);
+}
 /**
  * statusline 主路径：读 payload、归一化、落盘、输出单行状态文本。
  *
@@ -218,11 +257,16 @@ async function loadDashboardData(options, defaultRange) {
     // this-week 固定补齐到完整一周（周一到周日），即使本周还没过完，曲线 x 轴也按 7 天逐日展示；
     // 其它范围（today / last-week / 5h）不受影响。
     const window = (0, time_1.expandToFullWeekWindow)((0, time_1.resolveRange)(range, now));
-    const events = (await (0, storage_1.readEventsForRange)(dataDir, range, now)).map((record) => (0, payload_1.computeStatuslineEvent)(record));
+    // events 含 Claude 与 Codex：个人看板额度叠加 Codex（peak max、latest 相加、7d 累计合并），与 aggregate 同口径。
+    // codex 消息柱图走 dailyUserMessages，不受影响。
+    const events = (await (0, storage_1.readEventsForRange)(dataDir, range, now))
+        .map((record) => (0, payload_1.computeStatuslineEvent)(record));
     const claudeDailyUsage = await (0, claude_1.summarizeClaudeProjectUsageByDay)(window.start, window.end);
+    const codexDailyUsage = await (0, codex_sessions_1.summarizeCodexSessionUsageByDay)(window.start, window.end);
     const dailyUserMessages = (0, time_1.enumerateDateKeys)(window.start, window.end).map((date) => ({
         date,
         userMessageCount: claudeDailyUsage.get(date)?.userMessageCount ?? 0,
+        codexUserMessageCount: codexDailyUsage.get(date)?.userMessageCount ?? 0,
     }));
     (0, debug_1.debugLog)("dashboard", "events loaded", { range, label: window.label, sampleCount: events.length, days: dailyUserMessages.length });
     const html = (0, dashboard_1.buildDashboardHtml)(events, window.label, window.start, window.end, dailyUserMessages);
@@ -323,10 +367,17 @@ async function runExport(options) {
     (0, debug_1.debugLog)("export", "range resolved", { range, label: window.label, start: window.start.toISOString(), end: window.end.toISOString() });
     const records = await (0, storage_1.readEventsForRange)(dataDir, range, now);
     const events = records.map((record) => (0, payload_1.computeStatuslineEvent)(record));
-    const statuslineSummary = (0, dashboard_2.summarizeEvents)(events);
-    const statuslineDailyRows = (0, export_1.buildSummaryRows)(events);
+    // 按 source 分流：Claude usage 只算 claude 事件，Codex 额度单列（避免 codex 额度污染 claude usage）。
+    const claudeEvents = events.filter((event) => !(0, payload_1.isCodexSourceEvent)(event));
+    const codexEvents = events.filter(payload_1.isCodexSourceEvent);
+    const statuslineSummary = (0, dashboard_2.summarizeEvents)(claudeEvents);
+    const statuslineDailyRows = (0, export_1.buildSummaryRows)(claudeEvents);
+    const codexStatuslineSummary = (0, dashboard_2.summarizeEvents)(codexEvents);
+    const codexStatuslineDailyRows = (0, export_1.buildSummaryRows)(codexEvents);
     const claudeUsage = await (0, claude_1.summarizeClaudeProjectUsage)(window.start, window.end);
     const claudeDailyUsage = await (0, claude_1.summarizeClaudeProjectUsageByDay)(window.start, window.end);
+    const codexUsage = await (0, codex_sessions_1.summarizeCodexSessionUsage)(window.start, window.end);
+    const codexDailyUsage = await (0, codex_sessions_1.summarizeCodexSessionUsageByDay)(window.start, window.end);
     (0, debug_1.debugLog)("export", "data collected", {
         statuslineSamples: records.length,
         claudeProjectFiles: claudeUsage.matchedFileCount,
@@ -344,7 +395,7 @@ async function runExport(options) {
         exportUserName = gitIdentity.userName;
     }
     const weeklySummary = {
-        schemaVersion: 6,
+        schemaVersion: 8,
         generatedAt: new Date().toISOString(),
         range: {
             label: window.label,
@@ -364,6 +415,17 @@ async function runExport(options) {
             outputTokens: claudeUsage.outputTokens,
             cacheReadInputTokens: claudeUsage.cacheReadInputTokens,
         },
+        codex: {
+            userMessageCount: codexUsage.userMessageCount,
+            apiRequestCount: codexUsage.apiRequestCount,
+            inputTokens: codexUsage.inputTokens,
+            outputTokens: codexUsage.outputTokens,
+            cacheReadInputTokens: codexUsage.cacheReadInputTokens,
+            fiveHourPeakUsagePct: codexStatuslineSummary.fiveHourPeakUsagePct,
+            fiveHourLatestUsagePct: codexStatuslineSummary.fiveHourLatestUsagePct,
+            sevenDayPeakUsagePct: codexStatuslineSummary.sevenDayPeakUsagePct,
+            sevenDayLatestUsagePct: codexStatuslineSummary.sevenDayLatestUsagePct,
+        },
         statusline: {
             sampleCount: statuslineSummary.sampleCount,
             uniqueSessions: statuslineSummary.uniqueSessions,
@@ -383,9 +445,12 @@ async function runExport(options) {
         },
     };
     const statuslineDailyMap = new Map(statuslineDailyRows.map((row) => [row.date, row]));
+    const codexStatuslineDailyMap = new Map(codexStatuslineDailyRows.map((row) => [row.date, row]));
     const dailySummaries = (0, time_1.enumerateDateKeys)(window.start, window.end).map((date) => {
         const row = statuslineDailyMap.get(date);
         const claudeDay = claudeDailyUsage.get(date);
+        const codexDay = codexDailyUsage.get(date);
+        const codexRow = codexStatuslineDailyMap.get(date);
         return {
             date,
             userMessageCount: claudeDay?.userMessageCount ?? 0,
@@ -393,6 +458,17 @@ async function runExport(options) {
             inputTokens: claudeDay?.inputTokens ?? 0,
             outputTokens: claudeDay?.outputTokens ?? 0,
             cacheReadInputTokens: claudeDay?.cacheReadInputTokens ?? 0,
+            codex: {
+                userMessageCount: codexDay?.userMessageCount ?? 0,
+                apiRequestCount: codexDay?.apiRequestCount ?? 0,
+                inputTokens: codexDay?.inputTokens ?? 0,
+                outputTokens: codexDay?.outputTokens ?? 0,
+                cacheReadInputTokens: codexDay?.cacheReadInputTokens ?? 0,
+                fiveHourPeakUsagePct: codexRow?.fiveHourPeakUsagePct ?? null,
+                fiveHourLatestUsagePct: codexRow?.fiveHourLatestUsagePct ?? null,
+                sevenDayPeakUsagePct: codexRow?.sevenDayPeakUsagePct ?? null,
+                sevenDayLatestUsagePct: codexRow?.sevenDayLatestUsagePct ?? null,
+            },
             sampleCount: row?.sampleCount ?? 0,
             fiveHourLatestUsagePct: row?.fiveHourLatestUsagePct ?? null,
             fiveHourPeakUsagePct: row?.fiveHourPeakUsagePct ?? null,
@@ -403,7 +479,7 @@ async function runExport(options) {
         };
     });
     const bundle = {
-        schemaVersion: 6,
+        schemaVersion: 8,
         generatedAt: new Date().toISOString(),
         range: {
             label: window.label,
@@ -836,6 +912,127 @@ async function handleBackgroundSync(options) {
         (0, debug_1.debugLog)("sync", "background sync failed", error instanceof Error ? (error.stack ?? error.message) : String(error));
     }
 }
+/**
+ * Codex 回调（notify / hook）共享的采集入口：拉额度（走缓存）→ 构造 source=codex 事件落盘 → 心跳 → 兜底 sync。
+ *
+ * 全程不写 stdout（Codex 继承的 stdio 写了会污染终端）；失败 debugLog 到 stderr 后静默。
+ * 拉不到额度（未安装 / 未登录 / 无缓存）时不落空事件，静默返回。
+ */
+async function recordCodexEvent(dataDir, identity) {
+    (0, debug_1.debugLog)("codex-event", "start", { dataDir, cwd: identity.cwd, sessionId: identity.sessionId });
+    try {
+        const quota = await (0, codex_fetcher_1.resolveCodexQuota)(dataDir);
+        if (quota === null) {
+            (0, debug_1.debugLog)("codex-event", "no quota available, skip persist");
+            return;
+        }
+        const payload = { source: "codex" };
+        if (identity.sessionId) {
+            payload.session_id = identity.sessionId;
+        }
+        if (identity.cwd) {
+            payload.workspace = { current_dir: identity.cwd };
+        }
+        const record = (0, payload_1.createPersistedStatuslineEvent)(payload);
+        const gitIdentity = await (0, git_1.readGitIdentity)();
+        record.gitUserName = gitIdentity.userName;
+        record.gitUserEmail = gitIdentity.userEmail;
+        record.gitUserAccount = (0, time_1.extractGitEmailAccount)(gitIdentity.userEmail);
+        (0, api_mode_1.applyQuotaToPayload)(record.rawPayload, { fiveHour: quota.fiveHour, sevenDay: quota.sevenDay, level: null });
+        await (0, storage_1.appendEvent)(dataDir, record);
+        (0, debug_1.debugLog)("codex-event", "persisted", { fiveHour: quota.fiveHour, sevenDay: quota.sevenDay });
+    }
+    catch (error) {
+        (0, debug_1.debugLog)("codex-event", "failed", error instanceof Error ? (error.stack ?? error.message) : String(error));
+    }
+    finally {
+        // Codex 继承的 stdio 写 stdout/stderr 会污染终端；改写心跳文件留痕，证明回调被触发（notify 与 hook 共用）。
+        try {
+            const fsp = await Promise.resolve().then(() => __importStar(require("node:fs/promises")));
+            await fsp.writeFile(node_path_1.default.join(dataDir, "codex-notify.heartbeat"), `${new Date().toISOString()}\n`, "utf8");
+        }
+        catch {
+            // 心跳写失败静默，不影响主流程。
+        }
+        // Codex 没有 statusline，回调兜底触发定时同步（与 Claude statusline 的 maybeSpawnBackgroundSync 对称）：
+        // 每 turn 检查一次 sync 周期，到期才 spawn detached __sync，不阻塞、不写 stdout。
+        (0, sync_1.maybeSpawnBackgroundSync)(dataDir);
+    }
+}
+/**
+ * 隐藏命令 `__codex-notify`：Codex `notify`（config.toml，agent-turn-complete）回调入口。
+ *
+ * Codex 每 turn 结束 spawn 本命令，把 notify JSON 作为最后一个 argv 追加（含 cwd / thread-id）。
+ * 从 argv 解析身份 → recordCodexEvent。orca 等会覆盖 config.toml 的环境改用 `__codex-hook`（hooks.json）。
+ */
+async function handleCodexNotify(args) {
+    const options = parseOptions(args);
+    const dataDir = getDataDir(options);
+    const notify = parseCodexNotify(extractCodexNotifyJson(args));
+    await recordCodexEvent(dataDir, { cwd: notify.cwd, sessionId: notify.threadId });
+}
+/**
+ * 隐藏命令 `__codex-hook`：Codex hooks.json 的 Stop 事件回调入口（orca 等 hook-only 环境用）。
+ *
+ * Codex 把 hook payload 作为 stdin 的一个 JSON 对象传入（含 cwd / session_id / hook_event_name）。
+ * 解析身份 → recordCodexEvent。不写 stdout（Stop 要求 stdout 空或 JSON；ccus 选空 + exit 0 = success，不干预 Codex）。
+ * stdin 非法 JSON（Windows Stop 偶发 #23784）容错：当无 payload 处理，仍照常拉额度 + 落盘。
+ */
+async function handleCodexHook(args, deps = {}) {
+    const options = parseOptions(args);
+    const dataDir = getDataDir(options);
+    const read = deps.readStdin ?? io_1.readStdin;
+    let cwd = null;
+    let sessionId = null;
+    try {
+        const raw = await read();
+        if (raw.trim()) {
+            const parsed = JSON.parse(raw);
+            if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) {
+                const record = parsed;
+                if (typeof record["cwd"] === "string") {
+                    cwd = record["cwd"];
+                }
+                if (typeof record["session_id"] === "string") {
+                    sessionId = record["session_id"];
+                }
+            }
+        }
+    }
+    catch (error) {
+        (0, debug_1.debugLog)("codex-hook", "stdin parse failed", error instanceof Error ? error.message : String(error));
+    }
+    await recordCodexEvent(dataDir, { cwd, sessionId });
+}
+/** Codex 把 notify JSON 作为最后一个 argv 追加；取末尾首个以 `{` 开头的参数。 */
+function extractCodexNotifyJson(args) {
+    for (let index = args.length - 1; index >= 0; index -= 1) {
+        if (args[index].trim().startsWith("{")) {
+            return args[index];
+        }
+    }
+    return null;
+}
+/** 宽松解析 notify JSON：cwd + thread-id（兼容 threadId 驼峰）；非法返回空。 */
+function parseCodexNotify(json) {
+    if (!json) {
+        return { cwd: null, threadId: null };
+    }
+    try {
+        const parsed = JSON.parse(json);
+        if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
+            return { cwd: null, threadId: null };
+        }
+        const record = parsed;
+        const cwd = typeof record["cwd"] === "string" ? record["cwd"] : null;
+        const rawThreadId = record["thread-id"] ?? record["threadId"];
+        const threadId = typeof rawThreadId === "string" ? rawThreadId : null;
+        return { cwd, threadId };
+    }
+    catch {
+        return { cwd: null, threadId: null };
+    }
+}
 /** 解析时长字面量为毫秒：纯数字按 ms，支持 ms/s/m/h 后缀。非法返回 null。 */
 function parseDurationMs(raw) {
     if (raw === undefined) {
@@ -1136,6 +1333,14 @@ async function main(args = process.argv.slice(2)) {
         await handleBackgroundSync(parseOptions(args.slice(1)));
         return;
     }
+    if (group === "__codex-notify") {
+        await handleCodexNotify(args.slice(1));
+        return;
+    }
+    if (group === "__codex-hook") {
+        await handleCodexHook(args.slice(1));
+        return;
+    }
     if (group === "install") {
         await handleInstall(parseOptions(args.slice(1)));
         return;

package/dist/lib/aggregate-dashboard.js

@@ -297,7 +297,7 @@ function renderFiveHourUsageChart(people, detailRows) {
     const built = people
         .map((person, index) => {
         const personRows = detailRows
-            .filter((row) => row.personKey === person.personKey)
+            .filter((row) => row.personKey === person.personKey && row.source !== "codex")
             .map((row) => ({ t: new Date(row.timestamp).getTime(), five: row.usagePct, seven: row.sevenDayUsagePct }))
             .filter((point) => Number.isFinite(point.t))
             .sort((left, right) => left.t - right.t);

package/dist/lib/aggregate.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.addNullable = addNullable;
 exports.loadWeeklyExportBundles = loadWeeklyExportBundles;
 exports.computeCumulativeSevenDayCurve = computeCumulativeSevenDayCurve;
 exports.computeCumulativeSevenDay = computeCumulativeSevenDay;
@@ -23,6 +24,12 @@ function maxOrNull(values) {
     const numbers = values.filter((v) => v !== null);
     return numbers.length > 0 ? Math.max(...numbers) : null;
 }
+/** 两个可空数值相加：null 视为 0；两者皆 null 返回 null（表示两源都无该指标）。用于 codex+claude latest 叠加。 */
+function addNullable(a, b) {
+    if (a === null && b === null)
+        return null;
+    return (a ?? 0) + (b ?? 0);
+}
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -43,7 +50,7 @@ function isWeeklyExportBundle(value) {
     if (!isRecord(value)) {
         return false;
     }
-    if (value.schemaVersion !== 6) {
+    if (typeof value.schemaVersion !== "number" || ![6, 7, 8].includes(value.schemaVersion)) {
         return false;
     }
     if (!Array.isArray(value.rawEvents) || !Array.isArray(value.dailySummaries) || !isRecord(value.weeklySummary) || !isRecord(value.identity) || !isRecord(value.range)) {
@@ -124,7 +131,7 @@ async function loadWeeklyExportBundles(inputDir) {
         }
     }
     if (invalidFiles.length > 0) {
-        throw new Error(`Unsupported export bundle schema in files: ${invalidFiles.join(", ")}. Re-export with current ccus so aggregate receives schemaVersion 6 bundles.`);
+        throw new Error(`Unsupported export bundle schema in files: ${invalidFiles.join(", ")}. Re-export with current ccus so aggregate receives schemaVersion 6/7/8 bundles.`);
     }
     return bundles;
 }
@@ -419,7 +426,8 @@ function buildPersonSevenDayCurve(bundles) {
     const collected = new Map();
     for (const { bundle } of bundles) {
         const personKey = bundlePersonKey(bundle);
-        for (const record of bundle.rawEvents.filter(isPersistedStatuslineEvent)) {
+        // 含 Claude + Codex 两源读数：codex 7d 读数不再过滤，并入同一条曲线算累计
+        for (const record of bundle.rawEvents.filter((r) => isPersistedStatuslineEvent(r))) {
             const event = (0, payload_1.computeStatuslineEvent)(record);
             if (event.sevenDayUsagePct === null) {
                 continue;
@@ -468,20 +476,28 @@ function buildAggregatedDetailRows(bundles) {
         for (const rep of reps) {
             const events = bundleEventsByDate(rep.bundle).get(rep.date) ?? [];
             for (const event of events) {
+                const isCodex = (0, payload_1.isCodexSourceEvent)(event);
                 rows.push({
                     ...event,
                     personKey: rep.personKey,
                     weekKey: weekKey(new Date(event.timestamp)),
                     dateKey: rep.date,
-                    inputTokens: rep.day.inputTokens,
-                    outputTokens: rep.day.outputTokens,
-                    cacheReadInputTokens: rep.day.cacheReadInputTokens,
+                    source: isCodex ? "codex" : "claude",
+                    // codex 事件无单事件 token 语义（token 在 daySummary.codex 按天聚合），不附 claude 的日总量。
+                    inputTokens: isCodex ? 0 : rep.day.inputTokens,
+                    outputTokens: isCodex ? 0 : rep.day.outputTokens,
+                    cacheReadInputTokens: isCodex ? 0 : rep.day.cacheReadInputTokens,
                 });
             }
         }
     }
     return rows.sort((left, right) => left.timestamp.localeCompare(right.timestamp));
 }
+const ZERO_CODEX = { userMessageCount: 0, apiRequestCount: 0, inputTokens: 0, outputTokens: 0, cacheReadInputTokens: 0, fiveHourPeakUsagePct: null, fiveHourLatestUsagePct: null, sevenDayPeakUsagePct: null, sevenDayLatestUsagePct: null };
+/** 取 daySummary 的 codex 快照；缺字段（手编 bundle）回退零值，避免 reduce 抛错或 NaN。 */
+function codexOf(day) {
+    return day.codex ?? ZERO_CODEX;
+}
 /**
  * 展开 daily.csv：同人同天的不同机器数据直接叠加（计数字段相加），usage 从所有机器该天事件合并后重算。
  * 同机器重复导出由 selectDailyRepresentatives 在分组阶段去重，不会翻倍。
@@ -493,21 +509,23 @@ function buildAggregatedDailyRows(bundles) {
     for (const reps of repsMap.values()) {
         const { personKey, date } = reps[0];
         // 不同机器的独立数据直接叠加
-        const userMessageCount = reps.reduce((sum, r) => sum + r.day.userMessageCount, 0);
-        const apiRequestCount = reps.reduce((sum, r) => sum + r.day.apiRequestCount, 0);
-        const inputTokens = reps.reduce((sum, r) => sum + r.day.inputTokens, 0);
-        const outputTokens = reps.reduce((sum, r) => sum + r.day.outputTokens, 0);
-        const cacheReadInputTokens = reps.reduce((sum, r) => sum + r.day.cacheReadInputTokens, 0);
+        // 累加量含 Codex：Claude + Codex 同字段相加
+        const userMessageCount = reps.reduce((sum, r) => sum + r.day.userMessageCount + codexOf(r.day).userMessageCount, 0);
+        const apiRequestCount = reps.reduce((sum, r) => sum + r.day.apiRequestCount + codexOf(r.day).apiRequestCount, 0);
+        const inputTokens = reps.reduce((sum, r) => sum + r.day.inputTokens + codexOf(r.day).inputTokens, 0);
+        const outputTokens = reps.reduce((sum, r) => sum + r.day.outputTokens + codexOf(r.day).outputTokens, 0);
+        const cacheReadInputTokens = reps.reduce((sum, r) => sum + r.day.cacheReadInputTokens + codexOf(r.day).cacheReadInputTokens, 0);
         const sampleCount = reps.reduce((sum, r) => sum + r.day.sampleCount, 0);
         const uniqueSessions = reps.reduce((sum, r) => sum + r.day.uniqueSessions, 0);
         const uniqueWorkspaces = reps.reduce((sum, r) => sum + r.day.uniqueWorkspaces, 0);
-        // usage 从所有机器该天事件合并后重算；rawEvents 缺失时用各代表 daySummary 回退
+        // 按 source 分流：Claude usage 只算 claude 事件，Codex usage 单列重算（避免 codex 额度污染 claude usage）。
         const allEvents = reps.flatMap((r) => bundleEventsByDate(r.bundle).get(date) ?? []);
-        const usage = recomputeUsage(allEvents);
-        const fiveHourPeakFallback = maxOrNull(reps.map((r) => r.day.fiveHourPeakUsagePct));
-        const sevenDayPeakFallback = maxOrNull(reps.map((r) => r.day.sevenDayPeakUsagePct));
-        const fiveHourLatestFallback = reps.find((r) => r.day.fiveHourLatestUsagePct !== null)?.day.fiveHourLatestUsagePct ?? null;
-        const sevenDayLatestFallback = reps.find((r) => r.day.sevenDayLatestUsagePct !== null)?.day.sevenDayLatestUsagePct ?? null;
+        const claudeEvents = allEvents.filter((event) => !(0, payload_1.isCodexSourceEvent)(event));
+        const codexEvents = allEvents.filter(payload_1.isCodexSourceEvent);
+        const usage = recomputeUsage(claudeEvents);
+        const codexUsage = recomputeUsage(codexEvents);
+        // 额度回退：rawEvents 缺时从 daySummary 取（Claude+Codex 合并，见 fallbackWeeklyUsage）
+        const fallback = fallbackWeeklyUsage(reps.map((r) => r.day));
         // 累计指标走全样本合并曲线，不走单机的 recomputeUsage，避免漏掉另一台机器的样本。
         const sevenDayCumulativeUsagePct = computeCumulativeSevenDay(sliceCurveByDate(curves.get(personKey) ?? [], date));
         rows.push({
@@ -519,10 +537,10 @@ function buildAggregatedDailyRows(bundles) {
             outputTokens,
             cacheReadInputTokens,
             sampleCount,
-            fiveHourPeakUsagePct: usage.fiveHourPeakUsagePct ?? fiveHourPeakFallback,
-            fiveHourLatestUsagePct: usage.fiveHourLatestUsagePct ?? fiveHourLatestFallback,
-            sevenDayPeakUsagePct: usage.sevenDayPeakUsagePct ?? sevenDayPeakFallback,
-            sevenDayLatestUsagePct: usage.sevenDayLatestUsagePct ?? sevenDayLatestFallback,
+            fiveHourPeakUsagePct: maxOrNull([usage.fiveHourPeakUsagePct, codexUsage.fiveHourPeakUsagePct]) ?? fallback.fiveHourPeakUsagePct,
+            fiveHourLatestUsagePct: addNullable(usage.fiveHourLatestUsagePct, codexUsage.fiveHourLatestUsagePct) ?? fallback.fiveHourLatestUsagePct,
+            sevenDayPeakUsagePct: maxOrNull([usage.sevenDayPeakUsagePct, codexUsage.sevenDayPeakUsagePct]) ?? fallback.sevenDayPeakUsagePct,
+            sevenDayLatestUsagePct: addNullable(usage.sevenDayLatestUsagePct, codexUsage.sevenDayLatestUsagePct) ?? fallback.sevenDayLatestUsagePct,
             sevenDayCumulativeUsagePct,
             uniqueSessions,
             uniqueWorkspaces,
@@ -531,15 +549,23 @@ function buildAggregatedDailyRows(bundles) {
     return rows.sort((left, right) => `${left.personKey}|${left.date}`.localeCompare(`${right.personKey}|${right.date}`));
 }
 /** 周级 usage 回退：rawEvents 缺失时从各天 daySummary 自带值取 peak（max）/ latest（date 最新非空）。 */
+/**
+ * rawEvents 缺失时的额度回退：从各天 daySummary 取。
+ * Claude 与 Codex 合并：peak 取两源 max、latest 两源相加（与主字段叠加口径一致）。daily/weekly 共用。
+ */
 function fallbackWeeklyUsage(days) {
     const byDateDesc = [...days].sort((left, right) => right.date.localeCompare(left.date));
-    const fivePeaks = days.map((day) => day.fiveHourPeakUsagePct).filter((value) => value !== null);
-    const sevenPeaks = days.map((day) => day.sevenDayPeakUsagePct).filter((value) => value !== null);
+    const fivePeaks = days.flatMap((day) => [day.fiveHourPeakUsagePct, codexOf(day).fiveHourPeakUsagePct]);
+    const sevenPeaks = days.flatMap((day) => [day.sevenDayPeakUsagePct, codexOf(day).sevenDayPeakUsagePct]);
+    const claudeFiveLatest = byDateDesc.find((day) => day.fiveHourLatestUsagePct !== null)?.fiveHourLatestUsagePct ?? null;
+    const codexFiveDay = byDateDesc.find((day) => codexOf(day).fiveHourLatestUsagePct !== null);
+    const claudeSevenLatest = byDateDesc.find((day) => day.sevenDayLatestUsagePct !== null)?.sevenDayLatestUsagePct ?? null;
+    const codexSevenDay = byDateDesc.find((day) => codexOf(day).sevenDayLatestUsagePct !== null);
     return {
-        fiveHourPeakUsagePct: fivePeaks.length > 0 ? (0, time_1.roundNumber)(Math.max(...fivePeaks), 1) : null,
-        fiveHourLatestUsagePct: byDateDesc.find((day) => day.fiveHourLatestUsagePct !== null)?.fiveHourLatestUsagePct ?? null,
-        sevenDayPeakUsagePct: sevenPeaks.length > 0 ? (0, time_1.roundNumber)(Math.max(...sevenPeaks), 1) : null,
-        sevenDayLatestUsagePct: byDateDesc.find((day) => day.sevenDayLatestUsagePct !== null)?.sevenDayLatestUsagePct ?? null,
+        fiveHourPeakUsagePct: (0, time_1.roundNumber)(maxOrNull(fivePeaks), 1),
+        fiveHourLatestUsagePct: addNullable(claudeFiveLatest, codexFiveDay ? codexOf(codexFiveDay).fiveHourLatestUsagePct : null),
+        sevenDayPeakUsagePct: (0, time_1.roundNumber)(maxOrNull(sevenPeaks), 1),
+        sevenDayLatestUsagePct: addNullable(claudeSevenLatest, codexSevenDay ? codexOf(codexSevenDay).sevenDayLatestUsagePct : null),
     };
 }
 /**
@@ -573,11 +599,13 @@ function buildAggregatedWeeklyRows(bundles) {
                 groups.set(key, acc);
             }
             const day = rep.day;
-            acc.userMessageCount += day.userMessageCount;
-            acc.apiRequestCount += day.apiRequestCount;
-            acc.inputTokens += day.inputTokens;
-            acc.outputTokens += day.outputTokens;
-            acc.cacheReadInputTokens += day.cacheReadInputTokens;
+            const codexDay = codexOf(day);
+            // 累加量含 Codex：Claude + Codex 同字段相加
+            acc.userMessageCount += day.userMessageCount + codexDay.userMessageCount;
+            acc.apiRequestCount += day.apiRequestCount + codexDay.apiRequestCount;
+            acc.inputTokens += day.inputTokens + codexDay.inputTokens;
+            acc.outputTokens += day.outputTokens + codexDay.outputTokens;
+            acc.cacheReadInputTokens += day.cacheReadInputTokens + codexDay.cacheReadInputTokens;
             acc.sampleCount += day.sampleCount;
             acc.uniqueSessions += day.uniqueSessions;
             acc.uniqueWorkspaces += day.uniqueWorkspaces;
@@ -587,7 +615,11 @@ function buildAggregatedWeeklyRows(bundles) {
     }
     const rows = [];
     for (const acc of groups.values()) {
-        const usage = recomputeUsage(acc.events);
+        // 按 source 分流：Claude usage 只算 claude 事件，Codex usage 单列重算。
+        const claudeEvents = acc.events.filter((event) => !(0, payload_1.isCodexSourceEvent)(event));
+        const codexEvents = acc.events.filter(payload_1.isCodexSourceEvent);
+        const usage = recomputeUsage(claudeEvents);
+        const codexUsage = recomputeUsage(codexEvents);
         const fallback = fallbackWeeklyUsage(acc.days);
         // 整周累计：在整周合并曲线上一次性求正增量，跨天边界增量被计入，故 weekly ≥ Σ daily。
         const sevenDayCumulativeUsagePct = computeCumulativeSevenDay(sliceCurveByWeek(curves.get(acc.personKey) ?? [], acc.week));
@@ -600,10 +632,10 @@ function buildAggregatedWeeklyRows(bundles) {
             outputTokens: acc.outputTokens,
             cacheReadInputTokens: acc.cacheReadInputTokens,
             sampleCount: acc.sampleCount,
-            fiveHourPeakUsagePct: usage.fiveHourPeakUsagePct ?? fallback.fiveHourPeakUsagePct,
-            fiveHourLatestUsagePct: usage.fiveHourLatestUsagePct ?? fallback.fiveHourLatestUsagePct,
-            sevenDayPeakUsagePct: usage.sevenDayPeakUsagePct ?? fallback.sevenDayPeakUsagePct,
-            sevenDayLatestUsagePct: usage.sevenDayLatestUsagePct ?? fallback.sevenDayLatestUsagePct,
+            fiveHourPeakUsagePct: maxOrNull([usage.fiveHourPeakUsagePct, codexUsage.fiveHourPeakUsagePct]) ?? fallback.fiveHourPeakUsagePct,
+            fiveHourLatestUsagePct: addNullable(usage.fiveHourLatestUsagePct, codexUsage.fiveHourLatestUsagePct) ?? fallback.fiveHourLatestUsagePct,
+            sevenDayPeakUsagePct: maxOrNull([usage.sevenDayPeakUsagePct, codexUsage.sevenDayPeakUsagePct]) ?? fallback.sevenDayPeakUsagePct,
+            sevenDayLatestUsagePct: addNullable(usage.sevenDayLatestUsagePct, codexUsage.sevenDayLatestUsagePct) ?? fallback.sevenDayLatestUsagePct,
             sevenDayCumulativeUsagePct,
             uniqueSessions: acc.uniqueSessions,
             uniqueWorkspaces: acc.uniqueWorkspaces,