@qxbyte/muse 0.1.2 → 0.1.3

package/dist/cli.js

@@ -5,14 +5,24 @@ import { Command } from "commander";
 import { render } from "ink";
 
 // src/app.tsx
-import { useCallback, useEffect as useEffect5, useMemo as useMemo2, useReducer, useRef, useState as useState7 } from "react";
-import { Box as Box12, Text as Text14, useApp, useInput as useInput4, useStdout } from "ink";
+import { useCallback, useEffect as useEffect5, useMemo as useMemo2, useReducer, useRef, useState as useState8 } from "react";
+import { Box as Box13, Text as Text15, useApp, useInput as useInput5, useStdout as useStdout2 } from "ink";
 
 // src/components/BgTextInput.tsx
 import { useState, useEffect } from "react";
 import { Text, useInput } from "ink";
 import { jsx, jsxs } from "react/jsx-runtime";
 var BLINK_MS = 530;
+var PASTE_CHAR_THRESHOLD = 200;
+function looksLikePaste(input) {
+  return input.includes("\n") || input.includes("\r") || input.length > PASTE_CHAR_THRESHOLD;
+}
+function stripBracketedPaste(s) {
+  return s.replace(/\x1b\[20[01]~/g, "");
+}
+function normalizeLineEndings(s) {
+  return s.replace(/\r\n?/g, "\n");
+}
 function BgTextInput({
   value,
   onChange,
@@ -20,7 +30,9 @@ function BgTextInput({
   width,
   backgroundColor,
   color,
-  isActive = true
+  isActive = true,
+  onPaste,
+  placeholder
 }) {
   const [cursor, setCursor] = useState(value.length);
   const [blinkOn, setBlinkOn] = useState(true);
@@ -66,17 +78,35 @@ function BgTextInput({
         return;
       }
       if (input && !key.return) {
-        const next = value.slice(0, cursor) + input + value.slice(cursor);
+        const cleaned = normalizeLineEndings(stripBracketedPaste(input));
+        if (!cleaned) return;
+        const insertion = onPaste && looksLikePaste(cleaned) ? onPaste(cleaned) : cleaned;
+        const next = value.slice(0, cursor) + insertion + value.slice(cursor);
         onChange(next);
-        setCursor((c) => c + input.length);
+        setCursor((c) => c + insertion.length);
       }
     },
     { isActive }
   );
-  const view = computeViewport(value, cursor, width);
+  const showCursor = isActive && blinkOn;
+  if (value.length === 0 && placeholder) {
+    const maxW = Math.max(0, width - 1);
+    let truncated = placeholder;
+    while (stringWidth(truncated) > maxW && truncated.length > 0) {
+      truncated = truncated.slice(0, -1);
+    }
+    const usedW = 1 + stringWidth(truncated);
+    const padLen2 = Math.max(0, width - usedW);
+    return /* @__PURE__ */ jsxs(Text, { backgroundColor, color, children: [
+      showCursor ? /* @__PURE__ */ jsx(Text, { backgroundColor: "blue", color, dimColor: true, children: " " }) : /* @__PURE__ */ jsx(Text, { backgroundColor, color, children: " " }),
+      /* @__PURE__ */ jsx(Text, { backgroundColor, dimColor: true, children: truncated }),
+      " ".repeat(padLen2)
+    ] });
+  }
+  const displayValue = value.replace(/[\n\r]/g, "\u21B5");
+  const view = computeViewport(displayValue, cursor, width);
   const at = view.atChar;
   const padLen = Math.max(0, width - view.consumedWidth);
-  const showCursor = isActive && blinkOn;
   return /* @__PURE__ */ jsxs(Text, { backgroundColor, color, children: [
     view.before,
     showCursor ? /* @__PURE__ */ jsx(Text, { backgroundColor: "blue", color, dimColor: true, children: at }) : /* @__PURE__ */ jsx(Text, { backgroundColor, color, children: at }),
@@ -242,37 +272,533 @@ function pickBanner(width, props) {
 
 // src/components/MessageView.tsx
 import { useMemo } from "react";
-import { Box as Box2, Text as Text3 } from "ink";
+import { Box as Box2, Text as Text3, useStdout } from "ink";
+
+// node_modules/chalk/source/vendor/ansi-styles/index.js
+var ANSI_BACKGROUND_OFFSET = 10;
+var wrapAnsi16 = (offset = 0) => (code) => `\x1B[${code + offset}m`;
+var wrapAnsi256 = (offset = 0) => (code) => `\x1B[${38 + offset};5;${code}m`;
+var wrapAnsi16m = (offset = 0) => (red, green, blue) => `\x1B[${38 + offset};2;${red};${green};${blue}m`;
+var styles = {
+  modifier: {
+    reset: [0, 0],
+    // 21 isn't widely supported and 22 does the same thing
+    bold: [1, 22],
+    dim: [2, 22],
+    italic: [3, 23],
+    underline: [4, 24],
+    overline: [53, 55],
+    inverse: [7, 27],
+    hidden: [8, 28],
+    strikethrough: [9, 29]
+  },
+  color: {
+    black: [30, 39],
+    red: [31, 39],
+    green: [32, 39],
+    yellow: [33, 39],
+    blue: [34, 39],
+    magenta: [35, 39],
+    cyan: [36, 39],
+    white: [37, 39],
+    // Bright color
+    blackBright: [90, 39],
+    gray: [90, 39],
+    // Alias of `blackBright`
+    grey: [90, 39],
+    // Alias of `blackBright`
+    redBright: [91, 39],
+    greenBright: [92, 39],
+    yellowBright: [93, 39],
+    blueBright: [94, 39],
+    magentaBright: [95, 39],
+    cyanBright: [96, 39],
+    whiteBright: [97, 39]
+  },
+  bgColor: {
+    bgBlack: [40, 49],
+    bgRed: [41, 49],
+    bgGreen: [42, 49],
+    bgYellow: [43, 49],
+    bgBlue: [44, 49],
+    bgMagenta: [45, 49],
+    bgCyan: [46, 49],
+    bgWhite: [47, 49],
+    // Bright color
+    bgBlackBright: [100, 49],
+    bgGray: [100, 49],
+    // Alias of `bgBlackBright`
+    bgGrey: [100, 49],
+    // Alias of `bgBlackBright`
+    bgRedBright: [101, 49],
+    bgGreenBright: [102, 49],
+    bgYellowBright: [103, 49],
+    bgBlueBright: [104, 49],
+    bgMagentaBright: [105, 49],
+    bgCyanBright: [106, 49],
+    bgWhiteBright: [107, 49]
+  }
+};
+var modifierNames = Object.keys(styles.modifier);
+var foregroundColorNames = Object.keys(styles.color);
+var backgroundColorNames = Object.keys(styles.bgColor);
+var colorNames = [...foregroundColorNames, ...backgroundColorNames];
+function assembleStyles() {
+  const codes = /* @__PURE__ */ new Map();
+  for (const [groupName, group] of Object.entries(styles)) {
+    for (const [styleName, style] of Object.entries(group)) {
+      styles[styleName] = {
+        open: `\x1B[${style[0]}m`,
+        close: `\x1B[${style[1]}m`
+      };
+      group[styleName] = styles[styleName];
+      codes.set(style[0], style[1]);
+    }
+    Object.defineProperty(styles, groupName, {
+      value: group,
+      enumerable: false
+    });
+  }
+  Object.defineProperty(styles, "codes", {
+    value: codes,
+    enumerable: false
+  });
+  styles.color.close = "\x1B[39m";
+  styles.bgColor.close = "\x1B[49m";
+  styles.color.ansi = wrapAnsi16();
+  styles.color.ansi256 = wrapAnsi256();
+  styles.color.ansi16m = wrapAnsi16m();
+  styles.bgColor.ansi = wrapAnsi16(ANSI_BACKGROUND_OFFSET);
+  styles.bgColor.ansi256 = wrapAnsi256(ANSI_BACKGROUND_OFFSET);
+  styles.bgColor.ansi16m = wrapAnsi16m(ANSI_BACKGROUND_OFFSET);
+  Object.defineProperties(styles, {
+    rgbToAnsi256: {
+      value(red, green, blue) {
+        if (red === green && green === blue) {
+          if (red < 8) {
+            return 16;
+          }
+          if (red > 248) {
+            return 231;
+          }
+          return Math.round((red - 8) / 247 * 24) + 232;
+        }
+        return 16 + 36 * Math.round(red / 255 * 5) + 6 * Math.round(green / 255 * 5) + Math.round(blue / 255 * 5);
+      },
+      enumerable: false
+    },
+    hexToRgb: {
+      value(hex) {
+        const matches = /[a-f\d]{6}|[a-f\d]{3}/i.exec(hex.toString(16));
+        if (!matches) {
+          return [0, 0, 0];
+        }
+        let [colorString] = matches;
+        if (colorString.length === 3) {
+          colorString = [...colorString].map((character) => character + character).join("");
+        }
+        const integer = Number.parseInt(colorString, 16);
+        return [
+          /* eslint-disable no-bitwise */
+          integer >> 16 & 255,
+          integer >> 8 & 255,
+          integer & 255
+          /* eslint-enable no-bitwise */
+        ];
+      },
+      enumerable: false
+    },
+    hexToAnsi256: {
+      value: (hex) => styles.rgbToAnsi256(...styles.hexToRgb(hex)),
+      enumerable: false
+    },
+    ansi256ToAnsi: {
+      value(code) {
+        if (code < 8) {
+          return 30 + code;
+        }
+        if (code < 16) {
+          return 90 + (code - 8);
+        }
+        let red;
+        let green;
+        let blue;
+        if (code >= 232) {
+          red = ((code - 232) * 10 + 8) / 255;
+          green = red;
+          blue = red;
+        } else {
+          code -= 16;
+          const remainder = code % 36;
+          red = Math.floor(code / 36) / 5;
+          green = Math.floor(remainder / 6) / 5;
+          blue = remainder % 6 / 5;
+        }
+        const value = Math.max(red, green, blue) * 2;
+        if (value === 0) {
+          return 30;
+        }
+        let result = 30 + (Math.round(blue) << 2 | Math.round(green) << 1 | Math.round(red));
+        if (value === 2) {
+          result += 60;
+        }
+        return result;
+      },
+      enumerable: false
+    },
+    rgbToAnsi: {
+      value: (red, green, blue) => styles.ansi256ToAnsi(styles.rgbToAnsi256(red, green, blue)),
+      enumerable: false
+    },
+    hexToAnsi: {
+      value: (hex) => styles.ansi256ToAnsi(styles.hexToAnsi256(hex)),
+      enumerable: false
+    }
+  });
+  return styles;
+}
+var ansiStyles = assembleStyles();
+var ansi_styles_default = ansiStyles;
+
+// node_modules/chalk/source/vendor/supports-color/index.js
+import process2 from "process";
+import os from "os";
+import tty from "tty";
+function hasFlag(flag, argv = globalThis.Deno ? globalThis.Deno.args : process2.argv) {
+  const prefix = flag.startsWith("-") ? "" : flag.length === 1 ? "-" : "--";
+  const position = argv.indexOf(prefix + flag);
+  const terminatorPosition = argv.indexOf("--");
+  return position !== -1 && (terminatorPosition === -1 || position < terminatorPosition);
+}
+var { env } = process2;
+var flagForceColor;
+if (hasFlag("no-color") || hasFlag("no-colors") || hasFlag("color=false") || hasFlag("color=never")) {
+  flagForceColor = 0;
+} else if (hasFlag("color") || hasFlag("colors") || hasFlag("color=true") || hasFlag("color=always")) {
+  flagForceColor = 1;
+}
+function envForceColor() {
+  if ("FORCE_COLOR" in env) {
+    if (env.FORCE_COLOR === "true") {
+      return 1;
+    }
+    if (env.FORCE_COLOR === "false") {
+      return 0;
+    }
+    return env.FORCE_COLOR.length === 0 ? 1 : Math.min(Number.parseInt(env.FORCE_COLOR, 10), 3);
+  }
+}
+function translateLevel(level) {
+  if (level === 0) {
+    return false;
+  }
+  return {
+    level,
+    hasBasic: true,
+    has256: level >= 2,
+    has16m: level >= 3
+  };
+}
+function _supportsColor(haveStream, { streamIsTTY, sniffFlags = true } = {}) {
+  const noFlagForceColor = envForceColor();
+  if (noFlagForceColor !== void 0) {
+    flagForceColor = noFlagForceColor;
+  }
+  const forceColor = sniffFlags ? flagForceColor : noFlagForceColor;
+  if (forceColor === 0) {
+    return 0;
+  }
+  if (sniffFlags) {
+    if (hasFlag("color=16m") || hasFlag("color=full") || hasFlag("color=truecolor")) {
+      return 3;
+    }
+    if (hasFlag("color=256")) {
+      return 2;
+    }
+  }
+  if ("TF_BUILD" in env && "AGENT_NAME" in env) {
+    return 1;
+  }
+  if (haveStream && !streamIsTTY && forceColor === void 0) {
+    return 0;
+  }
+  const min = forceColor || 0;
+  if (env.TERM === "dumb") {
+    return min;
+  }
+  if (process2.platform === "win32") {
+    const osRelease = os.release().split(".");
+    if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
+      return Number(osRelease[2]) >= 14931 ? 3 : 2;
+    }
+    return 1;
+  }
+  if ("CI" in env) {
+    if (["GITHUB_ACTIONS", "GITEA_ACTIONS", "CIRCLECI"].some((key) => key in env)) {
+      return 3;
+    }
+    if (["TRAVIS", "APPVEYOR", "GITLAB_CI", "BUILDKITE", "DRONE"].some((sign) => sign in env) || env.CI_NAME === "codeship") {
+      return 1;
+    }
+    return min;
+  }
+  if ("TEAMCITY_VERSION" in env) {
+    return /^(9\.(0*[1-9]\d*)\.|\d{2,}\.)/.test(env.TEAMCITY_VERSION) ? 1 : 0;
+  }
+  if (env.COLORTERM === "truecolor") {
+    return 3;
+  }
+  if (env.TERM === "xterm-kitty") {
+    return 3;
+  }
+  if (env.TERM === "xterm-ghostty") {
+    return 3;
+  }
+  if (env.TERM === "wezterm") {
+    return 3;
+  }
+  if ("TERM_PROGRAM" in env) {
+    const version = Number.parseInt((env.TERM_PROGRAM_VERSION || "").split(".")[0], 10);
+    switch (env.TERM_PROGRAM) {
+      case "iTerm.app": {
+        return version >= 3 ? 3 : 2;
+      }
+      case "Apple_Terminal": {
+        return 2;
+      }
+    }
+  }
+  if (/-256(color)?$/i.test(env.TERM)) {
+    return 2;
+  }
+  if (/^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)) {
+    return 1;
+  }
+  if ("COLORTERM" in env) {
+    return 1;
+  }
+  return min;
+}
+function createSupportsColor(stream, options = {}) {
+  const level = _supportsColor(stream, {
+    streamIsTTY: stream && stream.isTTY,
+    ...options
+  });
+  return translateLevel(level);
+}
+var supportsColor = {
+  stdout: createSupportsColor({ isTTY: tty.isatty(1) }),
+  stderr: createSupportsColor({ isTTY: tty.isatty(2) })
+};
+var supports_color_default = supportsColor;
+
+// node_modules/chalk/source/utilities.js
+function stringReplaceAll(string, substring, replacer) {
+  let index = string.indexOf(substring);
+  if (index === -1) {
+    return string;
+  }
+  const substringLength = substring.length;
+  let endIndex = 0;
+  let returnValue = "";
+  do {
+    returnValue += string.slice(endIndex, index) + substring + replacer;
+    endIndex = index + substringLength;
+    index = string.indexOf(substring, endIndex);
+  } while (index !== -1);
+  returnValue += string.slice(endIndex);
+  return returnValue;
+}
+function stringEncaseCRLFWithFirstIndex(string, prefix, postfix, index) {
+  let endIndex = 0;
+  let returnValue = "";
+  do {
+    const gotCR = string[index - 1] === "\r";
+    returnValue += string.slice(endIndex, gotCR ? index - 1 : index) + prefix + (gotCR ? "\r\n" : "\n") + postfix;
+    endIndex = index + 1;
+    index = string.indexOf("\n", endIndex);
+  } while (index !== -1);
+  returnValue += string.slice(endIndex);
+  return returnValue;
+}
+
+// node_modules/chalk/source/index.js
+var { stdout: stdoutColor, stderr: stderrColor } = supports_color_default;
+var GENERATOR = /* @__PURE__ */ Symbol("GENERATOR");
+var STYLER = /* @__PURE__ */ Symbol("STYLER");
+var IS_EMPTY = /* @__PURE__ */ Symbol("IS_EMPTY");
+var levelMapping = [
+  "ansi",
+  "ansi",
+  "ansi256",
+  "ansi16m"
+];
+var styles2 = /* @__PURE__ */ Object.create(null);
+var applyOptions = (object, options = {}) => {
+  if (options.level && !(Number.isInteger(options.level) && options.level >= 0 && options.level <= 3)) {
+    throw new Error("The `level` option should be an integer from 0 to 3");
+  }
+  const colorLevel = stdoutColor ? stdoutColor.level : 0;
+  object.level = options.level === void 0 ? colorLevel : options.level;
+};
+var chalkFactory = (options) => {
+  const chalk2 = (...strings) => strings.join(" ");
+  applyOptions(chalk2, options);
+  Object.setPrototypeOf(chalk2, createChalk.prototype);
+  return chalk2;
+};
+function createChalk(options) {
+  return chalkFactory(options);
+}
+Object.setPrototypeOf(createChalk.prototype, Function.prototype);
+for (const [styleName, style] of Object.entries(ansi_styles_default)) {
+  styles2[styleName] = {
+    get() {
+      const builder = createBuilder(this, createStyler(style.open, style.close, this[STYLER]), this[IS_EMPTY]);
+      Object.defineProperty(this, styleName, { value: builder });
+      return builder;
+    }
+  };
+}
+styles2.visible = {
+  get() {
+    const builder = createBuilder(this, this[STYLER], true);
+    Object.defineProperty(this, "visible", { value: builder });
+    return builder;
+  }
+};
+var getModelAnsi = (model, level, type, ...arguments_) => {
+  if (model === "rgb") {
+    if (level === "ansi16m") {
+      return ansi_styles_default[type].ansi16m(...arguments_);
+    }
+    if (level === "ansi256") {
+      return ansi_styles_default[type].ansi256(ansi_styles_default.rgbToAnsi256(...arguments_));
+    }
+    return ansi_styles_default[type].ansi(ansi_styles_default.rgbToAnsi(...arguments_));
+  }
+  if (model === "hex") {
+    return getModelAnsi("rgb", level, type, ...ansi_styles_default.hexToRgb(...arguments_));
+  }
+  return ansi_styles_default[type][model](...arguments_);
+};
+var usedModels = ["rgb", "hex", "ansi256"];
+for (const model of usedModels) {
+  styles2[model] = {
+    get() {
+      const { level } = this;
+      return function(...arguments_) {
+        const styler = createStyler(getModelAnsi(model, levelMapping[level], "color", ...arguments_), ansi_styles_default.color.close, this[STYLER]);
+        return createBuilder(this, styler, this[IS_EMPTY]);
+      };
+    }
+  };
+  const bgModel = "bg" + model[0].toUpperCase() + model.slice(1);
+  styles2[bgModel] = {
+    get() {
+      const { level } = this;
+      return function(...arguments_) {
+        const styler = createStyler(getModelAnsi(model, levelMapping[level], "bgColor", ...arguments_), ansi_styles_default.bgColor.close, this[STYLER]);
+        return createBuilder(this, styler, this[IS_EMPTY]);
+      };
+    }
+  };
+}
+var proto = Object.defineProperties(() => {
+}, {
+  ...styles2,
+  level: {
+    enumerable: true,
+    get() {
+      return this[GENERATOR].level;
+    },
+    set(level) {
+      this[GENERATOR].level = level;
+    }
+  }
+});
+var createStyler = (open, close, parent) => {
+  let openAll;
+  let closeAll;
+  if (parent === void 0) {
+    openAll = open;
+    closeAll = close;
+  } else {
+    openAll = parent.openAll + open;
+    closeAll = close + parent.closeAll;
+  }
+  return {
+    open,
+    close,
+    openAll,
+    closeAll,
+    parent
+  };
+};
+var createBuilder = (self, _styler, _isEmpty) => {
+  const builder = (...arguments_) => applyStyle(builder, arguments_.length === 1 ? "" + arguments_[0] : arguments_.join(" "));
+  Object.setPrototypeOf(builder, proto);
+  builder[GENERATOR] = self;
+  builder[STYLER] = _styler;
+  builder[IS_EMPTY] = _isEmpty;
+  return builder;
+};
+var applyStyle = (self, string) => {
+  if (self.level <= 0 || !string) {
+    return self[IS_EMPTY] ? "" : string;
+  }
+  let styler = self[STYLER];
+  if (styler === void 0) {
+    return string;
+  }
+  const { openAll, closeAll } = styler;
+  if (string.includes("\x1B")) {
+    while (styler !== void 0) {
+      string = stringReplaceAll(string, styler.close, styler.open);
+      styler = styler.parent;
+    }
+  }
+  const lfIndex = string.indexOf("\n");
+  if (lfIndex !== -1) {
+    string = stringEncaseCRLFWithFirstIndex(string, closeAll, openAll, lfIndex);
+  }
+  return openAll + string + closeAll;
+};
+Object.defineProperties(createChalk.prototype, styles2);
+var chalk = createChalk();
+var chalkStderr = createChalk({ level: stderrColor ? stderrColor.level : 0 });
+var source_default = chalk;
+
+// src/components/MessageView.tsx
 import { marked } from "marked";
 import { markedTerminal } from "marked-terminal";
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
+if (source_default.level === 0) source_default.level = 3;
 marked.use(markedTerminal());
 function renderMarkdown(text) {
   try {
-    const out = marked.parse(text);
-    return out.replace(/\n+$/, "");
+    let out = marked.parse(text);
+    out = out.replace(/\n+$/, "");
+    out = out.replace(/\*\*([^\n*]+?)\*\*/g, (_, body) => `\x1B[1m${body}\x1B[22m`);
+    out = out.replace(/(?<![*\\\x1b])\*([^\n*]+?)\*(?!\*)/g, (_, body) => `\x1B[3m${body}\x1B[23m`);
+    out = out.replace(/\x1b\[0m/g, "");
+    return out;
   } catch {
     return text;
   }
 }
-function MessageView({ message }) {
+function MessageView({
+  message,
+  resultsByCallId
+}) {
   switch (message.role) {
     case "user":
       return /* @__PURE__ */ jsx3(UserMessage, { content: typeof message.content === "string" ? message.content : flattenText(message.content) });
     case "assistant":
-      return /* @__PURE__ */ jsx3(AssistantMessage, { content: message.content });
+      return /* @__PURE__ */ jsx3(AssistantMessage, { content: message.content, resultsByCallId });
     case "tool":
       if (message.toolName === "TodoWrite") return null;
-      return /* @__PURE__ */ jsx3(
-        ToolResultLine,
-        {
-          isError: message.isError ?? false,
-          content: message.content,
-          diff: message.diff,
-          summary: message.summary,
-          kind: message.kind
-        }
-      );
+      return /* @__PURE__ */ jsx3(ToolResultTree, { result: message, standalone: true });
     case "system":
       return null;
   }
@@ -281,13 +807,38 @@ function flattenText(parts) {
   return parts.filter((p) => p.type === "text").map((p) => p.text).join("\n");
 }
 var DOT = "\u23FA";
+var USER_BG = "#262626";
 function UserMessage({ content }) {
-  return /* @__PURE__ */ jsxs3(Box2, { flexDirection: "row", marginTop: 1, children: [
-    /* @__PURE__ */ jsx3(Text3, { color: "cyan", bold: true, children: "> " }),
-    /* @__PURE__ */ jsx3(Text3, { children: content })
+  const { stdout } = useStdout();
+  const termWidth = stdout?.columns ?? 80;
+  const bandWidth = Math.max(1, termWidth - 1);
+  const PREFIX = " \u203A ";
+  const PREFIX_W = 3;
+  const rendered = useMemo(() => renderMarkdown(content), [content]);
+  const lines = rendered.split("\n");
+  const bg = source_default.bgHex(USER_BG);
+  const prefixStyle = source_default.gray.bold;
+  const padRow = bg(" ".repeat(bandWidth));
+  return /* @__PURE__ */ jsxs3(Box2, { flexDirection: "column", marginTop: 1, children: [
+    /* @__PURE__ */ jsx3(Text3, { children: padRow }),
+    lines.map((line, i) => {
+      const visible = stringWidth(stripAnsi(line));
+      const padLen = Math.max(0, bandWidth - PREFIX_W - visible);
+      const prefix = i === 0 ? PREFIX : "   ";
+      const fullLine = bg(prefixStyle(prefix) + line + " ".repeat(padLen));
+      return /* @__PURE__ */ jsx3(Text3, { children: fullLine }, i);
+    }),
+    /* @__PURE__ */ jsx3(Text3, { children: padRow })
   ] });
 }
-function AssistantMessage({ content }) {
+var ANSI_RE = /\x1b\[[0-9;]*m/g;
+function stripAnsi(s) {
+  return s.replace(ANSI_RE, "");
+}
+function AssistantMessage({
+  content,
+  resultsByCallId
+}) {
   return /* @__PURE__ */ jsx3(Box2, { flexDirection: "column", marginTop: 1, children: content.map((part, i) => {
     if (part.type === "text") {
       return /* @__PURE__ */ jsx3(AssistantTextPart, { text: part.text }, i);
@@ -296,7 +847,8 @@ function AssistantMessage({ content }) {
       if (part.name === "TodoWrite") {
         return /* @__PURE__ */ jsx3(TodoList, { todos: extractTodos(part.args) }, i);
       }
-      return /* @__PURE__ */ jsx3(ToolCallLine, { name: part.name, args: part.args }, i);
+      const result = resultsByCallId?.get(part.id);
+      return /* @__PURE__ */ jsx3(ToolCallBlock, { name: part.name, args: part.args, result }, i);
     }
     return null;
   }) });
@@ -360,36 +912,50 @@ function TodoRow({ todo }) {
       ] });
   }
 }
-function ToolResultLine({
-  isError,
-  content,
-  diff,
-  summary,
-  kind
+function ToolCallBlock({
+  name,
+  args,
+  result
 }) {
-  const fallback = (() => {
-    const preview = content.length > 200 ? content.slice(0, 200) + "\u2026" : content;
-    return preview.split("\n")[0];
-  })();
-  const headLine = summary ?? fallback;
-  const totalLines = content.split("\n").length;
-  const extra = totalLines > 1 ? ` (+${totalLines - 1} lines)` : "";
-  const effective = kind ?? (isError ? "error" : "success");
+  return /* @__PURE__ */ jsxs3(Box2, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx3(ToolCallLine, { name, args }),
+    result && /* @__PURE__ */ jsx3(ToolResultTree, { result })
+  ] });
+}
+var MAX_RESULT_LINES = 5;
+function ToolResultTree({ result, standalone = false }) {
+  const isError = result.isError ?? false;
+  const effective = result.kind ?? (isError ? "error" : "success");
   const dotColor = effective === "error" ? "red" : effective === "warn" ? "yellowBright" : "green";
-  return /* @__PURE__ */ jsxs3(Box2, { flexDirection: "column", marginLeft: 2, children: [
-    /* @__PURE__ */ jsxs3(Box2, { flexDirection: "row", children: [
-      /* @__PURE__ */ jsxs3(Text3, { color: dotColor, children: [
-        DOT,
-        " "
-      ] }),
-      /* @__PURE__ */ jsx3(Box2, { flexGrow: 1, minWidth: 0, children: /* @__PURE__ */ jsxs3(Text3, { dimColor: true, wrap: "truncate-end", children: [
-        headLine,
-        extra
-      ] }) })
-    ] }),
-    diff && /* @__PURE__ */ jsx3(DiffBlock, { diff })
+  const cleaned = stripWrapperTags(result.content);
+  const rawLines = cleaned.split("\n");
+  while (rawLines.length > 0 && rawLines[rawLines.length - 1].trim() === "") rawLines.pop();
+  while (rawLines.length > 0 && rawLines[0].trim() === "") rawLines.shift();
+  let displayLines;
+  let omitted = 0;
+  if (result.summary) {
+    const extra = rawLines.length > 1 ? ` (+${rawLines.length - 1} lines)` : "";
+    displayLines = [result.summary + extra];
+  } else if (rawLines.length === 0) {
+    displayLines = ["(no output)"];
+  } else if (rawLines.length <= MAX_RESULT_LINES) {
+    displayLines = rawLines;
+  } else {
+    displayLines = rawLines.slice(0, MAX_RESULT_LINES);
+    omitted = rawLines.length - MAX_RESULT_LINES;
+  }
+  return /* @__PURE__ */ jsxs3(Box2, { flexDirection: "column", marginLeft: 2, marginTop: standalone ? 1 : 0, children: [
+    displayLines.map((line, i) => /* @__PURE__ */ jsxs3(Box2, { flexDirection: "row", children: [
+      /* @__PURE__ */ jsx3(Text3, { color: i === 0 ? dotColor : void 0, children: i === 0 ? "\u2514 " : "  " }),
+      /* @__PURE__ */ jsx3(Box2, { flexGrow: 1, minWidth: 0, children: /* @__PURE__ */ jsx3(Text3, { dimColor: true, wrap: "truncate-end", children: line || " " }) })
+    ] }, i)),
+    omitted > 0 && /* @__PURE__ */ jsx3(Box2, { marginLeft: 2, children: /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: `(+${omitted} more lines)` }) }),
+    result.diff && /* @__PURE__ */ jsx3(DiffBlock, { diff: result.diff })
   ] });
 }
+function stripWrapperTags(content) {
+  return content.split("\n").filter((l) => !/^<\/?(stdout|stderr|timeout|exit_code)>\s*$/.test(l.trim())).join("\n");
+}
 function DiffBlock({ diff }) {
   const lines = diff.split("\n");
   const start = lines.findIndex((l) => l.startsWith("@@"));
@@ -676,9 +1242,340 @@ function formatTime(iso) {
   return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
 }
 
-// src/components/SlashAutocomplete.tsx
-import { Box as Box7, Text as Text8 } from "ink";
+// src/components/QuestionPicker.tsx
+import { useState as useState4 } from "react";
+import { Box as Box7, Text as Text8, useInput as useInput4 } from "ink";
 import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
+var POINTER_COLOR2 = "#A855F7";
+var FOCUS_BG = "#5B5598";
+var FOCUS_FG = "white";
+var SUBMIT_COLOR = "green";
+var NOTES_LABEL_COLOR = "yellow";
+var PREVIEW_BORDER = "gray";
+var TAB_GAP = 3;
+var PREVIEW_MIN_WIDTH = 28;
+function QuestionPicker({ request }) {
+  const { questions } = request;
+  const N = questions.length;
+  const hasTabs = N > 1;
+  const submitTabIndex = N;
+  const [tabIndex, setTabIndex] = useState4(0);
+  const [states, setStates] = useState4(
+    () => questions.map(() => ({
+      optionIndex: 0,
+      selected: /* @__PURE__ */ new Set(),
+      notes: "",
+      notesEditing: false,
+      notesDraft: ""
+    }))
+  );
+  const currentQ = tabIndex < N ? questions[tabIndex] : null;
+  const isMulti = currentQ?.multiSelect === true;
+  const onSubmitChip = hasTabs && tabIndex === submitTabIndex;
+  const anyPreview = !!currentQ?.options.some((o) => o.preview);
+  const focusedOpt = currentQ?.options[states[tabIndex]?.optionIndex ?? 0];
+  const focusedPreview = anyPreview ? focusedOpt?.preview ?? "" : "";
+  const buildResponses = (cancelled) => {
+    if (cancelled) return questions.map(() => ({ cancelled: true, selections: [] }));
+    return questions.map((q, qi) => ({
+      cancelled: false,
+      selections: Array.from(states[qi].selected).sort((a, b) => a - b).map((i) => q.options[i].label),
+      notes: states[qi].notes
+    }));
+  };
+  const submit = () => request.resolve(buildResponses(false));
+  const cancel = () => request.resolve(buildResponses(true));
+  const updateState = (qi, mut) => {
+    setStates((prev) => {
+      const next = [...prev];
+      next[qi] = mut(prev[qi]);
+      return next;
+    });
+  };
+  const toggleOption = (qi, oi) => {
+    updateState(qi, (s) => {
+      const sel = new Set(s.selected);
+      if (sel.has(oi)) sel.delete(oi);
+      else sel.add(oi);
+      return { ...s, selected: sel };
+    });
+  };
+  const selectSingleOption = (qi, oi) => {
+    updateState(qi, (s) => ({ ...s, selected: /* @__PURE__ */ new Set([oi]) }));
+    if (!hasTabs) {
+      request.resolve([
+        {
+          cancelled: false,
+          selections: [questions[0].options[oi].label],
+          notes: states[0].notes
+        }
+      ]);
+      return;
+    }
+    if (qi < N - 1) setTabIndex(qi + 1);
+    else setTabIndex(submitTabIndex);
+  };
+  const singleQMultiSubmitRowIndex = !hasTabs && isMulti ? currentQ.options.length : -1;
+  const optionRowCount = !hasTabs && isMulti ? currentQ.options.length + 1 : currentQ?.options.length ?? 0;
+  const currentNotesEditing = tabIndex < N ? states[tabIndex].notesEditing : false;
+  useInput4((input, key) => {
+    if (currentNotesEditing) {
+      if (key.escape) {
+        updateState(tabIndex, (s2) => ({ ...s2, notesEditing: false, notesDraft: "" }));
+        return;
+      }
+      if (key.return) {
+        updateState(tabIndex, (s2) => ({
+          ...s2,
+          notesEditing: false,
+          notes: s2.notesDraft,
+          notesDraft: ""
+        }));
+        return;
+      }
+      if (key.backspace || key.delete) {
+        updateState(tabIndex, (s2) => ({
+          ...s2,
+          notesDraft: s2.notesDraft.slice(0, -1)
+        }));
+        return;
+      }
+      if (key.ctrl || key.tab || key.upArrow || key.downArrow || key.leftArrow || key.rightArrow || key.meta) {
+        return;
+      }
+      if (input) {
+        updateState(tabIndex, (s2) => ({ ...s2, notesDraft: s2.notesDraft + input }));
+      }
+      return;
+    }
+    if (key.escape) {
+      cancel();
+      return;
+    }
+    if (hasTabs && (key.tab || key.leftArrow || key.rightArrow)) {
+      if (key.leftArrow || key.shift && key.tab) {
+        setTabIndex((t) => Math.max(0, t - 1));
+      } else {
+        setTabIndex((t) => Math.min(submitTabIndex, t + 1));
+      }
+      return;
+    }
+    if (onSubmitChip) {
+      if (key.return) submit();
+      return;
+    }
+    const qi = tabIndex;
+    const s = states[qi];
+    if (key.upArrow) {
+      updateState(qi, (st) => ({ ...st, optionIndex: Math.max(0, st.optionIndex - 1) }));
+      return;
+    }
+    if (key.downArrow) {
+      updateState(qi, (st) => ({
+        ...st,
+        optionIndex: Math.min(optionRowCount - 1, st.optionIndex + 1)
+      }));
+      return;
+    }
+    if (input === "n" && !key.ctrl && !key.meta) {
+      updateState(qi, (st) => ({
+        ...st,
+        notesEditing: true,
+        notesDraft: st.notes
+      }));
+      return;
+    }
+    if (key.return) {
+      if (!hasTabs && isMulti && s.optionIndex === singleQMultiSubmitRowIndex) {
+        submit();
+        return;
+      }
+      if (isMulti) toggleOption(qi, s.optionIndex);
+      else selectSingleOption(qi, s.optionIndex);
+      return;
+    }
+    if (isMulti && input === " " && s.optionIndex !== singleQMultiSubmitRowIndex) {
+      toggleOption(qi, s.optionIndex);
+    }
+  });
+  return /* @__PURE__ */ jsxs8(Box7, { flexDirection: "column", marginTop: 1, children: [
+    /* @__PURE__ */ jsx8(Divider, {}),
+    hasTabs && /* @__PURE__ */ jsx8(Box7, { marginTop: 0, children: /* @__PURE__ */ jsx8(TabBar, { questions, states, tabIndex }) }),
+    tabIndex < N && /* @__PURE__ */ jsxs8(Box7, { flexDirection: "column", marginTop: 1, children: [
+      /* @__PURE__ */ jsx8(Text8, { children: questions[tabIndex].question }),
+      /* @__PURE__ */ jsxs8(Box7, { flexDirection: "row", marginTop: 1, children: [
+        /* @__PURE__ */ jsx8(Box7, { flexDirection: "column", flexGrow: anyPreview ? 0 : 1, flexShrink: 0, marginRight: anyPreview ? 2 : 0, children: /* @__PURE__ */ jsx8(
+          OptionsList,
+          {
+            options: questions[tabIndex].options,
+            focusedIndex: states[tabIndex].optionIndex,
+            selected: states[tabIndex].selected,
+            isMulti,
+            submitRowIndex: singleQMultiSubmitRowIndex
+          }
+        ) }),
+        anyPreview && /* @__PURE__ */ jsx8(Box7, { flexGrow: 1, minWidth: PREVIEW_MIN_WIDTH, children: /* @__PURE__ */ jsx8(PreviewPanel, { content: focusedPreview }) })
+      ] }),
+      /* @__PURE__ */ jsx8(
+        NotesLine,
+        {
+          notes: states[tabIndex].notes,
+          editing: states[tabIndex].notesEditing,
+          draft: states[tabIndex].notesDraft
+        }
+      )
+    ] }),
+    onSubmitChip && /* @__PURE__ */ jsx8(Box7, { flexDirection: "column", marginTop: 1, children: /* @__PURE__ */ jsx8(SubmitPreview, { questions, states }) }),
+    /* @__PURE__ */ jsx8(Divider, {}),
+    /* @__PURE__ */ jsx8(Box7, { children: /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: hintLine(hasTabs, isMulti, currentNotesEditing) }) })
+  ] });
+}
+function Divider() {
+  return /* @__PURE__ */ jsx8(Box7, { borderStyle: "single", borderTop: true, borderBottom: false, borderLeft: false, borderRight: false, borderColor: "gray" });
+}
+function TabBar({
+  questions,
+  states,
+  tabIndex
+}) {
+  const submitIndex = questions.length;
+  const canLeft = tabIndex > 0;
+  const canRight = tabIndex < submitIndex;
+  return /* @__PURE__ */ jsxs8(Box7, { flexDirection: "row", flexWrap: "wrap", children: [
+    /* @__PURE__ */ jsx8(Box7, { marginRight: 1, children: /* @__PURE__ */ jsx8(Text8, { dimColor: !canLeft, children: "\u2190" }) }),
+    questions.map((q, i) => {
+      const focused = i === tabIndex;
+      const isMulti = q.multiSelect === true;
+      const count = states[i].selected.size;
+      const answered = count > 0;
+      const mark = answered ? isMulti ? `[${count}]` : "\u2714" : "\u25A1";
+      return /* @__PURE__ */ jsx8(Box7, { marginRight: TAB_GAP, children: /* @__PURE__ */ jsx8(
+        Text8,
+        {
+          backgroundColor: focused ? FOCUS_BG : void 0,
+          color: focused ? FOCUS_FG : void 0,
+          bold: focused,
+          dimColor: !focused,
+          children: ` ${mark} ${q.header} `
+        }
+      ) }, i);
+    }),
+    /* @__PURE__ */ jsx8(Box7, { marginRight: 1, children: /* @__PURE__ */ jsx8(
+      Text8,
+      {
+        backgroundColor: tabIndex === submitIndex ? FOCUS_BG : void 0,
+        color: tabIndex === submitIndex ? FOCUS_FG : SUBMIT_COLOR,
+        bold: tabIndex === submitIndex,
+        dimColor: tabIndex !== submitIndex,
+        children: " \u2714 Submit "
+      }
+    ) }),
+    /* @__PURE__ */ jsx8(Text8, { dimColor: !canRight, children: "\u2192" })
+  ] });
+}
+function OptionsList({
+  options,
+  focusedIndex,
+  selected,
+  isMulti,
+  submitRowIndex
+}) {
+  return /* @__PURE__ */ jsxs8(Box7, { flexDirection: "column", children: [
+    options.map((opt, i) => {
+      const focused = i === focusedIndex;
+      const checked = selected.has(i);
+      return /* @__PURE__ */ jsxs8(Box7, { flexDirection: "column", children: [
+        /* @__PURE__ */ jsxs8(Box7, { flexDirection: "row", children: [
+          /* @__PURE__ */ jsx8(Text8, { color: POINTER_COLOR2, bold: true, children: focused ? "\u203A " : "  " }),
+          isMulti && /* @__PURE__ */ jsx8(Text8, { color: checked ? "green" : void 0, children: checked ? "[x] " : "[ ] " }),
+          /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: `${i + 1}. ` }),
+          /* @__PURE__ */ jsx8(Text8, { color: focused ? POINTER_COLOR2 : void 0, bold: focused, children: opt.label })
+        ] }),
+        opt.description && /* @__PURE__ */ jsx8(Box7, { marginLeft: isMulti ? 6 : 5, children: /* @__PURE__ */ jsx8(Text8, { dimColor: true, wrap: "truncate-end", children: opt.description }) })
+      ] }, i);
+    }),
+    submitRowIndex >= 0 && /* @__PURE__ */ jsxs8(Box7, { flexDirection: "row", marginTop: 1, children: [
+      /* @__PURE__ */ jsx8(Text8, { color: POINTER_COLOR2, bold: true, children: focusedIndex === submitRowIndex ? "\u203A " : "  " }),
+      /* @__PURE__ */ jsx8(
+        Text8,
+        {
+          color: focusedIndex === submitRowIndex ? SUBMIT_COLOR : void 0,
+          bold: focusedIndex === submitRowIndex,
+          dimColor: focusedIndex !== submitRowIndex,
+          children: `\u2500\u2500 Submit (${selected.size} selected)`
+        }
+      )
+    ] })
+  ] });
+}
+function PreviewPanel({ content }) {
+  const lines = content ? content.split("\n") : ["(no preview)"];
+  return /* @__PURE__ */ jsx8(
+    Box7,
+    {
+      borderStyle: "round",
+      borderColor: PREVIEW_BORDER,
+      flexDirection: "column",
+      paddingX: 1,
+      flexGrow: 1,
+      children: lines.map((line, i) => /* @__PURE__ */ jsx8(Text8, { wrap: "truncate-end", dimColor: !content, children: line || " " }, i))
+    }
+  );
+}
+function NotesLine({
+  notes,
+  editing,
+  draft
+}) {
+  if (editing) {
+    return /* @__PURE__ */ jsxs8(Box7, { marginTop: 1, flexDirection: "row", children: [
+      /* @__PURE__ */ jsx8(Text8, { color: NOTES_LABEL_COLOR, bold: true, children: "Notes: " }),
+      /* @__PURE__ */ jsx8(Text8, { children: draft }),
+      /* @__PURE__ */ jsx8(Text8, { color: POINTER_COLOR2, children: "\u258E" }),
+      /* @__PURE__ */ jsx8(Box7, { flexGrow: 1, marginLeft: 2, children: /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: "(Enter to save \xB7 Esc to discard)" }) })
+    ] });
+  }
+  return /* @__PURE__ */ jsxs8(Box7, { marginTop: 1, flexDirection: "row", justifyContent: "center", children: [
+    /* @__PURE__ */ jsx8(Text8, { color: NOTES_LABEL_COLOR, bold: true, children: "Notes: " }),
+    notes ? /* @__PURE__ */ jsx8(Text8, { children: notes }) : /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: "press n to add notes" })
+  ] });
+}
+function SubmitPreview({
+  questions,
+  states
+}) {
+  return /* @__PURE__ */ jsxs8(Box7, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx8(Text8, { bold: true, children: "Review" }),
+    questions.map((q, qi) => {
+      const sel = Array.from(states[qi].selected).sort((a, b) => a - b).map((i) => q.options[i].label);
+      const notes = states[qi].notes.trim();
+      return /* @__PURE__ */ jsxs8(Box7, { flexDirection: "column", marginLeft: 2, children: [
+        /* @__PURE__ */ jsxs8(Box7, { flexDirection: "row", children: [
+          /* @__PURE__ */ jsx8(Text8, { color: "yellow", children: `${q.header}: ` }),
+          /* @__PURE__ */ jsx8(Text8, { dimColor: sel.length === 0, children: sel.length > 0 ? sel.join(", ") : "(no answer)" })
+        ] }),
+        notes && /* @__PURE__ */ jsxs8(Box7, { marginLeft: 2, flexDirection: "row", children: [
+          /* @__PURE__ */ jsx8(Text8, { color: NOTES_LABEL_COLOR, children: "notes: " }),
+          /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: notes })
+        ] })
+      ] }, qi);
+    })
+  ] });
+}
+function hintLine(hasTabs, isMulti, editingNotes) {
+  if (editingNotes) {
+    return "Enter to save \xB7 Esc to discard \xB7 backspace to delete";
+  }
+  const parts = ["Enter to select", "\u2191/\u2193 to navigate", "n to add notes"];
+  if (hasTabs) parts.push("Tab to switch questions");
+  if (isMulti) parts.push("Space to toggle");
+  parts.push("Esc to cancel");
+  return parts.join(" \xB7 ");
+}
+
+// src/components/SlashAutocomplete.tsx
+import { Box as Box8, Text as Text9 } from "ink";
+import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
 var DEFAULT_MAX = 10;
 var SLASH_COLOR = "#A855F7";
 function SlashAutocomplete({ matches, index, maxVisible = DEFAULT_MAX }) {
@@ -687,33 +1584,33 @@ function SlashAutocomplete({ matches, index, maxVisible = DEFAULT_MAX }) {
   const end = Math.min(matches.length, start + maxVisible);
   const visible = matches.slice(start, end);
   const nameWidth = Math.max(...matches.map((c) => c.name.length));
-  return /* @__PURE__ */ jsxs8(Box7, { flexDirection: "column", marginTop: 1, children: [
+  return /* @__PURE__ */ jsxs9(Box8, { flexDirection: "column", marginTop: 1, children: [
     visible.map((cmd, i) => {
       const realIndex = start + i;
-      return /* @__PURE__ */ jsx8(Row, { cmd, focused: realIndex === index, nameWidth }, cmd.name);
+      return /* @__PURE__ */ jsx9(Row, { cmd, focused: realIndex === index, nameWidth }, cmd.name);
     }),
-    matches.length > visible.length && /* @__PURE__ */ jsx8(Box7, { marginLeft: 2, children: /* @__PURE__ */ jsxs8(Text8, { dimColor: true, children: [
+    matches.length > visible.length && /* @__PURE__ */ jsx9(Box8, { marginLeft: 2, children: /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
       "\u2191\u2193 select \xB7 Tab/Enter accept \xB7 Esc cancel  (",
       matches.length - visible.length,
       " more)"
     ] }) }),
-    matches.length <= visible.length && /* @__PURE__ */ jsx8(Box7, { marginLeft: 2, children: /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: "\u2191\u2193 select \xB7 Tab/Enter accept \xB7 Esc cancel" }) })
+    matches.length <= visible.length && /* @__PURE__ */ jsx9(Box8, { marginLeft: 2, children: /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: "\u2191\u2193 select \xB7 Tab/Enter accept \xB7 Esc cancel" }) })
   ] });
 }
 function Row({ cmd, focused, nameWidth }) {
   const padded = cmd.name.padEnd(nameWidth);
-  return /* @__PURE__ */ jsxs8(Box7, { flexDirection: "row", children: [
-    /* @__PURE__ */ jsxs8(Text8, { color: focused ? SLASH_COLOR : void 0, bold: focused, children: [
+  return /* @__PURE__ */ jsxs9(Box8, { flexDirection: "row", children: [
+    /* @__PURE__ */ jsxs9(Text9, { color: focused ? SLASH_COLOR : void 0, bold: focused, children: [
       "/",
       padded
     ] }),
-    /* @__PURE__ */ jsx8(Text8, { children: "   " }),
-    /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: cmd.description })
+    /* @__PURE__ */ jsx9(Text9, { children: "   " }),
+    /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: cmd.description })
   ] });
 }
 
 // src/components/PermissionModeBar.tsx
-import { Box as Box8, Text as Text9 } from "ink";
+import { Box as Box9, Text as Text10 } from "ink";
 
 // src/permission/index.ts
 var MODE_CYCLE = [
@@ -821,7 +1718,7 @@ var PermissionGate = class {
 };
 
 // src/components/PermissionModeBar.tsx
-import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
+import { jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
 function PermissionModeBar({ mode, compact }) {
   const color = MODE_COLOR[mode];
   const label = MODE_LABEL[mode];
@@ -833,23 +1730,23 @@ function PermissionModeBar({ mode, compact }) {
       plan: "[plan]",
       bypassPermissions: "[bypass]"
     };
-    return /* @__PURE__ */ jsxs9(Box8, { flexDirection: "row", children: [
-      /* @__PURE__ */ jsx9(Text9, { color, bold: isBypass, children: short[mode] }),
-      /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: " shift+tab" })
+    return /* @__PURE__ */ jsxs10(Box9, { flexDirection: "row", children: [
+      /* @__PURE__ */ jsx10(Text10, { color, bold: isBypass, children: short[mode] }),
+      /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: " shift+tab" })
     ] });
   }
-  return /* @__PURE__ */ jsxs9(Box8, { flexDirection: "row", children: [
-    /* @__PURE__ */ jsxs9(Text9, { color, bold: isBypass, children: [
+  return /* @__PURE__ */ jsxs10(Box9, { flexDirection: "row", children: [
+    /* @__PURE__ */ jsxs10(Text10, { color, bold: isBypass, children: [
       "\u25B8\u25B8 ",
       label
     ] }),
-    /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: " (shift+tab to cycle)" })
+    /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: " (shift+tab to cycle)" })
   ] });
 }
 
 // src/components/FooterStatus.tsx
-import { Box as Box9, Text as Text10 } from "ink";
-import { Fragment, jsx as jsx10, jsxs as jsxs10 } from "react/jsx-runtime";
+import { Box as Box10, Text as Text11 } from "ink";
+import { Fragment, jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
 var BAR_TOTAL_WIDE = 10;
 var BAR_TOTAL_COMPACT = 6;
 function FooterStatus({
@@ -865,57 +1762,57 @@ function FooterStatus({
   const hasCtx = contextWindow > 0;
   const pct = hasCtx ? Math.min(100, Math.round(lastInputTokens / contextWindow * 100)) : 0;
   const ctxColor = pct >= 90 ? "red" : pct >= 70 ? "yellow" : "green";
-  const SEP = /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: " \u2502 " });
-  const SEP_DOT = /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: " \xB7 " });
+  const SEP = /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: " \u2502 " });
+  const SEP_DOT = /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: " \xB7 " });
   const renderBar = (barW) => {
     const filled = Math.round(pct / 100 * barW);
     const empty = barW - filled;
-    return /* @__PURE__ */ jsxs10(Fragment, { children: [
-      filled > 0 && /* @__PURE__ */ jsx10(Text10, { color: ctxColor, children: "\u2588".repeat(filled) }),
-      empty > 0 && /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: "\u2591".repeat(empty) })
+    return /* @__PURE__ */ jsxs11(Fragment, { children: [
+      filled > 0 && /* @__PURE__ */ jsx11(Text11, { color: ctxColor, children: "\u2588".repeat(filled) }),
+      empty > 0 && /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: "\u2591".repeat(empty) })
     ] });
   };
   if (termWidth < 60) {
-    return /* @__PURE__ */ jsxs10(Box9, { flexDirection: "row", children: [
-      /* @__PURE__ */ jsx10(Text10, { color: "cyan", bold: true, children: sid }),
+    return /* @__PURE__ */ jsxs11(Box10, { flexDirection: "row", children: [
+      /* @__PURE__ */ jsx11(Text11, { color: "cyan", bold: true, children: sid }),
       SEP_DOT,
-      /* @__PURE__ */ jsx10(Text10, { color: "magenta", children: model }),
-      hasCtx && /* @__PURE__ */ jsxs10(Fragment, { children: [
+      /* @__PURE__ */ jsx11(Text11, { color: "magenta", children: model }),
+      hasCtx && /* @__PURE__ */ jsxs11(Fragment, { children: [
         SEP_DOT,
         renderBar(BAR_TOTAL_COMPACT),
-        /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: ` ${pct}%` })
+        /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: ` ${pct}%` })
       ] })
     ] });
   }
   if (termWidth < 100) {
-    return /* @__PURE__ */ jsxs10(Box9, { flexDirection: "row", children: [
-      /* @__PURE__ */ jsx10(Text10, { color: "cyan", bold: true, children: `@${sid}` }),
+    return /* @__PURE__ */ jsxs11(Box10, { flexDirection: "row", children: [
+      /* @__PURE__ */ jsx11(Text11, { color: "cyan", bold: true, children: `@${sid}` }),
       SEP,
-      /* @__PURE__ */ jsx10(Text10, { color: "magenta", children: model }),
-      hasCtx && /* @__PURE__ */ jsxs10(Fragment, { children: [
+      /* @__PURE__ */ jsx11(Text11, { color: "magenta", children: model }),
+      hasCtx && /* @__PURE__ */ jsxs11(Fragment, { children: [
         SEP,
-        /* @__PURE__ */ jsx10(Text10, { children: "ctx: " }),
+        /* @__PURE__ */ jsx11(Text11, { children: "ctx: " }),
         renderBar(BAR_TOTAL_COMPACT),
-        /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: ` ${pct}%` })
+        /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: ` ${pct}%` })
       ] })
     ] });
   }
-  return /* @__PURE__ */ jsxs10(Box9, { flexDirection: "row", children: [
-    /* @__PURE__ */ jsx10(Text10, { color: "cyan", bold: true, children: `@${sid}` }),
+  return /* @__PURE__ */ jsxs11(Box10, { flexDirection: "row", children: [
+    /* @__PURE__ */ jsx11(Text11, { color: "cyan", bold: true, children: `@${sid}` }),
     SEP,
-    /* @__PURE__ */ jsx10(Text10, { color: "magenta", children: model }),
-    hasCtx && /* @__PURE__ */ jsxs10(Fragment, { children: [
+    /* @__PURE__ */ jsx11(Text11, { color: "magenta", children: model }),
+    hasCtx && /* @__PURE__ */ jsxs11(Fragment, { children: [
       SEP,
-      /* @__PURE__ */ jsx10(Text10, { children: "ctx: " }),
+      /* @__PURE__ */ jsx11(Text11, { children: "ctx: " }),
       renderBar(BAR_TOTAL_WIDE),
-      /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: ` ${pct}%` }),
-      /* @__PURE__ */ jsx10(Text10, { dimColor: true, children: `  ${formatTokens(lastInputTokens)}/${formatTokens(contextWindow)}` })
+      /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: ` ${pct}%` }),
+      /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: `  ${formatTokens(lastInputTokens)}/${formatTokens(contextWindow)}` })
     ] }),
     SEP,
-    /* @__PURE__ */ jsx10(Text10, { children: "tok: " }),
-    /* @__PURE__ */ jsx10(Text10, { color: "green", children: `\u2191${formatTokens(sessionInputTokens)}` }),
-    /* @__PURE__ */ jsx10(Text10, { children: " " }),
-    /* @__PURE__ */ jsx10(Text10, { color: "blueBright", children: `\u2193${formatTokens(sessionOutputTokens)}` })
+    /* @__PURE__ */ jsx11(Text11, { children: "tok: " }),
+    /* @__PURE__ */ jsx11(Text11, { color: "green", children: `\u2191${formatTokens(sessionInputTokens)}` }),
+    /* @__PURE__ */ jsx11(Text11, { children: " " }),
+    /* @__PURE__ */ jsx11(Text11, { color: "blueBright", children: `\u2193${formatTokens(sessionOutputTokens)}` })
   ] });
 }
 function formatTokens(n) {
@@ -926,14 +1823,14 @@ function formatTokens(n) {
 }
 
 // src/components/ProgressBanner.tsx
-import { useEffect as useEffect2, useState as useState4 } from "react";
-import { Box as Box10, Text as Text11 } from "ink";
-import { jsx as jsx11, jsxs as jsxs11 } from "react/jsx-runtime";
+import { useEffect as useEffect2, useState as useState5 } from "react";
+import { Box as Box11, Text as Text12 } from "ink";
+import { jsx as jsx12, jsxs as jsxs12 } from "react/jsx-runtime";
 var BAR_WIDTH = 42;
 var TICK_MS = 400;
 var TIP_ROTATE_SEC = 5;
 function ProgressBanner({ state }) {
-  const [now, setNow] = useState4(Date.now());
+  const [now, setNow] = useState5(Date.now());
   useEffect2(() => {
     const t = setInterval(() => setNow(Date.now()), TICK_MS);
     return () => clearInterval(t);
@@ -944,60 +1841,60 @@ function ProgressBanner({ state }) {
   const empty = BAR_WIDTH - filled;
   const bar = "\u25B0".repeat(filled) + "\u25B1".repeat(empty);
   const tip = state.tips.length ? state.tips[Math.floor(elapsedSec / TIP_ROTATE_SEC) % state.tips.length] : "";
-  return /* @__PURE__ */ jsxs11(Box10, { flexDirection: "column", marginTop: 1, children: [
-    /* @__PURE__ */ jsxs11(Box10, { children: [
-      /* @__PURE__ */ jsx11(Text11, { color: "cyan", bold: true, children: "\u2726 " }),
-      /* @__PURE__ */ jsxs11(Text11, { color: "cyan", children: [
+  return /* @__PURE__ */ jsxs12(Box11, { flexDirection: "column", marginTop: 1, children: [
+    /* @__PURE__ */ jsxs12(Box11, { children: [
+      /* @__PURE__ */ jsx12(Text12, { color: "cyan", bold: true, children: "\u2726 " }),
+      /* @__PURE__ */ jsxs12(Text12, { color: "cyan", children: [
         state.title,
         "..."
       ] }),
-      /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: ` (${elapsedSec}s)` })
+      /* @__PURE__ */ jsx12(Text12, { dimColor: true, children: ` (${elapsedSec}s)` })
     ] }),
-    /* @__PURE__ */ jsxs11(Box10, { marginLeft: 2, children: [
-      /* @__PURE__ */ jsx11(Text11, { color: "cyan", children: bar }),
-      /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: ` ${percent}%` })
+    /* @__PURE__ */ jsxs12(Box11, { marginLeft: 2, children: [
+      /* @__PURE__ */ jsx12(Text12, { color: "cyan", children: bar }),
+      /* @__PURE__ */ jsx12(Text12, { dimColor: true, children: ` ${percent}%` })
     ] }),
-    tip && /* @__PURE__ */ jsx11(Box10, { marginLeft: 2, children: /* @__PURE__ */ jsx11(Text11, { dimColor: true, children: `\u2514 Tip: ${tip}` }) })
+    tip && /* @__PURE__ */ jsx12(Box11, { marginLeft: 2, children: /* @__PURE__ */ jsx12(Text12, { dimColor: true, children: `\u2514 Tip: ${tip}` }) })
   ] });
 }
 
 // src/components/StatusLine.tsx
-import { useEffect as useEffect4, useState as useState6 } from "react";
-import { Box as Box11, Text as Text13 } from "ink";
+import { useEffect as useEffect4, useState as useState7 } from "react";
+import { Box as Box12, Text as Text14 } from "ink";
 
 // src/components/Shimmer.tsx
-import { useEffect as useEffect3, useState as useState5 } from "react";
-import { Text as Text12 } from "ink";
-import { jsx as jsx12 } from "react/jsx-runtime";
+import { useEffect as useEffect3, useState as useState6 } from "react";
+import { Text as Text13 } from "ink";
+import { jsx as jsx13 } from "react/jsx-runtime";
 var FRAME_MS = 100;
 var TRAIL = 4;
 function Shimmer({ text, bold = true }) {
   const chars = Array.from(text);
   const cycle = chars.length + TRAIL;
-  const [phase, setPhase] = useState5(0);
+  const [phase, setPhase] = useState6(0);
   useEffect3(() => {
     const id = setInterval(() => {
       setPhase((p) => (p + 1) % cycle);
     }, FRAME_MS);
     return () => clearInterval(id);
   }, [cycle]);
-  return /* @__PURE__ */ jsx12(Text12, { children: chars.map((ch, i) => {
+  return /* @__PURE__ */ jsx13(Text13, { children: chars.map((ch, i) => {
     const d = Math.abs(i - phase);
     if (d === 0) {
-      return /* @__PURE__ */ jsx12(Text12, { color: "white", bold, children: ch }, i);
+      return /* @__PURE__ */ jsx13(Text13, { color: "white", bold, children: ch }, i);
     }
     if (d === 1) {
-      return /* @__PURE__ */ jsx12(Text12, { color: "white", children: ch }, i);
+      return /* @__PURE__ */ jsx13(Text13, { color: "white", children: ch }, i);
     }
-    return /* @__PURE__ */ jsx12(Text12, { color: "gray", dimColor: true, children: ch }, i);
+    return /* @__PURE__ */ jsx13(Text13, { color: "gray", dimColor: true, children: ch }, i);
   }) });
 }
 
 // src/components/StatusLine.tsx
-import { jsx as jsx13, jsxs as jsxs12 } from "react/jsx-runtime";
+import { jsx as jsx14, jsxs as jsxs13 } from "react/jsx-runtime";
 var TICK_MS2 = 400;
 function StatusLine({ startTime, firstTextTime, inputTokens, runningTool, lang }) {
-  const [now, setNow] = useState6(Date.now());
+  const [now, setNow] = useState7(Date.now());
   useEffect4(() => {
     const t = setInterval(() => setNow(Date.now()), TICK_MS2);
     return () => clearInterval(t);
@@ -1014,15 +1911,15 @@ function StatusLine({ startTime, firstTextTime, inputTokens, runningTool, lang }
       lang === "zh-CN" ? `\u601D\u8003 ${formatDuration(thinkSec)}` : `thought for ${formatDuration(thinkSec)}`
     );
   }
-  return /* @__PURE__ */ jsxs12(Box11, { flexDirection: "column", marginTop: 1, children: [
-    /* @__PURE__ */ jsxs12(Box11, { flexDirection: "row", children: [
-      /* @__PURE__ */ jsx13(Text13, { color: "gray", children: "\u25CF " }),
-      /* @__PURE__ */ jsx13(Shimmer, { text: mainLabel }),
-      /* @__PURE__ */ jsx13(Text13, { dimColor: true, children: `  (${parts.join(" \xB7 ")})` })
+  return /* @__PURE__ */ jsxs13(Box12, { flexDirection: "column", marginTop: 1, children: [
+    /* @__PURE__ */ jsxs13(Box12, { flexDirection: "row", children: [
+      /* @__PURE__ */ jsx14(Text14, { color: "gray", children: "\u25CF " }),
+      /* @__PURE__ */ jsx14(Shimmer, { text: mainLabel }),
+      /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: `  (${parts.join(" \xB7 ")})` })
     ] }),
-    runningTool && /* @__PURE__ */ jsxs12(Box11, { flexDirection: "row", marginLeft: 2, marginTop: 0, children: [
-      /* @__PURE__ */ jsx13(Text13, { dimColor: true, children: "\u21B3 " }),
-      /* @__PURE__ */ jsx13(Text13, { color: "cyan", children: runningTool })
+    runningTool && /* @__PURE__ */ jsxs13(Box12, { flexDirection: "row", marginLeft: 2, marginTop: 0, children: [
+      /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: "\u21B3 " }),
+      /* @__PURE__ */ jsx14(Text14, { color: "cyan", children: runningTool })
     ] })
   ] });
 }
@@ -1597,6 +2494,7 @@ ${todoSection}` : this.ctx.systemPrompt;
         this.ctx.events?.onTurnEnd?.();
         return;
       }
+      this.ctx.events?.onAssistantTurn?.();
       for (const call of toolCallsToRun) {
         await this.runToolCall(call);
       }
@@ -1677,7 +2575,8 @@ ${todoSection}` : this.ctx.systemPrompt;
       abortSignal: this.ctx.abortSignal,
       askPermission: async () => true,
       // 已在外层处理
-      todos: this.todos
+      todos: this.todos,
+      askQuestions: this.ctx.events?.onAskQuestions ? (qs) => this.ctx.events.onAskQuestions(qs) : void 0
     };
     const result = await this.ctx.tools.execute(call.name, call.args, toolCtx);
     this.recordToolResult(call.id, call.name, result.content, result.isError ?? false, result.summary, result.diff, result.kind);
@@ -2834,7 +3733,7 @@ var BUILTIN_SLASH_COMMANDS = [
 ];
 
 // src/app.tsx
-import { jsx as jsx14, jsxs as jsxs13 } from "react/jsx-runtime";
+import { jsx as jsx15, jsxs as jsxs14 } from "react/jsx-runtime";
 function reducer(state, action) {
   switch (action.type) {
     case "user_submit":
@@ -2891,14 +3790,14 @@ function App({
   initialMessages
 }) {
   const { exit } = useApp();
-  const { stdout } = useStdout();
+  const { stdout } = useStdout2();
   const termWidth = stdout?.columns ?? 80;
-  const [llm, setLLM] = useState7(initialLLM);
-  const [permissions, setPermissions] = useState7(initialPermissions);
-  const [settings, setSettings] = useState7(initialSettings);
-  const [settingsSources, setSettingsSources] = useState7(initialSources);
-  const [modelsRegistry, setModelsRegistry] = useState7(initialModelsRegistry);
-  const [mode, setMode] = useState7(initialPermissions.getMode());
+  const [llm, setLLM] = useState8(initialLLM);
+  const [permissions, setPermissions] = useState8(initialPermissions);
+  const [settings, setSettings] = useState8(initialSettings);
+  const [settingsSources, setSettingsSources] = useState8(initialSources);
+  const [modelsRegistry, setModelsRegistry] = useState8(initialModelsRegistry);
+  const [mode, setMode] = useState8(initialPermissions.getMode());
   const [state, dispatch] = useReducer(reducer, {
     history: initialMessages ?? [],
     streamingText: "",
@@ -2912,20 +3811,32 @@ function App({
     turnInputTokens: 0
   });
   const messagesRef = useRef(initialMessages ?? []);
-  const [input, setInput] = useState7("");
-  const [inputRemountKey, setInputRemountKey] = useState7(0);
+  const [input, setInput] = useState8("");
+  const [inputRemountKey, setInputRemountKey] = useState8(0);
   const commitInput = (value) => {
     setInput(value);
     setInputRemountKey((k) => k + 1);
   };
-  const [pending, setPending] = useState7(null);
-  const [picker, setPicker] = useState7(null);
-  const [sessionPicker, setSessionPicker] = useState7(null);
-  const [autocompleteIndex, setAutocompleteIndex] = useState7(0);
-  const [progress, setProgress] = useState7(null);
+  const pasteRegistryRef = useRef({
+    map: /* @__PURE__ */ new Map(),
+    nextId: 1
+  });
+  const handlePaste = useCallback((chunk) => {
+    const reg = pasteRegistryRef.current;
+    const id = reg.nextId++;
+    reg.map.set(id, chunk);
+    const lines = chunk.split("\n").length;
+    return `[Pasted text #${id} +${lines} lines]`;
+  }, []);
+  const [pending, setPending] = useState8(null);
+  const [picker, setPicker] = useState8(null);
+  const [sessionPicker, setSessionPicker] = useState8(null);
+  const [questionPicker, setQuestionPicker] = useState8(null);
+  const [autocompleteIndex, setAutocompleteIndex] = useState8(0);
+  const [progress, setProgress] = useState8(null);
   const agentRef = useRef(null);
   const queuedInputsRef = useRef([]);
-  const [queuedInputs, setQueuedInputs] = useState7([]);
+  const [queuedInputs, setQueuedInputs] = useState8([]);
   const enqueueInput = (text) => {
     queuedInputsRef.current.push(text);
     setQueuedInputs([...queuedInputsRef.current]);
@@ -2979,7 +3890,7 @@ function App({
   useEffect5(() => {
     return () => resetTerminalTitle();
   }, []);
-  const [memoryIndex, setMemoryIndex] = useState7("");
+  const [memoryIndex, setMemoryIndex] = useState8("");
   useEffect5(() => {
     let cancelled = false;
     loadMemoryIndex(cwd).then((idx) => {
@@ -3008,7 +3919,22 @@ function App({
       events: {
         onText: (delta) => dispatch({ type: "stream_delta", delta }),
         onToolCallStart: (_id, name) => dispatch({ type: "tool_start", name }),
-        onToolResult: () => dispatch({ type: "set_status", status: "streaming" }),
+        // assistant 流刚结束、这一批 calls 已落到 messages 但 tool 还没开始执行：
+        // 立刻同步 history，让所有 ⏺ Tool(...) 调用头一次性显示出来（之前要等第一个
+        // result 才能见到任何东西，看起来像"卡死了"）
+        onAssistantTurn: () => {
+          const msgs = [...agent.getMessages()];
+          messagesRef.current = msgs;
+          dispatch({ type: "history_set", messages: msgs });
+          dispatch({ type: "stream_reset" });
+        },
+        // 每个 tool result 到位就同步：result 立刻挂到对应 ⏺ 调用的 └ 树枝下方
+        onToolResult: () => {
+          const msgs = [...agent.getMessages()];
+          messagesRef.current = msgs;
+          dispatch({ type: "history_set", messages: msgs });
+          dispatch({ type: "set_status", status: "streaming" });
+        },
         onUsage: (usage) => dispatch({ type: "add_usage", usage }),
         onTurnEnd: () => {
           const msgs = [...agent.getMessages()];
@@ -3020,7 +3946,8 @@ function App({
           if (next) {
             setTimeout(() => {
               dispatch({ type: "user_submit" });
-              agent.runTurn(next).catch((err) => {
+              const expanded = expandPastes(next, pasteRegistryRef.current.map);
+              agent.runTurn(expanded).catch((err) => {
                 const m = err instanceof Error ? err.message : String(err);
                 dispatch({ type: "stream_delta", delta: `
 [error] ${m}
@@ -3038,13 +3965,16 @@ function App({
         },
         onPermissionRequest: (toolName, args, summary) => new Promise((resolve6) => {
           setPending({ toolName, args, summary, resolve: resolve6 });
+        }),
+        onAskQuestions: (questions) => new Promise((resolve6) => {
+          setQuestionPicker({ questions, resolve: resolve6 });
         })
       }
     });
     agent.setMessages(messagesRef.current);
     agentRef.current = agent;
   }, [llm, tools, permissions, session, cwd, lang, memoryIndex]);
-  useInput4(
+  useInput5(
     (inputKey, key) => {
       if (key.ctrl && inputKey === "c") {
         exit();
@@ -3087,9 +4017,11 @@ function App({
     },
     // 模型在跑时也要响应键盘（让用户能 Ctrl+C / Shift+Tab / autocomplete 导航）；
     // 仅模态弹起时让出键盘所有权
-    { isActive: !pending && !picker && !sessionPicker }
+    { isActive: !pending && !picker && !sessionPicker && !questionPicker }
   );
-  const acceptingInput = pending === null && picker === null && sessionPicker === null;
+  const acceptingInput = pending === null && picker === null && sessionPicker === null && questionPicker === null;
+  const inputVisible = pending === null && picker === null && sessionPicker === null;
+  const inputPlaceholder = questionPicker ? "Chat about this" : void 0;
   const actions = useMemo2(
     () => ({
       setMessages: (msgs) => {
@@ -3221,8 +4153,15 @@ function App({
         return;
       }
       dispatch({ type: "user_submit" });
+      const expanded = expandPastes(trimmed, pasteRegistryRef.current.map);
+      {
+        const userMsg = { role: "user", content: expanded };
+        const next = [...messagesRef.current, userMsg];
+        messagesRef.current = next;
+        dispatch({ type: "history_set", messages: next });
+      }
       try {
-        await agentRef.current?.runTurn(trimmed);
+        await agentRef.current?.runTurn(expanded);
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         dispatch({ type: "stream_delta", delta: `
@@ -3249,19 +4188,35 @@ function App({
     }
   }
   const banner = !showBanner ? null : pickBanner(termWidth, { version: "0.1.0", model: llm.model, cwd: shortCwd(cwd) });
-  return /* @__PURE__ */ jsxs13(Box12, { flexDirection: "column", children: [
+  const { resultsByCallId, inlinedIds } = useMemo2(() => {
+    const byId = /* @__PURE__ */ new Map();
+    const used = /* @__PURE__ */ new Set();
+    for (const m of state.history) {
+      if (m.role === "tool" && m.toolUseId) byId.set(m.toolUseId, m);
+      if (m.role === "assistant" && Array.isArray(m.content)) {
+        for (const p of m.content) {
+          if (p.type === "tool_use") used.add(p.id);
+        }
+      }
+    }
+    return { resultsByCallId: byId, inlinedIds: used };
+  }, [state.history]);
+  return /* @__PURE__ */ jsxs14(Box13, { flexDirection: "column", children: [
     banner,
-    /* @__PURE__ */ jsxs13(Box12, { flexDirection: "column", marginTop: 1, children: [
-      state.history.map((msg, i) => /* @__PURE__ */ jsx14(MessageView, { message: msg }, i)),
-      state.streamingText && /* @__PURE__ */ jsxs13(Box12, { flexDirection: "row", marginTop: 1, children: [
-        /* @__PURE__ */ jsxs13(Text14, { color: "cyan", children: [
+    /* @__PURE__ */ jsxs14(Box13, { flexDirection: "column", marginTop: 1, children: [
+      state.history.map((msg, i) => {
+        if (msg.role === "tool" && inlinedIds.has(msg.toolUseId)) return null;
+        return /* @__PURE__ */ jsx15(MessageView, { message: msg, resultsByCallId }, i);
+      }),
+      state.streamingText && /* @__PURE__ */ jsxs14(Box13, { flexDirection: "row", marginTop: 1, children: [
+        /* @__PURE__ */ jsxs14(Text15, { color: "cyan", children: [
           DOT,
           " "
         ] }),
-        /* @__PURE__ */ jsx14(Box12, { flexDirection: "column", flexGrow: 1, children: /* @__PURE__ */ jsx14(Text14, { children: state.streamingText }) })
+        /* @__PURE__ */ jsx15(Box13, { flexDirection: "column", flexGrow: 1, children: /* @__PURE__ */ jsx15(Text15, { children: state.streamingText }) })
       ] })
     ] }),
-    pending && /* @__PURE__ */ jsx14(
+    pending && /* @__PURE__ */ jsx15(
       PermissionPrompt,
       {
         request: {
@@ -3273,7 +4228,7 @@ function App({
         }
       }
     ),
-    picker && /* @__PURE__ */ jsx14(
+    picker && /* @__PURE__ */ jsx15(
       ModelSelector,
       {
         request: {
@@ -3285,7 +4240,7 @@ function App({
         }
       }
     ),
-    sessionPicker && /* @__PURE__ */ jsx14(
+    sessionPicker && /* @__PURE__ */ jsx15(
       SessionSelector,
       {
         request: {
@@ -3297,7 +4252,19 @@ function App({
         }
       }
     ),
-    state.status !== "idle" && /* @__PURE__ */ jsx14(
+    questionPicker && /* @__PURE__ */ jsx15(
+      QuestionPicker,
+      {
+        request: {
+          questions: questionPicker.questions,
+          resolve: (responses) => {
+            questionPicker.resolve(responses);
+            setQuestionPicker(null);
+          }
+        }
+      }
+    ),
+    state.status !== "idle" && /* @__PURE__ */ jsx15(
       StatusLine,
       {
         startTime: state.turnStartTime,
@@ -3307,17 +4274,17 @@ function App({
         lang
       }
     ),
-    progress && /* @__PURE__ */ jsx14(ProgressBanner, { state: progress }),
-    acceptingInput && /* @__PURE__ */ jsxs13(Box12, { flexDirection: "column", children: [
-      queuedInputs.length > 0 && /* @__PURE__ */ jsxs13(Box12, { flexDirection: "column", marginLeft: 2, marginTop: 1, children: [
-        queuedInputs.map((q, i) => /* @__PURE__ */ jsx14(Text14, { color: "yellow", dimColor: true, children: `\u21B3 queued: ${q.length > 60 ? q.slice(0, 60) + "\u2026" : q}` }, i)),
-        /* @__PURE__ */ jsx14(Text14, { dimColor: true, children: `  (will send after current turn \xB7 ${queuedInputs.length} pending)` })
+    progress && /* @__PURE__ */ jsx15(ProgressBanner, { state: progress }),
+    inputVisible && /* @__PURE__ */ jsxs14(Box13, { flexDirection: "column", children: [
+      queuedInputs.length > 0 && /* @__PURE__ */ jsxs14(Box13, { flexDirection: "column", marginLeft: 2, marginTop: 1, children: [
+        queuedInputs.map((q, i) => /* @__PURE__ */ jsx15(Text15, { color: "yellow", dimColor: true, children: `\u21B3 queued: ${q.length > 60 ? q.slice(0, 60) + "\u2026" : q}` }, i)),
+        /* @__PURE__ */ jsx15(Text15, { dimColor: true, children: `  (will send after current turn \xB7 ${queuedInputs.length} pending)` })
       ] }),
-      /* @__PURE__ */ jsxs13(Box12, { marginTop: 1, flexDirection: "column", children: [
-        /* @__PURE__ */ jsx14(Text14, { backgroundColor: "#1c1c1c", children: " ".repeat(Math.max(1, termWidth - 1)) }),
-        /* @__PURE__ */ jsxs13(Box12, { flexDirection: "row", children: [
-          /* @__PURE__ */ jsx14(Text14, { backgroundColor: "#1c1c1c", color: "gray", bold: true, children: " \u276F " }),
-          /* @__PURE__ */ jsx14(
+      /* @__PURE__ */ jsxs14(Box13, { marginTop: 1, flexDirection: "column", children: [
+        /* @__PURE__ */ jsx15(Text15, { backgroundColor: "#1c1c1c", children: " ".repeat(Math.max(1, termWidth - 1)) }),
+        /* @__PURE__ */ jsxs14(Box13, { flexDirection: "row", children: [
+          /* @__PURE__ */ jsx15(Text15, { backgroundColor: "#1c1c1c", color: "gray", bold: true, children: " \u203A " }),
+          /* @__PURE__ */ jsx15(
             BgTextInput,
             {
               value: input,
@@ -3325,17 +4292,19 @@ function App({
               onSubmit: handleSubmit,
               width: Math.max(10, termWidth - 4),
               backgroundColor: "#1c1c1c",
-              isActive: acceptingInput
+              isActive: acceptingInput,
+              onPaste: handlePaste,
+              placeholder: inputPlaceholder
             },
             inputRemountKey
           )
         ] }),
-        /* @__PURE__ */ jsx14(Text14, { backgroundColor: "#1c1c1c", children: " ".repeat(Math.max(1, termWidth - 1)) })
+        /* @__PURE__ */ jsx15(Text15, { backgroundColor: "#1c1c1c", children: " ".repeat(Math.max(1, termWidth - 1)) })
       ] }),
-      autocomplete && autocomplete.matches.length > 0 && /* @__PURE__ */ jsx14(SlashAutocomplete, { matches: autocomplete.matches, index: autocompleteIndex })
+      autocomplete && autocomplete.matches.length > 0 && /* @__PURE__ */ jsx15(SlashAutocomplete, { matches: autocomplete.matches, index: autocompleteIndex })
     ] }),
-    /* @__PURE__ */ jsxs13(Box12, { flexDirection: "column", children: [
-      /* @__PURE__ */ jsx14(
+    /* @__PURE__ */ jsxs14(Box13, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx15(
         FooterStatus,
         {
           sessionId: session.meta.id,
@@ -3347,7 +4316,7 @@ function App({
           termWidth
         }
       ),
-      /* @__PURE__ */ jsx14(PermissionModeBar, { mode, compact: termWidth < 60 })
+      /* @__PURE__ */ jsx15(PermissionModeBar, { mode, compact: termWidth < 60 })
     ] })
   ] });
 }
@@ -3361,6 +4330,13 @@ function extractUserInputs(messages) {
   }
   return out;
 }
+var PASTE_PLACEHOLDER_RE = /\[Pasted text #(\d+) \+\d+ lines\]/g;
+function expandPastes(value, map) {
+  return value.replace(PASTE_PLACEHOLDER_RE, (full, id) => {
+    const text = map.get(Number(id));
+    return text ?? full;
+  });
+}
 function shortCwd(cwd) {
   const home = homedir8();
   if (cwd === home) return "~";
@@ -4159,6 +5135,61 @@ var MemoryReadTool = defineTool({
   }
 });
 
+// src/tools/builtin/ask-user-question.ts
+import { z as z12 } from "zod";
+var AskQuestionOptionSchema = z12.object({
+  label: z12.string().min(1).describe("Option text shown to the user. Concise (1-5 words)."),
+  description: z12.string().optional().describe("Optional one-line explanation of what this option means."),
+  preview: z12.string().optional().describe(
+    "Optional rich preview rendered in a right-side panel when this option is focused. Use for code/diagram/config snippets that help compare options visually. Multi-line text supported."
+  )
+});
+var AskQuestionSchema = z12.object({
+  question: z12.string().min(1).describe("Full question text (end with ?)."),
+  header: z12.string().min(1).max(16).describe("Very short label (chip), max 12 chars. E.g. 'Auth method'."),
+  options: z12.array(AskQuestionOptionSchema).min(2).max(4).describe("2-4 options. Mutually exclusive unless multiSelect=true."),
+  multiSelect: z12.boolean().optional().describe("Allow multiple selections. Default false.")
+});
+var AskUserQuestionArgs = z12.object({
+  questions: z12.array(AskQuestionSchema).min(1).max(4).describe("1-4 questions to ask the user sequentially.")
+});
+var AskUserQuestionTool = defineTool({
+  name: "AskUserQuestion",
+  description: "Ask the user one or more multiple-choice questions when their input is needed to proceed. Each question has 2-4 options. Use multiSelect=true for non-mutually-exclusive choices. Prefer this over plain-text questions when the answer space is bounded. If the user presses Esc, the entire batch is treated as cancelled.",
+  parameters: AskUserQuestionArgs,
+  permission: "read",
+  summarize: (args) => `AskUserQuestion(${args.questions.length} question${args.questions.length === 1 ? "" : "s"})`,
+  async execute(args, ctx) {
+    if (!ctx.askQuestions) {
+      return {
+        content: "AskUserQuestion is unavailable: this agent run has no question handler. (Internal bug; tell the user.)",
+        isError: true
+      };
+    }
+    const responses = await ctx.askQuestions(args.questions);
+    if (responses.length > 0 && responses[0].cancelled) {
+      return {
+        content: "User cancelled (Esc). No answers were collected.",
+        isError: false
+      };
+    }
+    const blocks = args.questions.map((q, qi) => {
+      const r = responses[qi];
+      const sel = r?.selections ?? [];
+      const ans = sel.length === 0 ? "(no answer)" : sel.join(", ");
+      const notes = r?.notes?.trim();
+      return notes ? `Q: ${q.question}
+A: ${ans}
+Notes: ${notes}` : `Q: ${q.question}
+A: ${ans}`;
+    });
+    return {
+      content: blocks.join("\n\n"),
+      summary: `Asked ${args.questions.length} question${args.questions.length === 1 ? "" : "s"}`
+    };
+  }
+});
+
 // src/tools/builtin/index.ts
 var BUILTIN_TOOLS = [
   ReadTool,
@@ -4170,11 +5201,12 @@ var BUILTIN_TOOLS = [
   TodoWriteTool,
   WebFetchTool,
   MemoryReadTool,
-  MemoryWriteTool
+  MemoryWriteTool,
+  AskUserQuestionTool
 ];
 
 // src/cli.tsx
-import { jsx as jsx15 } from "react/jsx-runtime";
+import { jsx as jsx16 } from "react/jsx-runtime";
 var VERSION = "0.1.0";
 async function main() {
   const program = new Command();
@@ -4267,7 +5299,7 @@ async function main() {
       return;
     }
     const { waitUntilExit } = render(
-      /* @__PURE__ */ jsx15(
+      /* @__PURE__ */ jsx16(
         App,
         {
           llm,