@ai-setting/roy-agent-cli 1.7.52 → 1.7.55

package/dist/index.js

@@ -364,6 +364,7 @@ var exports_stream_output_service = {};
 __export(exports_stream_output_service, {
   streamAbortSignal: () => streamAbortSignal,
   resetStreamAbort: () => resetStreamAbort,
+  hasNumericUsage: () => hasNumericUsage,
   abortStream: () => abortStream,
   StreamOutputService: () => StreamOutputService,
   COLORS: () => COLORS
@@ -376,6 +377,11 @@ function resetStreamAbort() {
 function abortStream() {
   streamAbortSignal.aborted = true;
 }
+function hasNumericUsage(usage) {
+  if (!usage)
+    return false;
+  return typeof usage.promptTokens === "number" || typeof usage.completionTokens === "number" || typeof usage.totalTokens === "number" || typeof usage.cacheRead === "number" || typeof usage.cacheWrite === "number" || typeof usage.promptTokensTotal === "number";
+}
 var logger2, COLORS, streamAbortSignal, StreamOutputService;
 var init_stream_output_service = __esm(() => {
   init_markdown_renderer();
@@ -645,14 +651,16 @@ ${COLORS.system("[已中断]")}
           completionTokens: metadata.usage?.completionTokens,
           totalTokens: metadata.usage?.totalTokens,
           cacheRead: metadata.usage?.cacheRead,
-          cacheWrite: metadata.usage?.cacheWrite
+          cacheWrite: metadata.usage?.cacheWrite,
+          promptTokensTotal: metadata.usage?.promptTokensTotal
         };
         const logData = {
           promptTokens: this.usageInfo.promptTokens,
           completionTokens: this.usageInfo.completionTokens,
           totalTokens: this.usageInfo.totalTokens,
           cacheRead: this.usageInfo.cacheRead,
-          cacheWrite: this.usageInfo.cacheWrite
+          cacheWrite: this.usageInfo.cacheWrite,
+          promptTokensTotal: this.usageInfo.promptTokensTotal
         };
         if (this.contextWindow !== undefined) {
           logData.contextWindow = this.contextWindow;
@@ -668,7 +676,8 @@ ${COLORS.system("[已中断]")}
       }
       this.emitChunk({
         type: "llm.completed",
-        fullContent: payload.content ?? this.fullText
+        fullContent: payload.content ?? this.fullText,
+        usage: hasNumericUsage(this.usageInfo) ? this.usageInfo : undefined
       });
     }
     getFullText() {
@@ -1652,6 +1661,78 @@ var init_StatusBar = __esm(() => {
   init_theme();
 });
 
+// src/tui/UsageFooter.tsx
+import { Text as Text4 } from "ink";
+import { jsxDEV as jsxDEV4 } from "react/jsx-dev-runtime";
+function formatTokens2(n) {
+  if (!Number.isFinite(n))
+    return "0";
+  if (n < 1000)
+    return String(Math.round(n));
+  return `${(n / 1000).toFixed(1)}k`;
+}
+function formatUsageFooter(usage) {
+  if (!usage)
+    return null;
+  const promptTokens = usage.promptTokens;
+  const completionTokens = usage.completionTokens;
+  const cacheRead = usage.cacheRead;
+  const cacheWrite = usage.cacheWrite;
+  const hasCacheRead = typeof cacheRead === "number";
+  const hasCacheWrite = typeof cacheWrite === "number";
+  const hasPrompt = typeof promptTokens === "number";
+  const hasCompletion = typeof completionTokens === "number";
+  if (!hasPrompt && !hasCompletion && !hasCacheRead && !hasCacheWrite) {
+    return null;
+  }
+  const allZero = (promptTokens ?? 0) === 0 && (completionTokens ?? 0) === 0 && (cacheRead ?? 0) === 0 && (cacheWrite ?? 0) === 0;
+  if (allZero)
+    return null;
+  const parts = [];
+  if (hasCacheRead || hasCacheWrite) {
+    const read = cacheRead ?? 0;
+    const write = cacheWrite ?? 0;
+    const reportedTotal = usage.promptTokensTotal;
+    const denom = typeof reportedTotal === "number" && reportedTotal > 0 ? reportedTotal : (promptTokens ?? 0) + read + write;
+    const rawRate = denom > 0 ? read / denom * 100 : 0;
+    const rate = Math.min(100, Math.max(0, rawRate));
+    parts.push(`cache ${rate.toFixed(1)}%`);
+    if (denom > 0) {
+      parts.push(`${formatTokens2(read)}/${formatTokens2(denom)}`);
+    }
+    if (write > 0) {
+      parts.push(`write ${formatTokens2(write)}`);
+    }
+  }
+  if (hasPrompt)
+    parts.push(`in ${formatTokens2(promptTokens)}`);
+  if (hasCompletion)
+    parts.push(`out ${formatTokens2(completionTokens)}`);
+  if (parts.length === 0)
+    return null;
+  return parts.join(" · ");
+}
+var UsageFooter = ({
+  usage,
+  fallback,
+  indent = 2
+}) => {
+  const line = formatUsageFooter(usage);
+  if (!line) {
+    if (!fallback)
+      return null;
+    return /* @__PURE__ */ jsxDEV4(Text4, {
+      dimColor: true,
+      children: `${" ".repeat(indent)}${fallback}`
+    }, undefined, false, undefined, this);
+  }
+  return /* @__PURE__ */ jsxDEV4(Text4, {
+    dimColor: true,
+    children: `${" ".repeat(indent)}${line}`
+  }, undefined, false, undefined, this);
+};
+var init_UsageFooter = () => {};
+
 // src/commands/ui/dynamic-tail.ts
 function computeDynamicTailBounds(totalRows, reservedRows = DEFAULT_RESERVED_ROWS, hasPopup = false) {
   const total = Math.max(1, totalRows ?? 24);
@@ -1702,9 +1783,9 @@ __export(exports_repl_ink, {
   MultilineInput: () => MultilineInput
 });
 import * as React3 from "react";
-import { Box as Box3, Text as Text4, Static, useApp, useInput as useInput2 } from "ink";
-import { createLogger as createLogger5 } from "@ai-setting/roy-agent-core";
-import { jsxDEV as jsxDEV4 } from "react/jsx-dev-runtime";
+import { Box as Box3, Text as Text5, Static, useApp, useInput as useInput2 } from "ink";
+import { createLogger as createLogger6 } from "@ai-setting/roy-agent-core";
+import { jsxDEV as jsxDEV5 } from "react/jsx-dev-runtime";
 function nextMessageId() {
   _msgIdCounter += 1;
   return `m-${Date.now().toString(36)}-${_msgIdCounter.toString(36)}`;
@@ -1853,6 +1934,14 @@ function REPLInk(props) {
         streamingIndexRef.current = -1;
         isFirstDeltaInStreamRef.current = true;
       },
+      attachUsage: (usage) => {
+        if (!usage)
+          return;
+        setMessages((msgs) => [
+          ...msgs,
+          withMessageId({ role: "usage", content: "", usage })
+        ]);
+      },
       setMode: (newMode) => {
         setMode(newMode);
         setStatusBarCtxState((ctx) => ({ ...ctx, mode: newMode }));
@@ -1974,33 +2063,33 @@ function REPLInk(props) {
   const tailKey = messages.length > 0 ? tailMsg?.id ?? `tail-${messages.length - 1}` : "tail-empty";
   const statusBarModel = shortModel(statusBarCtx.model);
   const statusBarWorkdir = statusBarCtx.cwd;
-  return /* @__PURE__ */ jsxDEV4(Box3, {
+  return /* @__PURE__ */ jsxDEV5(Box3, {
     flexDirection: "column",
     children: [
-      staticItems.length > 0 ? /* @__PURE__ */ jsxDEV4(Static, {
+      staticItems.length > 0 ? /* @__PURE__ */ jsxDEV5(Static, {
         items: staticItems,
-        children: (msg, i) => /* @__PURE__ */ jsxDEV4(MessageView, {
+        children: (msg, i) => /* @__PURE__ */ jsxDEV5(MessageView, {
           msg,
           terminalWidth,
           tailBounds: staticTailBounds
         }, msg.id ?? `h-${msg.role}-${i}-${msg.content.length}`, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      tailMsg ? /* @__PURE__ */ jsxDEV4(MessageView, {
+      tailMsg ? /* @__PURE__ */ jsxDEV5(MessageView, {
         msg: tailMsg,
         terminalWidth,
         tailBounds: dynamicTailBounds
       }, tailKey, false, undefined, this) : null,
-      /* @__PURE__ */ jsxDEV4(Box3, {
+      /* @__PURE__ */ jsxDEV5(Box3, {
         flexDirection: "column",
         marginTop: 1,
-        children: /* @__PURE__ */ jsxDEV4(StatusBar, {
+        children: /* @__PURE__ */ jsxDEV5(StatusBar, {
           model: statusBarModel,
           workdir: statusBarWorkdir
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this),
-      showPopup ? /* @__PURE__ */ jsxDEV4(Box3, {
+      showPopup ? /* @__PURE__ */ jsxDEV5(Box3, {
         marginBottom: 0,
-        children: /* @__PURE__ */ jsxDEV4(SlashCommandPopup, {
+        children: /* @__PURE__ */ jsxDEV5(SlashCommandPopup, {
           query: inputValue,
           selectedIndex: safePopupIndex,
           onIndexChange: handlePopupIndexChange,
@@ -2008,20 +2097,20 @@ function REPLInk(props) {
           onClose: handlePopupClose
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      /* @__PURE__ */ jsxDEV4(Box3, {
+      /* @__PURE__ */ jsxDEV5(Box3, {
         flexDirection: "column",
         children: [
-          /* @__PURE__ */ jsxDEV4(Text4, {
+          /* @__PURE__ */ jsxDEV5(Text5, {
             children: COLORS.muted("─".repeat(40))
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV4(MultilineInput, {
+          /* @__PURE__ */ jsxDEV5(MultilineInput, {
             ref: multilineInputRef,
             onSubmit: handleSubmit,
             onEscape: handleEscapeCascade,
             popupActive: showPopup,
             onChange: setInputValue
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV4(Text4, {
+          /* @__PURE__ */ jsxDEV5(Text5, {
             children: COLORS.muted("─".repeat(40))
           }, undefined, false, undefined, this)
         ]
@@ -2048,17 +2137,18 @@ var init_repl_ink = __esm(() => {
   init_slash_command_popup();
   init_Markdown();
   init_StatusBar();
+  init_UsageFooter();
   init_dynamic_tail();
   MarkdownBounded = React3.memo(({ text, bounds, width }) => {
     const out = renderBoundedAssistant(text, bounds, width);
     if (!out) {
       return null;
     }
-    return /* @__PURE__ */ jsxDEV4(Text4, {
+    return /* @__PURE__ */ jsxDEV5(Text5, {
       children: out
     }, undefined, false, undefined, this);
   });
-  inkLogger = createLogger5("repl-ink");
+  inkLogger = createLogger6("repl-ink");
   MultilineInput = React3.memo(React3.forwardRef(function MultilineInput2(props, ref) {
     const { onSubmit, placeholder, popupActive, onChange, onEscape } = props;
     const [buffer, setBuffer] = React3.useState("");
@@ -2256,12 +2346,12 @@ var init_repl_ink = __esm(() => {
       }
     }
     const showPlaceholder = buffer.length === 0 && placeholder;
-    return /* @__PURE__ */ jsxDEV4(Box3, {
+    return /* @__PURE__ */ jsxDEV5(Box3, {
       flexDirection: "column",
       children: lines.map((line, i) => {
         const isFirst = i === 0;
         const isCursorRow = i === cursorRow;
-        const prefixEl = /* @__PURE__ */ jsxDEV4(Text4, {
+        const prefixEl = /* @__PURE__ */ jsxDEV5(Text5, {
           color: isFirst ? "red" : "gray",
           children: isFirst ? "❯ " : "... "
         }, undefined, false, undefined, this);
@@ -2276,29 +2366,29 @@ var init_repl_ink = __esm(() => {
             atCursor = line[cursorCol] ?? " ";
             afterCursor = line.slice(cursorCol + 1);
           }
-          return /* @__PURE__ */ jsxDEV4(Box3, {
+          return /* @__PURE__ */ jsxDEV5(Box3, {
             children: [
               prefixEl,
-              /* @__PURE__ */ jsxDEV4(Text4, {
+              /* @__PURE__ */ jsxDEV5(Text5, {
                 children: beforeCursor
               }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV4(Text4, {
+              /* @__PURE__ */ jsxDEV5(Text5, {
                 inverse: !showPlaceholder,
                 children: atCursor
               }, undefined, false, undefined, this),
-              showPlaceholder ? /* @__PURE__ */ jsxDEV4(Text4, {
+              showPlaceholder ? /* @__PURE__ */ jsxDEV5(Text5, {
                 color: "gray",
                 children: placeholder?.slice(1) ?? ""
-              }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV4(Text4, {
+              }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV5(Text5, {
                 children: afterCursor
               }, undefined, false, undefined, this)
             ]
           }, i, true, undefined, this);
         }
-        return /* @__PURE__ */ jsxDEV4(Box3, {
+        return /* @__PURE__ */ jsxDEV5(Box3, {
           children: [
             prefixEl,
-            /* @__PURE__ */ jsxDEV4(Text4, {
+            /* @__PURE__ */ jsxDEV5(Text5, {
               children: line
             }, undefined, false, undefined, this)
           ]
@@ -2312,13 +2402,22 @@ var init_repl_ink = __esm(() => {
     tailBounds
   }) {
     if (msg.kind === "welcome") {
-      return /* @__PURE__ */ jsxDEV4(Box3, {
+      return /* @__PURE__ */ jsxDEV5(Box3, {
         flexDirection: "column",
-        children: /* @__PURE__ */ jsxDEV4(Text4, {
+        children: /* @__PURE__ */ jsxDEV5(Text5, {
           children: msg.content
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this);
     }
+    if (msg.role === "usage") {
+      return /* @__PURE__ */ jsxDEV5(Box3, {
+        flexDirection: "column",
+        marginLeft: 2,
+        children: /* @__PURE__ */ jsxDEV5(UsageFooter, {
+          usage: msg.usage
+        }, undefined, false, undefined, this)
+      }, undefined, false, undefined, this);
+    }
     let prefix;
     let color;
     let contentColor;
@@ -2358,18 +2457,18 @@ var init_repl_ink = __esm(() => {
     const displayContent = msg.role === "tool" || msg.role === "tool_result" ? `${msg.toolName ?? "tool"}: ${msg.content}` : msg.content;
     const width = terminalWidth ?? process.stdout.columns ?? 80;
     if (msg.role === "assistant") {
-      const body = tailBounds ? /* @__PURE__ */ jsxDEV4(MarkdownBounded, {
+      const body = tailBounds ? /* @__PURE__ */ jsxDEV5(MarkdownBounded, {
         text: displayContent,
         bounds: tailBounds,
         width
-      }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV4(Markdown, {
+      }, undefined, false, undefined, this) : /* @__PURE__ */ jsxDEV5(Markdown, {
         text: displayContent
       }, undefined, false, undefined, this);
-      return /* @__PURE__ */ jsxDEV4(Box3, {
+      return /* @__PURE__ */ jsxDEV5(Box3, {
         flexDirection: "column",
         children: [
-          /* @__PURE__ */ jsxDEV4(Box3, {
-            children: /* @__PURE__ */ jsxDEV4(Text4, {
+          /* @__PURE__ */ jsxDEV5(Box3, {
+            children: /* @__PURE__ */ jsxDEV5(Text5, {
               color: "green",
               bold: true,
               children: [
@@ -2378,12 +2477,12 @@ var init_repl_ink = __esm(() => {
               ]
             }, undefined, true, undefined, this)
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV4(Box3, {
+          /* @__PURE__ */ jsxDEV5(Box3, {
             flexDirection: "column",
             marginLeft: 2,
             children: [
               body,
-              msg.streaming ? /* @__PURE__ */ jsxDEV4(Text4, {
+              msg.streaming ? /* @__PURE__ */ jsxDEV5(Text5, {
                 color: "gray",
                 children: "▌"
               }, undefined, false, undefined, this) : null
@@ -2393,9 +2492,9 @@ var init_repl_ink = __esm(() => {
       }, undefined, true, undefined, this);
     }
     if (tailBounds) {
-      return /* @__PURE__ */ jsxDEV4(Box3, {
+      return /* @__PURE__ */ jsxDEV5(Box3, {
         children: [
-          /* @__PURE__ */ jsxDEV4(Text4, {
+          /* @__PURE__ */ jsxDEV5(Text5, {
             color,
             bold: true,
             children: [
@@ -2403,7 +2502,7 @@ var init_repl_ink = __esm(() => {
               " "
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsxDEV4(Text4, {
+          /* @__PURE__ */ jsxDEV5(Text5, {
             color: contentColor,
             children: [
               renderBoundedPlain(displayContent, tailBounds, width),
@@ -2413,9 +2512,9 @@ var init_repl_ink = __esm(() => {
         ]
       }, undefined, true, undefined, this);
     }
-    return /* @__PURE__ */ jsxDEV4(Box3, {
+    return /* @__PURE__ */ jsxDEV5(Box3, {
       children: [
-        /* @__PURE__ */ jsxDEV4(Text4, {
+        /* @__PURE__ */ jsxDEV5(Text5, {
           color,
           bold: true,
           children: [
@@ -2423,7 +2522,7 @@ var init_repl_ink = __esm(() => {
             " "
           ]
         }, undefined, true, undefined, this),
-        /* @__PURE__ */ jsxDEV4(Text4, {
+        /* @__PURE__ */ jsxDEV5(Text5, {
           color: contentColor,
           children: [
             displayContent,
@@ -9486,7 +9585,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.52",
+  version: "1.7.55",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -11108,6 +11207,23 @@ class SessionManager {
 // src/commands/shared/query-executor.ts
 init_stream_output_service();
 import { ContextError as ContextError3, ErrorCodes as ErrorCodes3, TracedAs as TracedAs4 } from "@ai-setting/roy-agent-core";
+import { notifyReactFailure } from "@ai-setting/roy-agent-core/env/error-reply";
+import { createLogger as createLogger5 } from "@ai-setting/roy-agent-core/env/log-trace/logger";
+var logger5 = createLogger5("cli:query-executor");
+function isAskUserError(error) {
+  if (!error || typeof error !== "object")
+    return false;
+  const e = error;
+  if (e.name === "AskUserError")
+    return true;
+  if (e.type === "ask-user")
+    return true;
+  if (typeof e.message === "string" && e.message.includes("__ASK_USER_ERROR__:")) {
+    return true;
+  }
+  return false;
+}
+
 class QueryExecutor {
   env;
   sessionComponent;
@@ -11123,12 +11239,14 @@ class QueryExecutor {
   };
   _pendingContextConfig = null;
   _pendingChunkCallback = undefined;
+  failureNotifier;
   constructor(options) {
     this.env = options.env;
     this.sessionComponent = options.sessionComponent;
     this.output = options.output;
     this.quiet = options.quiet;
     this.silent = options.silent ?? false;
+    this.failureNotifier = options.failureNotifier ?? notifyReactFailure;
   }
   initSummaryAgent(llmComponent, promptComponent) {
     const session = this.sessionComponent;
@@ -11232,6 +11350,7 @@ class QueryExecutor {
     try {
       result = await contextHandler.handleQueryWithContext(message, context);
     } catch (error) {
+      await this.replyOnReactFailure(error, message, context);
       if (error instanceof ContextError3 && error.code === ErrorCodes3.CONTEXT_THRESHOLD_EXCEEDED) {
         this.output.error(`上下文阈值超出限制: ${error.usage?.totalTokens}/${error.contextWindow}`);
         this.output.info("请手动压缩会话: roy-agent sessions compact " + sessionId);
@@ -11243,6 +11362,23 @@ class QueryExecutor {
     }
     return result;
   }
+  async replyOnReactFailure(error, query, context) {
+    try {
+      if (isAskUserError(error))
+        return;
+      const envEvent = context?.envEvent ?? context?.metadata?.envEvent;
+      await this.failureNotifier({
+        error,
+        envEvent,
+        query: typeof query === "string" ? query : undefined,
+        sessionId: context?.sessionId
+      });
+    } catch (notifyErr) {
+      logger5.warn("[#4418] React 中断兜底回复失败（已忽略）", {
+        error: String(notifyErr)
+      });
+    }
+  }
   dispose() {
     if (this.unsubscribe) {
       this.unsubscribe();
@@ -11560,6 +11696,7 @@ import {
 
 // src/commands/shared/event-handler.ts
 import { TracedAs as TracedAs5 } from "@ai-setting/roy-agent-core";
+import { notifyReactFailure as notifyReactFailure2 } from "@ai-setting/roy-agent-core/env/error-reply";
 function parseLarkPerTaskChatId(contextJson) {
   if (!contextJson)
     return;
@@ -11821,6 +11958,15 @@ class EventHandler {
         await this.onEvent(item.message);
       } catch (error) {
         console.error(`[EventHandler] 处理事件失败:`, error);
+        try {
+          await notifyReactFailure2({
+            error,
+            envEvent: item.envEvent,
+            sessionId
+          });
+        } catch (notifyErr) {
+          console.error(`[EventHandler] 失败说明回飞书异常:`, notifyErr);
+        }
       }
     }
     this.isProcessing = false;
@@ -12075,7 +12221,7 @@ function hasActiveDescendants(env, parentSessionId) {
 
 // src/commands/interactive.ts
 init_stream_output_service();
-import { createLogger as createLogger6, getTracerProvider as getTracerProvider3 } from "@ai-setting/roy-agent-core";
+import { createLogger as createLogger7, getTracerProvider as getTracerProvider3 } from "@ai-setting/roy-agent-core";
 
 // src/commands/input-handler.ts
 class InputHandler {
@@ -12400,7 +12546,7 @@ async function shutdownInteractiveSteps(deps) {
     envService,
     shouldDisposeEnvService,
     output,
-    logger: logger5,
+    logger: logger6,
     console: consoleLike
   } = deps;
   const log = (msg) => consoleLike?.log?.(msg) ?? console.log(msg);
@@ -12413,7 +12559,7 @@ async function shutdownInteractiveSteps(deps) {
       await memoryPluginDispose();
       log("\uD83D\uDCBE 记忆已保存完毕");
     } catch (err) {
-      logger5.warn(`[Shutdown] MemoryPlugin dispose failed: ${err}`);
+      logger6.warn(`[Shutdown] MemoryPlugin dispose failed: ${err}`);
       output.warn(`⚠️ 记忆保存失败: ${err}`);
     }
   }
@@ -12421,25 +12567,25 @@ async function shutdownInteractiveSteps(deps) {
     try {
       await lspManagerDispose();
     } catch (err) {
-      logger5.warn(`[Shutdown] LSP Manager dispose failed: ${err}`);
+      logger6.warn(`[Shutdown] LSP Manager dispose failed: ${err}`);
     }
   }
   if (pluginAdapterDispose) {
     try {
       await pluginAdapterDispose();
     } catch (err) {
-      logger5.warn(`[Shutdown] PluginAdapter dispose failed: ${err}`);
+      logger6.warn(`[Shutdown] PluginAdapter dispose failed: ${err}`);
     }
   }
   try {
     eventHandler.stop();
   } catch (err) {
-    logger5.warn(`[Shutdown] EventHandler.stop failed: ${err}`);
+    logger6.warn(`[Shutdown] EventHandler.stop failed: ${err}`);
   }
   try {
     queryExecutor.dispose();
   } catch (err) {
-    logger5.warn(`[Shutdown] QueryExecutor.dispose failed: ${err}`);
+    logger6.warn(`[Shutdown] QueryExecutor.dispose failed: ${err}`);
   }
   try {
     const eventSourceComponent = env.getComponent("event-source");
@@ -12448,7 +12594,7 @@ async function shutdownInteractiveSteps(deps) {
       if (sources && sources.length > 0) {
         for (const source of sources) {
           const status = eventSourceComponent.getStatus?.(source.id);
-          logger5.debug(`[Shutdown] 检查事件源: ${source.id}, 状态: ${status}`);
+          logger6.debug(`[Shutdown] 检查事件源: ${source.id}, 状态: ${status}`);
           if (status !== "stopped" && status !== "created") {
             try {
               await eventSourceComponent.stopSource(source.id);
@@ -12461,20 +12607,20 @@ async function shutdownInteractiveSteps(deps) {
       }
     }
   } catch (err) {
-    logger5.warn(`[Shutdown] EventSource cleanup failed: ${err}`);
+    logger6.warn(`[Shutdown] EventSource cleanup failed: ${err}`);
   }
   if (shouldDisposeEnvService) {
     try {
       await envService.dispose();
     } catch (err) {
-      logger5.warn(`[Shutdown] envService.dispose failed: ${err}`);
+      logger6.warn(`[Shutdown] envService.dispose failed: ${err}`);
     }
   }
   try {
     await TempFileManager2.getInstance().cleanupAll();
-    logger5.debug("[Shutdown] TempFileManager cleaned up");
+    logger6.debug("[Shutdown] TempFileManager cleaned up");
   } catch (err) {
-    logger5.warn(`[Shutdown] TempFileManager cleanup failed: ${err}`);
+    logger6.warn(`[Shutdown] TempFileManager cleanup failed: ${err}`);
   }
 }
 
@@ -12483,7 +12629,7 @@ var DEFAULT_LOGGER = {
   warn: (msg) => console.error(`[shutdown] ${msg}`)
 };
 function registerShutdownHandlers(cleanup, options = {}) {
-  const logger5 = options.logger ?? DEFAULT_LOGGER;
+  const logger6 = options.logger ?? DEFAULT_LOGGER;
   const exitCode = options.exitCode ?? 0;
   const shutdownMessage = options.shutdownMessage ?? "Cleaning up...";
   let shuttingDown = false;
@@ -12493,7 +12639,7 @@ function registerShutdownHandlers(cleanup, options = {}) {
     }
     shuttingDown = true;
     try {
-      logger5.debug?.(`[${signal}] ${shutdownMessage}`);
+      logger6.debug?.(`[${signal}] ${shutdownMessage}`);
     } catch {}
     if (cleanup) {
       try {
@@ -12501,7 +12647,7 @@ function registerShutdownHandlers(cleanup, options = {}) {
       } catch (err) {
         const message = err instanceof Error ? err.message : String(err);
         try {
-          logger5.warn(`Cleanup failed: ${message}`);
+          logger6.warn(`Cleanup failed: ${message}`);
         } catch {
           try {
             process.stderr.write(`[shutdown] Cleanup failed: ${message}
@@ -12526,6 +12672,7 @@ function registerShutdownHandlers(cleanup, options = {}) {
 
 // src/commands/interactive.ts
 import { AskUserError, cascadeStopSessionTree } from "@ai-setting/roy-agent-core";
+import { notifyReactFailure as notifyReactFailure3 } from "@ai-setting/roy-agent-core/env/error-reply";
 
 // src/commands/shared/usage-formatter.ts
 import chalk4 from "chalk";
@@ -12549,8 +12696,10 @@ function formatCacheLine(usage, options = {}) {
     return chalk4.gray("\uD83D\uDCB0 Cache: read 0 / write 0 (saved ~$0.000 / 0% hit rate)");
   }
   const saved = cacheRead * (PRICING.regularPerToken - PRICING.cacheReadPerToken);
-  const denom = cacheRead + cacheWrite;
-  const hitRate = denom > 0 ? (cacheRead / denom * 100).toFixed(0) : "0";
+  const promptTokens = usage.promptTokens ?? 0;
+  const denom = usage.promptTokensTotal !== undefined && usage.promptTokensTotal > 0 ? usage.promptTokensTotal : promptTokens + cacheRead + cacheWrite;
+  const rawRate = denom > 0 ? cacheRead / denom * 100 : 0;
+  const hitRate = Math.min(100, Math.max(0, rawRate)).toFixed(0);
   const text = `\uD83D\uDCB0 Cache: read ${cacheRead} / write ${cacheWrite} (saved ~$${saved.toFixed(3)} / ${hitRate}% hit rate)`;
   if (!colorize)
     return text;
@@ -12710,7 +12859,7 @@ var COLOR_BY_STATUS = {
   busy: COLORS.accent
 };
 // src/commands/interactive.ts
-var logger5 = createLogger6("cli:interactive");
+var logger6 = createLogger7("cli:interactive");
 var USER_PROMPT = COLORS.accent("❯ ");
 
 class REPL {
@@ -12902,10 +13051,10 @@ ${COLORS.system("[正在中断...]")}`);
           const agentComponent = this.env.getComponent("agent");
           if (agentComponent?.abortAll) {
             agentComponent.abortAll();
-            logger5.debug("[/abort] AgentComponent.abortAll() called");
+            logger6.debug("[/abort] AgentComponent.abortAll() called");
           } else if (agentComponent?.abort) {
             agentComponent.abort("default");
-            logger5.debug("[/abort] AgentComponent.abort('default') called (fallback)");
+            logger6.debug("[/abort] AgentComponent.abort('default') called (fallback)");
           }
         }
         abortStream();
@@ -12953,6 +13102,9 @@ ${COLORS.system("[没有正在执行的请求]")}`);
             break;
           case "llm.completed":
             inkApiRef.finishAssistantStream();
+            if (event.usage) {
+              inkApiRef.attachUsage(event.usage);
+            }
             break;
           case "tool.call":
             inkApiRef.appendMessage({
@@ -13000,7 +13152,7 @@ ${COLORS.system("[没有正在执行的请求]")}`);
               try {
                 await this.options.onAfterExecute(this.lastUsage);
               } catch (hookError) {
-                logger5.warn("onAfterExecute hook failed (ink path)", { error: String(hookError) });
+                logger6.warn("onAfterExecute hook failed (ink path)", { error: String(hookError) });
               }
             }
           } catch (err) {
@@ -13020,7 +13172,7 @@ ${COLORS.system("[没有正在执行的请求]")}`);
         await this.shutdown();
         resolve();
       }).catch(async (err) => {
-        logger5.error("ink REPL render failed", { error: String(err) });
+        logger6.error("ink REPL render failed", { error: String(err) });
         await this.shutdown();
         resolve();
       });
@@ -13077,7 +13229,7 @@ ${COLORS.system("[没有正在执行的请求]")}`);
       }
       if (key.name === "escape") {
         this.handleEscKey().catch((err) => {
-          logger5.warn(`[Esc] handleEscKey failed: ${err}`);
+          logger6.warn(`[Esc] handleEscKey failed: ${err}`);
         });
       }
     };
@@ -13309,7 +13461,7 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
         try {
           await this.options.onAfterExecute(this.lastUsage);
         } catch (hookError) {
-          logger5.warn("onAfterExecute hook failed", { error: String(hookError) });
+          logger6.warn("onAfterExecute hook failed", { error: String(hookError) });
         }
       }
     } catch (error) {
@@ -13321,6 +13473,15 @@ ${COLORS.system("[通知2] ❯ " + message.replace(/\n/g, `
 ${COLORS.error("❌ 执行失败: " + error)}
 `);
         rootSpan.setAttribute("error", String(error));
+        try {
+          await notifyReactFailure3({
+            error,
+            envEvent: agentContext?.envEvent,
+            sessionId: agentContext?.eventSessionId
+          });
+        } catch (notifyErr) {
+          console.error(`[#4418] 失败说明回飞书异常:`, notifyErr);
+        }
       }
     } finally {
       rootSpan.end();
@@ -13472,12 +13633,12 @@ ${COLORS.error("❌ 执行失败: " + error)}
   }
   async handleEscKey() {
     if (this.isShuttingDown) {
-      logger5.debug("[Esc] handler entered (isShuttingDown=true) → early return");
+      logger6.debug("[Esc] handler entered (isShuttingDown=true) → early return");
       return;
     }
     const mainSessionIdEarly = this.options.sessionId;
     const hasActiveDescendant = mainSessionIdEarly ? hasActiveDescendants(this.env, mainSessionIdEarly) : false;
-    logger5.debug(`[Esc] handler entered: isExecuting=${this.isExecuting} hasActiveDescendant=${hasActiveDescendant} lastEscPressTime=${this.lastEscPressTime}`);
+    logger6.debug(`[Esc] handler entered: isExecuting=${this.isExecuting} hasActiveDescendant=${hasActiveDescendant} lastEscPressTime=${this.lastEscPressTime}`);
     const now = Date.now();
     const isExecuting = this.isExecuting;
     const canCascade = isExecuting || hasActiveDescendant;
@@ -13486,17 +13647,17 @@ ${COLORS.error("❌ 执行失败: " + error)}
       this.lastEscPressTime = now;
     }
     if (!canCascade) {
-      logger5.debug("[Esc] idle no-op: isExecuting=false, no active descendant");
+      logger6.debug("[Esc] idle no-op: isExecuting=false, no active descendant");
       return;
     }
     if (this.env) {
       const agentComponent = this.env.getComponent("agent");
       if (agentComponent?.abortAll) {
         agentComponent.abortAll();
-        logger5.debug("[Esc] AgentComponent.abortAll() called");
+        logger6.debug("[Esc] AgentComponent.abortAll() called");
       } else if (agentComponent?.abort) {
         agentComponent.abort("default");
-        logger5.debug("[Esc] AgentComponent.abort('default') called (fallback)");
+        logger6.debug("[Esc] AgentComponent.abort('default') called (fallback)");
       }
     }
     abortStream();
@@ -13504,7 +13665,7 @@ ${COLORS.error("❌ 执行失败: " + error)}
       try {
         this.inkApi.finishAssistantStream();
       } catch (err) {
-        logger5.warn("[Esc] finishAssistantStream failed", { error: String(err) });
+        logger6.warn("[Esc] finishAssistantStream failed", { error: String(err) });
       }
     }
     const mainSessionId = this.options.sessionId;
@@ -13517,9 +13678,9 @@ ${COLORS.error("❌ 执行失败: " + error)}
             timer = setTimeout(() => reject(new Error("cascade timeout 5s")), 5000);
           })
         ]);
-        logger5.info(`[Esc] cascade stop force=${result.force} tasks=${result.stoppedTaskIds.length} workflows=${result.stoppedWorkflowSessionIds.length} errors=${result.errors.length}`);
+        logger6.info(`[Esc] cascade stop force=${result.force} tasks=${result.stoppedTaskIds.length} workflows=${result.stoppedWorkflowSessionIds.length} errors=${result.errors.length}`);
       } catch (err) {
-        logger5.warn(`[Esc] cascade stop failed: ${err}`);
+        logger6.warn(`[Esc] cascade stop failed: ${err}`);
       } finally {
         if (timer !== undefined)
           clearTimeout(timer);
@@ -13858,6 +14019,8 @@ function createInteractiveCommand(externalEnvService) {
             return result;
           },
           onAfterExecute: (usage) => {
+            if (useInk)
+              return;
             if (usage) {
               const line = formatCacheLine(usage);
               if (line) {
@@ -13901,7 +14064,7 @@ function createInteractiveCommand(externalEnvService) {
               envService,
               shouldDisposeEnvService,
               output,
-              logger: logger5,
+              logger: logger6,
               console
             });
           }
@@ -13918,7 +14081,7 @@ function createInteractiveCommand(externalEnvService) {
             envService,
             shouldDisposeEnvService,
             output,
-            logger: logger5,
+            logger: logger6,
             console
           });
         });
@@ -14010,17 +14173,17 @@ import { render } from "ink";
 
 // src/RunTui.tsx
 import { useState as useState6, useCallback as useCallback4, useRef as useRef3, useEffect as useEffect5 } from "react";
-import { Box as Box7, Text as Text9, useApp as useApp2, useStdout } from "ink";
+import { Box as Box7, Text as Text10, useApp as useApp2, useStdout } from "ink";
 
 // src/tui/App.tsx
 init_Markdown();
-import { Box as Box5, Static as Static2, Text as Text7 } from "ink";
+import { Box as Box5, Static as Static2, Text as Text8 } from "ink";
 
 // src/tui/Spinner.tsx
 init_theme();
 import { useEffect as useEffect3, useState as useState3 } from "react";
-import { Text as Text5 } from "ink";
-import { jsxDEV as jsxDEV5 } from "react/jsx-dev-runtime";
+import { Text as Text6 } from "ink";
+import { jsxDEV as jsxDEV6 } from "react/jsx-dev-runtime";
 var FRAMES = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 var Spinner = ({
   label,
@@ -14034,14 +14197,14 @@ var Spinner = ({
     }, intervalMs);
     return () => clearInterval(timer);
   }, [intervalMs]);
-  return /* @__PURE__ */ jsxDEV5(Text5, {
+  return /* @__PURE__ */ jsxDEV6(Text6, {
     children: [
-      /* @__PURE__ */ jsxDEV5(Text5, {
+      /* @__PURE__ */ jsxDEV6(Text6, {
         color: theme.primary,
         children: FRAMES[frame]
       }, undefined, false, undefined, this),
       " ",
-      /* @__PURE__ */ jsxDEV5(Text5, {
+      /* @__PURE__ */ jsxDEV6(Text6, {
         dimColor: true,
         children: label
       }, undefined, false, undefined, this)
@@ -14053,7 +14216,7 @@ var Spinner = ({
 init_StatusBar();
 
 // src/tui/ToolCall.tsx
-import { Box as Box4, Text as Text6 } from "ink";
+import { Box as Box4, Text as Text7 } from "ink";
 init_theme();
 
 // src/tui/tool-call.ts
@@ -14211,17 +14374,17 @@ function formatDuration(ms) {
 }
 
 // src/tui/ToolCall.tsx
-import { jsxDEV as jsxDEV6 } from "react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV7 } from "react/jsx-dev-runtime";
 var StatusBadge = ({ info }) => {
   const theme = getTheme();
   if (info.status === "running") {
-    return /* @__PURE__ */ jsxDEV6(Spinner, {
+    return /* @__PURE__ */ jsxDEV7(Spinner, {
       label: "running"
     }, undefined, false, undefined, this);
   }
   const duration = info.durationMs !== undefined ? ` ${formatDuration(info.durationMs)}` : "";
   if (info.status === "error") {
-    return /* @__PURE__ */ jsxDEV6(Text6, {
+    return /* @__PURE__ */ jsxDEV7(Text7, {
       color: theme.error,
       children: [
         "✗",
@@ -14229,7 +14392,7 @@ var StatusBadge = ({ info }) => {
       ]
     }, undefined, true, undefined, this);
   }
-  return /* @__PURE__ */ jsxDEV6(Text6, {
+  return /* @__PURE__ */ jsxDEV7(Text7, {
     color: theme.success,
     children: [
       "✓",
@@ -14247,42 +14410,42 @@ var ToolCall = ({
 `) : [];
   const errorLines = showOutput && info.error ? info.error.split(`
 `).slice(0, 12) : [];
-  return /* @__PURE__ */ jsxDEV6(Box4, {
+  return /* @__PURE__ */ jsxDEV7(Box4, {
     flexDirection: "column",
     marginBottom: 1,
     children: [
-      /* @__PURE__ */ jsxDEV6(Box4, {
+      /* @__PURE__ */ jsxDEV7(Box4, {
         children: [
-          /* @__PURE__ */ jsxDEV6(Text6, {
+          /* @__PURE__ */ jsxDEV7(Text7, {
             color: theme.tool,
             children: [
               icon,
               " "
             ]
           }, undefined, true, undefined, this),
-          /* @__PURE__ */ jsxDEV6(Text6, {
+          /* @__PURE__ */ jsxDEV7(Text7, {
             bold: true,
             color: theme.tool,
             children: label
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV6(Text6, {
+          /* @__PURE__ */ jsxDEV7(Text7, {
             children: " "
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV6(StatusBadge, {
+          /* @__PURE__ */ jsxDEV7(StatusBadge, {
             info
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      detail ? /* @__PURE__ */ jsxDEV6(Box4, {
+      detail ? /* @__PURE__ */ jsxDEV7(Box4, {
         marginLeft: 2,
-        children: /* @__PURE__ */ jsxDEV6(Text6, {
+        children: /* @__PURE__ */ jsxDEV7(Text7, {
           dimColor: true,
           children: detail
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      outputLines.map((line, i) => /* @__PURE__ */ jsxDEV6(Box4, {
+      outputLines.map((line, i) => /* @__PURE__ */ jsxDEV7(Box4, {
         marginLeft: 2,
-        children: /* @__PURE__ */ jsxDEV6(Text6, {
+        children: /* @__PURE__ */ jsxDEV7(Text7, {
           dimColor: true,
           children: [
             i === 0 ? "└ " : "  ",
@@ -14290,9 +14453,9 @@ var ToolCall = ({
           ]
         }, undefined, true, undefined, this)
       }, `out-${i}`, false, undefined, this)),
-      errorLines.map((line, i) => /* @__PURE__ */ jsxDEV6(Box4, {
+      errorLines.map((line, i) => /* @__PURE__ */ jsxDEV7(Box4, {
         marginLeft: 2,
-        children: /* @__PURE__ */ jsxDEV6(Text6, {
+        children: /* @__PURE__ */ jsxDEV7(Text7, {
           color: theme.error,
           children: [
             i === 0 ? "└ " : "  ",
@@ -14306,16 +14469,18 @@ var ToolCall = ({
 
 // src/tui/App.tsx
 init_theme();
-import { jsxDEV as jsxDEV7 } from "react/jsx-dev-runtime";
+init_UsageFooter();
+import { jsxDEV as jsxDEV8 } from "react/jsx-dev-runtime";
 var ROLE_PREFIX = {
   user: "\uD83D\uDC64 You",
   assistant: "\uD83E\uDD16 Agent",
-  tool: "\uD83D\uDD27 Tool"
+  tool: "\uD83D\uDD27 Tool",
+  usage: ""
 };
 var RoleLabel = ({ role }) => {
   const theme = getTheme();
   const roleColor = role === "user" ? theme.user : role === "assistant" ? theme.assistant : theme.tool;
-  return /* @__PURE__ */ jsxDEV7(Text7, {
+  return /* @__PURE__ */ jsxDEV8(Text8, {
     bold: true,
     color: roleColor,
     children: ROLE_PREFIX[role]
@@ -14323,16 +14488,16 @@ var RoleLabel = ({ role }) => {
 };
 var HistoryEntry = ({ item }) => {
   if (item.role === "user") {
-    return /* @__PURE__ */ jsxDEV7(Box5, {
+    return /* @__PURE__ */ jsxDEV8(Box5, {
       flexDirection: "column",
       marginBottom: 1,
       children: [
-        /* @__PURE__ */ jsxDEV7(RoleLabel, {
+        /* @__PURE__ */ jsxDEV8(RoleLabel, {
           role: "user"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsxDEV7(Box5, {
+        /* @__PURE__ */ jsxDEV8(Box5, {
           marginLeft: 2,
-          children: /* @__PURE__ */ jsxDEV7(Text7, {
+          children: /* @__PURE__ */ jsxDEV8(Text8, {
             children: item.content
           }, undefined, false, undefined, this)
         }, undefined, false, undefined, this)
@@ -14341,20 +14506,20 @@ var HistoryEntry = ({ item }) => {
   }
   if (item.role === "tool") {
     if (item.tool) {
-      return /* @__PURE__ */ jsxDEV7(ToolCall, {
+      return /* @__PURE__ */ jsxDEV8(ToolCall, {
         info: item.tool
       }, undefined, false, undefined, this);
     }
-    return /* @__PURE__ */ jsxDEV7(Box5, {
+    return /* @__PURE__ */ jsxDEV8(Box5, {
       flexDirection: "column",
       marginBottom: 1,
       children: [
-        /* @__PURE__ */ jsxDEV7(RoleLabel, {
+        /* @__PURE__ */ jsxDEV8(RoleLabel, {
           role: "tool"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsxDEV7(Box5, {
+        /* @__PURE__ */ jsxDEV8(Box5, {
           marginLeft: 2,
-          children: /* @__PURE__ */ jsxDEV7(Text7, {
+          children: /* @__PURE__ */ jsxDEV8(Text8, {
             dimColor: true,
             children: item.content
           }, undefined, false, undefined, this)
@@ -14362,17 +14527,22 @@ var HistoryEntry = ({ item }) => {
       ]
     }, undefined, true, undefined, this);
   }
-  return /* @__PURE__ */ jsxDEV7(Box5, {
+  if (item.role === "usage") {
+    return /* @__PURE__ */ jsxDEV8(UsageFooter, {
+      usage: item.usage
+    }, undefined, false, undefined, this);
+  }
+  return /* @__PURE__ */ jsxDEV8(Box5, {
     flexDirection: "column",
     marginBottom: 1,
     children: [
-      item.continuation ? null : /* @__PURE__ */ jsxDEV7(RoleLabel, {
+      item.continuation ? null : /* @__PURE__ */ jsxDEV8(RoleLabel, {
         role: "assistant"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV7(Box5, {
+      /* @__PURE__ */ jsxDEV8(Box5, {
         marginLeft: 2,
         flexDirection: "column",
-        children: /* @__PURE__ */ jsxDEV7(Markdown, {
+        children: /* @__PURE__ */ jsxDEV8(Markdown, {
           text: item.content
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this)
@@ -14389,65 +14559,65 @@ var App = ({
   tokenCount
 }) => {
   const theme = getTheme();
-  return /* @__PURE__ */ jsxDEV7(Box5, {
+  return /* @__PURE__ */ jsxDEV8(Box5, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsxDEV7(Box5, {
+      /* @__PURE__ */ jsxDEV8(Box5, {
         borderStyle: "round",
         borderColor: theme.primary,
         paddingX: 1,
         marginBottom: 1,
         children: [
-          /* @__PURE__ */ jsxDEV7(Text7, {
+          /* @__PURE__ */ jsxDEV8(Text8, {
             bold: true,
             color: theme.primary,
             children: "\uD83D\uDE80 Roy Agent"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV7(Text7, {
+          /* @__PURE__ */ jsxDEV8(Text8, {
             dimColor: true,
             children: " — interactive TUI"
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV7(Static2, {
+      /* @__PURE__ */ jsxDEV8(Static2, {
         items: history,
-        children: (item, index) => /* @__PURE__ */ jsxDEV7(HistoryEntry, {
+        children: (item, index) => /* @__PURE__ */ jsxDEV8(HistoryEntry, {
           item
         }, item.id ?? `${item.role}:${index}`, false, undefined, this)
       }, undefined, false, undefined, this),
-      status === "thinking" ? /* @__PURE__ */ jsxDEV7(Box5, {
+      status === "thinking" ? /* @__PURE__ */ jsxDEV8(Box5, {
         marginBottom: 1,
-        children: /* @__PURE__ */ jsxDEV7(Spinner, {
+        children: /* @__PURE__ */ jsxDEV8(Spinner, {
           label: "Agent is thinking..."
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      status === "streaming" && streamingText ? /* @__PURE__ */ jsxDEV7(Box5, {
+      status === "streaming" && streamingText ? /* @__PURE__ */ jsxDEV8(Box5, {
         flexDirection: "column",
         marginBottom: 1,
         children: [
-          /* @__PURE__ */ jsxDEV7(RoleLabel, {
+          /* @__PURE__ */ jsxDEV8(RoleLabel, {
             role: "assistant"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV7(Box5, {
+          /* @__PURE__ */ jsxDEV8(Box5, {
             marginLeft: 2,
-            children: /* @__PURE__ */ jsxDEV7(Markdown, {
+            children: /* @__PURE__ */ jsxDEV8(Markdown, {
               text: streamingText
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this)
         ]
-      }, undefined, true, undefined, this) : status === "streaming" ? /* @__PURE__ */ jsxDEV7(Box5, {
+      }, undefined, true, undefined, this) : status === "streaming" ? /* @__PURE__ */ jsxDEV8(Box5, {
         marginBottom: 1,
-        children: /* @__PURE__ */ jsxDEV7(Spinner, {
+        children: /* @__PURE__ */ jsxDEV8(Spinner, {
           label: "Generating response..."
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      liveTools && liveTools.length > 0 ? /* @__PURE__ */ jsxDEV7(Box5, {
+      liveTools && liveTools.length > 0 ? /* @__PURE__ */ jsxDEV8(Box5, {
         flexDirection: "column",
-        children: liveTools.map((tool, i) => /* @__PURE__ */ jsxDEV7(ToolCall, {
+        children: liveTools.map((tool, i) => /* @__PURE__ */ jsxDEV8(ToolCall, {
           info: tool
         }, `live-tool-${i}`, false, undefined, this))
       }, undefined, false, undefined, this) : null,
-      /* @__PURE__ */ jsxDEV7(StatusBar, {
+      /* @__PURE__ */ jsxDEV8(StatusBar, {
         model,
         workdir,
         tokenCount
@@ -14462,7 +14632,7 @@ init_StatusBar();
 
 // src/tui/TextInput.tsx
 import { useEffect as useEffect4, useReducer, useState as useState4 } from "react";
-import { Box as Box6, Text as Text8, useInput as useInput3 } from "ink";
+import { Box as Box6, Text as Text9, useInput as useInput3 } from "ink";
 
 // src/tui/text-input-editing.ts
 function clampCursor(value, cursor) {
@@ -14533,7 +14703,7 @@ function editReducer(state, action) {
 }
 
 // src/tui/TextInput.tsx
-import { jsxDEV as jsxDEV8, Fragment } from "react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV9, Fragment } from "react/jsx-dev-runtime";
 var TextInput = ({
   label,
   prefix,
@@ -14611,9 +14781,9 @@ var TextInput = ({
     }
   });
   const { before, after } = splitAtCursor({ value, cursor });
-  return /* @__PURE__ */ jsxDEV8(Box6, {
+  return /* @__PURE__ */ jsxDEV9(Box6, {
     children: [
-      /* @__PURE__ */ jsxDEV8(Text8, {
+      /* @__PURE__ */ jsxDEV9(Text9, {
         bold: true,
         color: "green",
         children: [
@@ -14621,42 +14791,42 @@ var TextInput = ({
           " "
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV8(Text8, {
+      /* @__PURE__ */ jsxDEV9(Text9, {
         bold: true,
         children: [
           label,
           ": "
         ]
       }, undefined, true, undefined, this),
-      value ? /* @__PURE__ */ jsxDEV8(Fragment, {
+      value ? /* @__PURE__ */ jsxDEV9(Fragment, {
         children: [
-          /* @__PURE__ */ jsxDEV8(Text8, {
+          /* @__PURE__ */ jsxDEV9(Text9, {
             children: before
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV8(Text8, {
+          /* @__PURE__ */ jsxDEV9(Text9, {
             inverse: true,
             children: "▌"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV8(Text8, {
+          /* @__PURE__ */ jsxDEV9(Text9, {
             children: after
           }, undefined, false, undefined, this)
         ]
-      }, undefined, true, undefined, this) : placeholder ? /* @__PURE__ */ jsxDEV8(Fragment, {
+      }, undefined, true, undefined, this) : placeholder ? /* @__PURE__ */ jsxDEV9(Fragment, {
         children: [
-          /* @__PURE__ */ jsxDEV8(Text8, {
+          /* @__PURE__ */ jsxDEV9(Text9, {
             inverse: true,
             children: "▌"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV8(Text8, {
+          /* @__PURE__ */ jsxDEV9(Text9, {
             dimColor: true,
             children: placeholder
           }, undefined, false, undefined, this)
         ]
-      }, undefined, true, undefined, this) : /* @__PURE__ */ jsxDEV8(Text8, {
+      }, undefined, true, undefined, this) : /* @__PURE__ */ jsxDEV9(Text9, {
         inverse: true,
         children: "▌"
       }, undefined, false, undefined, this),
-      historyIndex !== -1 ? /* @__PURE__ */ jsxDEV8(Text8, {
+      historyIndex !== -1 ? /* @__PURE__ */ jsxDEV9(Text9, {
         dimColor: true,
         children: "  (history)"
       }, undefined, false, undefined, this) : null
@@ -14860,7 +15030,7 @@ function dispatchSlashCommand(raw, ctx) {
 }
 
 // src/RunTui.tsx
-import { jsxDEV as jsxDEV9 } from "react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV10 } from "react/jsx-dev-runtime";
 var RunScreen = ({
   handleQuery,
   streamHandleQuery,
@@ -14898,7 +15068,7 @@ var RunScreen = ({
     onExit?.();
     exit();
   }, [onExit, exit]);
-  const executeQuery = useCallback4(async (message) => {
+  const executeQuery = useCallback4(async (message, envEvent) => {
     isProcessingRef.current += 1;
     stream.start();
     let assistantBlocks = 0;
@@ -14911,6 +15081,18 @@ var RunScreen = ({
         { role: "assistant", content, id, continuation }
       ]);
     };
+    let pendingUsage;
+    const attachUsageToTurn = (usage) => {
+      pendingUsage = usage;
+    };
+    const flushUsageFooter = () => {
+      const usage = pendingUsage;
+      pendingUsage = undefined;
+      if (!usage)
+        return;
+      const id = `h${++historyIdRef.current}`;
+      setHistory((h) => [...h, { role: "usage", content: "", id, usage }]);
+    };
     const commitTool = (info) => {
       const id = `h${++historyIdRef.current}`;
       setHistory((h) => [
@@ -14987,17 +15169,18 @@ var RunScreen = ({
           const stable = stream.drainStable();
           if (stable)
             pushAssistant(stable);
-        }, showToolCalls ? handleToolEvent : undefined);
+        }, showToolCalls ? handleToolEvent : undefined, attachUsageToTurn, envEvent);
         const tail = stream.finish(responseText);
         if (tail.trim())
           pushAssistant(tail);
       } else {
-        responseText = await handleQuery(message);
+        responseText = await handleQuery(message, envEvent);
         stream.finish();
         const rendered = markdownEnabled2 ? renderMarkdown(responseText, { width }) : responseText;
         pushAssistant(truncateForTerminal(rendered, maxLines));
       }
       settleLiveTools("completed");
+      flushUsageFooter();
       assistantTurnCountRef.current += 1;
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
@@ -15029,14 +15212,14 @@ var RunScreen = ({
   useEffect5(() => {
     if (!onRegisterHandlers)
       return;
-    const handleNotification = async (message, _envEvent) => {
+    const handleNotification = async (message, envEvent) => {
       const notifId = `h${++historyIdRef.current}`;
       setHistory((h) => [
         ...h,
         { role: "tool", content: `\uD83D\uDCE2 ${message}`, id: notifId }
       ]);
       if (executeQueryRef.current) {
-        await executeQueryRef.current(message);
+        await executeQueryRef.current(message, envEvent);
       }
     };
     const isIdle = () => {
@@ -15130,10 +15313,10 @@ var RunScreen = ({
   const handleCancel = useCallback4(() => {
     doExit();
   }, [doExit]);
-  return /* @__PURE__ */ jsxDEV9(Box7, {
+  return /* @__PURE__ */ jsxDEV10(Box7, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsxDEV9(App, {
+      /* @__PURE__ */ jsxDEV10(App, {
         history,
         status,
         model,
@@ -15141,9 +15324,9 @@ var RunScreen = ({
         streamingText: stream.streamingText,
         liveTools
       }, undefined, false, undefined, this),
-      status === "idle" ? /* @__PURE__ */ jsxDEV9(Box7, {
+      status === "idle" ? /* @__PURE__ */ jsxDEV10(Box7, {
         marginTop: 1,
-        children: /* @__PURE__ */ jsxDEV9(TextInput, {
+        children: /* @__PURE__ */ jsxDEV10(TextInput, {
           label: "You",
           prefix: "\uD83D\uDC64",
           placeholder: 'Type a message, "/help", or "exit"',
@@ -15152,9 +15335,9 @@ var RunScreen = ({
           history: userHistory
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      errorMessage ? /* @__PURE__ */ jsxDEV9(Box7, {
+      errorMessage ? /* @__PURE__ */ jsxDEV10(Box7, {
         marginTop: 1,
-        children: /* @__PURE__ */ jsxDEV9(Text9, {
+        children: /* @__PURE__ */ jsxDEV10(Text10, {
           color: "red",
           children: [
             "⚠ ",
@@ -15183,36 +15366,36 @@ async function shutdownRunSteps(deps) {
     envService,
     shouldDisposeEnvService,
     output,
-    logger: logger6
+    logger: logger7
   } = deps;
   try {
     stopEventHandler();
   } catch (err) {
-    logger6?.warn?.(`[Shutdown] EventHandler.stop failed: ${err}`);
+    logger7?.warn?.(`[Shutdown] EventHandler.stop failed: ${err}`);
   }
   try {
     stopTaskEventHandler();
   } catch (err) {
-    logger6?.warn?.(`[Shutdown] TaskEventHandler.stop failed: ${err}`);
+    logger7?.warn?.(`[Shutdown] TaskEventHandler.stop failed: ${err}`);
   }
   if (lspManagerDispose) {
     try {
       await lspManagerDispose();
     } catch (err) {
-      logger6?.warn?.(`[Shutdown] LSP Manager dispose failed: ${err}`);
+      logger7?.warn?.(`[Shutdown] LSP Manager dispose failed: ${err}`);
     }
   }
   if (pluginAdapterDispose) {
     try {
       await pluginAdapterDispose();
     } catch (err) {
-      logger6?.warn?.(`[Shutdown] PluginAdapter dispose failed: ${err}`);
+      logger7?.warn?.(`[Shutdown] PluginAdapter dispose failed: ${err}`);
     }
   }
   try {
     queryExecutor.dispose();
   } catch (err) {
-    logger6?.warn?.(`[Shutdown] QueryExecutor.dispose failed: ${err}`);
+    logger7?.warn?.(`[Shutdown] QueryExecutor.dispose failed: ${err}`);
   }
   try {
     const eventSourceComponent = env.getComponent("event-source");
@@ -15221,7 +15404,7 @@ async function shutdownRunSteps(deps) {
       if (sources && sources.length > 0) {
         for (const source of sources) {
           const status = eventSourceComponent.getStatus?.(source.id);
-          logger6?.debug?.(`[Shutdown] 检查事件源: ${source.id}, 状态: ${status}`);
+          logger7?.debug?.(`[Shutdown] 检查事件源: ${source.id}, 状态: ${status}`);
           if (status !== "stopped" && status !== "created") {
             try {
               await eventSourceComponent.stopSource(source.id);
@@ -15234,20 +15417,20 @@ async function shutdownRunSteps(deps) {
       }
     }
   } catch (err) {
-    logger6?.warn?.(`[Shutdown] EventSource cleanup failed: ${err}`);
+    logger7?.warn?.(`[Shutdown] EventSource cleanup failed: ${err}`);
   }
   if (shouldDisposeEnvService) {
     try {
       await envService.dispose();
     } catch (err) {
-      logger6?.warn?.(`[Shutdown] envService.dispose failed: ${err}`);
+      logger7?.warn?.(`[Shutdown] envService.dispose failed: ${err}`);
     }
   }
   try {
     await TempFileManager3.getInstance().cleanupAll();
-    logger6?.debug?.("[Shutdown] TempFileManager cleaned up");
+    logger7?.debug?.("[Shutdown] TempFileManager cleaned up");
   } catch (err) {
-    logger6?.warn?.(`[Shutdown] TempFileManager cleanup failed: ${err}`);
+    logger7?.warn?.(`[Shutdown] TempFileManager cleanup failed: ${err}`);
   }
 }
 
@@ -15317,11 +15500,12 @@ async function loadHandleQuery(options, hooks) {
   }
   const llmComponent = envService.getLLM();
   queryExecutor.initStreamOutput(llmComponent ?? null);
-  const handleQuery = async (message) => {
+  const handleQuery = async (message, envEvent) => {
     const mergedContext = {
       ...agentContext,
       model: options.model,
       eventSourceSystemPrompt,
+      ...envEvent ? { envEvent } : {},
       metadata: {
         ...agentContext?.metadata ?? {},
         defaultAgentName: options.defaultAgentName
@@ -15366,7 +15550,7 @@ async function loadHandleQuery(options, hooks) {
   };
 }
 function createStreamHandleQuery(queryExecutor, sessionId, options, agentContext, eventSourceSystemPrompt) {
-  return async (message, onChunk, onTool) => {
+  return async (message, onChunk, onTool, onUsage, envEvent) => {
     queryExecutor.setChunkCallback((event) => {
       switch (event.type) {
         case "llm.text":
@@ -15399,6 +15583,11 @@ function createStreamHandleQuery(queryExecutor, sessionId, options, agentContext
             error: event.toolError
           });
           break;
+        case "llm.completed":
+          if (event.usage) {
+            onUsage?.(event.usage);
+          }
+          break;
         default:
           break;
       }
@@ -15407,6 +15596,7 @@ function createStreamHandleQuery(queryExecutor, sessionId, options, agentContext
       ...agentContext,
       model: options.model,
       eventSourceSystemPrompt,
+      ...envEvent ? { envEvent } : {},
       metadata: {
         ...agentContext?.metadata ?? {},
         defaultAgentName: options.defaultAgentName
@@ -15581,7 +15771,7 @@ import { render as render2 } from "ink";
 import { useEffect as useEffect6, useRef as useRef4, useState as useState7 } from "react";
 import { Box as Box8, useApp as useApp3 } from "ink";
 init_markdown();
-import { jsxDEV as jsxDEV10 } from "react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV11 } from "react/jsx-dev-runtime";
 var ChatScreen = ({
   handleQuery,
   streamHandleQuery,
@@ -15637,9 +15827,9 @@ var ChatScreen = ({
       cancelled = true;
     };
   }, [handleQuery, streamHandleQuery, message, maxLines, markdownEnabled2, exit, width, stream]);
-  return /* @__PURE__ */ jsxDEV10(Box8, {
+  return /* @__PURE__ */ jsxDEV11(Box8, {
     flexDirection: "column",
-    children: /* @__PURE__ */ jsxDEV10(App, {
+    children: /* @__PURE__ */ jsxDEV11(App, {
       history,
       status: stream.status,
       model,