ccus-cli 0.2.23 → 0.2.24

package/README.md

@@ -18,6 +18,14 @@
 >
 > Claude **桌面版** 和 **VS Code 插件** 都不支持 statusLine，因此不会调用 `ccus statusline emit`，也就采集不到使用率数据。
 
+## 面板周评分
+
+个人和聚合面板均提供「周评分」：默认 `50 × √(周消息数 / 200) + 50 × √(周累计额度百分点 / 70)`，消息和额度均合计 Claude + Codex。两项达到基准得 100 分，分数不封顶。
+
+面板只显示评分结果。权重和基准集中在 `src/lib/weekly-score.ts` 的 `DEFAULT_SCORE_SETTINGS` 修改：`messageWeight` 为消息占比（额度占比为 100 减去消息占比），`messageBaseline` 为周消息基准，`quotaBaseline` 为周额度基准。修改后重新构建并重启面板服务。
+
+评分按当前查询范围逐周计算，未满一周不折算；查看本周评分请使用 `ccus dashboard serve --range this-week`。聚合面板在「多人对比」中显示周评分，多周取逐周评分的平均值。额度缺失显示 `--`（消息占比为 100% 时可单独评分）。评分仅在页面展示，不改变 bundle 或 CSV。
+
 ## 安装
 
 全局安装（statusline 每次渲染都会调用，推荐全局装好，避免 `npx` 的启动开销）：

package/dist/lib/aggregate-dashboard.js

@@ -8,6 +8,7 @@ const chart_assets_1 = require("./chart-assets");
 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 CHART_PALETTE = ["#5eead4", "#f59e0b", "#a855f7", "#22c55e", "#f87171", "#60a5fa", "#fbbf24", "#34d399"];
 /**
@@ -415,7 +416,7 @@ function renderFiveHourUsageChart(people, detailRows) {
   `;
 }
 /** 按人渲染汇总表，给出消息、token、成本和 usage 核心指标。 */
-function renderPeopleLeaderboard(people) {
+function renderPeopleLeaderboard(people, weeklyRows) {
     if (people.length === 0) {
         return `
       <section class="panel table-panel">
@@ -429,19 +430,30 @@ function renderPeopleLeaderboard(people) {
       </section>
     `;
     }
+    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));
+        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>${formatNumber(person.userMessageCount)}</td>
         <td>${formatTokensM(person.inputTokens)}</td>
         <td>${formatTokensM(person.outputTokens)}</td>
         <td>${formatTokensM(person.cacheReadInputTokens)}</td>
         <td>${escapeHtml(costDisplay(person.estimatedApiEquivalentCostUsd, person.pricedApiRequestCount, person.unpricedApiRequestCount))}</td>
         <td>${escapeHtml(person.pricingCatalogVersion ?? "--")}</td>
-        <td>${escapeHtml(statValue(person.fiveHourPeakUsagePct))}</td>
-        <td>${escapeHtml(statValue(person.fiveHourLatestUsagePct))}</td>
         <td>${escapeHtml(statValue(person.sevenDayPeakUsagePct))}</td>
         <td>${escapeHtml(statValue(person.sevenDayLatestUsagePct))}</td>
         <td>${escapeHtml(statValue(person.sevenDayCumulativeUsagePct))}</td>
@@ -455,7 +467,7 @@ function renderPeopleLeaderboard(people) {
           <p class="eyebrow">People</p>
           <h2>多人对比</h2>
         </div>
-        <p class="muted">按用户消息数降序排列，所有数字直接来自 daily/weekly 汇总。</p>
+        <p class="muted">按用户消息数降序排列；评分按周计算，多周取平均，缺失额度显示 --。</p>
       </div>
       <div class="table-wrap">
         <table>
@@ -463,14 +475,13 @@ function renderPeopleLeaderboard(people) {
             <tr>
               <th>#</th>
               <th>personKey</th>
+              <th>周评分</th>
               <th>消息</th>
               <th>Input tokens</th>
               <th>Output tokens</th>
               <th>Cache read tokens</th>
               <th>等效 API 成本</th>
               <th>价格目录</th>
-              <th>5h Peak</th>
-              <th>5h Latest</th>
               <th>7d Peak</th>
               <th>7d Latest</th>
               <th>7d 累计</th>
@@ -798,7 +809,7 @@ function buildAggregateDashboardHtml(detailRows, dailyRows, weeklyRows, generate
           <a class="pricing-link" href="${api_pricing_table_1.API_PRICING_PAGE_FILE}" target="_blank" rel="noopener noreferrer">查看当前价格表</a>
         </article>
       </section>
-      ${renderPeopleLeaderboard(people)}
+      ${renderPeopleLeaderboard(people, weeklyRows)}
       ${renderSevenDayCumulativeChart(people)}
       ${renderFiveHourUsageChart(people, detailRows)}
       ${renderDailyUserRequestChart(people, dailyIndex, dateAxis)}

package/dist/lib/dashboard.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.buildPersonalWeeklyScores = buildPersonalWeeklyScores;
 exports.summarizeEvents = summarizeEvents;
 exports.bucketizeEvents = bucketizeEvents;
 exports.buildDashboardHtml = buildDashboardHtml;
@@ -8,6 +9,28 @@ const chart_assets_1 = require("./chart-assets");
 const api_pricing_table_1 = require("./api-pricing-table");
 const payload_1 = require("./payload");
 const time_1 = require("./time");
+const weekly_score_1 = require("./weekly-score");
+function buildPersonalWeeklyScores(events, messages, dayStart) {
+    const dayStartMinutes = (0, time_1.parseDayStart)(dayStart);
+    const weekOf = (date, boundary) => (0, time_1.localDateKey)((0, time_1.resolveRange)("this-week", date, boundary).start);
+    const weeks = new Map();
+    const getWeek = (week) => {
+        if (!weeks.has(week))
+            weeks.set(week, { week, personKey: "本人", userMessageCount: 0, sevenDayCumulativeUsagePct: null });
+        return weeks.get(week);
+    };
+    for (const point of messages) {
+        getWeek(weekOf(new Date(`${point.date}T12:00:00`), 0)).userMessageCount += point.userMessageCount + (point.codexUserMessageCount ?? 0);
+    }
+    for (const event of events)
+        getWeek(weekOf(new Date(event.timestamp), dayStartMinutes));
+    const curves = [false, true].map(codex => (0, aggregate_1.buildSevenDayCurveFromEvents)(events.filter(event => (0, payload_1.isCodexSourceEvent)(event) === codex)));
+    for (const row of weeks.values()) {
+        const totals = curves.map(curve => (0, aggregate_1.computeCumulativeSevenDay)(curve.filter(event => weekOf(new Date(event.timestamp), dayStartMinutes) === row.week)));
+        row.sevenDayCumulativeUsagePct = (0, aggregate_1.addNullable)(totals[0], totals[1]);
+    }
+    return [...weeks.values()];
+}
 /** 所有插入到 HTML/SVG 的动态文本都先转义，避免本地页面被注入内容。 */
 function escapeHtml(value) {
     return value
@@ -142,7 +165,7 @@ function renderChart(buckets) {
       <div class="panel-header">
         <div>
           <p class="eyebrow">Recent Trend</p>
-          <h2>Claude 使用率趋势</h2>
+          <h2>使用率趋势</h2>
         </div>
         <p class="muted">按采样时间聚合：5h（实线）来自 rate_limits.five_hour，7d（虚线）来自 rate_limits.seven_day；紫色「7d 分区叠加累计」走右侧 Y 轴，是把 7d 锯齿波还原成的累计真实使用量（口径同团队看板）</p>
       </div>
@@ -300,6 +323,11 @@ function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages =
     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;
+    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>
@@ -477,15 +505,10 @@ function buildDashboardHtml(events, rangeLabel, start, end, dailyUserMessages =
         </div>
       </section>
       <section class="stats">
-        <article class="panel stat-card">
-          <h2>Latest 5h usage</h2>
-          <p class="stat-value">${escapeHtml(statValue(summary.fiveHourLatestUsagePct))}</p>
-          <p class="stat-note">最后一条有效 5 小时 usage 样本</p>
-        </article>
-        <article class="panel stat-card">
-          <h2>Peak 5h usage</h2>
-          <p class="stat-value">${escapeHtml(statValue(summary.fiveHourPeakUsagePct))}</p>
-          <p class="stat-note">窗口内观测到的 5 小时使用率峰值</p>
+        <article class="panel stat-card" id="weekly-score">
+          <h2>周评分</h2>
+          <p class="stat-value">${weeklyScore?.toFixed(1) ?? "--"}</p>
+          <p class="stat-note">${scoreWeek} 当周 · 当前查询范围内数据</p>
         </article>
         <article class="panel stat-card">
           <h2>7d 分区叠加累计</h2>

package/dist/lib/weekly-score.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_SCORE_SETTINGS = void 0;
+exports.calculateWeeklyScore = calculateWeeklyScore;
+exports.renderWeeklyScores = renderWeeklyScores;
+exports.DEFAULT_SCORE_SETTINGS = {
+    messageWeight: 50,
+    messageBaseline: 200,
+    quotaBaseline: 70,
+};
+function calculateWeeklyScore(messages, quota, settings) {
+    const { messageWeight, messageBaseline, quotaBaseline } = settings;
+    if (!Number.isFinite(messageWeight) || messageWeight < 0 || messageWeight > 100
+        || !Number.isFinite(messageBaseline) || messageBaseline <= 0
+        || !Number.isFinite(quotaBaseline) || quotaBaseline <= 0
+        || !Number.isFinite(messages) || messages < 0
+        || (quota !== null && (!Number.isFinite(quota) || quota < 0)))
+        return null;
+    if (quota === null && messageWeight < 100)
+        return null;
+    return messageWeight * Math.sqrt(messages / messageBaseline)
+        + (100 - messageWeight) * Math.sqrt((quota ?? 0) / quotaBaseline);
+}
+function escapeHtml(value) {
+    return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;")
+        .replaceAll('"', "&quot;").replaceAll("'", "&#39;");
+}
+/** 两类面板共用评分；权重和基准统一在 DEFAULT_SCORE_SETTINGS 修改。 */
+function renderWeeklyScores(rows) {
+    const settings = exports.DEFAULT_SCORE_SETTINGS;
+    const body = [...rows].sort((a, b) => b.week.localeCompare(a.week) || a.personKey.localeCompare(b.personKey)).map((row) => {
+        const score = calculateWeeklyScore(row.userMessageCount, row.sevenDayCumulativeUsagePct, settings);
+        return `<tr><td>${escapeHtml(row.week)}</td><td>${escapeHtml(row.personKey)}</td>
+      <td><strong>${score?.toFixed(1) ?? "--"}</strong></td></tr>`;
+    }).join("");
+    return `<section class="panel table-panel" id="weekly-score">
+    <h2>周评分</h2>
+    <div class="table-wrap"><table><thead><tr><th>周起始</th><th>用户</th><th>评分</th></tr></thead>
+    <tbody>${body || '<tr><td colspan="3">暂无评分数据</td></tr>'}</tbody></table></div>
+  </section>`;
+}
+//# sourceMappingURL=weekly-score.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccus-cli",
-  "version": "0.2.23",
+  "version": "0.2.24",
   "description": "Claude Code statusline usage logger and dashboard CLI",
   "type": "commonjs",
   "bin": {
@@ -17,7 +17,7 @@
     "build": "tsc -p tsconfig.json && node scripts/copy-vendor.js",
     "prepublishOnly": "npm run build",
     "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/api-equivalent-cost.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/day-start.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/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",
+    "test:src": "node --import tsx --test --test-concurrency 1 src/test/payload.test.ts src/test/dashboard.test.ts src/test/weekly-score.test.ts src/test/export.test.ts src/test/storage.test.ts src/test/api-equivalent-cost.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/day-start.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/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": [