@guanlin4924/devflow-pi 0.1.10 → 0.1.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@guanlin4924/devflow-pi",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "type": "module",
   "description": "Devflow 专项研发 Pi，基于固定版本 OMP Runtime 组装研发状态机、代码智能、设计、实现与质量门禁。",
   "license": "UNLICENSED",

package/src/platform-extension.ts

@@ -1,6 +1,9 @@
-import type { ExtensionAPI } from "@oh-my-pi/pi-coding-agent";
+import type { ExtensionAPI, ExtensionUIContext } from "@oh-my-pi/pi-coding-agent";
+import { mkdir, writeFile } from "node:fs/promises";
+import path from "node:path";
 
-import { aggregateUsageReport, renderUsageReport, type UsageRange } from "./usage-stats.ts";
+import { devflowHome } from "./paths.ts";
+import { aggregateUsageReport, renderUsageHtml, renderUsageReport, type UsageRange } from "./usage-stats.ts";
 
 export interface PlatformExtensionOptions {
   sessionRoot: string;
@@ -8,7 +11,8 @@ export interface PlatformExtensionOptions {
   projectId: string;
 }
 
-type UsageInput = UsageRange & { source?: "project" | "omp"; format?: "table" | "json" };
+type UsageFormat = "table" | "json" | "html";
+type UsageInput = UsageRange & { source?: "project" | "omp"; format?: UsageFormat };
 
 function commandUsageInput(args: string): UsageInput {
   const tokens = args.trim().split(/\s+/).filter(Boolean);
@@ -22,9 +26,23 @@ function commandUsageInput(args: string): UsageInput {
     session: read("--session"),
     from: read("--from"),
     to: read("--to"),
+    models: read("--model")?.split(",").map(value => value.trim()).filter(Boolean),
+    format: (read("--format") as UsageFormat | undefined) ?? "table",
   };
 }
 
+function localDate(offset = "+08:00"): string {
+  const formatter = new Intl.DateTimeFormat("en-CA", { timeZone: offset === "+08:00" ? "Asia/Shanghai" : "UTC", year: "numeric", month: "2-digit", day: "2-digit" });
+  const parts = Object.fromEntries(formatter.formatToParts(new Date()).filter(part => part.type !== "literal").map(part => [part.type, part.value]));
+  return `${parts.year}-${parts.month}-${parts.day}`;
+}
+
+function daysAgo(days: number): string {
+  const date = new Date();
+  date.setDate(date.getDate() - days);
+  return date.toISOString().slice(0, 10);
+}
+
 export function createPlatformExtension(options: PlatformExtensionOptions) {
   return function devflowPlatform(pi: ExtensionAPI) {
     const { z } = pi.zod;
@@ -34,7 +52,8 @@ export function createPlatformExtension(options: PlatformExtensionOptions) {
       session: z.string().optional(),
       from: z.string().optional(),
       to: z.string().optional(),
-      format: z.enum(["table", "json"]).default("table"),
+      models: z.array(z.string()).optional(),
+      format: z.enum(["table", "json", "html"]).default("table"),
     });
     const usageTool = {
       label: "Devflow Usage Stats",
@@ -48,13 +67,13 @@ export function createPlatformExtension(options: PlatformExtensionOptions) {
         const report = await aggregateUsageReport(
           source === "omp" ? options.ompSessionRoot : options.sessionRoot,
           source,
-          { session: input.session, from: input.from, to: input.to },
+          { session: input.session, from: input.from, to: input.to, models: input.models },
         );
         return {
           content: [
             {
               type: "text" as const,
-              text: input.format === "json" ? JSON.stringify({ projectId: options.projectId, ...report }, null, 2) : renderUsageReport(report),
+              text: input.format === "json" ? JSON.stringify({ projectId: options.projectId, ...report }, null, 2) : input.format === "html" ? renderUsageHtml(report) : renderUsageReport(report),
             },
           ],
           details: { projectId: options.projectId, ...report },
@@ -67,17 +86,61 @@ export function createPlatformExtension(options: PlatformExtensionOptions) {
         ...usageTool,
       });
     }
+    async function pickUsageInput(ctx: { ui: ExtensionUIContext }): Promise<UsageInput | undefined> {
+      const sourceChoice = await ctx.ui.select("使用统计：数据范围", [
+        { label: "当前 Devflow 项目", description: "只读取当前项目会话（推荐）" },
+        { label: "OMP 历史", description: "读取 ~/.omp/agent/sessions" },
+      ]);
+      if (!sourceChoice) return undefined;
+      const source = sourceChoice === "OMP 历史" ? "omp" : "project" as const;
+      const root = source === "omp" ? options.ompSessionRoot : options.sessionRoot;
+      const overview = await aggregateUsageReport(root, source);
+      const sessionChoice = await ctx.ui.select("使用统计：会话", ["全部会话", ...Object.keys(overview.perSession)]);
+      if (!sessionChoice) return undefined;
+      const modelChoice = await ctx.ui.select("使用统计：模型", ["全部模型", ...Object.keys(overview.perModel)]);
+      if (!modelChoice) return undefined;
+      const period = await ctx.ui.select("使用统计：时间范围", ["全部时间", "今天", "最近 7 天", "最近 30 天", "自定义日期"]);
+      if (!period) return undefined;
+      let from: string | undefined;
+      let to: string | undefined;
+      if (period === "今天") from = to = localDate();
+      if (period === "最近 7 天") { from = daysAgo(6); to = localDate(); }
+      if (period === "最近 30 天") { from = daysAgo(29); to = localDate(); }
+      if (period === "自定义日期") {
+        from = await ctx.ui.input("使用统计：开始日期", "YYYY-MM-DD（留空表示不限）");
+        if (from === undefined) return undefined;
+        to = await ctx.ui.input("使用统计：结束日期", "YYYY-MM-DD（留空表示不限）");
+        if (to === undefined) return undefined;
+      }
+      const output = await ctx.ui.select("使用统计：输出方式", [
+        { label: "终端表格", description: "在当前终端显示" },
+        { label: "HTML 报告", description: "生成可在浏览器打开的单文件报告" },
+        { label: "JSON", description: "用于自动化处理" },
+      ]);
+      if (!output) return undefined;
+      return { source, session: sessionChoice === "全部会话" ? "all" : sessionChoice, models: modelChoice === "全部模型" ? undefined : [modelChoice], from: from || undefined, to: to || undefined, format: output === "HTML 报告" ? "html" : output === "JSON" ? "json" : "table" };
+    }
+
+    async function renderCommand(input: UsageInput, ctx: { ui: { notify(message: string, type?: "info" | "warning" | "error"): void } }) {
+      const source = input.source ?? "project";
+      const report = await aggregateUsageReport(source === "omp" ? options.ompSessionRoot : options.sessionRoot, source, input);
+      if (input.format === "html") {
+        const reportDir = path.join(devflowHome(), "reports", options.projectId);
+        const destination = path.join(reportDir, `usage-${new Date().toISOString().replaceAll(":", "-")}.html`);
+        await mkdir(reportDir, { recursive: true });
+        await writeFile(destination, renderUsageHtml(report), "utf8");
+        ctx.ui.notify(`已生成 HTML 使用报告：${destination}`, "info");
+        return;
+      }
+      ctx.ui.notify(input.format === "json" ? JSON.stringify({ projectId: options.projectId, ...report }, null, 2).slice(0, 12000) : renderUsageReport(report).slice(0, 12000), "info");
+    }
+
     pi.registerCommand("usage-stats", {
-      description: "Show token/cost usage. Default is this project; pass `omp` or --source omp for explicit OMP history.",
+      description: "交互式查看 token/成本：范围、会话、模型、时间与 HTML 报告；也支持 --source/--session/--model/--format 参数。",
       handler: async (args, ctx) => {
-        const input = commandUsageInput(args);
-        const source = input.source ?? "project";
-        const report = await aggregateUsageReport(
-          source === "omp" ? options.ompSessionRoot : options.sessionRoot,
-          source,
-          { session: input.session, from: input.from, to: input.to },
-        );
-        ctx.ui.notify(renderUsageReport(report).slice(0, 12000), "info");
+        const input = args.trim() ? commandUsageInput(args) : await pickUsageInput(ctx);
+        if (!input) return;
+        await renderCommand(input, ctx);
       },
     });
     pi.registerCommand("devflow-usage", {

package/src/usage-stats.ts

@@ -19,12 +19,19 @@ export interface UsageReport {
   totals: UsageTotals;
   perModel: Record<string, UsageTotals>;
   perSession: Record<string, UsageTotals>;
+  /**
+   * Message-linked attribution. A model reply that reads more than one Skill
+   * has its usage divided equally between those Skills, so this table always
+   * sums to the report total instead of double-counting a reply.
+   */
+  perSkill: Record<string, UsageTotals>;
 }
 
 export interface UsageRange {
   from?: string;
   to?: string;
   session?: string;
+  models?: string[];
   timezoneOffset?: string;
 }
 
@@ -61,6 +68,17 @@ function addUsage(target: UsageTotals, usage: Record<string, unknown>): void {
   target.assistantMessages += 1;
 }
 
+function addUsageShare(target: UsageTotals, usage: Record<string, unknown>, divisor: number): void {
+  const share = Math.max(1, divisor);
+  target.input += finiteNumber(usage.input) / share;
+  target.output += finiteNumber(usage.output) / share;
+  target.cacheRead += finiteNumber(usage.cacheRead) / share;
+  target.cacheWrite += finiteNumber(usage.cacheWrite) / share;
+  target.totalTokens += finiteNumber(usage.totalTokens) / share;
+  target.cost += usageCost(usage.cost) / share;
+  target.assistantMessages += 1 / share;
+}
+
 function nextDate(value: string): string {
   const match = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value);
   if (!match) return value;
@@ -107,6 +125,24 @@ function modelName(entry: Record<string, unknown>, current: string): string {
   return current;
 }
 
+function messageSkills(message: Record<string, unknown>): string[] {
+  const content = message.content;
+  if (!Array.isArray(content)) return [];
+  const skills = new Set<string>();
+  for (const block of content) {
+    if (!block || typeof block !== "object") continue;
+    const value = block as Record<string, unknown>;
+    const argumentsValue = value.arguments;
+    const text = typeof value.text === "string" ? value.text : "";
+    const pathValue = argumentsValue && typeof argumentsValue === "object" ? (argumentsValue as Record<string, unknown>).path : undefined;
+    const candidates = [text, typeof pathValue === "string" ? pathValue : ""];
+    for (const candidate of candidates) {
+      for (const match of candidate.matchAll(/skill:\/\/([^/\s?#]+)/g)) skills.add(match[1]);
+    }
+  }
+  return [...skills].sort();
+}
+
 export async function aggregateUsageReport(
   sessionRoot: string,
   source: "project" | "omp" = "project",
@@ -115,6 +151,7 @@ export async function aggregateUsageReport(
   const totals = emptyUsage();
   const perModel: Record<string, UsageTotals> = {};
   const perSession: Record<string, UsageTotals> = {};
+  const perSkill: Record<string, UsageTotals> = {};
   const files = await jsonlFiles(sessionRoot);
   totals.sessionFiles = files.length;
 
@@ -143,10 +180,14 @@ export async function aggregateUsageReport(
       const usage = message.usage as Record<string, unknown> | undefined;
       if (!usage) continue;
       const model = currentModel;
+      if (range.models?.length && !range.models.includes(model)) continue;
       const modelTotals = (perModel[model] ??= emptyUsage());
       addUsage(totals, usage);
       addUsage(sessionTotals, usage);
       addUsage(modelTotals, usage);
+      const skills = messageSkills(message);
+      const attribution = skills.length ? skills : ["未归因（此回复未直接读取 Skill）"];
+      for (const skill of attribution) addUsageShare((perSkill[skill] ??= emptyUsage()), usage, attribution.length);
     }
   }
 
@@ -162,6 +203,7 @@ export async function aggregateUsageReport(
     totals,
     perModel,
     perSession,
+    perSkill,
   };
 }
 
@@ -200,6 +242,23 @@ export function renderUsageReport(report: UsageReport): string {
     `sessions: ${totals.sessionFiles} | assistant requests: ${totals.assistantMessages} | tokens: ${totals.totalTokens.toLocaleString("en-US")} | cost: $${totals.cost.toFixed(6)}`,
     ...renderRows("By model", report.perModel),
     ...renderRows("By session", report.perSession),
-    "Note: token/cost totals use assistant message usage directly. Tool-call cost allocation is intentionally not estimated.",
+    ...renderRows("By Skill（按读取 Skill 的回复归因；多 Skill 回复均分）", report.perSkill),
+    "Note: token/cost totals use assistant message usage directly. Skill attribution is message-linked, not provider-level per-Skill billing.",
   ].join("\n");
 }
+
+function html(value: string): string {
+  return value.replaceAll("&", "&amp;").replaceAll("<", "&lt;").replaceAll(">", "&gt;").replaceAll('"', "&quot;");
+}
+
+function renderHtmlRows(rows: Record<string, UsageTotals>): string {
+  return Object.entries(rows)
+    .sort(([, left], [, right]) => right.totalTokens - left.totalTokens || right.cost - left.cost)
+    .map(([name, value]) => `<tr><td>${html(name)}</td><td>${value.assistantMessages.toFixed(2)}</td><td>${Math.round(value.totalTokens).toLocaleString("en-US")}</td><td>$${value.cost.toFixed(6)}</td></tr>`)
+    .join("") || "<tr><td colspan=\"4\">无数据</td></tr>";
+}
+
+export function renderUsageHtml(report: UsageReport): string {
+  const table = (title: string, rows: Record<string, UsageTotals>) => `<section><h2>${html(title)}</h2><table><thead><tr><th>名称</th><th>请求</th><th>Token</th><th>成本</th></tr></thead><tbody>${renderHtmlRows(rows)}</tbody></table></section>`;
+  return `<!doctype html><html lang="zh-CN"><meta charset="utf-8"><title>Devflow 使用统计</title><style>body{max-width:1100px;margin:32px auto;padding:0 20px;background:#111827;color:#e5e7eb;font:14px system-ui}h1{margin-bottom:4px}.muted{color:#9ca3af}section{margin-top:28px}table{width:100%;border-collapse:collapse;background:#182235}th,td{padding:10px;text-align:left;border-bottom:1px solid #334155}th{color:#93c5fd}td:nth-child(n+2){font-variant-numeric:tabular-nums}</style><h1>Devflow 使用统计</h1><p class="muted">${html(`来源：${report.source} ｜ 会话：${report.filter.session} ｜ ${report.filter.from ?? "全部时间"} 至 ${report.filter.to ?? "全部时间"}（${report.filter.timezoneOffset}）`)}</p><section><h2>总计</h2><p>${report.totals.sessionFiles} 个会话 ｜ ${report.totals.assistantMessages} 次请求 ｜ ${report.totals.totalTokens.toLocaleString("en-US")} Token ｜ $${report.totals.cost.toFixed(6)}</p></section>${table("按模型", report.perModel)}${table("按会话", report.perSession)}${table("按 Skill（多 Skill 回复均分）", report.perSkill)}<p class="muted">Skill 成本为回复级归因，不是供应商提供的逐 Skill 账单。</p></html>`;
+}