token-stats-timer 1.0.7 → 1.0.9

package/README.md

@@ -57,12 +57,13 @@ Footer 下行：cwd + git 分支 + 其他扩展状态。
 ## 任务计时（step-timer）
 
 - 任务执行中：工作指示器（spinner 文案）显示 `Working... 01:02`（整体已耗时，每秒刷新）
-- 思考阶段：隐藏思考块文案显示 `Thinking... 00:45`（当前思考块已耗时，每秒刷新；思考结束自动恢复）
-- 完成后：会话末尾插入一条汇总 `✅ 任务完成 总耗时 01:23`（失败时 ❌，中止时 ⏹），经 `appendEntry` 持久化、不进入 LLM 上下文，`/resume` 后仍在
+- 完成后：会话末尾插入一条汇总，仅显示总耗时：
 
-> `Thinking...` 文案只在“隐藏思考块”模式下显示；开启思考可见时该处不显示文案，但计时不受影响。
+  `总耗时 01:23`
 
-无独立开关，随包启用；计时口径与 run-timer 一致（一次 run = 首个 agent_start → agent_settled，含重试/压缩/排队提示）。早期版本的每 turn 摘要（timing-turn）已移除，历史条目自动隐藏。
+  经 `appendEntry` 持久化、不进入 LLM 上下文，`/resume` 后仍在；无主题色样式。
+
+无独立开关，随包启用；计时口径与 run-timer 一致（一次 run = 首个 agent_start → agent_settled，含重试/压缩/排队提示）。早期版本的每 turn 摘要（timing-turn）、“⏱ 思考”每条消息内联标注与 Thinking 实时标签均已移除，历史条目自动隐藏。
 
 ## 命令
 

package/notify.ts

@@ -9,7 +9,7 @@
 //   enabled       总开关（默认 true）
 //   minDurationSec 时长低于该秒数的 run 不通知（默认 0 = 每次都通知）
 //   sound         通知声音（默认 "Glass"，"" 表示静音）
-//   onSuccess / onFailure / onAbort / onSessionEnd  各类通知开关
+//   onSuccess / onAbort / onSessionEnd  各类通知开关
 //
 // 命令：/notify on | off | status
 
@@ -27,7 +27,6 @@ export interface NotifyConfig {
   minDurationSec: number;
   sound: string;
   onSuccess: boolean;
-  onFailure: boolean;
   onAbort: boolean;
   onSessionEnd: boolean;
 }
@@ -37,7 +36,6 @@ const DEFAULT_CONFIG: NotifyConfig = {
   minDurationSec: 0,
   sound: "Glass",
   onSuccess: true,
-  onFailure: true,
   onAbort: false,
   onSessionEnd: false,
 };
@@ -80,9 +78,7 @@ export function createNotifier(pi: ExtensionAPI): void {
 
   // 当前 run 的状态（agent_start 重置，agent_end 收集，agent_settled 消费）
   let runStartMs: number | undefined;
-  let runFailed = false;
   let runAborted = false;
-  let runErrorMsg: string | undefined;
 
   // 进程内去抖计时
   let lastNotifyAt = 0;
@@ -102,9 +98,7 @@ export function createNotifier(pi: ExtensionAPI): void {
   }
 
   pi.on("agent_start", () => {
-    runFailed = false;
     runAborted = false;
-    runErrorMsg = undefined;
     if (runStartMs === undefined) runStartMs = Date.now();
   });
 
@@ -115,17 +109,7 @@ export function createNotifier(pi: ExtensionAPI): void {
       if (m.role === "assistant") {
         if (m.stopReason === "aborted") {
           runAborted = true;
-          runErrorMsg = runErrorMsg || "被用户中止";
-        } else if (m.stopReason === "error" || m.errorMessage) {
-          runFailed = true;
-          runErrorMsg = runErrorMsg || m.errorMessage || "模型调用出错";
         }
-      } else if (m.role === "toolResult" && m.isError) {
-        runFailed = true;
-        const toolMsg = `工具 ${m.toolName} 执行失败`;
-        runErrorMsg = runErrorMsg && !runErrorMsg.startsWith("工具 ")
-          ? runErrorMsg
-          : toolMsg;
       }
     }
   });
@@ -142,19 +126,11 @@ export function createNotifier(pi: ExtensionAPI): void {
 
     const dur = startMs !== undefined ? `${formatDuration(durationMs)}` : "-";
 
-    if (runFailed) {
-      if (config.onFailure) {
-        notify(
-          "❌ pi 执行失败",
-          `耗时：${dur}\n${truncate(runErrorMsg || "未知错误")}`,
-          config.sound,
-        );
-      }
-    } else if (runAborted) {
+    if (runAborted) {
       if (config.onAbort) {
         notify(
           "⏹ pi 已中止",
-          `耗时：${dur}\n${truncate(runErrorMsg || "执行被中止")}`,
+          `耗时：${dur}\n${truncate("执行被中止")}`,
           config.sound,
         );
       }
@@ -167,9 +143,7 @@ export function createNotifier(pi: ExtensionAPI): void {
     }
 
     // 消费本次结果，避免串扰下一次 run
-    runFailed = false;
     runAborted = false;
-    runErrorMsg = undefined;
   });
 
   // 会话关闭时提示（可选）
@@ -196,7 +170,7 @@ export function createNotifier(pi: ExtensionAPI): void {
         const sound = config.sound ? `, 声音=${config.sound}` : ", 静音";
         ctx.ui.notify(
           `完成通知: ${config.enabled ? "开" : "关"}, 最短时长=${config.minDurationSec}s, ` +
-            `成功=${config.onSuccess ? "开" : "关"}, 失败=${config.onFailure ? "开" : "关"}, ` +
+            `成功=${config.onSuccess ? "开" : "关"}, ` +
             `中止=${config.onAbort ? "开" : "关"}, 会话结束=${config.onSessionEnd ? "开" : "关"}${sound}`,
           "info",
         );

package/package.json

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

package/step-timer.ts

@@ -2,15 +2,11 @@
 // =============================================================================
 // 实时显示(仅交互 TUI):
 //   - 任务执行中:工作指示器文案显示 "Working... 01:02"(整体已耗时,每秒刷新)
-//   - 思考阶段:隐藏思考块文案显示 "Thinking... 00:45"(当前思考块已耗时)
 // 完成后汇总(appendEntry 持久化,不进入 LLM 上下文,resume 后可回看):
-//   - agent_settled  appendEntry("timing-final", …):本次任务总耗时
+//   - agent_settled  appendEntry("timing-final", …):仅本次任务总耗时
 //
 // 一次 run = 空闲后的首个 agent_start → agent_settled(与 run-timer 语义一致,
 // 包含重试、压缩恢复和排队的 steering/follow-up 提示)。
-//
-// 注意:早期版本曾用 "timing-turn" 每 turn 摘要,该渲染器已移除,
-// 历史遗留的 timing-turn 条目因无渲染器而自动不再显示。
 
 import type { ExtensionAPI, ExtensionContext } from "@earendil-works/pi-coding-agent";
 import { Box, Text } from "@earendil-works/pi-tui";
@@ -18,8 +14,6 @@ import { Box, Text } from "@earendil-works/pi-tui";
 /** 一次 run 的总耗时汇总(appendEntry "timing-final") */
 export interface FinalTimingData {
   totalMs: number;
-  failed: boolean;
-  aborted: boolean;
 }
 
 const FINAL_TYPE = "timing-final";
@@ -43,29 +37,12 @@ export function createStepTimer(pi: ExtensionAPI): void {
 
   let runActive = false;
   let runStartMs = 0;
-  let runFailed = false;
-  let runAborted = false;
-
-  // 思考阶段状态(仅用于 Thinking... 文案计时)
-  let thinkingSinceMs: number | undefined;
-
-  /** 结束思考阶段并恢复默认 "Thinking..." 文案(若当前处于思考中) */
-  function endThinking(): void {
-    if (thinkingSinceMs === undefined) return;
-    thinkingSinceMs = undefined;
-    if (lastCtx?.hasUI) lastCtx.ui.setHiddenThinkingLabel();
-  }
 
   function startTicker(): void {
     stopTicker();
     tick = setInterval(() => {
       if (!lastCtx?.hasUI || !runActive) return;
-      const now = Date.now();
-      const ui = lastCtx.ui;
-      ui.setWorkingMessage(`Working... ${formatDuration(now - runStartMs)}`);
-      if (thinkingSinceMs !== undefined) {
-        ui.setHiddenThinkingLabel(`Thinking... ${formatDuration(now - thinkingSinceMs)}`);
-      }
+      lastCtx.ui.setWorkingMessage(`Working... ${formatDuration(Date.now() - runStartMs)}`);
     }, TICK_MS);
   }
 
@@ -78,8 +55,6 @@ export function createStepTimer(pi: ExtensionAPI): void {
   function appendFinal(): void {
     pi.appendEntry<FinalTimingData>(FINAL_TYPE, {
       totalMs: Date.now() - runStartMs,
-      failed: runFailed,
-      aborted: runAborted,
     });
   }
 
@@ -94,57 +69,13 @@ export function createStepTimer(pi: ExtensionAPI): void {
     if (runActive) return;
     runActive = true;
     runStartMs = Date.now();
-    runFailed = false;
-    runAborted = false;
-    thinkingSinceMs = undefined;
     startTicker();
     if (lastCtx?.hasUI) lastCtx.ui.setWorkingMessage("Working... 00:00");
   });
 
-  pi.on("message_update", (event, ctx) => {
-    if (!runActive) return;
-    lastCtx = ctx;
-    const ev = event.assistantMessageEvent;
-    if (!ev) return;
-    const now = Date.now();
-    if (ev.type === "thinking_start") {
-      thinkingSinceMs = now;
-      if (lastCtx?.hasUI) {
-        lastCtx.ui.setHiddenThinkingLabel("Thinking... 00:00");
-      }
-    } else if (ev.type === "thinking_end" || ev.type === "text_start") {
-      endThinking();
-    }
-  });
-
-  pi.on("tool_execution_start", (_event, ctx) => {
-    if (!runActive) return;
-    lastCtx = ctx;
-    // 工具执行时恢复正常文案,避免 Thinking 计时残留
-    endThinking();
-  });
-
-  pi.on("agent_end", (event, ctx) => {
-    if (!runActive) return;
-    lastCtx = ctx;
-    // 扫描消息找失败/中止信号,仅用于最终摘要素材
-    for (const msg of event.messages ?? []) {
-      if (msg.type === "assistant") {
-        if (msg.stopReason === "error" || msg.stopReason === "aborted") {
-          if (msg.stopReason === "error") runFailed = true;
-          else runAborted = true;
-        }
-        if (msg.errorMessage) runFailed = true;
-      } else if (msg.type === "toolResult" && msg.isError) {
-        runFailed = true;
-      }
-    }
-  });
-
   pi.on("agent_settled", (_event, ctx) => {
     lastCtx = ctx;
     if (!runActive) return;
-    endThinking();
     appendFinal();
     if (lastCtx?.hasUI) lastCtx.ui.setWorkingMessage(); // 恢复默认 "Working..."
     runActive = false;
@@ -154,7 +85,6 @@ export function createStepTimer(pi: ExtensionAPI): void {
   pi.on("session_shutdown", (_event, _ctx) => {
     // 会话提前结束(如 /exit 或崩溃):尽力补一条最终汇总
     if (runActive) {
-      endThinking();
       appendFinal();
       runActive = false;
     }
@@ -162,16 +92,11 @@ 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 title = d.failed
-      ? theme.fg("error", "❌ 任务失败 总耗时")
-      : d.aborted
-        ? theme.fg("dim", "⏹ 任务中止 总耗时")
-        : theme.fg("accent", "✅ 任务完成 总耗时");
-    const box = new Box(1, 1, (text) => theme.bg("customMessageBg", text));
-    box.addChild(new Text(`${title} ${formatDuration(d.totalMs)}`, 0, 0));
+    const box = new Box(1, 1);
+    box.addChild(new Text(`总耗时 ${formatDuration(d.totalMs)}`, 0, 0));
     return box;
   });
 }