ccus-cli 0.1.26 → 0.2.3

package/dist/lib/codex-sessions.js

@@ -0,0 +1,197 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.summarizeCodexSessionUsage = summarizeCodexSessionUsage;
+exports.summarizeCodexSessionUsageByDay = summarizeCodexSessionUsageByDay;
+const promises_1 = __importDefault(require("node:fs/promises"));
+const node_path_1 = __importDefault(require("node:path"));
+const paths_1 = require("./paths");
+const time_1 = require("./time");
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function getNumber(value) {
+    return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}
+function getString(value) {
+    return typeof value === "string" && value.length > 0 ? value : null;
+}
+async function collectRolloutFiles(directoryPath) {
+    try {
+        const entries = await promises_1.default.readdir(directoryPath, { withFileTypes: true });
+        const nested = await Promise.all(entries.map(async (entry) => {
+            const fullPath = node_path_1.default.join(directoryPath, entry.name);
+            if (entry.isDirectory()) {
+                return collectRolloutFiles(fullPath);
+            }
+            return entry.isFile() && entry.name.endsWith(".jsonl") ? [fullPath] : [];
+        }));
+        return nested.flat();
+    }
+    catch (error) {
+        if (error.code === "ENOENT") {
+            return [];
+        }
+        throw error;
+    }
+}
+function timestampInRange(timestamp, start, end) {
+    if (!timestamp) {
+        return false;
+    }
+    const value = new Date(timestamp).getTime();
+    return Number.isFinite(value) && value >= start.getTime() && value <= end.getTime();
+}
+/**
+ * 从 `token_count` 事件的 `info.last_token_usage` 取 token 用量对象（缺失返回 null）。
+ * 必须用 last_token_usage（本次增量），不能用 total_token_usage（会话累计，会重复计）。
+ */
+function extractLastTokenUsage(payload) {
+    if (!isRecord(payload.info)) {
+        return null;
+    }
+    return isRecord(payload.info.last_token_usage) ? payload.info.last_token_usage : null;
+}
+/**
+ * 统计单个 Codex rollout 文件内的 token / 消息。
+ *
+ * Codex rollout 每行一个事件，timestamp 在 top-level：
+ * - `event_msg` + `payload.type=="user_message"`：一次用户消息（工具结果是 `function_call_output`，不命中，无需过滤）。
+ * - `event_msg` + `payload.type=="token_count"`：一次模型请求，token 取 `info.last_token_usage` 增量。
+ */
+function summarizeRollout(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,
+    };
+    for (const line of lines) {
+        try {
+            const record = JSON.parse(line);
+            if (!isRecord(record) || !timestampInRange(getString(record.timestamp), start, end)) {
+                continue;
+            }
+            if (record.type !== "event_msg" || !isRecord(record.payload)) {
+                continue;
+            }
+            const payload = record.payload;
+            if (payload.type === "user_message") {
+                summary.userMessageCount += 1;
+            }
+            if (payload.type === "token_count") {
+                const usage = extractLastTokenUsage(payload);
+                if (usage) {
+                    summary.apiRequestCount += 1;
+                    summary.inputTokens += getNumber(usage.input_tokens);
+                    summary.outputTokens += getNumber(usage.output_tokens);
+                    summary.cacheReadInputTokens += getNumber(usage.cached_input_tokens);
+                }
+            }
+        }
+        catch {
+            continue;
+        }
+    }
+    return summary;
+}
+/**
+ * 从 Codex 本地 session rollout（<CODEX_HOME>/sessions 下递归的 .jsonl）统计消息数、请求数和 token 用量。
+ */
+async function summarizeCodexSessionUsage(start, end) {
+    const codexDataDir = (0, paths_1.getCodexHome)();
+    const sessionsDir = node_path_1.default.join(codexDataDir, "sessions");
+    const files = await collectRolloutFiles(sessionsDir);
+    const totals = {
+        userMessageCount: 0,
+        apiRequestCount: 0,
+        inputTokens: 0,
+        outputTokens: 0,
+        cacheReadInputTokens: 0,
+        matchedFileCount: files.length,
+        codexDataDir,
+    };
+    for (const filePath of files) {
+        try {
+            const content = await promises_1.default.readFile(filePath, "utf8");
+            const summary = summarizeRollout(content, start, end);
+            totals.userMessageCount += summary.userMessageCount;
+            totals.apiRequestCount += summary.apiRequestCount;
+            totals.inputTokens += summary.inputTokens;
+            totals.outputTokens += summary.outputTokens;
+            totals.cacheReadInputTokens += summary.cacheReadInputTokens;
+        }
+        catch {
+            continue;
+        }
+    }
+    return totals;
+}
+/**
+ * 按天汇总 Codex session rollout 中的消息数、请求数和 token 用量。
+ */
+async function summarizeCodexSessionUsageByDay(start, end) {
+    const codexDataDir = (0, paths_1.getCodexHome)();
+    const sessionsDir = node_path_1.default.join(codexDataDir, "sessions");
+    const files = await collectRolloutFiles(sessionsDir);
+    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;
+                }
+                if (record.type !== "event_msg" || !isRecord(record.payload)) {
+                    continue;
+                }
+                const payload = record.payload;
+                const isUserMessage = payload.type === "user_message";
+                const usage = payload.type === "token_count" ? extractLastTokenUsage(payload) : null;
+                if (!isUserMessage && !usage) {
+                    continue;
+                }
+                const date = (0, time_1.localDateKey)(new Date(timestamp));
+                const current = daily.get(date) ?? {
+                    date,
+                    userMessageCount: 0,
+                    apiRequestCount: 0,
+                    inputTokens: 0,
+                    outputTokens: 0,
+                    cacheReadInputTokens: 0,
+                };
+                if (isUserMessage) {
+                    current.userMessageCount += 1;
+                }
+                if (usage) {
+                    current.apiRequestCount += 1;
+                    current.inputTokens += getNumber(usage.input_tokens);
+                    current.outputTokens += getNumber(usage.output_tokens);
+                    current.cacheReadInputTokens += getNumber(usage.cached_input_tokens);
+                }
+                daily.set(date, current);
+            }
+            catch {
+                continue;
+            }
+        }
+    }
+    return daily;
+}
+//# sourceMappingURL=codex-sessions.js.map

package/dist/lib/dashboard.js

@@ -5,6 +5,7 @@ exports.bucketizeEvents = bucketizeEvents;
 exports.buildDashboardHtml = buildDashboardHtml;
 const aggregate_1 = require("./aggregate");
 const chart_assets_1 = require("./chart-assets");
+const payload_1 = require("./payload");
 const time_1 = require("./time");
 /** 所有插入到 HTML/SVG 的动态文本都先转义，避免本地页面被注入内容。 */
 function escapeHtml(value) {
@@ -25,14 +26,14 @@ function average(values) {
  * 这里的 usage 指 Claude 的 5 小时额度使用率，而不是 context window 百分比。
  */
 function summarizeEvents(events) {
+    // 额度叠加 Codex（与 aggregate 同口径）：peak 取所有读数 max、latest 按 source 分流后相加、7d 累计走合并曲线。
     const usages = events.map((event) => event.usagePct).filter((value) => value !== null);
     const sevenDayUsages = events.map((event) => event.sevenDayUsagePct).filter((value) => value !== null);
-    const latestUsagePct = [...events]
-        .sort((left, right) => new Date(right.timestamp).getTime() - new Date(left.timestamp).getTime())
-        .find((event) => event.usagePct !== null)?.usagePct ?? null;
-    const latestSevenDayUsagePct = [...events]
-        .sort((left, right) => new Date(right.timestamp).getTime() - new Date(left.timestamp).getTime())
-        .find((event) => event.sevenDayUsagePct !== null)?.sevenDayUsagePct ?? null;
+    const byDesc = (left, right) => new Date(right.timestamp).getTime() - new Date(left.timestamp).getTime();
+    const claudeByDesc = events.filter((event) => !(0, payload_1.isCodexSourceEvent)(event)).sort(byDesc);
+    const codexByDesc = events.filter(payload_1.isCodexSourceEvent).sort(byDesc);
+    const latestUsagePct = (0, aggregate_1.addNullable)(claudeByDesc.find((event) => event.usagePct !== null)?.usagePct ?? null, codexByDesc.find((event) => event.usagePct !== null)?.usagePct ?? null);
+    const latestSevenDayUsagePct = (0, aggregate_1.addNullable)(claudeByDesc.find((event) => event.sevenDayUsagePct !== null)?.sevenDayUsagePct ?? null, codexByDesc.find((event) => event.sevenDayUsagePct !== null)?.sevenDayUsagePct ?? null);
     // 7d 分区叠加累计：与 aggregate 同一套「去毛刺 + 分段峰谷和」，口径与团队看板一致。
     const sevenDayCumulativeUsagePct = (0, aggregate_1.computeCumulativeSevenDay)((0, aggregate_1.buildSevenDayCurveFromEvents)(events));
     return {
@@ -170,10 +171,12 @@ function renderDailyMessages(points) {
         return "";
     }
     const total = points.reduce((sum, point) => sum + point.userMessageCount, 0);
-    // 离散「天」用 category x（索引 0..n-1 + 月-日标签），单系列纵向柱；uPlot.paths.bars
+    const codexTotal = points.reduce((sum, point) => sum + (point.codexUserMessageCount ?? 0), 0);
+    // 离散「天」用 category x（索引 0..n-1 + 月-日标签），双系列纵向柱（Claude / Codex）；uPlot.paths.bars
     // 画柱、draw-hook 在柱顶标数值，cursor 悬停某天在 legend 显示当日计数。
     const xs = points.map((_, index) => index);
     const counts = points.map((point) => point.userMessageCount);
+    const codexCounts = points.map((point) => point.codexUserMessageCount ?? 0);
     const xLabels = points.map((point) => point.date.slice(5));
     const spec = {
         height: 280,
@@ -181,12 +184,18 @@ function renderDailyMessages(points) {
         xLabels,
         yMin0: true,
         bars: true,
-        series: [{ label: "用户消息数", stroke: "#5eead4", fill: "rgba(94, 234, 212, 0.55)", width: 1 }],
-        legendGroups: [{ label: "用户消息数", color: "#5eead4", seriesIdx: [1] }],
+        series: [
+            { label: "Claude 消息数", stroke: "#5eead4", fill: "rgba(94, 234, 212, 0.55)", width: 1 },
+            { label: "Codex 消息数", stroke: "#f59e0b", fill: "rgba(245, 158, 11, 0.55)", width: 1 },
+        ],
+        legendGroups: [
+            { label: "Claude 消息数", color: "#5eead4", seriesIdx: [1] },
+            { label: "Codex 消息数", color: "#f59e0b", seriesIdx: [2] },
+        ],
     };
-    const chart = (0, chart_assets_1.renderUplotChart)("chart-daily-messages", spec, [xs, counts]);
-    const noData = total === 0
-        ? `<div class="empty-state">当前时间窗口里还没有统计到 Claude 用户消息。</div>`
+    const chart = (0, chart_assets_1.renderUplotChart)("chart-daily-messages", spec, [xs, counts, codexCounts]);
+    const noData = total === 0 && codexTotal === 0
+        ? `<div class="empty-state">当前时间窗口里还没有统计到 Claude / Codex 用户消息。</div>`
         : "";
     return `
     <section class="panel chart-panel">
@@ -195,7 +204,7 @@ function renderDailyMessages(points) {
           <p class="eyebrow">Daily Messages</p>
           <h2>每日用户消息数</h2>
         </div>
-        <p class="muted">按自然日统计的真实用户请求数（口径同导出 userMessageCount），共 ${total} 条</p>
+        <p class="muted">按自然日统计的真实用户请求数（口径同导出 userMessageCount），共 ${total} 条 Claude · ${codexTotal} 条 Codex</p>
       </div>
       ${noData}
       ${chart}
@@ -257,6 +266,8 @@ function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages =
     const summary = summarizeEvents(events);
     const buckets = bucketizeEvents(events, start, end, pickBucketMinutes(start, end));
     const totalUserMessages = dailyUserMessages.reduce((sum, point) => sum + point.userMessageCount, 0);
+    const codexTotalUserMessages = dailyUserMessages.reduce((sum, point) => sum + (point.codexUserMessageCount ?? 0), 0);
+    const combinedUserMessages = totalUserMessages + codexTotalUserMessages;
     return `<!doctype html>
 <html lang="zh-CN">
   <head>
@@ -449,8 +460,8 @@ function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages =
         </article>
         <article class="panel stat-card">
           <h2>用户消息数</h2>
-          <p class="stat-value">${totalUserMessages}</p>
-          <p class="stat-note">窗口内每日真实用户请求数合计</p>
+          <p class="stat-value">${combinedUserMessages}</p>
+          <p class="stat-note">窗口内每日真实用户请求数合计（Claude ${totalUserMessages} · Codex ${codexTotalUserMessages}）</p>
         </article>
       </section>
       ${renderChart(buckets)}

package/dist/lib/export.js

@@ -98,6 +98,7 @@ function buildAggregatedDetailCsv(events) {
         "sessionId",
         "workspaceName",
         "modelName",
+        "source",
         "fiveHourUsagePct",
         "contextWindowPct",
         "contextUsedM",
@@ -114,6 +115,7 @@ function buildAggregatedDetailCsv(events) {
         event.sessionId,
         event.workspaceName,
         event.modelName,
+        event.source,
         event.usagePct,
         event.contextWindowPct,
         toMillions(event.contextUsed),

package/dist/lib/paths.js

@@ -11,6 +11,10 @@ exports.getSyncConfigPath = getSyncConfigPath;
 exports.getSyncStatePath = getSyncStatePath;
 exports.getApiConfigPath = getApiConfigPath;
 exports.getApiQuotaCachePath = getApiQuotaCachePath;
+exports.getCodexQuotaCachePath = getCodexQuotaCachePath;
+exports.getCodexHome = getCodexHome;
+exports.getCodexConfigPath = getCodexConfigPath;
+exports.getCodexHooksPath = getCodexHooksPath;
 exports.getClaudeDataDir = getClaudeDataDir;
 exports.getClaudeSettingsPath = getClaudeSettingsPath;
 const node_os_1 = __importDefault(require("node:os"));
@@ -66,6 +70,22 @@ function getApiConfigPath(dataDir) {
 function getApiQuotaCachePath(dataDir) {
     return node_path_1.default.join(dataDir, "api-quota-cache.json");
 }
+/** Codex 额度缓存文件，记录上次 app-server 拉取的额度与时间。 */
+function getCodexQuotaCachePath(dataDir) {
+    return node_path_1.default.join(dataDir, "codex-quota-cache.json");
+}
+/** Codex CLI 默认本地数据目录（`CODEX_HOME` 环境变量可覆盖，默认 `~/.codex`）。 */
+function getCodexHome() {
+    return process.env.CODEX_HOME ?? node_path_1.default.join(node_os_1.default.homedir(), ".codex");
+}
+/** Codex CLI 用户级 config.toml 路径，`ccus install --codex` 往里写 notify。 */
+function getCodexConfigPath() {
+    return node_path_1.default.join(getCodexHome(), "config.toml");
+}
+/** Codex CLI 用户级 hooks.json 路径，`ccus install --codex` 往 Stop 事件挂 hook（orca 等 hook-only 环境用）。 */
+function getCodexHooksPath() {
+    return node_path_1.default.join(getCodexHome(), "hooks.json");
+}
 /** Claude Code 默认本地数据目录。 */
 function getClaudeDataDir() {
     const configured = process.env.CCUS_CLAUDE_DATA_DIR;

package/dist/lib/payload.js

@@ -10,6 +10,8 @@ exports.resolveCtxTier = resolveCtxTier;
 exports.resolveCtxRedThresholds = resolveCtxRedThresholds;
 exports.formatStatusLine = formatStatusLine;
 exports.createPersistedStatuslineEvent = createPersistedStatuslineEvent;
+exports.isCodexSourceRecord = isCodexSourceRecord;
+exports.isCodexSourceEvent = isCodexSourceEvent;
 exports.computeStatuslineEvent = computeStatuslineEvent;
 const node_path_1 = __importDefault(require("node:path"));
 const time_1 = require("./time");
@@ -271,6 +273,14 @@ function createPersistedStatuslineEvent(payload, now = new Date()) {
         rawPayload: payload,
     };
 }
+/** 判断事件是否来自 Codex（rawPayload.source === "codex"）；Claude statusline 事件无该字段，视为 claude。 */
+function isCodexSourceRecord(record) {
+    return record.rawPayload?.source === "codex";
+}
+/** StatuslineEvent 视图版的 Codex 来源判断（event.rawPayload 透传自 record）。 */
+function isCodexSourceEvent(event) {
+    return event.rawPayload?.source === "codex";
+}
 /**
  * 从持久化事件计算出 dashboard/export/statusline 使用的完整视图。
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccus-cli",
-  "version": "0.1.26",
+  "version": "0.2.3",
   "description": "Claude Code statusline usage logger and dashboard CLI",
   "type": "commonjs",
   "bin": {
@@ -15,8 +15,8 @@
   "scripts": {
     "build": "tsc -p tsconfig.json && node scripts/copy-vendor.js",
     "prepublishOnly": "npm run build",
-    "test": "node --test dist/test",
-    "test:src": "node --import tsx --test src/test/payload.test.ts src/test/dashboard.test.ts src/test/export.test.ts src/test/storage.test.ts src/test/claude.test.ts src/test/aggregate.test.ts src/test/aggregate-dashboard.test.ts src/test/install.test.ts src/test/debug.test.ts src/test/time.test.ts src/test/update-check.test.ts src/test/sync.test.ts src/test/scheduler.test.ts src/test/api-mode.test.ts",
+    "test": "node --test --test-concurrency 1 \"dist/test/**/*.test.js\"",
+    "test:src": "node --import tsx --test --test-concurrency 1 src/test/payload.test.ts src/test/dashboard.test.ts src/test/export.test.ts src/test/storage.test.ts src/test/claude.test.ts src/test/aggregate.test.ts src/test/aggregate-dashboard.test.ts src/test/install.test.ts src/test/debug.test.ts src/test/time.test.ts src/test/update-check.test.ts src/test/sync.test.ts src/test/scheduler.test.ts src/test/api-mode.test.ts src/test/codex-fetcher.test.ts src/test/codex-sessions.test.ts src/test/codex-install.test.ts src/test/cli-codex-notify.test.ts src/test/cli-codex-hook.test.ts src/test/cli-install-codex.test.ts",
     "smoke:api": "node scripts/smoke-api.mjs"
   },
   "keywords": [