@shareai-lab/kode 2.1.0 → 2.1.2

package/dist/chunks/{chunk-Z3J3WJ2K.js → chunk-BPMYW5DT.js}

@@ -6,8 +6,9 @@ import {
 import {
   buildSystemPromptForSession,
   runTurn
-} from "./chunk-Q55CB4Y4.js";
+} from "./chunk-WE7CQGRG.js";
 import {
+  BashSpinner,
   ConfigScreen,
   ConsoleScreen,
   HelpScreen,
@@ -16,7 +17,6 @@ import {
   NotificationsScreen,
   OpenFileScreen,
   ProjectOnboarding,
-  Spinner,
   TasksScreen,
   TodosScreen,
   TranscriptScreen,
@@ -28,7 +28,7 @@ import {
   markProjectOnboardingComplete,
   sendNotification,
   switchCwdForResume
-} from "./chunk-KKOES3YK.js";
+} from "./chunk-4T5LR4P5.js";
 import {
   Cursor,
   Select,
@@ -36,18 +36,18 @@ import {
   TextInput,
   countWrappedLines,
   structuredDiffLines
-} from "./chunk-HJCYE2AS.js";
+} from "./chunk-LUZMHHQF.js";
 import {
   getWindowedList
 } from "./chunk-YK3ZQM3C.js";
 import {
   useDoublePress,
   useExitOnCtrlCD
-} from "./chunk-5MVUCX6O.js";
+} from "./chunk-AZHJLRRP.js";
 import {
   Doctor,
   KEYPRESS_PRIORITY
-} from "./chunk-JJ67KF6A.js";
+} from "./chunk-PTIAF6KF.js";
 import {
   wrapLines
 } from "./chunk-7FPYAZAS.js";
@@ -58,7 +58,7 @@ import {
   setTerminalTitle,
   terminalCapabilityManager,
   useKeypress
-} from "./chunk-DELUVYKS.js";
+} from "./chunk-XVNEJVZC.js";
 import {
   getCurrentOutputStyle,
   getCurrentOutputStyleDefinition,
@@ -66,44 +66,47 @@ import {
 } from "./chunk-OP5ZIKFR.js";
 import {
   subscribeCustomCommandReloads
-} from "./chunk-4UDKRYWZ.js";
+} from "./chunk-N4772IDQ.js";
 import {
   Divider,
   ScreenFrame
-} from "./chunk-REQTXUXO.js";
+} from "./chunk-5LBRVQT5.js";
 import {
   useScreenLayout
-} from "./chunk-DPQE5NA4.js";
+} from "./chunk-7SRIFZDJ.js";
 import {
   useTerminalSize
-} from "./chunk-YUXYJB45.js";
+} from "./chunk-5RCVEFJS.js";
 import {
   lastX
 } from "./chunk-QAXE37B5.js";
 import {
   AskUserQuestionTool,
-  BLACK_CIRCLE,
   BashTool,
   BashToolResultMessage_default,
+  CHECKMARK,
+  CROSS,
+  DIAMOND_HOLLOW,
   ExitPlanModeTool,
   FileEditTool,
   GlobTool,
   GrepTool,
   MaxSizedText,
   NotebookEditTool,
+  RECORD_CIRCLE,
   SkillTool,
   SlashCommandTool,
   WebFetchTool,
   applyMarkdown,
   inputSchema,
   maybeTruncateVerboseToolOutput
-} from "./chunk-V3IXG64X.js";
+} from "./chunk-WOMV4RCI.js";
 import {
   countTokens,
   getBinaryFeedbackResultForChoice,
   logBinaryFeedbackEvent,
   resolveToolNameAlias
-} from "./chunk-VBGSHKHX.js";
+} from "./chunk-SVRXO73D.js";
 import {
   FileReadTool,
   FileWriteTool,
@@ -114,7 +117,7 @@ import {
   listBackgroundAgentTaskSnapshots,
   normalizeLineEndings,
   shouldTreatAsSpecialPaste
-} from "./chunk-LIBZWJEW.js";
+} from "./chunk-BNSPVA24.js";
 import {
   detectFileEncoding,
   getMessagesSetter,
@@ -123,7 +126,7 @@ import {
   setMessagesSetter,
   setModelConfigChangeHandler,
   triggerModelConfigChange
-} from "./chunk-EKXQ7ZWV.js";
+} from "./chunk-L5ZJIOEF.js";
 import {
   getCachedStringWidth
 } from "./chunk-UKNILZCN.js";
@@ -131,42 +134,45 @@ import {
   getActiveAgents,
   getAgentByType,
   subscribeAgentReloads
-} from "./chunk-HDEYMVIJ.js";
+} from "./chunk-437YGKVA.js";
 import {
   AbortError,
+  MODE_CONFIGS,
   MalformedCommandError,
   applyToolPermissionContextUpdateForConversationKey,
   describeToolPermissionRuleSource,
   findUnreachablePermissionRules,
   getCommandSubcommandPrefix,
+  getNextPermissionMode,
   getToolPermissionContextForConversationKey,
   hasPermissionsToUseTool,
   isPathInWorkingDirectories,
   isUnsafeCompoundCommand,
+  normalizePermissionMode,
   savePermission,
   setPermissionModeForConversationKey,
   setToolPermissionContextForConversationKey,
   subscribeToolPermissionContextUpdates,
   toAbsolutePath
-} from "./chunk-TJMA65RL.js";
+} from "./chunk-N5AH66UG.js";
 import {
   resolveToolDescription
-} from "./chunk-QBW7VU7C.js";
+} from "./chunk-DWKF6SQH.js";
 import {
   getCodeStyle,
   getContext
-} from "./chunk-MEQ7TAT7.js";
+} from "./chunk-KHMXPPO7.js";
 import {
   resetReminderSession
-} from "./chunk-DZPD6H7A.js";
+} from "./chunk-JXYXMP2Q.js";
 import {
   getRequestStatus,
   subscribeRequestStatus
-} from "./chunk-LOCXPQNJ.js";
+} from "./chunk-ESRGV7DC.js";
 import {
   applyToolPermissionContextUpdate,
   createDefaultToolPermissionContext
-} from "./chunk-4RVYYLN7.js";
+} from "./chunk-E4C4N7OV.js";
 import {
   API_ERROR_MESSAGE_PREFIX,
   CANCEL_MESSAGE,
@@ -192,7 +198,7 @@ import {
   normalizeMessages,
   reorderMessages,
   stripSystemMessages
-} from "./chunk-Y33AS3MY.js";
+} from "./chunk-L2LWCVUF.js";
 import {
   getTheme
 } from "./chunk-HDVL5VTM.js";
@@ -204,16 +210,16 @@ import {
 } from "./chunk-GJYXZ5IL.js";
 import {
   getDisableAllHooksState
-} from "./chunk-BEDQTC44.js";
+} from "./chunk-5LL33G6X.js";
 import {
   getMaxThinkingTokens
-} from "./chunk-3DBNJOZI.js";
+} from "./chunk-SUNG5KP5.js";
 import {
   getModelManager
-} from "./chunk-VSKGDU73.js";
+} from "./chunk-FKWFR23G.js";
 import {
   debug
-} from "./chunk-KDY7XYYS.js";
+} from "./chunk-YQ3YJSMI.js";
 import {
   PRODUCT_NAME,
   enterPlanModeForConversationKey,
@@ -227,14 +233,14 @@ import {
   overwriteLog,
   readPlanFile,
   setActivePlanConversationKey
-} from "./chunk-AKC4BUW5.js";
+} from "./chunk-SOBWNYOW.js";
 import {
   getCwd,
   getOriginalCwd
 } from "./chunk-5ARRC2T2.js";
 import {
   MACRO
-} from "./chunk-P77NF36M.js";
+} from "./chunk-6CAQXUDY.js";
 import {
   getKodeAgentSessionId
 } from "./chunk-SWQV4KSY.js";
@@ -259,7 +265,12 @@ import * as React80 from "react";
 // apps/cli/src/ui/screens/REPL/REPLView.tsx
 import { Box as Box53, Static, Text as Text56, measureElement as measureElement2 } from "ink";
 import * as React70 from "react";
-import { useLayoutEffect as useLayoutEffect2, useMemo as useMemo25, useRef as useRef12, useState as useState21 } from "react";
+import {
+  useLayoutEffect as useLayoutEffect2,
+  useMemo as useMemo24,
+  useRef as useRef12,
+  useState as useState22
+} from "react";
 
 // apps/cli/src/ui/components/permissions/PermissionRequest.tsx
 import * as React19 from "react";
@@ -334,7 +345,6 @@ import * as React2 from "react";
 import { existsSync, readFileSync } from "fs";
 import { useMemo } from "react";
 import { Box as Box2, Text as Text2 } from "ink";
-import { relative } from "path";
 import figures from "figures";
 function FileEditToolDiff({
   file_path,
@@ -423,7 +433,7 @@ function FileEditToolDiff({
   );
   const topIndicator = window.showUpIndicator ? `${figures.arrowUp} More` : " ";
   const bottomIndicator = window.showDownIndicator ? `${figures.arrowDown} More` : " ";
-  return /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column" }, /* @__PURE__ */ React2.createElement(Text2, { bold: true, wrap: "truncate-end" }, verbose ? file_path : relative(getCwd(), file_path)), enableScrolling ? /* @__PURE__ */ React2.createElement(Text2, { dimColor: true, wrap: "truncate-end" }, "PgUp/PgDn scroll \xB7 Home/End") : null, /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React2.createElement(Text2, { dimColor: true, wrap: "truncate-end" }, topIndicator), diffLines.slice(window.start, window.end).map((line, idx) => /* @__PURE__ */ React2.createElement(Box2, { key: `${window.start + idx}` }, line)), /* @__PURE__ */ React2.createElement(Text2, { dimColor: true, wrap: "truncate-end" }, bottomIndicator)));
+  return /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column" }, /* @__PURE__ */ React2.createElement(Text2, { bold: true, wrap: "truncate-end" }, file_path), enableScrolling ? /* @__PURE__ */ React2.createElement(Text2, { dimColor: true, wrap: "truncate-end" }, "PgUp/PgDn scroll \xB7 Home/End") : null, /* @__PURE__ */ React2.createElement(Box2, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React2.createElement(Text2, { dimColor: true, wrap: "truncate-end" }, topIndicator), diffLines.slice(window.start, window.end).map((line, idx) => /* @__PURE__ */ React2.createElement(Box2, { key: `${window.start + idx}` }, line)), /* @__PURE__ */ React2.createElement(Text2, { dimColor: true, wrap: "truncate-end" }, bottomIndicator)));
 }
 
 // apps/cli/src/ui/utils/permissionModeCycleShortcut.ts
@@ -475,107 +485,6 @@ import React3, {
   useRef
 } from "react";
 
-// packages/core/src/types/PermissionMode.ts
-var MODE_CONFIGS = {
-  default: {
-    name: "default",
-    label: "Default",
-    icon: "",
-    color: "blue",
-    description: "Standard permission checking",
-    allowedTools: ["*"],
-    restrictions: {
-      readOnly: false,
-      requireConfirmation: true,
-      bypassValidation: false
-    }
-  },
-  acceptEdits: {
-    name: "acceptEdits",
-    label: "Accept edits",
-    icon: "\u23F5\u23F5",
-    color: "green",
-    description: "Auto-approve edit operations",
-    allowedTools: ["*"],
-    restrictions: {
-      readOnly: false,
-      requireConfirmation: false,
-      bypassValidation: false
-    }
-  },
-  plan: {
-    name: "plan",
-    label: "Plan Mode",
-    icon: "\u23F8",
-    color: "yellow",
-    description: "Research and planning - read-only tools only",
-    allowedTools: [
-      "Read",
-      "Grep",
-      "Glob",
-      "WebSearch",
-      "WebFetch",
-      "AskUserQuestion",
-      "TodoWrite",
-      "Write",
-      "Edit",
-      "ExitPlanMode",
-      "KillShell",
-      "TaskOutput",
-      "ListMcpResourcesTool",
-      "ReadMcpResourceTool",
-      "mcp"
-    ],
-    restrictions: {
-      readOnly: true,
-      requireConfirmation: true,
-      bypassValidation: false
-    }
-  },
-  bypassPermissions: {
-    name: "bypassPermissions",
-    label: "Bypass Permissions",
-    icon: "\u23F5\u23F5",
-    color: "red",
-    description: "All permissions bypassed",
-    allowedTools: ["*"],
-    restrictions: {
-      readOnly: false,
-      requireConfirmation: false,
-      bypassValidation: true
-    }
-  },
-  dontAsk: {
-    name: "dontAsk",
-    label: "Don't Ask",
-    icon: "\u23F5\u23F5",
-    color: "red",
-    description: "Auto-deny permission prompts",
-    allowedTools: ["*"],
-    restrictions: {
-      readOnly: false,
-      requireConfirmation: true,
-      bypassValidation: false
-    }
-  }
-};
-function getNextPermissionMode(currentMode, isBypassAvailable = true) {
-  switch (currentMode) {
-    case "default":
-      return "acceptEdits";
-    case "acceptEdits":
-      return "plan";
-    case "plan":
-      return isBypassAvailable ? "bypassPermissions" : "default";
-    case "bypassPermissions":
-      return "default";
-    case "dontAsk":
-      return "default";
-    default:
-      return "default";
-  }
-}
-
 // apps/cli/src/ui/contexts/permissionModeSideEffects.ts
 function __applyPermissionModeSideEffectsForTests(args) {
   const now = args.now ?? Date.now;
@@ -1391,7 +1300,7 @@ import * as React8 from "react";
 import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
 import { useMemo as useMemo6 } from "react";
 import { Box as Box7, Text as Text7 } from "ink";
-import { extname as extname2, relative as relative2 } from "path";
+import { extname as extname2 } from "path";
 import figures2 from "figures";
 import wrapAnsi from "wrap-ansi";
 import { highlight, supportsLanguage } from "cli-highlight";
@@ -1511,7 +1420,7 @@ function FileWriteToolDiff({
   );
   const topIndicator = window.showUpIndicator ? `${figures2.arrowUp} More` : " ";
   const bottomIndicator = window.showDownIndicator ? `${figures2.arrowDown} More` : " ";
-  return /* @__PURE__ */ React8.createElement(Box7, { flexDirection: "column" }, /* @__PURE__ */ React8.createElement(Text7, { bold: true, wrap: "truncate-end" }, verbose ? file_path : relative2(getCwd(), file_path)), enableScrolling ? /* @__PURE__ */ React8.createElement(Text7, { dimColor: true, wrap: "truncate-end" }, "PgUp/PgDn scroll \xB7 Home/End") : null, /* @__PURE__ */ React8.createElement(Box7, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React8.createElement(Text7, { dimColor: true, wrap: "truncate-end" }, topIndicator), previewLines.slice(window.start, window.end).map((line, idx) => /* @__PURE__ */ React8.createElement(Box7, { key: `${window.start + idx}` }, line)), /* @__PURE__ */ React8.createElement(Text7, { dimColor: true, wrap: "truncate-end" }, bottomIndicator)));
+  return /* @__PURE__ */ React8.createElement(Box7, { flexDirection: "column" }, /* @__PURE__ */ React8.createElement(Text7, { bold: true, wrap: "truncate-end" }, file_path), enableScrolling ? /* @__PURE__ */ React8.createElement(Text7, { dimColor: true, wrap: "truncate-end" }, "PgUp/PgDn scroll \xB7 Home/End") : null, /* @__PURE__ */ React8.createElement(Box7, { flexDirection: "column", width: "100%" }, /* @__PURE__ */ React8.createElement(Text7, { dimColor: true, wrap: "truncate-end" }, topIndicator), previewLines.slice(window.start, window.end).map((line, idx) => /* @__PURE__ */ React8.createElement(Box7, { key: `${window.start + idx}` }, line)), /* @__PURE__ */ React8.createElement(Text7, { dimColor: true, wrap: "truncate-end" }, bottomIndicator)));
 }
 
 // apps/cli/src/ui/components/permissions/FileWritePermissionRequest/FileWritePermissionRequest.tsx
@@ -3489,10 +3398,14 @@ function useStatusLine(input) {
     };
     tick().catch(() => {
     });
+    const intervalId = setInterval(() => {
+      tickRef.current?.();
+    }, 1e3);
     return () => {
       alive = false;
       abortRef.current?.abort();
       tickRef.current = null;
+      clearInterval(intervalId);
     };
   }, []);
   return state;
@@ -4884,25 +4797,19 @@ function useUnifiedCompletionNavigationKeys(args) {
   useKeypress(
     (inputChar, key) => {
       if (!args.isEnabled) return false;
-      const preferHistoryNavigation = !args.input.includes("\n") && !key.ctrl && !key.meta;
+      const preferHistoryNavigation = !args.state.isActive && !args.input.includes("\n") && !key.ctrl && !key.meta;
       if (preferHistoryNavigation && (key.upArrow || key.downArrow)) {
         return false;
       }
       if (key.return && !key.shift && !key.meta && args.state.isActive && args.state.suggestions.length > 0) {
-        const selectedSuggestion = args.state.suggestions[args.state.selectedIndex];
-        if (selectedSuggestion && args.state.context) {
-          const preview = getPreviewText(selectedSuggestion, args.state.context);
-          const isDirectory = selectedSuggestion.value.endsWith("/");
-          const completion = `${preview}${isDirectory ? "" : " "}`;
-          const currentWord = args.input.slice(args.state.context.startPos);
-          const nextSpaceIndex = currentWord.indexOf(" ");
-          const actualEndPos = nextSpaceIndex === -1 ? args.input.length : args.state.context.startPos + nextSpaceIndex;
-          const newInput = args.input.slice(0, args.state.context.startPos) + completion + args.input.slice(actualEndPos);
-          args.onInputChange(newInput);
-          args.setCursorOffset(args.state.context.startPos + completion.length);
+        if (args.state.preview?.isActive && args.state.context) {
+          args.onInputChange(args.state.preview.originalInput);
+          args.setCursorOffset(
+            args.state.context.startPos + args.state.context.prefix.length
+          );
         }
         args.resetCompletion();
-        return true;
+        return false;
       }
       if (!args.state.isActive || args.state.suggestions.length === 0)
         return false;
@@ -5239,6 +5146,9 @@ function getPromptInputSpecialKeyAction(args) {
   if (args.inputChar === "\xA9" || optionOrMeta && (args.inputChar === "g" || args.inputChar === "G")) {
     return "externalEditor";
   }
+  if (args.inputChar === "\xF7" || optionOrMeta && args.inputChar === "/" || args.key.tab && optionOrMeta && !args.key.shift) {
+    return "bashModeToggle";
+  }
   return null;
 }
 
@@ -5314,7 +5224,8 @@ function UserBashInputMessage({
   if (!input) {
     return null;
   }
-  return /* @__PURE__ */ React20.createElement(Box18, { flexDirection: "column", marginTop: addMargin ? 1 : 0, width: "100%" }, /* @__PURE__ */ React20.createElement(Box18, null, /* @__PURE__ */ React20.createElement(Text18, { color: getTheme().bashBorder }, "!"), /* @__PURE__ */ React20.createElement(Text18, { color: getTheme().secondaryText }, " ", input)));
+  const theme = getTheme();
+  return /* @__PURE__ */ React20.createElement(Box18, { flexDirection: "column", marginTop: addMargin ? 1 : 0, width: "100%" }, /* @__PURE__ */ React20.createElement(Box18, null, /* @__PURE__ */ React20.createElement(Text18, { color: theme.bashBorder, bold: true }, "$"), /* @__PURE__ */ React20.createElement(Text18, { bold: true }, " ", input)));
 }
 
 // apps/cli/src/ui/components/messages/UserBackgroundTaskInputMessage.tsx
@@ -5502,7 +5413,7 @@ async function processUserInput(input, mode, setToolJSX, context, pastedImages)
             type: "text"
           }
         }
-      ), /* @__PURE__ */ React22.createElement(Spinner, null)),
+      ), /* @__PURE__ */ React22.createElement(BashSpinner, null)),
       shouldHidePromptInput: false
     });
     try {
@@ -5623,12 +5534,12 @@ async function processUserInput(input, mode, setToolJSX, context, pastedImages)
 ${input}` : input;
   if (processedInput.includes("!`") || processedInput.includes("@")) {
     try {
-      const { executeBashCommands } = await import("./customCommands-FA6HRXXV.js");
+      const { executeBashCommands } = await import("./customCommands-S6YGRUED.js");
       if (processedInput.includes("!`")) {
         processedInput = await executeBashCommands(processedInput);
       }
       if (processedInput.includes("@")) {
-        const { processMentions } = await import("./mentionProcessor-VV6DN2LJ.js");
+        const { processMentions } = await import("./mentionProcessor-HH4EF7BE.js");
         await processMentions(processedInput);
       }
     } catch (error) {
@@ -5809,7 +5720,7 @@ function extractMessageText(content) {
 }
 async function interpretHashCommand(input) {
   try {
-    const { queryQuick } = await import("./llm-C4F2Q7I2.js");
+    const { queryQuick } = await import("./llm-PONI6QWH.js");
     const systemPrompt = [
       "You're helping the user structure notes that will be added to their AGENTS.md file.",
       "Format the user's input into a well-structured note that will be useful for later reference.",
@@ -5972,6 +5883,11 @@ async function submitPrompt(args) {
   }
 }
 
+// apps/cli/src/ui/components/PromptInput/types.ts
+function toggleBashMode(current) {
+  return current === "bash" ? "prompt" : "bash";
+}
+
 // apps/cli/src/ui/components/PromptInput/PromptInputView.tsx
 import { Box as Box26, Text as Text25 } from "ink";
 import * as React29 from "react";
@@ -5980,72 +5896,77 @@ import * as React29 from "react";
 import React23 from "react";
 import { Box as Box21, Text as Text20 } from "ink";
 function __getModeIndicatorDisplayForTests(args) {
-  if (args.mode === "default") {
-    return {
-      shouldRender: false,
-      color: args.theme.text,
-      mainText: "",
-      shortcutHintText: ""
-    };
-  }
-  const icon = getModeIndicatorIcon(args.mode);
-  const label = getModeIndicatorLabel(args.mode).toLowerCase();
-  const color = getModeIndicatorColor(args.theme, args.mode);
+  const normalized = normalizePermissionMode(args.mode);
+  const icon = getModeIndicatorIcon(normalized);
+  const label = getModeIndicatorLabel(normalized).toLowerCase();
+  const color = getModeIndicatorColor(args.theme, normalized);
   return {
     shouldRender: true,
     color,
-    mainText: `${icon} ${label} on`,
+    mainText: icon ? `${icon} ${label} mode` : `${label} mode`,
     shortcutHintText: ` (${args.shortcutDisplayText} to cycle)`
   };
 }
 function getModeIndicatorLabel(mode) {
-  switch (mode) {
-    case "default":
-      return "Default";
+  switch (normalizePermissionMode(mode)) {
+    case "yolo":
+      return "YOLO";
+    case "cautious":
+      return "Ask";
     case "plan":
-      return "Plan Mode";
+      return "Plan";
     case "acceptEdits":
-      return "Accept edits";
+      return "Accept Edits";
     case "bypassPermissions":
-      return "Bypass Permissions";
+      return "Bypass";
     case "dontAsk":
       return "Don't Ask";
+    default:
+      return "Unknown";
   }
 }
 function getModeIndicatorIcon(mode) {
-  switch (mode) {
-    case "default":
+  switch (normalizePermissionMode(mode)) {
+    case "yolo":
       return "";
+    case "cautious":
+      return "??";
     case "plan":
-      return "\u23F8";
+      return "||";
     case "acceptEdits":
+      return ">>";
     case "bypassPermissions":
+      return "\u{1F680}";
     case "dontAsk":
-      return "\u23F5\u23F5";
+      return "X";
+    default:
+      return "";
   }
 }
 function getModeIndicatorColor(theme, mode) {
-  switch (mode) {
-    case "default":
-      return theme.text;
+  switch (normalizePermissionMode(mode)) {
+    case "yolo":
+      return theme.secondaryText;
+    case "cautious":
+      return theme.warning;
     case "plan":
-      return theme.planMode;
+      return theme.success;
     case "acceptEdits":
       return theme.autoAccept;
     case "bypassPermissions":
     case "dontAsk":
       return theme.error;
+    default:
+      return theme.secondaryText;
   }
 }
 function CompactModeIndicator() {
   const { currentMode } = usePermissionContext();
   const theme = getTheme();
   const shortcut = getPermissionModeCycleShortcut();
-  if (currentMode === "default") {
-    return null;
-  }
+  const normalized = normalizePermissionMode(currentMode);
   const indicator = __getModeIndicatorDisplayForTests({
-    mode: currentMode,
+    mode: normalized,
     shortcutDisplayText: shortcut.displayText,
     theme
   });
@@ -6104,11 +6025,12 @@ var SuggestionItem = React26.memo(
     return /* @__PURE__ */ React26.createElement(Box23, { flexDirection: "row" }, /* @__PURE__ */ React26.createElement(
       Text22,
       {
+        bold: true,
         color: displayColor,
         dimColor: !isSelected && !displayColor,
         wrap: "truncate-end"
       },
-      isSelected ? "\u25C6 " : "  ",
+      isSelected ? "> " : "  ",
       suggestion.displayValue
     ));
   },
@@ -6454,7 +6376,7 @@ function PromptInputView({
       borderRight: false,
       borderColor: mode === "bash" || mode === "background" ? theme.bashBorder : mode === "koding" ? theme.notingBorder : theme.inputBorder,
       borderDimColor: false,
-      borderStyle: "classic",
+      borderStyle: "single",
       width: "100%"
     },
     /* @__PURE__ */ React29.createElement(
@@ -6464,9 +6386,9 @@ function PromptInputView({
         alignSelf: "flex-start",
         flexWrap: "nowrap",
         justifyContent: "flex-start",
-        width: 3
+        width: 2
       },
-      mode === "bash" ? /* @__PURE__ */ React29.createElement(Text25, { color: theme.bashBorder }, "\xA0!\xA0") : mode === "background" ? /* @__PURE__ */ React29.createElement(Text25, { color: theme.bashBorder }, "\xA0&\xA0") : mode === "koding" ? /* @__PURE__ */ React29.createElement(Text25, { color: theme.noting }, "\xA0#\xA0") : /* @__PURE__ */ React29.createElement(Text25, { color: isLoading ? theme.secondaryText : void 0 }, "K>\xA0")
+      mode === "bash" ? /* @__PURE__ */ React29.createElement(Text25, { color: theme.bashBorder }, "$\xA0") : mode === "background" ? /* @__PURE__ */ React29.createElement(Text25, { color: theme.bashBorder }, "&\xA0") : mode === "koding" ? /* @__PURE__ */ React29.createElement(Text25, { color: theme.noting }, "#\xA0") : /* @__PURE__ */ React29.createElement(Text25, { color: isLoading ? theme.secondaryText : void 0 }, "\u276F", "\xA0")
     ),
     /* @__PURE__ */ React29.createElement(Box26, { paddingRight: 1 }, /* @__PURE__ */ React29.createElement(
       TextInput,
@@ -6600,18 +6522,6 @@ function exit() {
   setTerminalTitle("");
   process.exit(0);
 }
-function toPromptMode(value) {
-  if (value.startsWith("!")) return { mode: "bash", text: value.slice(1) };
-  if (value.startsWith("&")) return { mode: "background", text: value.slice(1) };
-  if (value.startsWith("#")) return { mode: "koding", text: value.slice(1) };
-  return { mode: "prompt", text: value };
-}
-function __adjustCursorOffsetForPromptPrefixForTests(args) {
-  if (args.nextText === args.value) return args.previousOffset;
-  const removedChars = Math.max(0, args.value.length - args.nextText.length);
-  if (removedChars === 0) return args.previousOffset;
-  return Math.max(0, args.previousOffset - removedChars);
-}
 function PromptInput({
   commands,
   forkNumber,
@@ -6714,18 +6624,21 @@ function PromptInput({
   const onChange = useCallback14(
     (value) => {
       onHistoryUserInputRef.current();
-      const next = toPromptMode(value);
-      if (next.mode !== mode) onModeChange(next.mode);
-      onInputChange(next.text);
-      if (next.text !== value) {
-        setCursorOffset(
-          (prev) => __adjustCursorOffsetForPromptPrefixForTests({
-            value,
-            nextText: next.text,
-            previousOffset: prev
-          })
-        );
+      if (mode === "prompt") {
+        if (value.startsWith("!") || value.startsWith("$")) {
+          onModeChange("bash");
+          return;
+        }
+        if (value.startsWith("&")) {
+          onModeChange("background");
+          return;
+        }
+        if (value.startsWith("#")) {
+          onModeChange("koding");
+          return;
+        }
       }
+      onInputChange(value);
     },
     [mode, onInputChange, onModeChange]
   );
@@ -6849,7 +6762,7 @@ function PromptInput({
     if (editorMode === "vim" && vimMode === "INSERT") {
       parts.push("-- INSERT --");
     } else if (mode === "bash") {
-      parts.push("! bash");
+      parts.push("$ bash");
     } else if (mode === "background") {
       parts.push("& background");
     } else if (mode === "koding") {
@@ -7108,21 +7021,34 @@ function PromptInput({
     })
   });
   onHistoryUserInputRef.current = onUserInput;
-  const hasShownHistorySearchHintRef = useRef7(false);
+  const historyHintTimeoutRef = useRef7(null);
+  const lastHistoryHintTimeRef = useRef7(0);
   useEffect17(() => {
-    if (hasShownHistorySearchHintRef.current) return;
     if (historyIndex < 2) return;
-    hasShownHistorySearchHintRef.current = true;
+    const now = Date.now();
+    if (now - lastHistoryHintTimeRef.current < 1e4) return;
+    if (historyHintTimeoutRef.current) {
+      clearTimeout(historyHintTimeoutRef.current);
+      historyHintTimeoutRef.current = null;
+    }
+    lastHistoryHintTimeRef.current = now;
     handleInlineMessage(true, "Tip: Ctrl+R to search history");
-    const timeoutId = setTimeout(() => {
+    historyHintTimeoutRef.current = setTimeout(() => {
       setMessage((prev) => {
         if (!prev.show) return prev;
         if (prev.text !== "Tip: Ctrl+R to search history") return prev;
         return { show: false };
       });
-    }, 3e3);
-    return () => clearTimeout(timeoutId);
+      historyHintTimeoutRef.current = null;
+    }, 5e3);
   }, [handleInlineMessage, historyIndex]);
+  useEffect17(() => {
+    return () => {
+      if (historyHintTimeoutRef.current) {
+        clearTimeout(historyHintTimeoutRef.current);
+      }
+    };
+  }, []);
   const handleHistoryUp = () => {
     if (completionActive) resetCompletion();
     onHistoryUp();
@@ -7164,6 +7090,10 @@ function PromptInput({
         cycleMode();
         return true;
       }
+      if (action === "bashModeToggle") {
+        onModeChange(toggleBashMode(mode));
+        return true;
+      }
       if (action === "modelSwitch") {
         handleQuickModelSwitch();
         return true;
@@ -7238,8 +7168,10 @@ function PromptInput({
       handleQuickModelSwitch,
       isEditingExternally,
       isLoading,
+      mode,
       modeCycleShortcut,
       onInputChange,
+      onModeChange,
       input,
       textInputColumns,
       vimMode
@@ -7486,16 +7418,9 @@ function PromptInput({
         setCursorOffset(snapshot.cursorOffset);
         return true;
       }
-      if ((mode === "bash" || mode === "background") && (key.backspace || key.delete)) {
-        if (input === "") onModeChange("prompt");
-        return;
-      }
-      if (mode === "koding" && (key.backspace || key.delete)) {
-        if (input === "") onModeChange("prompt");
-        return;
-      }
-      if (inputChar === "" && (key.escape || key.backspace || key.delete)) {
+      if ((mode === "bash" || mode === "background" || mode === "koding") && input === "" && (key.backspace || key.delete || key.escape)) {
         onModeChange("prompt");
+        return true;
       }
       if (key.escape && !isLoading && mode === "prompt" && !completionVisible && input.length === 0 && pastedTexts.length === 0 && pastedImages.length === 0) {
         setClearInputPending(false);
@@ -7566,38 +7491,66 @@ var PromptInput_default = memo2(PromptInput);
 
 // apps/cli/src/ui/components/RequestStatusIndicator.tsx
 import { Box as Box27, Text as Text26 } from "ink";
-import React31, { useEffect as useEffect18, useMemo as useMemo18, useRef as useRef8, useState as useState16 } from "react";
-var CHARACTERS = process.platform === "darwin" ? ["\xB7", "\u2722", "\u2733", "\u2217", "\u273B", "\u273D"] : ["\xB7", "\u2722", "*", "\u2217", "\u273B", "\u273D"];
+import React31, { useEffect as useEffect18, useRef as useRef8, useState as useState16 } from "react";
+var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 function getLabel(status) {
   switch (status.kind) {
     case "thinking":
-      return "Thinking";
+      return "Prefilling";
     case "streaming":
-      return "Streaming";
-    case "tool":
-      return status.detail ? `Running tool: ${status.detail}` : "Running tool";
-    case "idle":
-      return "Working";
+      return "Decoding";
+    default:
+      return "";
   }
 }
+function formatDuration(seconds) {
+  if (seconds < 60) {
+    return `${seconds}s`;
+  }
+  if (seconds < 3600) {
+    const minutes2 = Math.floor(seconds / 60);
+    const secs2 = seconds % 60;
+    return `${minutes2}m ${secs2}s`;
+  }
+  const hours = Math.floor(seconds / 3600);
+  const minutes = Math.floor(seconds % 3600 / 60);
+  const secs = seconds % 60;
+  return `${hours}h ${minutes}m ${secs}s`;
+}
+function formatTokens(tokens) {
+  if (tokens >= 1e3) {
+    return `${(tokens / 1e3).toFixed(1)}k`;
+  }
+  return tokens.toString();
+}
+function getTokenDisplay(status) {
+  if (status.kind === "thinking" && status.inputTokens) {
+    return ` \xB7 \u2191 ${formatTokens(status.inputTokens)}`;
+  }
+  if (status.kind === "streaming" && status.outputTokens !== void 0) {
+    return ` \xB7 \u2193 ${formatTokens(status.outputTokens)}`;
+  }
+  return "";
+}
 function RequestStatusIndicator() {
-  const frames = useMemo18(
-    () => [...CHARACTERS, ...[...CHARACTERS].reverse()],
-    []
-  );
+  const frames = SPINNER_FRAMES;
   const theme = getTheme();
   const [frame, setFrame] = useState16(0);
   const [elapsedTime, setElapsedTime] = useState16(0);
   const [status, setStatus] = useState16(() => getRequestStatus());
-  const requestStartTime = useRef8(null);
+  const requestStartTime = useRef8(Date.now());
   useEffect18(() => {
+    const initialStatus = getRequestStatus();
+    if (initialStatus.kind !== "idle") {
+      requestStartTime.current = Date.now();
+    }
     return subscribeRequestStatus((next) => {
       setStatus(next);
-      if (next.kind !== "idle" && requestStartTime.current === null) {
-        requestStartTime.current = Date.now();
+      if (next.kind !== "idle") {
+        setElapsedTime(Math.floor((Date.now() - requestStartTime.current) / 1e3));
       }
       if (next.kind === "idle") {
-        requestStartTime.current = null;
+        requestStartTime.current = Date.now();
         setElapsedTime(0);
       }
     });
@@ -7605,20 +7558,19 @@ function RequestStatusIndicator() {
   useEffect18(() => {
     const timer = setInterval(() => {
       setFrame((f) => (f + 1) % frames.length);
-    }, 120);
+    }, 80);
     return () => clearInterval(timer);
   }, [frames.length]);
   useEffect18(() => {
     const timer = setInterval(() => {
-      if (requestStartTime.current === null) {
-        setElapsedTime(0);
-        return;
-      }
       setElapsedTime(Math.floor((Date.now() - requestStartTime.current) / 1e3));
-    }, 250);
+    }, 1e3);
     return () => clearInterval(timer);
   }, []);
-  return /* @__PURE__ */ React31.createElement(Box27, { flexDirection: "row", marginTop: 1 }, /* @__PURE__ */ React31.createElement(Box27, { flexWrap: "nowrap", height: 1, width: 2 }, /* @__PURE__ */ React31.createElement(Text26, { color: theme.kode }, frames[frame])), /* @__PURE__ */ React31.createElement(Text26, { color: theme.kode }, getLabel(status), "\u2026 "), /* @__PURE__ */ React31.createElement(Text26, { color: theme.secondaryText }, "(", elapsedTime, "s \xB7 ", /* @__PURE__ */ React31.createElement(Text26, { bold: true }, "esc"), " to interrupt)"));
+  if (status.kind === "tool" || status.kind === "idle") {
+    return null;
+  }
+  return /* @__PURE__ */ React31.createElement(Box27, { flexDirection: "row", marginTop: 1 }, /* @__PURE__ */ React31.createElement(Text26, { color: theme.kode, bold: true }, frames[frame], " ", getLabel(status)), /* @__PURE__ */ React31.createElement(Text26, { color: theme.secondaryText }, " ", ":: ", formatDuration(elapsedTime), " (Esc to interrupt)", getTokenDisplay(status)));
 }
 
 // apps/cli/src/ui/components/CostThresholdDialog.tsx
@@ -7687,7 +7639,7 @@ import { default as React68, useCallback as useCallback16 } from "react";
 import chalk10 from "chalk";
 import { Box as Box51, Text as Text54 } from "ink";
 import Link2 from "ink-link";
-import React67, { useState as useState19 } from "react";
+import React67, { useState as useState20 } from "react";
 
 // apps/cli/src/ui/components/Message.tsx
 import { Box as Box49 } from "ink";
@@ -7726,7 +7678,7 @@ function FallbackToolUseRejectedMessage() {
 }
 
 // apps/cli/src/ui/components/messages/UserToolResultMessage/utils.tsx
-import { useMemo as useMemo19 } from "react";
+import { useMemo as useMemo18 } from "react";
 function asRecord3(value) {
   if (!value || typeof value !== "object") return null;
   if (Array.isArray(value)) return null;
@@ -7759,7 +7711,7 @@ function getToolUseFromMessages(toolUseID, messages) {
   return toolUse;
 }
 function useGetToolFromMessages(toolUseID, tools, messages) {
-  return useMemo19(() => {
+  return useMemo18(() => {
     const toolUse = getToolUseFromMessages(toolUseID, messages);
     if (!toolUse) {
       throw new ReferenceError(
@@ -7846,7 +7798,7 @@ function renderTaskOutputToolResultMessage(output, { verbose }) {
 import { Box as Box35, Text as Text37 } from "ink";
 import * as React42 from "react";
 import { readFileSync as readFileSync4 } from "fs";
-import { isAbsolute, relative as relative4, resolve as resolve3 } from "path";
+import { isAbsolute, resolve as resolve3 } from "path";
 
 // apps/cli/src/ui/components/FileEditToolUpdatedMessage.tsx
 import { Box as Box34, Text as Text36 } from "ink";
@@ -7858,7 +7810,6 @@ function intersperse(as, separator) {
 }
 
 // apps/cli/src/ui/components/FileEditToolUpdatedMessage.tsx
-import { relative as relative3 } from "path";
 var MAX_HUNKS_TO_RENDER = 4;
 var MAX_DIFF_LINES_TO_RENDER = 200;
 function truncateHunks(hunks) {
@@ -7909,7 +7860,7 @@ function FileEditToolUpdatedMessage({
     0
   );
   const diff = React41.useMemo(() => truncateHunks(patches), [patches]);
-  return /* @__PURE__ */ React41.createElement(Box34, { flexDirection: "column" }, /* @__PURE__ */ React41.createElement(Text36, null, "  ", "\u23BF Updated", " ", /* @__PURE__ */ React41.createElement(Text36, { bold: true }, verbose ? filePath : relative3(getCwd(), filePath)), numAdditions > 0 || numRemovals > 0 ? " with " : "", numAdditions > 0 ? /* @__PURE__ */ React41.createElement(React41.Fragment, null, /* @__PURE__ */ React41.createElement(Text36, { bold: true }, numAdditions), " ", numAdditions > 1 ? "additions" : "addition") : null, numAdditions > 0 && numRemovals > 0 ? " and " : null, numRemovals > 0 ? /* @__PURE__ */ React41.createElement(React41.Fragment, null, /* @__PURE__ */ React41.createElement(Text36, { bold: true }, numRemovals), " ", numRemovals > 1 ? "removals" : "removal") : null), verbose && diff.hunks.length > 0 && intersperse(
+  return /* @__PURE__ */ React41.createElement(Box34, { flexDirection: "column" }, /* @__PURE__ */ React41.createElement(Text36, null, "  ", "\u23BF Updated ", /* @__PURE__ */ React41.createElement(Text36, { bold: true }, filePath), numAdditions > 0 || numRemovals > 0 ? " with " : "", numAdditions > 0 ? /* @__PURE__ */ React41.createElement(React41.Fragment, null, /* @__PURE__ */ React41.createElement(Text36, { bold: true }, numAdditions), " ", numAdditions > 1 ? "additions" : "addition") : null, numAdditions > 0 && numRemovals > 0 ? " and " : null, numRemovals > 0 ? /* @__PURE__ */ React41.createElement(React41.Fragment, null, /* @__PURE__ */ React41.createElement(Text36, { bold: true }, numRemovals), " ", numRemovals > 1 ? "removals" : "removal") : null), verbose && diff.hunks.length > 0 && intersperse(
     diff.hunks.map((_) => /* @__PURE__ */ React41.createElement(Box34, { flexDirection: "column", paddingLeft: 5, key: _.newStart }, /* @__PURE__ */ React41.createElement(StructuredDiff, { patch: _, dim: false, width: columns - 12 }))),
     (i) => /* @__PURE__ */ React41.createElement(Box34, { paddingLeft: 5, key: `ellipsis-${i}` }, /* @__PURE__ */ React41.createElement(Text36, { color: getTheme().secondaryText }, "..."))
   ), verbose && diff.hiddenLines > 0 && /* @__PURE__ */ React41.createElement(Box34, { paddingLeft: 5, marginTop: 1 }, /* @__PURE__ */ React41.createElement(Text36, { color: getTheme().secondaryText }, "... (+", diff.hiddenLines, " more diff lines hidden)")));
@@ -7963,7 +7914,7 @@ function renderFileEditToolUseRejectedMessage(input = {}, options = {
       oldStr: originalFile,
       newStr: updatedFile
     });
-    return /* @__PURE__ */ React42.createElement(Box35, { flexDirection: "column" }, /* @__PURE__ */ React42.createElement(Text37, null, "  ", "\u23BF", " ", /* @__PURE__ */ React42.createElement(Text37, { color: getTheme().error }, "User rejected ", old_string === "" ? "write" : "update", " to", " "), /* @__PURE__ */ React42.createElement(Text37, { bold: true }, verbose ? file_path : relative4(getCwd(), file_path))), intersperse(
+    return /* @__PURE__ */ React42.createElement(Box35, { flexDirection: "column" }, /* @__PURE__ */ React42.createElement(Text37, null, "  ", "\u23BF", " ", /* @__PURE__ */ React42.createElement(Text37, { color: getTheme().error }, "User rejected ", old_string === "" ? "write" : "update", " to", " "), /* @__PURE__ */ React42.createElement(Text37, { bold: true }, fullFilePath)), intersperse(
       patch.map((patch2) => /* @__PURE__ */ React42.createElement(Box35, { flexDirection: "column", paddingLeft: 5, key: patch2.newStart }, /* @__PURE__ */ React42.createElement(StructuredDiff, { patch: patch2, dim: true, width: columns - 12 }))),
       (i) => /* @__PURE__ */ React42.createElement(Box35, { paddingLeft: 5, key: `ellipsis-${i}` }, /* @__PURE__ */ React42.createElement(Text37, { color: getTheme().secondaryText }, "..."))
     ));
@@ -7978,14 +7929,14 @@ import { Box as Box36, Text as Text39 } from "ink";
 import * as React44 from "react";
 import { readFileSync as readFileSync5 } from "fs";
 import { EOL } from "os";
-import { extname as extname4, isAbsolute as isAbsolute2, relative as relative5, resolve as resolve4 } from "path";
+import { extname as extname4, isAbsolute as isAbsolute2, relative as relative3, resolve as resolve4 } from "path";
 
 // apps/cli/src/ui/components/HighlightedCode.tsx
 import { highlight as highlight2, supportsLanguage as supportsLanguage2 } from "cli-highlight";
 import { Text as Text38 } from "ink";
-import React43, { useMemo as useMemo21 } from "react";
+import React43, { useMemo as useMemo20 } from "react";
 function HighlightedCode({ code, language }) {
-  const highlightedCode = useMemo21(() => {
+  const highlightedCode = useMemo20(() => {
     try {
       if (supportsLanguage2(language)) {
         return highlight2(code, { language });
@@ -8015,7 +7966,7 @@ function renderFileWriteToolResultMessage(output, options) {
     case "create": {
       const contentWithFallback = output.content || "(No content)";
       const numLines = output.content.split(EOL).length;
-      return /* @__PURE__ */ React44.createElement(Box36, { flexDirection: "column" }, /* @__PURE__ */ React44.createElement(Text39, null, "  ", "\u23BF Wrote ", numLines, " lines to", " ", /* @__PURE__ */ React44.createElement(Text39, { bold: true }, verbose ? output.filePath : relative5(getCwd(), output.filePath))), /* @__PURE__ */ React44.createElement(Box36, { flexDirection: "column", paddingLeft: 5 }, /* @__PURE__ */ React44.createElement(
+      return /* @__PURE__ */ React44.createElement(Box36, { flexDirection: "column" }, /* @__PURE__ */ React44.createElement(Text39, null, "  ", "\u23BF Wrote ", numLines, " lines to", " ", /* @__PURE__ */ React44.createElement(Text39, { bold: true }, output.filePath)), /* @__PURE__ */ React44.createElement(Box36, { flexDirection: "column", paddingLeft: 5 }, /* @__PURE__ */ React44.createElement(
         HighlightedCode,
         {
           code: verbose ? contentWithFallback : contentWithFallback.split("\n").slice(0, MAX_LINES_TO_RENDER).filter((_) => _.trim() !== "").join("\n"),
@@ -8055,7 +8006,7 @@ function renderFileWriteToolUseRejectedMessage(input = {}, options = {
       oldStr: oldContent ?? "",
       newStr: content ?? ""
     });
-    return /* @__PURE__ */ React44.createElement(Box36, { flexDirection: "column" }, /* @__PURE__ */ React44.createElement(Text39, null, "  ", "\u23BF", " ", /* @__PURE__ */ React44.createElement(Text39, { color: getTheme().error }, "User rejected ", type === "update" ? "update" : "write", " to", " "), /* @__PURE__ */ React44.createElement(Text39, { bold: true }, verbose ? file_path : relative5(getCwd(), file_path))), intersperse(
+    return /* @__PURE__ */ React44.createElement(Box36, { flexDirection: "column" }, /* @__PURE__ */ React44.createElement(Text39, null, "  ", "\u23BF", " ", /* @__PURE__ */ React44.createElement(Text39, { color: getTheme().error }, "User rejected ", type === "update" ? "update" : "write", " to", " "), /* @__PURE__ */ React44.createElement(Text39, { bold: true }, verbose ? file_path : relative3(getCwd(), file_path))), intersperse(
       patch.map((_) => /* @__PURE__ */ React44.createElement(Box36, { flexDirection: "column", paddingLeft: 5, key: _.newStart }, /* @__PURE__ */ React44.createElement(StructuredDiff, { patch: _, dim: true, width: columns - 12 }))),
       (i) => /* @__PURE__ */ React44.createElement(Box36, { paddingLeft: 5, key: `ellipsis-${i}` }, /* @__PURE__ */ React44.createElement(Text39, { color: getTheme().secondaryText }, "..."))
     ));
@@ -8234,20 +8185,30 @@ function useInterval(callback, delay) {
 }
 
 // apps/cli/src/ui/components/ToolUseLoader.tsx
+var SPINNER_FRAMES2 = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 function ToolUseLoader({
   isError,
   isUnresolved,
   shouldAnimate
 }) {
-  const [isVisible, setIsVisible] = React49.useState(true);
+  const [frameIndex, setFrameIndex] = React49.useState(0);
   useInterval(() => {
     if (!shouldAnimate) {
       return;
     }
-    setIsVisible((_) => !_);
-  }, 600);
-  const color = isUnresolved ? getTheme().secondaryText : isError ? getTheme().error : getTheme().success;
-  return /* @__PURE__ */ React49.createElement(Box38, { minWidth: 2 }, /* @__PURE__ */ React49.createElement(Text41, { color }, isVisible ? BLACK_CIRCLE : "  "));
+    setFrameIndex((i) => (i + 1) % SPINNER_FRAMES2.length);
+  }, 80);
+  const theme = getTheme();
+  if (shouldAnimate) {
+    return /* @__PURE__ */ React49.createElement(Box38, { minWidth: 2 }, /* @__PURE__ */ React49.createElement(Text41, { color: theme.kode }, SPINNER_FRAMES2[frameIndex], " "));
+  }
+  if (isError) {
+    return /* @__PURE__ */ React49.createElement(Box38, { minWidth: 2 }, /* @__PURE__ */ React49.createElement(Text41, { color: theme.error }, CROSS, " "));
+  }
+  if (isUnresolved) {
+    return /* @__PURE__ */ React49.createElement(Box38, { minWidth: 2 }, /* @__PURE__ */ React49.createElement(Text41, { color: theme.secondaryText }, DIAMOND_HOLLOW, " "));
+  }
+  return /* @__PURE__ */ React49.createElement(Box38, { minWidth: 2 }, /* @__PURE__ */ React49.createElement(Text41, { color: "green" }, CHECKMARK, " "));
 }
 
 // packages/tools/src/tools/ai/ThinkTool/ThinkTool.tsx
@@ -8301,12 +8262,21 @@ var ThinkTool = {
 };
 
 // apps/cli/src/ui/components/messages/AssistantThinkingMessage.tsx
-import React51 from "react";
+import React51, { useState as useState17, useEffect as useEffect20 } from "react";
 import { Box as Box39, Text as Text43 } from "ink";
+var PROGRESS_FRAMES = ["/", "-", "\\", "|"];
 function AssistantThinkingMessage({
   param: { thinking },
   addMargin = false
 }) {
+  const [progressFrame, setProgressFrame] = useState17(0);
+  const theme = getTheme();
+  useEffect20(() => {
+    const timer = setInterval(() => {
+      setProgressFrame((f) => (f + 1) % PROGRESS_FRAMES.length);
+    }, 150);
+    return () => clearInterval(timer);
+  }, []);
   if (!thinking || thinking.trim().length === 0) {
     return null;
   }
@@ -8318,21 +8288,21 @@ function AssistantThinkingMessage({
       marginTop: addMargin ? 1 : 0,
       width: "100%"
     },
-    /* @__PURE__ */ React51.createElement(Text43, { color: getTheme().secondaryText, italic: true }, "\u273B Thinking\u2026"),
-    /* @__PURE__ */ React51.createElement(Box39, { paddingLeft: 2 }, /* @__PURE__ */ React51.createElement(Text43, { color: getTheme().secondaryText, italic: true }, applyMarkdown(thinking)))
+    /* @__PURE__ */ React51.createElement(Text43, { color: theme.kode, bold: true }, "\u25C6", " [Thinking ", PROGRESS_FRAMES[progressFrame], "]"),
+    /* @__PURE__ */ React51.createElement(Box39, { paddingLeft: 2 }, /* @__PURE__ */ React51.createElement(Text43, { color: theme.secondaryText, italic: true }, applyMarkdown(thinking)))
   );
 }
 
 // apps/cli/src/ui/components/messages/TaskToolMessage.tsx
-import React52, { useEffect as useEffect20, useState as useState17, useMemo as useMemo22 } from "react";
+import React52, { useEffect as useEffect21, useState as useState18, useMemo as useMemo21 } from "react";
 import { Text as Text44 } from "ink";
 var agentConfigCache = /* @__PURE__ */ new Map();
 function TaskToolMessage({ agentType, children, bold = true }) {
   const theme = getTheme();
-  const [agentConfig, setAgentConfig] = useState17(() => {
+  const [agentConfig, setAgentConfig] = useState18(() => {
     return agentConfigCache.get(agentType) || null;
   });
-  useEffect20(() => {
+  useEffect21(() => {
     if (agentConfigCache.has(agentType)) {
       setAgentConfig(agentConfigCache.get(agentType));
       return;
@@ -8352,7 +8322,7 @@ function TaskToolMessage({ agentType, children, bold = true }) {
       mounted = false;
     };
   }, [agentType]);
-  const color = useMemo22(() => {
+  const color = useMemo21(() => {
     return agentConfig?.color || theme.text;
   }, [agentConfig?.color, theme.text]);
   return /* @__PURE__ */ React52.createElement(Text44, { color, bold }, children);
@@ -8383,6 +8353,7 @@ function AssistantToolUseMessage({
   shouldAnimate,
   shouldShowDot
 }) {
+  const theme = getTheme();
   const resolvedName = resolveToolNameAlias(param.name).resolvedName;
   const tool = tools.find((_) => _.name === resolvedName);
   if (!tool) {
@@ -8390,7 +8361,8 @@ function AssistantToolUseMessage({
     return null;
   }
   const isQueued = !inProgressToolUseIDs.has(param.id) && unresolvedToolUseIDs.has(param.id);
-  const color = isQueued ? getTheme().secondaryText : void 0;
+  const isError = erroredToolUseIDs.has(param.id);
+  const isInProgress = inProgressToolUseIDs.has(param.id);
   if (tool === ThinkTool) {
     const { thought } = ThinkTool.inputSchema.parse(param.input);
     return /* @__PURE__ */ React53.createElement(
@@ -8410,6 +8382,8 @@ function AssistantToolUseMessage({
   if (!hasToolName && !hasToolMessage) {
     return null;
   }
+  const toolNameColor = isQueued ? theme.secondaryText : isError ? theme.error : theme.kode;
+  const paramColor = theme.secondaryText;
   return /* @__PURE__ */ React53.createElement(
     Box40,
     {
@@ -8418,39 +8392,31 @@ function AssistantToolUseMessage({
       marginTop: addMargin ? 1 : 0,
       width: "100%"
     },
-    /* @__PURE__ */ React53.createElement(Box40, null, /* @__PURE__ */ React53.createElement(
-      Box40,
+    /* @__PURE__ */ React53.createElement(Box40, null, /* @__PURE__ */ React53.createElement(Box40, { flexWrap: "nowrap" }, shouldShowDot && /* @__PURE__ */ React53.createElement(
+      ToolUseLoader,
       {
-        flexWrap: "nowrap",
-        minWidth: userFacingToolName.length + (shouldShowDot ? 2 : 0)
-      },
-      shouldShowDot && (isQueued ? /* @__PURE__ */ React53.createElement(Box40, { minWidth: 2 }, /* @__PURE__ */ React53.createElement(Text45, { color }, BLACK_CIRCLE)) : /* @__PURE__ */ React53.createElement(
-        ToolUseLoader,
-        {
-          shouldAnimate,
-          isUnresolved: unresolvedToolUseIDs.has(param.id),
-          isError: erroredToolUseIDs.has(param.id)
-        }
-      )),
-      tool.name === "Task" && param.input ? /* @__PURE__ */ React53.createElement(
-        TaskToolMessage,
-        {
-          agentType: parsedInput.success ? getSubagentType(parsedInput.data) ?? "general-purpose" : "general-purpose",
-          bold: Boolean(!isQueued),
-          children: String(userFacingToolName || "")
-        }
-      ) : hasToolName && /* @__PURE__ */ React53.createElement(Text45, { color, bold: !isQueued, wrap: "truncate-end" }, userFacingToolName)
-    ), /* @__PURE__ */ React53.createElement(Box40, { flexWrap: "nowrap" }, hasToolMessage && (() => {
+        shouldAnimate,
+        isUnresolved: unresolvedToolUseIDs.has(param.id),
+        isError
+      }
+    ), tool.name === "Task" && param.input ? /* @__PURE__ */ React53.createElement(
+      TaskToolMessage,
+      {
+        agentType: parsedInput.success ? getSubagentType(parsedInput.data) ?? "general-purpose" : "general-purpose",
+        bold: !isQueued,
+        children: String(userFacingToolName || "")
+      }
+    ) : hasToolName && /* @__PURE__ */ React53.createElement(Text45, { color: toolNameColor, bold: !isQueued, wrap: "truncate-end" }, userFacingToolName)), /* @__PURE__ */ React53.createElement(Box40, { flexWrap: "nowrap" }, hasToolMessage && (() => {
       if (React53.isValidElement(toolMessage)) {
         if (!hasToolName) return toolMessage;
-        return /* @__PURE__ */ React53.createElement(Box40, { flexDirection: "row" }, /* @__PURE__ */ React53.createElement(Text45, { color }, "("), toolMessage, /* @__PURE__ */ React53.createElement(Text45, { color }, ")"));
+        return /* @__PURE__ */ React53.createElement(Box40, { flexDirection: "row" }, /* @__PURE__ */ React53.createElement(Text45, { color: paramColor }, "("), toolMessage, /* @__PURE__ */ React53.createElement(Text45, { color: paramColor }, ")"));
       }
       if (typeof toolMessage !== "string") return null;
       if (!hasToolName) {
-        return /* @__PURE__ */ React53.createElement(Text45, { color, wrap: "truncate-end" }, toolMessage);
+        return /* @__PURE__ */ React53.createElement(Text45, { color: paramColor, wrap: "truncate-end" }, toolMessage);
       }
-      return /* @__PURE__ */ React53.createElement(Text45, { color, wrap: "truncate-end" }, "(", toolMessage, ")");
-    })(), /* @__PURE__ */ React53.createElement(Text45, { color, wrap: "truncate-end" }, "\u2026"))),
+      return /* @__PURE__ */ React53.createElement(Text45, { color: paramColor, wrap: "truncate-end" }, "(", toolMessage, ")");
+    })(), isInProgress && /* @__PURE__ */ React53.createElement(Text45, { color: paramColor, wrap: "truncate-end" }, "..."))),
     /* @__PURE__ */ React53.createElement(Cost, { costUSD, durationMs, debug: debug2 })
   );
 }
@@ -8484,15 +8450,32 @@ function AssistantBashOutputMessage({
 // apps/cli/src/ui/components/messages/AssistantBackgroundTaskOutputMessage.tsx
 import { Box as Box41, Text as Text46 } from "ink";
 import * as React55 from "react";
+var MAX_RENDERED_LINES2 = 5;
+function renderTruncatedContent(lines, maxLines = MAX_RENDERED_LINES2) {
+  if (lines.length <= maxLines) {
+    return { lines, truncated: false, hiddenCount: 0 };
+  }
+  return {
+    lines: lines.slice(-maxLines),
+    truncated: true,
+    hiddenCount: lines.length - maxLines
+  };
+}
 function AssistantBackgroundTaskOutputMessage({
-  content
+  content,
+  verbose = false
 }) {
   const message = extractTag(content, "background-task-output");
   if (!message) {
     return null;
   }
-  const lines = message.split(/\r?\n/);
-  return /* @__PURE__ */ React55.createElement(Box41, { flexDirection: "column" }, lines.map((line, index) => /* @__PURE__ */ React55.createElement(Box41, { key: index, flexDirection: "row" }, /* @__PURE__ */ React55.createElement(Text46, null, "\xA0\xA0\u23BF \xA0", /* @__PURE__ */ React55.createElement(Text46, { color: getTheme().secondaryText }, line)))));
+  const theme = getTheme();
+  const allLines = message.split(/\r?\n/).filter((l) => l.trim().length > 0);
+  if (allLines.length === 0) {
+    return null;
+  }
+  const { lines, truncated, hiddenCount } = verbose ? { lines: allLines, truncated: false, hiddenCount: 0 } : renderTruncatedContent(allLines);
+  return /* @__PURE__ */ React55.createElement(Box41, { flexDirection: "column" }, truncated && /* @__PURE__ */ React55.createElement(Box41, { flexDirection: "row" }, /* @__PURE__ */ React55.createElement(Text46, { color: theme.secondaryText }, "\xA0\xA0\u23BF \xA0... ", hiddenCount, " lines hidden, showing last", " ", MAX_RENDERED_LINES2, " lines")), lines.map((line, index) => /* @__PURE__ */ React55.createElement(Box41, { key: index, flexDirection: "row" }, /* @__PURE__ */ React55.createElement(Text46, null, "\xA0\xA0\u23BF \xA0", /* @__PURE__ */ React55.createElement(Text46, { color: theme.secondaryText }, line)))));
 }
 
 // apps/cli/src/ui/components/messages/AssistantLocalCommandOutputMessage.tsx
@@ -8545,7 +8528,7 @@ import { Box as Box43, Text as Text48 } from "ink";
 
 // apps/cli/src/ui/contexts/TransientViewportContext.tsx
 import * as React57 from "react";
-import { useCallback as useCallback15, useMemo as useMemo23, useRef as useRef10 } from "react";
+import { useCallback as useCallback15, useMemo as useMemo22, useRef as useRef10 } from "react";
 var TransientViewportContext = React57.createContext({});
 function TransientViewportProvider({
   value,
@@ -8621,7 +8604,7 @@ function AssistantTextMessage({
     );
   }
   if (text.startsWith("<background-task-output")) {
-    return /* @__PURE__ */ React58.createElement(AssistantBackgroundTaskOutputMessage, { content: text });
+    return /* @__PURE__ */ React58.createElement(AssistantBackgroundTaskOutputMessage, { content: text, verbose });
   }
   if (text.startsWith("<local-command-stdout") || text.startsWith("<local-command-stderr")) {
     return /* @__PURE__ */ React58.createElement(
@@ -8662,7 +8645,7 @@ function AssistantTextMessage({
           marginTop: addMargin ? 1 : 0,
           width: "100%"
         },
-        /* @__PURE__ */ React58.createElement(Box43, { flexDirection: "row" }, shouldShowDot && /* @__PURE__ */ React58.createElement(Box43, { minWidth: 2 }, /* @__PURE__ */ React58.createElement(Text48, { color: getTheme().text }, BLACK_CIRCLE)), /* @__PURE__ */ React58.createElement(Box43, { flexDirection: "column", width: contentWidth }, maxHeight ? /* @__PURE__ */ React58.createElement(
+        /* @__PURE__ */ React58.createElement(Box43, { flexDirection: "row" }, shouldShowDot && /* @__PURE__ */ React58.createElement(Box43, { minWidth: 2 }, /* @__PURE__ */ React58.createElement(Text48, { color: getTheme().kode }, RECORD_CIRCLE)), /* @__PURE__ */ React58.createElement(Box43, { flexDirection: "column", width: contentWidth }, maxHeight ? /* @__PURE__ */ React58.createElement(
           MaxSizedText,
           {
             text: content,
@@ -8719,7 +8702,7 @@ function UserPromptMessage({
     return null;
   }
   const theme = getTheme();
-  return /* @__PURE__ */ React61.createElement(Box46, { flexDirection: "row", marginTop: addMargin ? 1 : 0, width: "100%" }, /* @__PURE__ */ React61.createElement(Box46, { minWidth: 2, width: 2 }, /* @__PURE__ */ React61.createElement(Text51, { color: theme.kode }, ">")), /* @__PURE__ */ React61.createElement(Box46, { flexDirection: "column", width: columns - 4 }, /* @__PURE__ */ React61.createElement(Text51, { color: theme.kode, wrap: "wrap" }, text)));
+  return /* @__PURE__ */ React61.createElement(Box46, { flexDirection: "row", marginTop: addMargin ? 1 : 0, width: "100%" }, /* @__PURE__ */ React61.createElement(Box46, { minWidth: 2, width: 2 }, /* @__PURE__ */ React61.createElement(Text51, { color: theme.kode, bold: true }, "\u276F")), /* @__PURE__ */ React61.createElement(Box46, { flexDirection: "column", width: columns - 4 }, /* @__PURE__ */ React61.createElement(Text51, { color: theme.kode, bold: true, wrap: "wrap" }, text)));
 }
 
 // apps/cli/src/ui/components/messages/UserTextMessage.tsx
@@ -9060,8 +9043,8 @@ function BinaryFeedbackView({
 }) {
   const theme = getTheme();
   const { rows, columns } = useTerminalSize();
-  const [focused, setFocus] = useState19("no-preference");
-  const [focusValue, setFocusValue] = useState19(void 0);
+  const [focused, setFocus] = useState20("no-preference");
+  const [focusValue, setFocusValue] = useState20(void 0);
   const exitState = useExitOnCtrlCD(() => process.exit(1));
   const panelHeight = Math.max(1, rows - 2);
   useKeypress((_input, key) => {
@@ -9192,7 +9175,7 @@ function BinaryFeedback({
 // apps/cli/src/ui/components/MessageSelector.tsx
 import { Box as Box52, Text as Text55 } from "ink";
 import * as React69 from "react";
-import { useEffect as useEffect21, useMemo as useMemo24, useState as useState20 } from "react";
+import { useEffect as useEffect22, useMemo as useMemo23, useState as useState21 } from "react";
 import figures8 from "figures";
 import { randomUUID } from "crypto";
 var MAX_VISIBLE_MESSAGES = 7;
@@ -9234,7 +9217,7 @@ function MessageSelector({
   onSelect,
   onEscape
 }) {
-  const currentUUID = useMemo24(() => randomUUID(), []);
+  const currentUUID = useMemo23(() => randomUUID(), []);
   const { rows } = useTerminalSize();
   function handleSelect(message) {
     onSelect(message);
@@ -9242,7 +9225,7 @@ function MessageSelector({
   function handleEscape() {
     onEscape();
   }
-  const allItems = useMemo24(() => {
+  const allItems = useMemo23(() => {
     const filtered = messages.filter(
       (message) => message.type === "user" && !isToolResultOnlyMessage(message)
     );
@@ -9251,8 +9234,8 @@ function MessageSelector({
       { ...createUserMessage(""), uuid: currentUUID }
     ];
   }, [messages, currentUUID]);
-  const [selectedIndex, setSelectedIndex] = useState20(allItems.length - 1);
-  useEffect21(() => {
+  const [selectedIndex, setSelectedIndex] = useState21(allItems.length - 1);
+  useEffect22(() => {
     setSelectedIndex((previous) => {
       if (allItems.length === 0) return 0;
       return Math.min(previous, allItems.length - 1);
@@ -9335,11 +9318,11 @@ function MessageSelector({
 
 // apps/cli/src/ui/hooks/useFlickerDetector.ts
 import { measureElement } from "ink";
-import { useCallback as useCallback17, useEffect as useEffect22, useRef as useRef11 } from "react";
+import { useCallback as useCallback17, useEffect as useEffect23, useRef as useRef11 } from "react";
 var MIN_MEASURE_INTERVAL_MS = 100;
 function useFlickerDetector(rootUiRef, terminalHeight, enabled) {
   const lastMeasureRef = useRef11(0);
-  useEffect22(() => {
+  useEffect23(() => {
     if (!enabled) return;
     if (!rootUiRef.current) return;
     if (!Number.isFinite(terminalHeight) || terminalHeight <= 0) return;
@@ -9405,8 +9388,8 @@ function REPLView({
   const hasToolUseConfirm = Boolean(toolUseConfirm);
   const hasBinaryFeedback = Boolean(binaryFeedbackContext);
   const hasToast = Boolean(toast);
-  const [mainControlsHeight, setMainControlsHeight] = useState21(0);
-  const [messageSelectorHeight, setMessageSelectorHeight] = useState21(0);
+  const [mainControlsHeight, setMainControlsHeight] = useState22(0);
+  const [messageSelectorHeight, setMessageSelectorHeight] = useState22(0);
   useLayoutEffect2(() => {
     if (rows <= 0 || columns <= 0) return;
     const measureKey = [
@@ -9459,7 +9442,7 @@ function REPLView({
     1,
     rows - mainControlsHeight - messageSelectorHeight - VIEWPORT_SAFE_MARGIN_ROWS
   );
-  const transientViewportValue = useMemo25(
+  const transientViewportValue = useMemo24(
     () => ({ maxHeight: transientMaxHeight }),
     [transientMaxHeight]
   );
@@ -9469,7 +9452,7 @@ function REPLView({
       conversationKey,
       isBypassPermissionsModeAvailable: !safeMode
     },
-    isFullScreenToolView && toolJSX ? /* @__PURE__ */ React70.createElement(Box53, { ref: rootUiRef, flexDirection: "column", width: "100%" }, toolJSX.jsx) : /* @__PURE__ */ React70.createElement(Box53, { ref: rootUiRef, flexDirection: "column", width: "100%" }, /* @__PURE__ */ React70.createElement(React70.Fragment, { key: `static-messages-${forkNumber}` }, /* @__PURE__ */ React70.createElement(Static, { items: staticItems, children: (item) => item.jsx })), /* @__PURE__ */ React70.createElement(Box53, { flexDirection: "column", width: "100%" }, transientItems.map((item) => item.jsx)), /* @__PURE__ */ React70.createElement(
+    isFullScreenToolView && toolJSX ? /* @__PURE__ */ React70.createElement(Box53, { ref: rootUiRef, flexDirection: "column", width: "100%" }, toolJSX.jsx) : /* @__PURE__ */ React70.createElement(Box53, { ref: rootUiRef, flexDirection: "column", width: "100%" }, /* @__PURE__ */ React70.createElement(Static, { key: `static-${forkNumber}`, items: staticItems }, (item) => item.jsx), /* @__PURE__ */ React70.createElement(Box53, { flexDirection: "column", width: "100%" }, transientItems.map((item) => item.jsx), !toolJSX && !toolUseConfirm && !binaryFeedbackContext && isLoading && /* @__PURE__ */ React70.createElement(RequestStatusIndicator, null)), /* @__PURE__ */ React70.createElement(
       Box53,
       {
         ref: mainControlsRef,
@@ -9479,7 +9462,6 @@ function REPLView({
         width: "100%"
       },
       toast && !toolUseConfirm && !toolJSX && !binaryFeedbackContext && /* @__PURE__ */ React70.createElement(Box53, { paddingX: 1, marginTop: 1 }, /* @__PURE__ */ React70.createElement(Text56, { color: "yellow", dimColor: true, wrap: "truncate-end" }, toast)),
-      !toolJSX && !toolUseConfirm && !binaryFeedbackContext && isLoading && /* @__PURE__ */ React70.createElement(RequestStatusIndicator, null),
       toolJSX ? toolJSX.jsx : null,
       !toolJSX && binaryFeedbackContext && !isMessageSelectorVisible && /* @__PURE__ */ React70.createElement(
         BinaryFeedback,
@@ -9532,13 +9514,13 @@ function REPLView({
 // apps/cli/src/ui/screens/REPL/useReplController.tsx
 import { Box as Box61 } from "ink";
 import * as React79 from "react";
-import { useCallback as useCallback28, useEffect as useEffect28, useMemo as useMemo32, useRef as useRef17, useState as useState26 } from "react";
+import { useCallback as useCallback28, useEffect as useEffect29, useMemo as useMemo31, useRef as useRef17, useState as useState27 } from "react";
 import ReactReconciler from "react-reconciler";
 
 // apps/cli/src/ui/hooks/useCostSummary.ts
-import { useEffect as useEffect23 } from "react";
+import { useEffect as useEffect24 } from "react";
 function useCostSummary() {
-  useEffect23(() => {
+  useEffect24(() => {
     return registerCostSummaryOnExit();
   }, []);
 }
@@ -9687,9 +9669,9 @@ function useCanUseTool(setToolUseConfirm, options) {
 var useCanUseTool_default = useCanUseTool;
 
 // apps/cli/src/ui/hooks/useLogMessages.ts
-import { useEffect as useEffect24 } from "react";
+import { useEffect as useEffect25 } from "react";
 function useLogMessages(messages, messageLogName, forkNumber) {
-  useEffect24(() => {
+  useEffect25(() => {
     overwriteLog(
       getMessagesPath(messageLogName, forkNumber, 0),
       messages.filter((_) => _.type !== "progress"),
@@ -9699,7 +9681,7 @@ function useLogMessages(messages, messageLogName, forkNumber) {
 }
 
 // apps/cli/src/ui/screens/overlays/ShortcutsScreen.tsx
-import React72, { useCallback as useCallback19, useMemo as useMemo26, useRef as useRef14 } from "react";
+import React72, { useCallback as useCallback19, useMemo as useMemo25, useRef as useRef14 } from "react";
 import { Box as Box54, Text as Text57 } from "ink";
 function ShortcutsScreen({ onDone }) {
   const theme = getTheme();
@@ -9711,7 +9693,7 @@ function ShortcutsScreen({ onDone }) {
     didDoneRef.current = true;
     onDone();
   }, [onDone]);
-  const modeCycleShortcut = useMemo26(() => getPermissionModeCycleShortcut(), []);
+  const modeCycleShortcut = useMemo25(() => getPermissionModeCycleShortcut(), []);
   useKeypress((input, key) => {
     const inputChar = input.length === 1 ? input : "";
     if (key.escape || inputChar === "?" || key.ctrl && inputChar === "c") {
@@ -9735,7 +9717,7 @@ function ShortcutsScreen({ onDone }) {
 }
 
 // apps/cli/src/ui/screens/overlays/CommandPaletteScreen.tsx
-import React73, { useCallback as useCallback20, useEffect as useEffect25, useMemo as useMemo27, useState as useState22 } from "react";
+import React73, { useCallback as useCallback20, useEffect as useEffect26, useMemo as useMemo26, useState as useState23 } from "react";
 import { Box as Box55, Text as Text58 } from "ink";
 import figures9 from "figures";
 var VIEWPORT_SAFE_MARGIN_ROWS2 = 1;
@@ -9797,17 +9779,17 @@ function CommandPaletteScreen({
   const paddingY = layout.paddingY;
   const gap = layout.gap;
   const paddingX = layout.paddingX;
-  const [query, setQuery] = useState22("");
-  const [cursorOffset, setCursorOffset] = useState22(0);
-  const [focusedIndex, setFocusedIndex] = useState22(0);
-  const [status, setStatus] = useState22(null);
-  const actions = useMemo27(() => getDefaultActions(), []);
-  const normalizedQuery = useMemo27(() => normalizeQuery(query), [query]);
-  const filtered = useMemo27(
+  const [query, setQuery] = useState23("");
+  const [cursorOffset, setCursorOffset] = useState23(0);
+  const [focusedIndex, setFocusedIndex] = useState23(0);
+  const [status, setStatus] = useState23(null);
+  const actions = useMemo26(() => getDefaultActions(), []);
+  const normalizedQuery = useMemo26(() => normalizeQuery(query), [query]);
+  const filtered = useMemo26(
     () => actions.filter((action) => matchesQuery(action, normalizedQuery)),
     [actions, normalizedQuery]
   );
-  useEffect25(() => {
+  useEffect26(() => {
     setFocusedIndex((prev) => clamp(prev, 0, Math.max(0, filtered.length - 1)));
   }, [filtered.length]);
   const headerRows = 4;
@@ -9892,7 +9874,7 @@ function CommandPaletteScreen({
     },
     [filtered.length, onDone, runSelection, visibleOptionCount]
   );
-  const visible = useMemo27(
+  const visible = useMemo26(
     () => filtered.slice(start, end),
     [end, filtered, start]
   );
@@ -9945,7 +9927,7 @@ function CommandPaletteScreen({
 }
 
 // apps/cli/src/ui/screens/overlays/HistorySearchScreen.tsx
-import React74, { useCallback as useCallback21, useMemo as useMemo28, useState as useState23 } from "react";
+import React74, { useCallback as useCallback21, useMemo as useMemo27, useState as useState24 } from "react";
 import { Box as Box56, Text as Text59 } from "ink";
 import figures10 from "figures";
 function normalizeQuery2(value) {
@@ -9964,13 +9946,13 @@ function HistorySearchScreen({
   const theme = getTheme();
   const layout = useScreenLayout();
   const exitState = { pending: false, keyName: null };
-  const [query, setQuery] = useState23("");
-  const [cursorOffset, setCursorOffset] = useState23(0);
-  const [selectedIndex, setSelectedIndex] = useState23(0);
-  const [status, setStatus] = useState23(null);
-  const normalizedQuery = useMemo28(() => normalizeQuery2(query), [query]);
-  const history = useMemo28(() => getGlobalHistoryWithPastes(), []);
-  const filtered = useMemo28(
+  const [query, setQuery] = useState24("");
+  const [cursorOffset, setCursorOffset] = useState24(0);
+  const [selectedIndex, setSelectedIndex] = useState24(0);
+  const [status, setStatus] = useState24(null);
+  const normalizedQuery = useMemo27(() => normalizeQuery2(query), [query]);
+  const history = useMemo27(() => getGlobalHistoryWithPastes(), []);
+  const filtered = useMemo27(
     () => history.filter((item) => matchesQuery2(item.display, normalizedQuery)),
     [history, normalizedQuery]
   );
@@ -10117,7 +10099,7 @@ function HistorySearchScreen({
 }
 
 // apps/cli/src/ui/screens/overlays/ModelPickerScreen.tsx
-import React75, { useCallback as useCallback22, useEffect as useEffect26, useMemo as useMemo29, useState as useState24 } from "react";
+import React75, { useCallback as useCallback22, useEffect as useEffect27, useMemo as useMemo28, useState as useState25 } from "react";
 import { Box as Box57, Text as Text60 } from "ink";
 import figures11 from "figures";
 function clamp3(value, min, max) {
@@ -10130,20 +10112,20 @@ function ModelPickerScreen({
   const theme = getTheme();
   const layout = useScreenLayout();
   const exitState = { pending: false, keyName: null };
-  const modelManager = useMemo29(() => getModelManager(), []);
+  const modelManager = useMemo28(() => getModelManager(), []);
   const currentMainModelName = modelManager.getModelName("main");
-  const models = useMemo29(
+  const models = useMemo28(
     () => modelManager.getAllConfiguredModels(),
     [modelManager]
   );
-  const initialIndex = useMemo29(() => {
+  const initialIndex = useMemo28(() => {
     if (!currentMainModelName) return 0;
     const idx = models.findIndex((m) => m.modelName === currentMainModelName);
     return idx >= 0 ? idx : 0;
   }, [currentMainModelName, models]);
-  const [selectedIndex, setSelectedIndex] = useState24(initialIndex);
-  const [status, setStatus] = useState24(null);
-  useEffect26(() => {
+  const [selectedIndex, setSelectedIndex] = useState25(initialIndex);
+  const [status, setStatus] = useState25(null);
+  useEffect27(() => {
     setSelectedIndex((prev) => clamp3(prev, 0, Math.max(0, models.length - 1)));
   }, [models.length]);
   const confirm = useCallback22(() => {
@@ -10214,7 +10196,7 @@ function ModelPickerScreen({
 }
 
 // apps/cli/src/ui/screens/overlays/ThinkingToggleScreen.tsx
-import React76, { useCallback as useCallback23, useEffect as useEffect27, useMemo as useMemo30, useState as useState25 } from "react";
+import React76, { useCallback as useCallback23, useEffect as useEffect28, useMemo as useMemo29, useState as useState26 } from "react";
 import { Box as Box58, Text as Text61 } from "ink";
 import figures12 from "figures";
 function clamp4(value, min, max) {
@@ -10229,7 +10211,7 @@ function ThinkingToggleScreen({
   const theme = getTheme();
   const layout = useScreenLayout();
   const exitState = { pending: false, keyName: null };
-  const options = useMemo30(
+  const options = useMemo29(
     () => [
       {
         value: true,
@@ -10245,8 +10227,8 @@ function ThinkingToggleScreen({
     []
   );
   const initialIndex = currentValue ? 0 : 1;
-  const [selectedIndex, setSelectedIndex] = useState25(initialIndex);
-  useEffect27(() => {
+  const [selectedIndex, setSelectedIndex] = useState26(initialIndex);
+  useEffect28(() => {
     setSelectedIndex((prev) => clamp4(prev, 0, Math.max(0, options.length - 1)));
   }, [options.length]);
   const confirm = useCallback23(() => {
@@ -10316,7 +10298,7 @@ function ThinkingToggleScreen({
 // apps/cli/src/ui/screens/REPL/useTranscriptItems.tsx
 import { Box as Box60 } from "ink";
 import * as React78 from "react";
-import { useMemo as useMemo31, useRef as useRef16 } from "react";
+import { useMemo as useMemo30, useRef as useRef16 } from "react";
 
 // apps/cli/src/ui/components/MessageResponse.tsx
 import { Box as Box59, Text as Text62 } from "ink";
@@ -10458,19 +10440,19 @@ function splitTransientTextMessage(message, chunkState) {
 }
 function useTranscriptItems(args) {
   const chunkStateRef = useRef16(/* @__PURE__ */ new Map());
-  const normalizedMessages = useMemo31(
+  const normalizedMessages = useMemo30(
     () => normalizeMessages(args.messages).filter(isNotEmptyMessage),
     [args.messages]
   );
-  const unresolvedToolUseIDs = useMemo31(
+  const unresolvedToolUseIDs = useMemo30(
     () => getUnresolvedToolUseIDs(normalizedMessages),
     [normalizedMessages]
   );
-  const inProgressToolUseIDs = useMemo31(
+  const inProgressToolUseIDs = useMemo30(
     () => getInProgressToolUseIDs(normalizedMessages),
     [normalizedMessages]
   );
-  const erroredToolUseIDs = useMemo31(
+  const erroredToolUseIDs = useMemo30(
     () => new Set(
       getErroredToolUseMessages(normalizedMessages).map(
         (_) => _.message.content[0].id
@@ -10478,11 +10460,11 @@ function useTranscriptItems(args) {
     ),
     [normalizedMessages]
   );
-  const orderedMessages = useMemo31(
+  const orderedMessages = useMemo30(
     () => reorderMessages(normalizedMessages),
     [normalizedMessages]
   );
-  const replStaticPrefixLength = useMemo31(
+  const replStaticPrefixLength = useMemo30(
     () => getReplStaticPrefixLength(
       orderedMessages,
       normalizedMessages,
@@ -10490,7 +10472,7 @@ function useTranscriptItems(args) {
     ),
     [orderedMessages, normalizedMessages, unresolvedToolUseIDs]
   );
-  const chunked = useMemo31(() => {
+  const chunked = useMemo30(() => {
     const chunkState = chunkStateRef.current;
     const activeIds = new Set(
       orderedMessages.map((message) => message.uuid)
@@ -10560,7 +10542,7 @@ function useTranscriptItems(args) {
       replStaticPrefixLength: replStaticPrefixLength + staticPrefixExtra
     };
   }, [orderedMessages, replStaticPrefixLength]);
-  const items = useMemo31(() => {
+  const items = useMemo30(() => {
     return chunked.renderMessages.map(
       ({ message, key, isTransient }, index) => {
         const toolUseID = getToolUseID(message);
@@ -10949,22 +10931,22 @@ function useReplController(props) {
   const safeMode = Boolean(props.safeMode);
   const mcpClients = props.mcpClients ?? [];
   const isDefaultModel = props.isDefaultModel ?? true;
-  const [updateAvailableVersion, setUpdateAvailableVersion] = useState26(() => props.initialUpdateVersion ?? null);
-  const [updateCommands, setUpdateCommands] = useState26(
+  const [updateAvailableVersion, setUpdateAvailableVersion] = useState27(() => props.initialUpdateVersion ?? null);
+  const [updateCommands, setUpdateCommands] = useState27(
     () => props.initialUpdateCommands ? [...props.initialUpdateCommands] : null
   );
-  const [verbose, setVerbose] = useState26(() => {
+  const [verbose, setVerbose] = useState27(() => {
     return props.verbose ?? getGlobalConfigCached().verbose;
   });
-  const [commands, setCommands] = useState26(() => props.commands);
-  useEffect28(() => {
+  const [commands, setCommands] = useState27(() => props.commands);
+  useEffect29(() => {
     if (process.env.NODE_ENV === "test") return;
     if (updateAvailableVersion || updateCommands) return;
     let cancelled = false;
     (async () => {
       try {
         const [{ getLatestVersion, getUpdateCommandSuggestions }, semverMod] = await Promise.all([
-          import("./autoUpdater-MEPC7LJF.js"),
+          import("./autoUpdater-SDLJ5QSH.js"),
           import("semver")
         ]);
         const semverModule = semverMod;
@@ -10984,7 +10966,7 @@ function useReplController(props) {
       cancelled = true;
     };
   }, [updateAvailableVersion, updateCommands]);
-  const [forkNumber, setForkNumber] = useState26(
+  const [forkNumber, setForkNumber] = useState27(
     getNextAvailableLogForkNumber(
       props.messageLogName,
       props.initialForkNumber ?? 0,
@@ -10992,11 +10974,11 @@ function useReplController(props) {
     )
   );
   const initialForkNumberRef = useRef17(forkNumber);
-  const [uiRefreshCounter, setUiRefreshCounter] = useState26(0);
+  const [uiRefreshCounter, setUiRefreshCounter] = useState27(0);
   const [
     pendingForkConvoWithMessages,
     setPendingForkConvoWithMessages
-  ] = useState26(null);
+  ] = useState27(null);
   const pendingForkConvoWithMessagesRef = useRef17(null);
   const setForkConvoWithMessagesOnTheNextRender = useCallback28((messages2, options) => {
     const request = { messages: messages2, options };
@@ -11015,20 +10997,20 @@ function useReplController(props) {
     },
     []
   );
-  const [abortController, setAbortController] = useState26(null);
-  const [isLoading, setIsLoading] = useState26(false);
-  const [toolViewStack, setToolViewStack] = useState26([]);
+  const [abortController, setAbortController] = useState27(null);
+  const [isLoading, setIsLoading] = useState27(false);
+  const [toolViewStack, setToolViewStack] = useState27([]);
   const toolViewStackRef = useRef17(toolViewStack);
-  useEffect28(() => {
+  useEffect29(() => {
     toolViewStackRef.current = toolViewStack;
   }, [toolViewStack]);
   const toolJSX = toolViewStack.length > 0 ? toolViewStack[toolViewStack.length - 1] : null;
   const toolJSXRef = useRef17(toolJSX);
-  useEffect28(() => {
+  useEffect29(() => {
     toolJSXRef.current = toolJSX;
   }, [toolJSX]);
   const ephemeralFullscreenAltScreenRef = useRef17(false);
-  useEffect28(() => {
+  useEffect29(() => {
     return () => {
       if (ephemeralFullscreenAltScreenRef.current) {
         ephemeralFullscreenAltScreenRef.current = false;
@@ -11113,25 +11095,25 @@ function useReplController(props) {
     },
     [setToolViewStackWithClear]
   );
-  const [toolUseConfirm, setToolUseConfirm] = useState26(
+  const [toolUseConfirm, setToolUseConfirm] = useState27(
     null
   );
-  const [messages, setMessages] = useState26(
+  const [messages, setMessages] = useState27(
     props.initialMessages ?? []
   );
-  const [inputValue, setInputValue] = useState26("");
-  const [inputMode, setInputMode] = useState26("prompt");
-  const [restorePastes, setRestorePastes] = useState26(void 0);
-  const [draftPastes, setDraftPastes] = useState26({ pastedTexts: [], pastedImages: [] });
-  const [sessionThinkingMode, setSessionThinkingMode] = useState26(null);
-  const [submitCount, setSubmitCount] = useState26(0);
-  const [isMessageSelectorVisible, setIsMessageSelectorVisible] = useState26(false);
-  const [showCostDialog, setShowCostDialog] = useState26(false);
-  const [haveShownCostDialog, setHaveShownCostDialog] = useState26(
+  const [inputValue, setInputValue] = useState27("");
+  const [inputMode, setInputMode] = useState27("prompt");
+  const [restorePastes, setRestorePastes] = useState27(void 0);
+  const [draftPastes, setDraftPastes] = useState27({ pastedTexts: [], pastedImages: [] });
+  const [sessionThinkingMode, setSessionThinkingMode] = useState27(null);
+  const [submitCount, setSubmitCount] = useState27(0);
+  const [isMessageSelectorVisible, setIsMessageSelectorVisible] = useState27(false);
+  const [showCostDialog, setShowCostDialog] = useState27(false);
+  const [haveShownCostDialog, setHaveShownCostDialog] = useState27(
     getGlobalConfigCached().hasAcknowledgedCostThreshold
   );
-  const [binaryFeedbackContext, setBinaryFeedbackContext] = useState26(null);
-  const [toast, setToast] = useState26(null);
+  const [binaryFeedbackContext, setBinaryFeedbackContext] = useState27(null);
+  const [toast, setToast] = useState27(null);
   const toastTimeoutRef = useRef17(null);
   const dismissToolView = useCallback28(() => {
     const current = toolViewStackRef.current;
@@ -11495,7 +11477,7 @@ function useReplController(props) {
                       ModelConfig,
                       {
                         onClose: () => {
-                          import("./model-NPMMYL2U.js").then(
+                          import("./model-4EIFU5QN.js").then(
                             ({ reloadModelManager }) => {
                               reloadModelManager();
                               triggerModelConfigChange();
@@ -11532,10 +11514,10 @@ function useReplController(props) {
   );
   const readFileTimestampsRef = useRef17({});
   const { status: apiKeyStatus, reverify } = useApiKeyVerification();
-  useEffect28(() => {
+  useEffect29(() => {
     apiKeyStatusRef.current = apiKeyStatus;
   }, [apiKeyStatus]);
-  useEffect28(() => {
+  useEffect29(() => {
     void ensureLspManagerInitialized().catch(() => {
     });
   }, []);
@@ -11559,7 +11541,7 @@ function useReplController(props) {
     isMessageSelectorVisible,
     abortController?.signal
   );
-  useEffect28(() => {
+  useEffect29(() => {
     if (!pendingForkConvoWithMessages) return;
     if (toolJSX?.displayMode === "fullscreen") return;
     const request = pendingForkConvoWithMessages;
@@ -11584,7 +11566,7 @@ function useReplController(props) {
       applyStateUpdates();
     }
   }, [pendingForkConvoWithMessages, toolJSX?.displayMode]);
-  useEffect28(() => {
+  useEffect29(() => {
     const totalCost = getTotalCost();
     if (totalCost >= 5 && !showCostDialog && !haveShownCostDialog) {
       setShowCostDialog(true);
@@ -11598,7 +11580,7 @@ function useReplController(props) {
     toastTimeoutRef.current = setTimeout(() => setToast(null), 6e3);
   }, []);
   const ultrathinkToastActiveRef = useRef17(false);
-  useEffect28(() => {
+  useEffect29(() => {
     if (inputMode === "bash" || inputMode === "background") {
       ultrathinkToastActiveRef.current = false;
       return;
@@ -11610,7 +11592,7 @@ function useReplController(props) {
     }
     ultrathinkToastActiveRef.current = hasUltrathink;
   }, [inputMode, inputValue, sessionThinkingMode, showToast]);
-  useEffect28(() => {
+  useEffect29(() => {
     return subscribeAgentReloads((event) => {
       const count = event.changedPaths.length;
       showToast(
@@ -11618,7 +11600,7 @@ function useReplController(props) {
       );
     });
   }, [showToast]);
-  useEffect28(() => {
+  useEffect29(() => {
     let cancelled = false;
     const unsubscribe = subscribeCustomCommandReloads((event) => {
       const count = event.changedPaths.length;
@@ -11627,7 +11609,7 @@ function useReplController(props) {
       );
       void (async () => {
         try {
-          const { getCommands } = await import("./registry-FHPZ36EO.js");
+          const { getCommands } = await import("./registry-3UVW32YF.js");
           const next = await getCommands();
           if (cancelled) return;
           setCommands(next);
@@ -11642,7 +11624,7 @@ function useReplController(props) {
       unsubscribe();
     };
   }, [showToast]);
-  useEffect28(() => {
+  useEffect29(() => {
     return () => {
       if (toastTimeoutRef.current) {
         clearTimeout(toastTimeoutRef.current);
@@ -11686,7 +11668,7 @@ function useReplController(props) {
     setAbortController,
     setIsLoading
   });
-  useEffect28(() => {
+  useEffect29(() => {
     onQueryRef.current = onQuery;
   }, [onQuery]);
   const onInit = useReplInit({
@@ -11709,16 +11691,16 @@ function useReplController(props) {
     onQuery
   });
   useCostSummary();
-  useEffect28(() => {
+  useEffect29(() => {
     setMessagesGetter(() => messages);
     setMessagesSetter(setMessages);
   }, [messages]);
-  useEffect28(() => {
+  useEffect29(() => {
     setModelConfigChangeHandler(() => setUiRefreshCounter((prev) => prev + 1));
   }, []);
   useLogMessages(messages, props.messageLogName, forkNumber);
   useLogStartupTime();
-  useEffect28(() => {
+  useEffect29(() => {
     onInit();
   }, []);
   const transcript = useTranscriptItems({
@@ -11731,11 +11713,20 @@ function useReplController(props) {
     isMessageSelectorVisible,
     forkNumber
   });
-  const staticItems = useMemo32(() => {
+  const staticItemsRef = useRef17([]);
+  const printedKeysRef = useRef17(/* @__PURE__ */ new Set());
+  const lastForkNumberRef = useRef17(forkNumber);
+  const staticItems = useMemo31(() => {
+    if (lastForkNumberRef.current !== forkNumber) {
+      lastForkNumberRef.current = forkNumber;
+      staticItemsRef.current = [];
+      printedKeysRef.current = /* @__PURE__ */ new Set();
+    }
     const items = [];
+    const logoKey = `logo-${forkNumber}`;
     items.push({
-      key: `logo-${forkNumber}`,
-      jsx: /* @__PURE__ */ React79.createElement(Box61, { flexDirection: "column", key: `logo-${forkNumber}` }, /* @__PURE__ */ React79.createElement(
+      key: logoKey,
+      jsx: /* @__PURE__ */ React79.createElement(Box61, { flexDirection: "column", key: logoKey }, /* @__PURE__ */ React79.createElement(
         Logo,
         {
           mcpClients,
@@ -11746,7 +11737,17 @@ function useReplController(props) {
       ), /* @__PURE__ */ React79.createElement(ProjectOnboarding, { workspaceDir: getOriginalCwd() }))
     });
     items.push(...transcript.items.slice(0, transcript.replStaticPrefixLength));
-    return items;
+    const newItems = [];
+    for (const item of items) {
+      if (!printedKeysRef.current.has(item.key)) {
+        printedKeysRef.current.add(item.key);
+        newItems.push(item);
+      }
+    }
+    if (newItems.length > 0) {
+      staticItemsRef.current = [...staticItemsRef.current, ...newItems];
+    }
+    return staticItemsRef.current;
   }, [
     forkNumber,
     isDefaultModel,
@@ -11756,7 +11757,7 @@ function useReplController(props) {
     updateAvailableVersion,
     updateCommands
   ]);
-  const transientItems = useMemo32(
+  const transientItems = useMemo31(
     () => transcript.items.slice(transcript.replStaticPrefixLength),
     [transcript.items, transcript.replStaticPrefixLength]
   );