ccus-cli 0.2.5 → 0.2.6

package/dist/lib/aggregate.js

@@ -411,8 +411,11 @@ function buildSevenDayCurveFromEvents(events) {
 }
 /**
  * 同一 personKey 的 7d 累计曲线：把该人**所有 bundle**（非仅 winner）的 rawEvents 计算成事件、
- * 取非 null `sevenDayUsagePct`、按 timestamp 升序合并、对完全相同 timestamp 去重，再做读数去毛刺，
- * 得到一条账号级曲线。
+ * 取非 null `sevenDayUsagePct`、按 timestamp 升序合并、对完全相同 timestamp 去重，再做读数去毛刺。
+ *
+ * Claude 与 Codex 是两个不同额度池的独立曲线（读数水平常常相差悬殊），按 source 各自建一条，
+ * 算累计时分别做分段峰谷和再相加。混成一条会让低位源频繁触发假 reset、把高位源的上升段反复重算，
+ * 导致累计严重虚高（实测 jizhiqiang 混算 221% vs 分源相加 44%）。
  *
  * 走全样本而非 winner，是因为累计指标是同一条共享额度曲线的密集采样：只取 winner 会漏掉非 winner
  * 机器的样本（曲线稀疏、累计偏小），分机各自累计再相加又会翻倍。结果按 bundles 数组缓存复用。
@@ -423,27 +426,31 @@ function buildPersonSevenDayCurve(bundles) {
     if (cached) {
         return cached;
     }
-    const collected = new Map();
+    const claudeByPerson = new Map();
+    const codexByPerson = new Map();
     for (const { bundle } of bundles) {
         const personKey = bundlePersonKey(bundle);
-        // 含 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;
             }
-            const list = collected.get(personKey);
+            const target = (0, payload_1.isCodexSourceEvent)(event) ? codexByPerson : claudeByPerson;
+            const list = target.get(personKey);
             if (list) {
                 list.push(event);
             }
             else {
-                collected.set(personKey, [event]);
+                target.set(personKey, [event]);
             }
         }
     }
     const curves = new Map();
-    for (const [personKey, events] of collected.entries()) {
-        curves.set(personKey, buildSevenDayCurveFromEvents(events));
+    for (const personKey of new Set([...claudeByPerson.keys(), ...codexByPerson.keys()])) {
+        curves.set(personKey, {
+            claude: buildSevenDayCurveFromEvents(claudeByPerson.get(personKey) ?? []),
+            codex: buildSevenDayCurveFromEvents(codexByPerson.get(personKey) ?? []),
+        });
     }
     personSevenDayCurveCache.set(bundles, curves);
     return curves;
@@ -456,6 +463,18 @@ function sliceCurveByDate(curve, date) {
 function sliceCurveByWeek(curve, week) {
     return curve.filter((event) => weekKey(new Date(event.timestamp)) === week);
 }
+/**
+ * 分源 7d 累计：Claude 与 Codex 各自按区间切片做分段峰谷和，再用 `addNullable` 相加。
+ * 两源是不同额度池的独立曲线，混算会互相触发假 reset 而虚高；分源算后相加，与 CSV 里 token /
+ * 消息数「Claude+Codex 合计」口径一致。该 personKey 无任何曲线、或两源都无有效样本时返回 null。
+ */
+function computeCumulativeSevenDayBySource(curves, personKey, slicer, rangeKey) {
+    const bySource = curves.get(personKey);
+    if (!bySource) {
+        return null;
+    }
+    return addNullable(computeCumulativeSevenDay(slicer(bySource.claude, rangeKey)), computeCumulativeSevenDay(slicer(bySource.codex, rangeKey)));
+}
 /** 从一组事件按真实时间戳重算 5h / 7d 的 peak（max）与 latest（时间戳最新非空）。 */
 function recomputeUsage(events) {
     const newestFirst = [...events].sort((left, right) => new Date(right.timestamp).getTime() - new Date(left.timestamp).getTime());
@@ -526,8 +545,8 @@ function buildAggregatedDailyRows(bundles) {
         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));
+        // 累计指标走全样本分源曲线（Claude + Codex 各自切片累计后相加），不走单机的 recomputeUsage，避免漏掉另一台机器的样本。
+        const sevenDayCumulativeUsagePct = computeCumulativeSevenDayBySource(curves, personKey, sliceCurveByDate, date);
         rows.push({
             personKey,
             date,
@@ -621,8 +640,8 @@ function buildAggregatedWeeklyRows(bundles) {
         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));
+        // 整周累计：Claude + Codex 各自在整周子曲线上做分段峰谷和后相加，跨天边界增量被计入，故 weekly ≥ Σ daily。
+        const sevenDayCumulativeUsagePct = computeCumulativeSevenDayBySource(curves, acc.personKey, sliceCurveByWeek, acc.week);
         rows.push({
             personKey: acc.personKey,
             week: acc.week,

package/dist/lib/dashboard.js

@@ -34,8 +34,8 @@ function summarizeEvents(events) {
     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));
+    // 7d 分源累计：Claude + Codex 各自「去毛刺 + 分段峰谷和」后相加，与 aggregate 同口径（混算会虚高）。
+    const sevenDayCumulativeUsagePct = (0, aggregate_1.addNullable)((0, aggregate_1.computeCumulativeSevenDay)((0, aggregate_1.buildSevenDayCurveFromEvents)(events.filter((event) => !(0, payload_1.isCodexSourceEvent)(event)))), (0, aggregate_1.computeCumulativeSevenDay)((0, aggregate_1.buildSevenDayCurveFromEvents)(events.filter(payload_1.isCodexSourceEvent))));
     return {
         fiveHourLatestUsagePct: latestUsagePct,
         fiveHourPeakUsagePct: usages.length > 0 ? (0, time_1.roundNumber)(Math.max(...usages), 1) : null,
@@ -79,8 +79,9 @@ function bucketizeEvents(events, start, end, bucketMinutes = 5) {
     }
     // 7d 累计曲线（去毛刺 + 分段峰谷和的逐点版本）映射到时间桶：曲线已按时间升序，
     // 同桶内后写覆盖前写，最终每个桶留下落在其区间内最后一个累计点的值（单调，等于桶内最大累计）。
+    // 只画 Claude 源：折线图是 Claude 趋势看板（与同图 5h/7d 两条线同源），Codex 累计已并入顶部 summary 数值。
     const cumulativeByBucket = new Map();
-    for (const point of (0, aggregate_1.computeCumulativeSevenDayCurve)((0, aggregate_1.buildSevenDayCurveFromEvents)(events))) {
+    for (const point of (0, aggregate_1.computeCumulativeSevenDayCurve)((0, aggregate_1.buildSevenDayCurveFromEvents)(events.filter((event) => !(0, payload_1.isCodexSourceEvent)(event))))) {
         const ts = new Date(point.timestamp).getTime();
         if (ts < start.getTime() || ts > end.getTime()) {
             continue;

package/package.json

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