@qwen-code/qwen-code 0.19.2 → 0.19.3-nightly.20260701.a974594d7

package/chunks/{chunk-I5T6PIBQ.js → chunk-I4MXURND.js}

@@ -10,7 +10,10 @@ import {
   getCommandSourceGroup,
   getCommandSubcommandNames,
   useSessionStats
-} from "./chunk-4W4T77MO.js";
+} from "./chunk-BLAE2TCO.js";
+import {
+  Colors
+} from "./chunk-32MCHZQC.js";
 import {
   buildResumedHistoryItems,
   calculateAverageLatency,
@@ -25,15 +28,20 @@ import {
   useKeypress,
   useKeypressContext,
   wrapForMultiplexer
-} from "./chunk-JTYRZODB.js";
+} from "./chunk-IBEM64M4.js";
+import {
+  isTerminalGoalStatusKind
+} from "./chunk-KSPVDFE4.js";
 import {
   relaunchApp
-} from "./chunk-UAARVVBI.js";
+} from "./chunk-WGY3GIPP.js";
 import {
   MINIMUM_MAX_HEIGHT,
-  MaxSizedBox,
+  MaxSizedBox
+} from "./chunk-HUGAEYZR.js";
+import {
   theme
-} from "./chunk-EL5IHQON.js";
+} from "./chunk-VXGPYF7U.js";
 import {
   Box_default,
   Static,
@@ -43,21 +51,18 @@ import {
   use_is_screen_reader_enabled_default,
   use_stdin_default,
   use_stdout_default
-} from "./chunk-UAARJR2G.js";
-import {
-  isTerminalGoalStatusKind
-} from "./chunk-KSPVDFE4.js";
+} from "./chunk-N4V4VBP6.js";
 import {
   require_react
 } from "./chunk-KYMBIKIW.js";
+import {
+  resolveColor,
+  themeManager
+} from "./chunk-HTWHAN44.js";
 import {
   require_has_flag,
   require_source
 } from "./chunk-3GONHQOA.js";
-import {
-  resolveColor,
-  themeManager
-} from "./chunk-TMBPDHXD.js";
 import {
   cpLen,
   cpSlice,
@@ -67,8 +72,9 @@ import {
   sanitizeSensitiveText,
   stringWidth,
   stripUnsafeCharacters,
-  toCodePoints
-} from "./chunk-CGOMICBE.js";
+  toCodePoints,
+  wrapToVisualLines
+} from "./chunk-GDIG7TMG.js";
 import {
   formatDuration,
   formatMemoryUsage,
@@ -77,16 +83,18 @@ import {
 } from "./chunk-KHDZHZMH.js";
 import {
   createLoadedSettingsAdapter
-} from "./chunk-5RVSM6NW.js";
+} from "./chunk-VN4CKYUW.js";
 import {
-  getPersistScopeForModelSelection,
-  isWorkspaceTrusted
-} from "./chunk-OQHQHJRK.js";
+  getPersistScopeForModelSelection
+} from "./chunk-6FIWYVN4.js";
 import {
   getCurrentLanguage,
   localizeToolDisplayName,
   t
-} from "./chunk-5JZLXFPD.js";
+} from "./chunk-3O2BJMFW.js";
+import {
+  isWorkspaceTrusted
+} from "./chunk-Z34RYLRO.js";
 import {
   ALL_PROVIDERS,
   IdeClient,
@@ -107,20 +115,20 @@ import {
   resolveMetadataKey,
   resolveOwnsModel,
   stripAnsi
-} from "./chunk-PXFFKNCO.js";
+} from "./chunk-35FH347N.js";
 import {
   MAIN_SOURCE,
   getMCPServerStatus
-} from "./chunk-WA5OJGFL.js";
+} from "./chunk-B5MPZI4K.js";
 import {
   ToolDisplayNames,
   ToolNames
-} from "./chunk-TOEGRAVX.js";
+} from "./chunk-JV7A66DR.js";
 import {
   createDebugLogger,
   escapePath,
   unescapePath
-} from "./chunk-C4K3FEQ2.js";
+} from "./chunk-AVQDCKNF.js";
 import {
   init_esbuild_shims
 } from "./chunk-A4BMJM77.js";
@@ -3978,11 +3986,11 @@ __name(useTerminalSize, "useTerminalSize");
 
 // packages/cli/src/ui/components/SessionPreview.tsx
 init_esbuild_shims();
-var import_react44 = __toESM(require_react(), 1);
+var import_react43 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/HistoryItemDisplay.tsx
 init_esbuild_shims();
-var import_react43 = __toESM(require_react(), 1);
+var import_react42 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/messages/ConversationMessages.tsx
 init_esbuild_shims();
@@ -8835,6 +8843,8 @@ __name(formatDuration2, "formatDuration");
 // packages/cli/src/ui/components/messages/ConversationMessages.tsx
 var import_jsx_runtime7 = __toESM(require_jsx_runtime(), 1);
 var THINKING_ICON = "\u2234 ";
+var THINKING_ICON_PENDING = "\u2235 ";
+var toggleKeyHint = process.platform === "darwin" ? "option+t" : "alt+t";
 function getPrefixWidth(prefix) {
   return stringWidth(prefix) + 1;
 }
@@ -8950,7 +8960,7 @@ var AssistantMessage = /* @__PURE__ */ __name(({
   PrefixedMarkdownMessage,
   {
     text,
-    prefix: "\u2726",
+    prefix: "\u25C6",
     prefixColor: theme.text.accent,
     ariaLabel: SCREEN_READER_MODEL_PREFIX,
     isPending,
@@ -8972,43 +8982,11 @@ var AssistantMessageContent = /* @__PURE__ */ __name(({
     isPending,
     availableTerminalHeight,
     contentWidth,
-    basePrefix: "\u2726",
+    basePrefix: "\u25C6",
     sourceCopyIndexOffsets
   }
 ), "AssistantMessageContent");
 var MAX_STREAMING_THINKING_VISUAL_LINES = 4;
-function wrapToVisualLines(text, width) {
-  if (width <= 0) {
-    return [""];
-  }
-  const visualLines = [];
-  for (const logicalLine of text.split("\n")) {
-    if (logicalLine === "") {
-      visualLines.push("");
-      continue;
-    }
-    let currentLine = "";
-    let currentWidth = 0;
-    for (const char of logicalLine) {
-      const charWidth = getCachedStringWidth(char);
-      if (currentWidth + charWidth > width && currentWidth > 0) {
-        visualLines.push(currentLine);
-        currentLine = "";
-        currentWidth = 0;
-      }
-      currentLine += char;
-      currentWidth += charWidth;
-    }
-    if (currentLine) {
-      visualLines.push(currentLine);
-    }
-  }
-  if (visualLines.length === 0) {
-    visualLines.push("");
-  }
-  return visualLines;
-}
-__name(wrapToVisualLines, "wrapToVisualLines");
 function tailVisualLines(text, width, maxLines) {
   const charBudget = maxLines * width * 2;
   let sliceStart = Math.max(0, text.length - charBudget);
@@ -9037,7 +9015,7 @@ var ThinkMessage = /* @__PURE__ */ __name(({
       THINKING_ICON,
       label,
       " ",
-      t("(alt+t to expand)")
+      t("({{keyHint}} to expand)", { keyHint: toggleKeyHint })
     ] });
   }
   if (isPending) {
@@ -9052,7 +9030,7 @@ var ThinkMessage = /* @__PURE__ */ __name(({
     const display = tailVisualLines(text, innerWidth, maxLines);
     return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(Box_default, { flexDirection: "column", children: [
       /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(Text, { dimColor: true, italic: true, children: [
-        THINKING_ICON,
+        THINKING_ICON_PENDING,
         t("Thinking"),
         "\u2026",
         durationSuffix
@@ -9066,7 +9044,7 @@ var ThinkMessage = /* @__PURE__ */ __name(({
       THINKING_ICON,
       expandedLabel,
       " ",
-      t("(alt+t to collapse)")
+      t("({{keyHint}} to collapse)", { keyHint: toggleKeyHint })
     ] }),
     /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(Box_default, { paddingLeft: 2, flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
       MarkdownDisplay,
@@ -9116,11 +9094,11 @@ var ThinkMessageContent = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/messages/ToolGroupMessage.tsx
 init_esbuild_shims();
-var import_react27 = __toESM(require_react(), 1);
+var import_react26 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/messages/ToolMessage.tsx
 init_esbuild_shims();
-var import_react25 = __toESM(require_react(), 1);
+var import_react24 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/components/messages/DiffRenderer.tsx
 init_esbuild_shims();
@@ -9436,64 +9414,6 @@ var ShellStatsBar = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/TodoDisplay.tsx
 init_esbuild_shims();
-
-// packages/cli/src/ui/colors.ts
-init_esbuild_shims();
-var Colors = {
-  get type() {
-    return themeManager.getActiveTheme().colors.type;
-  },
-  get Foreground() {
-    return themeManager.getActiveTheme().colors.Foreground;
-  },
-  get Background() {
-    return themeManager.getActiveTheme().colors.Background;
-  },
-  get LightBlue() {
-    return themeManager.getActiveTheme().colors.LightBlue;
-  },
-  get AccentBlue() {
-    return themeManager.getActiveTheme().colors.AccentBlue;
-  },
-  get AccentPurple() {
-    return themeManager.getActiveTheme().colors.AccentPurple;
-  },
-  get AccentCyan() {
-    return themeManager.getActiveTheme().colors.AccentCyan;
-  },
-  get AccentGreen() {
-    return themeManager.getActiveTheme().colors.AccentGreen;
-  },
-  get AccentYellow() {
-    return themeManager.getActiveTheme().colors.AccentYellow;
-  },
-  get AccentRed() {
-    return themeManager.getActiveTheme().colors.AccentRed;
-  },
-  get AccentYellowDim() {
-    return themeManager.getActiveTheme().colors.AccentYellowDim;
-  },
-  get AccentRedDim() {
-    return themeManager.getActiveTheme().colors.AccentRedDim;
-  },
-  get DiffAdded() {
-    return themeManager.getActiveTheme().colors.DiffAdded;
-  },
-  get DiffRemoved() {
-    return themeManager.getActiveTheme().colors.DiffRemoved;
-  },
-  get Comment() {
-    return themeManager.getActiveTheme().colors.Comment;
-  },
-  get Gray() {
-    return themeManager.getActiveTheme().colors.Gray;
-  },
-  get GradientColors() {
-    return themeManager.getActiveTheme().colors.GradientColors;
-  }
-};
-
-// packages/cli/src/ui/components/TodoDisplay.tsx
 var import_jsx_runtime10 = __toESM(require_jsx_runtime(), 1);
 var STATUS_ICONS = {
   pending: "\u25CB",
@@ -13008,7 +12928,7 @@ function TextInput({
   }, [isActive]);
   const handleSubmit = /* @__PURE__ */ __name(() => {
     if (!onSubmit) return;
-    onSubmit();
+    onSubmit(buffer.text);
   }, "handleSubmit");
   useKeypress(
     (key) => {
@@ -13117,6 +13037,7 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
   const [currentQuestionIndex, setCurrentQuestionIndex] = (0, import_react17.useState)(0);
   const [selectedOptions, setSelectedOptions] = (0, import_react17.useState)({});
   const [customInputValues, setCustomInputValues] = (0, import_react17.useState)({});
+  const customInputValuesRef = (0, import_react17.useRef)({});
   const [selectedIndex, setSelectedIndex] = (0, import_react17.useState)(0);
   const [multiSelectedOptions, setMultiSelectedOptions] = (0, import_react17.useState)({});
   const [customInputChecked, setCustomInputChecked] = (0, import_react17.useState)({});
@@ -13127,7 +13048,8 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
   const isMultiSelect = currentQuestion?.multiSelect ?? false;
   const totalOptions = currentQuestion ? currentQuestion.options.length + 1 : 2;
   const isCustomInputSelected = !isSubmitTab && currentQuestion && selectedIndex === currentQuestion.options.length;
-  const currentCustomInputValue = customInputValues[currentQuestionIndex] ?? "";
+  const getCustomInputValue = /* @__PURE__ */ __name((idx) => customInputValuesRef.current[idx] ?? customInputValues[idx] ?? "", "getCustomInputValue");
+  const currentCustomInputValue = getCustomInputValue(currentQuestionIndex);
   const isCustomInputAnswer = !isSubmitTab && currentQuestion && !isMultiSelect && selectedOptions[currentQuestionIndex] !== void 0 && !currentQuestion.options.some(
     (opt) => opt.label === selectedOptions[currentQuestionIndex]
   );
@@ -13135,7 +13057,7 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
     const q = confirmationDetails.questions[idx];
     if (q?.multiSelect) {
       const selections = [...multiSelectedOptions[idx] ?? []];
-      const customValue = (customInputValues[idx] ?? "").trim();
+      const customValue = getCustomInputValue(idx).trim();
       if (customInputChecked[idx] && customValue) {
         selections.push(customValue);
       }
@@ -13166,24 +13088,30 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
       }, 150);
     }
   }, "selectAndAdvance");
-  const handleMultiSelectSubmit = /* @__PURE__ */ __name(() => {
+  const getCurrentMultiSelectAnswer = /* @__PURE__ */ __name((includeCustomInput = customInputChecked[currentQuestionIndex], inputValue = currentCustomInputValue) => {
     if (!currentQuestion) return;
     const selections = [...multiSelectedOptions[currentQuestionIndex] ?? []];
-    const customValue = currentCustomInputValue.trim();
-    if (customInputChecked[currentQuestionIndex] && customValue) {
+    const customValue = inputValue.trim();
+    if (includeCustomInput && customValue) {
       selections.push(customValue);
     }
-    if (selections.length === 0) return;
-    selectAndAdvance(selections.join(", "));
+    return selections.length > 0 ? selections.join(", ") : void 0;
+  }, "getCurrentMultiSelectAnswer");
+  const handleMultiSelectSubmit = /* @__PURE__ */ __name(() => {
+    const answer = getCurrentMultiSelectAnswer();
+    if (!answer) return;
+    selectAndAdvance(answer);
   }, "handleMultiSelectSubmit");
-  const handleCustomInputSubmit = /* @__PURE__ */ __name(() => {
-    const trimmedValue = currentCustomInputValue.trim();
+  const handleCustomInputSubmit = /* @__PURE__ */ __name((inputValue = currentCustomInputValue) => {
+    const trimmedValue = inputValue.trim();
     if (isMultiSelect) {
-      if (!trimmedValue) return;
       setCustomInputChecked((prev) => ({
         ...prev,
-        [currentQuestionIndex]: !prev[currentQuestionIndex]
+        [currentQuestionIndex]: trimmedValue.length > 0
       }));
+      if (trimmedValue) {
+        selectAndAdvance(getCurrentMultiSelectAnswer(true, inputValue));
+      }
       return;
     }
     if (!trimmedValue) return;
@@ -13419,7 +13347,11 @@ var AskUserQuestionDialog = /* @__PURE__ */ __name(({
               value: currentCustomInputValue,
               initialCursorOffset: currentCustomInputValue.length,
               onChange: (value) => {
-                const oldValue = customInputValues[currentQuestionIndex] ?? "";
+                const oldValue = customInputValuesRef.current[currentQuestionIndex] ?? customInputValues[currentQuestionIndex] ?? "";
+                customInputValuesRef.current = {
+                  ...customInputValuesRef.current,
+                  [currentQuestionIndex]: value
+                };
                 if (isMultiSelect && value !== oldValue) {
                   setCustomInputChecked((prevChecked) => ({
                     ...prevChecked,
@@ -13968,31 +13900,24 @@ var ShellInputPrompt = /* @__PURE__ */ __name(({
   return null;
 }, "ShellInputPrompt");
 
-// packages/cli/src/ui/contexts/CompactModeContext.tsx
+// packages/cli/src/ui/components/messages/CompactToolGroupDisplay.tsx
 init_esbuild_shims();
-var import_react20 = __toESM(require_react(), 1);
-var CompactModeContext = (0, import_react20.createContext)({
-  compactMode: false,
-  compactInline: false
-});
-var useCompactMode = /* @__PURE__ */ __name(() => (0, import_react20.useContext)(CompactModeContext), "useCompactMode");
-var CompactModeProvider = CompactModeContext.Provider;
 
 // packages/cli/src/ui/components/shared/ToolStatusIndicator.tsx
 init_esbuild_shims();
 
 // packages/cli/src/ui/components/GeminiRespondingSpinner.tsx
 init_esbuild_shims();
-var import_react23 = __toESM(require_react(), 1);
+var import_react22 = __toESM(require_react(), 1);
 
 // node_modules/ink-spinner/build/index.js
 init_esbuild_shims();
-var import_react21 = __toESM(require_react(), 1);
+var import_react20 = __toESM(require_react(), 1);
 var import_cli_spinners = __toESM(require_cli_spinners(), 1);
 function Spinner({ type = "dots" }) {
-  const [frame, setFrame] = (0, import_react21.useState)(0);
+  const [frame, setFrame] = (0, import_react20.useState)(0);
   const spinner = import_cli_spinners.default[type];
-  (0, import_react21.useEffect)(() => {
+  (0, import_react20.useEffect)(() => {
     const timer = setInterval(() => {
       setFrame((previousFrame) => {
         const isLastFrame = previousFrame === spinner.frames.length - 1;
@@ -14003,19 +13928,19 @@ function Spinner({ type = "dots" }) {
       clearInterval(timer);
     };
   }, [spinner]);
-  return import_react21.default.createElement(Text, null, spinner.frames[frame]);
+  return import_react20.default.createElement(Text, null, spinner.frames[frame]);
 }
 __name(Spinner, "Spinner");
 var build_default = Spinner;
 
 // packages/cli/src/ui/contexts/StreamingContext.tsx
 init_esbuild_shims();
-var import_react22 = __toESM(require_react(), 1);
-var StreamingContext = (0, import_react22.createContext)(
+var import_react21 = __toESM(require_react(), 1);
+var StreamingContext = (0, import_react21.createContext)(
   void 0
 );
 var useStreamingContext = /* @__PURE__ */ __name(() => {
-  const context = import_react22.default.useContext(StreamingContext);
+  const context = import_react21.default.useContext(StreamingContext);
   if (context === void 0) {
     throw new Error(
       "useStreamingContext must be used within a StreamingContextProvider"
@@ -14050,8 +13975,8 @@ var GeminiSpinner = /* @__PURE__ */ __name(({
 }) => {
   const isScreenReaderEnabled = use_is_screen_reader_enabled_default();
   const isTmux = Boolean(process.env["TMUX"]);
-  const [tmuxFrameIndex, setTmuxFrameIndex] = (0, import_react23.useState)(0);
-  (0, import_react23.useEffect)(() => {
+  const [tmuxFrameIndex, setTmuxFrameIndex] = (0, import_react22.useState)(0);
+  (0, import_react22.useEffect)(() => {
     if (isScreenReaderEnabled || !isTmux) {
       return;
     }
@@ -14071,7 +13996,7 @@ var GeminiSpinner = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/shared/ToolStatusIndicator.tsx
 var import_jsx_runtime18 = __toESM(require_jsx_runtime(), 1);
-var STATUS_INDICATOR_WIDTH = 3;
+var STATUS_INDICATOR_WIDTH = 2;
 var ToolStatusIndicator = /* @__PURE__ */ __name(({
   status,
   name
@@ -14096,15 +14021,15 @@ var ToolStatusIndicator = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/shared/ToolElapsedTime.tsx
 init_esbuild_shims();
-var import_react24 = __toESM(require_react(), 1);
+var import_react23 = __toESM(require_react(), 1);
 var import_jsx_runtime19 = __toESM(require_jsx_runtime(), 1);
 var ToolElapsedTime = /* @__PURE__ */ __name(({
   status,
   executionStartTime,
   timeoutMs
 }) => {
-  const [elapsedSeconds, setElapsedSeconds] = (0, import_react24.useState)(0);
-  (0, import_react24.useEffect)(() => {
+  const [elapsedSeconds, setElapsedSeconds] = (0, import_react23.useState)(0);
+  (0, import_react23.useEffect)(() => {
     if (status !== "Executing" /* Executing */ || !executionStartTime) {
       setElapsedSeconds(0);
       return;
@@ -14125,8 +14050,178 @@ var ToolElapsedTime = /* @__PURE__ */ __name(({
   return /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(Box_default, { flexShrink: 0, marginLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime19.jsx)(Text, { color: theme.text.secondary, children: label }) });
 }, "ToolElapsedTime");
 
-// packages/cli/src/ui/components/messages/ToolMessage.tsx
+// packages/cli/src/ui/components/messages/CompactToolGroupDisplay.tsx
 var import_jsx_runtime20 = __toESM(require_jsx_runtime(), 1);
+function getOverallStatus(toolCalls) {
+  if (toolCalls.some((t2) => t2.status === "Confirming" /* Confirming */))
+    return "Confirming" /* Confirming */;
+  if (toolCalls.some((t2) => t2.status === "Executing" /* Executing */))
+    return "Executing" /* Executing */;
+  if (toolCalls.some((t2) => t2.status === "Error" /* Error */))
+    return "Error" /* Error */;
+  if (toolCalls.some((t2) => t2.status === "Canceled" /* Canceled */))
+    return "Canceled" /* Canceled */;
+  if (toolCalls.some((t2) => t2.status === "Pending" /* Pending */))
+    return "Pending" /* Pending */;
+  return "Success" /* Success */;
+}
+__name(getOverallStatus, "getOverallStatus");
+function getActiveTool(toolCalls) {
+  return toolCalls.find((t2) => t2.status === "Confirming" /* Confirming */) ?? toolCalls.find((t2) => t2.status === "Executing" /* Executing */) ?? toolCalls[toolCalls.length - 1];
+}
+__name(getActiveTool, "getActiveTool");
+function getShellTimeoutMs(tool) {
+  const display = tool.resultDisplay;
+  if (typeof display === "object" && display !== null && "ansiOutput" in display) {
+    return display.timeoutMs;
+  }
+  return void 0;
+}
+__name(getShellTimeoutMs, "getShellTimeoutMs");
+var TOOL_NAME_TO_CATEGORY = {
+  [ToolDisplayNames.READ_FILE]: "read",
+  [ToolDisplayNames.EDIT]: "edit",
+  [ToolDisplayNames.WRITE_FILE]: "write",
+  [ToolDisplayNames.NOTEBOOK_EDIT]: "edit",
+  [ToolDisplayNames.GREP]: "search",
+  [ToolDisplayNames.GLOB]: "search",
+  [ToolDisplayNames.LS]: "list",
+  [ToolDisplayNames.SHELL]: "command",
+  [SHELL_COMMAND_NAME]: "command",
+  [ToolDisplayNames.AGENT]: "agent",
+  [ToolDisplayNames.WORKFLOW]: "agent",
+  [ToolDisplayNames.SEND_MESSAGE]: "agent",
+  "Read File": "read",
+  "Read File(s)": "read",
+  "Read Directory": "list",
+  // Legacy display names (keys from ToolDisplayNamesMigration)
+  SearchFiles: "search",
+  FindFiles: "search",
+  ReadFolder: "list",
+  Task: "agent",
+  TodoWrite: "other"
+};
+var CATEGORY_TEMPLATES = {
+  read: {
+    pastVerb: "Read",
+    activeVerb: "Reading",
+    singular: "file",
+    plural: "files"
+  },
+  edit: {
+    pastVerb: "Edited",
+    activeVerb: "Editing",
+    singular: "file",
+    plural: "files"
+  },
+  write: {
+    pastVerb: "Wrote",
+    activeVerb: "Writing",
+    singular: "file",
+    plural: "files"
+  },
+  search: {
+    pastVerb: "Searched",
+    activeVerb: "Searching",
+    singular: "pattern",
+    plural: "patterns"
+  },
+  list: {
+    pastVerb: "Listed",
+    activeVerb: "Listing",
+    singular: "directory",
+    plural: "directories"
+  },
+  command: {
+    pastVerb: "Ran",
+    activeVerb: "Running",
+    singular: "command",
+    plural: "commands"
+  },
+  agent: {
+    pastVerb: "Ran",
+    activeVerb: "Running",
+    singular: "agent",
+    plural: "agents"
+  },
+  other: {
+    pastVerb: "Used",
+    activeVerb: "Using",
+    singular: "tool",
+    plural: "tools"
+  }
+};
+var CATEGORY_ORDER = [
+  "search",
+  "read",
+  "list",
+  "command",
+  "edit",
+  "write",
+  "agent",
+  "other"
+];
+var COLLAPSIBLE_CATEGORIES = /* @__PURE__ */ new Set([
+  "read",
+  "search",
+  "list"
+]);
+function getToolCategory(toolName) {
+  return TOOL_NAME_TO_CATEGORY[toolName] ?? "other";
+}
+__name(getToolCategory, "getToolCategory");
+function isCollapsibleTool(toolName) {
+  return COLLAPSIBLE_CATEGORIES.has(getToolCategory(toolName));
+}
+__name(isCollapsibleTool, "isCollapsibleTool");
+function buildToolSummary(toolCalls, isActive) {
+  if (toolCalls.length === 0) return "";
+  const counts = /* @__PURE__ */ new Map();
+  for (const tool of toolCalls) {
+    const cat = getToolCategory(tool.name);
+    counts.set(cat, (counts.get(cat) ?? 0) + 1);
+  }
+  const parts = [];
+  for (const cat of CATEGORY_ORDER) {
+    const count = counts.get(cat);
+    if (!count) continue;
+    const template = CATEGORY_TEMPLATES[cat];
+    const verb = isActive ? template.activeVerb : template.pastVerb;
+    const lower = parts.length > 0;
+    const v = lower ? verb.toLowerCase() : verb;
+    if (count === 1) {
+      parts.push(`${v} 1 ${template.singular}`);
+    } else {
+      parts.push(`${v} ${count} ${template.plural}`);
+    }
+  }
+  return parts.join(", ");
+}
+__name(buildToolSummary, "buildToolSummary");
+var CompactToolGroupDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWidth }) => {
+  if (toolCalls.length === 0) return null;
+  const overallStatus = getOverallStatus(toolCalls);
+  const activeTool = getActiveTool(toolCalls);
+  const isActive = overallStatus === "Executing" /* Executing */ || overallStatus === "Pending" /* Pending */ || overallStatus === "Confirming" /* Confirming */;
+  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { flexDirection: "column", width: contentWidth, paddingX: 1, gap: 0, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Box_default, { flexDirection: "row", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ToolStatusIndicator, { status: overallStatus, name: activeTool.name }),
+    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Text, { wrap: "truncate-end", bold: true, children: [
+      buildToolSummary(toolCalls, isActive),
+      isActive && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { children: "\u2026" }, "ellipsis")
+    ] }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+      ToolElapsedTime,
+      {
+        status: overallStatus,
+        executionStartTime: activeTool.executionStartTime,
+        timeoutMs: getShellTimeoutMs(activeTool)
+      }
+    )
+  ] }) });
+}, "CompactToolGroupDisplay");
+
+// packages/cli/src/ui/components/messages/ToolMessage.tsx
+var import_jsx_runtime21 = __toESM(require_jsx_runtime(), 1);
 var STATIC_HEIGHT = 1;
 var RESERVED_LINE_COUNT = 5;
 var MIN_LINES_SHOWN = 2;
@@ -14178,7 +14273,7 @@ function sliceTextForMaxHeight(text, maxHeight, maxWidth) {
   };
 }
 __name(sliceTextForMaxHeight, "sliceTextForMaxHeight");
-var useResultDisplayRenderer = /* @__PURE__ */ __name((resultDisplay) => import_react25.default.useMemo(() => {
+var useResultDisplayRenderer = /* @__PURE__ */ __name((resultDisplay) => import_react24.default.useMemo(() => {
   if (!resultDisplay) {
     return { type: "none" };
   }
@@ -14212,7 +14307,7 @@ var useResultDisplayRenderer = /* @__PURE__ */ __name((resultDisplay) => import_
     const totalStr = progress.total != null ? `/${progress.total}` : "";
     return {
       type: "string",
-      data: `\u23F3 [${progress.progress}${totalStr}] ${msg}`
+      data: `\u25CC [${progress.progress}${totalStr}] ${msg}`
     };
   }
   if (typeof resultDisplay === "object" && resultDisplay !== null && "ansiOutput" in resultDisplay) {
@@ -14236,8 +14331,8 @@ var useResultDisplayRenderer = /* @__PURE__ */ __name((resultDisplay) => import_
 }, [resultDisplay]), "useResultDisplayRenderer");
 var TodoResultRenderer = /* @__PURE__ */ __name(({
   data
-}) => /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(TodoDisplay, { todos: data.todos }), "TodoResultRenderer");
-var PlanResultRenderer = /* @__PURE__ */ __name(({ data, availableHeight, childWidth }) => /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+}) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(TodoDisplay, { todos: data.todos }), "TodoResultRenderer");
+var PlanResultRenderer = /* @__PURE__ */ __name(({ data, availableHeight, childWidth }) => /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
   PlanSummaryDisplay,
   {
     data,
@@ -14248,13 +14343,13 @@ var PlanResultRenderer = /* @__PURE__ */ __name(({ data, availableHeight, childW
 var SubagentExecutionRenderer = /* @__PURE__ */ __name(({ data, availableHeight, childWidth, config, isFocused }) => {
   if (data.pendingConfirmation && isFocused) {
     const agentLabel = escapeAnsiCtrlCodes(data.subagentName || "agent");
-    return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Box_default, { flexDirection: "column", paddingLeft: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Box_default, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: theme.text.secondary, children: "Approval requested by " }),
-        /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { bold: true, color: theme.text.accent, children: agentLabel }),
-        /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: theme.text.secondary, children: ":" })
+    return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Box_default, { flexDirection: "column", paddingLeft: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Box_default, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color: theme.text.secondary, children: "Approval requested by " }),
+        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { bold: true, color: theme.text.accent, children: agentLabel }),
+        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color: theme.text.secondary, children: ":" })
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
         ToolConfirmationMessage,
         {
           confirmationDetails: data.pendingConfirmation,
@@ -14269,16 +14364,16 @@ var SubagentExecutionRenderer = /* @__PURE__ */ __name(({ data, availableHeight,
   }
   if (data.pendingConfirmation) {
     const agentLabel = escapeAnsiCtrlCodes(data.subagentName || "agent");
-    return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Box_default, { paddingLeft: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Text, { color: theme.text.secondary, dimColor: true, children: [
-        "\u23F3 Queued approval:",
+    return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Box_default, { paddingLeft: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Text, { color: theme.text.secondary, dimColor: true, children: [
+        "\u25CC Queued approval:",
         " "
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { dimColor: true, children: agentLabel })
+      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { dimColor: true, children: agentLabel })
     ] });
   }
   if (data.status === "completed" || data.status === "failed" || data.status === "cancelled") {
-    return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(SubagentScrollbackSummary, { data });
+    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(SubagentScrollbackSummary, { data });
   }
   return null;
 }, "SubagentExecutionRenderer");
@@ -14307,19 +14402,19 @@ var SubagentScrollbackSummary = /* @__PURE__ */ __name(({ data }) => {
       formatDuration(stats.totalDurationMs, { hideTrailingZeros: true })
     );
   }
-  if (stats?.totalTokens && stats.totalTokens > 0) {
-    parts.push(`${formatTokenCount(stats.totalTokens)} tokens`);
+  if (stats?.outputTokens && stats.outputTokens > 0) {
+    parts.push(`${formatTokenCount(stats.outputTokens)} tokens`);
   }
   const tail = parts.length > 0 ? ` \xB7 ${parts.join(" \xB7 ")}` : "";
   const typePrefix = data.subagentName ? `${escapeAnsiCtrlCodes(data.subagentName)}: ` : "";
   const safeDescription = escapeAnsiCtrlCodes(data.taskDescription ?? "");
   const reason = data.status !== "completed" && data.terminateReason ? ` \xB7 ${escapeAnsiCtrlCodes(data.terminateReason)}` : "";
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { paddingLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Text, { wrap: "truncate-end", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color, children: `${glyph} ` }),
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { bold: true, children: typePrefix }),
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: theme.text.secondary, children: safeDescription }),
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: theme.text.secondary, children: tail }),
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: theme.text.secondary, children: reason })
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Box_default, { paddingLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Text, { wrap: "truncate-end", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color, children: `${glyph} ` }),
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { bold: true, children: typePrefix }),
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color: theme.text.secondary, children: safeDescription }),
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color: theme.text.secondary, children: tail }),
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color: theme.text.secondary, children: reason })
   ] }) });
 }, "SubagentScrollbackSummary");
 var StringResultRenderer = /* @__PURE__ */ __name(({ data, renderAsMarkdown, availableHeight, childWidth }) => {
@@ -14328,7 +14423,7 @@ var StringResultRenderer = /* @__PURE__ */ __name(({ data, renderAsMarkdown, ava
     displayData = "..." + displayData.slice(-MAXIMUM_RESULT_DISPLAY_CHARACTERS);
   }
   if (renderAsMarkdown) {
-    return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
       MarkdownDisplay,
       {
         text: displayData,
@@ -14343,24 +14438,24 @@ var StringResultRenderer = /* @__PURE__ */ __name(({ data, renderAsMarkdown, ava
     availableHeight,
     childWidth
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
     MaxSizedBox,
     {
       maxHeight: availableHeight,
       maxWidth: childWidth,
       additionalHiddenLinesCount: sliced.hiddenLinesCount,
-      children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { wrap: "wrap", color: theme.text.primary, children: sliced.text }) })
+      children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { wrap: "wrap", color: theme.text.primary, children: sliced.text }) })
     }
   );
 }, "StringResultRenderer");
 var DiffResultRenderer = /* @__PURE__ */ __name(({ data, availableHeight, childWidth, settings }) => {
   const diffHeight = data.truncatedForSession && availableHeight !== void 0 ? Math.max(1, availableHeight - 1) : availableHeight;
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Box_default, { flexDirection: "column", children: [
-    data.truncatedForSession && /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Text, { color: theme.status.warning, wrap: "wrap", children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Box_default, { flexDirection: "column", children: [
+    data.truncatedForSession && /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Text, { color: theme.status.warning, wrap: "wrap", children: [
       data.fileDiffTruncated ? "Saved session preview only; full diff omitted from JSONL" : "Saved session preview only; full file contents truncated in JSONL",
       data.fileDiffTruncated && typeof data.fileDiffLength === "number" ? ` (${data.fileDiffLength} chars).` : "."
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
       DiffRenderer,
       {
         diffContent: data.fileDiff,
@@ -14392,21 +14487,21 @@ var ToolMessage = /* @__PURE__ */ __name(({
 }) => {
   const settings = useSettings();
   const isThisShellFocused = (name === SHELL_COMMAND_NAME || name === SHELL_NAME) && status === "Executing" /* Executing */ && ptyId === activeShellPtyId && embeddedShellFocused;
-  const [lastUpdateTime, setLastUpdateTime] = import_react25.default.useState(null);
-  const [userHasFocused, setUserHasFocused] = import_react25.default.useState(false);
-  const [showFocusHint, setShowFocusHint] = import_react25.default.useState(false);
-  import_react25.default.useEffect(() => {
+  const [lastUpdateTime, setLastUpdateTime] = import_react24.default.useState(null);
+  const [userHasFocused, setUserHasFocused] = import_react24.default.useState(false);
+  const [showFocusHint, setShowFocusHint] = import_react24.default.useState(false);
+  import_react24.default.useEffect(() => {
     if (resultDisplay) {
       setLastUpdateTime(/* @__PURE__ */ new Date());
     }
   }, [resultDisplay]);
-  const shellTimeoutMs = import_react25.default.useMemo(() => {
+  const shellTimeoutMs = import_react24.default.useMemo(() => {
     if (typeof resultDisplay === "object" && resultDisplay !== null && "ansiOutput" in resultDisplay) {
       return resultDisplay.timeoutMs;
     }
     return void 0;
   }, [resultDisplay]);
-  import_react25.default.useEffect(() => {
+  import_react24.default.useEffect(() => {
     if (!lastUpdateTime) {
       return;
     }
@@ -14415,7 +14510,7 @@ var ToolMessage = /* @__PURE__ */ __name(({
     }, 5e3);
     return () => clearTimeout(timer);
   }, [lastUpdateTime]);
-  import_react25.default.useEffect(() => {
+  import_react24.default.useEffect(() => {
     if (isThisShellFocused) {
       setUserHasFocused(true);
     }
@@ -14437,15 +14532,12 @@ var ToolMessage = /* @__PURE__ */ __name(({
   if (availableHeight) {
     renderOutputAsMarkdown = false;
   }
-  const displayRenderer = useResultDisplayRenderer(resultDisplay);
-  const { compactMode } = useCompactMode();
-  const isCompleted = status === "Success" /* Success */;
-  const shouldCollapse = compactMode && isCompleted && !forceShowResult;
-  const effectiveDisplayRenderer = shouldCollapse ? { type: "none" } : displayRenderer;
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Box_default, { paddingX: 1, paddingY: 0, flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Box_default, { minHeight: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(ToolStatusIndicator, { status, name }),
-      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+  const effectiveDisplayRenderer = useResultDisplayRenderer(resultDisplay);
+  const shouldCollapseResult = !forceShowResult && status === "Success" /* Success */ && isCollapsibleTool(name) && (effectiveDisplayRenderer.type === "string" || effectiveDisplayRenderer.type === "ansi");
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Box_default, { paddingX: 1, paddingY: 0, flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Box_default, { minHeight: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(ToolStatusIndicator, { status, name }),
+      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
         ToolInfo,
         {
           name,
@@ -14454,8 +14546,8 @@ var ToolMessage = /* @__PURE__ */ __name(({
           emphasis
         }
       ),
-      shouldShowFocusHint && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { marginLeft: 1, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: theme.text.accent, children: isThisShellFocused ? "(Focused)" : "(ctrl+f to focus)" }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+      shouldShowFocusHint && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Box_default, { marginLeft: 1, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color: theme.text.accent, children: isThisShellFocused ? "(Focused)" : "(ctrl+f to focus)" }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
         ToolElapsedTime,
         {
           status,
@@ -14463,11 +14555,11 @@ var ToolMessage = /* @__PURE__ */ __name(({
           timeoutMs: shellTimeoutMs
         }
       ),
-      emphasis === "high" && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(TrailingIndicator, {})
+      emphasis === "high" && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(TrailingIndicator, {})
     ] }),
-    effectiveDisplayRenderer.type !== "none" && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { paddingLeft: STATUS_INDICATOR_WIDTH, width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Box_default, { flexDirection: "column", children: [
-      effectiveDisplayRenderer.type === "todo" && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(TodoResultRenderer, { data: effectiveDisplayRenderer.data }),
-      effectiveDisplayRenderer.type === "plan" && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+    effectiveDisplayRenderer.type !== "none" && !shouldCollapseResult && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Box_default, { paddingLeft: STATUS_INDICATOR_WIDTH, width: "100%", children: /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Box_default, { flexDirection: "column", children: [
+      effectiveDisplayRenderer.type === "todo" && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(TodoResultRenderer, { data: effectiveDisplayRenderer.data }),
+      effectiveDisplayRenderer.type === "plan" && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
         PlanResultRenderer,
         {
           data: effectiveDisplayRenderer.data,
@@ -14475,7 +14567,7 @@ var ToolMessage = /* @__PURE__ */ __name(({
           childWidth: innerWidth
         }
       ),
-      effectiveDisplayRenderer.type === "task" && config && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+      effectiveDisplayRenderer.type === "task" && config && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
         SubagentExecutionRenderer,
         {
           data: effectiveDisplayRenderer.data,
@@ -14486,7 +14578,7 @@ var ToolMessage = /* @__PURE__ */ __name(({
           isPending
         }
       ),
-      effectiveDisplayRenderer.type === "diff" && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+      effectiveDisplayRenderer.type === "diff" && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
         DiffResultRenderer,
         {
           data: effectiveDisplayRenderer.data,
@@ -14495,8 +14587,8 @@ var ToolMessage = /* @__PURE__ */ __name(({
           settings
         }
       ),
-      effectiveDisplayRenderer.type === "ansi" && /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(import_jsx_runtime20.Fragment, { children: [
-        /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+      effectiveDisplayRenderer.type === "ansi" && /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(import_jsx_runtime21.Fragment, { children: [
+        /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
           AnsiOutputText,
           {
             data: effectiveDisplayRenderer.data,
@@ -14504,7 +14596,7 @@ var ToolMessage = /* @__PURE__ */ __name(({
             maxWidth: innerWidth
           }
         ),
-        effectiveDisplayRenderer.stats && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+        effectiveDisplayRenderer.stats && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
           ShellStatsBar,
           {
             ...effectiveDisplayRenderer.stats,
@@ -14512,7 +14604,7 @@ var ToolMessage = /* @__PURE__ */ __name(({
           }
         )
       ] }),
-      effectiveDisplayRenderer.type === "string" && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+      effectiveDisplayRenderer.type === "string" && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
         StringResultRenderer,
         {
           data: effectiveDisplayRenderer.data,
@@ -14522,7 +14614,7 @@ var ToolMessage = /* @__PURE__ */ __name(({
         }
       )
     ] }) }),
-    isThisShellFocused && config && /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(
+    isThisShellFocused && config && /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Box_default, { paddingLeft: STATUS_INDICATOR_WIDTH, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
       ShellInputPrompt,
       {
         activeShellPtyId: activeShellPtyId ?? null,
@@ -14537,8 +14629,7 @@ var ToolInfo = /* @__PURE__ */ __name(({
   status,
   emphasis
 }) => {
-  const { compactMode } = useCompactMode();
-  const nameColor = import_react25.default.useMemo(() => {
+  const nameColor = import_react24.default.useMemo(() => {
     switch (emphasis) {
       case "high":
         return theme.text.primary;
@@ -14552,109 +14643,20 @@ var ToolInfo = /* @__PURE__ */ __name(({
       }
     }
   }, [emphasis]);
-  const isDim = compactMode && status === "Success" /* Success */;
-  return /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(
-    Text,
-    {
-      wrap: "truncate-end",
-      strikethrough: status === "Canceled" /* Canceled */,
-      dimColor: isDim,
-      children: [
-        /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: nameColor, bold: !isDim, children: localizeToolDisplayName(name) }),
-        " ",
-        /* @__PURE__ */ (0, import_jsx_runtime20.jsx)(Text, { color: theme.text.secondary, children: description })
-      ]
-    }
-  ) });
+  return /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Text, { wrap: "wrap", strikethrough: status === "Canceled" /* Canceled */, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color: nameColor, bold: true, children: localizeToolDisplayName(name) }),
+    " ",
+    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color: theme.text.secondary, children: description })
+  ] }) });
 }, "ToolInfo");
-var TrailingIndicator = /* @__PURE__ */ __name(() => /* @__PURE__ */ (0, import_jsx_runtime20.jsxs)(Text, { color: theme.text.primary, wrap: "truncate", children: [
+var TrailingIndicator = /* @__PURE__ */ __name(() => /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Text, { color: theme.text.primary, wrap: "truncate", children: [
   " ",
   "\u2190"
 ] }), "TrailingIndicator");
 
-// packages/cli/src/ui/components/messages/CompactToolGroupDisplay.tsx
-init_esbuild_shims();
-var import_jsx_runtime21 = __toESM(require_jsx_runtime(), 1);
-function getOverallStatus(toolCalls) {
-  if (toolCalls.some((t2) => t2.status === "Confirming" /* Confirming */))
-    return "Confirming" /* Confirming */;
-  if (toolCalls.some((t2) => t2.status === "Executing" /* Executing */))
-    return "Executing" /* Executing */;
-  if (toolCalls.some((t2) => t2.status === "Error" /* Error */))
-    return "Error" /* Error */;
-  if (toolCalls.some((t2) => t2.status === "Canceled" /* Canceled */))
-    return "Canceled" /* Canceled */;
-  if (toolCalls.some((t2) => t2.status === "Pending" /* Pending */))
-    return "Pending" /* Pending */;
-  return "Success" /* Success */;
-}
-__name(getOverallStatus, "getOverallStatus");
-function getActiveTool(toolCalls) {
-  return toolCalls.find((t2) => t2.status === "Confirming" /* Confirming */) ?? toolCalls.find((t2) => t2.status === "Executing" /* Executing */) ?? toolCalls[toolCalls.length - 1];
-}
-__name(getActiveTool, "getActiveTool");
-function getShellTimeoutMs(tool) {
-  const display = tool.resultDisplay;
-  if (typeof display === "object" && display !== null && "ansiOutput" in display) {
-    return display.timeoutMs;
-  }
-  return void 0;
-}
-__name(getShellTimeoutMs, "getShellTimeoutMs");
-function renderSummaryHeader(label, count) {
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(import_jsx_runtime21.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { bold: true, children: label }),
-    count > 1 ? /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Text, { color: theme.text.secondary, children: [
-      "  \xB7 ",
-      count,
-      " tools"
-    ] }) : null
-  ] });
-}
-__name(renderSummaryHeader, "renderSummaryHeader");
-function renderDefaultHeader(activeToolName, activeToolDescription, count) {
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(import_jsx_runtime21.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { bold: true, children: activeToolName }),
-    count > 1 ? /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Text, { color: theme.text.secondary, children: [
-      " \xD7 ",
-      count
-    ] }) : null,
-    activeToolDescription ? /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Text, { color: theme.text.secondary, children: [
-      "  ",
-      activeToolDescription
-    ] }) : null
-  ] });
-}
-__name(renderDefaultHeader, "renderDefaultHeader");
-var CompactToolGroupDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWidth, compactLabel }) => {
-  if (toolCalls.length === 0) return null;
-  const overallStatus = getOverallStatus(toolCalls);
-  const activeTool = getActiveTool(toolCalls);
-  const activeToolDescription = activeTool.description ? activeTool.description.split("\n")[0] : "";
-  return /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Box_default, { flexDirection: "column", width: contentWidth, paddingX: 1, gap: 0, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsxs)(Box_default, { flexDirection: "row", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(ToolStatusIndicator, { status: overallStatus, name: activeTool.name }),
-      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { wrap: "truncate-end", children: compactLabel ? renderSummaryHeader(compactLabel, toolCalls.length) : renderDefaultHeader(
-        localizeToolDisplayName(activeTool.name),
-        activeToolDescription,
-        toolCalls.length
-      ) }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(
-        ToolElapsedTime,
-        {
-          status: overallStatus,
-          executionStartTime: activeTool.executionStartTime,
-          timeoutMs: getShellTimeoutMs(activeTool)
-        }
-      )
-    ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime21.jsx)(Text, { color: theme.text.secondary, children: t("Press Ctrl+O to show full tool output") })
-  ] });
-}, "CompactToolGroupDisplay");
-
 // packages/cli/src/ui/components/messages/InlineParallelAgentsDisplay.tsx
 init_esbuild_shims();
-var import_react26 = __toESM(require_react(), 1);
+var import_react25 = __toESM(require_react(), 1);
 var import_jsx_runtime22 = __toESM(require_jsx_runtime(), 1);
 function deriveAgentId(toolCall, resultDisplay) {
   return `${resultDisplay.subagentName}-${toolCall.callId}`;
@@ -14720,9 +14722,9 @@ function truncateMiddle(input, max) {
   return `${input.slice(0, head)}\u2026${input.slice(input.length - tail)}`;
 }
 __name(truncateMiddle, "truncateMiddle");
-var InlineParallelAgentsDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWidth, totalAgentCount }) => {
-  const config = (0, import_react26.useContext)(ConfigContext);
-  const agentEntries = (0, import_react26.useMemo)(() => {
+var InlineParallelAgentsDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWidth, totalAgentCount, availableTerminalHeight }) => {
+  const config = (0, import_react25.useContext)(ConfigContext);
+  const agentEntries = (0, import_react25.useMemo)(() => {
     const out = [];
     for (const tc of toolCalls) {
       if (isAgentResult(tc.resultDisplay)) {
@@ -14731,19 +14733,19 @@ var InlineParallelAgentsDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWi
     }
     return out;
   }, [toolCalls]);
-  const [now, setNow] = (0, import_react26.useState)(() => Date.now());
-  const hasLiveAgent = (0, import_react26.useMemo)(
+  const [now, setNow] = (0, import_react25.useState)(() => Date.now());
+  const hasLiveAgent = (0, import_react25.useMemo)(
     () => agentEntries.some(
       (e) => e.result.status === "running" || e.result.status === "background"
     ),
     [agentEntries]
   );
-  (0, import_react26.useEffect)(() => {
+  (0, import_react25.useEffect)(() => {
     if (!hasLiveAgent) return;
     const id = setInterval(() => setNow(Date.now()), 1e3);
     return () => clearInterval(id);
   }, [hasLiveAgent]);
-  const rows = (0, import_react26.useMemo)(() => {
+  const rows = (0, import_react25.useMemo)(() => {
     const registry = config?.getBackgroundTaskRegistry();
     void now;
     return agentEntries.map(({ toolCall, result }) => {
@@ -14759,7 +14761,7 @@ var InlineParallelAgentsDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWi
         endTime: live?.endTime,
         fallbackElapsedMs: result.executionSummary?.totalDurationMs,
         recentActivity: recent ? { name: recent.name, description: recent.description } : void 0,
-        tokenCount: result.tokenCount ?? live?.stats?.totalTokens ?? result.executionSummary?.totalTokens
+        tokenCount: result.tokenCount ?? live?.stats?.outputTokens ?? result.executionSummary?.outputTokens
       };
     });
   }, [agentEntries, config, now]);
@@ -14769,9 +14771,27 @@ var InlineParallelAgentsDisplay = /* @__PURE__ */ __name(({ toolCalls, contentWi
   ).length;
   const total = totalAgentCount ?? rows.length;
   const headerLabel = `Parallel agents \xB7 ${total} \xB7 ${doneCount}/${total} done`;
+  const hasBudget = availableTerminalHeight != null && availableTerminalHeight > 0;
+  let overflowCount = 0;
+  let visibleRows = rows;
+  if (hasBudget && rows.length + 1 > availableTerminalHeight) {
+    if (availableTerminalHeight >= 2) {
+      const rowsFit = availableTerminalHeight - 2;
+      overflowCount = rows.length - rowsFit;
+      visibleRows = rowsFit > 0 ? rows.slice(rows.length - rowsFit) : [];
+    } else {
+      visibleRows = [];
+    }
+  }
   return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(Box_default, { flexDirection: "column", width: contentWidth, paddingX: 1, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { bold: true, color: theme.text.accent, children: headerLabel }) }),
-    rows.map((row) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(AgentRow, { row, now }, row.agentId))
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { bold: true, color: theme.text.accent, wrap: "truncate-end", children: headerLabel }) }),
+    overflowCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(Text, { color: theme.text.secondary, wrap: "truncate-end", children: [
+      "\u2026 +",
+      overflowCount,
+      " more ",
+      overflowCount === 1 ? "agent" : "agents"
+    ] }) }),
+    visibleRows.map((row) => /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(AgentRow, { row, now }, row.agentId))
   ] });
 }, "InlineParallelAgentsDisplay");
 var AgentRow = /* @__PURE__ */ __name(({ row, now }) => {
@@ -14786,10 +14806,10 @@ var AgentRow = /* @__PURE__ */ __name(({ row, now }) => {
   if (tokens) trailingParts.push(`${tokens} tok`);
   const trailing = trailingParts.join(" \xB7 ");
   return /* @__PURE__ */ (0, import_jsx_runtime22.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { flexShrink: 0, marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color, children: glyph }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { flexShrink: 0, marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color, wrap: "truncate-end", children: glyph }) }),
     /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { flexShrink: 0, marginRight: 1, width: NAME_COL_WIDTH, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { wrap: "truncate-end", children: displayName }) }),
     /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { flexShrink: 1, flexGrow: 1, marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color: theme.text.secondary, wrap: "truncate-end", children: activity }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color: theme.text.secondary, children: trailing }) })
+    /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Box_default, { flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime22.jsx)(Text, { color: theme.text.secondary, wrap: "truncate-end", children: trailing }) })
   ] });
 }, "AgentRow");
 
@@ -14834,11 +14854,9 @@ var ToolGroupMessage = /* @__PURE__ */ __name(({
   embeddedShellFocused,
   memoryWriteCount,
   memoryReadCount,
-  isUserInitiated,
-  compactLabel
+  isUserInitiated
 }) => {
   const config = useConfig();
-  const { compactMode } = useCompactMode();
   const hasConfirmingTool = toolCalls.some(
     (t2) => t2.status === "Confirming" /* Confirming */
   );
@@ -14846,33 +14864,27 @@ var ToolGroupMessage = /* @__PURE__ */ __name(({
   const isEmbeddedShellFocused = embeddedShellFocused && toolCalls.some(
     (t2) => t2.ptyId === activeShellPtyId && t2.status === "Executing" /* Executing */
   );
-  const toolAwaitingApproval = (0, import_react27.useMemo)(
+  const toolAwaitingApproval = (0, import_react26.useMemo)(
     () => toolCalls.find((tc) => tc.status === "Confirming" /* Confirming */),
     [toolCalls]
   );
-  const isMemoryOnlyGroup = (0, import_react27.useMemo)(
+  const isMemoryOnlyGroup = (0, import_react26.useMemo)(
     () => toolCalls.length > 0 && toolCalls.every((t2) => t2.isMemoryOp != null),
     [toolCalls]
   );
-  const allComplete = (0, import_react27.useMemo)(
-    () => toolCalls.every(
-      (t2) => t2.status === "Success" /* Success */ || t2.status === "Error" /* Error */
-    ),
-    [toolCalls]
-  );
-  const inlineToolCalls = (0, import_react27.useMemo)(
+  const inlineToolCalls = (0, import_react26.useMemo)(
     () => isPending ? toolCalls.filter(
       (tool) => !isPanelOwnedSubagentTool(tool) || isAgentWithPendingConfirmation(tool.resultDisplay)
     ) : toolCalls,
     [isPending, toolCalls]
   );
-  const subagentsAwaitingApproval = (0, import_react27.useMemo)(
+  const subagentsAwaitingApproval = (0, import_react26.useMemo)(
     () => toolCalls.filter(
       (tc) => isAgentWithPendingConfirmation(tc.resultDisplay)
     ),
     [toolCalls]
   );
-  const focusedSubagentRef = (0, import_react27.useRef)(null);
+  const focusedSubagentRef = (0, import_react26.useRef)(null);
   const stillPending = subagentsAwaitingApproval.some(
     (tc) => tc.callId === focusedSubagentRef.current
   );
@@ -14880,55 +14892,31 @@ var ToolGroupMessage = /* @__PURE__ */ __name(({
     focusedSubagentRef.current = subagentsAwaitingApproval[0]?.callId ?? null;
   }
   const focusedSubagentCallId = focusedSubagentRef.current;
-  const runningSubagentCallId = (0, import_react27.useMemo)(
+  const runningSubagentCallId = (0, import_react26.useMemo)(
     () => toolCalls.find((tc) => isRunningAgent(tc.resultDisplay))?.callId ?? null,
     [toolCalls]
   );
   const keyboardFocusedSubagentCallId = focusedSubagentCallId ?? runningSubagentCallId;
   const hasSubagentPendingConfirmation = subagentsAwaitingApproval.length > 0;
   if (isPureParallelAgentGroup(toolCalls) && !hasSubagentPendingConfirmation) {
+    if (inlineToolCalls.length === 0) {
+      return null;
+    }
     return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
       InlineParallelAgentsDisplay,
-      {
-        toolCalls,
-        contentWidth
-      }
-    );
-  }
-  if (isPending && inlineToolCalls.length === 0) {
-    return null;
-  }
-  const hasTerminalSubagent = inlineToolCalls.some(isTerminalSubagentTool);
-  const showCompact = compactMode && !hasConfirmingTool && !hasSubagentPendingConfirmation && !hasErrorTool && !isEmbeddedShellFocused && !isUserInitiated && !hasTerminalSubagent;
-  if (showCompact) {
-    return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
-      CompactToolGroupDisplay,
       {
         toolCalls: inlineToolCalls,
         contentWidth,
-        compactLabel
+        totalAgentCount: toolCalls.length,
+        availableTerminalHeight: isPending ? availableTerminalHeight : void 0
       }
     );
   }
-  const staticHeight = (
-    /* marginBottom */
-    1
-  );
-  const innerWidth = contentWidth - 2;
-  let countToolCallsWithResults = 0;
-  for (const tool of inlineToolCalls) {
-    if (tool.resultDisplay !== void 0 && tool.resultDisplay !== "") {
-      countToolCallsWithResults++;
-    }
+  if (isPending && inlineToolCalls.length === 0) {
+    return null;
   }
-  const countOneLineToolCalls = inlineToolCalls.length - countToolCallsWithResults;
-  const availableTerminalHeightPerToolMessage = availableTerminalHeight ? Math.max(
-    Math.floor(
-      (availableTerminalHeight - staticHeight - countOneLineToolCalls) / Math.max(1, countToolCallsWithResults)
-    ),
-    1
-  ) : void 0;
-  if (isMemoryOnlyGroup && allComplete) {
+  const allMemOpsComplete = isMemoryOnlyGroup && !hasErrorTool && toolCalls.every((t2) => t2.status === "Success" /* Success */);
+  if (allMemOpsComplete) {
     const readCount = memoryReadCount ?? 0;
     const writeCount = memoryWriteCount ?? 0;
     return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Box_default, { flexDirection: "column", width: contentWidth, children: [
@@ -14948,23 +14936,64 @@ var ToolGroupMessage = /* @__PURE__ */ __name(({
       ] }) })
     ] });
   }
+  const hasTerminalSubagent = inlineToolCalls.some(isTerminalSubagentTool);
+  const forceExpandAll = hasConfirmingTool || hasSubagentPendingConfirmation || hasErrorTool || isEmbeddedShellFocused || isUserInitiated || hasTerminalSubagent;
+  const collapsibleTools = forceExpandAll ? [] : inlineToolCalls.filter(
+    (t2) => isCollapsibleTool(t2.name) && t2.status !== "Canceled" /* Canceled */
+  );
+  const nonCollapsibleTools = forceExpandAll ? inlineToolCalls : inlineToolCalls.filter(
+    (t2) => !isCollapsibleTool(t2.name) || t2.status === "Canceled" /* Canceled */
+  );
+  const hasMemoryBadge = !isMemoryOnlyGroup && ((memoryWriteCount ?? 0) > 0 || (memoryReadCount ?? 0) > 0);
+  const memoryBadge = hasMemoryBadge ? /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { paddingLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Text, { dimColor: true, children: [
+    "\u25CF ",
+    [
+      (memoryReadCount ?? 0) > 0 && `Recalled ${memoryReadCount} ${memoryReadCount === 1 ? "memory" : "memories"}`,
+      (memoryWriteCount ?? 0) > 0 && `Wrote ${memoryWriteCount} ${memoryWriteCount === 1 ? "memory" : "memories"}`
+    ].filter(Boolean).join(", ")
+  ] }) }) : null;
+  if (collapsibleTools.length > 0 && nonCollapsibleTools.length === 0) {
+    return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Box_default, { flexDirection: "column", width: contentWidth, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+        CompactToolGroupDisplay,
+        {
+          toolCalls: collapsibleTools,
+          contentWidth
+        }
+      ),
+      memoryBadge
+    ] });
+  }
+  const collapsibleSummaryHeight = collapsibleTools.length > 0 ? 1 : 0;
+  const memoryBadgeHeight = hasMemoryBadge ? 1 : 0;
+  const staticHeight = (
+    /* marginBottom */
+    1 + collapsibleSummaryHeight + memoryBadgeHeight
+  );
+  const innerWidth = contentWidth - 2;
+  let countToolCallsWithResults = 0;
+  for (const tool of nonCollapsibleTools) {
+    if (tool.resultDisplay !== void 0 && tool.resultDisplay !== "") {
+      countToolCallsWithResults++;
+    }
+  }
+  const countOneLineToolCalls = nonCollapsibleTools.length - countToolCallsWithResults;
+  const availableTerminalHeightPerToolMessage = availableTerminalHeight ? Math.max(
+    Math.floor(
+      (availableTerminalHeight - staticHeight - countOneLineToolCalls) / Math.max(1, countToolCallsWithResults)
+    ),
+    1
+  ) : void 0;
   return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Box_default, { flexDirection: "column", width: contentWidth, gap: 0, children: [
-    !isMemoryOnlyGroup && ((memoryWriteCount ?? 0) > 0 || (memoryReadCount ?? 0) > 0) && (() => {
-      const parts = [];
-      if ((memoryReadCount ?? 0) > 0) {
-        const n = memoryReadCount;
-        parts.push(`Recalled ${n} ${n === 1 ? "memory" : "memories"}`);
-      }
-      if ((memoryWriteCount ?? 0) > 0) {
-        const n = memoryWriteCount;
-        parts.push(`Wrote ${n} ${n === 1 ? "memory" : "memories"}`);
+    collapsibleTools.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(
+      CompactToolGroupDisplay,
+      {
+        toolCalls: collapsibleTools,
+        contentWidth
       }
-      return /* @__PURE__ */ (0, import_jsx_runtime23.jsx)(Box_default, { paddingLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Text, { dimColor: true, children: [
-        "\u25CF ",
-        parts.join(", ")
-      ] }) });
-    })(),
-    inlineToolCalls.map((tool) => {
+    ),
+    memoryBadge,
+    nonCollapsibleTools.map((tool) => {
       const isConfirming = toolAwaitingApproval?.callId === tool.callId;
       const isSubagentFocused = isFocused && !toolAwaitingApproval && keyboardFocusedSubagentCallId === tool.callId;
       return /* @__PURE__ */ (0, import_jsx_runtime23.jsxs)(Box_default, { flexDirection: "column", minHeight: 1, children: [
@@ -14978,14 +15007,7 @@ var ToolGroupMessage = /* @__PURE__ */ __name(({
             activeShellPtyId,
             embeddedShellFocused,
             config,
-            forceShowResult: isUserInitiated || tool.status === "Confirming" /* Confirming */ || tool.status === "Error" /* Error */ || isAgentWithPendingConfirmation(tool.resultDisplay) || // Terminal subagents need their result block to render
-            // even in compact mode — that's where
-            // `SubagentScrollbackSummary` lands. ToolMessage's
-            // compact-mode gate
-            // (`!compactMode || forceShowResult ? renderer : 'none'`)
-            // would otherwise drop the result block, leaving the
-            // committed audit trail empty for compact-mode users.
-            isTerminalSubagentTool(tool),
+            forceShowResult: isUserInitiated || tool.status === "Confirming" /* Confirming */ || tool.status === "Error" /* Error */ || isAgentWithPendingConfirmation(tool.resultDisplay) || isTerminalSubagentTool(tool),
             isFocused: isSubagentFocused,
             isPending
           }
@@ -15046,7 +15068,7 @@ function CompressionMessage({
   }, "getCompressionText");
   const text = getCompressionText();
   return /* @__PURE__ */ (0, import_jsx_runtime24.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginRight: 1, children: isPending ? /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(build_default, { type: "dots" }) : /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.accent, children: "\u2726" }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { marginRight: 1, children: isPending ? /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(build_default, { type: "dots" }) : /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Text, { color: theme.text.accent, children: "\u25C6" }) }),
     /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime24.jsx)(
       Text,
       {
@@ -15105,7 +15127,7 @@ init_esbuild_shims();
 
 // node_modules/ink-link/dist/index.js
 init_esbuild_shims();
-var import_react28 = __toESM(require_react(), 1);
+var import_react27 = __toESM(require_react(), 1);
 var import_prop_types = __toESM(require_prop_types(), 1);
 
 // node_modules/ink-link/node_modules/terminal-link/index.js
@@ -15253,10 +15275,10 @@ terminalLink.stderr.isSupported = import_supports_hyperlinks.default.stderr;
 // node_modules/ink-link/dist/index.js
 var Link = /* @__PURE__ */ __name(({ children, url, fallback = true }) => (
   // eslint-disable-line react/function-component-definition
-  import_react28.default.createElement(
+  import_react27.default.createElement(
     Transform,
     { transform: /* @__PURE__ */ __name((children2) => terminalLink(children2, url, { fallback }), "transform") },
-    import_react28.default.createElement(Text, null, children)
+    import_react27.default.createElement(Text, null, children)
   )
 ), "Link");
 Link.propTypes = {
@@ -15353,6 +15375,15 @@ var RetryCountdownMessage = /* @__PURE__ */ __name(({ text }) => /* @__PURE__ */
     textColor: theme.text.secondary
   }
 ), "RetryCountdownMessage");
+var VisionNoticeMessage = /* @__PURE__ */ __name(({ text }) => /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(
+  StatusMessage,
+  {
+    text,
+    prefix: "\u25CE",
+    prefixColor: theme.text.secondary,
+    textColor: theme.text.secondary
+  }
+), "VisionNoticeMessage");
 var AwayRecapMessage = /* @__PURE__ */ __name(({ text }) => /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(Box_default, { flexDirection: "row", children: [
   /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Box_default, { width: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime26.jsx)(Text, { color: theme.text.secondary, children: "\u203B" }) }),
   /* @__PURE__ */ (0, import_jsx_runtime26.jsxs)(Text, { wrap: "wrap", children: [
@@ -15401,7 +15432,7 @@ init_esbuild_shims();
 
 // node_modules/ink-gradient/dist/index.js
 init_esbuild_shims();
-var import_react29 = __toESM(require_react(), 1);
+var import_react28 = __toESM(require_react(), 1);
 var import_prop_types2 = __toESM(require_prop_types(), 1);
 var import_gradient_string = __toESM(require_gradient_string(), 1);
 var Gradient = /* @__PURE__ */ __name((props) => {
@@ -15417,7 +15448,7 @@ var Gradient = /* @__PURE__ */ __name((props) => {
     throw new Error("Either `name` or `colors` prop must be provided");
   }
   const applyGradient = /* @__PURE__ */ __name((text) => gradient.multiline(stripAnsi(text)), "applyGradient");
-  return import_react29.default.createElement(Transform, { transform: applyGradient }, props.children);
+  return import_react28.default.createElement(Transform, { transform: applyGradient }, props.children);
 }, "Gradient");
 Gradient.propTypes = {
   children: import_prop_types2.default.oneOfType([
@@ -16095,9 +16126,98 @@ var ToolStatsDisplay = /* @__PURE__ */ __name(({
   );
 }, "ToolStatsDisplay");
 
-// packages/cli/src/ui/components/SessionSummaryDisplay.tsx
+// packages/cli/src/ui/components/SkillStatsDisplay.tsx
 init_esbuild_shims();
 var import_jsx_runtime31 = __toESM(require_jsx_runtime(), 1);
+var SKILL_NAME_COL_WIDTH = 30;
+var CALLS_COL_WIDTH2 = 8;
+var SUCCESS_COL_WIDTH = 8;
+var FAIL_COL_WIDTH = 8;
+var SUCCESS_RATE_COL_WIDTH2 = 15;
+var StatRow4 = /* @__PURE__ */ __name(({ name, stats }) => {
+  const successRate = stats.count > 0 ? stats.success / stats.count * 100 : 0;
+  const successColor = getStatusColor(successRate, {
+    green: TOOL_SUCCESS_RATE_HIGH,
+    yellow: TOOL_SUCCESS_RATE_MEDIUM
+  });
+  return /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(Box_default, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Box_default, { width: SKILL_NAME_COL_WIDTH, children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Text, { color: theme.text.link, children: name }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Box_default, { width: CALLS_COL_WIDTH2, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Text, { color: theme.text.primary, children: stats.count }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Box_default, { width: SUCCESS_COL_WIDTH, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Text, { color: theme.status.success, children: stats.success }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Box_default, { width: FAIL_COL_WIDTH, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Text, { color: stats.fail > 0 ? theme.status.error : theme.text.primary, children: stats.fail }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Box_default, { width: SUCCESS_RATE_COL_WIDTH2, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(Text, { color: successColor, children: [
+      successRate.toFixed(1),
+      "%"
+    ] }) })
+  ] });
+}, "StatRow");
+var SkillStatsDisplay = /* @__PURE__ */ __name(({
+  width
+}) => {
+  const { stats } = useSessionStats();
+  const skills = stats.metrics.skills ?? {
+    totalCalls: 0,
+    totalSuccess: 0,
+    totalFail: 0,
+    byName: {}
+  };
+  const activeSkills = Object.entries(skills.byName).filter(([, metrics]) => metrics.count > 0).sort(([leftName, left], [rightName, right]) => {
+    const countDelta = right.count - left.count;
+    return countDelta !== 0 ? countDelta : leftName.localeCompare(rightName);
+  });
+  if (activeSkills.length === 0) {
+    return /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+      Box_default,
+      {
+        borderStyle: "round",
+        borderColor: theme.border.default,
+        paddingY: 1,
+        paddingX: 2,
+        width,
+        children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Text, { color: theme.text.primary, children: t("No skill calls have been made in this session.") })
+      }
+    );
+  }
+  return /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(
+    Box_default,
+    {
+      borderStyle: "round",
+      borderColor: theme.border.default,
+      flexDirection: "column",
+      paddingY: 1,
+      paddingX: 2,
+      width,
+      children: [
+        /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Text, { bold: true, color: theme.text.accent, children: t("Skill Stats For Nerds") }),
+        /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Box_default, { height: 1 }),
+        /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(Box_default, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Box_default, { width: SKILL_NAME_COL_WIDTH, children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Skill Name") }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Box_default, { width: CALLS_COL_WIDTH2, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Calls") }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Box_default, { width: SUCCESS_COL_WIDTH, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Text, { bold: true, color: theme.text.primary, children: t("OK") }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Box_default, { width: FAIL_COL_WIDTH, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Fail") }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Box_default, { width: SUCCESS_RATE_COL_WIDTH2, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Success Rate") }) })
+        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+          Box_default,
+          {
+            borderStyle: "single",
+            borderBottom: true,
+            borderTop: false,
+            borderLeft: false,
+            borderRight: false,
+            borderColor: theme.border.default,
+            width: "100%"
+          }
+        ),
+        activeSkills.map(([name, skillStats]) => /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(StatRow4, { name, stats: skillStats }, name))
+      ]
+    }
+  );
+}, "SkillStatsDisplay");
+
+// packages/cli/src/ui/components/SessionSummaryDisplay.tsx
+init_esbuild_shims();
+var import_jsx_runtime32 = __toESM(require_jsx_runtime(), 1);
 var SessionSummaryDisplay = /* @__PURE__ */ __name(({
   duration,
   width
@@ -16106,8 +16226,8 @@ var SessionSummaryDisplay = /* @__PURE__ */ __name(({
   const { stats } = useSessionStats();
   const hasMessages = stats.promptCount > 0;
   const canResume = !!config.getChatRecordingService();
-  return /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(import_jsx_runtime31.Fragment, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(import_jsx_runtime32.Fragment, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
       StatsDisplay,
       {
         title: t("Agent powering down. Goodbye!"),
@@ -16115,10 +16235,10 @@ var SessionSummaryDisplay = /* @__PURE__ */ __name(({
         width
       }
     ),
-    hasMessages && canResume && /* @__PURE__ */ (0, import_jsx_runtime31.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(Text, { color: theme.text.secondary, children: [
+    hasMessages && canResume && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Text, { color: theme.text.secondary, children: [
       t("To continue this session, run"),
       " ",
-      /* @__PURE__ */ (0, import_jsx_runtime31.jsxs)(Text, { color: theme.text.accent, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Text, { color: theme.text.accent, children: [
         "qwen --resume ",
         stats.sessionId
       ] })
@@ -16128,8 +16248,8 @@ var SessionSummaryDisplay = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/Help.tsx
 init_esbuild_shims();
-var import_react30 = __toESM(require_react(), 1);
-var import_jsx_runtime32 = __toESM(require_jsx_runtime(), 1);
+var import_react29 = __toESM(require_react(), 1);
+var import_jsx_runtime33 = __toESM(require_jsx_runtime(), 1);
 var DEFAULT_WIDTH = 100;
 var KEY_COL_WIDTH = 20;
 var COMMAND_LIST_VISIBLE_LINES = 18;
@@ -16149,7 +16269,7 @@ var Help = /* @__PURE__ */ __name(({
 }) => {
   const safeWidth = Math.max(72, width);
   const bodyWidth = safeWidth - 6;
-  const handleTabChange = (0, import_react30.useCallback)(
+  const handleTabChange = (0, import_react29.useCallback)(
     (direction) => {
       const currentIndex = TAB_DEFS.findIndex((tab) => tab.tab === activeTab);
       const nextIndex = (currentIndex + direction + TAB_DEFS.length) % TAB_DEFS.length;
@@ -16169,13 +16289,13 @@ var Help = /* @__PURE__ */ __name(({
     },
     { isActive: isInteractive }
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { flexDirection: "column", width: safeWidth, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { flexDirection: "column", width: safeWidth, children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
     Box_default,
     {
       borderColor: theme.border.default,
       borderStyle: "single",
       width: safeWidth,
-      children: /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(
         Box_default,
         {
           flexDirection: "column",
@@ -16183,10 +16303,10 @@ var Help = /* @__PURE__ */ __name(({
           paddingY: 1,
           width: safeWidth - 2,
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(HelpTabs, { activeTab }),
-            /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { marginTop: 1, children: [
-              activeTab === "general" && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(GeneralHelp, { width: bodyWidth }),
-              activeTab === "commands" && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+            /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(HelpTabs, { activeTab }),
+            /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Box_default, { marginTop: 1, children: [
+              activeTab === "general" && /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(GeneralHelp, { width: bodyWidth }),
+              activeTab === "commands" && /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
                 CommandsHelp,
                 {
                   commands,
@@ -16195,7 +16315,7 @@ var Help = /* @__PURE__ */ __name(({
                   isInteractive
                 }
               ),
-              activeTab === "custom-commands" && /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+              activeTab === "custom-commands" && /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
                 CommandsHelp,
                 {
                   commands,
@@ -16205,24 +16325,24 @@ var Help = /* @__PURE__ */ __name(({
                 }
               )
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Text, { color: theme.text.secondary, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Text, { color: theme.text.secondary, children: [
               t("For more help:"),
               " ",
-              /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { underline: true, children: DOCS_URL })
+              /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { underline: true, children: DOCS_URL })
             ] }) }),
-            /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { italic: true, color: theme.text.secondary, children: t("Tab/Shift+Tab to switch tabs  \xB7  Esc to cancel") }) })
+            /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { italic: true, color: theme.text.secondary, children: t("Tab/Shift+Tab to switch tabs  \xB7  Esc to cancel") }) })
           ]
         }
       )
     }
   ) });
 }, "Help");
-var HelpTabs = /* @__PURE__ */ __name(({ activeTab }) => /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "row", children: [
-  /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { bold: true, color: theme.text.accent, children: "Qwen Code" }),
-  /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { color: theme.text.secondary, children: " " }),
+var HelpTabs = /* @__PURE__ */ __name(({ activeTab }) => /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Box_default, { flexDirection: "row", children: [
+  /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { bold: true, color: theme.text.accent, children: "Qwen Code" }),
+  /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { color: theme.text.secondary, children: " " }),
   TAB_DEFS.map(({ tab, labelKey }) => {
     const active = tab === activeTab;
-    return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { marginLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { marginLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
       Text,
       {
         color: active ? theme.background.primary : theme.text.primary,
@@ -16254,13 +16374,13 @@ var GeneralHelp = /* @__PURE__ */ __name(({ width }) => {
   const left = shortcuts.slice(0, Math.ceil(shortcuts.length / 2));
   const right = shortcuts.slice(Math.ceil(shortcuts.length / 2));
   const colWidth = Math.floor((width - 2) / 2);
-  return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { color: theme.text.primary, children: t(
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Box_default, { flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { color: theme.text.primary, children: t(
       "Qwen Code understands your codebase, makes edits with your permission, and executes commands right from your terminal."
     ) }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Shortcuts") }),
-    /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "row", gap: 2, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { flexDirection: "column", width: colWidth, children: left.map(([key, desc]) => /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+    /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Shortcuts") }),
+    /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Box_default, { flexDirection: "row", gap: 2, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { flexDirection: "column", width: colWidth, children: left.map(([key, desc]) => /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
         ShortcutRow,
         {
           shortcutKey: key,
@@ -16269,7 +16389,7 @@ var GeneralHelp = /* @__PURE__ */ __name(({ width }) => {
         },
         key
       )) }),
-      /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { flexDirection: "column", width: colWidth, children: right.map(([key, desc]) => /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { flexDirection: "column", width: colWidth, children: right.map(([key, desc]) => /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(
         ShortcutRow,
         {
           shortcutKey: key,
@@ -16281,25 +16401,25 @@ var GeneralHelp = /* @__PURE__ */ __name(({ width }) => {
     ] })
   ] });
 }, "GeneralHelp");
-var ShortcutRow = /* @__PURE__ */ __name(({ shortcutKey, desc, width }) => /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "row", width, children: [
-  /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { width: KEY_COL_WIDTH, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { color: theme.text.accent, children: shortcutKey }) }),
-  /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { color: theme.text.primary, wrap: "truncate", children: truncateText2(desc, width - KEY_COL_WIDTH - 1) })
+var ShortcutRow = /* @__PURE__ */ __name(({ shortcutKey, desc, width }) => /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Box_default, { flexDirection: "row", width, children: [
+  /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { width: KEY_COL_WIDTH, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { color: theme.text.accent, children: shortcutKey }) }),
+  /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { color: theme.text.primary, wrap: "truncate", children: truncateText2(desc, width - KEY_COL_WIDTH - 1) })
 ] }), "ShortcutRow");
 var CommandsHelp = /* @__PURE__ */ __name(({ commands, width, customOnly, isInteractive }) => {
-  const groups = (0, import_react30.useMemo)(
+  const groups = (0, import_react29.useMemo)(
     () => groupCommands(commands, customOnly),
     [commands, customOnly]
   );
-  const lines = (0, import_react30.useMemo)(
+  const lines = (0, import_react29.useMemo)(
     () => renderCommandLines(groups, width),
     [groups, width]
   );
   const maxScroll = Math.max(0, lines.length - COMMAND_LIST_VISIBLE_LINES);
-  const [scrollOffset, setScrollOffset] = (0, import_react30.useState)(0);
-  (0, import_react30.useEffect)(() => {
+  const [scrollOffset, setScrollOffset] = (0, import_react29.useState)(0);
+  (0, import_react29.useEffect)(() => {
     setScrollOffset(0);
   }, [customOnly, commands]);
-  (0, import_react30.useEffect)(() => {
+  (0, import_react29.useEffect)(() => {
     setScrollOffset((offset) => Math.min(offset, maxScroll));
   }, [maxScroll]);
   useKeypress(
@@ -16321,17 +16441,17 @@ var CommandsHelp = /* @__PURE__ */ __name(({ commands, width, customOnly, isInte
     { isActive: isInteractive }
   );
   if (groups.length === 0) {
-    return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { color: theme.text.secondary, children: customOnly ? t("No custom commands are currently available.") : t("No commands are currently available.") });
+    return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { color: theme.text.secondary, children: customOnly ? t("No custom commands are currently available.") : t("No commands are currently available.") });
   }
   const visibleLines = lines.slice(
     scrollOffset,
     scrollOffset + COMMAND_LIST_VISIBLE_LINES
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { color: theme.text.primary, children: customOnly ? t("Browse custom, skill, plugin, and MCP commands:") : t("Browse built-in commands:") }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { flexDirection: "column", height: COMMAND_LIST_VISIBLE_LINES, children: visibleLines.map((line, index) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Box_default, { flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { color: theme.text.primary, children: customOnly ? t("Browse custom, skill, plugin, and MCP commands:") : t("Browse built-in commands:") }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { flexDirection: "column", height: COMMAND_LIST_VISIBLE_LINES, children: visibleLines.map((line, index) => {
       const stableKey = line.type === "blank" ? `blank:${index}` : `${line.type}:${line.text}:${index}`;
-      return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(CommandLine, { line }, stableKey);
+      return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(CommandLine, { line }, stableKey);
     }) }),
     maxScroll > 0 && (() => {
       const totalCommands = lines.filter(
@@ -16343,7 +16463,7 @@ var CommandsHelp = /* @__PURE__ */ __name(({ commands, width, customOnly, isInte
       const firstCmd = visibleSignatures.length > 0 ? visibleSignatures[0].commandIndex + 1 : 0;
       const lastCmd = visibleSignatures.length > 0 ? visibleSignatures[visibleSignatures.length - 1].commandIndex + 1 : 0;
       const range = firstCmd === lastCmd ? `${firstCmd}` : `${firstCmd}-${lastCmd}`;
-      return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Text, { color: theme.text.secondary, children: [
+      return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Text, { color: theme.text.secondary, children: [
         t("Use \u2191/\u2193 to scroll"),
         " ",
         `(${range}/${totalCommands})`
@@ -16354,28 +16474,28 @@ var CommandsHelp = /* @__PURE__ */ __name(({ commands, width, customOnly, isInte
 var CommandLine = /* @__PURE__ */ __name(({ line }) => {
   switch (line.type) {
     case "group":
-      return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Text, { bold: true, color: theme.text.primary, children: [
+      return /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Text, { bold: true, color: theme.text.primary, children: [
         line.text,
         " ",
-        /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { color: theme.text.secondary, children: `(${line.count})` })
+        /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { color: theme.text.secondary, children: `(${line.count})` })
       ] });
     case "signature":
-      return /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Box_default, { flexDirection: "row", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Text, { color: theme.text.accent, children: [
+      return /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Box_default, { flexDirection: "row", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Text, { color: theme.text.accent, children: [
           " ",
           line.text
         ] }),
-        line.meta && /* @__PURE__ */ (0, import_jsx_runtime32.jsxs)(Text, { color: theme.text.secondary, children: [
+        line.meta && /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Text, { color: theme.text.secondary, children: [
           " ",
           line.meta
         ] })
       ] });
     case "description":
-      return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { paddingLeft: 4, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { color: theme.text.primary, wrap: "truncate", children: line.text }) });
+      return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { paddingLeft: 4, children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { color: theme.text.primary, wrap: "truncate", children: line.text }) });
     case "subcommands":
-      return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Box_default, { paddingLeft: 4, children: /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { color: theme.text.secondary, wrap: "truncate", children: line.text }) });
+      return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Box_default, { paddingLeft: 4, children: /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { color: theme.text.secondary, wrap: "truncate", children: line.text }) });
     case "blank":
-      return /* @__PURE__ */ (0, import_jsx_runtime32.jsx)(Text, { children: " " });
+      return /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { children: " " });
     default:
       return null;
   }
@@ -16487,26 +16607,26 @@ init_esbuild_shims();
 
 // packages/cli/src/ui/contexts/UIStateContext.tsx
 init_esbuild_shims();
-var import_react37 = __toESM(require_react(), 1);
+var import_react36 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/hooks/useHistoryManager.ts
 init_esbuild_shims();
-var import_react31 = __toESM(require_react(), 1);
+var import_react30 = __toESM(require_react(), 1);
 import process2 from "node:process";
 var debugLogger6 = createDebugLogger("HISTORY_MANAGER");
 var UI_COMPACT_CLEARED_MESSAGE = "[Old tool result content cleared]";
 var UI_COMPACT_KEEP_RECENT = 20;
 function useHistory() {
-  const [history, setHistory] = (0, import_react31.useState)([]);
-  const messageIdCounterRef = (0, import_react31.useRef)(0);
-  const getNextMessageId = (0, import_react31.useCallback)((baseTimestamp) => {
+  const [history, setHistory] = (0, import_react30.useState)([]);
+  const messageIdCounterRef = (0, import_react30.useRef)(0);
+  const getNextMessageId = (0, import_react30.useCallback)((baseTimestamp) => {
     messageIdCounterRef.current += 1;
     return baseTimestamp + messageIdCounterRef.current;
   }, []);
-  const loadHistory = (0, import_react31.useCallback)((newHistory) => {
+  const loadHistory = (0, import_react30.useCallback)((newHistory) => {
     setHistory(newHistory);
   }, []);
-  const addItem = (0, import_react31.useCallback)(
+  const addItem = (0, import_react30.useCallback)(
     (itemData, baseTimestamp) => {
       const id = getNextMessageId(baseTimestamp);
       const newItem = { ...itemData, id };
@@ -16530,7 +16650,7 @@ function useHistory() {
     },
     [getNextMessageId]
   );
-  const updateItem = (0, import_react31.useCallback)(
+  const updateItem = (0, import_react30.useCallback)(
     (id, updates) => {
       setHistory((prevHistory) => {
         let updated = false;
@@ -16553,7 +16673,7 @@ function useHistory() {
     },
     []
   );
-  const clearItems = (0, import_react31.useCallback)(() => {
+  const clearItems = (0, import_react30.useCallback)(() => {
     if (debugLogger6.isEnabled()) {
       debugLogger6.debug(
         `[CLEAR_HISTORY] Clearing history, memory before=${(process2.memoryUsage().heapUsed / 1024 / 1024).toFixed(1)}MB`
@@ -16562,13 +16682,13 @@ function useHistory() {
     setHistory([]);
     messageIdCounterRef.current = 0;
   }, []);
-  const truncateToItem = (0, import_react31.useCallback)((itemId) => {
+  const truncateToItem = (0, import_react30.useCallback)((itemId) => {
     setHistory((prev) => {
       const index = prev.findIndex((h) => h.id === itemId);
       return index === -1 ? prev : prev.slice(0, index);
     });
   }, []);
-  const compactOldItems = (0, import_react31.useCallback)(() => {
+  const compactOldItems = (0, import_react30.useCallback)(() => {
     setHistory((prev) => {
       if (prev.length === 0) return prev;
       let thoughtRemoved = 0;
@@ -16632,7 +16752,7 @@ function useHistory() {
       return thoughtRemoved > 0 || toolGroupsCompacted > 0 ? next : prev;
     });
   }, []);
-  return (0, import_react31.useMemo)(
+  return (0, import_react30.useMemo)(
     () => ({
       history,
       addItem,
@@ -16657,11 +16777,11 @@ __name(useHistory, "useHistory");
 
 // packages/cli/src/ui/contexts/UIActionsContext.tsx
 init_esbuild_shims();
-var import_react34 = __toESM(require_react(), 1);
+var import_react33 = __toESM(require_react(), 1);
 
 // packages/cli/src/ui/IdeIntegrationNudge.tsx
 init_esbuild_shims();
-var import_jsx_runtime33 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime34 = __toESM(require_jsx_runtime(), 1);
 function IdeIntegrationNudge({
   ide,
   onComplete
@@ -16707,7 +16827,7 @@ function IdeIntegrationNudge({
     }
   ];
   const installText = isInSandbox ? `Note: In sandbox environments, IDE integration requires manual setup on the host system. If you select Yes, you'll receive instructions on how to set this up.` : isExtensionPreInstalled ? `If you select Yes, the CLI will connect to your ${ideName ?? "editor"} and have access to your open files and display diffs directly.` : `If you select Yes, we'll install an extension that allows the CLI to access your open files and display diffs directly in ${ideName ?? "your editor"}.`;
-  return /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -16717,14 +16837,14 @@ function IdeIntegrationNudge({
       width: "100%",
       marginLeft: 1,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Box_default, { marginBottom: 1, flexDirection: "column", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime33.jsxs)(Text, { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { color: theme.status.warning, children: "> " }),
+        /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(Box_default, { marginBottom: 1, flexDirection: "column", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(Text, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Text, { color: theme.status.warning, children: "> " }),
             `Do you want to connect ${ideName ?? "your editor"} to Qwen Code?`
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(Text, { color: theme.text.secondary, children: installText })
+          /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Text, { color: theme.text.secondary, children: installText })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime33.jsx)(RadioButtonSelect, { items: OPTIONS, onSelect: onComplete })
+        /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(RadioButtonSelect, { items: OPTIONS, onSelect: onComplete })
       ]
     }
   );
@@ -16733,7 +16853,7 @@ __name(IdeIntegrationNudge, "IdeIntegrationNudge");
 
 // packages/cli/src/ui/CommandFormatMigrationNudge.tsx
 init_esbuild_shims();
-var import_jsx_runtime34 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime35 = __toESM(require_jsx_runtime(), 1);
 function CommandFormatMigrationNudge({
   tomlFiles,
   onComplete
@@ -16767,7 +16887,7 @@ function CommandFormatMigrationNudge({
   const count = tomlFiles.length;
   const fileList = count <= 3 ? tomlFiles.map((f) => `  \u2022 ${f}`).join("\n") : `  \u2022 ${tomlFiles.slice(0, 2).join("\n  \u2022 ")}
   \u2022 ${t("... and {{count}} more", { count: String(count - 2) })}`;
-  return /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -16777,20 +16897,20 @@ function CommandFormatMigrationNudge({
       width: "100%",
       marginLeft: 1,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(Box_default, { marginBottom: 1, flexDirection: "column", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime34.jsxs)(Text, { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Text, { color: theme.status.warning, children: "\u26A0\uFE0F  " }),
-            /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Text, { bold: true, children: t("Command Format Migration") })
+        /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(Box_default, { marginBottom: 1, flexDirection: "column", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(Text, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: theme.status.warning, children: "\u26A0  " }),
+            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { bold: true, children: t("Command Format Migration") })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Text, { color: theme.text.secondary, children: count > 1 ? t("Found {{count}} TOML command files:", { count: String(count) }) : t("Found {{count}} TOML command file:", { count: String(count) }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Text, { color: theme.text.secondary, children: fileList }),
-          /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Text, { children: "" }),
-          /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Text, { color: theme.text.secondary, children: t(
+          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: theme.text.secondary, children: count > 1 ? t("Found {{count}} TOML command files:", { count: String(count) }) : t("Found {{count}} TOML command file:", { count: String(count) }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: theme.text.secondary, children: fileList }),
+          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { children: "" }),
+          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: theme.text.secondary, children: t(
             "The TOML format is deprecated. Would you like to migrate them to Markdown format?"
           ) }),
-          /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(Text, { color: theme.text.secondary, children: t("(Backups will be created and original files will be preserved)") })
+          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: theme.text.secondary, children: t("(Backups will be created and original files will be preserved)") })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime34.jsx)(RadioButtonSelect, { items: OPTIONS, onSelect: onComplete })
+        /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(RadioButtonSelect, { items: OPTIONS, onSelect: onComplete })
       ]
     }
   );
@@ -16799,15 +16919,15 @@ __name(CommandFormatMigrationNudge, "CommandFormatMigrationNudge");
 
 // packages/cli/src/ui/components/FolderTrustDialog.tsx
 init_esbuild_shims();
-var import_react32 = __toESM(require_react(), 1);
+var import_react31 = __toESM(require_react(), 1);
 import * as process3 from "node:process";
 import * as path2 from "node:path";
-var import_jsx_runtime35 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime36 = __toESM(require_jsx_runtime(), 1);
 var FolderTrustDialog = /* @__PURE__ */ __name(({
   onSelect,
   isRestarting
 }) => {
-  (0, import_react32.useEffect)(() => {
+  (0, import_react31.useEffect)(() => {
     const doRelaunch = /* @__PURE__ */ __name(async () => {
       if (isRestarting) {
         setTimeout(async () => {
@@ -16844,8 +16964,8 @@ var FolderTrustDialog = /* @__PURE__ */ __name(({
       key: "Don't trust (esc)"
     }
   ];
-  return /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(Box_default, { flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(Box_default, { flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
       Box_default,
       {
         flexDirection: "column",
@@ -16855,11 +16975,11 @@ var FolderTrustDialog = /* @__PURE__ */ __name(({
         width: "100%",
         marginLeft: 1,
         children: [
-          /* @__PURE__ */ (0, import_jsx_runtime35.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { bold: true, color: theme.text.primary, children: "Do you trust this folder?" }),
-            /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: theme.text.primary, children: "Trusting a folder allows Qwen Code to execute commands it suggests. This is a security feature to prevent accidental execution in untrusted directories." })
+          /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Text, { bold: true, color: theme.text.primary, children: "Do you trust this folder?" }),
+            /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Text, { color: theme.text.primary, children: "Trusting a folder allows Qwen Code to execute commands it suggests. This is a security feature to prevent accidental execution in untrusted directories." })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(
             RadioButtonSelect,
             {
               items: options,
@@ -16870,13 +16990,13 @@ var FolderTrustDialog = /* @__PURE__ */ __name(({
         ]
       }
     ),
-    isRestarting && /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Box_default, { marginLeft: 1, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime35.jsx)(Text, { color: theme.status.warning, children: "Qwen Code is restarting to apply the trust changes..." }) })
+    isRestarting && /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Box_default, { marginLeft: 1, marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Text, { color: theme.status.warning, children: "Qwen Code is restarting to apply the trust changes..." }) })
   ] });
 }, "FolderTrustDialog");
 
 // packages/cli/src/ui/components/mcp/MCPServerApprovalDialog.tsx
 init_esbuild_shims();
-var import_jsx_runtime36 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime37 = __toESM(require_jsx_runtime(), 1);
 var MCPServerApprovalDialog = /* @__PURE__ */ __name(({ serverName, summary, source, pendingServers, remaining, onSelect }) => {
   useKeypress(
     (key) => {
@@ -16903,7 +17023,7 @@ var MCPServerApprovalDialog = /* @__PURE__ */ __name(({ serverName, summary, sou
       key: "reject"
     }
   ];
-  return /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -16913,21 +17033,21 @@ var MCPServerApprovalDialog = /* @__PURE__ */ __name(({ serverName, summary, sou
       width: "100%",
       marginLeft: 1,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Text, { bold: true, color: theme.text.primary, children: `Untrusted MCP server in ${source}` }),
-          /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Text, { color: theme.text.primary, children: `This workspace declares an MCP server. Approving lets Qwen Code start it and run its tools. Approval is bound to this exact configuration \u2014 if ${source} changes, you will be asked again.` })
+        /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Text, { bold: true, color: theme.text.primary, children: `Untrusted MCP server in ${source}` }),
+          /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Text, { color: theme.text.primary, children: `This workspace declares an MCP server. Approving lets Qwen Code start it and run its tools. Approval is bound to this exact configuration \u2014 if ${source} changes, you will be asked again.` })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(Text, { color: theme.text.primary, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Text, { bold: true, children: serverName }),
+        /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(Text, { color: theme.text.primary, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Text, { bold: true, children: serverName }),
             `  ${summary}`
           ] }),
-          remaining > 0 && /* @__PURE__ */ (0, import_jsx_runtime36.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Text, { color: theme.text.secondary, children: "Approve all will trust these servers:" }),
-            pendingServers.map((server) => /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(Text, { color: theme.text.secondary, children: `  ${server.name}  ${server.summary}` }, server.name))
+          remaining > 0 && /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Text, { color: theme.text.secondary, children: "Approve all will trust these servers:" }),
+            pendingServers.map((server) => /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Text, { color: theme.text.secondary, children: `  ${server.name}  ${server.summary}` }, server.name))
           ] })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime36.jsx)(RadioButtonSelect, { items: options, onSelect, isFocused: true })
+        /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(RadioButtonSelect, { items: options, onSelect, isFocused: true })
       ]
     }
   ) });
@@ -16935,16 +17055,16 @@ var MCPServerApprovalDialog = /* @__PURE__ */ __name(({ serverName, summary, sou
 
 // packages/cli/src/ui/hooks/useArenaCommand.ts
 init_esbuild_shims();
-var import_react33 = __toESM(require_react(), 1);
+var import_react32 = __toESM(require_react(), 1);
 function useArenaCommand() {
-  const [activeArenaDialog, setActiveArenaDialog] = (0, import_react33.useState)(null);
-  const openArenaDialog = (0, import_react33.useCallback)(
+  const [activeArenaDialog, setActiveArenaDialog] = (0, import_react32.useState)(null);
+  const openArenaDialog = (0, import_react32.useCallback)(
     (type) => {
       setActiveArenaDialog(type);
     },
     []
   );
-  const closeArenaDialog = (0, import_react33.useCallback)(() => {
+  const closeArenaDialog = (0, import_react32.useCallback)(() => {
     setActiveArenaDialog(null);
   }, []);
   return {
@@ -16956,9 +17076,9 @@ function useArenaCommand() {
 __name(useArenaCommand, "useArenaCommand");
 
 // packages/cli/src/ui/contexts/UIActionsContext.tsx
-var UIActionsContext = (0, import_react34.createContext)(null);
+var UIActionsContext = (0, import_react33.createContext)(null);
 var useUIActions = /* @__PURE__ */ __name(() => {
-  const context = (0, import_react34.useContext)(UIActionsContext);
+  const context = (0, import_react33.useContext)(UIActionsContext);
   if (!context) {
     throw new Error("useUIActions must be used within a UIActionsProvider");
   }
@@ -16967,16 +17087,16 @@ var useUIActions = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/hooks/useIdeTrustListener.ts
 init_esbuild_shims();
-var import_react35 = __toESM(require_react(), 1);
+var import_react34 = __toESM(require_react(), 1);
 function useIdeTrustListener() {
   const settings = useSettings();
-  const [connectionStatus, setConnectionStatus] = (0, import_react35.useState)(
+  const [connectionStatus, setConnectionStatus] = (0, import_react34.useState)(
     "disconnected" /* Disconnected */
   );
-  const previousTrust = (0, import_react35.useRef)(void 0);
-  const [restartReason, setRestartReason] = (0, import_react35.useState)("NONE");
-  const [needsRestart, setNeedsRestart] = (0, import_react35.useState)(false);
-  const subscribe = (0, import_react35.useCallback)((onStoreChange) => {
+  const previousTrust = (0, import_react34.useRef)(void 0);
+  const [restartReason, setRestartReason] = (0, import_react34.useState)("NONE");
+  const [needsRestart, setNeedsRestart] = (0, import_react34.useState)(false);
+  const subscribe = (0, import_react34.useCallback)((onStoreChange) => {
     const handleStatusChange = /* @__PURE__ */ __name((state) => {
       setConnectionStatus(state.status);
       setRestartReason("CONNECTION_CHANGE");
@@ -17006,8 +17126,8 @@ function useIdeTrustListener() {
     }
     return ideContextStore.get()?.workspaceState?.isTrusted;
   }, "getSnapshot");
-  const isIdeTrusted = (0, import_react35.useSyncExternalStore)(subscribe, getSnapshot);
-  (0, import_react35.useEffect)(() => {
+  const isIdeTrusted = (0, import_react34.useSyncExternalStore)(subscribe, getSnapshot);
+  (0, import_react34.useEffect)(() => {
     const currentTrust = isWorkspaceTrusted(settings.merged).isTrusted;
     if (previousTrust.current !== void 0 && previousTrust.current !== currentTrust) {
       setNeedsRestart(true);
@@ -17020,7 +17140,7 @@ __name(useIdeTrustListener, "useIdeTrustListener");
 
 // packages/cli/src/ui/hooks/useProviderUpdates.ts
 init_esbuild_shims();
-var import_react36 = __toESM(require_react(), 1);
+var import_react35 = __toESM(require_react(), 1);
 function getProviderMetadata(settings, metadataKey) {
   const mergedSettings = settings.merged;
   const ns = mergedSettings[PROVIDER_METADATA_NS];
@@ -17119,9 +17239,9 @@ function findAllPendingUpdates(settings, currentModel) {
 }
 __name(findAllPendingUpdates, "findAllPendingUpdates");
 function useProviderUpdates(settings, config, addItem) {
-  const [updateRequest, setUpdateRequest] = (0, import_react36.useState)();
-  const migrated = (0, import_react36.useRef)(false);
-  const executeUpdate = (0, import_react36.useCallback)(
+  const [updateRequest, setUpdateRequest] = (0, import_react35.useState)();
+  const migrated = (0, import_react35.useRef)(false);
+  const executeUpdate = (0, import_react35.useCallback)(
     async (providerCfg, baseUrl) => {
       try {
         const resolved = resolveBaseUrl(providerCfg, baseUrl);
@@ -17201,7 +17321,7 @@ function useProviderUpdates(settings, config, addItem) {
     },
     [settings, config, addItem]
   );
-  const checkForUpdates = (0, import_react36.useCallback)(() => {
+  const checkForUpdates = (0, import_react35.useCallback)(() => {
     if (!migrated.current) {
       migrated.current = true;
       migrateProviderMetadata(settings);
@@ -17234,10 +17354,10 @@ function useProviderUpdates(settings, config, addItem) {
       }, "onConfirm")
     });
   }, [settings, config, executeUpdate]);
-  (0, import_react36.useEffect)(() => {
+  (0, import_react35.useEffect)(() => {
     checkForUpdates();
   }, [checkForUpdates]);
-  const dismissProviderUpdate = (0, import_react36.useCallback)(() => {
+  const dismissProviderUpdate = (0, import_react35.useCallback)(() => {
     setUpdateRequest(void 0);
   }, []);
   return {
@@ -17248,9 +17368,9 @@ function useProviderUpdates(settings, config, addItem) {
 __name(useProviderUpdates, "useProviderUpdates");
 
 // packages/cli/src/ui/contexts/UIStateContext.tsx
-var UIStateContext = (0, import_react37.createContext)(null);
+var UIStateContext = (0, import_react36.createContext)(null);
 var useUIState = /* @__PURE__ */ __name(() => {
-  const context = (0, import_react37.useContext)(UIStateContext);
+  const context = (0, import_react36.useContext)(UIStateContext);
   if (!context) {
     throw new Error("useUIState must be used within a UIStateProvider");
   }
@@ -17306,17 +17426,17 @@ function extensionUpdatesReducer(state, action) {
 __name(extensionUpdatesReducer, "extensionUpdatesReducer");
 
 // packages/cli/src/ui/components/views/ExtensionsList.tsx
-var import_jsx_runtime37 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime38 = __toESM(require_jsx_runtime(), 1);
 var debugLogger7 = createDebugLogger("EXTENSIONS_LIST");
 var ExtensionsList = /* @__PURE__ */ __name(() => {
   const { extensionsUpdateState, commandContext } = useUIState();
   const extensions = commandContext.services.config?.getExtensions() || [];
   if (extensions.length === 0) {
-    return /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Text, { children: "No extensions installed." });
+    return /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Text, { children: "No extensions installed." });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Text, { children: "Installed extensions:" }),
-    /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Box_default, { flexDirection: "column", paddingLeft: 2, children: extensions.map((ext) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, marginBottom: 1, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Text, { children: "Installed extensions:" }),
+    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Box_default, { flexDirection: "column", paddingLeft: 2, children: extensions.map((ext) => {
       const state = extensionsUpdateState.get(ext.name);
       const isActive = ext.isActive;
       const activeString = isActive ? "active" : "disabled";
@@ -17344,15 +17464,15 @@ var ExtensionsList = /* @__PURE__ */ __name(() => {
           debugLogger7.error(`Unhandled ExtensionUpdateState ${state}`);
           break;
       }
-      return /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(Text, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Text, { color: "cyan", children: `${getExtensionDisplayName(ext, getCurrentLanguage())} (v${ext.version})` }),
-          /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Text, { color: activeColor, children: ` - ${activeString}` }),
-          /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Text, { color: stateColor, children: ` (${stateText})` })
+      return /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(Text, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Text, { color: "cyan", children: `${getExtensionDisplayName(ext, getCurrentLanguage())} (v${ext.version})` }),
+          /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Text, { color: activeColor, children: ` - ${activeString}` }),
+          /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Text, { color: stateColor, children: ` (${stateText})` })
         ] }),
-        ext.resolvedSettings && ext.resolvedSettings.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(Box_default, { flexDirection: "column", paddingLeft: 2, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime37.jsx)(Text, { children: "settings:" }),
-          ext.resolvedSettings.map((setting) => /* @__PURE__ */ (0, import_jsx_runtime37.jsxs)(Text, { children: [
+        ext.resolvedSettings && ext.resolvedSettings.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(Box_default, { flexDirection: "column", paddingLeft: 2, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Text, { children: "settings:" }),
+          ext.resolvedSettings.map((setting) => /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(Text, { children: [
             "- ",
             setting.name,
             ": ",
@@ -17366,17 +17486,17 @@ var ExtensionsList = /* @__PURE__ */ __name(() => {
 
 // packages/cli/src/ui/components/views/SkillsList.tsx
 init_esbuild_shims();
-var import_jsx_runtime38 = __toESM(require_jsx_runtime(), 1);
-var SkillsList = /* @__PURE__ */ __name(({ skills }) => /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-  /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Available skills:") }),
-  /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Box_default, { height: 1 }),
-  skills.length > 0 ? skills.map((skill) => /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(Text, { color: theme.text.primary, children: [
+var import_jsx_runtime39 = __toESM(require_jsx_runtime(), 1);
+var SkillsList = /* @__PURE__ */ __name(({ skills }) => /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+  /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Available skills:") }),
+  /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Box_default, { height: 1 }),
+  skills.length > 0 ? skills.map((skill) => /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Box_default, { flexDirection: "row", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Text, { color: theme.text.primary, children: [
       "  ",
       "- "
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime38.jsx)(Text, { bold: true, color: theme.text.accent, children: skill.name })
-  ] }, skill.name)) : /* @__PURE__ */ (0, import_jsx_runtime38.jsxs)(Text, { color: theme.text.primary, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Text, { bold: true, color: theme.text.accent, children: skill.name })
+  ] }, skill.name)) : /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Text, { color: theme.text.primary, children: [
     " ",
     t("No skills available")
   ] })
@@ -17384,25 +17504,25 @@ var SkillsList = /* @__PURE__ */ __name(({ skills }) => /* @__PURE__ */ (0, impo
 
 // packages/cli/src/ui/components/views/ToolsList.tsx
 init_esbuild_shims();
-var import_jsx_runtime39 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime40 = __toESM(require_jsx_runtime(), 1);
 var ToolsList = /* @__PURE__ */ __name(({
   tools,
   showDescriptions,
   contentWidth
-}) => /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Box_default, { flexDirection: "column", children: [
-  /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Available Qwen Code CLI tools:") }),
-  /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(Box_default, { height: 1 }),
-  tools.length > 0 ? tools.map((tool) => /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Text, { color: theme.text.primary, children: [
+}) => /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { flexDirection: "column", children: [
+  /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Available Qwen Code CLI tools:") }),
+  /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Box_default, { height: 1 }),
+  tools.length > 0 ? tools.map((tool) => /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { flexDirection: "row", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { color: theme.text.primary, children: [
       "  ",
       "- "
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Box_default, { flexDirection: "column", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Text, { bold: true, color: theme.text.accent, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { flexDirection: "column", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { bold: true, color: theme.text.accent, children: [
         tool.displayName,
         showDescriptions ? ` (${tool.name})` : ""
       ] }),
-      showDescriptions && tool.description && /* @__PURE__ */ (0, import_jsx_runtime39.jsx)(
+      showDescriptions && tool.description && /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(
         MarkdownDisplay,
         {
           contentWidth,
@@ -17411,7 +17531,7 @@ var ToolsList = /* @__PURE__ */ __name(({
         }
       )
     ] })
-  ] }, tool.name)) : /* @__PURE__ */ (0, import_jsx_runtime39.jsxs)(Text, { color: theme.text.primary, children: [
+  ] }, tool.name)) : /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { color: theme.text.primary, children: [
     " ",
     t("No tools available")
   ] })
@@ -17419,7 +17539,7 @@ var ToolsList = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/views/McpStatus.tsx
 init_esbuild_shims();
-var import_jsx_runtime40 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime41 = __toESM(require_jsx_runtime(), 1);
 var McpStatus = /* @__PURE__ */ __name(({
   servers,
   tools,
@@ -17435,19 +17555,19 @@ var McpStatus = /* @__PURE__ */ __name(({
 }) => {
   const serverNames = Object.keys(servers);
   if (serverNames.length === 0 && blockedServers.length === 0) {
-    return /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { children: t("No MCP servers configured.") }) });
+    return /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { children: t("No MCP servers configured.") }) });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { flexDirection: "column", children: [
-    discoveryInProgress && /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.status.warning, children: t("\u23F3 MCP servers are starting up ({{count}} initializing)...", {
+  return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", children: [
+    discoveryInProgress && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.status.warning, children: t("\u25CC MCP servers are starting up ({{count}} initializing)...", {
         count: String(connectingServers.length)
       }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.primary, children: t(
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.primary, children: t(
         "Note: First startup may take longer. Tool availability will update automatically."
       ) })
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { bold: true, children: t("Configured MCP servers:") }),
-    /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Box_default, { height: 1 }),
+    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, children: t("Configured MCP servers:") }),
+    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { height: 1 }),
     serverNames.map((serverName) => {
       const server = servers[serverName];
       const serverTools = tools.filter(
@@ -17464,18 +17584,18 @@ var McpStatus = /* @__PURE__ */ __name(({
       let statusColor = theme.text.primary;
       switch (status) {
         case "connected" /* CONNECTED */:
-          statusIndicator = "\u{1F7E2}";
+          statusIndicator = "\u25CF";
           statusText = t("Ready");
           statusColor = theme.status.success;
           break;
         case "connecting" /* CONNECTING */:
-          statusIndicator = "\u{1F504}";
+          statusIndicator = "\u25D0";
           statusText = t("Starting... (first startup may take longer)");
           statusColor = theme.status.warning;
           break;
         case "disconnected" /* DISCONNECTED */:
         default:
-          statusIndicator = "\u{1F534}";
+          statusIndicator = "\u25CF";
           statusText = t("Disconnected");
           statusColor = theme.status.error;
           break;
@@ -17502,140 +17622,140 @@ var McpStatus = /* @__PURE__ */ __name(({
       const serverAuthStatus = authStatus[serverName];
       let authStatusNode = null;
       if (serverAuthStatus === "authenticated") {
-        authStatusNode = /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { children: [
+        authStatusNode = /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
           " (",
           t("OAuth"),
           ")"
         ] });
       } else if (serverAuthStatus === "expired") {
-        authStatusNode = /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { color: theme.status.error, children: [
+        authStatusNode = /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: theme.status.error, children: [
           " (",
           t("OAuth expired"),
           ")"
         ] });
       } else if (serverAuthStatus === "unauthenticated") {
-        authStatusNode = /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { color: theme.status.warning, children: [
+        authStatusNode = /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: theme.status.warning, children: [
           " ",
           "(",
           t("OAuth not authenticated"),
           ")"
         ] });
       }
-      return /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
-        /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { color: statusColor, children: [
+      return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", marginBottom: 1, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: statusColor, children: [
             statusIndicator,
             " "
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { bold: true, children: serverDisplayName }),
-          /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, children: serverDisplayName }),
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
             " - ",
             statusText,
             status === "connected" /* CONNECTED */ && parts.length > 0 && ` (${parts.join(", ")})`
           ] }),
           authStatusNode
         ] }),
-        status === "connecting" /* CONNECTING */ && /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { children: [
+        status === "connecting" /* CONNECTING */ && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
           " (",
           t("tools and prompts will appear when ready"),
           ")"
         ] }),
-        status === "disconnected" /* DISCONNECTED */ && toolCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { children: [
+        status === "disconnected" /* DISCONNECTED */ && toolCount > 0 && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
           "(",
           t("{{count}} tools cached", { count: String(toolCount) }),
           ")"
         ] }),
-        showDescriptions && server?.description && /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.secondary, children: server.description.trim() }),
-        serverTools.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { flexDirection: "column", marginLeft: 2, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.primary, children: t("Tools:") }),
+        showDescriptions && server?.description && /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.secondary, children: server.description.trim() }),
+        serverTools.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", marginLeft: 2, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.primary, children: t("Tools:") }),
           serverTools.map((tool) => {
             const schemaContent = showSchema && tool.schema && (tool.schema.parametersJsonSchema || tool.schema.parameters) ? JSON.stringify(
               tool.schema.parametersJsonSchema ?? tool.schema.parameters,
               null,
               2
             ) : null;
-            return /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { flexDirection: "column", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { children: [
+            return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
                 "- ",
-                /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.primary, children: tool.name })
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.primary, children: tool.name })
               ] }),
-              showDescriptions && tool.description && /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.secondary, children: tool.description.trim() }) }),
-              schemaContent && /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { flexDirection: "column", marginLeft: 4, children: [
-                /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.secondary, children: t("Parameters:") }),
-                /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.secondary, children: schemaContent })
+              showDescriptions && tool.description && /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.secondary, children: tool.description.trim() }) }),
+              schemaContent && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", marginLeft: 4, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.secondary, children: t("Parameters:") }),
+                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.secondary, children: schemaContent })
               ] })
             ] }, tool.name);
           })
         ] }),
-        serverPrompts.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { flexDirection: "column", marginLeft: 2, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.primary, children: t("Prompts:") }),
-          serverPrompts.map((prompt) => /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { flexDirection: "column", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { children: [
+        serverPrompts.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", marginLeft: 2, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.primary, children: t("Prompts:") }),
+          serverPrompts.map((prompt) => /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
               "- ",
-              /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.primary, children: prompt.name })
+              /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.primary, children: prompt.name })
             ] }),
-            showDescriptions && prompt.description && /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.primary, children: prompt.description.trim() }) })
+            showDescriptions && prompt.description && /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.primary, children: prompt.description.trim() }) })
           ] }, prompt.name))
         ] })
       ] }, serverName);
     }),
-    blockedServers.map((server) => /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { marginBottom: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.status.error, children: "\u{1F534} " }),
-      /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { bold: true, children: [
+    blockedServers.map((server) => /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { marginBottom: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.status.error, children: "\u25CF " }),
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { bold: true, children: [
         server.name,
         server.extensionName ? ` ${t("(from {{extensionName}})", {
           extensionName: server.extensionName
         })}` : ""
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
         " - ",
         t("Blocked")
       ] })
     ] }, server.name)),
-    showTips && /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
-      /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.accent, children: t("\u{1F4A1} Tips:") }),
-      /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { children: [
+    showTips && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.accent, children: t("\u2605 Tips:") }),
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
         "  ",
         "- ",
         t("Use"),
         " ",
-        /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.accent, children: "/mcp desc" }),
+        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.accent, children: "/mcp desc" }),
         " ",
         t("to show server and tool descriptions")
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
         "  ",
         "- ",
         t("Use"),
         " ",
-        /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.accent, children: "/mcp schema" }),
+        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.accent, children: "/mcp schema" }),
         " ",
         t("to show tool parameter schemas")
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
         "  ",
         "- ",
         t("Use"),
         " ",
-        /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.accent, children: "/mcp nodesc" }),
+        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.accent, children: "/mcp nodesc" }),
         " ",
         t("to hide descriptions")
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
         "  ",
         "- ",
         t("Use"),
         " ",
-        /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.accent, children: "/mcp" }),
+        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.accent, children: "/mcp" }),
         " ",
         t("to authenticate with OAuth-enabled servers")
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime40.jsxs)(Text, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
         "  ",
         "- ",
         t("Press"),
         " ",
-        /* @__PURE__ */ (0, import_jsx_runtime40.jsx)(Text, { color: theme.text.accent, children: "Ctrl+T" }),
+        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.accent, children: "Ctrl+T" }),
         " ",
         t("to toggle tool descriptions on/off")
       ] })
@@ -17645,7 +17765,7 @@ var McpStatus = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/views/ContextUsage.tsx
 init_esbuild_shims();
-var import_jsx_runtime41 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime42 = __toESM(require_jsx_runtime(), 1);
 var FILLED = "\u2588";
 var BUFFER = "\u2592";
 var EMPTY = "\u2591";
@@ -17677,10 +17797,10 @@ var ProgressBar = /* @__PURE__ */ __name(({ usedPercentage, bufferPercentage, wi
   } else if (usedPercentage > 60) {
     usedColor = theme.status.warning;
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: usedColor, children: usedStr }),
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.secondary, children: freeStr }),
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.status.warning, children: bufferStr })
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: usedColor, children: usedStr }),
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: theme.text.secondary, children: freeStr }),
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: theme.status.warning, children: bufferStr })
   ] });
 }, "ProgressBar");
 function formatPercentage(tokens, contextWindowSize) {
@@ -17702,18 +17822,18 @@ var CategoryRow = /* @__PURE__ */ __name(({
 }) => {
   const percentageStr = formatPercentage(tokens, contextWindowSize);
   const tokenStr = `${formatTokens(tokens)} ${t("tokens")} (${percentageStr}%)`;
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { width: CONTENT_WIDTH, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { width: 2, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: symbolColor || theme.text.secondary, children: symbol }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { width: 24, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.primary, children: label }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: isOverLimit ? theme.status.error : theme.text.secondary, children: tokenStr }) })
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { width: CONTENT_WIDTH, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { width: 2, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: symbolColor || theme.text.secondary, children: symbol }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { width: 24, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: theme.text.primary, children: label }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: isOverLimit ? theme.status.error : theme.text.secondary, children: tokenStr }) })
   ] });
 }, "CategoryRow");
 var ThresholdRow = /* @__PURE__ */ __name(({ label, tokens, isCurrent, hint }) => {
   const tokenStr = `${formatTokens(tokens)} ${t("tokens")}`;
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { width: CONTENT_WIDTH, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { width: 2, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: isCurrent ? theme.status.warning : theme.text.secondary, children: isCurrent ? "\u25B6" : " " }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { width: 22, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.primary, children: label }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: theme.text.secondary, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { width: CONTENT_WIDTH, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { width: 2, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: isCurrent ? theme.status.warning : theme.text.secondary, children: isCurrent ? "\u25B6" : " " }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { width: 22, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: theme.text.primary, children: label }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: theme.text.secondary, children: [
       tokenStr,
       hint ? `  ${hint}` : ""
     ] }) })
@@ -17734,16 +17854,16 @@ function tierColor(tier) {
   }
 }
 __name(tierColor, "tierColor");
-var CompactionThresholds = /* @__PURE__ */ __name(({ thresholds, currentTier }) => /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
-  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Compaction thresholds") }),
-  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+var CompactionThresholds = /* @__PURE__ */ __name(({ thresholds, currentTier }) => /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+  /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Compaction thresholds") }),
+  /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
     ThresholdRow,
     {
       label: t("Effective window"),
       tokens: thresholds.effectiveWindow
     }
   ),
-  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+  /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
     ThresholdRow,
     {
       label: t("Warn threshold"),
@@ -17751,7 +17871,7 @@ var CompactionThresholds = /* @__PURE__ */ __name(({ thresholds, currentTier })
       isCurrent: currentTier === "warn"
     }
   ),
-  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+  /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
     ThresholdRow,
     {
       label: t("Auto threshold"),
@@ -17759,7 +17879,7 @@ var CompactionThresholds = /* @__PURE__ */ __name(({ thresholds, currentTier })
       isCurrent: currentTier === "auto"
     }
   ),
-  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+  /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
     ThresholdRow,
     {
       label: t("Hard threshold"),
@@ -17767,22 +17887,22 @@ var CompactionThresholds = /* @__PURE__ */ __name(({ thresholds, currentTier })
       isCurrent: currentTier === "hard"
     }
   ),
-  /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { width: CONTENT_WIDTH, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { width: 2, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { children: " " }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { width: 22, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.primary, children: t("Current tier") }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, color: tierColor(currentTier), children: currentTier }) })
+  /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { width: CONTENT_WIDTH, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { width: 2, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { children: " " }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { width: 22, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: theme.text.primary, children: t("Current tier") }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { bold: true, color: tierColor(currentTier), children: currentTier }) })
   ] })
 ] }), "CompactionThresholds");
 var DETAIL_NAME_MAX_LEN = 30;
 var DetailRow = /* @__PURE__ */ __name(({ name, tokens }) => {
   const tokenStr = tokens > 0 ? `${formatTokens(tokens)} ${t("tokens")}` : `0 ${t("tokens")}`;
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { width: CONTENT_WIDTH, paddingLeft: 2, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: theme.text.secondary, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { width: CONTENT_WIDTH, paddingLeft: 2, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: theme.text.secondary, children: [
       "\u2514",
       " "
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { width: 32, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.link, children: truncateName(name, DETAIL_NAME_MAX_LEN) }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.secondary, children: tokenStr }) })
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { width: 32, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: theme.text.link, children: truncateName(name, DETAIL_NAME_MAX_LEN) }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: theme.text.secondary, children: tokenStr }) })
   ] });
 }, "DetailRow");
 var ContextUsage = /* @__PURE__ */ __name(({
@@ -17812,7 +17932,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
     const bTotal = b.tokens + (b.bodyTokens ?? 0);
     return bTotal - aTotal;
   });
-  return /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(
     Box_default,
     {
       borderStyle: "round",
@@ -17821,12 +17941,12 @@ var ContextUsage = /* @__PURE__ */ __name(({
       paddingY: 1,
       paddingX: 2,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, color: theme.text.accent, children: t("Context Usage") }),
-        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { height: 1 }),
-        isEstimated ? /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.status.warning, italic: true, children: t("No API response yet. Send a message to see actual usage.") }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Estimated pre-conversation overhead") }),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: theme.text.secondary, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { bold: true, color: theme.text.accent, children: t("Context Usage") }),
+        /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { height: 1 }),
+        isEstimated ? /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(import_jsx_runtime42.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: theme.status.warning, italic: true, children: t("No API response yet. Send a message to see actual usage.") }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Estimated pre-conversation overhead") }),
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: theme.text.secondary, children: [
             t("Model"),
             ": ",
             modelName,
@@ -17837,15 +17957,15 @@ var ContextUsage = /* @__PURE__ */ __name(({
             " ",
             t("tokens")
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { height: 1 })
-        ] }) : /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { width: CONTENT_WIDTH, marginBottom: 1, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: theme.text.secondary, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { height: 1 })
+        ] }) : /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(import_jsx_runtime42.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { width: CONTENT_WIDTH, marginBottom: 1, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: theme.text.secondary, children: [
               t("Model"),
               ": ",
               modelName
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: theme.text.secondary, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: theme.text.secondary, children: [
               t("Context window"),
               ": ",
               formatTokens(contextWindowSize),
@@ -17853,7 +17973,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
               t("tokens")
             ] }) })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { width: CONTENT_WIDTH, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { width: CONTENT_WIDTH, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
             ProgressBar,
             {
               usedPercentage: Math.min(percentage, 100),
@@ -17861,9 +17981,9 @@ var ContextUsage = /* @__PURE__ */ __name(({
               width: CONTENT_WIDTH
             }
           ) }),
-          isOverLimit && /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.status.error, children: t("Context exceeds limit! Use /compress or /clear to reduce.") }) }),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { height: 1 }),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+          isOverLimit && /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { marginBottom: 1, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: theme.status.error, children: t("Context exceeds limit! Use /compress or /clear to reduce.") }) }),
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { height: 1 }),
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
             CategoryRow,
             {
               symbol: FILLED,
@@ -17874,7 +17994,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
               isOverLimit
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
             CategoryRow,
             {
               symbol: EMPTY,
@@ -17884,7 +18004,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
               symbolColor: theme.text.secondary
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
             CategoryRow,
             {
               symbol: BUFFER,
@@ -17894,10 +18014,10 @@ var ContextUsage = /* @__PURE__ */ __name(({
               symbolColor: theme.status.warning
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { height: 1 }),
-          /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Usage by category") })
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { height: 1 }),
+          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Usage by category") })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
           CategoryRow,
           {
             symbol: FILLED,
@@ -17907,7 +18027,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
             symbolColor: theme.text.accent
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
           CategoryRow,
           {
             symbol: FILLED,
@@ -17917,7 +18037,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
             symbolColor: theme.text.accent
           }
         ),
-        breakdown.mcpTools > 0 && /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+        breakdown.mcpTools > 0 && /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
           CategoryRow,
           {
             symbol: FILLED,
@@ -17927,7 +18047,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
             symbolColor: theme.text.accent
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
           CategoryRow,
           {
             symbol: FILLED,
@@ -17937,7 +18057,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
             symbolColor: theme.text.accent
           }
         ),
-        /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
           CategoryRow,
           {
             symbol: FILLED,
@@ -17947,7 +18067,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
             symbolColor: theme.text.accent
           }
         ),
-        !isEstimated && /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+        !isEstimated && /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
           CategoryRow,
           {
             symbol: FILLED,
@@ -17957,17 +18077,17 @@ var ContextUsage = /* @__PURE__ */ __name(({
             symbolColor: theme.text.accent
           }
         ),
-        breakdown.thresholds && breakdown.currentTier && /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+        breakdown.thresholds && breakdown.currentTier && /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
           CompactionThresholds,
           {
             thresholds: breakdown.thresholds,
             currentTier: breakdown.currentTier
           }
         ),
-        showDetails ? /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(import_jsx_runtime41.Fragment, { children: [
-          sortedBuiltinTools.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Built-in tools") }),
-            sortedBuiltinTools.map((tool) => /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+        showDetails ? /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(import_jsx_runtime42.Fragment, { children: [
+          sortedBuiltinTools.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Built-in tools") }),
+            sortedBuiltinTools.map((tool) => /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
               DetailRow,
               {
                 name: tool.name,
@@ -17976,9 +18096,9 @@ var ContextUsage = /* @__PURE__ */ __name(({
               tool.name
             ))
           ] }),
-          sortedMcpTools.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, color: theme.text.primary, children: t("MCP tools") }),
-            sortedMcpTools.map((tool) => /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+          sortedMcpTools.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { bold: true, color: theme.text.primary, children: t("MCP tools") }),
+            sortedMcpTools.map((tool) => /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
               DetailRow,
               {
                 name: tool.name,
@@ -17987,9 +18107,9 @@ var ContextUsage = /* @__PURE__ */ __name(({
               tool.name
             ))
           ] }),
-          sortedMemoryFiles.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Memory files") }),
-            sortedMemoryFiles.map((file) => /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(
+          sortedMemoryFiles.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Memory files") }),
+            sortedMemoryFiles.map((file) => /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(
               DetailRow,
               {
                 name: file.path,
@@ -17998,34 +18118,34 @@ var ContextUsage = /* @__PURE__ */ __name(({
               file.path
             ))
           ] }),
-          sortedSkills.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
-            /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Skills") }),
-            sortedSkills.map((skill) => /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { flexDirection: "column", children: [
-              /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { width: CONTENT_WIDTH, paddingLeft: 2, children: [
-                /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: theme.text.secondary, children: [
+          sortedSkills.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { bold: true, color: theme.text.primary, children: t("Skills") }),
+            sortedSkills.map((skill) => /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { flexDirection: "column", children: [
+              /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { width: CONTENT_WIDTH, paddingLeft: 2, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: theme.text.secondary, children: [
                   "\u2514",
                   " "
                 ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { width: 32, children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.link, children: truncateName(skill.name, DETAIL_NAME_MAX_LEN) }),
-                  skill.loaded && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: theme.status.success, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { width: 32, children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: theme.text.link, children: truncateName(skill.name, DETAIL_NAME_MAX_LEN) }),
+                  skill.loaded && /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: theme.status.success, children: [
                     " ",
                     t("active")
                   ] })
                 ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: theme.text.secondary, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: theme.text.secondary, children: [
                   formatTokens(skill.tokens),
                   " ",
                   t("tokens")
                 ] }) })
               ] }),
-              skill.loaded && skill.bodyTokens != null && skill.bodyTokens > 0 && /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Box_default, { width: CONTENT_WIDTH, paddingLeft: 4, children: [
-                /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: theme.text.secondary, children: [
+              skill.loaded && skill.bodyTokens != null && skill.bodyTokens > 0 && /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { width: CONTENT_WIDTH, paddingLeft: 4, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: theme.text.secondary, children: [
                   "  \u2514",
                   " "
                 ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { width: 30, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.secondary, italic: true, children: t("body loaded") }) }),
-                /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime41.jsxs)(Text, { color: theme.status.success, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { width: 30, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: theme.text.secondary, italic: true, children: t("body loaded") }) }),
+                /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { flexGrow: 1, justifyContent: "flex-end", children: /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: theme.status.success, children: [
                   "+",
                   formatTokens(skill.bodyTokens),
                   " ",
@@ -18034,7 +18154,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
               ] })
             ] }, skill.name))
           ] })
-        ] }) : /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime41.jsx)(Text, { color: theme.text.secondary, italic: true, children: t("Run /context detail for per-item breakdown.") }) })
+        ] }) : /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: theme.text.secondary, italic: true, children: t("Run /context detail for per-item breakdown.") }) })
       ]
     }
   );
@@ -18042,7 +18162,7 @@ var ContextUsage = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/views/DoctorReport.tsx
 init_esbuild_shims();
-var import_jsx_runtime42 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime43 = __toESM(require_jsx_runtime(), 1);
 var STATUS_ICONS2 = {
   pass: "\u2713",
   // checkmark
@@ -18085,7 +18205,7 @@ var DoctorReport = /* @__PURE__ */ __name(({
   const groups = groupByCategory(checks);
   const categoryEntries = Array.from(groups.entries());
   const nameColWidth = Math.max(20, ...checks.map((c) => c.name.length + 2));
-  return /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(
     Box_default,
     {
       borderStyle: "round",
@@ -18095,26 +18215,26 @@ var DoctorReport = /* @__PURE__ */ __name(({
       paddingX: 2,
       width,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { bold: true, color: theme.text.accent, children: t("Doctor Report") }),
-        /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { height: 1 }),
-        categoryEntries.map(([category, items], groupIdx) => /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(
+        /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { bold: true, color: theme.text.accent, children: t("Doctor Report") }),
+        /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { height: 1 }),
+        categoryEntries.map(([category, items], groupIdx) => /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(
           Box_default,
           {
             flexDirection: "column",
             marginTop: groupIdx > 0 ? 1 : 0,
             children: [
-              /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { bold: true, color: theme.text.link, children: category }),
-              items.map((check) => /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { flexDirection: "column", children: [
-                /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { flexDirection: "row", children: [
-                  /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: getStatusColor2(check.status), children: [
+              /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { bold: true, color: theme.text.link, children: category }),
+              items.map((check) => /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box_default, { flexDirection: "column", children: [
+                /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box_default, { flexDirection: "row", children: [
+                  /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: getStatusColor2(check.status), children: [
                     "  ",
                     STATUS_ICONS2[check.status],
                     " "
                   ] }),
-                  /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { width: nameColWidth, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { color: theme.text.primary, children: check.name }) }),
-                  /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { dimColor: true, children: check.message })
+                  /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { width: nameColWidth, children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color: theme.text.primary, children: check.name }) }),
+                  /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { dimColor: true, children: check.message })
                 ] }),
-                check.detail && /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Box_default, { marginLeft: 6, children: /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { dimColor: true, children: [
+                check.detail && /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { marginLeft: 6, children: /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { dimColor: true, children: [
                   "-> ",
                   check.detail
                 ] }) })
@@ -18123,21 +18243,21 @@ var DoctorReport = /* @__PURE__ */ __name(({
           },
           category
         )),
-        /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Box_default, { marginTop: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { dimColor: true, children: "-- " }),
-          /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: theme.status.success, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box_default, { marginTop: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { dimColor: true, children: "-- " }),
+          /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.status.success, children: [
             summary.pass,
             " ",
             t("passed")
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { dimColor: true, children: ", " }),
-          /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: theme.status.warning, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { dimColor: true, children: ", " }),
+          /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.status.warning, children: [
             summary.warn,
             " ",
             t("warnings")
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime42.jsx)(Text, { dimColor: true, children: ", " }),
-          /* @__PURE__ */ (0, import_jsx_runtime42.jsxs)(Text, { color: theme.status.error, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { dimColor: true, children: ", " }),
+          /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.status.error, children: [
             summary.fail,
             " ",
             t("failures")
@@ -18150,7 +18270,7 @@ var DoctorReport = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/arena/ArenaCards.tsx
 init_esbuild_shims();
-var import_jsx_runtime43 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime44 = __toESM(require_jsx_runtime(), 1);
 var ArenaAgentCard = /* @__PURE__ */ __name(({
   agent,
   width
@@ -18160,8 +18280,8 @@ var ArenaAgentCard = /* @__PURE__ */ __name(({
   const tokens = agent.totalTokens.toLocaleString();
   const inTokens = agent.inputTokens.toLocaleString();
   const outTokens = agent.outputTokens.toLocaleString();
-  return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box_default, { flexDirection: "column", width, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Box_default, { flexDirection: "column", width, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color, children: [
       icon,
       " ",
       agent.label,
@@ -18170,7 +18290,7 @@ var ArenaAgentCard = /* @__PURE__ */ __name(({
       " \xB7 ",
       duration
     ] }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.text.secondary, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.secondary, children: [
       "Tokens: ",
       tokens,
       " (in ",
@@ -18179,25 +18299,25 @@ var ArenaAgentCard = /* @__PURE__ */ __name(({
       outTokens,
       ")"
     ] }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.text.secondary, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.secondary, children: [
       "Tool Calls: ",
       agent.toolCalls,
-      agent.failedToolCalls > 0 && /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(import_jsx_runtime43.Fragment, { children: [
+      agent.failedToolCalls > 0 && /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(import_jsx_runtime44.Fragment, { children: [
         " ",
         "(",
-        /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.status.success, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.status.success, children: [
           "\u2713 ",
           agent.successfulToolCalls
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color: theme.text.secondary, children: " " }),
-        /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.status.error, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.secondary, children: " " }),
+        /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.status.error, children: [
           "\u2715 ",
           agent.failedToolCalls
         ] }),
         ")"
       ] })
     ] }) }),
-    agent.error && /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color: theme.status.error, children: agent.error }) })
+    agent.error && /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.status.error, children: agent.error }) })
   ] });
 }, "ArenaAgentCard");
 function getDiffStats(diff, diffSummary) {
@@ -18264,7 +18384,7 @@ var ArenaSessionCard = /* @__PURE__ */ __name(({
   width
 }) => {
   const titleLabel = sessionStatus === "idle" || sessionStatus === "completed" ? "Arena Comparison Summary" : sessionStatus === "cancelled" ? "Arena Cancelled" : "Arena Failed";
-  return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(
     Box_default,
     {
       borderStyle: "round",
@@ -18274,92 +18394,92 @@ var ArenaSessionCard = /* @__PURE__ */ __name(({
       paddingY: 1,
       width,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { bold: true, color: theme.text.primary, children: titleLabel }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { height: 1 }),
-        (sessionStatus === "idle" || sessionStatus === "completed") && /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(import_jsx_runtime43.Fragment, { children: [
-          /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box_default, { flexDirection: "column", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { bold: true, color: theme.text.primary, children: "Status Summary:" }),
+        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { bold: true, color: theme.text.primary, children: titleLabel }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { height: 1 }),
+        (sessionStatus === "idle" || sessionStatus === "completed") && /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(import_jsx_runtime44.Fragment, { children: [
+          /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Box_default, { flexDirection: "column", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { bold: true, color: theme.text.primary, children: "Status Summary:" }),
             agents.map((agent, index) => {
               const { text: statusText, color } = getArenaStatusLabel(
                 agent.status
               );
-              return /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box_default, { marginLeft: 2, children: [
-                /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.text.secondary, children: [
+              return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Box_default, { marginLeft: 2, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.secondary, children: [
                   index === agents.length - 1 ? "\u2514\u2500" : "\u251C\u2500",
                   " ",
                   agent.label,
                   ":",
                   " "
                 ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color, children: statusText })
+                /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color, children: statusText })
               ] }, agent.label);
             })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { height: 1 }),
-          /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box_default, { flexDirection: "column", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { bold: true, color: theme.text.primary, children: "Files Modified:" }),
-            getComparisonFileGroups(agents).map((group, index, groups) => /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box_default, { marginLeft: 2, children: [
-              /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.text.secondary, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { height: 1 }),
+          /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Box_default, { flexDirection: "column", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { bold: true, color: theme.text.primary, children: "Files Modified:" }),
+            getComparisonFileGroups(agents).map((group, index, groups) => /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Box_default, { marginLeft: 2, children: [
+              /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.secondary, children: [
                 getTreeBranch(index, groups.length),
                 " ",
                 group.label,
                 ":",
                 " "
               ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color: theme.text.primary, children: formatFileList(group.files) })
+              /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.primary, children: formatFileList(group.files) })
             ] }, group.label))
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { height: 1 }),
-          /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box_default, { flexDirection: "column", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { bold: true, color: theme.text.primary, children: "Approach Summary:" }),
+          /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { height: 1 }),
+          /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Box_default, { flexDirection: "column", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { bold: true, color: theme.text.primary, children: "Approach Summary:" }),
             agents.map((agent, index) => {
               const diffStats = getDiffStats(agent.diff, agent.diffSummary);
               const files = getAgentFiles(agent).length;
               const branch = index === agents.length - 1 ? "\u2514\u2500" : "\u251C\u2500";
               const summary = agent.approachSummary ?? "No approach summary available.";
-              return /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { children: [
-                /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.text.secondary, children: [
+              return /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { marginLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { children: [
+                /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.secondary, children: [
                   branch,
                   " ",
                   agent.label,
                   ":",
                   " "
                 ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.text.primary, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.primary, children: [
                   summary,
                   " "
                 ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color: theme.text.secondary, children: "(" }),
-                /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color: theme.text.accent, children: files }),
-                /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color: theme.text.secondary, children: files === 1 ? " file, " : " files, " }),
-                /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.status.success, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.secondary, children: "(" }),
+                /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.accent, children: files }),
+                /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.secondary, children: files === 1 ? " file, " : " files, " }),
+                /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.status.success, children: [
                   "+",
                   diffStats.additions
                 ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color: theme.text.secondary, children: " " }),
-                /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.status.error, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.secondary, children: " " }),
+                /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.status.error, children: [
                   "-",
                   diffStats.deletions
                 ] }),
-                /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color: theme.text.secondary, children: " lines, " }),
-                /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color: theme.text.accent, children: agent.toolCalls }),
-                /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color: theme.text.secondary, children: agent.toolCalls === 1 ? " tool call)" : " tool calls)" })
+                /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.secondary, children: " lines, " }),
+                /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.accent, children: agent.toolCalls }),
+                /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.secondary, children: agent.toolCalls === 1 ? " tool call)" : " tool calls)" })
               ] }) }, agent.label);
             })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { height: 1 }),
-          /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box_default, { flexDirection: "column", children: [
-            /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { bold: true, color: theme.text.primary, children: "Token Efficiency:" }),
-            agents.map((agent, index) => /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Box_default, { marginLeft: 2, children: [
-              /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.text.secondary, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { height: 1 }),
+          /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Box_default, { flexDirection: "column", children: [
+            /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { bold: true, color: theme.text.primary, children: "Token Efficiency:" }),
+            agents.map((agent, index) => /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Box_default, { marginLeft: 2, children: [
+              /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.secondary, children: [
                 index === agents.length - 1 ? "\u2514\u2500" : "\u251C\u2500",
                 " ",
                 agent.label,
                 ":",
                 " "
               ] }),
-              /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.text.primary, children: [
-                agent.totalTokens.toLocaleString(),
+              /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.primary, children: [
+                agent.outputTokens.toLocaleString(),
                 " tokens \xB7 runtime",
                 " ",
                 formatDuration(agent.durationMs)
@@ -18367,15 +18487,15 @@ var ArenaSessionCard = /* @__PURE__ */ __name(({
             ] }, agent.label))
           ] })
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { height: 1 }),
-        sessionStatus === "idle" && /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.text.secondary, children: [
+        /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { height: 1 }),
+        sessionStatus === "idle" && /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.secondary, children: [
           "Run ",
-          /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color: theme.text.accent, children: "/arena select" }),
+          /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.accent, children: "/arena select" }),
           " to view detailed diff or pick a winner."
         ] }) }),
-        sessionStatus === "completed" && /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime43.jsxs)(Text, { color: theme.text.secondary, children: [
+        sessionStatus === "completed" && /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.secondary, children: [
           "Run ",
-          /* @__PURE__ */ (0, import_jsx_runtime43.jsx)(Text, { color: theme.text.accent, children: "/arena select" }),
+          /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.accent, children: "/arena select" }),
           " to pick a winner."
         ] }) })
       ]
@@ -18385,7 +18505,7 @@ var ArenaSessionCard = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/messages/InsightProgressMessage.tsx
 init_esbuild_shims();
-var import_jsx_runtime44 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime45 = __toESM(require_jsx_runtime(), 1);
 var InsightProgressMessage = /* @__PURE__ */ __name(({
   progress
 }) => {
@@ -18395,28 +18515,28 @@ var InsightProgressMessage = /* @__PURE__ */ __name(({
   const remainingWidth = width - completedWidth;
   const bar = "\u2588".repeat(Math.max(0, completedWidth)) + "\u2591".repeat(Math.max(0, remainingWidth));
   if (error) {
-    return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Box_default, { flexDirection: "column", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.status.error, children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(Box_default, { flexDirection: "column", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(Text, { color: theme.status.error, children: [
         "\u2715 ",
         stage
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.secondary, children: error })
+      /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Text, { color: theme.text.secondary, children: error })
     ] });
   }
   if (isComplete) {
-    return /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Box_default, { flexDirection: "row", children: /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.status.success, children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Box_default, { flexDirection: "row", children: /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(Text, { color: theme.status.success, children: [
       "\u2713 ",
       stage
     ] }) });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { color: theme.text.accent, children: /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(build_default, { type: "dots" }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime44.jsx)(Text, { children: " " }),
-    /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.secondary, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(Box_default, { flexDirection: "row", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Text, { color: theme.text.accent, children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(build_default, { type: "dots" }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Text, { children: " " }),
+    /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(Text, { color: theme.text.secondary, children: [
       bar,
       " "
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime44.jsxs)(Text, { color: theme.text.accent, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(Text, { color: theme.text.accent, children: [
       stage,
       progress.detail ? ` (${progress.detail})` : ""
     ] })
@@ -18425,8 +18545,8 @@ var InsightProgressMessage = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/messages/BtwMessage.tsx
 init_esbuild_shims();
-var import_react38 = __toESM(require_react(), 1);
-var import_jsx_runtime45 = __toESM(require_jsx_runtime(), 1);
+var import_react37 = __toESM(require_react(), 1);
+var import_jsx_runtime46 = __toESM(require_jsx_runtime(), 1);
 var BTW_SELF_CHROME = 4;
 function normalizeCodeFences(text) {
   return text.replace(/([^\n])(```|~~~)/g, "$1\n$2");
@@ -18439,7 +18559,7 @@ var BtwMessageInternal = /* @__PURE__ */ __name(({
   const { columns: terminalWidth } = useTerminalSize();
   const baseWidth = containerWidth ?? terminalWidth;
   const contentWidth = Math.max(2, baseWidth - BTW_SELF_CHROME);
-  return /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -18448,18 +18568,18 @@ var BtwMessageInternal = /* @__PURE__ */ __name(({
       paddingX: 1,
       width: "100%",
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(Box_default, { flexDirection: "row", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Text, { color: Colors.AccentYellow, bold: true, children: "/btw " }),
-          /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Text, { wrap: "wrap", color: Colors.AccentYellow, children: btw.question })
+        /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(Box_default, { flexDirection: "row", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Text, { color: Colors.AccentYellow, bold: true, children: "/btw " }),
+          /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Text, { wrap: "wrap", color: Colors.AccentYellow, children: btw.question })
         ] }),
-        btw.isPending ? /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(Box_default, { children: [
-            /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Text, { color: Colors.AccentYellow, children: "+ " }),
-            /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Text, { color: Colors.AccentYellow, children: t("Answering...") })
+        btw.isPending ? /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(Box_default, { children: [
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Text, { color: Colors.AccentYellow, children: "+ " }),
+            /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Text, { color: Colors.AccentYellow, children: t("Answering...") })
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Text, { dimColor: true, children: t("Press Escape, Ctrl+C, or Ctrl+D to cancel") }) })
-        ] }) : /* @__PURE__ */ (0, import_jsx_runtime45.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Text, { dimColor: true, children: t("Press Escape, Ctrl+C, or Ctrl+D to cancel") }) })
+        ] }) : /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(Box_default, { flexDirection: "column", marginTop: 1, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
             MarkdownDisplay,
             {
               text: normalizeCodeFences(btw.answer),
@@ -18467,26 +18587,26 @@ var BtwMessageInternal = /* @__PURE__ */ __name(({
               contentWidth
             }
           ),
-          /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime45.jsx)(Text, { dimColor: true, children: t("Press Space, Enter, or Escape to dismiss") }) })
+          /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Box_default, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Text, { dimColor: true, children: t("Press Space, Enter, or Escape to dismiss") }) })
         ] })
       ]
     }
   );
 }, "BtwMessageInternal");
-var BtwMessage = import_react38.default.memo(BtwMessageInternal);
+var BtwMessage = import_react37.default.memo(BtwMessageInternal);
 
 // packages/cli/src/ui/components/messages/MemorySavedMessage.tsx
 init_esbuild_shims();
-var import_jsx_runtime46 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime47 = __toESM(require_jsx_runtime(), 1);
 var MemorySavedMessage = /* @__PURE__ */ __name(({
   item
 }) => {
   const verb = item.verb ?? "Saved";
   const n = item.writtenCount;
   const label = n === 1 ? "memory" : "memories";
-  return /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Box_default, { minWidth: 2, children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(Text, { dimColor: true, children: "\u25CF" }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(Text, { dimColor: true, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Box_default, { flexDirection: "row", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Box_default, { minWidth: 2, children: /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { dimColor: true, children: "\u25CF" }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { dimColor: true, children: [
       verb,
       " ",
       n,
@@ -18498,28 +18618,28 @@ var MemorySavedMessage = /* @__PURE__ */ __name(({
 
 // packages/cli/src/ui/components/messages/DiffStatsDisplay.tsx
 init_esbuild_shims();
-var import_jsx_runtime47 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime48 = __toESM(require_jsx_runtime(), 1);
 var DiffStatsDisplay = /* @__PURE__ */ __name(({
   model
 }) => {
   const { filesCount, linesAdded, linesRemoved, rows, hiddenCount } = model;
   const { addWidth, remWidth, statColumnWidth } = computeDiffColumnWidths(rows);
   const headerLabel = filesCount === 1 ? t("{{count}} file changed", { count: String(filesCount) }) : t("{{count}} files changed", { count: String(filesCount) });
-  return /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Box_default, { flexDirection: "column", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { color: theme.text.primary, children: headerLabel }),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { color: theme.text.secondary, children: ", " }),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { color: theme.status.success, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Box_default, { flexDirection: "column", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: theme.text.primary, children: headerLabel }),
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: theme.text.secondary, children: ", " }),
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { color: theme.status.success, children: [
         "+",
         linesAdded
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { color: theme.text.secondary, children: " / " }),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { color: theme.status.error, children: [
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: theme.text.secondary, children: " / " }),
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { color: theme.status.error, children: [
         "-",
         linesRemoved
       ] })
     ] }),
-    rows.map((row) => /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(
+    rows.map((row) => /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(
       DiffRow,
       {
         row,
@@ -18529,7 +18649,7 @@ var DiffStatsDisplay = /* @__PURE__ */ __name(({
       },
       row.filename
     )),
-    hiddenCount > 0 && rows.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { color: theme.text.secondary, children: [
+    hiddenCount > 0 && rows.length > 0 && /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { color: theme.text.secondary, children: [
       "  ",
       t("\u2026and {{hidden}} more (showing first {{shown}})", {
         hidden: String(hiddenCount),
@@ -18547,12 +18667,12 @@ var DiffRow = /* @__PURE__ */ __name(({
   if (row.isBinary) {
     const marker = padRight("~", statColumnWidth);
     const suffix2 = row.isUntracked ? t("(binary, new)") : row.isDeleted ? t("(binary, deleted)") : t("(binary)");
-    return /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { color: theme.text.primary, children: "  " }),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { color: theme.text.secondary, children: marker }),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { color: theme.text.primary, children: "  " }),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { color: theme.text.primary, children: row.filename }),
-      /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { color: theme.text.secondary, children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: theme.text.primary, children: "  " }),
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: theme.text.secondary, children: marker }),
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: theme.text.primary, children: "  " }),
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: theme.text.primary, children: row.filename }),
+      /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { color: theme.text.secondary, children: [
         " ",
         suffix2
       ] })
@@ -18566,20 +18686,20 @@ var DiffRow = /* @__PURE__ */ __name(({
   } else if (row.isDeleted) {
     suffix = t("(deleted)");
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { children: [
-    /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { color: theme.text.primary, children: "  " }),
-    /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { color: theme.status.success, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { children: [
+    /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: theme.text.primary, children: "  " }),
+    /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { color: theme.status.success, children: [
       "+",
       added
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { color: theme.text.primary, children: " " }),
-    /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { color: theme.status.error, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: theme.text.primary, children: " " }),
+    /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { color: theme.status.error, children: [
       "-",
       removed
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { color: theme.text.primary, children: "  " }),
-    /* @__PURE__ */ (0, import_jsx_runtime47.jsx)(Text, { color: theme.text.primary, children: row.filename }),
-    suffix && /* @__PURE__ */ (0, import_jsx_runtime47.jsxs)(Text, { color: theme.text.secondary, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: theme.text.primary, children: "  " }),
+    /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: theme.text.primary, children: row.filename }),
+    suffix && /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { color: theme.text.secondary, children: [
       " ",
       suffix
     ] })
@@ -18592,8 +18712,8 @@ __name(padRight, "padRight");
 
 // packages/cli/src/ui/components/messages/GoalStatusMessage.tsx
 init_esbuild_shims();
-var import_react39 = __toESM(require_react(), 1);
-var import_jsx_runtime48 = __toESM(require_jsx_runtime(), 1);
+var import_react38 = __toESM(require_react(), 1);
+var import_jsx_runtime49 = __toESM(require_jsx_runtime(), 1);
 var pluralTurns = /* @__PURE__ */ __name((n) => n === 1 ? "turn" : "turns", "pluralTurns");
 function assertNeverGoalStatusKind(kind) {
   throw new Error(`Unexpected goal status kind: ${kind}`);
@@ -18608,20 +18728,20 @@ var GoalStatusMessageInternal = /* @__PURE__ */ __name(({
 }) => {
   if (kind === "checking") {
     const reason = lastReason?.trim();
-    return /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Box_default, { flexDirection: "row", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Box_default, { width: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: theme.text.secondary, children: "\u25CB" }) }),
-      /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Box_default, { flexGrow: 1, flexDirection: "column", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { color: theme.text.secondary, children: [
+    return /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Box_default, { flexDirection: "row", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Box_default, { width: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Text, { color: theme.text.secondary, children: "\u25CB" }) }),
+      /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Box_default, { flexGrow: 1, flexDirection: "column", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Text, { color: theme.text.secondary, children: [
           "Goal check",
           typeof iterations === "number" && iterations > 0 ? ` \xB7 turn ${iterations}` : "",
           " ",
           "\xB7 not yet met"
         ] }),
-        /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { color: theme.text.secondary, wrap: "wrap", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Text, { color: theme.text.secondary, wrap: "wrap", children: [
           "Goal: ",
           condition
         ] }),
-        reason ? /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { color: theme.text.secondary, wrap: "wrap", children: [
+        reason ? /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Text, { color: theme.text.secondary, wrap: "wrap", children: [
           "Judge: ",
           reason
         ] }) : null
@@ -18672,49 +18792,49 @@ var GoalStatusMessageInternal = /* @__PURE__ */ __name(({
     stats.push(formatDuration(durationMs, { hideTrailingZeros: true }));
   }
   const subtitle = stats.length > 0 ? stats.join(" \xB7 ") : null;
-  return /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Box_default, { flexDirection: "row", children: [
-    /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Box_default, { width: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: prefixColor, children: prefix }) }),
-    /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Box_default, { flexGrow: 1, flexDirection: "column", children: [
-      /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { color: prefixColor, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Box_default, { flexDirection: "row", children: [
+    /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Box_default, { width: 2, flexShrink: 0, children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Text, { color: prefixColor, children: prefix }) }),
+    /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Box_default, { flexGrow: 1, flexDirection: "column", children: [
+      /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Text, { color: prefixColor, children: [
         title,
-        subtitle ? /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { color: theme.text.secondary, children: [
+        subtitle ? /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Text, { color: theme.text.secondary, children: [
           " \xB7 ",
           subtitle
         ] }) : null
       ] }),
-      /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Box_default, { flexDirection: "row", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Box_default, { flexShrink: 0, marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { color: theme.text.secondary, children: "Goal:" }) }),
-        /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime48.jsx)(Text, { wrap: "wrap", children: condition }) })
+      /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Box_default, { flexDirection: "row", children: [
+        /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Box_default, { flexShrink: 0, marginRight: 1, children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Text, { color: theme.text.secondary, children: "Goal:" }) }),
+        /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Box_default, { flexGrow: 1, children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Text, { wrap: "wrap", children: condition }) })
       ] }),
-      isTerminalGoalStatusKind(kind) && lastReason?.trim() ? /* @__PURE__ */ (0, import_jsx_runtime48.jsxs)(Text, { color: theme.text.secondary, wrap: "wrap", children: [
+      isTerminalGoalStatusKind(kind) && lastReason?.trim() ? /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Text, { color: theme.text.secondary, wrap: "wrap", children: [
         "Last check: ",
         lastReason.trim()
       ] }) : null
     ] })
   ] });
 }, "GoalStatusMessageInternal");
-var GoalStatusMessage = import_react39.default.memo(GoalStatusMessageInternal);
+var GoalStatusMessage = import_react38.default.memo(GoalStatusMessageInternal);
 
 // packages/cli/src/ui/contexts/ThoughtExpandedContext.tsx
 init_esbuild_shims();
-var import_react40 = __toESM(require_react(), 1);
-var ThoughtExpandedContext = (0, import_react40.createContext)(false);
-var useThoughtExpanded = /* @__PURE__ */ __name(() => (0, import_react40.useContext)(ThoughtExpandedContext), "useThoughtExpanded");
+var import_react39 = __toESM(require_react(), 1);
+var ThoughtExpandedContext = (0, import_react39.createContext)(false);
+var useThoughtExpanded = /* @__PURE__ */ __name(() => (0, import_react39.useContext)(ThoughtExpandedContext), "useThoughtExpanded");
 var ThoughtExpandedProvider = ThoughtExpandedContext.Provider;
 
 // packages/cli/src/ui/contexts/ThinkingViewerContext.tsx
 init_esbuild_shims();
-var import_react41 = __toESM(require_react(), 1);
-var ThinkingViewerContext = (0, import_react41.createContext)({
+var import_react40 = __toESM(require_react(), 1);
+var ThinkingViewerContext = (0, import_react40.createContext)({
   openThinkingViewer: /* @__PURE__ */ __name(() => {
   }, "openThinkingViewer")
 });
-var useThinkingViewer = /* @__PURE__ */ __name(() => (0, import_react41.useContext)(ThinkingViewerContext), "useThinkingViewer");
+var useThinkingViewer = /* @__PURE__ */ __name(() => (0, import_react40.useContext)(ThinkingViewerContext), "useThinkingViewer");
 var ThinkingViewerProvider = ThinkingViewerContext.Provider;
 
 // packages/cli/src/ui/hooks/useMouseEvents.ts
 init_esbuild_shims();
-var import_react42 = __toESM(require_react(), 1);
+var import_react41 = __toESM(require_react(), 1);
 var mouseModeRefs = /* @__PURE__ */ new Map();
 var disableAllMouseModes = /* @__PURE__ */ __name(() => {
   for (const stdout of mouseModeRefs.keys()) {
@@ -18748,24 +18868,27 @@ function releaseMouseMode(stdout) {
   }
 }
 __name(releaseMouseMode, "releaseMouseMode");
-function useMouseEvents(handler, { isActive }) {
+function useMouseEvents(handler, { isActive, bypassVpGate = false }) {
   const { isRawModeSupported } = use_stdin_default();
   const { stdout } = use_stdout_default();
   const { subscribeMouse, unsubscribeMouse } = useKeypressContext();
-  const handlerRef = (0, import_react42.useRef)(handler);
+  const settings = (0, import_react41.useContext)(SettingsContext);
+  const isVpMode = settings?.merged.ui?.useTerminalBuffer ?? false;
+  const vpGateOpen = isVpMode || bypassVpGate;
+  const handlerRef = (0, import_react41.useRef)(handler);
   handlerRef.current = handler;
-  const enabled = isActive && isRawModeSupported;
-  (0, import_react42.useEffect)(() => {
+  const enabled = isActive && isRawModeSupported && vpGateOpen;
+  (0, import_react41.useEffect)(() => {
     if (!enabled) return;
     acquireMouseMode(stdout);
     return () => {
       releaseMouseMode(stdout);
     };
   }, [enabled, stdout]);
-  const mouseCallback = (0, import_react42.useCallback)((event) => {
+  const mouseCallback = (0, import_react41.useCallback)((event) => {
     handlerRef.current(event);
   }, []);
-  (0, import_react42.useEffect)(() => {
+  (0, import_react41.useEffect)(() => {
     if (!enabled) return;
     subscribeMouse(mouseCallback);
     return () => unsubscribeMouse(mouseCallback);
@@ -18800,7 +18923,7 @@ function measureElementPosition(node) {
 __name(measureElementPosition, "measureElementPosition");
 
 // packages/cli/src/ui/components/HistoryItemDisplay.tsx
-var import_jsx_runtime49 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime50 = __toESM(require_jsx_runtime(), 1);
 var ClickableThinkMessage = /* @__PURE__ */ __name(({
   text,
   viewerText,
@@ -18810,15 +18933,15 @@ var ClickableThinkMessage = /* @__PURE__ */ __name(({
   contentWidth,
   durationMs
 }) => {
-  const ref = (0, import_react43.useRef)(null);
+  const ref = (0, import_react42.useRef)(null);
   const { openThinkingViewer } = useThinkingViewer();
   const isActive = !isPending && !expanded;
-  const sanitizedViewerText = (0, import_react43.useMemo)(
+  const sanitizedViewerText = (0, import_react42.useMemo)(
     () => escapeAnsiCtrlCodes(viewerText),
     [viewerText]
   );
   useMouseEvents(
-    (0, import_react43.useCallback)(
+    (0, import_react42.useCallback)(
       (event) => {
         if (event.name !== "left-press" || !ref.current) return;
         const metrics = measureElementPosition(ref.current);
@@ -18832,7 +18955,7 @@ var ClickableThinkMessage = /* @__PURE__ */ __name(({
     ),
     { isActive }
   );
-  return /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Box_default, { ref: isActive ? ref : void 0, children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Box_default, { ref: isActive ? ref : void 0, children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
     ThinkMessage,
     {
       text,
@@ -18870,6 +18993,7 @@ function getHistoryItemMarginTop(item) {
     case "stop_hook_loop":
     case "stop_hook_system_message":
     case "goal_status":
+    case "vision_notice":
       return 0;
     default:
       return 1;
@@ -18887,22 +19011,19 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
   activeShellPtyId,
   embeddedShellFocused,
   availableTerminalHeightGemini,
-  compactLabel,
-  summaryAbsorbed = false,
   sourceCopyIndexOffsets,
   thoughtExpanded,
   thinkingFullText
 }) => {
   const marginTop = getHistoryItemMarginTop(item);
-  const { compactMode } = useCompactMode();
   const contextThoughtExpanded = useThoughtExpanded();
   const resolvedThoughtExpanded = thoughtExpanded ?? contextThoughtExpanded;
   const settings = useSettings();
   const showTimestamps = settings.merged.output?.showTimestamps === true;
-  const itemForDisplay = (0, import_react43.useMemo)(() => escapeAnsiCtrlCodes(item), [item]);
+  const itemForDisplay = (0, import_react42.useMemo)(() => escapeAnsiCtrlCodes(item), [item]);
   const contentWidth = terminalWidth - 4;
   const boxWidth = mainAreaWidth || contentWidth;
-  return /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(
+  return /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(
     Box_default,
     {
       flexDirection: "column",
@@ -18910,18 +19031,21 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
       marginLeft: 2,
       marginRight: 2,
       children: [
-        itemForDisplay.type === "user" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(UserMessage, { text: itemForDisplay.text }),
-        itemForDisplay.type === "notification" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(InfoMessage, { text: itemForDisplay.text }),
-        itemForDisplay.type === "user_shell" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(UserShellMessage, { text: itemForDisplay.text }),
-        itemForDisplay.type === "gemini" && /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(import_jsx_runtime49.Fragment, { children: [
-          showTimestamps && itemForDisplay.timestamp != null && /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Text, { dimColor: true, children: [
+        itemForDisplay.type === "user" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(UserMessage, { text: itemForDisplay.text }),
+        itemForDisplay.type === "notification" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(InfoMessage, { text: itemForDisplay.text }),
+        itemForDisplay.type === "user_shell" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(UserShellMessage, { text: itemForDisplay.text }),
+        itemForDisplay.type === "gemini" && /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(import_jsx_runtime50.Fragment, { children: [
+          showTimestamps && itemForDisplay.timestamp != null && /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(Text, { dimColor: true, children: [
             "[",
             new Date(itemForDisplay.timestamp).toLocaleTimeString("en-US", {
-              hour12: false
+              hour12: false,
+              hour: "2-digit",
+              minute: "2-digit",
+              second: "2-digit"
             }),
             "]"
           ] }),
-          /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+          /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
             AssistantMessage,
             {
               text: itemForDisplay.text,
@@ -18932,7 +19056,7 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
             }
           )
         ] }),
-        itemForDisplay.type === "gemini_content" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        itemForDisplay.type === "gemini_content" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
           AssistantMessageContent,
           {
             text: itemForDisplay.text,
@@ -18942,7 +19066,7 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
             sourceCopyIndexOffsets
           }
         ),
-        itemForDisplay.type === "gemini_thought" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        itemForDisplay.type === "gemini_thought" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
           ClickableThinkMessage,
           {
             text: itemForDisplay.text.trimEnd(),
@@ -18954,7 +19078,7 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
             durationMs: itemForDisplay.durationMs
           }
         ),
-        itemForDisplay.type === "gemini_thought_content" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        itemForDisplay.type === "gemini_thought_content" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
           ThinkMessageContent,
           {
             text: itemForDisplay.text.trimEnd(),
@@ -18964,7 +19088,7 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
             contentWidth
           }
         ),
-        itemForDisplay.type === "info" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        itemForDisplay.type === "info" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
           InfoMessage,
           {
             text: itemForDisplay.text,
@@ -18972,24 +19096,26 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
             linkText: itemForDisplay.linkText
           }
         ),
-        itemForDisplay.type === "success" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(SuccessMessage, { text: itemForDisplay.text }),
-        itemForDisplay.type === "warning" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(WarningMessage, { text: itemForDisplay.text }),
-        itemForDisplay.type === "error" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(ErrorMessage, { text: itemForDisplay.text, hint: itemForDisplay.hint }),
-        itemForDisplay.type === "retry_countdown" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(RetryCountdownMessage, { text: itemForDisplay.text }),
-        itemForDisplay.type === "about" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(AboutBox, { ...itemForDisplay.systemInfo, width: boxWidth }),
-        itemForDisplay.type === "help" && commands && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Help, { commands, width: boxWidth }),
-        itemForDisplay.type === "stats" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(StatsDisplay, { duration: itemForDisplay.duration, width: boxWidth }),
-        itemForDisplay.type === "diff_stats" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(DiffStatsDisplay, { model: itemForDisplay.model }),
-        itemForDisplay.type === "model_stats" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(ModelStatsDisplay, { width: boxWidth }),
-        itemForDisplay.type === "tool_stats" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(ToolStatsDisplay, { width: boxWidth }),
-        itemForDisplay.type === "quit" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        itemForDisplay.type === "success" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(SuccessMessage, { text: itemForDisplay.text }),
+        itemForDisplay.type === "warning" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(WarningMessage, { text: itemForDisplay.text }),
+        itemForDisplay.type === "error" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(ErrorMessage, { text: itemForDisplay.text, hint: itemForDisplay.hint }),
+        itemForDisplay.type === "retry_countdown" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(RetryCountdownMessage, { text: itemForDisplay.text }),
+        itemForDisplay.type === "vision_notice" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(VisionNoticeMessage, { text: itemForDisplay.text }),
+        itemForDisplay.type === "about" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(AboutBox, { ...itemForDisplay.systemInfo, width: boxWidth }),
+        itemForDisplay.type === "help" && commands && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Help, { commands, width: boxWidth }),
+        itemForDisplay.type === "stats" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(StatsDisplay, { duration: itemForDisplay.duration, width: boxWidth }),
+        itemForDisplay.type === "diff_stats" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(DiffStatsDisplay, { model: itemForDisplay.model }),
+        itemForDisplay.type === "model_stats" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(ModelStatsDisplay, { width: boxWidth }),
+        itemForDisplay.type === "tool_stats" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(ToolStatsDisplay, { width: boxWidth }),
+        itemForDisplay.type === "skill_stats" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(SkillStatsDisplay, { width: boxWidth }),
+        itemForDisplay.type === "quit" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
           SessionSummaryDisplay,
           {
             duration: itemForDisplay.duration,
             width: boxWidth
           }
         ),
-        itemForDisplay.type === "tool_group" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        itemForDisplay.type === "tool_group" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
           ToolGroupMessage,
           {
             toolCalls: itemForDisplay.tools,
@@ -19002,18 +19128,17 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
             embeddedShellFocused,
             memoryWriteCount: itemForDisplay.memoryWriteCount,
             memoryReadCount: itemForDisplay.memoryReadCount,
-            isUserInitiated: itemForDisplay.isUserInitiated,
-            compactLabel
+            isUserInitiated: itemForDisplay.isUserInitiated
           }
         ),
-        itemForDisplay.type === "tool_use_summary" && (!compactMode || !summaryAbsorbed) && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Box_default, { paddingLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Text, { dimColor: true, children: [
+        itemForDisplay.type === "tool_use_summary" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Box_default, { paddingLeft: 1, children: /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(Text, { dimColor: true, children: [
           "\u25CF ",
           itemForDisplay.summary
         ] }) }),
-        itemForDisplay.type === "compression" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(CompressionMessage, { compression: itemForDisplay.compression }),
-        itemForDisplay.type === "summary" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(SummaryMessage, { summary: itemForDisplay.summary }),
-        itemForDisplay.type === "extensions_list" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(ExtensionsList, {}),
-        itemForDisplay.type === "tools_list" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        itemForDisplay.type === "compression" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(CompressionMessage, { compression: itemForDisplay.compression }),
+        itemForDisplay.type === "summary" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(SummaryMessage, { summary: itemForDisplay.summary }),
+        itemForDisplay.type === "extensions_list" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(ExtensionsList, {}),
+        itemForDisplay.type === "tools_list" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
           ToolsList,
           {
             contentWidth,
@@ -19021,9 +19146,9 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
             showDescriptions: itemForDisplay.showDescriptions
           }
         ),
-        itemForDisplay.type === "skills_list" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(SkillsList, { skills: itemForDisplay.skills }),
-        itemForDisplay.type === "mcp_status" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(McpStatus, { ...itemForDisplay, serverStatus: getMCPServerStatus }),
-        itemForDisplay.type === "context_usage" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        itemForDisplay.type === "skills_list" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(SkillsList, { skills: itemForDisplay.skills }),
+        itemForDisplay.type === "mcp_status" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(McpStatus, { ...itemForDisplay, serverStatus: getMCPServerStatus }),
+        itemForDisplay.type === "context_usage" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
           ContextUsage,
           {
             modelName: itemForDisplay.modelName,
@@ -19038,7 +19163,7 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
             showDetails: itemForDisplay.showDetails
           }
         ),
-        itemForDisplay.type === "doctor" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        itemForDisplay.type === "doctor" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
           DoctorReport,
           {
             checks: itemForDisplay.checks,
@@ -19046,8 +19171,8 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
             width: boxWidth
           }
         ),
-        itemForDisplay.type === "arena_agent_complete" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(ArenaAgentCard, { agent: itemForDisplay.agent, width: boxWidth }),
-        itemForDisplay.type === "arena_session_complete" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        itemForDisplay.type === "arena_agent_complete" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(ArenaAgentCard, { agent: itemForDisplay.agent, width: boxWidth }),
+        itemForDisplay.type === "arena_session_complete" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
           ArenaSessionCard,
           {
             sessionStatus: itemForDisplay.sessionStatus,
@@ -19057,22 +19182,22 @@ var HistoryItemDisplayComponent = /* @__PURE__ */ __name(({
             width: boxWidth
           }
         ),
-        itemForDisplay.type === "insight_progress" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(InsightProgressMessage, { progress: itemForDisplay.progress }),
-        itemForDisplay.type === "btw" && itemForDisplay.btw && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(BtwMessage, { btw: itemForDisplay.btw, containerWidth: contentWidth }),
-        itemForDisplay.type === "user_prompt_submit_blocked" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Text, { color: theme.status.warning, children: `\u2715 UserPromptSubmit operation blocked by hook:
+        itemForDisplay.type === "insight_progress" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(InsightProgressMessage, { progress: itemForDisplay.progress }),
+        itemForDisplay.type === "btw" && itemForDisplay.btw && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(BtwMessage, { btw: itemForDisplay.btw, containerWidth: contentWidth }),
+        itemForDisplay.type === "user_prompt_submit_blocked" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Box_default, { flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Text, { color: theme.status.warning, children: `\u2715 UserPromptSubmit operation blocked by hook:
 ${itemForDisplay.reason}
 
 Original prompt: ${sanitizeSensitiveText(itemForDisplay.originalPrompt)}` }) }),
-        itemForDisplay.type === "stop_hook_loop" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        itemForDisplay.type === "stop_hook_loop" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
           InfoMessage,
           {
             text: `Ran ${itemForDisplay.stopHookCount} stop hooks
   \u23BF  Stop hook error: ${itemForDisplay.reasons[itemForDisplay.reasons.length - 1]}`
           }
         ),
-        itemForDisplay.type === "stop_hook_system_message" && /* @__PURE__ */ (0, import_jsx_runtime49.jsxs)(Box_default, { flexDirection: "column", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Text, { color: theme.text.primary, children: " \u23BF Stop says:" }),
-          /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(Box_default, { marginLeft: 4, flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        itemForDisplay.type === "stop_hook_system_message" && /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(Box_default, { flexDirection: "column", children: [
+          /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Text, { color: theme.text.primary, children: " \u23BF Stop says:" }),
+          /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Box_default, { marginLeft: 4, flexDirection: "column", children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
             MarkdownDisplay,
             {
               text: itemForDisplay.message,
@@ -19081,9 +19206,9 @@ Original prompt: ${sanitizeSensitiveText(itemForDisplay.originalPrompt)}` }) }),
             }
           ) })
         ] }),
-        itemForDisplay.type === "memory_saved" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(MemorySavedMessage, { item: itemForDisplay }),
-        itemForDisplay.type === "away_recap" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(AwayRecapMessage, { text: itemForDisplay.text }),
-        itemForDisplay.type === "goal_status" && /* @__PURE__ */ (0, import_jsx_runtime49.jsx)(
+        itemForDisplay.type === "memory_saved" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(MemorySavedMessage, { item: itemForDisplay }),
+        itemForDisplay.type === "away_recap" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(AwayRecapMessage, { text: itemForDisplay.text }),
+        itemForDisplay.type === "goal_status" && /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
           GoalStatusMessage,
           {
             kind: itemForDisplay.kind,
@@ -19100,7 +19225,7 @@ Original prompt: ${sanitizeSensitiveText(itemForDisplay.originalPrompt)}` }) }),
 }, "HistoryItemDisplayComponent");
 
 // packages/cli/src/ui/components/SessionPreview.tsx
-var import_jsx_runtime50 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime51 = __toESM(require_jsx_runtime(), 1);
 function SessionPreview(props) {
   const {
     sessionService,
@@ -19113,9 +19238,9 @@ function SessionPreview(props) {
     onResume
   } = props;
   const { columns } = useTerminalSize();
-  const [data, setData] = (0, import_react44.useState)(null);
-  const [error, setError] = (0, import_react44.useState)(null);
-  (0, import_react44.useEffect)(() => {
+  const [data, setData] = (0, import_react43.useState)(null);
+  const [error, setError] = (0, import_react43.useState)(null);
+  (0, import_react43.useEffect)(() => {
     let cancelled = false;
     setData(null);
     setError(null);
@@ -19134,11 +19259,11 @@ function SessionPreview(props) {
       cancelled = true;
     };
   }, [sessionService, sessionId]);
-  const items = (0, import_react44.useMemo)(() => {
+  const items = (0, import_react43.useMemo)(() => {
     if (!data) return [];
     return buildResumedHistoryItems(data, null);
   }, [data]);
-  const computedMessageCount = (0, import_react44.useMemo)(() => {
+  const computedMessageCount = (0, import_react43.useMemo)(() => {
     if (!data) return void 0;
     const seen = /* @__PURE__ */ new Set();
     for (const msg of data.conversation.messages) {
@@ -19175,19 +19300,19 @@ function SessionPreview(props) {
     metaParts.push(gitBranch);
   }
   const metaLine = metaParts.join(" \xB7 ");
-  const header = /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Text, { bold: true, color: theme.text.primary, children: sessionTitle ?? t("Session Preview") }) }, "header");
-  const topSeparator = /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Text, { color: theme.border.default, children: "\u2500".repeat(separatorWidth) }) }, "top-separator");
-  const footerSeparator = /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Text, { color: theme.border.default, children: "\u2500".repeat(separatorWidth) }) }, "footer-separator");
-  const meta = metaLine ? /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Text, { color: theme.text.secondary, children: metaLine }) }, "meta") : null;
-  const footer = /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Text, { color: theme.text.secondary, children: t("Enter to resume \xB7 Esc to back") }) }, "footer");
+  const header = /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { bold: true, color: theme.text.primary, children: sessionTitle ?? t("Session Preview") }) }, "header");
+  const topSeparator = /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.border.default, children: "\u2500".repeat(separatorWidth) }) }, "top-separator");
+  const footerSeparator = /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.border.default, children: "\u2500".repeat(separatorWidth) }) }, "footer-separator");
+  const meta = metaLine ? /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.secondary, children: metaLine }) }, "meta") : null;
+  const footer = /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.secondary, children: t("Enter to resume \xB7 Esc to back") }) }, "footer");
   if (data && !error) {
-    return /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Box_default, { flexDirection: "column", width: boxWidth, children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { flexDirection: "column", width: boxWidth, children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
       Static,
       {
         items: [
           header,
           topSeparator,
-          ...items.map((item) => /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(
+          ...items.map((item) => /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
             HistoryItemDisplayComponent,
             {
               item,
@@ -19206,10 +19331,10 @@ function SessionPreview(props) {
       sessionId
     ) });
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime50.jsxs)(Box_default, { flexDirection: "column", width: boxWidth, children: [
+  return /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(Box_default, { flexDirection: "column", width: boxWidth, children: [
     header,
     topSeparator,
-    error ? /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Box_default, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Text, { color: theme.status.error, children: error }) }) : /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Box_default, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ (0, import_jsx_runtime50.jsx)(Text, { color: theme.text.secondary, children: t("Loading session preview...") }) }),
+    error ? /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.status.error, children: error }) }) : /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.secondary, children: t("Loading session preview...") }) }),
     footerSeparator,
     meta,
     footer
@@ -19218,7 +19343,7 @@ function SessionPreview(props) {
 __name(SessionPreview, "SessionPreview");
 
 // packages/cli/src/ui/components/SessionPicker.tsx
-var import_jsx_runtime51 = __toESM(require_jsx_runtime(), 1);
+var import_jsx_runtime52 = __toESM(require_jsx_runtime(), 1);
 var PREFIX_CHARS = {
   selected: "\u203A ",
   scrollUp: "\u2191 ",
@@ -19251,9 +19376,9 @@ function SessionListItemView({
     Math.max(1, maxPromptWidth - checkboxWidth)
   );
   const isAutoTitle = session.titleSource === "auto" && Boolean(session.customTitle);
-  return /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(Box_default, { flexDirection: "column", marginBottom: isLast ? 0 : 1, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(Box_default, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(Box_default, { flexDirection: "column", marginBottom: isLast ? 0 : 1, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(Box_default, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
         Text,
         {
           color: isSelected ? theme.text.accent : showUpIndicator || showDownIndicator ? theme.text.secondary : void 0,
@@ -19261,7 +19386,7 @@ function SessionListItemView({
           children: prefix
         }
       ),
-      isChecked !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+      isChecked !== void 0 && /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
         Text,
         {
           color: isDisabled ? theme.text.secondary : isChecked ? theme.text.accent : isSelected ? theme.text.accent : theme.text.secondary,
@@ -19269,7 +19394,7 @@ function SessionListItemView({
           children: isChecked ? "[x] " : "[ ] "
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+      /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
         Text,
         {
           color: isDisabled ? theme.text.secondary : isSelected ? theme.text.accent : isAutoTitle ? theme.text.secondary : theme.text.primary,
@@ -19278,7 +19403,7 @@ function SessionListItemView({
         }
       )
     ] }),
-    /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(Text, { color: theme.text.secondary, children: [
+    /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Box_default, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(Text, { color: theme.text.secondary, children: [
       timeAgo,
       messageText !== void 0 && ` \xB7 ${messageText}`,
       session.gitBranch && ` \xB7 ${session.gitBranch}`,
@@ -19327,7 +19452,7 @@ function SessionPicker(props) {
     const previewed = picker.filteredSessions.find(
       (s) => s.sessionId === picker.previewSessionId
     );
-    return /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+    return /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
       SessionPreview,
       {
         sessionService,
@@ -19341,14 +19466,14 @@ function SessionPicker(props) {
       }
     );
   }
-  return /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+  return /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
     Box_default,
     {
       flexDirection: "column",
       width: boxWidth,
       height: height - 1,
       overflow: "hidden",
-      children: /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(
+      children: /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(
         Box_default,
         {
           flexDirection: "column",
@@ -19358,38 +19483,38 @@ function SessionPicker(props) {
           height: height - 1,
           overflow: "hidden",
           children: [
-            /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(Box_default, { paddingX: 1, children: [
-              /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { bold: true, color: theme.text.primary, children: title ?? t("Resume Session") }),
-              picker.filterByBranch && currentBranch && /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(Text, { color: theme.text.secondary, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(Box_default, { paddingX: 1, children: [
+              /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { bold: true, color: theme.text.primary, children: title ?? t("Resume Session") }),
+              picker.filterByBranch && currentBranch && /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(Text, { color: theme.text.secondary, children: [
                 " ",
                 t("(branch: {{branch}})", { branch: currentBranch })
               ] }),
-              picker.searchQuery !== "" && /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(Text, { color: theme.text.secondary, children: [
+              picker.searchQuery !== "" && /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(Text, { color: theme.text.secondary, children: [
                 " ",
                 t("({{count}} matches)", {
                   count: String(picker.filteredSessions.length)
                 })
               ] })
             ] }),
-            /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { paddingX: 1, children: picker.isSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(import_jsx_runtime51.Fragment, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.secondary, children: t("Search: ") }),
-              /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(Text, { color: theme.text.primary, children: [
+            /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Box_default, { paddingX: 1, children: picker.isSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(import_jsx_runtime52.Fragment, { children: [
+              /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { color: theme.text.secondary, children: t("Search: ") }),
+              /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(Text, { color: theme.text.primary, children: [
                 picker.searchQuery,
-                /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.secondary, children: "\u258C" })
+                /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { color: theme.text.secondary, children: "\u258C" })
               ] })
-            ] }) : picker.searchQuery !== "" ? /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(import_jsx_runtime51.Fragment, { children: [
-              /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.secondary, children: t("Filter: ") }),
-              /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.primary, children: picker.searchQuery })
-            ] }) : /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.secondary, children: t("Press / to search") }) }),
-            /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.border.default, children: "\u2500".repeat(boxWidth - 2) }) }),
-            /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { flexDirection: "column", flexGrow: 1, paddingX: 1, overflow: "hidden", children: !sessionService || picker.isLoading ? /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.secondary, children: t("Loading sessions...") }) }) : picker.filteredSessions.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.secondary, children: picker.searchQuery !== "" ? t('No sessions match "{{query}}"', {
+            ] }) : picker.searchQuery !== "" ? /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(import_jsx_runtime52.Fragment, { children: [
+              /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { color: theme.text.secondary, children: t("Filter: ") }),
+              /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { color: theme.text.primary, children: picker.searchQuery })
+            ] }) : /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { color: theme.text.secondary, children: t("Press / to search") }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { color: theme.border.default, children: "\u2500".repeat(boxWidth - 2) }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Box_default, { flexDirection: "column", flexGrow: 1, paddingX: 1, overflow: "hidden", children: !sessionService || picker.isLoading ? /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Box_default, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { color: theme.text.secondary, children: t("Loading sessions...") }) }) : picker.filteredSessions.length === 0 ? /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Box_default, { paddingY: 1, justifyContent: "center", children: /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { color: theme.text.secondary, children: picker.searchQuery !== "" ? t('No sessions match "{{query}}"', {
               query: picker.searchQuery
             }) : picker.filterByBranch ? t('No sessions found for branch "{{branch}}"', {
               branch: currentBranch ?? ""
             }) : t("No sessions found") }) }) : picker.visibleSessions.map((session, visibleIndex) => {
               const actualIndex = picker.scrollOffset + visibleIndex;
               const isDisabled = picker.disabledIdSet.has(session.sessionId);
-              return /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+              return /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
                 SessionListItemView,
                 {
                   session,
@@ -19408,10 +19533,10 @@ function SessionPicker(props) {
                 session.sessionId
               );
             }) }),
-            /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.border.default, children: "\u2500".repeat(boxWidth - 2) }) }),
-            /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Box_default, { flexDirection: "row", children: picker.isSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.secondary, children: t("Type to search \xB7 Enter to commit \xB7 Esc to clear") }) : /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(import_jsx_runtime51.Fragment, { children: [
-              currentBranch && /* @__PURE__ */ (0, import_jsx_runtime51.jsxs)(Text, { color: theme.text.secondary, children: [
-                /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(
+            /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Box_default, { children: /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { color: theme.border.default, children: "\u2500".repeat(boxWidth - 2) }) }),
+            /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Box_default, { paddingX: 1, children: /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Box_default, { flexDirection: "row", children: picker.isSearchActive ? /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { color: theme.text.secondary, children: t("Type to search \xB7 Enter to commit \xB7 Esc to clear") }) : /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(import_jsx_runtime52.Fragment, { children: [
+              currentBranch && /* @__PURE__ */ (0, import_jsx_runtime52.jsxs)(Text, { color: theme.text.secondary, children: [
+                /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(
                   Text,
                   {
                     bold: picker.filterByBranch,
@@ -19421,7 +19546,7 @@ function SessionPicker(props) {
                 ),
                 t(" to toggle branch \xB7 ")
               ] }),
-              enablePreview && /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.secondary, children: t("Space to preview \xB7 ") }),
+              enablePreview && /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { color: theme.text.secondary, children: t("Space to preview \xB7 ") }),
               enableMultiSelect && (() => {
                 let committableCheckedCount = 0;
                 for (const id of picker.checkedIds) {
@@ -19429,11 +19554,11 @@ function SessionPicker(props) {
                     committableCheckedCount++;
                   }
                 }
-                return /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.secondary, children: committableCheckedCount > 0 ? t("Space to toggle \xB7 {{count}} selected \xB7 ", {
+                return /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { color: theme.text.secondary, children: committableCheckedCount > 0 ? t("Space to toggle \xB7 {{count}} selected \xB7 ", {
                   count: String(committableCheckedCount)
                 }) : t("Space to select multiple \xB7 ") });
               })(),
-              /* @__PURE__ */ (0, import_jsx_runtime51.jsx)(Text, { color: theme.text.secondary, children: t("\u2191\u2193 to navigate \xB7 Type to search \xB7 Esc to cancel") })
+              /* @__PURE__ */ (0, import_jsx_runtime52.jsx)(Text, { color: theme.text.secondary, children: t("\u2191\u2193 to navigate \xB7 Type to search \xB7 Esc to cancel") })
             ] }) }) })
           ]
         }
@@ -19470,7 +19595,6 @@ export {
   formatDuration2 as formatDuration,
   THINKING_ICON,
   DiffRenderer,
-  Colors,
   keyMatchers,
   useSelectionList,
   BaseSelectionList,
@@ -19482,8 +19606,6 @@ export {
   renderSoftwareCursor,
   TextInput,
   ToolConfirmationMessage,
-  useCompactMode,
-  CompactModeProvider,
   build_default,
   StreamingContext,
   useStreamingContext,