token-stats-timer 1.0.9 → 1.0.11

package/README.md

@@ -1,6 +1,6 @@
 # token-stats-timer
 
-`@carlosgtrz/pi-run-timer` 与 `@liziy/token-stats` 的合并插件。
+`@liziy/token-stats` 的修改版本。
 
 一个扩展、一个 footer，同时提供 run 计时与 token 用量/配额监控。
 
@@ -23,10 +23,9 @@ Footer 下行：cwd + git 分支 + 其他扩展状态。
 
 ## macOS 完成通知
 
-每次 run（agent 任务）结束后弹系统通知，区分三种结果：
+每次 run（agent 任务）结束后弹系统通知，区分两种结果：
 
 - ✅ pi 执行完成 —— 正常结束（含耗时）
-- ❌ pi 执行失败 —— 模型调用出错 / 工具执行失败（含错误摘要）
 - ⏹ pi 已中止 —— 用户 Esc 中止
 
 会话关闭时另有 👋 提示（可关）。通知经 `osascript` 发送，需在系统设置 → 通知 中允许终端 App 通知。
@@ -69,7 +68,7 @@ Footer 下行：cwd + git 分支 + 其他扩展状态。
 
 - `/stats` —— 无参进入套餐配置（为当前 provider 选择/关闭配额套餐）
 - `/stats day [YYYY-MM-DD]` / `hour` / `week` / `month [YYYY-MM]` —— 统计查询
-- `/stats config` —— 显示样式 / 显示内容（含「计时器」开关）/ 配额刷新时间
+- `/stats config` —— 显示样式 / 显示内容 / 配额刷新时间
 - `/notify [on|off]` —— macOS 完成通知开关（无参查看状态）
 
 ## 与两个原包的兼容性
@@ -81,7 +80,6 @@ Footer 下行：cwd + git 分支 + 其他扩展状态。
 ## 安装（替换两个原包）
 
 ```bash
-pi remove npm:@carlosgtrz/pi-run-timer
 pi remove npm:@liziy/token-stats
 pi install npm:token-stats-timer
 ```

package/index.ts

@@ -18,7 +18,6 @@
 
 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";
 import { createNotifier } from "./notify.ts";
 import { createStepTimer } from "./step-timer.ts";
@@ -30,7 +29,6 @@ const shared: SharedState = {
 
 export default function runTokenStatsExtension(pi: ExtensionAPI) {
   const stats = createTokenStats(pi, shared);
-  const timer = createRunTimer(pi, shared);
   // macOS 完成通知（成功/失败/中止），配置见 notify-config.json
   createNotifier(pi);
   // 每步耗时：Thinking.../Working... 实时耗时 + 每 turn/总耗时会话摘要
@@ -54,13 +52,9 @@ export default function runTokenStatsExtension(pi: ExtensionAPI) {
           // 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 || "";

package/package.json

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

package/step-timer.ts

@@ -92,11 +92,12 @@ export function createStepTimer(pi: ExtensionAPI): void {
     lastCtx = undefined;
   });
 
-  pi.registerEntryRenderer<FinalTimingData>(FINAL_TYPE, (entry, _opts, _theme) => {
+  pi.registerEntryRenderer<FinalTimingData>(FINAL_TYPE, (entry, _opts, theme) => {
     const d = entry.data;
     if (!d) return undefined;
-    const box = new Box(1, 1);
-    box.addChild(new Text(`总耗时 ${formatDuration(d.totalMs)}`, 0, 0));
+    const title = theme.fg("accent", "总耗时");
+    const box = new Box(1, 1, (text) => theme.bg("customMessageBg", text));
+    box.addChild(new Text(`${title} ${formatDuration(d.totalMs)}`, 0, 0));
     return box;
   });
 }

package/token-stats.ts

@@ -138,7 +138,6 @@ export type DisplayKey =
   | "quota5h"     // 5h 额度
   | "quotaWeek"   // 周额度
   | "quotaClock"  // 刷新时间（⏱）
-  | "timer";      // run 计时（⏱ run/prev/max）
 
 export interface DisplayConfig {
   items: Record<DisplayKey, boolean>;
@@ -465,7 +464,6 @@ const DEFAULT_DISPLAY_CONFIG: DisplayConfig = {
     quota5h: true,
     quotaWeek: true,
     quotaClock: true,
-    timer: true,
   },
   contextStyle: "pct-window",
   speedStyle: "t/s",
@@ -476,8 +474,6 @@ const DEFAULT_DISPLAY_CONFIG: DisplayConfig = {
 export interface TokenStatsHandle {
   /** footer 上行指标段（不含 run 计时；计时由 index.ts 拼接） */
   getMetricParts(theme: Theme, ctx: ExtensionContext): string[];
-  /** 是否显示 run 计时段 */
-  isTimerEnabled(): boolean;
 }
 
 export function createTokenStats(
@@ -1750,10 +1746,10 @@ export function createTokenStats(
         } else if (subChoice === "显示内容") {
           const itemLabels: DisplayKey[] = [
             "input", "output", "totalTokens", "cacheHit", "speed", "context",
-            "quota5h", "quotaWeek", "quotaClock", "timer",
+            "quota5h", "quotaWeek", "quotaClock",
           ];
           const itemNames: Record<DisplayKey, string> = {
-            timer: "计时器", input: "输入", output: "输出", totalTokens: "总token",
+            input: "输入", output: "输出", totalTokens: "总token",
             cacheHit: "缓存命中", speed: "速度", context: "容量",
             quota5h: "5h额度", quotaWeek: "周额度", quotaClock: "刷新时间",
           };
@@ -1843,6 +1839,5 @@ export function createTokenStats(
 
   return {
     getMetricParts,
-    isTimerEnabled: () => displayConfig.items.timer === true,
   };
 }

package/run-timer.ts

@@ -1,181 +0,0 @@
-// 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}`;
-    },
-  };
-}