token-stats-timer 1.0.0

package/README.md

@@ -0,0 +1,43 @@
+# token-stats-timer
+
+`@carlosgtrz/pi-run-timer` 与 `@liziy/token-stats` 的合并插件。
+
+一个扩展、一个 footer，同时提供 run 计时与 token 用量/配额监控。
+
+## 功能
+
+Footer 上行（左对齐）：
+
+```
+● run 01:23 · prev 00:40 · max 03:12 (Review README…) | ↑12k ↓3.4k CH87% ⚡77.7 t/s 5.3%/1.0M | 5h: 87% W: 92% ⏱ 2h 15m
+```
+
+- `● run 01:23` —— 当前 run 已耗时（从空闲后的第一个 `agent_start` 到 `agent_settled`，含重试/压缩恢复/排队提示）
+- `prev` / `max` —— 上一次 run 耗时 / 本会话分支内最长 run 耗时（带 15 字 prompt 预览）
+- `↑ ↓ Σ CH` —— 累计输入 / 输出 / 总量 / 缓存命中率
+- `⚡` —— 实时速率（2s rolling window，无流时回落到平均速率）
+- 上下文占用（样式可配）
+- `5h: W: ⏱` —— 套餐剩余（MiniMax / GLM / Kimi / DeepSeek 内置套餐，需在 /stats 里为当前 provider 启用）
+
+Footer 下行：cwd + git 分支 + 其他扩展状态。
+
+## 命令
+
+- `/stats` —— 无参进入套餐配置（为当前 provider 选择/关闭配额套餐）
+- `/stats day [YYYY-MM-DD]` / `hour` / `week` / `month [YYYY-MM]` —— 统计查询
+- `/stats config` —— 显示样式 / 显示内容（含「计时器」开关）/ 配额刷新时间
+
+## 与两个原包的兼容性
+
+- 显示/套餐配置沿用 `~/.pi/agent/extensions/token-stats/`（原 token-stats 的配置直接生效）
+- 统计日志沿用 `~/.pi/agent/extensions/token-stats-logs/`（历史数据 `/stats` 可直接查询）
+- run 计时状态沿用 session 内 `run-timer-state` 自定义条目（`/reload` 后自动恢复，兼容旧 `turn-timer-state`）
+
+## 安装（替换两个原包）
+
+```bash
+pi remove npm:@carlosgtrz/pi-run-timer
+pi remove npm:@liziy/token-stats
+```
+
+本目录已在 `~/.pi/agent/extensions/` 下，自动发现，`/reload` 或重启 pi 生效。

package/index.ts

@@ -0,0 +1,102 @@
+// run-token-stats —— 合并 @carlosgtrz/pi-run-timer + @liziy/token-stats 的单一插件
+// =============================================================================
+// Footer 上行：run 计时（● run 01:23 · prev 00:40 · max 03:12）+ token 指标
+//              （输入/输出/总量、缓存命中、速率、上下文、套餐配额），右侧模型名
+// Footer 下行：cwd + git 分支 + 其他扩展状态
+//
+// 命令：/stats [day [date] | hour [date] | week | month [YYYY-MM] | config]
+//       无参进入套餐配置
+//
+// 模块划分：
+//   run-timer.ts   —— run 计时状态机 + session 持久化（原 pi-run-timer）
+//   token-stats.ts —— token 统计 + 套餐配额 + JSONL 日志 + /stats（原 token-stats）
+//
+// 与两个原包的兼容性：
+//   - 配置沿用 ~/.pi/agent/extensions/token-stats/{config.json,display-config.json}
+//   - 日志沿用 ~/.pi/agent/extensions/token-stats-logs/
+//   - 计时状态沿用 session 内 "run-timer-state" 自定义条目
+
+import type { ExtensionAPI } from "@earendil-works/pi-coding-agent";
+import { truncateToWidth, visibleWidth } from "@earendil-works/pi-tui";
+import { createRunTimer } from "./run-timer.ts";
+import { createTokenStats, formatUserPath, type SharedState } from "./token-stats.ts";
+
+const shared: SharedState = {
+  sessionActive: false,
+  requestRender: null,
+};
+
+export default function runTokenStatsExtension(pi: ExtensionAPI) {
+  const stats = createTokenStats(pi, shared);
+  const timer = createRunTimer(pi, shared);
+
+  pi.on("session_start", (_event, ctx) => {
+    shared.sessionActive = true;
+
+    ctx.ui.setFooter((tui, theme, footerData) => {
+      const render = () => tui.requestRender();
+      shared.requestRender = render;
+      const unsub = footerData.onBranchChange(render);
+
+      return {
+        dispose() {
+          unsub();
+          if (shared.requestRender === render) shared.requestRender = null;
+        },
+        invalidate() {},
+        render(width: number): string[] {
+          // session 替换后旧 footer 可能仍被 TUI 渲染，此时 ctx 已失效，直接返回空
+          if (!shared.sessionActive) return [];
+
+          // ── 上行：计时 + 指标左对齐，模型名右对齐 ──
+          // 计时器放在指标行末尾（紧邻右侧模型名）
+          const leftParts: string[] = [];
+          leftParts.push(...stats.getMetricParts(theme, ctx));
+          if (stats.isTimerEnabled()) {
+            leftParts.push(timer.getStatusText(theme));
+          }
+          const left = leftParts.join(" | ");
+
+          const modelName = ctx.model?.id || "";
+          const provider = ctx.model?.provider || "";
+          const level = ctx.thinkingLevel || "off";
+          const rightSide = (provider ? `(${provider}) ${modelName}` : modelName) + ` · ${level}`;
+
+          const leftWidth = visibleWidth(left);
+          const rightWidth = visibleWidth(rightSide);
+          const topLine = leftWidth + rightWidth <= width
+            ? left + " ".repeat(width - leftWidth - rightWidth) + rightSide
+            : leftWidth <= width
+              ? left + " ".repeat(width - leftWidth) + truncateToWidth(rightSide, Math.max(0, width - leftWidth), "")
+              : truncateToWidth(left, width);
+
+          // ── 下行：cwd + git 分支 + 其他扩展状态 ────
+          const cwd = formatUserPath(ctx.cwd || "");
+          const branch = footerData.getGitBranch();
+          const cwdPart = branch ? `${cwd} (${branch})` : cwd;
+
+          const statuses = footerData.getExtensionStatuses();
+          const otherStatuses = Array.from(statuses.entries())
+            .filter(([k]) => k !== "token-stats-webui")
+            .map(([, v]) => v as string);
+
+          const bottomParts: string[] = [theme.fg("dim", cwdPart)];
+          if (otherStatuses.length > 0) {
+            bottomParts.push(theme.fg("dim", "│"));
+            bottomParts.push(...otherStatuses);
+          }
+
+          return [
+            truncateToWidth(topLine, width),
+            truncateToWidth(bottomParts.join(" "), width),
+          ];
+        },
+      };
+    });
+  });
+
+  pi.on("session_shutdown", (_event, _ctx) => {
+    shared.sessionActive = false;
+    shared.requestRender = null;
+  });
+}

package/package.json

@@ -0,0 +1,20 @@
+{
+  "name": "token-stats-timer",
+  "version": "1.0.0",
+  "description": "pi extension to display token usage and time spend.",
+  "keywords": [
+    "pi-extension"
+  ],
+  "license": "ISC",
+  "author": "",
+  "type": "module",
+  "main": "index.ts",
+  "files": [
+    "run-timer.ts",
+    "token-stats.ts",
+    "README.md"
+  ],
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  }
+}

package/run-timer.ts

@@ -0,0 +1,181 @@
+// run-token-stats / run-timer 模块
+// =============================================================================
+// 由 @carlosgtrz/pi-run-timer 0.2.0 移植而来，与 @liziy/token-stats 合并为一个插件。
+// 原实现通过 ctx.ui.setStatus 注入 footer；合并后改为提供 getStatusText()，
+// 由 index.ts 把计时文本拼进统一 footer 的指标行。
+//
+// 显示：当前 run 已耗时 / 上一次 run 耗时 / 会话分支内最长 run 耗时（带 prompt 预览）
+// 一次 run = 从空闲后的第一个 agent_start 到 agent_settled 的连续忙碌期，
+// 包含重试、压缩恢复以及排队的 steering/follow-up 提示。
+//
+// 状态通过 pi.appendEntry 持久化到 session，/reload 后自动恢复。
+
+import type {
+  ExtensionAPI,
+  ExtensionContext,
+  Theme,
+} from "@earendil-works/pi-coding-agent";
+import type { SharedState } from "./token-stats.ts";
+
+const STATE_TYPE = "run-timer-state";
+const LEGACY_STATE_TYPE = "turn-timer-state";
+
+type TimerState = {
+  currentRunStartMs?: number;
+  previousRunDurationMs?: number;
+  longestRunDurationMs?: number;
+};
+
+function formatDuration(ms: number): string {
+  const totalSeconds = Math.max(0, Math.floor(ms / 1000));
+  const hours = Math.floor(totalSeconds / 3600);
+  const minutes = Math.floor((totalSeconds % 3600) / 60);
+  const seconds = totalSeconds % 60;
+
+  if (hours > 0) {
+    return `${hours}:${minutes.toString().padStart(2, "0")}:${seconds.toString().padStart(2, "0")}`;
+  }
+  return `${minutes.toString().padStart(2, "0")}:${seconds.toString().padStart(2, "0")}`;
+}
+
+function isTimerState(value: unknown): value is TimerState {
+  if (!value || typeof value !== "object") return false;
+  const state = value as TimerState;
+  return (
+    (state.currentRunStartMs === undefined || typeof state.currentRunStartMs === "number") &&
+    (state.previousRunDurationMs === undefined || typeof state.previousRunDurationMs === "number") &&
+    (state.longestRunDurationMs === undefined || typeof state.longestRunDurationMs === "number")
+  );
+}
+
+export interface RunTimerHandle {
+  /** 计时段文本，例如 "● run 01:23 · prev 00:40 · max 03:12 (Review README…)" */
+  getStatusText(theme: Theme): string;
+}
+
+export function createRunTimer(
+  pi: ExtensionAPI,
+  shared: SharedState,
+): RunTimerHandle {
+  let timer: ReturnType<typeof setInterval> | undefined;
+
+  let currentRunStartMs: number | undefined;
+  let previousRunDurationMs: number | undefined;
+  let longestRunDurationMs: number | undefined;
+
+  let lastCtx: ExtensionContext | undefined;
+
+  function getState(): TimerState {
+    return {
+      currentRunStartMs,
+      previousRunDurationMs,
+      longestRunDurationMs,
+    };
+  }
+
+  function applyState(state: TimerState): void {
+    currentRunStartMs = state.currentRunStartMs;
+    previousRunDurationMs = state.previousRunDurationMs;
+    longestRunDurationMs = state.longestRunDurationMs;
+  }
+
+  function saveState(): void {
+    pi.appendEntry(STATE_TYPE, getState());
+  }
+
+  function restoreState(ctx: ExtensionContext): void {
+    for (const entry of [...ctx.sessionManager.getBranch()].reverse()) {
+      if (entry.type !== "custom") continue;
+      if (entry.customType !== STATE_TYPE && entry.customType !== LEGACY_STATE_TYPE) continue;
+      if (isTimerState(entry.data)) {
+        applyState(entry.data);
+      }
+      return;
+    }
+  }
+
+  function stopTimer(): void {
+    if (!timer) return;
+    clearInterval(timer);
+    timer = undefined;
+  }
+
+  function startTimer(): void {
+    stopTimer();
+    // 运行期间每秒刷一次 footer，让计时文本跳动
+    timer = setInterval(() => {
+      if (!lastCtx?.hasUI) return;
+      shared.requestRender?.();
+    }, 1000);
+  }
+
+  pi.on("session_start", (_event, ctx) => {
+    lastCtx = ctx;
+    stopTimer();
+    restoreState(ctx);
+    if (!ctx.hasUI) return;
+    if (currentRunStartMs !== undefined) startTimer();
+    shared.requestRender?.();
+  });
+
+  pi.on("agent_start", (_event, ctx) => {
+    lastCtx = ctx;
+    if (!ctx.hasUI) return;
+
+    if (currentRunStartMs === undefined) {
+      currentRunStartMs = Date.now();
+      startTimer();
+    }
+
+    shared.requestRender?.();
+  });
+
+  pi.on("agent_settled", (_event, ctx) => {
+    lastCtx = ctx;
+    if (!ctx.hasUI) {
+      stopTimer();
+      return;
+    }
+    if (currentRunStartMs === undefined) {
+      shared.requestRender?.();
+      return;
+    }
+
+    const duration = Date.now() - currentRunStartMs;
+    previousRunDurationMs = duration;
+
+    if (longestRunDurationMs === undefined || duration > longestRunDurationMs) {
+      longestRunDurationMs = duration;
+    }
+
+    currentRunStartMs = undefined;
+    stopTimer();
+    saveState();
+    shared.requestRender?.();
+  });
+
+  pi.on("session_shutdown", (_event, _ctx) => {
+    // 保存计时状态（persist 到 session），停掉 tick 定时器
+    saveState();
+    stopTimer();
+    lastCtx = undefined;
+  });
+
+  return {
+    getStatusText(theme: Theme): string {
+      const startMs = currentRunStartMs;
+      const working = startMs !== undefined;
+
+      const elapsed = startMs !== undefined ? formatDuration(Date.now() - startMs) : "idle";
+      const prev = previousRunDurationMs !== undefined ? formatDuration(previousRunDurationMs) : "--:--";
+      const max = longestRunDurationMs !== undefined ? formatDuration(longestRunDurationMs) : "--:--";
+
+      const indicator = working ? theme.fg("accent", "●") : theme.fg("dim", "○");
+      const elapsedText = working ? theme.fg("text", elapsed) : theme.fg("dim", elapsed);
+      const label = theme.fg("dim", " run ");
+      const stats = theme.fg("dim", ` · prev ${prev} · max ${max}`);
+
+      return `${indicator}${label}${elapsedText}${stats}`;
+    },
+  };
+}