ccus-cli 0.2.12 → 0.2.14

package/README.md

@@ -310,9 +310,9 @@ ccus install --codex --uninstall          # 移除 ccus 的 Stop 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`）；wham 回退走 ccus 自己的 Node HTTP，但经统一 env 代理通道（读 `CCUS_PROXY` / `https_proxy` / `http_proxy` / `all_proxy` / `NO_PROXY`，`CCUS_PROXY` 优先、小写优先、对齐 curl），代理环境同样可达。
-- **无 codex 命令时回退 wham**：本机没装 `codex` CLI（spawn 返回 `unavailable`）且无新鲜缓存时，ccus 改走 ChatGPT 后端 `wham/usage` HTTP 直连——读 `~/.codex/auth.json` 的 OAuth token（仅 chatgpt 登录模式）、按各窗 `limit_window_seconds` 认 5h / 7d 桶，照常落盘 `source="codex"` 事件。让「装过 codex 留下 hook + auth.json、但 codex 未入 PATH / 已卸载」的用户也能采到额度。仅 `unavailable` 触发，超时 / RPC 错（`error`）不回退。
+- **app-server 失败时回退 wham**：无新鲜缓存时，app-server 返回 `unavailable` / `error` / 空额度或直接抛错，ccus 都会继续走 ChatGPT 后端 `wham/usage` HTTP 直连——读 `~/.codex/auth.json` 的 OAuth token（仅 chatgpt 登录模式）、按各窗 `limit_window_seconds` 认 5h / 7d 桶。HTTP 成功则照常落盘 `source="codex"` 事件；两路都失败则跳过本次事件，不使用过期缓存额度。
 - **定时同步**：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 超时），失败回退旧缓存。
+- **缓存节流**：Stop 每 turn 触发，额度按 5 分钟 TTL 缓存（`codex-quota-cache.json`），新鲜缓存命中秒回不 spawn；过期后依次尝试 app-server 与 wham，两路失败返回空，不回退过期缓存。
 - **字段映射**：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` 与 `%APPDATA%/orca/codex-runtime-home/home/sessions` 的 rollout；同一相对路径的副本按 JSONL 事件去重，并排除 `source.subagent.other="guardian"` 的 Codex Desktop 内部安全审查会话。统计进入 `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 处理、仍照常拉额度 + 落盘。

package/dist/cli.js

@@ -264,8 +264,12 @@ async function loadDashboardData(options, defaultRange) {
     // 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 [claudeUsage, codexUsage] = await Promise.all([
+        (0, claude_1.summarizeClaudeProjectUsageCombined)(window.start, window.end),
+        (0, codex_sessions_1.summarizeCodexSessionUsageCombined)(window.start, window.end),
+    ]);
+    const claudeDailyUsage = claudeUsage.daily;
+    const codexDailyUsage = codexUsage.daily;
     const dailyUserMessages = (0, time_1.enumerateDateKeys)(window.start, window.end).map((date) => ({
         date,
         userMessageCount: claudeDailyUsage.get(date)?.userMessageCount ?? 0,
@@ -397,10 +401,14 @@ async function runExport(options) {
     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);
+    const [claudeScan, codexScan] = await Promise.all([
+        (0, claude_1.summarizeClaudeProjectUsageCombined)(window.start, window.end),
+        (0, codex_sessions_1.summarizeCodexSessionUsageCombined)(window.start, window.end),
+    ]);
+    const claudeUsage = claudeScan.weekly;
+    const claudeDailyUsage = claudeScan.daily;
+    const codexUsage = codexScan.weekly;
+    const codexDailyUsage = codexScan.daily;
     const claudeWeeklyCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([...claudeDailyUsage.values()].map((day) => day.apiEquivalentCost));
     const codexWeeklyCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([...codexDailyUsage.values()].map((day) => day.apiEquivalentCost));
     (0, debug_1.debugLog)("export", "data collected", {
@@ -823,6 +831,7 @@ async function handleBackgroundCheckUpdate(options) {
  * 不带参数则用已存配置同步。最终仍无目标目录则报错引导用户先配置。
  */
 async function handleSync(options) {
+    const startedAt = process.hrtime.bigint();
     const dataDir = getDataDir(options);
     const target = getStringOption(options, "target");
     const interval = getStringOption(options, "interval");
@@ -848,6 +857,8 @@ async function handleSync(options) {
     if (result.archivedLastWeekDest) {
         process.stdout.write(`已归档上一周到 ${result.archivedLastWeekDest}\n`);
     }
+    const elapsedMs = Number(process.hrtime.bigint() - startedAt) / 1_000_000;
+    process.stdout.write(`耗时：${(0, sync_1.formatSyncElapsed)(elapsedMs)}\n`);
 }
 /**
  * `ccus sync status`：打印当前同步配置、上次同步时间与是否到期。

package/dist/lib/claude.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.summarizeClaudeProjectUsage = summarizeClaudeProjectUsage;
+exports.summarizeClaudeProjectUsageCombined = summarizeClaudeProjectUsageCombined;
 exports.findActiveSessionFiles = findActiveSessionFiles;
 exports.summarizeClaudeProjectUsageByDay = summarizeClaudeProjectUsageByDay;
 const promises_1 = __importDefault(require("node:fs/promises"));
@@ -84,6 +85,14 @@ function localDateKey(date) {
     const day = String(date.getDate()).padStart(2, "0");
     return `${year}-${month}-${day}`;
 }
+async function fileMayContainRange(filePath, start) {
+    try {
+        return (await promises_1.default.stat(filePath)).mtimeMs >= start.getTime();
+    }
+    catch {
+        return true;
+    }
+}
 /**
  * 判断一条 `type:"user"` 事件是否算作一次用户请求。
  *
@@ -113,50 +122,18 @@ function isHumanUserMessage(record) {
     }
     return true;
 }
-function summarizeProjectTranscript(content, start, end) {
-    const lines = content.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
-    const summary = {
-        userMessageCount: 0,
-        apiRequestCount: 0,
-        inputTokens: 0,
-        outputTokens: 0,
-        cacheReadInputTokens: 0,
-        apiEquivalentCost: (0, api_equivalent_cost_1.emptyApiEquivalentCost)(),
-    };
-    for (const line of lines) {
-        try {
-            const record = JSON.parse(line);
-            const timestamp = isRecord(record) ? getString(record.timestamp) : null;
-            if (!isRecord(record) || !timestampInRange(timestamp, start, end)) {
-                continue;
-            }
-            if (isHumanUserMessage(record)) {
-                summary.userMessageCount += 1;
-            }
-            if (record.type !== "assistant" || !isRecord(record.message) || !isRecord(record.message.usage)) {
-                continue;
-            }
-            const assistantUsage = summarizeAssistantUsage(record.message, timestamp);
-            summary.apiRequestCount += 1;
-            summary.inputTokens += assistantUsage.inputTokens;
-            summary.outputTokens += assistantUsage.outputTokens;
-            summary.cacheReadInputTokens += assistantUsage.cacheReadInputTokens;
-            summary.apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([summary.apiEquivalentCost, assistantUsage.apiEquivalentCost]);
-        }
-        catch {
-            continue;
-        }
-    }
-    return summary;
-}
 /**
  * 从 Claude 本地 project transcript 中统计本周消息数、请求数、token 用量和标准 API 等效成本。
  */
 async function summarizeClaudeProjectUsage(start, end) {
+    return (await summarizeClaudeProjectUsageCombined(start, end)).weekly;
+}
+/** 单次扫描同时生成周汇总与按天汇总。 */
+async function summarizeClaudeProjectUsageCombined(start, end) {
     const claudeDataDir = (0, paths_1.getClaudeDataDir)();
     const projectDir = node_path_1.default.join(claudeDataDir, "projects");
     const files = await collectProjectJsonlFiles(projectDir);
-    const totals = {
+    const weekly = {
         userMessageCount: 0,
         apiRequestCount: 0,
         inputTokens: 0,
@@ -166,22 +143,75 @@ async function summarizeClaudeProjectUsage(start, end) {
         matchedFileCount: files.length,
         claudeDataDir,
     };
+    const daily = new Map();
     for (const filePath of files) {
+        if (!(await fileMayContainRange(filePath, start))) {
+            continue;
+        }
+        let content = "";
         try {
-            const content = await promises_1.default.readFile(filePath, "utf8");
-            const summary = summarizeProjectTranscript(content, start, end);
-            totals.userMessageCount += summary.userMessageCount;
-            totals.apiRequestCount += summary.apiRequestCount;
-            totals.inputTokens += summary.inputTokens;
-            totals.outputTokens += summary.outputTokens;
-            totals.cacheReadInputTokens += summary.cacheReadInputTokens;
-            totals.apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([totals.apiEquivalentCost, summary.apiEquivalentCost]);
+            content = await promises_1.default.readFile(filePath, "utf8");
         }
         catch {
             continue;
         }
+        const fileSummary = {
+            userMessageCount: 0,
+            apiRequestCount: 0,
+            inputTokens: 0,
+            outputTokens: 0,
+            cacheReadInputTokens: 0,
+            apiEquivalentCost: (0, api_equivalent_cost_1.emptyApiEquivalentCost)(),
+        };
+        const lines = content.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
+        for (const line of lines) {
+            try {
+                const record = JSON.parse(line);
+                const timestamp = isRecord(record) ? getString(record.timestamp) : null;
+                if (!isRecord(record) || !timestampInRange(timestamp, start, end)) {
+                    continue;
+                }
+                const date = localDateKey(new Date(timestamp));
+                const day = daily.get(date) ?? {
+                    date,
+                    userMessageCount: 0,
+                    apiRequestCount: 0,
+                    inputTokens: 0,
+                    outputTokens: 0,
+                    cacheReadInputTokens: 0,
+                    apiEquivalentCost: (0, api_equivalent_cost_1.emptyApiEquivalentCost)(),
+                };
+                if (isHumanUserMessage(record)) {
+                    fileSummary.userMessageCount += 1;
+                    day.userMessageCount += 1;
+                }
+                if (record.type === "assistant" && isRecord(record.message) && isRecord(record.message.usage)) {
+                    const usage = summarizeAssistantUsage(record.message, timestamp);
+                    fileSummary.apiRequestCount += 1;
+                    fileSummary.inputTokens += usage.inputTokens;
+                    fileSummary.outputTokens += usage.outputTokens;
+                    fileSummary.cacheReadInputTokens += usage.cacheReadInputTokens;
+                    fileSummary.apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([fileSummary.apiEquivalentCost, usage.apiEquivalentCost]);
+                    day.apiRequestCount += 1;
+                    day.inputTokens += usage.inputTokens;
+                    day.outputTokens += usage.outputTokens;
+                    day.cacheReadInputTokens += usage.cacheReadInputTokens;
+                    day.apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([day.apiEquivalentCost, usage.apiEquivalentCost]);
+                }
+                daily.set(date, day);
+            }
+            catch {
+                continue;
+            }
+        }
+        weekly.userMessageCount += fileSummary.userMessageCount;
+        weekly.apiRequestCount += fileSummary.apiRequestCount;
+        weekly.inputTokens += fileSummary.inputTokens;
+        weekly.outputTokens += fileSummary.outputTokens;
+        weekly.cacheReadInputTokens += fileSummary.cacheReadInputTokens;
+        weekly.apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([weekly.apiEquivalentCost, fileSummary.apiEquivalentCost]);
     }
-    return totals;
+    return { weekly, daily };
 }
 /**
  * 找出 ~/.claude/projects 中在指定时间范围内有活动的 session 文件，返回文件路径及结构信息。
@@ -230,57 +260,6 @@ async function findActiveSessionFiles(start, end) {
  * 按天汇总 Claude project transcript 中的消息数、请求数、token 用量和标准 API 等效成本。
  */
 async function summarizeClaudeProjectUsageByDay(start, end) {
-    const claudeDataDir = (0, paths_1.getClaudeDataDir)();
-    const projectDir = node_path_1.default.join(claudeDataDir, "projects");
-    const files = await collectProjectJsonlFiles(projectDir);
-    const daily = new Map();
-    for (const filePath of files) {
-        let content = "";
-        try {
-            content = await promises_1.default.readFile(filePath, "utf8");
-        }
-        catch {
-            continue;
-        }
-        const lines = content.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
-        for (const line of lines) {
-            try {
-                const record = JSON.parse(line);
-                if (!isRecord(record)) {
-                    continue;
-                }
-                const timestamp = getString(record.timestamp);
-                if (!timestampInRange(timestamp, start, end)) {
-                    continue;
-                }
-                const date = localDateKey(new Date(timestamp));
-                const current = daily.get(date) ?? {
-                    date,
-                    userMessageCount: 0,
-                    apiRequestCount: 0,
-                    inputTokens: 0,
-                    outputTokens: 0,
-                    cacheReadInputTokens: 0,
-                    apiEquivalentCost: (0, api_equivalent_cost_1.emptyApiEquivalentCost)(),
-                };
-                if (isHumanUserMessage(record)) {
-                    current.userMessageCount += 1;
-                }
-                if (record.type === "assistant" && isRecord(record.message) && isRecord(record.message.usage)) {
-                    const assistantUsage = summarizeAssistantUsage(record.message, timestamp);
-                    current.apiRequestCount += 1;
-                    current.inputTokens += assistantUsage.inputTokens;
-                    current.outputTokens += assistantUsage.outputTokens;
-                    current.cacheReadInputTokens += assistantUsage.cacheReadInputTokens;
-                    current.apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([current.apiEquivalentCost, assistantUsage.apiEquivalentCost]);
-                }
-                daily.set(date, current);
-            }
-            catch {
-                continue;
-            }
-        }
-    }
-    return daily;
+    return (await summarizeClaudeProjectUsageCombined(start, end)).daily;
 }
 //# sourceMappingURL=claude.js.map

package/dist/lib/codex-fetcher.js

@@ -22,7 +22,7 @@ const CODEX_ARGS = ["-s", "read-only", "-a", "never", "app-server"];
 const DEFAULT_TIMEOUT_MS = 10_000;
 // notify 每 turn 触发，额度缓存 5 分钟，命中秒回避免阻塞 Codex 主流程。
 const DEFAULT_TTL_MS = 5 * 60 * 1000;
-// ChatGPT 后端 wham/usage 回退：仅本机无 codex CLI（spawn unavailable）时走，直连读 auth.json 的 OAuth token。
+// ChatGPT 后端 wham/usage 回退：app-server 未返回可用额度时走，直连读 auth.json 的 OAuth token。
 const WHAM_USAGE_URL = "https://chatgpt.com/backend-api/wham/usage";
 const WHAM_TIMEOUT_MS = 15_000;
 // wham 各窗口自带的时长（秒）：5h 窗 18000、周窗 604800，按它认桶、不假设 primary/secondary 顺序。
@@ -306,7 +306,7 @@ async function fetchCodexQuota(options = {}) {
         });
     });
 }
-// --- wham/usage HTTP 直连回退（仅主路径 unavailable 时由 resolveCodexQuota 编排） ---
+// --- wham/usage HTTP 直连回退（主路径未返回可用额度时由 resolveCodexQuota 编排） ---
 /** 读 wham 窗口使用率：主字段 `used_percent`（下划线，wham 实际返回），驼峰 / `used_percentage` 防御性 fallback；窗口为 null 返回 null。 */
 function readWhamUsedPercent(window) {
     if (!window) {
@@ -380,7 +380,7 @@ function emptyWhamOutcome(status) {
 /**
  * wham/usage HTTP 直连回退：读 auth.json 的 chatgpt OAuth token → `GET wham/usage` → parseWhamUsage 认桶。
  *
- * 仅在主路径 `unavailable`（本机无 codex CLI）时由 resolveCodexQuota 编排调用。全程不抛错：
+ * 主路径未返回可用额度时由 resolveCodexQuota 编排调用。全程不抛错：
  * 无 token / HTTP 失败 / 非 2xx / JSON 异常 / 解析空 → `{ status: "error", ... }`，成功 → `{ status: "ok", ... }`。
  * 请求经 api-mode 的 httpRequest（自带统一 env 代理通道，代理环境也能回退采到额度）。
  */
@@ -465,7 +465,7 @@ function hasAnyQuota(quota) {
     return quota.fiveHour !== null || quota.sevenDay !== null;
 }
 /**
- * 缓存优先解析额度：新鲜直接返回；过期拉一次（带超时）；拉取失败 / 无有效数据回退旧缓存，全失败返回 null。
+ * 缓存优先解析额度：新鲜直接返回；过期先拉 app-server，未得到可用额度再拉 wham；两路均失败或全空返回 null。
  *
  * notify 路径用，全程不抛错、不写 stdout。`options.fetcher` 供测试注入。
  */
@@ -487,30 +487,24 @@ async function resolveCodexQuota(dataDir, options = {}) {
         if (outcome.status === "ok" && hasAnyQuota(outcome)) {
             return await persist({ fiveHour: outcome.fiveHour, sevenDay: outcome.sevenDay, resetsAt: outcome.resetsAt });
         }
-        // 主路径 unavailable（本机无 codex CLI）→ wham/usage HTTP 直连回退；
-        // error（超时 / RPC 错 / 进程崩）不触发，避免瞬时故障多扛一次 15s HTTP。
-        if (outcome.status === "unavailable") {
-            try {
-                const whamOutcome = await whamFetcher({
-                    codexHomePath: options.fetchOptions?.codexHomePath,
-                    env: options.fetchOptions?.env,
-                });
-                if (whamOutcome.status === "ok" && hasAnyQuota(whamOutcome)) {
-                    return await persist({ fiveHour: whamOutcome.fiveHour, sevenDay: whamOutcome.sevenDay, resetsAt: whamOutcome.resetsAt });
-                }
-                (0, debug_1.debugLog)("codex", "wham fallback did not yield usable quota", { status: whamOutcome.status });
-            }
-            catch (error) {
-                (0, debug_1.debugLog)("codex", "wham fallback threw", error instanceof Error ? error.message : String(error));
-            }
-        }
-        else {
-            (0, debug_1.debugLog)("codex", "fetch did not yield usable quota", { status: outcome.status });
+        (0, debug_1.debugLog)("codex", "app-server did not yield usable quota", { status: outcome.status });
+    }
+    catch (error) {
+        (0, debug_1.debugLog)("codex", "app-server fetch threw", error instanceof Error ? error.message : String(error));
+    }
+    try {
+        const whamOutcome = await whamFetcher({
+            codexHomePath: options.fetchOptions?.codexHomePath,
+            env: options.fetchOptions?.env,
+        });
+        if (whamOutcome.status === "ok" && hasAnyQuota(whamOutcome)) {
+            return await persist({ fiveHour: whamOutcome.fiveHour, sevenDay: whamOutcome.sevenDay, resetsAt: whamOutcome.resetsAt });
         }
+        (0, debug_1.debugLog)("codex", "wham fallback did not yield usable quota", { status: whamOutcome.status });
     }
     catch (error) {
-        (0, debug_1.debugLog)("codex", "fetch threw, fallback to cache", error instanceof Error ? error.message : String(error));
+        (0, debug_1.debugLog)("codex", "wham fallback threw", error instanceof Error ? error.message : String(error));
     }
-    return cached ? quotaFromCache(cached) : null;
+    return null;
 }
 //# sourceMappingURL=codex-fetcher.js.map

package/dist/lib/codex-sessions.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findActiveCodexSessionFiles = findActiveCodexSessionFiles;
+exports.summarizeCodexSessionUsageCombined = summarizeCodexSessionUsageCombined;
 exports.summarizeCodexSessionUsage = summarizeCodexSessionUsage;
 exports.summarizeCodexSessionUsageByDay = summarizeCodexSessionUsageByDay;
 const promises_1 = __importDefault(require("node:fs/promises"));
@@ -126,8 +127,36 @@ function mergeRolloutContents(contents) {
     }
     return mergedLines.length > 0 ? `${mergedLines.join("\n")}\n` : "";
 }
-async function readMergedRollout(group) {
-    const reads = await Promise.all(group.filePaths.map(async (filePath) => {
+async function readRolloutFileRef(filePath) {
+    try {
+        const stat = await promises_1.default.stat(filePath, { bigint: true });
+        return {
+            filePath,
+            identityKey: stat.ino === 0n ? null : `${stat.dev}:${stat.ino}`,
+            mtimeMs: Number(stat.mtimeMs),
+        };
+    }
+    catch {
+        return { filePath, identityKey: null, mtimeMs: null };
+    }
+}
+function isCompletePrefix(shorter, longer) {
+    return shorter.length === 0
+        || ((shorter.endsWith("\n") || shorter.endsWith("\r")) && longer.startsWith(shorter));
+}
+async function readMergedRollout(group, start) {
+    const refs = await Promise.all(group.filePaths.map((filePath) => readRolloutFileRef(filePath)));
+    if (start && refs.length > 0 && refs.every((ref) => ref.mtimeMs !== null && ref.mtimeMs < start.getTime())) {
+        return null;
+    }
+    const uniqueRefs = new Map();
+    for (const ref of refs) {
+        const key = ref.identityKey ?? `path:${rolloutPathKey(ref.filePath)}`;
+        if (!uniqueRefs.has(key)) {
+            uniqueRefs.set(key, ref);
+        }
+    }
+    const reads = await Promise.all([...uniqueRefs.values()].map(async ({ filePath }) => {
         try {
             return await promises_1.default.readFile(filePath, "utf8");
         }
@@ -135,7 +164,18 @@ async function readMergedRollout(group) {
             return null;
         }
     }));
-    return mergeRolloutContents(reads.filter((content) => content !== null));
+    const contents = reads.filter((content) => content !== null);
+    if (contents.length === 0) {
+        return "";
+    }
+    if (contents.length === 1 || contents.every((content) => content === contents[0])) {
+        return contents[0];
+    }
+    const longest = contents.reduce((current, content) => content.length > current.length ? content : current);
+    if (contents.every((content) => content === longest || isCompletePrefix(content, longest))) {
+        return longest;
+    }
+    return mergeRolloutContents(contents);
 }
 function timestampInRange(timestamp, start, end) {
     if (!timestamp) {
@@ -155,6 +195,9 @@ async function findActiveCodexSessionFiles(start, end) {
     for (const group of groups) {
         try {
             const content = await readMergedRollout(group);
+            if (content === null) {
+                continue;
+            }
             const lines = content.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
             let hasInRange = false;
             for (const line of lines) {
@@ -203,7 +246,23 @@ function extractLastTokenUsage(payload) {
  *   turn_id 全局去重（取最早 timestamp），不能在单文件层计数。
  * - `event_msg` + `payload.type=="token_count"`：一次模型请求，token 取 `info.last_token_usage` 增量。
  */
-function summarizeRollout(content, start, end) {
+function ensureCodexDay(daily, date) {
+    let current = daily.get(date);
+    if (!current) {
+        current = {
+            date,
+            userMessageCount: 0,
+            apiRequestCount: 0,
+            inputTokens: 0,
+            outputTokens: 0,
+            cacheReadInputTokens: 0,
+            apiEquivalentCost: (0, api_equivalent_cost_1.emptyApiEquivalentCost)(),
+        };
+        daily.set(date, current);
+    }
+    return current;
+}
+function summarizeRollout(content, start, end, daily) {
     const lines = content.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
     const result = {
         turns: [],
@@ -242,21 +301,27 @@ function summarizeRollout(content, start, end) {
                 if (usage) {
                     const { inputTokens, cacheReadInputTokens } = splitInputTokens(usage);
                     const outputTokens = getNumber(usage.output_tokens);
+                    const cost = (0, api_equivalent_cost_1.priceApiRequest)({
+                        provider: "codex",
+                        timestamp: timestamp,
+                        model: currentModel,
+                        inputTokens,
+                        outputTokens,
+                        cacheReadInputTokens,
+                    });
                     result.apiRequestCount += 1;
                     result.inputTokens += inputTokens;
                     result.outputTokens += outputTokens;
                     result.cacheReadInputTokens += cacheReadInputTokens;
-                    result.apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([
-                        result.apiEquivalentCost,
-                        (0, api_equivalent_cost_1.priceApiRequest)({
-                            provider: "codex",
-                            timestamp: timestamp,
-                            model: currentModel,
-                            inputTokens,
-                            outputTokens,
-                            cacheReadInputTokens,
-                        }),
-                    ]);
+                    result.apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([result.apiEquivalentCost, cost]);
+                    if (daily) {
+                        const day = ensureCodexDay(daily, (0, time_1.localDateKey)(new Date(timestamp)));
+                        day.apiRequestCount += 1;
+                        day.inputTokens += inputTokens;
+                        day.outputTokens += outputTokens;
+                        day.cacheReadInputTokens += cacheReadInputTokens;
+                        day.apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([day.apiEquivalentCost, cost]);
+                    }
                 }
             }
         }
@@ -273,10 +338,11 @@ function summarizeRollout(content, start, end) {
  * 消息数 = task_started 的 distinct turn_id（跨文件去重）。重放副本会让同一 turn_id 出现在多个文件，
  * 故用全局 Map<turn_id, minMs> 收集（取最早 timestamp = 真实发生时刻，早于任何重放副本），最后取 size。
  */
-async function summarizeCodexSessionUsage(start, end) {
+async function summarizeCodexSessionUsageCombined(start, end) {
     const codexDataDir = (0, paths_1.getCodexHome)();
     const groups = await collectRolloutFileGroups();
     const turnMinMs = new Map();
+    const daily = new Map();
     let apiRequestCount = 0;
     let inputTokens = 0;
     let outputTokens = 0;
@@ -284,14 +350,14 @@ async function summarizeCodexSessionUsage(start, end) {
     let apiEquivalentCost = (0, api_equivalent_cost_1.emptyApiEquivalentCost)();
     for (const group of groups) {
         try {
-            const content = await readMergedRollout(group);
-            if (isGuardianRollout(content)) {
+            const content = await readMergedRollout(group, start);
+            if (content === null || isGuardianRollout(content)) {
                 continue;
             }
-            const parsed = summarizeRollout(content, start, end);
+            const parsed = summarizeRollout(content, start, end, daily);
             for (const turn of parsed.turns) {
-                const prev = turnMinMs.get(turn.turnId);
-                if (prev === undefined || turn.ms < prev) {
+                const previous = turnMinMs.get(turn.turnId);
+                if (previous === undefined || turn.ms < previous) {
                     turnMinMs.set(turn.turnId, turn.ms);
                 }
             }
@@ -305,17 +371,26 @@ async function summarizeCodexSessionUsage(start, end) {
             continue;
         }
     }
+    for (const ms of turnMinMs.values()) {
+        ensureCodexDay(daily, (0, time_1.localDateKey)(new Date(ms))).userMessageCount += 1;
+    }
     return {
-        userMessageCount: turnMinMs.size,
-        apiRequestCount,
-        inputTokens,
-        outputTokens,
-        cacheReadInputTokens,
-        apiEquivalentCost,
-        matchedFileCount: groups.length,
-        codexDataDir,
+        weekly: {
+            userMessageCount: turnMinMs.size,
+            apiRequestCount,
+            inputTokens,
+            outputTokens,
+            cacheReadInputTokens,
+            apiEquivalentCost,
+            matchedFileCount: groups.length,
+            codexDataDir,
+        },
+        daily,
     };
 }
+async function summarizeCodexSessionUsage(start, end) {
+    return (await summarizeCodexSessionUsageCombined(start, end)).weekly;
+}
 /**
  * 按天汇总 Codex session rollout 中的消息数、请求数、token 用量和标准 API 等效成本。
  * 与周汇总一致，排除 Codex Desktop 的 guardian 安全审查 rollout。
@@ -324,93 +399,6 @@ async function summarizeCodexSessionUsage(start, end) {
  * 且重放副本跨天不重复）。token 维度按 token_count 事件 timestamp 的本地日累加。
  */
 async function summarizeCodexSessionUsageByDay(start, end) {
-    const groups = await collectRolloutFileGroups();
-    const turnMinMs = new Map();
-    const daily = new Map();
-    const ensureDay = (date) => {
-        let current = daily.get(date);
-        if (!current) {
-            current = {
-                date,
-                userMessageCount: 0,
-                apiRequestCount: 0,
-                inputTokens: 0,
-                outputTokens: 0,
-                cacheReadInputTokens: 0,
-                apiEquivalentCost: (0, api_equivalent_cost_1.emptyApiEquivalentCost)(),
-            };
-            daily.set(date, current);
-        }
-        return current;
-    };
-    for (const group of groups) {
-        const content = await readMergedRollout(group);
-        if (isGuardianRollout(content)) {
-            continue;
-        }
-        const lines = content.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0);
-        let currentModel = null;
-        for (const line of lines) {
-            try {
-                const record = JSON.parse(line);
-                if (!isRecord(record) || !isRecord(record.payload)) {
-                    continue;
-                }
-                const payload = record.payload;
-                if (record.type === "turn_context") {
-                    if (typeof payload.model === "string") {
-                        currentModel = payload.model;
-                    }
-                    continue;
-                }
-                const timestamp = getString(record.timestamp);
-                if (!timestampInRange(timestamp, start, end)) {
-                    continue;
-                }
-                if (record.type !== "event_msg") {
-                    continue;
-                }
-                const ms = new Date(timestamp).getTime();
-                if (payload.type === "task_started" && typeof payload.turn_id === "string") {
-                    if (Number.isFinite(ms)) {
-                        const prev = turnMinMs.get(payload.turn_id);
-                        if (prev === undefined || ms < prev) {
-                            turnMinMs.set(payload.turn_id, ms);
-                        }
-                    }
-                }
-                if (payload.type === "token_count") {
-                    const usage = extractLastTokenUsage(payload);
-                    if (usage) {
-                        const current = ensureDay((0, time_1.localDateKey)(new Date(ms)));
-                        const { inputTokens, cacheReadInputTokens } = splitInputTokens(usage);
-                        const outputTokens = getNumber(usage.output_tokens);
-                        current.apiRequestCount += 1;
-                        current.inputTokens += inputTokens;
-                        current.outputTokens += outputTokens;
-                        current.cacheReadInputTokens += cacheReadInputTokens;
-                        current.apiEquivalentCost = (0, api_equivalent_cost_1.mergeApiEquivalentCosts)([
-                            current.apiEquivalentCost,
-                            (0, api_equivalent_cost_1.priceApiRequest)({
-                                provider: "codex",
-                                timestamp: timestamp,
-                                model: currentModel,
-                                inputTokens,
-                                outputTokens,
-                                cacheReadInputTokens,
-                            }),
-                        ]);
-                    }
-                }
-            }
-            catch {
-                continue;
-            }
-        }
-    }
-    for (const ms of turnMinMs.values()) {
-        ensureDay((0, time_1.localDateKey)(new Date(ms))).userMessageCount += 1;
-    }
-    return daily;
+    return (await summarizeCodexSessionUsageCombined(start, end)).daily;
 }
 //# sourceMappingURL=codex-sessions.js.map

package/dist/lib/sync.js

@@ -10,6 +10,7 @@ exports.readSyncConfig = readSyncConfig;
 exports.writeSyncConfig = writeSyncConfig;
 exports.readSyncStateSync = readSyncStateSync;
 exports.isSyncDue = isSyncDue;
+exports.formatSyncElapsed = formatSyncElapsed;
 exports.performSync = performSync;
 exports.maybeSpawnBackgroundSync = maybeSpawnBackgroundSync;
 const node_child_process_1 = require("node:child_process");
@@ -159,6 +160,10 @@ function isSyncDue(config, state, now = new Date()) {
     }
     return now.getTime() - last >= interval.ms;
 }
+/** 把同步耗时统一格式化为秒，保留三位小数。 */
+function formatSyncElapsed(elapsedMs) {
+    return `${(Math.max(0, elapsedMs) / 1000).toFixed(3)}s`;
+}
 /**
  * 导出某个 range 的 bundle，并复制到目标目录下对应的「按周」子目录。
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccus-cli",
-  "version": "0.2.12",
+  "version": "0.2.14",
   "description": "Claude Code statusline usage logger and dashboard CLI",
   "type": "commonjs",
   "bin": {