@ai-setting/roy-agent-cli 1.7.42 → 1.7.45

package/dist/bin/roy-agent.js

@@ -609,6 +609,7 @@ ${COLORS.system("[已中断]")}
       this.emitChunk({
         type: "tool.result",
         toolName: name,
+        toolId: payload.id,
         toolResult: payload.result?.output
       });
     }
@@ -1559,69 +1560,94 @@ var init_theme = __esm(() => {
 });
 
 // src/tui/StatusBar.tsx
+import React2 from "react";
 import { Box as Box2, Text as Text3 } from "ink";
 import { jsxDEV as jsxDEV3 } from "react/jsx-dev-runtime";
-var StatusBar = ({
+function detectColumns() {
+  const c = process.stdout?.columns;
+  if (typeof c === "number" && c > 0)
+    return c;
+  return 80;
+}
+function shortenWorkdir(input) {
+  if (!input)
+    return input;
+  if (input.length <= WORKDIR_TAIL_MAX)
+    return input;
+  const tail = input.slice(input.length - WORKDIR_TAIL_MAX);
+  return `…/${tail}`;
+}
+function clipModel(input, max = MODEL_NARROW_MAX) {
+  if (!input)
+    return input;
+  if (input.length <= max)
+    return input;
+  return input.slice(0, max - 1) + "…";
+}
+function planSegments(props, columns) {
+  const segs = [];
+  const tier = columns >= 80 ? 4 : columns >= 60 ? 3 : columns >= 40 ? 2 : 1;
+  if (props.model) {
+    const text = tier === 1 ? clipModel(props.model) ?? "" : props.model;
+    segs.push({ text, color: "primary", dimPrefix: "\uD83E\uDD16 " });
+  }
+  if (tier >= 4 || tier === 3) {
+    if (props.workdir) {
+      segs.push({
+        text: shortenWorkdir(props.workdir) ?? "",
+        color: "muted",
+        dimPrefix: "\uD83D\uDCC1 "
+      });
+    }
+  }
+  if (tier >= 4 || tier === 3 || tier === 2) {
+    if (typeof props.tokenCount === "number") {
+      segs.push({ text: `n=${props.tokenCount}`, color: "accent", dimPrefix: "" });
+    }
+  }
+  if (tier >= 4) {
+    segs.push({ text: "Ctrl+C to exit", color: "muted" });
+  }
+  return segs;
+}
+var WORKDIR_TAIL_MAX = 30, MODEL_NARROW_MAX = 24, StatusBar = ({
   model,
   workdir,
-  tokenCount
+  tokenCount,
+  columns
 }) => {
   const theme = getTheme();
+  const cols = typeof columns === "number" ? columns : detectColumns();
+  const segs = planSegments({ model, workdir, tokenCount }, cols);
+  if (segs.length === 0) {
+    return /* @__PURE__ */ jsxDEV3(Box2, {
+      paddingX: 1
+    }, undefined, false, undefined, this);
+  }
   return /* @__PURE__ */ jsxDEV3(Box2, {
-    borderStyle: "single",
-    borderColor: "gray",
     paddingX: 1,
-    justifyContent: "space-between",
-    children: [
-      /* @__PURE__ */ jsxDEV3(Box2, {
-        children: model ? /* @__PURE__ */ jsxDEV3(Text3, {
-          children: [
-            /* @__PURE__ */ jsxDEV3(Text3, {
-              dimColor: true,
-              children: "\uD83E\uDD16 "
-            }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV3(Text3, {
-              color: theme.primary,
-              children: model
-            }, undefined, false, undefined, this)
-          ]
-        }, undefined, true, undefined, this) : null
-      }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV3(Box2, {
-        children: workdir ? /* @__PURE__ */ jsxDEV3(Text3, {
-          children: [
-            /* @__PURE__ */ jsxDEV3(Text3, {
-              dimColor: true,
-              children: "\uD83D\uDCC1 "
-            }, undefined, false, undefined, this),
-            /* @__PURE__ */ jsxDEV3(Text3, {
-              children: workdir
-            }, undefined, false, undefined, this)
-          ]
-        }, undefined, true, undefined, this) : null
-      }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV3(Box2, {
+    flexDirection: "row",
+    children: segs.map((seg, i) => {
+      const color = seg.color === "primary" ? theme.primary : seg.color === "accent" ? theme.accent : theme.muted;
+      const isFirst = i === 0;
+      return /* @__PURE__ */ jsxDEV3(React2.Fragment, {
         children: [
-          typeof tokenCount === "number" ? /* @__PURE__ */ jsxDEV3(Text3, {
-            children: [
-              /* @__PURE__ */ jsxDEV3(Text3, {
-                dimColor: true,
-                children: "tokens: "
-              }, undefined, false, undefined, this),
-              /* @__PURE__ */ jsxDEV3(Text3, {
-                color: theme.accent,
-                children: tokenCount
-              }, undefined, false, undefined, this)
-            ]
-          }, undefined, true, undefined, this) : null,
-          /* @__PURE__ */ jsxDEV3(Text3, {
+          !isFirst ? /* @__PURE__ */ jsxDEV3(Text3, {
             dimColor: true,
-            children: "  Ctrl+C to exit"
+            children: " · "
+          }, undefined, false, undefined, this) : null,
+          seg.dimPrefix ? /* @__PURE__ */ jsxDEV3(Text3, {
+            dimColor: true,
+            children: seg.dimPrefix
+          }, undefined, false, undefined, this) : null,
+          /* @__PURE__ */ jsxDEV3(Text3, {
+            color,
+            children: seg.text
           }, undefined, false, undefined, this)
         ]
-      }, undefined, true, undefined, this)
-    ]
-  }, undefined, true, undefined, this);
+      }, i, true, undefined, this);
+    })
+  }, undefined, false, undefined, this);
 };
 var init_StatusBar = __esm(() => {
   init_theme();
@@ -1676,7 +1702,7 @@ __export(exports_repl_ink, {
   REPLInk: () => REPLInk,
   MultilineInput: () => MultilineInput
 });
-import * as React2 from "react";
+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";
@@ -1701,7 +1727,7 @@ function REPLInk(props) {
     onEscape
   } = props;
   const { exit: appExit } = useApp();
-  const [messages, setMessages] = React2.useState(() => [
+  const [messages, setMessages] = React3.useState(() => [
     withMessageId({
       role: "system",
       kind: "welcome",
@@ -1709,47 +1735,47 @@ function REPLInk(props) {
     }),
     ...initialMessages.map(withMessageId)
   ]);
-  const [mode, setMode] = React2.useState(initialMode);
-  const [statusBarCtx, setStatusBarCtxState] = React2.useState({
+  const [mode, setMode] = React3.useState(initialMode);
+  const [statusBarCtx, setStatusBarCtxState] = React3.useState({
     mode: initialMode,
     cwd: initialStatusBarCtx.cwd ?? initialContext.cwd,
     gitBranch: initialStatusBarCtx.gitBranch,
     model: initialStatusBarCtx.model ?? initialContext.model
   });
-  const [inputValue, setInputValue] = React2.useState("");
-  const [popupIndex, setPopupIndex] = React2.useState(0);
-  const filteredCmds = React2.useMemo(() => {
+  const [inputValue, setInputValue] = React3.useState("");
+  const [popupIndex, setPopupIndex] = React3.useState(0);
+  const filteredCmds = React3.useMemo(() => {
     if (!/^\/\S*$/.test(inputValue))
       return [];
     return filterCommands(inputValue);
   }, [inputValue]);
   const showPopup = filteredCmds.length > 0;
-  React2.useEffect(() => {
+  React3.useEffect(() => {
     setPopupIndex(0);
   }, [filteredCmds]);
   const safePopupIndex = clampSelectedIndex(popupIndex, filteredCmds.length);
-  const handlePopupSelect = React2.useCallback((cmd) => {
+  const handlePopupSelect = React3.useCallback((cmd) => {
     multilineInputRef.current?.setBuffer(cmd.cmd + " ");
     setInputValue(cmd.cmd + " ");
   }, []);
-  const handlePopupClose = React2.useCallback(() => {
+  const handlePopupClose = React3.useCallback(() => {
     const current = multilineInputRef.current?.getBuffer() ?? "";
     const stripped = current.replace(/^\/+/, "");
     multilineInputRef.current?.setBuffer(stripped);
     setInputValue(stripped);
   }, []);
-  const handlePopupIndexChange = React2.useCallback((idx) => {
+  const handlePopupIndexChange = React3.useCallback((idx) => {
     setPopupIndex(idx);
   }, []);
-  const streamingIndexRef = React2.useRef(-1);
-  const lastFlushTsRef = React2.useRef(0);
+  const streamingIndexRef = React3.useRef(-1);
+  const lastFlushTsRef = React3.useRef(0);
   const STALE_STREAM_THRESHOLD_MS = 1000;
-  const multilineInputRef = React2.useRef(null);
-  const lastEscapeTsRef = React2.useRef(0);
-  const pendingDeltaRef = React2.useRef("");
-  const throttleTimerRef = React2.useRef(null);
-  const isFirstDeltaInStreamRef = React2.useRef(true);
-  const flushStreamingDelta = React2.useCallback(() => {
+  const multilineInputRef = React3.useRef(null);
+  const lastEscapeTsRef = React3.useRef(0);
+  const pendingDeltaRef = React3.useRef("");
+  const throttleTimerRef = React3.useRef(null);
+  const isFirstDeltaInStreamRef = React3.useRef(true);
+  const flushStreamingDelta = React3.useCallback(() => {
     const delta = pendingDeltaRef.current;
     pendingDeltaRef.current = "";
     throttleTimerRef.current = null;
@@ -1778,7 +1804,7 @@ function REPLInk(props) {
     });
     lastFlushTsRef.current = Date.now();
   }, []);
-  React2.useEffect(() => {
+  React3.useEffect(() => {
     return () => {
       if (throttleTimerRef.current !== null) {
         clearTimeout(throttleTimerRef.current);
@@ -1786,8 +1812,8 @@ function REPLInk(props) {
       }
     };
   }, []);
-  const apiRef = React2.useRef(null);
-  React2.useEffect(() => {
+  const apiRef = React3.useRef(null);
+  React3.useEffect(() => {
     const api = {
       appendMessage: (msg) => {
         setMessages((msgs) => [...msgs, withMessageId(msg)]);
@@ -1863,7 +1889,7 @@ function REPLInk(props) {
     apiRef.current = api;
     onReady?.(api);
   }, [appExit, onCommand, onReady]);
-  const handleEscapeCascade = React2.useCallback(() => {
+  const handleEscapeCascade = React3.useCallback(() => {
     const now = Date.now();
     if (now - lastEscapeTsRef.current < 100) {
       return;
@@ -1907,7 +1933,7 @@ function REPLInk(props) {
       }
     }
   });
-  const handleSubmit = React2.useCallback(async (value) => {
+  const handleSubmit = React3.useCallback(async (value) => {
     if (!value || value.trim() === "") {
       return;
     }
@@ -1936,7 +1962,7 @@ function REPLInk(props) {
       ]);
     }
   }, [onCommand, onSubmit]);
-  const staticItems = React2.useMemo(() => {
+  const staticItems = React3.useMemo(() => {
     if (messages.length <= 1)
       return [];
     return messages.slice(0, -1);
@@ -1944,8 +1970,8 @@ function REPLInk(props) {
   const tailMsg = messages.length > 0 ? messages[messages.length - 1] : null;
   const terminalWidth = process.stdout.columns ?? 80;
   const terminalHeight = process.stdout.rows ?? 24;
-  const dynamicTailBounds = React2.useMemo(() => computeDynamicTailBounds(terminalHeight, 12, showPopup), [terminalHeight, showPopup]);
-  const staticTailBounds = React2.useMemo(() => computeDynamicTailBounds(terminalHeight, 12, showPopup), [terminalHeight, showPopup]);
+  const dynamicTailBounds = React3.useMemo(() => computeDynamicTailBounds(terminalHeight, 12, showPopup), [terminalHeight, showPopup]);
+  const staticTailBounds = React3.useMemo(() => computeDynamicTailBounds(terminalHeight, 12, showPopup), [terminalHeight, showPopup]);
   const tailKey = messages.length > 0 ? tailMsg?.id ?? `tail-${messages.length - 1}` : "tail-empty";
   const statusBarModel = shortModel(statusBarCtx.model);
   const statusBarWorkdir = statusBarCtx.cwd;
@@ -2012,7 +2038,7 @@ function shortModel(model) {
 }
 async function renderInkREPL(props) {
   const ink = await import("ink");
-  const { waitUntilExit } = ink.render(React2.createElement(REPLInk, props));
+  const { waitUntilExit } = ink.render(React3.createElement(REPLInk, props));
   await waitUntilExit();
 }
 var MarkdownBounded, inkLogger, _msgIdCounter = 0, MultilineInput, MessageView;
@@ -2024,7 +2050,7 @@ var init_repl_ink = __esm(() => {
   init_Markdown();
   init_StatusBar();
   init_dynamic_tail();
-  MarkdownBounded = React2.memo(({ text, bounds, width }) => {
+  MarkdownBounded = React3.memo(({ text, bounds, width }) => {
     const out = renderBoundedAssistant(text, bounds, width);
     if (!out) {
       return null;
@@ -2034,16 +2060,16 @@ var init_repl_ink = __esm(() => {
     }, undefined, false, undefined, this);
   });
   inkLogger = createLogger5("repl-ink");
-  MultilineInput = React2.memo(React2.forwardRef(function MultilineInput2(props, ref) {
+  MultilineInput = React3.memo(React3.forwardRef(function MultilineInput2(props, ref) {
     const { onSubmit, placeholder, popupActive, onChange, onEscape } = props;
-    const [buffer, setBuffer] = React2.useState("");
-    const [cursor, setCursor] = React2.useState(0);
-    React2.useEffect(() => {
+    const [buffer, setBuffer] = React3.useState("");
+    const [cursor, setCursor] = React3.useState(0);
+    React3.useEffect(() => {
       if (popupActive || buffer.startsWith("/")) {
         onChange?.(buffer);
       }
     }, [buffer, onChange, popupActive]);
-    React2.useImperativeHandle(ref, () => ({
+    React3.useImperativeHandle(ref, () => ({
       clearBuffer: () => {
         setBuffer("");
         setCursor(0);
@@ -2281,7 +2307,7 @@ var init_repl_ink = __esm(() => {
       })
     }, undefined, false, undefined, this);
   }));
-  MessageView = React2.memo(function MessageView2({
+  MessageView = React3.memo(function MessageView2({
     msg,
     terminalWidth,
     tailBounds
@@ -9461,7 +9487,7 @@ class CliQuietModeService {
 // package.json
 var package_default = {
   name: "@ai-setting/roy-agent-cli",
-  version: "1.7.42",
+  version: "1.7.45",
   type: "module",
   description: "CLI for roy-agent - Non-interactive command execution",
   main: "./dist/index.js",
@@ -13591,7 +13617,7 @@ ${chalk7.bold("╰")}${chalk7.dim("─".repeat(49))}${chalk7.bold("╯")}
 }
 function createInteractiveCommand(externalEnvService) {
   return {
-    command: "interactive",
+    command: "run",
     aliases: ["i", "repl"],
     describe: "交互式模式 - 多轮对话交互",
     builder: (yargs) => yargs.option("session", {
@@ -13676,7 +13702,7 @@ function createInteractiveCommand(externalEnvService) {
             configPath: args.config,
             plugins: [...componentPluginNames, ...coderPluginNames],
             loadPlugins: true,
-            commandName: "interactive"
+            commandName: "run"
           });
         }
         const env = envService.getEnvironment();
@@ -13983,16 +14009,16 @@ function createInteractiveCommand(externalEnvService) {
 var InteractiveCommand = createInteractiveCommand();
 
 // src/commands/run.ts
-import React6 from "react";
+import React7 from "react";
 import { render } from "ink";
 
 // src/RunTui.tsx
-import { useState as useState6, useCallback as useCallback4, useRef as useRef2, useEffect as useEffect5 } from "react";
-import { Box as Box6, Text as Text8, useApp as useApp2 } from "ink";
+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";
 
 // src/tui/App.tsx
 init_Markdown();
-import { Box as Box4, Static as Static2, Text as Text6 } from "ink";
+import { Box as Box5, Static as Static2, Text as Text7 } from "ink";
 
 // src/tui/Spinner.tsx
 init_theme();
@@ -14029,8 +14055,262 @@ var Spinner = ({
 
 // src/tui/App.tsx
 init_StatusBar();
+
+// src/tui/ToolCall.tsx
+import { Box as Box4, Text as Text6 } from "ink";
 init_theme();
+
+// src/tui/tool-call.ts
+var TOOL_META = {
+  bash: { icon: "❯", label: "Bash", argKeys: ["command", "cmd"] },
+  shell: { icon: "❯", label: "Bash", argKeys: ["command", "cmd"] },
+  echo: { icon: "\uD83D\uDCAC", label: "Echo", argKeys: ["message", "text"] },
+  read_file: {
+    icon: "\uD83D\uDCD6",
+    label: "Read",
+    argKeys: ["file_path", "path", "filePath", "filename"]
+  },
+  write_file: {
+    icon: "\uD83D\uDCDD",
+    label: "Write",
+    argKeys: ["file_path", "path", "filePath", "filename"]
+  },
+  edit_file: {
+    icon: "✏️",
+    label: "Edit",
+    argKeys: ["file_path", "path", "filePath", "filename"]
+  },
+  glob: { icon: "\uD83D\uDD0D", label: "Glob", argKeys: ["pattern"] },
+  grep: { icon: "\uD83D\uDD0E", label: "Grep", argKeys: ["pattern", "query"] },
+  query_background_process: {
+    icon: "\uD83D\uDCE1",
+    label: "Background Process",
+    argKeys: ["id", "process_id"]
+  },
+  understand_image: {
+    icon: "\uD83D\uDDBC️",
+    label: "Understand Image",
+    argKeys: ["image_path", "path", "url"]
+  },
+  delegate_task: {
+    icon: "\uD83E\uDD16",
+    label: "Task",
+    argKeys: ["description", "prompt"]
+  },
+  stop_task: { icon: "\uD83D\uDED1", label: "Stop Task", argKeys: ["task_id", "id"] },
+  task_search: { icon: "\uD83D\uDD0E", label: "Task Search", argKeys: ["query"] },
+  ask_user: { icon: "❓", label: "Ask User", argKeys: ["question"] },
+  workflow_run: {
+    icon: "\uD83D\uDD00",
+    label: "Run Workflow",
+    argKeys: ["workflow", "name", "path"]
+  },
+  web_search: { icon: "\uD83C\uDF10", label: "Web Search", argKeys: ["query"] },
+  webfetch: { icon: "\uD83C\uDF10", label: "Fetch", argKeys: ["url"] },
+  fetch: { icon: "\uD83C\uDF10", label: "Fetch", argKeys: ["url"] },
+  skill: { icon: "\uD83C\uDFAF", label: "Skill", argKeys: ["name"] }
+};
+var TOOL_ALIASES = {
+  read: "read_file",
+  write: "write_file",
+  edit: "edit_file",
+  search: "grep",
+  task: "delegate_task",
+  run_terminal_cmd: "bash",
+  terminal: "bash"
+};
+function humanizeToolName(name) {
+  if (!name)
+    return "Tool";
+  const spaced = name.replace(/([a-z0-9])([A-Z])/g, "$1 $2").replace(/[_-]+/g, " ").trim();
+  return spaced.split(/\s+/).map((w) => w.charAt(0).toUpperCase() + w.slice(1)).join(" ");
+}
+function firstLine(value, max = 120) {
+  const line = value.split(/\r?\n/)[0]?.trim() ?? "";
+  return line.length > max ? `${line.slice(0, max - 1)}…` : line;
+}
+function summarizeArgs(args) {
+  for (const value of Object.values(args)) {
+    if (typeof value === "string" && value.trim())
+      return firstLine(value);
+    if (typeof value === "number" || typeof value === "boolean") {
+      return String(value);
+    }
+    if (Array.isArray(value) && value.length > 0) {
+      return firstLine(value.map((v) => String(v)).join(" "));
+    }
+  }
+  return "";
+}
+function describeToolCall(name, args) {
+  const meta = TOOL_META[name] ?? TOOL_META[TOOL_ALIASES[name] ?? ""];
+  const label = meta?.label ?? humanizeToolName(name);
+  const icon = meta?.icon ?? "⚙";
+  let detail = "";
+  if (args && Object.keys(args).length > 0) {
+    const keys = meta?.argKeys ?? [];
+    for (const key of keys) {
+      const value = args[key];
+      if (typeof value === "string" && value.trim()) {
+        detail = firstLine(value);
+        break;
+      }
+      if (value !== undefined && value !== null && typeof value !== "object") {
+        detail = String(value);
+        break;
+      }
+    }
+    if (!detail)
+      detail = summarizeArgs(args);
+  }
+  return { icon, label, detail };
+}
+function stringifyToolOutput(output) {
+  if (output === undefined || output === null)
+    return "";
+  if (typeof output === "string")
+    return output;
+  if (typeof output === "object") {
+    const obj = output;
+    for (const key of ["output", "text", "content", "message"]) {
+      if (typeof obj[key] === "string")
+        return obj[key];
+    }
+    try {
+      return JSON.stringify(output, null, 2);
+    } catch {
+      return String(output);
+    }
+  }
+  return String(output);
+}
+function formatToolOutput(output, options = {}) {
+  const { maxLines = 12, maxChars = 200 } = options;
+  const text = stringifyToolOutput(output).replace(/\r\n?/g, `
+`).replace(/\s+$/, "");
+  if (!text)
+    return "";
+  const lines = text.split(`
+`);
+  const shown = lines.slice(0, maxLines);
+  const hidden = lines.length - shown.length;
+  const body = shown.map((line) => firstLine(line, maxChars)).join(`
+`);
+  return hidden > 0 ? `${body}
+… (+${hidden} more lines)` : body;
+}
+function formatDuration(ms) {
+  if (!Number.isFinite(ms) || ms < 0)
+    return "";
+  if (ms < 1000)
+    return `${Math.round(ms)}ms`;
+  const seconds = ms / 1000;
+  if (seconds < 10)
+    return `${seconds.toFixed(1)}s`;
+  if (seconds < 60)
+    return `${Math.round(seconds)}s`;
+  const minutes = Math.floor(seconds / 60);
+  const rest = Math.round(seconds % 60);
+  return `${minutes}m${rest.toString().padStart(2, "0")}s`;
+}
+
+// src/tui/ToolCall.tsx
 import { jsxDEV as jsxDEV6 } from "react/jsx-dev-runtime";
+var StatusBadge = ({ info }) => {
+  const theme = getTheme();
+  if (info.status === "running") {
+    return /* @__PURE__ */ jsxDEV6(Spinner, {
+      label: "running"
+    }, undefined, false, undefined, this);
+  }
+  const duration = info.durationMs !== undefined ? ` ${formatDuration(info.durationMs)}` : "";
+  if (info.status === "error") {
+    return /* @__PURE__ */ jsxDEV6(Text6, {
+      color: theme.error,
+      children: [
+        "✗",
+        duration || " failed"
+      ]
+    }, undefined, true, undefined, this);
+  }
+  return /* @__PURE__ */ jsxDEV6(Text6, {
+    color: theme.success,
+    children: [
+      "✓",
+      duration
+    ]
+  }, undefined, true, undefined, this);
+};
+var ToolCall = ({
+  info,
+  showOutput = true
+}) => {
+  const theme = getTheme();
+  const { icon, label, detail } = describeToolCall(info.name, info.args);
+  const outputLines = showOutput && info.output ? info.output.split(`
+`) : [];
+  const errorLines = showOutput && info.error ? info.error.split(`
+`).slice(0, 12) : [];
+  return /* @__PURE__ */ jsxDEV6(Box4, {
+    flexDirection: "column",
+    marginBottom: 1,
+    children: [
+      /* @__PURE__ */ jsxDEV6(Box4, {
+        children: [
+          /* @__PURE__ */ jsxDEV6(Text6, {
+            color: theme.tool,
+            children: [
+              icon,
+              " "
+            ]
+          }, undefined, true, undefined, this),
+          /* @__PURE__ */ jsxDEV6(Text6, {
+            bold: true,
+            color: theme.tool,
+            children: label
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV6(Text6, {
+            children: " "
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV6(StatusBadge, {
+            info
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this),
+      detail ? /* @__PURE__ */ jsxDEV6(Box4, {
+        marginLeft: 2,
+        children: /* @__PURE__ */ jsxDEV6(Text6, {
+          dimColor: true,
+          children: detail
+        }, undefined, false, undefined, this)
+      }, undefined, false, undefined, this) : null,
+      outputLines.map((line, i) => /* @__PURE__ */ jsxDEV6(Box4, {
+        marginLeft: 2,
+        children: /* @__PURE__ */ jsxDEV6(Text6, {
+          dimColor: true,
+          children: [
+            i === 0 ? "└ " : "  ",
+            line
+          ]
+        }, undefined, true, undefined, this)
+      }, `out-${i}`, false, undefined, this)),
+      errorLines.map((line, i) => /* @__PURE__ */ jsxDEV6(Box4, {
+        marginLeft: 2,
+        children: /* @__PURE__ */ jsxDEV6(Text6, {
+          color: theme.error,
+          children: [
+            i === 0 ? "└ " : "  ",
+            line
+          ]
+        }, undefined, true, undefined, this)
+      }, `err-${i}`, false, undefined, this))
+    ]
+  }, undefined, true, undefined, this);
+};
+
+// src/tui/App.tsx
+init_theme();
+import { jsxDEV as jsxDEV7 } from "react/jsx-dev-runtime";
 var ROLE_PREFIX = {
   user: "\uD83D\uDC64 You",
   assistant: "\uD83E\uDD16 Agent",
@@ -14039,7 +14319,7 @@ var ROLE_PREFIX = {
 var RoleLabel = ({ role }) => {
   const theme = getTheme();
   const roleColor = role === "user" ? theme.user : role === "assistant" ? theme.assistant : theme.tool;
-  return /* @__PURE__ */ jsxDEV6(Text6, {
+  return /* @__PURE__ */ jsxDEV7(Text7, {
     bold: true,
     color: roleColor,
     children: ROLE_PREFIX[role]
@@ -14047,16 +14327,16 @@ var RoleLabel = ({ role }) => {
 };
 var HistoryEntry = ({ item }) => {
   if (item.role === "user") {
-    return /* @__PURE__ */ jsxDEV6(Box4, {
+    return /* @__PURE__ */ jsxDEV7(Box5, {
       flexDirection: "column",
       marginBottom: 1,
       children: [
-        /* @__PURE__ */ jsxDEV6(RoleLabel, {
+        /* @__PURE__ */ jsxDEV7(RoleLabel, {
           role: "user"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsxDEV6(Box4, {
+        /* @__PURE__ */ jsxDEV7(Box5, {
           marginLeft: 2,
-          children: /* @__PURE__ */ jsxDEV6(Text6, {
+          children: /* @__PURE__ */ jsxDEV7(Text7, {
             children: item.content
           }, undefined, false, undefined, this)
         }, undefined, false, undefined, this)
@@ -14064,16 +14344,21 @@ var HistoryEntry = ({ item }) => {
     }, undefined, true, undefined, this);
   }
   if (item.role === "tool") {
-    return /* @__PURE__ */ jsxDEV6(Box4, {
+    if (item.tool) {
+      return /* @__PURE__ */ jsxDEV7(ToolCall, {
+        info: item.tool
+      }, undefined, false, undefined, this);
+    }
+    return /* @__PURE__ */ jsxDEV7(Box5, {
       flexDirection: "column",
       marginBottom: 1,
       children: [
-        /* @__PURE__ */ jsxDEV6(RoleLabel, {
+        /* @__PURE__ */ jsxDEV7(RoleLabel, {
           role: "tool"
         }, undefined, false, undefined, this),
-        /* @__PURE__ */ jsxDEV6(Box4, {
+        /* @__PURE__ */ jsxDEV7(Box5, {
           marginLeft: 2,
-          children: /* @__PURE__ */ jsxDEV6(Text6, {
+          children: /* @__PURE__ */ jsxDEV7(Text7, {
             dimColor: true,
             children: item.content
           }, undefined, false, undefined, this)
@@ -14081,17 +14366,17 @@ var HistoryEntry = ({ item }) => {
       ]
     }, undefined, true, undefined, this);
   }
-  return /* @__PURE__ */ jsxDEV6(Box4, {
+  return /* @__PURE__ */ jsxDEV7(Box5, {
     flexDirection: "column",
     marginBottom: 1,
     children: [
-      /* @__PURE__ */ jsxDEV6(RoleLabel, {
+      item.continuation ? null : /* @__PURE__ */ jsxDEV7(RoleLabel, {
         role: "assistant"
       }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV6(Box4, {
+      /* @__PURE__ */ jsxDEV7(Box5, {
         marginLeft: 2,
         flexDirection: "column",
-        children: /* @__PURE__ */ jsxDEV6(Markdown, {
+        children: /* @__PURE__ */ jsxDEV7(Markdown, {
           text: item.content
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this)
@@ -14104,66 +14389,69 @@ var App = ({
   model,
   workdir,
   streamingText,
+  liveTools,
   tokenCount
 }) => {
   const theme = getTheme();
-  return /* @__PURE__ */ jsxDEV6(Box4, {
+  return /* @__PURE__ */ jsxDEV7(Box5, {
     flexDirection: "column",
-    minHeight: 20,
     children: [
-      /* @__PURE__ */ jsxDEV6(Box4, {
+      /* @__PURE__ */ jsxDEV7(Box5, {
         borderStyle: "round",
         borderColor: theme.primary,
         paddingX: 1,
         marginBottom: 1,
         children: [
-          /* @__PURE__ */ jsxDEV6(Text6, {
+          /* @__PURE__ */ jsxDEV7(Text7, {
             bold: true,
             color: theme.primary,
             children: "\uD83D\uDE80 Roy Agent"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV6(Text6, {
+          /* @__PURE__ */ jsxDEV7(Text7, {
             dimColor: true,
             children: " — interactive TUI"
           }, undefined, false, undefined, this)
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV6(Static2, {
+      /* @__PURE__ */ jsxDEV7(Static2, {
         items: history,
-        children: (item, index) => /* @__PURE__ */ jsxDEV6(HistoryEntry, {
+        children: (item, index) => /* @__PURE__ */ jsxDEV7(HistoryEntry, {
           item
         }, item.id ?? `${item.role}:${index}`, false, undefined, this)
       }, undefined, false, undefined, this),
-      status === "thinking" ? /* @__PURE__ */ jsxDEV6(Box4, {
+      status === "thinking" ? /* @__PURE__ */ jsxDEV7(Box5, {
         marginBottom: 1,
-        children: /* @__PURE__ */ jsxDEV6(Spinner, {
+        children: /* @__PURE__ */ jsxDEV7(Spinner, {
           label: "Agent is thinking..."
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      status === "streaming" && streamingText ? /* @__PURE__ */ jsxDEV6(Box4, {
+      status === "streaming" && streamingText ? /* @__PURE__ */ jsxDEV7(Box5, {
         flexDirection: "column",
         marginBottom: 1,
         children: [
-          /* @__PURE__ */ jsxDEV6(RoleLabel, {
+          /* @__PURE__ */ jsxDEV7(RoleLabel, {
             role: "assistant"
           }, undefined, false, undefined, this),
-          /* @__PURE__ */ jsxDEV6(Box4, {
+          /* @__PURE__ */ jsxDEV7(Box5, {
             marginLeft: 2,
-            children: /* @__PURE__ */ jsxDEV6(Markdown, {
+            children: /* @__PURE__ */ jsxDEV7(Markdown, {
               text: streamingText
             }, undefined, false, undefined, this)
           }, undefined, false, undefined, this)
         ]
-      }, undefined, true, undefined, this) : status === "streaming" ? /* @__PURE__ */ jsxDEV6(Box4, {
+      }, undefined, true, undefined, this) : status === "streaming" ? /* @__PURE__ */ jsxDEV7(Box5, {
         marginBottom: 1,
-        children: /* @__PURE__ */ jsxDEV6(Spinner, {
+        children: /* @__PURE__ */ jsxDEV7(Spinner, {
           label: "Generating response..."
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      /* @__PURE__ */ jsxDEV6(Box4, {
-        flexGrow: 1
-      }, undefined, false, undefined, this),
-      /* @__PURE__ */ jsxDEV6(StatusBar, {
+      liveTools && liveTools.length > 0 ? /* @__PURE__ */ jsxDEV7(Box5, {
+        flexDirection: "column",
+        children: liveTools.map((tool, i) => /* @__PURE__ */ jsxDEV7(ToolCall, {
+          info: tool
+        }, `live-tool-${i}`, false, undefined, this))
+      }, undefined, false, undefined, this) : null,
+      /* @__PURE__ */ jsxDEV7(StatusBar, {
         model,
         workdir,
         tokenCount
@@ -14177,9 +14465,79 @@ init_Markdown();
 init_StatusBar();
 
 // src/tui/TextInput.tsx
-import { useEffect as useEffect4, useState as useState4 } from "react";
-import { Box as Box5, Text as Text7, useInput as useInput3 } from "ink";
-import { jsxDEV as jsxDEV7 } from "react/jsx-dev-runtime";
+import { useEffect as useEffect4, useReducer, useState as useState4 } from "react";
+import { Box as Box6, Text as Text8, useInput as useInput3 } from "ink";
+
+// src/tui/text-input-editing.ts
+function clampCursor(value, cursor) {
+  if (!Number.isFinite(cursor))
+    return value.length;
+  return Math.max(0, Math.min(Math.trunc(cursor), value.length));
+}
+function insertText(state, text) {
+  const cursor = clampCursor(state.value, state.cursor);
+  const value = state.value.slice(0, cursor) + text + state.value.slice(cursor);
+  return { value, cursor: cursor + text.length };
+}
+function deleteBefore(state) {
+  const cursor = clampCursor(state.value, state.cursor);
+  if (cursor === 0)
+    return { value: state.value, cursor };
+  const value = state.value.slice(0, cursor - 1) + state.value.slice(cursor);
+  return { value, cursor: cursor - 1 };
+}
+function deleteAt(state) {
+  const { value } = state;
+  const cursor = clampCursor(value, state.cursor);
+  if (cursor >= value.length)
+    return { value, cursor };
+  return { value: value.slice(0, cursor) + value.slice(cursor + 1), cursor };
+}
+function moveLeft(state) {
+  return {
+    value: state.value,
+    cursor: Math.max(0, clampCursor(state.value, state.cursor) - 1)
+  };
+}
+function moveRight(state) {
+  const cursor = clampCursor(state.value, state.cursor);
+  return {
+    value: state.value,
+    cursor: Math.min(state.value.length, cursor + 1)
+  };
+}
+function splitAtCursor(state) {
+  const cursor = clampCursor(state.value, state.cursor);
+  return {
+    before: state.value.slice(0, cursor),
+    after: state.value.slice(cursor),
+    cursor
+  };
+}
+function editReducer(state, action) {
+  switch (action.type) {
+    case "insert":
+      return insertText(state, action.text);
+    case "backspace":
+      return deleteBefore(state);
+    case "delete":
+      return deleteAt(state);
+    case "left":
+      return moveLeft(state);
+    case "right":
+      return moveRight(state);
+    case "set":
+      return {
+        value: action.value,
+        cursor: action.cursor ?? action.value.length
+      };
+    case "clear":
+      return { value: "", cursor: 0 };
+  }
+}
+
+// src/tui/TextInput.tsx
+import { jsxDEV as jsxDEV8, Fragment } from "react/jsx-dev-runtime";
 var TextInput = ({
   label,
   prefix,
@@ -14188,7 +14546,10 @@ var TextInput = ({
   placeholder,
   history = []
 }) => {
-  const [value, setValue] = useState4("");
+  const [{ value, cursor }, dispatch] = useReducer(editReducer, {
+    value: "",
+    cursor: 0
+  });
   const [historyIndex, setHistoryIndex] = useState4(-1);
   const [draft, setDraft] = useState4("");
   useEffect4(() => {
@@ -14201,7 +14562,7 @@ var TextInput = ({
     }
     if (key.return) {
       const submitted = value;
-      setValue("");
+      dispatch({ type: "clear" });
       setHistoryIndex(-1);
       setDraft("");
       onSubmit(submitted);
@@ -14211,7 +14572,15 @@ var TextInput = ({
       if (historyIndex !== -1) {
         setHistoryIndex(-1);
       }
-      setValue((v) => v.slice(0, -1));
+      dispatch({ type: "backspace" });
+      return;
+    }
+    if (key.leftArrow) {
+      dispatch({ type: "left" });
+      return;
+    }
+    if (key.rightArrow) {
+      dispatch({ type: "right" });
       return;
     }
     if (key.upArrow) {
@@ -14222,7 +14591,7 @@ var TextInput = ({
       }
       const nextIndex = Math.min(historyIndex + 1, history.length - 1);
       setHistoryIndex(nextIndex);
-      setValue(history[nextIndex] ?? "");
+      dispatch({ type: "set", value: history[nextIndex] ?? "" });
       return;
     }
     if (key.downArrow) {
@@ -14231,10 +14600,10 @@ var TextInput = ({
       const nextIndex = historyIndex - 1;
       if (nextIndex < 0) {
         setHistoryIndex(-1);
-        setValue(draft);
+        dispatch({ type: "set", value: draft });
       } else {
         setHistoryIndex(nextIndex);
-        setValue(history[nextIndex] ?? "");
+        dispatch({ type: "set", value: history[nextIndex] ?? "" });
       }
       return;
     }
@@ -14242,12 +14611,13 @@ var TextInput = ({
       setHistoryIndex(-1);
     }
     if (input) {
-      setValue((v) => v + input);
+      dispatch({ type: "insert", text: input });
     }
   });
-  return /* @__PURE__ */ jsxDEV7(Box5, {
+  const { before, after } = splitAtCursor({ value, cursor });
+  return /* @__PURE__ */ jsxDEV8(Box6, {
     children: [
-      /* @__PURE__ */ jsxDEV7(Text7, {
+      /* @__PURE__ */ jsxDEV8(Text8, {
         bold: true,
         color: "green",
         children: [
@@ -14255,21 +14625,42 @@ var TextInput = ({
           " "
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV7(Text7, {
+      /* @__PURE__ */ jsxDEV8(Text8, {
         bold: true,
         children: [
           label,
           ": "
         ]
       }, undefined, true, undefined, this),
-      /* @__PURE__ */ jsxDEV7(Text7, {
-        children: value
+      value ? /* @__PURE__ */ jsxDEV8(Fragment, {
+        children: [
+          /* @__PURE__ */ jsxDEV8(Text8, {
+            children: before
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV8(Text8, {
+            inverse: true,
+            children: "▌"
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV8(Text8, {
+            children: after
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this) : placeholder ? /* @__PURE__ */ jsxDEV8(Fragment, {
+        children: [
+          /* @__PURE__ */ jsxDEV8(Text8, {
+            inverse: true,
+            children: "▌"
+          }, undefined, false, undefined, this),
+          /* @__PURE__ */ jsxDEV8(Text8, {
+            dimColor: true,
+            children: placeholder
+          }, undefined, false, undefined, this)
+        ]
+      }, undefined, true, undefined, this) : /* @__PURE__ */ jsxDEV8(Text8, {
+        inverse: true,
+        children: "▌"
       }, undefined, false, undefined, this),
-      !value && placeholder ? /* @__PURE__ */ jsxDEV7(Text7, {
-        dimColor: true,
-        children: placeholder
-      }, undefined, false, undefined, this) : null,
-      historyIndex !== -1 ? /* @__PURE__ */ jsxDEV7(Text7, {
+      historyIndex !== -1 ? /* @__PURE__ */ jsxDEV8(Text8, {
         dimColor: true,
         children: "  (history)"
       }, undefined, false, undefined, this) : null
@@ -14282,37 +14673,119 @@ init_theme();
 init_welcome_card2();
 
 // src/tui/use-streaming-accumulator.ts
-import { useCallback as useCallback3, useState as useState5 } from "react";
-function useStreamingAccumulator() {
+import { useCallback as useCallback3, useRef as useRef2, useState as useState5 } from "react";
+
+// src/tui/scrollback.ts
+var FENCE_RE = /^\s*(```|~~~)/;
+function lineStartOffset(lines, index) {
+  let off = 0;
+  for (let i = 0;i < index; i++)
+    off += (lines[i] ?? "").length + 1;
+  return off;
+}
+function splitStable(text, opts = {}) {
+  if (!text)
+    return { stable: "", tail: "" };
+  if (opts.force)
+    return { stable: text, tail: "" };
+  const lines = text.split(`
+`);
+  let inFence = false;
+  let boundary = -1;
+  for (let i = 0;i < lines.length; i++) {
+    const line = lines[i] ?? "";
+    const isLast = i === lines.length - 1;
+    const next = lineStartOffset(lines, i) + line.length + 1;
+    if (FENCE_RE.test(line)) {
+      inFence = !inFence;
+    } else if (!inFence && !isLast && line.trim() === "") {
+      boundary = next;
+    }
+  }
+  if (boundary > 0) {
+    return { stable: text.slice(0, boundary), tail: text.slice(boundary) };
+  }
+  const maxTailLines = opts.maxTailLines ?? 0;
+  if (maxTailLines > 0 && !inFence && lines.length > maxTailLines) {
+    const keepFrom = lines.length - 1;
+    const off = lineStartOffset(lines, keepFrom);
+    if (off > 0) {
+      return { stable: text.slice(0, off), tail: text.slice(off) };
+    }
+  }
+  return { stable: "", tail: text };
+}
+
+// src/tui/use-streaming-accumulator.ts
+var DEFAULT_MAX_TAIL_LINES = 24;
+function useStreamingAccumulator(options = {}) {
+  const maxTailLines = options.maxTailLines ?? DEFAULT_MAX_TAIL_LINES;
   const [status, setStatus] = useState5("idle");
   const [streamingText, setStreamingText] = useState5("");
+  const pendingRef = useRef2("");
+  const emittedRef = useRef2("");
   const start = useCallback3(() => {
+    pendingRef.current = "";
+    emittedRef.current = "";
     setStreamingText("");
     setStatus("thinking");
   }, []);
   const append = useCallback3((chunk) => {
+    pendingRef.current += chunk;
+    setStreamingText(pendingRef.current);
     setStatus("streaming");
-    setStreamingText((prev) => prev + chunk);
   }, []);
-  const finish = useCallback3(() => {
-    setStatus("idle");
-    let snapshot = "";
-    setStreamingText((prev) => {
-      snapshot = prev;
-      return "";
+  const drainStable = useCallback3(() => {
+    const { stable, tail } = splitStable(pendingRef.current, {
+      maxTailLines
     });
-    return snapshot;
+    if (!stable)
+      return "";
+    pendingRef.current = tail;
+    emittedRef.current += stable;
+    setStreamingText(tail);
+    return stable;
+  }, [maxTailLines]);
+  const flushPending = useCallback3(() => {
+    const pending = pendingRef.current;
+    if (!pending)
+      return "";
+    pendingRef.current = "";
+    emittedRef.current += pending;
+    setStreamingText("");
+    return pending;
+  }, []);
+  const finish = useCallback3((finalText) => {
+    const pending = pendingRef.current;
+    pendingRef.current = "";
+    setStreamingText("");
+    setStatus("idle");
+    if (finalText === undefined) {
+      emittedRef.current += pending;
+      return pending;
+    }
+    if (finalText.startsWith(emittedRef.current)) {
+      const suffix = finalText.slice(emittedRef.current.length);
+      emittedRef.current = finalText;
+      return suffix;
+    }
+    const emitted = emittedRef.current;
+    let i = 0;
+    const max = Math.min(emitted.length, finalText.length);
+    while (i < max && emitted.charCodeAt(i) === finalText.charCodeAt(i)) {
+      i++;
+    }
+    emittedRef.current = finalText;
+    return finalText.slice(i);
   }, []);
   const fail = useCallback3((_err) => {
+    const rest = pendingRef.current;
+    pendingRef.current = "";
+    setStreamingText("");
     setStatus("idle");
-    let snapshot = "";
-    setStreamingText((prev) => {
-      snapshot = prev;
-      return "";
-    });
-    return snapshot;
+    return rest;
   }, []);
-  return { status, streamingText, start, append, finish, fail };
+  return { status, streamingText, start, append, drainStable, flushPending, finish, fail };
 }
 
 // src/RunTui.tsx
@@ -14391,7 +14864,7 @@ function dispatchSlashCommand(raw, ctx) {
 }
 
 // src/RunTui.tsx
-import { jsxDEV as jsxDEV8 } from "react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV9 } from "react/jsx-dev-runtime";
 var RunScreen = ({
   handleQuery,
   streamHandleQuery,
@@ -14399,6 +14872,8 @@ var RunScreen = ({
   workdir,
   maxLines: initialMaxLines,
   markdownEnabled: markdownEnabled2,
+  showToolCalls = true,
+  showToolResults = true,
   onExit,
   onRegisterHandlers
 }) => {
@@ -14406,14 +14881,22 @@ var RunScreen = ({
   const [errorMessage, setErrorMessage] = useState6(null);
   const [maxLines, setMaxLines] = useState6(initialMaxLines);
   const [userHistory, setUserHistory] = useState6([]);
-  const stream = useStreamingAccumulator();
+  const [liveTools, setLiveTools] = useState6([]);
+  const { stdout } = useStdout();
+  const maxTailLines = Math.max(4, (stdout?.rows ?? 24) - 12);
+  const stream = useStreamingAccumulator({ maxTailLines });
   const status = stream.status;
   const { exit } = useApp2();
-  const userTurnCountRef = useRef2(0);
-  const assistantTurnCountRef = useRef2(0);
-  const isProcessingRef = useRef2(0);
-  const executeQueryRef = useRef2(null);
-  const historyIdRef = useRef2(0);
+  const userTurnCountRef = useRef3(0);
+  const assistantTurnCountRef = useRef3(0);
+  const isProcessingRef = useRef3(0);
+  const executeQueryRef = useRef3(null);
+  const historyIdRef = useRef3(0);
+  const liveRef = useRef3([]);
+  const toolSeqRef = useRef3(0);
+  const syncLiveTools = useCallback4(() => {
+    setLiveTools(liveRef.current.map((t) => t.info));
+  }, []);
   const width = process.stdout.columns ?? 80;
   const doExit = useCallback4(() => {
     onExit?.();
@@ -14422,25 +14905,108 @@ var RunScreen = ({
   const executeQuery = useCallback4(async (message) => {
     isProcessingRef.current += 1;
     stream.start();
+    let assistantBlocks = 0;
+    const pushAssistant = (content) => {
+      const id = `h${++historyIdRef.current}`;
+      const continuation = assistantBlocks > 0;
+      assistantBlocks += 1;
+      setHistory((h) => [
+        ...h,
+        { role: "assistant", content, id, continuation }
+      ]);
+    };
+    const commitTool = (info) => {
+      const id = `h${++historyIdRef.current}`;
+      setHistory((h) => [
+        ...h,
+        { role: "tool", content: "", tool: info, id }
+      ]);
+    };
+    const findLiveIndex = (event) => {
+      if (event.id) {
+        const byId = liveRef.current.findIndex((t) => t.key === event.id);
+        if (byId >= 0)
+          return byId;
+      }
+      return liveRef.current.findIndex((t) => t.info.name === event.name);
+    };
+    const handleToolEvent = (event) => {
+      if (event.kind === "call") {
+        const pending = stream.flushPending();
+        if (pending.trim())
+          pushAssistant(pending);
+        const key = event.id ?? `${event.name}#${++toolSeqRef.current}`;
+        liveRef.current = [
+          ...liveRef.current,
+          {
+            key,
+            startedAt: Date.now(),
+            info: { name: event.name, args: event.args, status: "running" }
+          }
+        ];
+        syncLiveTools();
+        return;
+      }
+      const idx = findLiveIndex(event);
+      const entry = idx >= 0 ? liveRef.current[idx] : undefined;
+      const durationMs = entry ? Date.now() - entry.startedAt : undefined;
+      const info = event.kind === "error" ? {
+        name: event.name,
+        args: entry?.info.args,
+        status: "error",
+        error: event.error ?? "tool failed",
+        durationMs
+      } : {
+        name: event.name,
+        args: entry?.info.args,
+        status: "completed",
+        output: showToolResults ? formatToolOutput(event.output) : undefined,
+        durationMs
+      };
+      if (idx >= 0) {
+        liveRef.current = liveRef.current.filter((_, i) => i !== idx);
+        syncLiveTools();
+      }
+      commitTool(info);
+    };
+    const settleLiveTools = (status2, error) => {
+      if (liveRef.current.length === 0)
+        return;
+      for (const t of liveRef.current) {
+        commitTool({
+          ...t.info,
+          status: status2,
+          ...error ? { error } : {},
+          durationMs: Date.now() - t.startedAt
+        });
+      }
+      liveRef.current = [];
+      syncLiveTools();
+    };
     try {
       let responseText;
       if (streamHandleQuery) {
-        responseText = await streamHandleQuery(message, (chunk) => stream.append(chunk));
+        responseText = await streamHandleQuery(message, (chunk) => {
+          stream.append(chunk);
+          const stable = stream.drainStable();
+          if (stable)
+            pushAssistant(stable);
+        }, showToolCalls ? handleToolEvent : undefined);
+        const tail = stream.finish(responseText);
+        if (tail.trim())
+          pushAssistant(tail);
       } else {
         responseText = await handleQuery(message);
+        stream.finish();
+        const rendered = markdownEnabled2 ? renderMarkdown(responseText, { width }) : responseText;
+        pushAssistant(truncateForTerminal(rendered, maxLines));
       }
-      const rendered = markdownEnabled2 ? renderMarkdown(responseText, { width }) : responseText;
-      const finalText = truncateForTerminal(rendered, maxLines);
-      stream.finish();
-      const assistantId = `h${++historyIdRef.current}`;
-      setHistory((h) => [
-        ...h,
-        { role: "assistant", content: finalText, id: assistantId }
-      ]);
+      settleLiveTools("completed");
       assistantTurnCountRef.current += 1;
     } catch (err) {
       const msg = err instanceof Error ? err.message : String(err);
       stream.fail(err instanceof Error ? err : new Error(msg));
+      settleLiveTools("error", msg);
       setErrorMessage(msg);
       const errorId = `h${++historyIdRef.current}`;
       setHistory((h) => [
@@ -14450,7 +15016,17 @@ var RunScreen = ({
     } finally {
       isProcessingRef.current -= 1;
     }
-  }, [handleQuery, markdownEnabled2, maxLines, stream, streamHandleQuery, width]);
+  }, [
+    handleQuery,
+    markdownEnabled2,
+    maxLines,
+    showToolCalls,
+    showToolResults,
+    stream,
+    streamHandleQuery,
+    syncLiveTools,
+    width
+  ]);
   useEffect5(() => {
     executeQueryRef.current = executeQuery;
   }, [executeQuery]);
@@ -14558,19 +15134,20 @@ var RunScreen = ({
   const handleCancel = useCallback4(() => {
     doExit();
   }, [doExit]);
-  return /* @__PURE__ */ jsxDEV8(Box6, {
+  return /* @__PURE__ */ jsxDEV9(Box7, {
     flexDirection: "column",
     children: [
-      /* @__PURE__ */ jsxDEV8(App, {
+      /* @__PURE__ */ jsxDEV9(App, {
         history,
         status,
         model,
         workdir,
-        streamingText: stream.streamingText
+        streamingText: stream.streamingText,
+        liveTools
       }, undefined, false, undefined, this),
-      status === "idle" ? /* @__PURE__ */ jsxDEV8(Box6, {
+      status === "idle" ? /* @__PURE__ */ jsxDEV9(Box7, {
         marginTop: 1,
-        children: /* @__PURE__ */ jsxDEV8(TextInput, {
+        children: /* @__PURE__ */ jsxDEV9(TextInput, {
           label: "You",
           prefix: "\uD83D\uDC64",
           placeholder: 'Type a message, "/help", or "exit"',
@@ -14579,9 +15156,9 @@ var RunScreen = ({
           history: userHistory
         }, undefined, false, undefined, this)
       }, undefined, false, undefined, this) : null,
-      errorMessage ? /* @__PURE__ */ jsxDEV8(Box6, {
+      errorMessage ? /* @__PURE__ */ jsxDEV9(Box7, {
         marginTop: 1,
-        children: /* @__PURE__ */ jsxDEV8(Text8, {
+        children: /* @__PURE__ */ jsxDEV9(Text9, {
           color: "red",
           children: [
             "⚠ ",
@@ -14690,7 +15267,7 @@ async function loadHandleQuery(options, hooks) {
     workDir: options.workdir,
     loadPlugins: true,
     plugins: options.plugins,
-    commandName: "run"
+    commandName: "interactive"
   });
   const env = envService.getEnvironment();
   if (!env) {
@@ -14793,14 +15370,41 @@ async function loadHandleQuery(options, hooks) {
   };
 }
 function createStreamHandleQuery(queryExecutor, sessionId, options, agentContext, eventSourceSystemPrompt) {
-  return async (message, onChunk) => {
+  return async (message, onChunk, onTool) => {
     queryExecutor.setChunkCallback((event) => {
-      if (event.type === "llm.text") {
-        if (event.delta) {
-          onChunk(event.delta);
-        } else if (event.content) {
-          onChunk(event.content);
-        }
+      switch (event.type) {
+        case "llm.text":
+          if (event.delta) {
+            onChunk(event.delta);
+          } else if (event.content) {
+            onChunk(event.content);
+          }
+          break;
+        case "tool.call":
+          onTool?.({
+            kind: "call",
+            id: event.toolId,
+            name: event.toolName ?? "tool",
+            args: event.toolArgs
+          });
+          break;
+        case "tool.result":
+          onTool?.({
+            kind: "result",
+            id: event.toolId,
+            name: event.toolName ?? "tool",
+            output: event.toolResult
+          });
+          break;
+        case "tool.error":
+          onTool?.({
+            kind: "error",
+            name: event.toolName ?? "tool",
+            error: event.toolError
+          });
+          break;
+        default:
+          break;
       }
     });
     const mergedContext = {
@@ -14814,15 +15418,15 @@ function createStreamHandleQuery(queryExecutor, sessionId, options, agentContext
     };
     const result = await queryExecutor.execute(message, sessionId, {
       showReasoning: options.reasoning ?? true,
-      showToolCalls: options.toolCalls ?? true,
-      showToolResults: options.toolResults ?? false
+      showToolCalls: true,
+      showToolResults: true
     }, undefined, mergedContext);
     return String(result ?? "");
   };
 }
 function createRunCommand() {
   return {
-    command: "run",
+    command: "interactive",
     describe: "Start an interactive conversation with the agent (Ink TUI)",
     builder: (yargs) => yargs.option("model", {
       alias: "m",
@@ -14876,7 +15480,7 @@ function createRunCommand() {
     }).option("tool-results", {
       type: "boolean",
       describe: "显示工具执行结果",
-      default: false
+      default: true
     }).option("event-source", {
       alias: "es",
       type: "array",
@@ -14935,13 +15539,15 @@ function createRunCommand() {
       const streamHandleQuery = createStreamHandleQuery(queryExecutor, sessionId, argv, agentContext, eventSourceSystemPrompt);
       const stopEventHandler = eventHandler.start();
       const stopTaskEventHandler = taskEventHandler.start();
-      const { waitUntilExit } = render(React6.createElement(RunTui_default, {
+      const { waitUntilExit } = render(React7.createElement(RunTui_default, {
         handleQuery,
         streamHandleQuery,
         model: argv.model,
         workdir: argv.workdir,
         maxLines,
         markdownEnabled: argv.markdown !== false,
+        showToolCalls: argv.toolCalls !== false,
+        showToolResults: argv.toolResults !== false,
         onRegisterHandlers: (handlers) => {
           runState.onNotification = handlers.onNotification;
           runState.isIdle = handlers.isIdle;
@@ -14972,14 +15578,14 @@ function createRunCommand() {
 var RunCommand = createRunCommand();
 
 // src/commands/chat.ts
-import React8 from "react";
+import React9 from "react";
 import { render as render2 } from "ink";
 
 // src/ChatTui.tsx
-import { useEffect as useEffect6, useRef as useRef3, useState as useState7 } from "react";
-import { Box as Box7, useApp as useApp3 } 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 jsxDEV9 } from "react/jsx-dev-runtime";
+import { jsxDEV as jsxDEV10 } from "react/jsx-dev-runtime";
 var ChatScreen = ({
   handleQuery,
   streamHandleQuery,
@@ -14992,7 +15598,7 @@ var ChatScreen = ({
   const [history, setHistory] = useState7([
     { role: "user", content: message, id: "h-init-1" }
   ]);
-  const historyIdRef = useRef3(1);
+  const historyIdRef = useRef4(1);
   const stream = useStreamingAccumulator();
   const { exit } = useApp3();
   const width = process.stdout.columns ?? 80;
@@ -15035,9 +15641,9 @@ var ChatScreen = ({
       cancelled = true;
     };
   }, [handleQuery, streamHandleQuery, message, maxLines, markdownEnabled2, exit, width, stream]);
-  return /* @__PURE__ */ jsxDEV9(Box7, {
+  return /* @__PURE__ */ jsxDEV10(Box8, {
     flexDirection: "column",
-    children: /* @__PURE__ */ jsxDEV9(App, {
+    children: /* @__PURE__ */ jsxDEV10(App, {
       history,
       status: stream.status,
       model,
@@ -15123,7 +15729,7 @@ function createChatCommand() {
       }
       const maxLines = Number.parseInt(argv.maxLines ?? "500", 10);
       const handleQuery = await loadHandleQuery2(argv);
-      const { waitUntilExit } = render2(React8.createElement(ChatTui_default, {
+      const { waitUntilExit } = render2(React9.createElement(ChatTui_default, {
         handleQuery,
         message: argv.message,
         model: argv.model,
@@ -22778,7 +23384,7 @@ function formatDate(date) {
   const d = typeof date === "string" ? new Date(date) : date;
   return d.toLocaleString("zh-CN");
 }
-function formatDuration(ms) {
+function formatDuration2(ms) {
   if (ms === undefined || ms === null)
     return "-";
   if (ms < 1000)
@@ -22926,7 +23532,7 @@ function renderRunsList(runs, options) {
   const rows = runs.map((r) => {
     const id = truncateVisual3(r.id, ID_WIDTH).padEnd(ID_WIDTH);
     const status = statusColor(r.status)(r.status.padEnd(STATUS_WIDTH));
-    const duration = formatDuration(r.durationMs).padEnd(DURATION_WIDTH);
+    const duration = formatDuration2(r.durationMs).padEnd(DURATION_WIDTH);
     const started = formatDate(r.startedAt);
     return `${id}${GAP}${status}${GAP}${duration}${GAP}${started}`;
   });
@@ -22954,7 +23560,7 @@ function renderRunDetail(run) {
   if (run.completedAt) {
     lines.push(`  ${chalk67.cyan("Completed:")} ${formatDate(run.completedAt)}`);
   }
-  lines.push(`  ${chalk67.cyan("Duration:")}  ${formatDuration(run.durationMs)}`);
+  lines.push(`  ${chalk67.cyan("Duration:")}  ${formatDuration2(run.durationMs)}`);
   if (run.error) {
     lines.push(chalk67.bold(`
 ❌ Error
@@ -23020,7 +23626,7 @@ function renderRunResult(result) {
   }
   lines.push(`   Run ID: ${result.runId}`);
   if (result.durationMs) {
-    lines.push(`   Duration: ${formatDuration(result.durationMs)}`);
+    lines.push(`   Duration: ${formatDuration2(result.durationMs)}`);
   }
   if (result.error) {
     lines.push(chalk67.red(`