ccus-cli 0.1.12 → 0.1.14

package/README.md

@@ -171,12 +171,12 @@ ccus aggregate serve --input-dir ./team-exports
 
 - 输入目录放很多通过 `ccus export` 导出的 bundle 文件，`.json.gz`（gzip 压缩）与明文 `.json` 都能识别，gzip 文件读取时自动解压
 - `aggregate` 目前只接受 `schemaVersion: 6` 的 bundle；旧导出请先用当前版本重新 `ccus export`
-- 同一个人在多台电脑上各自导出 bundle 时会自动合并去重：累加类指标（token、消息数、采样数等）按「同人同天 / 同人同周取 `generatedAt` 最新的那份导出」保留，不相加，避免同一台机器重复导出或周与周重叠造成翻倍；usage（5h / 7d）从选中那份的 `rawEvents` 按真实时间戳重算（peak 取 max、latest 取最新）
+- 同一个人在多台电脑上各自导出 bundle 时会自动合并去重：去重以**天**为粒度，对每个「同人同天」取 `generatedAt` 最新的那份导出，避免同一台机器重复导出或周与周重叠造成翻倍；**周汇总不取整周单份，而是把按天去重后的各天数据上卷累加**，所以多台电脑在不同天产生的用量会正确合进同一周。usage（5h / 7d）从选中事件按真实时间戳重算（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`：同人同周取最新导出 bundle 的 `weeklySummary`，usage 从该 bundle 全部事件重算
+  - `weekly.csv`：把同人同周的各天 winner（已按天去重）上卷累加得到，usage 从该周全部 winner 天的事件重算
 - CSV 里所有以 token 计的列（context 与 in/out/cache）都以百万（M）为单位（原始值除以 1,000,000），列名统一带 `M` 后缀；`contextWindowPct` 仍是百分比
 - 想直接查看团队多人 dashboard，可以用 `ccus aggregate serve --input-dir DIR [--port 0] [--host 127.0.0.1]`：默认监听 `127.0.0.1` 上的随机端口，启动后会自动用系统默认浏览器打开，每次请求实时读取目录里的 bundle，不写入任何文件
 

package/dist/lib/aggregate.js

@@ -122,19 +122,26 @@ async function loadWeeklyExportBundles(inputDir) {
 function bundlePersonKey(bundle) {
     return toPersonKey(bundle.identity.gitUserEmail, bundle.identity.gitUserName);
 }
-/** 某天 daySummary 是否承载真实数据（用于优先选中有数据的那份 bundle，而非占位空天）。 */
-function dayHasData(day) {
-    return day.sampleCount > 0 || day.userMessageCount > 0 || day.apiRequestCount > 0;
-}
-/** 整周 weeklySummary 是否承载真实数据。 */
-function weekHasData(bundle) {
-    const summary = bundle.weeklySummary;
-    return summary.statusline.sampleCount > 0 || summary.counts.userMessageCount > 0 || summary.counts.apiRequestCount > 0;
+/**
+ * 某天 daySummary 的数据质量等级（越高越优先）：
+ * 2 = 有 transcript 数据（userMessageCount / apiRequestCount > 0）
+ * 1 = 仅有 statusline 采样（sampleCount > 0，但 transcript 字段全为 0）
+ * 0 = 全空占位天
+ *
+ * transcript 级别优先于纯 sampleCount 级别，避免只有采样事件但无消息数的 bundle
+ * 抢走有真实 transcript 数据的 bundle 的 winner 位置。
+ */
+function dayDataTier(day) {
+    if (day.userMessageCount > 0 || day.apiRequestCount > 0)
+        return 2;
+    if (day.sampleCount > 0)
+        return 1;
+    return 0;
 }
-/** winner 比较：有数据优先，其次 generatedAt 较新，最后用 filePath 做稳定 tie-break。 */
-function isBetterCandidate(nextHasData, nextGeneratedAt, nextFilePath, currentHasData, currentGeneratedAt, currentFilePath) {
-    if (nextHasData !== currentHasData) {
-        return nextHasData;
+/** winner 比较：数据质量等级高优先，同级别内 generatedAt 较新优先，最后用 filePath 做稳定 tie-break。 */
+function isBetterCandidate(nextTier, nextGeneratedAt, nextFilePath, currentTier, currentGeneratedAt, currentFilePath) {
+    if (nextTier !== currentTier) {
+        return nextTier > currentTier;
     }
     if (nextGeneratedAt !== currentGeneratedAt) {
         return nextGeneratedAt > currentGeneratedAt;
@@ -150,28 +157,13 @@ function selectDailyWinners(bundles) {
         for (const day of bundle.dailySummaries) {
             const key = `${personKey}|${day.date}`;
             const current = winners.get(key);
-            if (!current || isBetterCandidate(dayHasData(day), generatedAt, filePath, dayHasData(current.day), current.generatedAt, current.filePath)) {
+            if (!current || isBetterCandidate(dayDataTier(day), generatedAt, filePath, dayDataTier(current.day), current.generatedAt, current.filePath)) {
                 winners.set(key, { personKey, date: day.date, day, bundle, generatedAt, filePath });
             }
         }
     }
     return winners;
 }
-/** 对每个 (personKey, week) 选出 generatedAt 最新、且尽量有数据的那份 bundle。 */
-function selectWeeklyWinners(bundles) {
-    const winners = new Map();
-    for (const { filePath, bundle } of bundles) {
-        const personKey = bundlePersonKey(bundle);
-        const week = weekKey(new Date(bundle.range.start));
-        const key = `${personKey}|${week}`;
-        const generatedAt = bundle.generatedAt ?? "";
-        const current = winners.get(key);
-        if (!current || isBetterCandidate(weekHasData(bundle), generatedAt, filePath, weekHasData(current.bundle), current.generatedAt, current.filePath)) {
-            winners.set(key, { personKey, week, bundle, generatedAt, filePath });
-        }
-    }
-    return winners;
-}
 /** 把 bundle 的 rawEvents 计算成 StatuslineEvent 并按本地自然日分组，结果做缓存复用。 */
 const bundleEventsCache = new WeakMap();
 function bundleEventsByDate(bundle) {
@@ -252,28 +244,78 @@ function buildAggregatedDailyRows(bundles) {
     }
     return rows.sort((left, right) => `${left.personKey}|${left.date}`.localeCompare(`${right.personKey}|${right.date}`));
 }
-/** 展开 weekly.csv：同人同周取 winner bundle 的累加值，usage 从该 bundle 全部事件重算。 */
+/** 周级 usage 回退：rawEvents 缺失时从各天 daySummary 自带值取 peak（max）/ latest（date 最新非空）。 */
+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);
+    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,
+    };
+}
+/**
+ * 展开 weekly.csv：一个人同一周有多份 bundle（多台电脑各导出）时，不取单独一份的整周汇总，
+ * 而是复用按天去重后的 daily winner（每天选有数据的那份），按 (person, 周) 把每天的 token / 计数累加上卷，
+ * usage 从该周所有 winner 天的事件重算（peak 取 max、latest 取时间戳最新），缺失时回退到 daySummary 自带值。
+ */
 function buildAggregatedWeeklyRows(bundles) {
-    const winners = selectWeeklyWinners(bundles);
+    const dailyWinners = selectDailyWinners(bundles);
+    const groups = new Map();
+    for (const winner of dailyWinners.values()) {
+        const week = weekKey(new Date(winner.bundle.range.start));
+        const key = `${winner.personKey}|${week}`;
+        let acc = groups.get(key);
+        if (!acc) {
+            acc = {
+                personKey: winner.personKey,
+                week,
+                userMessageCount: 0,
+                apiRequestCount: 0,
+                inputTokens: 0,
+                outputTokens: 0,
+                cacheReadInputTokens: 0,
+                sampleCount: 0,
+                uniqueSessions: 0,
+                uniqueWorkspaces: 0,
+                days: [],
+                events: [],
+            };
+            groups.set(key, acc);
+        }
+        const day = winner.day;
+        acc.userMessageCount += day.userMessageCount;
+        acc.apiRequestCount += day.apiRequestCount;
+        acc.inputTokens += day.inputTokens;
+        acc.outputTokens += day.outputTokens;
+        acc.cacheReadInputTokens += day.cacheReadInputTokens;
+        acc.sampleCount += day.sampleCount;
+        acc.uniqueSessions += day.uniqueSessions;
+        acc.uniqueWorkspaces += day.uniqueWorkspaces;
+        acc.days.push(day);
+        acc.events.push(...(bundleEventsByDate(winner.bundle).get(winner.date) ?? []));
+    }
     const rows = [];
-    for (const winner of winners.values()) {
-        const summary = winner.bundle.weeklySummary;
-        const usage = recomputeUsage([...bundleEventsByDate(winner.bundle).values()].flat());
+    for (const acc of groups.values()) {
+        const usage = recomputeUsage(acc.events);
+        const fallback = fallbackWeeklyUsage(acc.days);
         rows.push({
-            personKey: winner.personKey,
-            week: winner.week,
-            userMessageCount: summary.counts.userMessageCount,
-            apiRequestCount: summary.counts.apiRequestCount,
-            inputTokens: summary.tokens.inputTokens,
-            outputTokens: summary.tokens.outputTokens,
-            cacheReadInputTokens: summary.tokens.cacheReadInputTokens,
-            sampleCount: summary.statusline.sampleCount,
-            fiveHourPeakUsagePct: usage.fiveHourPeakUsagePct ?? summary.statusline.fiveHourPeakUsagePct,
-            fiveHourLatestUsagePct: usage.fiveHourLatestUsagePct ?? summary.statusline.fiveHourLatestUsagePct,
-            sevenDayPeakUsagePct: usage.sevenDayPeakUsagePct ?? summary.statusline.sevenDayPeakUsagePct,
-            sevenDayLatestUsagePct: usage.sevenDayLatestUsagePct ?? summary.statusline.sevenDayLatestUsagePct,
-            uniqueSessions: summary.statusline.uniqueSessions,
-            uniqueWorkspaces: summary.statusline.uniqueWorkspaces,
+            personKey: acc.personKey,
+            week: acc.week,
+            userMessageCount: acc.userMessageCount,
+            apiRequestCount: acc.apiRequestCount,
+            inputTokens: acc.inputTokens,
+            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,
+            uniqueSessions: acc.uniqueSessions,
+            uniqueWorkspaces: acc.uniqueWorkspaces,
         });
     }
     return rows.sort((left, right) => `${left.personKey}|${left.week}`.localeCompare(`${right.personKey}|${right.week}`));

package/package.json

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