ccus-cli 0.2.24 → 0.2.26

package/README.md

@@ -22,9 +22,11 @@
 
 个人和聚合面板均提供「周评分」：默认 `50 × √(周消息数 / 200) + 50 × √(周累计额度百分点 / 70)`，消息和额度均合计 Claude + Codex。两项达到基准得 100 分，分数不封顶。
 
-面板只显示评分结果。权重和基准集中在 `src/lib/weekly-score.ts` 的 `DEFAULT_SCORE_SETTINGS` 修改：`messageWeight` 为消息占比（额度占比为 100 减去消息占比），`messageBaseline` 为周消息基准，`quotaBaseline` 为周额度基准。修改后重新构建并重启面板服务。
+个人和团队面板提供「出勤天数」选择，默认 5 天，可选 1～7 天，切换后立即更新评分。消息和额度达标线按 `出勤天数 / 5` 调整，原始统计值不变；例如 3 天对应 120 条消息、42 个额度百分点。团队顶部选择批量设置所有成员，每行可单独调整，该成员所展示的各周共用所选天数；刷新页面恢复 5 天。点击「导出周统计 CSV」下载按当前各成员出勤天数评分的 `weekly.csv`，保留现有列，多周逐周导出。命令行导出仍按默认 5 天评分。
 
-评分按当前查询范围逐周计算，未满一周不折算；查看本周评分请使用 `ccus dashboard serve --range this-week`。聚合面板在「多人对比」中显示周评分，多周取逐周评分的平均值。额度缺失显示 `--`（消息占比为 100% 时可单独评分）。评分仅在页面展示，不改变 bundle 或 CSV。
+权重和标准 5 天基准集中在 `src/lib/weekly-score.ts` 的 `DEFAULT_SCORE_SETTINGS` 修改：`messageWeight` 为消息占比（额度占比为 100 减去消息占比），`messageBaseline` 为周消息基准，`quotaBaseline` 为周额度基准。修改后重新构建并重启面板服务。
+
+评分按当前查询范围逐周计算，未满一周不折算；查看本周评分请使用 `ccus dashboard serve --range this-week`。聚合面板在「多人对比」中显示周评分，多周取逐周评分的平均值。额度缺失显示 `--`（消息占比为 100% 时可单独评分）。`weekly.csv` 末尾包含 `weeklyScore`、`attendanceDays` 两列：评分与看板共用公式，保留最多 1 位小数，不可用时留空；出勤天数为 1～7，看板导出使用各成员当前选择，命令行默认 5 天。bundle、`daily.csv` 和 `detail.csv` 不变。
 
 ## 安装
 

package/dist/cli.js

@@ -613,7 +613,7 @@ async function handleAggregate(options) {
     (0, debug_1.debugLog)("aggregate", "bundles loaded", { bundleCount: bundles.length, detailRows: detailRows.length, dailyRows: dailyRows.length, weeklyRows: weeklyRows.length });
     const detailCsv = (0, export_1.buildAggregatedDetailCsv)(detailRows);
     const dailyCsv = (0, export_1.buildAggregatedDailyCsv)(dailyRows);
-    const weeklyCsv = (0, export_1.buildAggregatedWeeklyCsv)(weeklyRows);
+    const weeklyCsv = (0, export_1.buildAggregatedWeeklyCsv)(weeklyRows, 5);
     const detailPath = node_path_1.default.join(outputDir, "detail.csv");
     const dailyPath = node_path_1.default.join(outputDir, "daily.csv");
     const weeklyPath = node_path_1.default.join(outputDir, "weekly.csv");

package/dist/lib/aggregate-dashboard.js

@@ -9,6 +9,7 @@ const time_1 = require("./time");
 const api_equivalent_cost_1 = require("./api-equivalent-cost");
 const api_pricing_table_1 = require("./api-pricing-table");
 const weekly_score_1 = require("./weekly-score");
+const export_1 = require("./export");
 /** 折线 / 图例统一的调色板，保证同一个人在不同图表里颜色一致。 */
 const CHART_PALETTE = ["#5eead4", "#f59e0b", "#a855f7", "#22c55e", "#f87171", "#60a5fa", "#fbbf24", "#34d399"];
 /**
@@ -433,21 +434,16 @@ function renderPeopleLeaderboard(people, weeklyRows) {
     const scores = new Map();
     for (const row of weeklyRows) {
         const values = scores.get(row.personKey) ?? [];
-        values.push((0, weekly_score_1.calculateWeeklyScore)(row.userMessageCount, row.sevenDayCumulativeUsagePct, weekly_score_1.DEFAULT_SCORE_SETTINGS));
+        values.push(row);
         scores.set(row.personKey, values);
     }
-    const scoreText = (personKey) => {
-        const values = scores.get(personKey) ?? [];
-        if (values.length === 0 || values.some(value => value === null))
-            return "--";
-        return (values.reduce((sum, value) => sum + (value ?? 0), 0) / values.length).toFixed(1);
-    };
     const rows = people
         .map((person, index) => `
       <tr>
         <td class="rank">${index + 1}</td>
         <td><strong>${escapeHtml(person.personKey)}</strong></td>
-        <td><strong>${scoreText(person.personKey)}</strong></td>
+        <td><strong>${(0, weekly_score_1.renderAttendanceScore)(scores.get(person.personKey) ?? [])}</strong></td>
+        <td>${(0, weekly_score_1.renderAttendanceControl)(person.personKey)}</td>
         <td>${formatNumber(person.userMessageCount)}</td>
         <td>${formatTokensM(person.inputTokens)}</td>
         <td>${formatTokensM(person.outputTokens)}</td>
@@ -468,6 +464,8 @@ function renderPeopleLeaderboard(people, weeklyRows) {
           <h2>多人对比</h2>
         </div>
         <p class="muted">按用户消息数降序排列；评分按周计算，多周取平均，缺失额度显示 --。</p>
+        ${(0, weekly_score_1.renderAttendanceControl)()}
+        <button type="button" id="export-weekly-csv">导出周统计 CSV</button>
       </div>
       <div class="table-wrap">
         <table>
@@ -476,6 +474,7 @@ function renderPeopleLeaderboard(people, weeklyRows) {
               <th>#</th>
               <th>personKey</th>
               <th>周评分</th>
+              <th>出勤天数</th>
               <th>消息</th>
               <th>Input tokens</th>
               <th>Output tokens</th>
@@ -494,6 +493,38 @@ function renderPeopleLeaderboard(people, weeklyRows) {
     </section>
   `;
 }
+function weeklyCsvDownloadScript(rows) {
+    const header = (0, export_1.buildAggregatedWeeklyCsv)([]);
+    const data = rows.map(row => ({
+        personKey: row.personKey,
+        csv: [1, 2, 3, 4, 5, 6, 7].map(days => (0, export_1.buildAggregatedWeeklyCsv)([row], days).slice(header.length + 1)),
+    }));
+    // 防止用户字段闭合内联脚本；CSV 转义和公式防护复用导出模块。
+    const serialized = JSON.stringify({ header, rows: data }).replaceAll("<", "\\u003c");
+    return `<script>
+    (() => {
+      const button = document.getElementById('export-weekly-csv');
+      if (!button) return;
+      const data = ${serialized};
+      button.addEventListener('click', () => {
+        const attendance = new Map();
+        document.querySelectorAll('[data-attendance-person]').forEach(control => {
+          const days = Number(control.value);
+          attendance.set(control.dataset.attendancePerson, Number.isInteger(days) && days >= 1 && days <= 7 ? days : 5);
+        });
+        const csv = [data.header, ...data.rows.map(row => row.csv[(attendance.get(row.personKey) ?? 5) - 1])].join('\\n');
+        const url = URL.createObjectURL(new Blob(['\\uFEFF', csv], { type: 'text/csv;charset=utf-8' }));
+        const link = document.createElement('a');
+        link.href = url;
+        link.download = 'weekly.csv';
+        document.body.appendChild(link);
+        link.click();
+        link.remove();
+        setTimeout(() => URL.revokeObjectURL(url), 1000);
+      });
+    })();
+  </script>`;
+}
 /** 把 daily 行按 personKey × date 排成一个矩阵表。 */
 function renderDailyMatrix(people, dailyIndex, dateAxis) {
     if (people.length === 0 || dateAxis.length === 0) {
@@ -816,6 +847,8 @@ function buildAggregateDashboardHtml(detailRows, dailyRows, weeklyRows, generate
       ${renderDailyMatrix(people, dailyIndex, dateAxis)}
       ${renderWeeklyTable(weeklyRows)}
     </main>
+    ${(0, weekly_score_1.attendanceScoreScript)()}
+    ${weeklyCsvDownloadScript(weeklyRows)}
     ${(0, chart_assets_1.uplotBodyScripts)()}
   </body>
 </html>`;

package/dist/lib/aggregate.js

@@ -697,6 +697,7 @@ function fallbackWeeklyUsage(days) {
 /**
  * 展开 weekly.csv：不同机器的同人同天数据已在 selectDailyRepresentatives 层按 sessionId 去重分组，
  * 这里直接按 (person, 周) 把所有代表的 token / 计数累加上卷，usage 从该周所有代表事件重算。
+ * 出勤天数由 CSV 导出层提供，不从原始事件推算。
  */
 function buildAggregatedWeeklyRows(bundles) {
     const repsMap = selectDailyRepresentatives(bundles);

package/dist/lib/dashboard.js

@@ -325,9 +325,6 @@ function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages =
     const combinedUserMessages = totalUserMessages + codexTotalUserMessages;
     const scoreWeek = (0, time_1.localDateKey)((0, time_1.resolveRange)("this-week", end, (0, time_1.parseDayStart)(dayStart)).start);
     const scoreRow = buildPersonalWeeklyScores(events, dailyUserMessages, dayStart).find(row => row.week === scoreWeek);
-    const weeklyScore = scoreRow
-        ? (0, weekly_score_1.calculateWeeklyScore)(scoreRow.userMessageCount, scoreRow.sevenDayCumulativeUsagePct, weekly_score_1.DEFAULT_SCORE_SETTINGS)
-        : null;
     return `<!doctype html>
 <html lang="zh-CN">
   <head>
@@ -507,7 +504,8 @@ function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages =
       <section class="stats">
         <article class="panel stat-card" id="weekly-score">
           <h2>周评分</h2>
-          <p class="stat-value">${weeklyScore?.toFixed(1) ?? "--"}</p>
+          <p class="stat-value">${(0, weekly_score_1.renderAttendanceScore)(scoreRow ? [scoreRow] : [])}</p>
+          ${(0, weekly_score_1.renderAttendanceControl)()}
           <p class="stat-note">${scoreWeek} 当周 · 当前查询范围内数据</p>
         </article>
         <article class="panel stat-card">
@@ -527,6 +525,7 @@ function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages =
       ${renderDailyMessages(dailyUserMessages)}
       ${renderRecentEvents(events)}
     </main>
+    ${(0, weekly_score_1.attendanceScoreScript)()}
     ${(0, chart_assets_1.uplotBodyScripts)()}
   </body>
 </html>`;

package/dist/lib/export.js

@@ -19,6 +19,7 @@ const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
 const node_zlib_1 = require("node:zlib");
 const time_1 = require("./time");
+const weekly_score_1 = require("./weekly-score");
 const gzipAsync = (0, node_util_1.promisify)(node_zlib_1.gzip);
 /** CSV 字符串字段统一做转义，避免逗号和引号破坏列结构。 */
 function quoteCsv(value) {
@@ -248,7 +249,7 @@ function buildAggregatedDailyCsv(rows) {
     return [header.join(","), ...lines].join("\n");
 }
 /** 多人汇总的 weekly.csv。 */
-function buildAggregatedWeeklyCsv(rows) {
+function buildAggregatedWeeklyCsv(rows, attendanceDays = 5) {
     const header = [
         "personKey",
         "week",
@@ -267,26 +268,33 @@ function buildAggregatedWeeklyCsv(rows) {
         "uniqueWorkspaces",
         "estimatedApiEquivalentCostUsd",
         "pricingCatalogVersion",
+        "weeklyScore",
+        "attendanceDays",
     ];
-    const lines = rows.map((row) => toCsvLine([
-        row.personKey,
-        row.week,
-        row.userMessageCount,
-        row.apiRequestCount,
-        toMillions(row.inputTokens),
-        toMillions(row.outputTokens),
-        toMillions(row.cacheReadInputTokens),
-        row.sampleCount,
-        row.fiveHourPeakUsagePct,
-        row.fiveHourLatestUsagePct,
-        row.sevenDayPeakUsagePct,
-        row.sevenDayLatestUsagePct,
-        row.sevenDayCumulativeUsagePct,
-        row.uniqueSessions,
-        row.uniqueWorkspaces,
-        formatApiEquivalentCost(row.estimatedApiEquivalentCostUsd),
-        row.pricingCatalogVersion,
-    ]));
+    const lines = rows.map((row) => {
+        const score = (0, weekly_score_1.calculateWeeklyScore)(row.userMessageCount, row.sevenDayCumulativeUsagePct, weekly_score_1.DEFAULT_SCORE_SETTINGS, attendanceDays);
+        return toCsvLine([
+            row.personKey,
+            row.week,
+            row.userMessageCount,
+            row.apiRequestCount,
+            toMillions(row.inputTokens),
+            toMillions(row.outputTokens),
+            toMillions(row.cacheReadInputTokens),
+            row.sampleCount,
+            row.fiveHourPeakUsagePct,
+            row.fiveHourLatestUsagePct,
+            row.sevenDayPeakUsagePct,
+            row.sevenDayLatestUsagePct,
+            row.sevenDayCumulativeUsagePct,
+            row.uniqueSessions,
+            row.uniqueWorkspaces,
+            formatApiEquivalentCost(row.estimatedApiEquivalentCostUsd),
+            row.pricingCatalogVersion,
+            score === null ? null : Number(score.toFixed(1)),
+            attendanceDays,
+        ]);
+    });
     return [header.join(","), ...lines].join("\n");
 }
 /** 统一负责写文本文件，顺带确保父目录存在。 */

package/dist/lib/weekly-score.js

@@ -2,15 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DEFAULT_SCORE_SETTINGS = void 0;
 exports.calculateWeeklyScore = calculateWeeklyScore;
+exports.renderAttendanceControl = renderAttendanceControl;
+exports.renderAttendanceScore = renderAttendanceScore;
+exports.attendanceScoreScript = attendanceScoreScript;
 exports.renderWeeklyScores = renderWeeklyScores;
 exports.DEFAULT_SCORE_SETTINGS = {
     messageWeight: 50,
     messageBaseline: 200,
     quotaBaseline: 70,
 };
-function calculateWeeklyScore(messages, quota, settings) {
+function calculateWeeklyScore(messages, quota, settings, attendanceDays = 5) {
     const { messageWeight, messageBaseline, quotaBaseline } = settings;
-    if (!Number.isFinite(messageWeight) || messageWeight < 0 || messageWeight > 100
+    if (!Number.isInteger(attendanceDays) || attendanceDays < 1 || attendanceDays > 7
+        || !Number.isFinite(messageWeight) || messageWeight < 0 || messageWeight > 100
         || !Number.isFinite(messageBaseline) || messageBaseline <= 0
         || !Number.isFinite(quotaBaseline) || quotaBaseline <= 0
         || !Number.isFinite(messages) || messages < 0
@@ -18,8 +22,48 @@ function calculateWeeklyScore(messages, quota, settings) {
         return null;
     if (quota === null && messageWeight < 100)
         return null;
-    return messageWeight * Math.sqrt(messages / messageBaseline)
-        + (100 - messageWeight) * Math.sqrt((quota ?? 0) / quotaBaseline);
+    const attendanceRatio = attendanceDays / 5;
+    return messageWeight * Math.sqrt(messages / (messageBaseline * attendanceRatio))
+        + (100 - messageWeight) * Math.sqrt((quota ?? 0) / (quotaBaseline * attendanceRatio));
+}
+function renderAttendanceControl(personKey) {
+    const attributes = personKey === undefined ? 'id="attendance-days"' : `data-attendance-person="${escapeHtml(personKey)}" aria-label="出勤天数"`;
+    const select = `<select ${attributes}>${[1, 2, 3, 4, 5, 6, 7].map(days => `<option value="${days}"${days === 5 ? " selected" : ""}>${days} 天</option>`).join("")}</select>`;
+    return personKey === undefined ? `<label>出勤天数 ${select}</label>` : select;
+}
+/** 多周逐周评分后取平均；浏览器切换预先按各出勤天数算好的结果。 */
+function renderAttendanceScore(rows) {
+    const scores = [1, 2, 3, 4, 5, 6, 7].map(days => {
+        const values = rows.map(row => calculateWeeklyScore(row.userMessageCount, row.sevenDayCumulativeUsagePct, exports.DEFAULT_SCORE_SETTINGS, days));
+        if (!values.length || values.some(value => value === null))
+            return "--";
+        return (values.reduce((sum, value) => sum + (value ?? 0), 0) / values.length).toFixed(1);
+    });
+    return `<span data-attendance-scores="${escapeHtml(JSON.stringify(scores))}">${scores[4]}</span>`;
+}
+function attendanceScoreScript() {
+    return `<script>
+    (() => {
+      const select = document.getElementById('attendance-days');
+      if (!select) return;
+      select.addEventListener('change', () => {
+        const days = Number(select.value);
+        if (!Number.isInteger(days) || days < 1 || days > 7) return;
+        document.querySelectorAll('[data-attendance-scores]').forEach(element => {
+          element.textContent = JSON.parse(element.dataset.attendanceScores)[days - 1];
+        });
+        document.querySelectorAll('[data-attendance-person]').forEach(element => { element.value = select.value; });
+      });
+      document.querySelectorAll('[data-attendance-person]').forEach(control => {
+        control.addEventListener('change', () => {
+          const days = Number(control.value);
+          if (!Number.isInteger(days) || days < 1 || days > 7) return;
+          const score = control.closest('tr').querySelector('[data-attendance-scores]');
+          score.textContent = JSON.parse(score.dataset.attendanceScores)[days - 1];
+        });
+      });
+    })();
+  </script>`;
 }
 function escapeHtml(value) {
     return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;")

package/package.json

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