token-stats-timer 1.0.16 → 1.0.18

package/README.md

@@ -76,8 +76,9 @@ Footer 下行：cwd + git 分支 + 其他扩展状态。
 
 ## 命令
 
-- `/stats` —— 无参进入套餐配置（为当前 provider 选择/关闭配额套餐；选 GLM 后会继续询问是否配置团队套餐凭证）
+- `/stats` —— 无参默认显示**当天 token 统计**（等价 `/stats day`）
 - `/stats day [YYYY-MM-DD]` / `hour` / `week` / `month [YYYY-MM]` —— 统计查询
+- `/stats limit` —— 套餐配置（为当前 provider 选择/关闭配额套餐；选 GLM 后会继续询问是否配置团队套餐凭证）
 - `/stats config` —— 显示样式 / 显示内容 / 配额刷新时间 / GLM 团队凭证
 - `/notify [on|off|test]` —— 通知开关 / 测试（无参查看状态）
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "token-stats-timer",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "pi extension to display token usage and time spend.",
   "keywords": [
     "pi-package",

package/token-stats.ts

@@ -20,6 +20,7 @@ import {
   appendFile,
   mkdir,
   readFile,
+  readdir,
   writeFile,
 } from "node:fs/promises";
 import { join } from "node:path";
@@ -195,7 +196,7 @@ type QuotaError =
  * Token 格式化（对齐 @firstpick/pi-utils formatTokens）
  */
 function formatTokens(count: number): string {
-  if (count < 1000) return count.toString();
+  if (count < 1000) return count.toFixed(1);
   if (count < 10000) return `${(count / 1000).toFixed(1)}k`;
   if (count < 1000000) return `${Math.round(count / 1000)}k`;
   if (count < 10000000) return `${(count / 1000000).toFixed(1)}M`;
@@ -249,6 +250,134 @@ function renderTable(
   return lines;
 }
 
+// ── 按模型统计（读取 raw 明细，按 model 聚合）────────────────────
+
+/** 读取若干日期的原始逐条记录 */
+async function readRawRecordsForDates(dates: string[]): Promise<RawRecord[]> {
+  const out: RawRecord[] = [];
+  for (const d of dates) {
+    try {
+      const content = await readFile(join(RAW_DIR, `${d}.jsonl`), "utf-8");
+      for (const line of content.trim().split("\n")) {
+        if (line) out.push(JSON.parse(line));
+      }
+    } catch {
+      // 该日无原始数据
+    }
+  }
+  return out;
+}
+
+/** 读取 [startDate, endDate] 闭区间内所有日期的原始记录 */
+async function readRawRecordsInRange(
+  startDate: string,
+  endDate: string,
+): Promise<RawRecord[]> {
+  const dates: string[] = [];
+  try {
+    const files = await readdir(RAW_DIR);
+    for (const f of files) {
+      if (!f.endsWith(".jsonl")) continue;
+      const d = f.slice(0, 10);
+      if (/^\d{4}-\d{2}-\d{2}$/.test(d) && d >= startDate && d <= endDate) {
+        dates.push(d);
+      }
+    }
+  } catch {
+    // RAW_DIR 不存在
+  }
+  return readRawRecordsForDates(dates);
+}
+
+interface ModelAgg {
+  count: number;
+  input: number;
+  cacheRead: number;
+  cacheWrite: number;
+  output: number;
+  tokensPerSecSum: number;
+  hitRateSum: number;
+}
+
+/** 按模型生成 markdown 用量表（模型行按总token降序，末尾合计） */
+function renderModelBreakdown(records: RawRecord[]): string[] {
+  if (records.length === 0) return ["", "> 按模型：该范围暂无明细数据"];
+
+  const byModel = new Map<string, ModelAgg>();
+  for (const r of records) {
+    const key = r.model || "unknown";
+    const agg = byModel.get(key) ?? {
+      count: 0,
+      input: 0,
+      cacheRead: 0,
+      cacheWrite: 0,
+      output: 0,
+      tokensPerSecSum: 0,
+      hitRateSum: 0,
+    };
+    agg.count++;
+    agg.input += r.input;
+    agg.cacheRead += r.cacheRead;
+    agg.cacheWrite += r.cacheWrite;
+    agg.output += r.output;
+    agg.tokensPerSecSum += r.tokensPerSec;
+    agg.hitRateSum += r.cacheHitRate;
+    byModel.set(key, agg);
+  }
+
+  // 与汇总口径一致：总token = 新增输入 + 缓存输入
+  const totalTokensOf = (a: ModelAgg) => a.input + a.cacheRead + a.cacheWrite;
+  const rows = [...byModel.entries()].sort(
+    (a, b) => totalTokensOf(b[1]) - totalTokensOf(a[1]),
+  );
+
+  const total: ModelAgg = {
+    count: 0, input: 0, cacheRead: 0, cacheWrite: 0,
+    output: 0, tokensPerSecSum: 0, hitRateSum: 0,
+  };
+  const body: string[][] = rows.map(([model, agg]) => {
+    total.count += agg.count;
+    total.input += agg.input;
+    total.cacheRead += agg.cacheRead;
+    total.cacheWrite += agg.cacheWrite;
+    total.output += agg.output;
+    total.tokensPerSecSum += agg.tokensPerSecSum;
+    total.hitRateSum += agg.hitRateSum;
+    return [
+      model,
+      String(agg.count),
+      formatTokens(agg.input),
+      formatTokens(agg.cacheRead),
+      formatTokens(agg.output),
+      formatTokens(totalTokensOf(agg)),
+      `${(agg.count > 0 ? agg.hitRateSum / agg.count : 0).toFixed(1)}%`,
+      `${(agg.count > 0 ? agg.tokensPerSecSum / agg.count : 0).toFixed(1)}`,
+    ];
+  });
+
+  return [
+    "",
+    "**按模型**",
+    ...renderTable(
+      ["模型", "次数", "新增输入", "缓存输入", "输出", "总token", "命中率", "速率"],
+      body,
+      {
+        aligns: ["left", "right", "right", "right", "right", "right", "right", "right"],
+        totalRow: [
+          "合计",
+          String(total.count),
+          formatTokens(total.input),
+          formatTokens(total.cacheRead),
+          formatTokens(total.output),
+          formatTokens(total.input + total.cacheRead + total.cacheWrite),
+          `${(total.count > 0 ? total.hitRateSum / total.count : 0).toFixed(1)}%`,
+          `${(total.count > 0 ? total.tokensPerSecSum / total.count : 0).toFixed(1)}`,
+        ],
+      },
+    ),
+  ];
+}
+
 function isReasonableTokenSpeed(tokensPerSecond: number): boolean {
   return Number.isFinite(tokensPerSecond) && tokensPerSecond > 0 && tokensPerSecond <= MAX_REASONABLE_TOKEN_SPEED;
 }
@@ -1478,7 +1607,7 @@ export function createTokenStats(
     }
 
     await showStats(
-      renderDaySummary(daily),
+      [...renderDaySummary(daily), ...renderModelBreakdown(await readRawRecordsForDates([date]))],
       `Token 统计  |  ${date}`,
       ctx,
     );
@@ -1503,16 +1632,23 @@ export function createTokenStats(
     records.sort((a, b) => a.hour - b.hour);
 
     const lines = renderTable(
-      ["时间", "次数", "输入", "输出", "命中率", "速率"],
-      records.map((r) => [
-        String(r.hour).padStart(2, "0"),
-        String(r.count),
-        formatTokens(r.sumInput),
-        formatTokens(r.sumOutput),
-        `${weightedCacheHitRate(r).toFixed(1)}%`,
-        `${(r.sumTokensPerSec / r.count).toFixed(1)}`,
-      ]),
-      { aligns: ["left", "right", "right", "right", "right", "right"] },
+      ["时间", "次数", "新增输入", "缓存输入", "输出", "总token", "命中率", "速率"],
+      records.map((r) => {
+        const totalPrompt = r.sumInput + r.sumCacheRead + r.sumCacheWrite;
+        return [
+          String(r.hour).padStart(2, "0"),
+          String(r.count),
+          formatTokens(r.sumInput),
+          formatTokens(r.sumCacheRead),
+          formatTokens(r.sumOutput),
+          formatTokens(totalPrompt),
+          `${weightedCacheHitRate(r).toFixed(1)}%`,
+          `${(r.sumTokensPerSec / r.count).toFixed(1)}`,
+        ];
+      }),
+      {
+        aligns: ["left", "right", "right", "right", "right", "right", "right", "right"],
+      },
     );
 
     await showStats(lines, `按小时分布  |  ${date}`, ctx);
@@ -1562,7 +1698,11 @@ export function createTokenStats(
       },
     );
 
-    await showStats(lines, "本周每天汇总", ctx);
+    await showStats(
+      [...lines, ...renderModelBreakdown(await readRawRecordsInRange(sevenDaysAgo, today))],
+      "本周每天汇总",
+      ctx,
+    );
   }
 
   function getMonthStr(date: Date = new Date()): string {
@@ -1636,7 +1776,17 @@ export function createTokenStats(
       },
     );
 
-    await showStats(lines, `${month} 月度汇总`, ctx);
+    const monthDates = monthRecords.map((r) => r.date).sort();
+    await showStats(
+      [
+        ...lines,
+        ...renderModelBreakdown(
+          await readRawRecordsInRange(monthDates[0], monthDates[monthDates.length - 1]),
+        ),
+      ],
+      `${month} 月度汇总`,
+      ctx,
+    );
   }
 
   // ── 事件注册 ─────────────────────────────────────────
@@ -1857,12 +2007,18 @@ export function createTokenStats(
   // ── /stats 命令 ─────────────────────────────────────
 
   pi.registerCommand("stats", {
-    description: "Token 统计 (day | hour | week | month | config)  无参默认进入套餐配置",
+    description: "Token 统计 (day | hour | week | month | config | limit)  无参默认显示当天统计；limit 进入套餐配置",
     handler: async (args, ctx) => {
       const arg = args.trim();
 
-      // 无参 → 套餐配置
+      // 无参 → 当天统计（等价于 /stats day）
       if (!arg) {
+        await showDay(getDateStr(), ctx);
+        return;
+      }
+
+      // limit → 套餐配置（原无参行为）
+      if (arg === "limit") {
         const provider = ctx.model?.provider;
         if (!provider) {
           ctx.ui.notify("无法获取当前供应商，请先切换对话", "warning");