ccus-cli 0.1.2 → 0.1.3

package/README.md

@@ -31,7 +31,7 @@ npm install -g ccus-cli
 ccus install
 ```
 
-然后照常使用 Claude Code，statusline 会显示 5 小时额度使用率（`5h`）、7 天额度使用率（`7d`）和 context window 占用百分比（`ctx`），原始 payload 也会落到本地日志，供后续 dashboard / export 使用。
+然后照常使用 Claude Code，statusline 会显示 5 小时额度使用率（`5h`）、7 天额度使用率（`7d`）、context window 占用百分比（`ctx`）、模型名、工作区名，以及当前 git 分支（`⎇ <branch>`，实时读取，非 git 仓库或处于 detached HEAD 时省略该段）；原始 payload 也会落到本地日志，供后续 dashboard / export 使用。
 
 攒了一段时间数据后，最常用的几条命令：
 
@@ -107,6 +107,7 @@ ccus aggregate serve --input-dir ./team-exports
 ## 导出
 
 - 默认导出 `this-week`；如需导出上一个完整周（周一到周日），用 `--range last-week`，或位置参数简写 `ccus export lw`（`tw` = 本周）
+- 周度导出固定覆盖**完整一周（周一到周日）**：`this-week` 即使本周还没过完、后面几天还没有任何数据，文件名的起止日期也会补齐到本周日，`dailySummaries` 同样按整周 7 天逐日输出
 - 默认输出一个 `json` 数据包，里面同时包含 `rawEvents`、`weeklySummary`、`dailySummaries`
 - 当前导出 bundle / weeklySummary 的 `schemaVersion` 为 `6`，用于标识已使用 `fiveHourLatestUsagePct`、`fiveHourPeakUsagePct`、`sevenDayLatestUsagePct`、`sevenDayPeakUsagePct` 字段的新导出契约
 - 默认文件名会带 git email 的帐号名前缀和起止日期，例如：`alice_export_2026-05-26_to_2026-06-01.json`

package/dist/cli.js

@@ -152,7 +152,8 @@ async function handleStatuslineEmit(options) {
         (0, debug_1.debugLog)("statusline", "payload received", { length: raw.length });
         const payload = (0, payload_1.parseStatuslinePayload)(raw);
         const record = (0, payload_1.createPersistedStatuslineEvent)(payload);
-        const gitIdentity = await (0, git_1.readGitIdentity)();
+        const workspaceDir = (0, payload_1.extractWorkspaceDir)(payload);
+        const [gitIdentity, gitBranch] = await Promise.all([(0, git_1.readGitIdentity)(), (0, git_1.readGitBranch)(workspaceDir)]);
         record.gitUserName = gitIdentity.userName;
         record.gitUserEmail = gitIdentity.userEmail;
         record.gitUserAccount = (0, time_1.extractGitEmailAccount)(gitIdentity.userEmail);
@@ -162,7 +163,7 @@ async function handleStatuslineEmit(options) {
         else {
             await (0, storage_1.appendEvent)(dataDir, record);
         }
-        const event = (0, payload_1.computeStatuslineEvent)(record);
+        const event = (0, payload_1.computeStatuslineEvent)(record, { gitBranch });
         (0, debug_1.debugLog)("statusline", "event computed", {
             sessionId: event.sessionId,
             usagePct: event.usagePct,
@@ -171,6 +172,7 @@ async function handleStatuslineEmit(options) {
             modelName: event.modelName,
             workspaceName: event.workspaceName,
             gitUserAccount: event.gitUserAccount,
+            gitBranch,
         });
         process.stdout.write(`${event.statusLine}\n`);
     }
@@ -280,7 +282,8 @@ async function handleExport(options) {
         throw new Error("--format has been removed. Export now always writes a weekly bundle json.");
     }
     const now = new Date();
-    const window = (0, time_1.resolveRange)(range, now);
+    // 周度导出固定覆盖完整一周：this-week 即使本周还没过完，文件名与 dailySummaries 也补齐到周日。
+    const window = (0, time_1.expandToFullWeekWindow)((0, time_1.resolveRange)(range, now));
     (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));

package/dist/lib/aggregate-dashboard.js

@@ -6,6 +6,13 @@ exports.buildAggregateDashboardHtml = buildAggregateDashboardHtml;
 const time_1 = require("./time");
 /** 折线 / 图例统一的调色板，保证同一个人在不同图表里颜色一致。 */
 const CHART_PALETTE = ["#5eead4", "#f59e0b", "#a855f7", "#22c55e", "#f87171", "#60a5fa", "#fbbf24", "#34d399"];
+/**
+ * 7d 虚线专用的配套色板，和 CHART_PALETTE 同序号但色相强反差。
+ *
+ * 5h / 7d 同图叠加时，5h 用 CHART_PALETTE 实线、7d 用这套对比色虚线，
+ * 避免两条线颜色太接近看不清；人物对应关系靠图例里的双色点维持。
+ */
+const SEVEN_DAY_PALETTE = ["#fb7185", "#38bdf8", "#facc15", "#e879f9", "#4ade80", "#fb923c", "#818cf8", "#f472b6"];
 /** 所有插入到 HTML 的文本字段都要先转义，避免本地页面被注入。 */
 function escapeHtml(value) {
     return value
@@ -270,33 +277,39 @@ function formatTickTime(t) {
     return `${mm}-${dd} ${hh}:${mi}`;
 }
 /**
- * 用事件级 detail 行画出 5h 额度使用率（usagePct）的详细曲线。
+ * 用事件级 detail 行画出 5h 额度与 7d 周额度使用率的详细曲线。
  *
  * 与按天聚合的图不同，这里直接用每条 statusline 采样的真实时间戳，粒度最细，
- * 能看出每个人 5 小时额度在一天里的爬升与重置节奏。X 轴是连续时间，Y 轴是百分比。
+ * 能看出每个人 5 小时额度在一天里的爬升与重置节奏，同时叠加 7 天周额度的走势。
+ * X 轴是连续时间，Y 轴是百分比；同一个人 5h 用实线、7d 用虚线，共用颜色和 Y 轴。
  */
 function renderFiveHourUsageChart(people, detailRows) {
     const series = people
-        .map((person, index) => ({
-        person,
-        index,
-        points: detailRows
-            .filter((row) => row.personKey === person.personKey && row.usagePct !== null)
-            .map((row) => ({ t: new Date(row.timestamp).getTime(), v: row.usagePct }))
+        .map((person, index) => {
+        const personRows = detailRows
+            .filter((row) => row.personKey === person.personKey)
+            .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),
-    }))
-        .filter((entry) => entry.points.length > 0);
-    const allPoints = series.flatMap((entry) => entry.points);
+            .sort((left, right) => left.t - right.t);
+        const fivePoints = personRows
+            .filter((point) => point.five !== null)
+            .map((point) => ({ t: point.t, v: point.five }));
+        const sevenPoints = personRows
+            .filter((point) => point.seven !== null)
+            .map((point) => ({ t: point.t, v: point.seven }));
+        return { person, index, fivePoints, sevenPoints };
+    })
+        .filter((entry) => entry.fivePoints.length > 0 || entry.sevenPoints.length > 0);
+    const allPoints = series.flatMap((entry) => [...entry.fivePoints, ...entry.sevenPoints]);
     if (allPoints.length === 0) {
         return `
       <section class="panel chart-panel">
         <div class="panel-header">
           <div>
-            <p class="eyebrow">5h Usage Detail</p>
-            <h2>5h 使用率详细曲线</h2>
+            <p class="eyebrow">Usage Detail</p>
+            <h2>5h / 7d 使用率详细曲线</h2>
           </div>
-          <p class="muted">还没有带 5h 使用率的 statusline 采样。</p>
+          <p class="muted">还没有带使用率的 statusline 采样。</p>
         </div>
       </section>
     `;
@@ -327,32 +340,42 @@ function renderFiveHourUsageChart(people, detailRows) {
         return `<g><line x1="${x}" x2="${x}" y1="${height - paddingY}" y2="${height - paddingY + 6}" class="chart-axis-line" /><text x="${x}" y="${height - 4}" text-anchor="middle" class="chart-axis">${escapeHtml(formatTickTime(t))}</text></g>`;
     })
         .join("");
+    const pathFor = (points) => points.map((point, pointIndex) => `${pointIndex === 0 ? "M" : "L"}${xFor(point.t).toFixed(2)} ${yFor(point.v).toFixed(2)}`).join(" ");
     const seriesPaths = series
         .map((entry) => {
         const color = CHART_PALETTE[entry.index % CHART_PALETTE.length];
-        const path = entry.points
-            .map((point, pointIndex) => `${pointIndex === 0 ? "M" : "L"}${xFor(point.t).toFixed(2)} ${yFor(point.v).toFixed(2)}`)
-            .join(" ");
-        return `<g><path d="${path}" fill="none" stroke="${color}" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><title>${escapeHtml(entry.person.personKey)}</title></path></g>`;
+        const sevenColor = SEVEN_DAY_PALETTE[entry.index % SEVEN_DAY_PALETTE.length];
+        const fivePath = entry.fivePoints.length > 0
+            ? `<path d="${pathFor(entry.fivePoints)}" fill="none" stroke="${color}" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><title>${escapeHtml(entry.person.personKey)} · 5h</title></path>`
+            : "";
+        const sevenPath = entry.sevenPoints.length > 0
+            ? `<path d="${pathFor(entry.sevenPoints)}" fill="none" stroke="${sevenColor}" stroke-width="2" stroke-dasharray="5 4" stroke-linecap="round" stroke-linejoin="round"><title>${escapeHtml(entry.person.personKey)} · 7d</title></path>`
+            : "";
+        return `<g>${fivePath}${sevenPath}</g>`;
     })
         .join("");
     const legend = series
         .map((entry) => {
         const color = CHART_PALETTE[entry.index % CHART_PALETTE.length];
-        return `<span class="legend-chip"><span class="legend-dot" style="background:${color}"></span>${escapeHtml(entry.person.personKey)}</span>`;
+        const sevenColor = SEVEN_DAY_PALETTE[entry.index % SEVEN_DAY_PALETTE.length];
+        return `<span class="legend-chip"><span class="legend-dot" style="background:${color}"></span><span class="legend-dot" style="background:${sevenColor}"></span>${escapeHtml(entry.person.personKey)}</span>`;
     })
         .join("");
     return `
     <section class="panel chart-panel">
       <div class="panel-header">
         <div>
-          <p class="eyebrow">5h Usage Detail</p>
-          <h2>5h 使用率详细曲线</h2>
+          <p class="eyebrow">Usage Detail</p>
+          <h2>5h / 7d 使用率详细曲线</h2>
         </div>
-        <p class="muted">每条 statusline 采样的 5 小时额度使用率（usagePct），按真实时间戳绘制。</p>
+        <p class="muted">每条 statusline 采样的 5 小时额度（实线）与 7 天周额度（对比色虚线）使用率，按真实时间戳绘制、共用 Y 轴。</p>
       </div>
-      <div class="legend">${legend}</div>
-      <svg viewBox="0 0 ${width} ${height}" class="chart" role="img" aria-label="5h 使用率详细曲线">
+      <div class="legend">
+        ${legend}
+        <span class="legend-chip"><span class="legend-line legend-line-solid"></span>5h 使用率（实线）</span>
+        <span class="legend-chip"><span class="legend-line legend-line-dashed"></span>7d 周使用量（对比色虚线）</span>
+      </div>
+      <svg viewBox="0 0 ${width} ${height}" class="chart" role="img" aria-label="5h / 7d 使用率详细曲线">
         ${ticks}
         ${xLabels}
         ${seriesPaths}
@@ -656,6 +679,8 @@ function buildAggregateDashboardHtml(detailRows, dailyRows, weeklyRows, generate
       }
       .legend-chip { display: inline-flex; align-items: center; gap: 8px; }
       .legend-dot { display: inline-block; width: 10px; height: 10px; border-radius: 50%; }
+      .legend-line { display: inline-block; width: 22px; height: 0; border-top-width: 2px; border-top-style: solid; border-top-color: var(--muted); }
+      .legend-line-dashed { border-top-style: dashed; }
       .table-panel { margin-top: 22px; }
       .table-wrap { overflow: auto; padding: 16px 20px 22px; }
       table { width: 100%; border-collapse: collapse; min-width: 760px; }

package/dist/lib/git.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.readGitBranch = readGitBranch;
 exports.readGitIdentity = readGitIdentity;
 const node_child_process_1 = require("node:child_process");
 const node_util_1 = require("node:util");
@@ -9,8 +10,8 @@ function normalizeGitValue(value) {
     const trimmed = value.replaceAll(/[\r\n\0]+/g, " ").trim();
     return trimmed.length > 0 ? trimmed : null;
 }
-/** 读取一次全局 git config 键值。 */
-async function readGitConfigValue(args) {
+/** 跑一次 git 命令并归一化其 stdout，失败一律返回 null。 */
+async function runGitCommand(args) {
     try {
         const { stdout } = await execFileAsync("git", args, {
             windowsHide: true,
@@ -21,6 +22,24 @@ async function readGitConfigValue(args) {
         return null;
     }
 }
+/**
+ * 读取指定工作目录当前所在的 git 分支名。
+ *
+ * 仅用于 statusline 实时展示，不落盘、不进导出契约。
+ * detached HEAD 等无分支场景下 `rev-parse` 会返回 `HEAD`，这里归一化为 null，避免误导。
+ * 读取失败（非 git 仓库、git 不存在等）一律降级为 null。
+ */
+async function readGitBranch(cwd) {
+    const args = ["rev-parse", "--abbrev-ref", "HEAD"];
+    if (cwd) {
+        args.unshift("-C", cwd);
+    }
+    const branch = await runGitCommand(args);
+    if (branch === null || branch === "HEAD") {
+        return null;
+    }
+    return branch;
+}
 /**
  * 读取全局 Git 用户名和邮箱。
  *
@@ -28,8 +47,8 @@ async function readGitConfigValue(args) {
  */
 async function readGitIdentity() {
     const [globalUserName, globalUserEmail] = await Promise.all([
-        readGitConfigValue(["config", "--global", "--get", "user.name"]),
-        readGitConfigValue(["config", "--global", "--get", "user.email"]),
+        runGitCommand(["config", "--global", "--get", "user.name"]),
+        runGitCommand(["config", "--global", "--get", "user.email"]),
     ]);
     return {
         userName: globalUserName,

package/dist/lib/payload.js

@@ -151,14 +151,21 @@ function parseStatuslinePayload(input) {
  *
  * 这里必须保持单行、紧凑，避免污染 statusline 展示区域。
  */
-function formatStatusLine(event) {
+function formatStatusLine(event, gitBranch = null) {
     const timeLabel = (0, time_1.formatClock)(new Date(event.timestamp));
     const usageLabel = event.usagePct === null ? "5h --" : `5h ${event.usagePct.toFixed(1)}%`;
     const sevenDayLabel = event.sevenDayUsagePct === null ? "7d --" : `7d ${event.sevenDayUsagePct.toFixed(1)}%`;
     const contextLabel = event.contextWindowPct === null ? "ctx --" : `ctx ${event.contextWindowPct.toFixed(1)}%`;
     const modelLabel = event.modelName ?? "model --";
     const workspaceLabel = event.workspaceName ?? "workspace --";
-    return `${usageLabel} | ${sevenDayLabel} | ${contextLabel} | ${modelLabel} | ${workspaceLabel} | ${timeLabel}`;
+    const segments = [usageLabel, sevenDayLabel, contextLabel, modelLabel, workspaceLabel];
+    // 分支名是 statusline 实时读取的展示信息，仅在拿得到时追加一段；
+    // 历史日志重算时通常没有分支，省略该段比硬塞 "branch --" 更干净。
+    if (gitBranch) {
+        segments.push(`⎇ ${gitBranch}`);
+    }
+    segments.push(timeLabel);
+    return segments.join(" | ");
 }
 /**
  * 基于原始 payload 创建一条最小持久化事件。
@@ -180,7 +187,7 @@ function createPersistedStatuslineEvent(payload, now = new Date()) {
  *
  * 对旧日志会优先使用 rawPayload 重新推导；若个别旧字段缺失，再回退到历史持久化字段。
  */
-function computeStatuslineEvent(record) {
+function computeStatuslineEvent(record, options = {}) {
     const legacy = record;
     const payload = record.rawPayload ?? {};
     const sessionId = readSessionId(payload) ?? legacy.sessionId ?? null;
@@ -213,7 +220,7 @@ function computeStatuslineEvent(record) {
     };
     return {
         ...baseEvent,
-        statusLine: legacy.statusLine ?? formatStatusLine(baseEvent),
+        statusLine: legacy.statusLine ?? formatStatusLine(baseEvent, options.gitBranch ?? null),
     };
 }
 //# sourceMappingURL=payload.js.map

package/dist/lib/time.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveRange = resolveRange;
+exports.expandToFullWeekWindow = expandToFullWeekWindow;
 exports.localDateKey = localDateKey;
 exports.formatRangeFileLabel = formatRangeFileLabel;
 exports.extractGitEmailAccount = extractGitEmailAccount;
@@ -27,6 +28,15 @@ function startOfLocalWeek(date) {
     start.setDate(date.getDate() + diff);
     return startOfLocalDay(start);
 }
+/**
+ * 以周日 23:59:59.999 作为一周结束（周一为起始）。
+ *
+ * 和 `startOfLocalWeek` 对称，用来把 `this-week` 补齐成完整一周。
+ */
+function endOfLocalWeek(date) {
+    const start = startOfLocalWeek(date);
+    return new Date(start.getFullYear(), start.getMonth(), start.getDate() + 6, 23, 59, 59, 999);
+}
 /** range 短别名：保持解析后的 label 仍为规范名，避免影响文件名与 bundle 契约。 */
 const RANGE_ALIASES = {
     lw: "last-week",
@@ -66,6 +76,19 @@ function resolveRange(range, now = new Date()) {
         end: now,
     };
 }
+/**
+ * 把 `this-week` 窗口补齐成完整一周（周一 ~ 周日）。
+ *
+ * export 用它保证文件名与 dailySummaries 始终覆盖整周：即使本周尚未结束、
+ * 后面几天还没有任何数据，文件名也固定是「周一_to_周日」，每天一条 daily。
+ * `last-week` 等已经是完整周的窗口原样返回，其它相对窗口不受影响。
+ */
+function expandToFullWeekWindow(window) {
+    if (window.label !== "this-week") {
+        return window;
+    }
+    return { ...window, end: endOfLocalWeek(window.start) };
+}
 /**
  * 把日期映射成稳定的本地日键，用于事件按天分桶存储。
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccus-cli",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Claude Code statusline usage logger and dashboard CLI",
   "type": "commonjs",
   "bin": {
@@ -15,7 +15,7 @@
     "build": "tsc -p tsconfig.json",
     "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"
+    "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"
   },
   "keywords": [
     "claude-code",