@nomad-e/bluma-cli 0.1.30 → 0.1.32

package/dist/main.js

@@ -328,33 +328,71 @@ var init_async_command = __esm({
 });
 
 // src/main.ts
-import React11 from "react";
+import React12 from "react";
 import { render } from "ink";
-import { EventEmitter as EventEmitter2 } from "events";
+import { EventEmitter as EventEmitter3 } from "events";
 import fs15 from "fs";
 import { v4 as uuidv46 } from "uuid";
 
 // src/app/ui/App.tsx
-import { useState as useState7, useEffect as useEffect6, useRef as useRef5, useCallback as useCallback2, memo as memo11 } from "react";
-import { Box as Box17, Text as Text16, Static } from "ink";
+import { useState as useState6, useEffect as useEffect7, useRef as useRef5, useCallback as useCallback2, memo as memo12 } from "react";
+import { Box as Box20, Text as Text19, Static } from "ink";
 
 // src/app/ui/layout.tsx
 import { Box, Text } from "ink";
 import { memo } from "react";
-import { Fragment, jsx, jsxs } from "react/jsx-runtime";
+
+// src/app/ui/theme/blumaTerminal.ts
+var BLUMA_TERMINAL = {
+  brandBlue: "blue",
+  brandMagenta: "magenta",
+  text: "white",
+  muted: "gray",
+  dim: "gray",
+  code: "gray",
+  codeLabel: "blue",
+  link: "blue",
+  linkUnderline: true,
+  success: "green",
+  warn: "yellow",
+  err: "red",
+  panelBorder: "blue",
+  toolLabel: "magenta",
+  toolMeta: "gray",
+  heading1: "blue",
+  heading2: "blue",
+  headingDeep: "magenta",
+  listBullet: "magenta",
+  listBulletSub: "blue",
+  rule: "gray",
+  /** M3 CLI — superfícies e hierarquia */
+  m3Outline: "blue",
+  m3TonalOutline: "magenta",
+  m3Rail: "blue",
+  m3Label: "gray",
+  m3OnSurface: "white"
+};
+
+// src/app/ui/layout.tsx
+import { jsx, jsxs } from "react/jsx-runtime";
 var HeaderComponent = ({
   sessionId,
   workdir
 }) => {
   const dirName = workdir.split("/").pop() || workdir;
   return /* @__PURE__ */ jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [
-    /* @__PURE__ */ jsx(Box, { children: /* @__PURE__ */ jsx(Text, { color: "magenta", bold: true, children: "bluma \u2014 coding agent" }) }),
-    /* @__PURE__ */ jsxs(Box, { children: [
+    /* @__PURE__ */ jsxs(Box, { flexDirection: "row", flexWrap: "wrap", children: [
+      /* @__PURE__ */ jsx(Text, { color: BLUMA_TERMINAL.brandBlue, bold: true, children: "BluMa" }),
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: " \u2014 " }),
+      /* @__PURE__ */ jsx(Text, { children: "Base Language Unit" }),
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: " \xB7 " }),
+      /* @__PURE__ */ jsx(Text, { color: BLUMA_TERMINAL.brandMagenta, bold: true, children: "Model Agent" })
+    ] }),
+    /* @__PURE__ */ jsxs(Box, { flexDirection: "row", flexWrap: "wrap", children: [
       /* @__PURE__ */ jsx(Text, { dimColor: true, children: "cwd " }),
-      /* @__PURE__ */ jsx(Text, { color: "cyan", children: dirName }),
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: " | " }),
-      /* @__PURE__ */ jsx(Text, { dimColor: true, children: "session " }),
-      /* @__PURE__ */ jsx(Text, { color: "gray", children: sessionId.slice(0, 8) })
+      /* @__PURE__ */ jsx(Text, { color: BLUMA_TERMINAL.brandBlue, children: dirName }),
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: " \u2502 session " }),
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: sessionId.slice(0, 8) })
     ] })
   ] });
 };
@@ -366,12 +404,12 @@ var SessionInfoComponent = ({
   mcpStatus
 }) => /* @__PURE__ */ jsxs(Box, { paddingX: 1, children: [
   /* @__PURE__ */ jsx(Text, { dimColor: true, children: "mcp " }),
-  /* @__PURE__ */ jsx(Text, { color: mcpStatus === "connected" ? "green" : "yellow", children: mcpStatus === "connected" ? "+" : "-" }),
-  toolsCount !== null && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+  /* @__PURE__ */ jsx(Text, { color: mcpStatus === "connected" ? BLUMA_TERMINAL.success : BLUMA_TERMINAL.warn, children: mcpStatus === "connected" ? "on" : "\u2026" }),
+  toolsCount !== null ? /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
     " ",
     toolsCount,
     " tools"
-  ] }) })
+  ] }) : null
 ] });
 var SessionInfo = memo(SessionInfoComponent);
 var TaskStatusBarComponent = ({
@@ -380,9 +418,9 @@ var TaskStatusBarComponent = ({
   status
 }) => {
   const modeColors = {
-    PLANNING: "blue",
-    EXECUTION: "green",
-    VERIFICATION: "yellow"
+    PLANNING: BLUMA_TERMINAL.brandBlue,
+    EXECUTION: BLUMA_TERMINAL.brandBlue,
+    VERIFICATION: BLUMA_TERMINAL.brandMagenta
   };
   return /* @__PURE__ */ jsxs(Box, { paddingX: 1, children: [
     /* @__PURE__ */ jsxs(Text, { color: modeColors[mode], bold: true, children: [
@@ -394,10 +432,10 @@ var TaskStatusBarComponent = ({
       " ",
       taskName
     ] }),
-    status && /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
-      " - ",
+    status ? /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
+      " \u2014 ",
       status
-    ] })
+    ] }) : null
   ] });
 };
 var TaskStatusBar = memo(TaskStatusBarComponent);
@@ -408,6 +446,12 @@ import { Box as Box2, Text as Text2, useStdout, useInput as useInput2 } from "in
 // src/app/ui/utils/useSimpleInputBuffer.ts
 import { useReducer, useRef, useCallback, useEffect } from "react";
 import { useInput } from "ink";
+
+// src/app/ui/utils/expandPreviewHotkey.ts
+import { EventEmitter } from "events";
+var expandPreviewHotkeyBus = new EventEmitter();
+
+// src/app/ui/utils/useSimpleInputBuffer.ts
 function getLineStart(text, cursorPos) {
   let pos = cursorPos - 1;
   while (pos >= 0 && text[pos] !== "\n") {
@@ -546,7 +590,12 @@ function inputReducer(state, action, viewWidth) {
       return state;
   }
 }
-var useCustomInput = ({ onSubmit, viewWidth, isReadOnly, onInterrupt }) => {
+var useCustomInput = ({
+  onSubmit,
+  viewWidth,
+  isReadOnly,
+  onInterrupt
+}) => {
   const [state, dispatch] = useReducer(
     (s, a) => inputReducer(s, a, viewWidth),
     { text: "", cursorPosition: 0, viewStart: 0 }
@@ -597,6 +646,10 @@ var useCustomInput = ({ onSubmit, viewWidth, isReadOnly, onInterrupt }) => {
       if (inputBuffer.current.length > 0 && (key.ctrl || key.meta || key.escape || key.return || key.leftArrow || key.rightArrow || key.upArrow || key.downArrow || key.tab || key.shift)) {
         flushInputBuffer();
       }
+      if (key.ctrl && input === "o") {
+        expandPreviewHotkeyBus.emit("expand");
+        return;
+      }
       if (key.escape) {
         onInterrupt();
         return;
@@ -685,7 +738,7 @@ var useCustomInput = ({ onSubmit, viewWidth, isReadOnly, onInterrupt }) => {
 
 // src/app/ui/components/InputPrompt.tsx
 import { useEffect as useEffect3, useMemo, useState as useState2, memo as memo2 } from "react";
-import { EventEmitter } from "events";
+import { EventEmitter as EventEmitter2 } from "events";
 
 // src/app/ui/utils/slashRegistry.ts
 var getSlashCommands = () => [
@@ -884,9 +937,14 @@ function useAtCompletion({
   return { open, suggestions, selected, setSelected, insertAtSelection, close, update };
 }
 
+// src/app/ui/constants/toolUiPreview.ts
+var TOOL_PREVIEW_MAX_LINES = 8;
+var EXPAND_OVERLAY_MAX_LINES = 60;
+var TERMINAL_RULE_CHAR = "\u2500";
+
 // src/app/ui/components/InputPrompt.tsx
-import { Fragment as Fragment2, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
-var uiEventBus = global.__bluma_ui_eventbus__ || new EventEmitter();
+import { Fragment, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-runtime";
+var uiEventBus = global.__bluma_ui_eventbus__ || new EventEmitter2();
 global.__bluma_ui_eventbus__ = uiEventBus;
 var TextLine = memo2(({
   line,
@@ -931,8 +989,8 @@ var PathSuggestions = memo2(({
     const realIdx = start + idx;
     const isSelected = realIdx === selected;
     return /* @__PURE__ */ jsxs2(Box2, { paddingLeft: 1, paddingY: 0, children: [
-      /* @__PURE__ */ jsx2(Text2, { color: isSelected ? "magenta" : "gray", children: isSelected ? "\u276F " : "  " }),
-      /* @__PURE__ */ jsx2(Text2, { color: isSelected ? "magenta" : "white", bold: isSelected, dimColor: !isSelected, children: s.label })
+      /* @__PURE__ */ jsx2(Text2, { color: isSelected ? BLUMA_TERMINAL.brandMagenta : BLUMA_TERMINAL.muted, children: isSelected ? "> " : "  " }),
+      /* @__PURE__ */ jsx2(Text2, { color: isSelected ? BLUMA_TERMINAL.brandBlue : void 0, bold: isSelected, dimColor: !isSelected, children: s.label })
     ] }, s.fullPath);
   }) });
 });
@@ -943,11 +1001,11 @@ var SlashSuggestions = memo2(({
 }) => /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", marginTop: 1, children: suggestions.map((s, idx) => {
   const isSelected = idx === selectedIndex;
   return /* @__PURE__ */ jsxs2(Box2, { paddingLeft: 1, paddingY: 0, children: [
-    /* @__PURE__ */ jsx2(Text2, { color: isSelected ? "magenta" : "gray", children: isSelected ? "\u276F " : "  " }),
-    /* @__PURE__ */ jsxs2(Text2, { color: isSelected ? "magenta" : "white", bold: isSelected, dimColor: !isSelected, children: [
+    /* @__PURE__ */ jsx2(Text2, { color: isSelected ? BLUMA_TERMINAL.brandMagenta : BLUMA_TERMINAL.muted, children: isSelected ? "> " : "  " }),
+    /* @__PURE__ */ jsxs2(Text2, { color: isSelected ? BLUMA_TERMINAL.brandBlue : void 0, bold: isSelected, dimColor: !isSelected, children: [
       s.name,
       " ",
-      /* @__PURE__ */ jsxs2(Text2, { color: "gray", children: [
+      /* @__PURE__ */ jsxs2(Text2, { dimColor: true, children: [
         "- ",
         s.description
       ] })
@@ -955,7 +1013,14 @@ var SlashSuggestions = memo2(({
   ] }, s.name);
 }) }));
 SlashSuggestions.displayName = "SlashSuggestions";
-var Footer = memo2(({ isReadOnly }) => /* @__PURE__ */ jsx2(Box2, { paddingX: 1, justifyContent: "center", children: /* @__PURE__ */ jsx2(Text2, { color: "gray", dimColor: true, children: isReadOnly ? "ctrl+c to exit | Enter to send message | Shift+Enter for new line | esc interrupt" : "ctrl+c to exit | Enter to submit | Shift+Enter for new line | /help commands | esc interrupt" }) }));
+var InputRuleLine = memo2(() => {
+  const { stdout } = useStdout();
+  const cols = stdout?.columns ?? 80;
+  const n = Math.max(8, cols);
+  return /* @__PURE__ */ jsx2(Text2, { color: "white", children: TERMINAL_RULE_CHAR.repeat(n) });
+});
+InputRuleLine.displayName = "InputRuleLine";
+var Footer = memo2(({ isReadOnly }) => /* @__PURE__ */ jsx2(Box2, { justifyContent: "center", children: /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: isReadOnly ? "ctrl+c to exit | Enter to send message | Shift+Enter for new line | esc interrupt | Ctrl+O expand last clip" : "ctrl+c to exit | Enter to submit | Shift+Enter for new line | /help commands | esc interrupt | Ctrl+O expand last clip" }) }));
 Footer.displayName = "Footer";
 var TextLinesRenderer = memo2(({
   lines,
@@ -965,17 +1030,14 @@ var TextLinesRenderer = memo2(({
   showPlaceholder,
   placeholder
 }) => {
-  return /* @__PURE__ */ jsx2(Fragment2, { children: lines.map((line, idx) => {
+  return /* @__PURE__ */ jsx2(Fragment, { children: lines.map((line, idx) => {
     const isFirstLine = idx === 0;
-    return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "row", paddingX: 1, children: [
-      isFirstLine && /* @__PURE__ */ jsxs2(Text2, { color: "white", children: [
+    return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "row", children: [
+      isFirstLine && /* @__PURE__ */ jsxs2(Text2, { color: "white", bold: true, children: [
         ">",
         " "
       ] }),
-      !isFirstLine && /* @__PURE__ */ jsxs2(Text2, { color: "gray", children: [
-        "\u2502",
-        " "
-      ] }),
+      !isFirstLine && /* @__PURE__ */ jsx2(Text2, { color: BLUMA_TERMINAL.brandMagenta, children: "\u2502 " }),
       showPlaceholder && isFirstLine && line.length === 0 ? /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: placeholder }) : /* @__PURE__ */ jsx2(
         TextLine,
         {
@@ -1116,14 +1178,15 @@ var InputPrompt = memo2(({
       return;
     }
   }, { isActive: true });
-  return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", children: [
-    disableWhileProcessing ? /* @__PURE__ */ jsx2(Box2, { children: /* @__PURE__ */ jsxs2(Box2, { flexDirection: "row", paddingX: 1, flexWrap: "nowrap", children: [
-      /* @__PURE__ */ jsxs2(Text2, { color: "white", children: [
+  return /* @__PURE__ */ jsxs2(Box2, { flexDirection: "column", marginTop: 1, children: [
+    /* @__PURE__ */ jsx2(InputRuleLine, {}),
+    /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", marginY: 0, children: disableWhileProcessing ? /* @__PURE__ */ jsxs2(Box2, { flexDirection: "row", flexWrap: "nowrap", children: [
+      /* @__PURE__ */ jsxs2(Text2, { color: "white", bold: true, children: [
         ">",
         " "
       ] }),
       /* @__PURE__ */ jsx2(Text2, { dimColor: true, children: "ctrl+c to exit" })
-    ] }) }) : /* @__PURE__ */ jsxs2(Fragment2, { children: [
+    ] }) : /* @__PURE__ */ jsxs2(Fragment, { children: [
       /* @__PURE__ */ jsx2(Box2, { flexDirection: "column", children: /* @__PURE__ */ jsx2(
         TextLinesRenderer,
         {
@@ -1142,14 +1205,9 @@ var InputPrompt = memo2(({
           selected: pathAutocomplete.selected
         }
       ),
-      slashOpen && slashSuggestions.length > 0 && /* @__PURE__ */ jsx2(
-        SlashSuggestions,
-        {
-          suggestions: slashSuggestions,
-          selectedIndex: slashIndex
-        }
-      )
-    ] }),
+      slashOpen && slashSuggestions.length > 0 && /* @__PURE__ */ jsx2(SlashSuggestions, { suggestions: slashSuggestions, selectedIndex: slashIndex })
+    ] }) }),
+    /* @__PURE__ */ jsx2(InputRuleLine, {}),
     /* @__PURE__ */ jsx2(Footer, { isReadOnly })
   ] });
 });
@@ -1157,7 +1215,7 @@ InputPrompt.displayName = "InputPrompt";
 
 // src/app/ui/ConfirmationPrompt.tsx
 import { memo as memo4 } from "react";
-import { Box as Box6, Text as Text6 } from "ink";
+import { Box as Box7, Text as Text7 } from "ink";
 
 // src/app/ui/InteractiveMenu.tsx
 import { useState as useState3, memo as memo3 } from "react";
@@ -1165,9 +1223,9 @@ import { Box as Box3, Text as Text3, useInput as useInput3 } from "ink";
 import { jsx as jsx3, jsxs as jsxs3 } from "react/jsx-runtime";
 var InteractiveMenuComponent = ({ onDecision }) => {
   const options = [
-    { key: "y", label: "yes", value: "accept", color: "green" },
-    { key: "n", label: "no", value: "decline", color: "red" },
-    { key: "a", label: "always", value: "accept_always", color: "yellow" }
+    { key: "y", label: "yes", value: "accept" },
+    { key: "n", label: "no", value: "decline" },
+    { key: "a", label: "always", value: "accept_always" }
   ];
   const [selected, setSelected] = useState3(0);
   useInput3((input, key) => {
@@ -1188,12 +1246,12 @@ var InteractiveMenuComponent = ({ onDecision }) => {
       onDecision(opt.value);
     }
   });
-  return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", paddingX: 1, marginTop: 1, children: [
-    /* @__PURE__ */ jsxs3(Box3, { children: [
-      /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "approve? " }),
+  return /* @__PURE__ */ jsxs3(Box3, { flexDirection: "column", marginTop: 1, children: [
+    /* @__PURE__ */ jsxs3(Box3, { flexDirection: "row", flexWrap: "wrap", children: [
+      /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "approve \xB7 " }),
       options.map((opt, idx) => {
         const isSelected = idx === selected;
-        return /* @__PURE__ */ jsx3(Box3, { marginRight: 1, children: /* @__PURE__ */ jsxs3(Text3, { color: isSelected ? opt.color : "gray", bold: isSelected, children: [
+        return /* @__PURE__ */ jsx3(Box3, { marginRight: 1, children: /* @__PURE__ */ jsxs3(Text3, { color: isSelected ? BLUMA_TERMINAL.brandMagenta : BLUMA_TERMINAL.muted, bold: isSelected, children: [
           "[",
           opt.key,
           "]",
@@ -1201,7 +1259,7 @@ var InteractiveMenuComponent = ({ onDecision }) => {
         ] }) }, opt.value);
       })
     ] }),
-    /* @__PURE__ */ jsx3(Box3, { children: /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "arrows to select, enter to confirm, esc to cancel" }) })
+    /* @__PURE__ */ jsx3(Box3, { marginTop: 0, children: /* @__PURE__ */ jsx3(Text3, { dimColor: true, children: "arrows \xB7 enter \xB7 esc cancel" }) })
   ] });
 };
 var InteractiveMenu = memo3(InteractiveMenuComponent);
@@ -1354,7 +1412,7 @@ var renderEditTool = ({ toolCall, preview }) => {
 var renderGeneric = ({ toolCall }) => {
   const toolName = toolCall.function.name;
   const rawArguments = toolCall.function.arguments;
-  const MAX_LINES2 = 5;
+  const MAX_LINES = 5;
   let formattedArgsString;
   if (!rawArguments) {
     formattedArgsString = "";
@@ -1369,9 +1427,9 @@ var renderGeneric = ({ toolCall }) => {
     formattedArgsString = JSON.stringify(rawArguments, null, 2);
   }
   const lines = formattedArgsString.split("\n");
-  const isTruncated = lines.length > MAX_LINES2;
-  const visibleLines = isTruncated ? lines.slice(0, MAX_LINES2) : lines;
-  const remainingCount = lines.length - MAX_LINES2;
+  const isTruncated = lines.length > MAX_LINES;
+  const visibleLines = isTruncated ? lines.slice(0, MAX_LINES) : lines;
+  const remainingCount = lines.length - MAX_LINES;
   return /* @__PURE__ */ jsxs5(Box5, { flexDirection: "column", paddingX: 1, marginBottom: 1, children: [
     /* @__PURE__ */ jsxs5(Box5, { children: [
       /* @__PURE__ */ jsx5(Text5, { color: "blue", children: "\u25B8" }),
@@ -1411,12 +1469,12 @@ var renderTodoTool = ({ toolCall }) => {
         /* @__PURE__ */ jsx5(Text5, { dimColor: true, children: " todo" })
       ] }),
       /* @__PURE__ */ jsxs5(Box5, { paddingLeft: 2, flexDirection: "column", children: [
-        /* @__PURE__ */ jsxs5(Text5, { color: "magenta", children: [
-          "\u{1F4CB} ",
+        /* @__PURE__ */ jsxs5(Text5, { color: "blue", children: [
+          "todo  ",
           pending,
-          " pending, ",
+          " open \xB7 ",
           completed,
-          " completed"
+          " done"
         ] }),
         tasks.length > 0 && tasks.length <= 10 && /* @__PURE__ */ jsx5(Box5, { paddingLeft: 2, flexDirection: "column", marginTop: 1, children: tasks.map((task, idx) => {
           const isComplete = task.isComplete === true;
@@ -1466,19 +1524,60 @@ var promptRenderers = {
   // <--- ADICIONE ESTA LINHA
 };
 
-// src/app/ui/ConfirmationPrompt.tsx
+// src/app/ui/theme/m3Layout.tsx
+import { Box as Box6, Text as Text6 } from "ink";
 import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+function ChatBlock({
+  children,
+  marginBottom = 1
+}) {
+  return /* @__PURE__ */ jsx6(Box6, { flexDirection: "column", marginBottom, children });
+}
+function ChatUserMessage({ children }) {
+  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "row", marginBottom: 1, flexWrap: "wrap", alignItems: "flex-start", children: [
+    /* @__PURE__ */ jsxs6(Text6, { color: "white", bold: true, children: [
+      ">",
+      " "
+    ] }),
+    /* @__PURE__ */ jsx6(Box6, { flexDirection: "column", flexGrow: 1, children })
+  ] });
+}
+function ChatMeta({ children }) {
+  return /* @__PURE__ */ jsx6(Box6, { marginBottom: 1, children: /* @__PURE__ */ jsx6(Text6, { dimColor: true, children }) });
+}
+function ChatStatusRow({ children }) {
+  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "row", marginBottom: 1, flexWrap: "wrap", children: [
+    /* @__PURE__ */ jsxs6(Text6, { color: BLUMA_TERMINAL.brandMagenta, bold: true, children: [
+      "*",
+      " "
+    ] }),
+    children
+  ] });
+}
+function ChatTurnDuration({ secondsFormatted }) {
+  return /* @__PURE__ */ jsx6(Box6, { marginBottom: 1, children: /* @__PURE__ */ jsxs6(Text6, { dimColor: true, children: [
+    /* @__PURE__ */ jsx6(Text6, { color: BLUMA_TERMINAL.brandBlue, children: "\xB7 " }),
+    /* @__PURE__ */ jsxs6(Text6, { color: BLUMA_TERMINAL.brandMagenta, children: [
+      secondsFormatted,
+      "s"
+    ] })
+  ] }) });
+}
+var M3StatusStrip = ChatStatusRow;
+
+// src/app/ui/ConfirmationPrompt.tsx
+import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
 var ConfirmationPromptComponent = ({ toolCalls, preview, onDecision }) => {
-  const toolCall = toolCalls && toolCalls.length > 0 ? toolCalls[0] : null;
-  if (!toolCall) {
-    return /* @__PURE__ */ jsx6(Box6, { paddingX: 1, children: /* @__PURE__ */ jsx6(Text6, { dimColor: true, children: "waiting..." }) });
+  const toolCall = toolCalls && Array.isArray(toolCalls) && toolCalls.length > 0 ? toolCalls[0] : null;
+  if (!toolCall?.function) {
+    return /* @__PURE__ */ jsx7(Box7, { paddingX: 1, children: /* @__PURE__ */ jsx7(Text7, { dimColor: true, children: "waiting\u2026" }) });
   }
-  const toolName = toolCall.function.name;
+  const toolName = toolCall.function.name || "tool";
   const renderFunction = promptRenderers[toolName] || renderGeneric;
-  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", paddingX: 1, children: [
+  return /* @__PURE__ */ jsx7(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", paddingLeft: 1, children: [
     renderFunction({ toolCall, preview }),
-    /* @__PURE__ */ jsx6(InteractiveMenu, { onDecision })
-  ] });
+    /* @__PURE__ */ jsx7(InteractiveMenu, { onDecision })
+  ] }) });
 };
 var ConfirmationPrompt = memo4(ConfirmationPromptComponent);
 
@@ -3605,14 +3704,84 @@ function searchNotes(args) {
     matched: matches
   };
 }
-function clearNotes() {
+function removeNote(args) {
   loadMemoryFromFile();
-  memoryStore = [];
-  nextId2 = 1;
+  const id = args.id;
+  if (id == null || typeof id !== "number" || !Number.isFinite(id)) {
+    return {
+      success: false,
+      message: "id is required for action=remove (use list or search to get ids)",
+      entries: memoryStore
+    };
+  }
+  const idx = memoryStore.findIndex((e) => e.id === id);
+  if (idx === -1) {
+    return {
+      success: false,
+      message: `No coding memory entry with id=${id}`,
+      entries: memoryStore
+    };
+  }
+  memoryStore.splice(idx, 1);
+  saveMemoryToFile();
+  return {
+    success: true,
+    message: `Removed coding memory entry id=${id}`,
+    entries: memoryStore
+  };
+}
+function updateNote(args) {
+  loadMemoryFromFile();
+  const id = args.id;
+  if (id == null || typeof id !== "number" || !Number.isFinite(id)) {
+    return {
+      success: false,
+      message: "id is required for action=update",
+      entries: memoryStore
+    };
+  }
+  const entry = memoryStore.find((e) => e.id === id);
+  if (!entry) {
+    return {
+      success: false,
+      message: `No coding memory entry with id=${id}`,
+      entries: memoryStore
+    };
+  }
+  const hasNote = typeof args.note === "string";
+  const hasTags = args.tags !== void 0;
+  if (!hasNote && !hasTags) {
+    return {
+      success: false,
+      message: "update requires `note` and/or `tags` (omit fields you do not want to change)",
+      entries: memoryStore
+    };
+  }
+  if (hasNote) {
+    const newNote = args.note.trim();
+    if (!newNote) {
+      return {
+        success: false,
+        message: "note cannot be empty; omit `note` to keep the existing text",
+        entries: memoryStore
+      };
+    }
+    if (newNote.length > 4e3) {
+      return {
+        success: false,
+        message: "note too long (max 4000 chars)",
+        entries: memoryStore
+      };
+    }
+    entry.note = newNote;
+  }
+  if (hasTags) {
+    entry.tags = normalizeTags(args.tags);
+  }
   saveMemoryToFile();
   return {
     success: true,
-    message: "All coding memory entries cleared",
+    message: `Updated coding memory id=${id}`,
     entries: memoryStore
   };
 }
@@ -3625,8 +3794,10 @@ async function coding_memory(args) {
       return listNotes();
     case "search":
       return searchNotes(args);
-    case "clear":
-      return clearNotes();
+    case "remove":
+      return removeNote(args);
+    case "update":
+      return updateNote(args);
     default:
       return {
         success: false,
@@ -3939,20 +4110,21 @@ async function withFileLock(file, fn) {
 }
 var pendingSaves = /* @__PURE__ */ new Map();
 var DEBOUNCE_DELAY_MS = 100;
-function debouncedSave(sessionFile, history) {
+function debouncedSave(sessionFile, history, memory) {
   const existing = pendingSaves.get(sessionFile);
   if (existing) {
     clearTimeout(existing.timer);
   }
+  const resolvedMemory = memory !== void 0 ? memory : existing?.memory;
   const timer = setTimeout(async () => {
     pendingSaves.delete(sessionFile);
     try {
-      await doSaveSessionHistory(sessionFile, history);
+      await doSaveSessionHistory(sessionFile, history, resolvedMemory);
     } catch (e) {
       console.warn(`Debounced save failed for ${sessionFile}: ${e.message}`);
     }
   }, DEBOUNCE_DELAY_MS);
-  pendingSaves.set(sessionFile, { history: [...history], timer });
+  pendingSaves.set(sessionFile, { history: [...history], memory: resolvedMemory, timer });
 }
 function expandHome(p) {
   if (!p) return p;
@@ -4017,7 +4189,11 @@ async function loadOrcreateSession(sessionId) {
     await fs11.access(sessionFile);
     const fileContent = await fs11.readFile(sessionFile, "utf-8");
     const sessionData = JSON.parse(fileContent);
-    return [sessionFile, sessionData.conversation_history || [], []];
+    const memory = {
+      historyAnchor: sessionData.history_anchor ?? null,
+      compressedTurnSliceCount: sessionData.compressed_turn_slice_count ?? 0
+    };
+    return [sessionFile, sessionData.conversation_history || [], memory];
   } catch (error) {
     const newSessionData = {
       session_id: sessionId,
@@ -4025,10 +4201,14 @@ async function loadOrcreateSession(sessionId) {
       conversation_history: []
     };
     await fs11.writeFile(sessionFile, JSON.stringify(newSessionData, null, 2), "utf-8");
-    return [sessionFile, [], []];
+    const emptyMemory = {
+      historyAnchor: null,
+      compressedTurnSliceCount: 0
+    };
+    return [sessionFile, [], emptyMemory];
   }
 }
-async function doSaveSessionHistory(sessionFile, history) {
+async function doSaveSessionHistory(sessionFile, history, memory) {
   await withFileLock(sessionFile, async () => {
     let sessionData;
     try {
@@ -4061,6 +4241,14 @@ async function doSaveSessionHistory(sessionFile, history) {
     }
     sessionData.conversation_history = history;
     sessionData.last_updated = (/* @__PURE__ */ new Date()).toISOString();
+    if (memory) {
+      if (memory.historyAnchor) {
+        sessionData.history_anchor = memory.historyAnchor;
+      } else {
+        delete sessionData.history_anchor;
+      }
+      sessionData.compressed_turn_slice_count = memory.compressedTurnSliceCount;
+    }
     const tempSessionFile = `${sessionFile}.${Date.now()}.tmp`;
     try {
       await fs11.writeFile(tempSessionFile, JSON.stringify(sessionData, null, 2), "utf-8");
@@ -4078,14 +4266,14 @@ async function doSaveSessionHistory(sessionFile, history) {
     }
   });
 }
-async function saveSessionHistory(sessionFile, history) {
+async function saveSessionHistory(sessionFile, history, memory) {
   const cleanHistory = history.filter((msg) => {
     if (msg.role === "user" && typeof msg.content === "string") {
       return !msg.content.startsWith("[SKILL:");
     }
     return true;
   });
-  debouncedSave(sessionFile, cleanHistory);
+  debouncedSave(sessionFile, cleanHistory, memory);
 }
 
 // src/app/agent/core/prompt/prompt_builder.ts
@@ -4098,7 +4286,6 @@ import { execSync } from "child_process";
 import fs12 from "fs";
 import path14 from "path";
 import os7 from "os";
-import { fileURLToPath as fileURLToPath3 } from "url";
 var SkillLoader = class _SkillLoader {
   bundledSkillsDir;
   projectSkillsDir;
@@ -4115,19 +4302,35 @@ var SkillLoader = class _SkillLoader {
    * Funciona tanto em ESM como quando executado a partir de dist/.
    */
   static resolveBundledDir() {
-    if (process.env.NODE_ENV === "test" || process.env.JEST_WORKER_ID !== void 0) {
-      if (typeof __dirname !== "undefined") {
-        return path14.join(__dirname, "config", "skills");
-      }
+    if (process.env.JEST_WORKER_ID !== void 0 || process.env.NODE_ENV === "test") {
       return path14.join(process.cwd(), "dist", "config", "skills");
     }
-    try {
-      const currentFile = fileURLToPath3(import.meta.url);
-      const distDir = path14.dirname(currentFile);
-      return path14.join(distDir, "config", "skills");
-    } catch {
-      return path14.join(process.cwd(), "dist", "config", "skills");
+    const candidates = [];
+    const argv1 = process.argv[1];
+    if (argv1 && !argv1.startsWith("-")) {
+      try {
+        const scriptDir = path14.dirname(path14.resolve(argv1));
+        candidates.push(path14.join(scriptDir, "config", "skills"));
+      } catch {
+      }
     }
+    candidates.push(
+      path14.join(process.cwd(), "dist", "config", "skills"),
+      path14.join(process.cwd(), "node_modules", "@nomad-e", "bluma-cli", "dist", "config", "skills")
+    );
+    if (typeof __dirname !== "undefined") {
+      candidates.push(
+        path14.join(__dirname, "config", "skills"),
+        path14.join(__dirname, "..", "..", "..", "config", "skills")
+      );
+    }
+    for (const c of candidates) {
+      const abs = path14.resolve(c);
+      if (fs12.existsSync(abs)) {
+        return abs;
+      }
+    }
+    return path14.join(process.cwd(), "dist", "config", "skills");
   }
   /**
    * Lista skills disponíveis de todas as fontes.
@@ -4501,6 +4704,10 @@ var SYSTEM_PROMPT = `
 - NEVER try to \`load_skill\` with a name that isn't in \`<available_skills>\`
 - Your base knowledge (testing, git, docker...) is NOT a skill - it's just knowledge you have
 
+**Git / commits (when \`git-commit\` is listed in \`<available_skills>\`):**
+- For "commit", "push", "commit message", or "conventional commit": call \`load_skill({ skill_name: "git-commit" })\` **before** \`git commit\`, then follow the skill body (scopes, types, optional validator script).
+- The bundled skill name is exactly \`git-commit\`. Do **not** use \`git-conventional\` or other invented names.
+
 **Progressive Disclosure (Skills with references and scripts):**
 
 Skills may include additional assets beyond the SKILL.md body:
@@ -4553,19 +4760,35 @@ You MUST adapt all commands to this environment. Use the correct package manager
 <coding_memory>
 ## Persistent coding memory (tool: \`coding_memory\`)
 
-You have **durable notes** on disk (typically \`~/.bluma/coding_memory.json\`), separate from chat history. They **survive new sessions**.
+This is your **long-term scratchpad** (usually \`~/.bluma/coding_memory.json\`). It is **not** the chat log: it persists across sessions so you can behave like a coding agent that **actually recalls** stable project facts\u2014**but only if you use the tool**.
+
+### Ground rules
+- **Never invent** what is stored: if you are not sure, run \`action: "search"\` (or \`list\`) before stating a remembered fact.
+- The **<coding_memory_snapshot>** below is a **one-time snapshot at session start**. After any \`add\`, \`remove\`, or \`update\` in this session, treat the snapshot as **possibly stale** and **search** or **list** before relying on it.
+- Do **not** ask the user for permission to search memory when it reduces risk (e.g. they mention a prior decision, branch name, or "as we agreed").
+- **There is no "clear all"**: you can only **remove** entries **one id at a time** (\`action: "remove"\`, \`id\`). To fix bad data, \`update\` or \`remove\` specific ids.
+
+### When to search first
+- User: "lembra-te / remember / last time / o que combin\xE1mos / qual era o comando".
+- You are about to edit, run tests, or refactor using **assumptions** that came from earlier in this project (stack, scripts, env vars, URLs).
+- You return to a task after many unrelated turns\u2014the chat may have been compressed; **memory on disk still holds** the durable notes if you saved them.
 
-### Baseline vs live refresh
-- The **<coding_memory_snapshot>** block (appended after this prompt) is loaded **once at session start** from disk. It can become stale if memory changes later or if the topic was never saved.
-- Act like a teammate who **checks their notes**: before relying on "what we agreed" or project-specific lore, use \`coding_memory\` with \`action: "search"\` and a short \`query\` \u2014 especially when the user asks if you remember something, or when switching back to a topic after a long stretch of work.
+### When to add
+- **Stable** facts: architecture, naming conventions, test commands, ports, API bases, repo layout, user preferences that repeat.
+- **Pointers**, not novels: one short \`note\` + \`tags\` (e.g. \`auth\`, \`deploy\`, \`bluma\`). Put long specs in the repo; here only **reminders**.
 
-### When to write
-- After you learn **stable** facts (architecture, conventions, important URLs, decisions, repeated user preferences), call \`coding_memory\` with \`action: "add"\`, a concise \`note\`, and \`tags\` for later search.
-- When something **changes**, add an updated note (and do not treat outdated snapshot text as truth without searching).
+### CRUD (tool actions)
+- **Create:** \`add\` + \`note\` (+ optional \`tags\`).
+- **Read:** \`list\` (all ids) or \`search\` + \`query\`.
+- **Update:** \`update\` + \`id\` + new \`note\` and/or \`tags\` (omit fields you leave unchanged).
+- **Delete:** \`remove\` + \`id\` only \u2014 **never** bulk-wipe; the product intentionally forbids it.
+
+### When something changes
+- Prefer \`update\` on the same \`id\` when correcting a note; add a **new** note if the old one should remain as history; \`remove\` obsolete ids.
 
 ### Habits (continuity)
-- Prefer **search** or **list** over guessing when answering "remember / last time / what we did".
-- Long specs belong in the repo or artifacts; use \`coding_memory\` for **short** reminders and pointers.
+- Prefer **search** or **list** over guessing whenever "memory" matters.
+- After important milestones (feature done, bug fixed, migration applied), consider a **brief add** so future-you in a new session is not blind.
 </coding_memory>
 
 ---
@@ -4601,6 +4824,7 @@ Run tests when modifying code. If a testing skill is listed in available_skills,
 - **ALWAYS read a file before editing** - Use read_file_lines or ls_tool first
 - **Use absolute paths** when possible to avoid ambiguity
 - **For edit_tool**: Provide exact content with correct whitespace (read first!)
+- **Truncated CLI preview** (user may press Ctrl+O for more lines): still not a substitute for \`read_file_lines\` \u2014 use the tool for authoritative content before editing
 - **Check file exists** before attempting edits
 
 ### Safe Auto-Approved Tools (no confirmation needed):
@@ -5007,7 +5231,7 @@ tools:
 
 2. READ FRONTMATTER FIRST
    - name: npm-publish
-   - depends_on: [git-conventional]
+   - depends_on: [git-commit]
    - tools.required: [shell_command, command_status]
    - tools.recommended: [read_file_lines, message]
 
@@ -5044,17 +5268,17 @@ User: "Publish the package"
 2. load_skill({ skill_name: "npm-publish" })
 
 3. Read frontmatter:
-   - depends_on: [git-conventional]
+   - depends_on: [git-commit]
    - tools.required: [shell_command, command_status]
 
 4. Read body -> Workflow says:
-   "Step 1: If uncommitted changes, delegate to git-conventional"
+   "Step 1: If uncommitted changes, delegate to git-commit"
 
 5. Check git status with shell_command (required tool)
    Found changes
 
-6. Delegate: load_skill({ skill_name: "git-conventional" })
-   - Read git-conventional frontmatter
+6. Delegate: load_skill({ skill_name: "git-commit" })
+   - Read git-commit frontmatter
    - Follow its workflow for commit
    - Commit done
 
@@ -5080,7 +5304,7 @@ User: "Publish the package"
 <coding_memory_snapshot>
 ## Persistent notes (loaded at session start from disk)
 
-${memorySnapshot.trim().length > 0 ? memorySnapshot : "(No entries yet. Use coding_memory with action add or search to build continuity across sessions.)"}
+${memorySnapshot.trim().length > 0 ? memorySnapshot : "(No entries yet. Use coding_memory: add, list, search \u2014 remove/update by id when needed.)"}
 </coding_memory_snapshot>
 `;
   return prompt;
@@ -5094,6 +5318,161 @@ function isGitRepo(dir) {
   }
 }
 
+// src/app/agent/core/context-api/token_counter.ts
+import { getEncoding } from "js-tiktoken";
+var MESSAGE_OVERHEAD_TOKENS = 4;
+var CONVERSATION_BASE_OVERHEAD = 3;
+var cachedEncoding = null;
+function getO200kEncoding() {
+  if (!cachedEncoding) {
+    cachedEncoding = getEncoding("o200k_base");
+  }
+  return cachedEncoding;
+}
+function messageBodyForTokens(msg) {
+  const c = msg.content;
+  if (c == null) {
+    return "";
+  }
+  if (typeof c === "string") {
+    return c;
+  }
+  return JSON.stringify(c);
+}
+function messageExtraForTokens(msg) {
+  const m = msg;
+  const parts = [String(m.role ?? "")];
+  if (Array.isArray(m.tool_calls)) {
+    parts.push(JSON.stringify(m.tool_calls));
+  }
+  if (typeof m.tool_call_id === "string") {
+    parts.push(m.tool_call_id);
+  }
+  if (typeof m.name === "string") {
+    parts.push(m.name);
+  }
+  return parts.join("\0");
+}
+function countTokens(messages) {
+  if (messages.length === 0) {
+    return CONVERSATION_BASE_OVERHEAD;
+  }
+  const enc = getO200kEncoding();
+  let total = CONVERSATION_BASE_OVERHEAD;
+  for (const msg of messages) {
+    const body = messageBodyForTokens(msg);
+    const extra = messageExtraForTokens(msg);
+    const nBody = body ? enc.encode(body).length : 0;
+    const nExtra = extra ? enc.encode(extra).length : 0;
+    total += nBody + nExtra + MESSAGE_OVERHEAD_TOKENS;
+  }
+  return total;
+}
+
+// src/app/agent/core/context-api/history_anchor.ts
+function stripJsonFence(text) {
+  let s = text.trim();
+  const fence = /^```(?:json)?\s*([\s\S]*?)```\s*$/im.exec(s);
+  if (fence) {
+    s = fence[1].trim();
+  }
+  return s;
+}
+function parseAnchorJson(raw) {
+  const cleaned = stripJsonFence(raw);
+  const start = cleaned.indexOf("{");
+  const end = cleaned.lastIndexOf("}");
+  if (start === -1 || end === -1 || end <= start) {
+    throw new Error("compressToAnchor: resposta sem JSON object");
+  }
+  const parsed = JSON.parse(cleaned.slice(start, end + 1));
+  return {
+    intent: String(parsed.intent ?? ""),
+    filesModified: Array.isArray(parsed.filesModified) ? parsed.filesModified.map(String) : [],
+    decisionsMade: Array.isArray(parsed.decisionsMade) ? parsed.decisionsMade.map(String) : [],
+    errorsEncountered: Array.isArray(parsed.errorsEncountered) ? parsed.errorsEncountered.map(String) : [],
+    currentState: String(parsed.currentState ?? ""),
+    nextSteps: String(parsed.nextSteps ?? ""),
+    compressedAt: typeof parsed.compressedAt === "number" ? parsed.compressedAt : Date.now(),
+    turnsCompressed: typeof parsed.turnsCompressed === "number" ? parsed.turnsCompressed : 0
+  };
+}
+function formatMessagesForPrompt(msgs) {
+  return msgs.map((m, i) => {
+    const role = m.role ?? "?";
+    const content = m.content;
+    const text = typeof content === "string" ? content : content == null ? "" : JSON.stringify(content);
+    const toolCalls = m.tool_calls;
+    const tail = toolCalls ? `
+[tool_calls]: ${JSON.stringify(toolCalls)}` : "";
+    return `--- msg ${i + 1} (${role}) ---
+${text.slice(0, 12e4)}${tail}`;
+  }).join("\n\n");
+}
+async function compressToAnchor(spansToCompress, existingAnchor, llmService, userContext, turnSlicesInBatch) {
+  const messagesBlock = formatMessagesForPrompt(spansToCompress);
+  const existingBlock = existingAnchor ? `ANCHOR EXISTENTE (estende este, n\xE3o substitui \u2014 merge sem perder informa\xE7\xE3o):
+${JSON.stringify(existingAnchor, null, 2)}` : "N\xE3o existe anchor anterior.";
+  const userPrompt = `Tu \xE9s um compressor de hist\xF3rico para um agente de c\xF3digo CLI.
+
+${existingBlock}
+
+MENSAGENS A COMPRIMIR (turnos antigos da conversa):
+${messagesBlock}
+
+Produz um JSON com esta estrutura exata:
+{
+  "intent": "objetivo principal da sess\xE3o",
+  "filesModified": ["path1", "path2"],
+  "decisionsMade": ["decis\xE3o 1", "decis\xE3o 2"],
+  "errorsEncountered": ["erro X \u2192 resolvido com Y"],
+  "currentState": "onde estamos agora em 2-3 frases",
+  "nextSteps": "o que est\xE1 pendente",
+  "compressedAt": ${Date.now()},
+  "turnsCompressed": 0
+}
+
+Regras:
+- Responde APENAS com JSON v\xE1lido, sem markdown, sem texto extra
+- filesModified: inclui TODOS os paths de ficheiros mencionados
+- decisionsMade: preserva decis\xF5es de arquitetura, abordagem, estrutura
+- errorsEncountered: formato "erro \u2192 solu\xE7\xE3o"
+- Se j\xE1 existe anchor, faz merge \u2014 n\xE3o percas informa\xE7\xE3o anterior
+- O campo turnsCompressed na resposta ser\xE1 ignorado; usa 0.`;
+  const resp = await llmService.chatCompletion({
+    messages: [
+      {
+        role: "system",
+        content: "\xC9s um extrator factual. Sa\xEDda: apenas um objeto JSON v\xE1lido, sem markdown."
+      },
+      { role: "user", content: userPrompt }
+    ],
+    temperature: 0,
+    max_tokens: 4096,
+    userContext
+  });
+  const text = resp.choices[0]?.message?.content;
+  if (typeof text !== "string" || !text.trim()) {
+    throw new Error("compressToAnchor: modelo n\xE3o devolveu conte\xFAdo textual");
+  }
+  const anchor = parseAnchorJson(text);
+  const prevTurns = existingAnchor?.turnsCompressed ?? 0;
+  anchor.turnsCompressed = prevTurns + Math.max(0, turnSlicesInBatch);
+  anchor.compressedAt = Date.now();
+  return anchor;
+}
+function anchorToSystemMessage(anchor) {
+  const date = new Date(anchor.compressedAt).toISOString();
+  const content = `[MEM\xD3RIA DE SESS\xC3O \u2014 ${anchor.turnsCompressed} turnos comprimidos em ${date}]
+Objetivo: ${anchor.intent}
+Ficheiros modificados: ${anchor.filesModified.join(", ") || "(nenhum)"}
+Decis\xF5es tomadas: ${anchor.decisionsMade.join(" | ") || "(nenhuma)"}
+Erros resolvidos: ${anchor.errorsEncountered.join(" | ") || "(nenhum)"}
+Estado atual: ${anchor.currentState}
+Pr\xF3ximos passos: ${anchor.nextSteps}`;
+  return { role: "system", content };
+}
+
 // src/app/agent/core/context-api/context_manager.ts
 function isEndTurnToolCall(tc) {
   if (tc.function.name === "agent_end_turn") {
@@ -5109,40 +5488,26 @@ function isEndTurnToolCall(tc) {
   }
   return false;
 }
-function createApiContextWindow(fullHistory, maxTurns) {
-  if (!fullHistory.length) {
-    return [];
-  }
-  if (maxTurns === null || maxTurns === void 0) {
-    return [...fullHistory];
-  }
-  const systemMessages = [];
-  let historyStartIndex = 0;
-  while (historyStartIndex < fullHistory.length && fullHistory[historyStartIndex].role === "system") {
-    systemMessages.push(fullHistory[historyStartIndex]);
-    historyStartIndex++;
-  }
-  const conversationHistory = fullHistory.slice(historyStartIndex);
+function partitionConversationIntoTurnSlices(conversationHistory) {
   const turns = [];
   let currentTurn = [];
-  let turnsFound = 0;
   const isDevOverlay = (m) => m?.role === "user" && m?.name === "user_overlay";
   for (let i = conversationHistory.length - 1; i >= 0; i--) {
     const msg = conversationHistory[i];
     currentTurn.unshift(msg);
-    const endsWithAgentEnd = msg.role === "assistant" && msg.tool_calls?.some((tc) => isEndTurnToolCall(tc));
+    const endsWithAgentEnd = msg.role === "assistant" && msg.tool_calls?.some(
+      (tc) => isEndTurnToolCall(tc)
+    );
     if (endsWithAgentEnd) {
       turns.unshift([...currentTurn]);
       currentTurn = [];
-      turnsFound++;
-      if (turnsFound >= maxTurns) {
-        break;
-      }
       continue;
     }
     const prev = conversationHistory[i - 1];
     if (msg.role === "user" && !isDevOverlay(msg)) {
-      if (prev && prev.role === "assistant" && !prev.tool_calls?.some((tc) => isEndTurnToolCall(tc))) {
+      if (prev && prev.role === "assistant" && !prev.tool_calls?.some(
+        (tc) => isEndTurnToolCall(tc)
+      )) {
         const hasNonOverlay = currentTurn.some((m) => m.role !== "user" || !isDevOverlay(m));
         if (hasNonOverlay) {
           turns.unshift([...currentTurn]);
@@ -5154,8 +5519,76 @@ function createApiContextWindow(fullHistory, maxTurns) {
   if (currentTurn.length > 0) {
     turns.unshift(currentTurn);
   }
-  const finalContext = systemMessages.concat(turns.flat());
-  return finalContext;
+  return turns;
+}
+var DEFAULT_TOKEN_BUDGET = 6e4;
+var DEFAULT_COMPRESS_THRESHOLD = 0.7;
+var DEFAULT_KEEP_RECENT_TURNS = 8;
+function readContextOptionInt(envKey, fallback) {
+  const raw = (process.env[envKey] ?? "").trim();
+  if (!raw) return fallback;
+  const n = Number(raw);
+  return Number.isFinite(n) && n > 0 ? Math.floor(n) : fallback;
+}
+function readContextOptionFloat(envKey, fallback) {
+  const raw = (process.env[envKey] ?? "").trim();
+  if (!raw) return fallback;
+  const n = Number(raw);
+  return Number.isFinite(n) && n > 0 && n <= 1 ? n : fallback;
+}
+function buildContextMessages(systemMessages, anchor, pendingRaw, recentFlat) {
+  const anchorMsg = anchor ? [anchorToSystemMessage(anchor)] : [];
+  return [...systemMessages, ...anchorMsg, ...pendingRaw, ...recentFlat];
+}
+async function createApiContextWindow(fullHistory, currentAnchor, compressedTurnSliceCount, llmService, userContext, options) {
+  if (!fullHistory.length) {
+    return {
+      messages: [],
+      newAnchor: currentAnchor,
+      newCompressedTurnSliceCount: compressedTurnSliceCount
+    };
+  }
+  const tokenBudget = options?.tokenBudget ?? readContextOptionInt("BLUMA_CONTEXT_TOKEN_BUDGET", DEFAULT_TOKEN_BUDGET);
+  const compressThreshold = options?.compressThreshold ?? readContextOptionFloat("BLUMA_COMPRESS_THRESHOLD", DEFAULT_COMPRESS_THRESHOLD);
+  const keepRecentTurns = options?.keepRecentTurns ?? readContextOptionInt("BLUMA_KEEP_RECENT_TURNS", DEFAULT_KEEP_RECENT_TURNS);
+  const systemMessages = [];
+  let historyStartIndex = 0;
+  while (historyStartIndex < fullHistory.length && fullHistory[historyStartIndex].role === "system") {
+    systemMessages.push(fullHistory[historyStartIndex]);
+    historyStartIndex++;
+  }
+  const conversationHistory = fullHistory.slice(historyStartIndex);
+  const turnSlices = partitionConversationIntoTurnSlices(conversationHistory);
+  const n = turnSlices.length;
+  const recentStart = Math.max(0, n - keepRecentTurns);
+  let sliceCount = Math.min(Math.max(0, compressedTurnSliceCount), recentStart);
+  let anchor = currentAnchor;
+  const recentSlices = turnSlices.slice(recentStart);
+  const recentFlat = recentSlices.flat();
+  const thresholdTokens = tokenBudget * compressThreshold;
+  let pendingSlices = turnSlices.slice(sliceCount, recentStart);
+  let pendingFlat = pendingSlices.flat();
+  let messages = buildContextMessages(systemMessages, anchor, pendingFlat, recentFlat);
+  let tokens = countTokens(messages);
+  while (tokens >= thresholdTokens && pendingSlices.length > 0) {
+    anchor = await compressToAnchor(
+      pendingFlat,
+      anchor,
+      llmService,
+      userContext,
+      pendingSlices.length
+    );
+    sliceCount = recentStart;
+    pendingSlices = [];
+    pendingFlat = [];
+    messages = buildContextMessages(systemMessages, anchor, pendingFlat, recentFlat);
+    tokens = countTokens(messages);
+  }
+  return {
+    messages,
+    newAnchor: anchor,
+    newCompressedTurnSliceCount: sliceCount
+  };
 }
 
 // src/app/agent/core/llm/llm.ts
@@ -5538,7 +5971,9 @@ var BluMaAgent = class {
   mcpClient;
   feedbackSystem;
   skillLoader;
-  maxContextTurns = 5;
+  /** Memória comprimida persistida (turnos antigos) + cursor de fatias já absorvidas. */
+  sessionAnchor = null;
+  compressedTurnSliceCount = 0;
   isInterrupted = false;
   /** Mesmo turnId durante processTurn + todo o loop de tool_calls (FactorRouter). */
   activeTurnContext = null;
@@ -5562,50 +5997,74 @@ var BluMaAgent = class {
       this.eventBus.emit("backend_message", { type: "user_overlay", payload: clean, ts: data.ts || Date.now() });
       try {
         if (this.sessionFile) {
-          await saveSessionHistory(this.sessionFile, this.history);
+          this.persistSession();
         } else {
-          const [sessionFile, _] = await loadOrcreateSession(this.sessionId);
+          const [sessionFile, , mem] = await loadOrcreateSession(this.sessionId);
           this.sessionFile = sessionFile;
-          await saveSessionHistory(this.sessionFile, this.history);
+          this.sessionAnchor = mem.historyAnchor;
+          this.compressedTurnSliceCount = mem.compressedTurnSliceCount;
+          this.persistSession();
         }
       } catch (e) {
         this.eventBus.emit("backend_message", { type: "error", message: `Falha ao salvar hist\xF3rico ap\xF3s user_overlay: ${e.message}` });
       }
     });
   }
+  getMemorySnapshot() {
+    return {
+      historyAnchor: this.sessionAnchor,
+      compressedTurnSliceCount: this.compressedTurnSliceCount
+    };
+  }
+  /** Debounced: grava histórico + estado de compressão no mesmo ficheiro de sessão. */
+  persistSession() {
+    if (!this.sessionFile) return;
+    void saveSessionHistory(this.sessionFile, this.history, this.getMemorySnapshot());
+  }
   async initialize() {
     await this.mcpClient.nativeToolInvoker.initialize();
     await this.mcpClient.initialize();
-    const [sessionFile, history] = await loadOrcreateSession(this.sessionId);
+    const [sessionFile, history, mem] = await loadOrcreateSession(this.sessionId);
     this.sessionFile = sessionFile;
     this.history = history;
+    this.sessionAnchor = mem.historyAnchor;
+    this.compressedTurnSliceCount = mem.compressedTurnSliceCount;
     initializeSkillContext({
       history: this.history,
       skillLoader: this.skillLoader
     });
-    if (this.history.length === 0) {
-      const dirs = this.skillLoader.getSkillsDirs();
-      this.eventBus.emit("backend_message", {
-        type: "info",
-        message: `Skills dirs \u2014 bundled: ${dirs.bundled} | project: ${dirs.project} | global: ${dirs.global}`
-      });
-      const availableSkills = this.skillLoader.listAvailable();
-      this.eventBus.emit("backend_message", {
-        type: "info",
-        message: `Skills loaded: ${availableSkills.length} \u2014 ${availableSkills.map((s) => `${s.name} (${s.source})`).join(", ") || "none"}`
-      });
-      if (this.skillLoader.hasConflicts()) {
-        for (const warning of this.skillLoader.formatConflictWarnings()) {
-          this.eventBus.emit("backend_message", {
-            type: "warning",
-            message: warning
-          });
-        }
+    const dirs = this.skillLoader.getSkillsDirs();
+    this.eventBus.emit("backend_message", {
+      type: "info",
+      message: `Skills dirs \u2014 bundled: ${dirs.bundled} | project: ${dirs.project} | global: ${dirs.global}`
+    });
+    const availableSkills = this.skillLoader.listAvailable();
+    this.eventBus.emit("backend_message", {
+      type: "info",
+      message: `Skills loaded: ${availableSkills.length} \u2014 ${availableSkills.map((s) => `${s.name} (${s.source})`).join(", ") || "none"}`
+    });
+    if (this.skillLoader.hasConflicts()) {
+      for (const warning of this.skillLoader.formatConflictWarnings()) {
+        this.eventBus.emit("backend_message", {
+          type: "warning",
+          message: warning
+        });
       }
-      const systemPrompt = getUnifiedSystemPrompt(availableSkills);
+    }
+    const systemPrompt = getUnifiedSystemPrompt(availableSkills);
+    if (this.history.length === 0) {
       this.history.push({ role: "system", content: systemPrompt });
-      await saveSessionHistory(this.sessionFile, this.history);
+    } else {
+      const sysIdx = this.history.findIndex(
+        (m) => m.role === "system" && typeof m.content === "string" && String(m.content).includes("<identity>")
+      );
+      if (sysIdx >= 0) {
+        this.history[sysIdx] = { ...this.history[sysIdx], content: systemPrompt };
+      } else {
+        this.history.unshift({ role: "system", content: systemPrompt });
+      }
     }
+    this.persistSession();
   }
   getAvailableTools() {
     return this.mcpClient.getAvailableTools();
@@ -5634,11 +6093,13 @@ var BluMaAgent = class {
     let toolResultContent;
     let shouldContinueConversation = true;
     if (!this.sessionFile) {
-      const [sessionFile, history] = await loadOrcreateSession(this.sessionId);
+      const [sessionFile, history, mem] = await loadOrcreateSession(this.sessionId);
       this.sessionFile = sessionFile;
       if (this.history.length === 0 && history.length > 0) {
         this.history = history;
       }
+      this.sessionAnchor = mem.historyAnchor;
+      this.compressedTurnSliceCount = mem.compressedTurnSliceCount;
     }
     if (decisionData.type === "user_decision_execute") {
       const toolName = toolCall.function.name;
@@ -5660,7 +6121,7 @@ var BluMaAgent = class {
           raw_arguments: toolCall.function.arguments
         });
         this.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
-        await saveSessionHistory(this.sessionFile, this.history);
+        this.persistSession();
         await this._continueConversation();
         return;
       }
@@ -5672,7 +6133,7 @@ var BluMaAgent = class {
             received: toolArgs
           });
           this.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
-          await saveSessionHistory(this.sessionFile, this.history);
+          this.persistSession();
           await this._continueConversation();
           return;
         }
@@ -5683,7 +6144,7 @@ var BluMaAgent = class {
             received: toolArgs
           });
           this.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
-          await saveSessionHistory(this.sessionFile, this.history);
+          this.persistSession();
           await this._continueConversation();
           return;
         }
@@ -5753,7 +6214,7 @@ var BluMaAgent = class {
       toolResultContent = "The system rejected this action. Verify that the command you are executing contributes to the tasks intent and try again.";
     }
     this.history.push({ role: "tool", tool_call_id: toolCall.id, content: toolResultContent });
-    await saveSessionHistory(this.sessionFile, this.history);
+    this.persistSession();
     if (shouldContinueConversation && !this.isInterrupted) {
       await this._continueConversation();
     }
@@ -5803,7 +6264,16 @@ ${editData.error.display}`;
         this.eventBus.emit("backend_message", { type: "info", message: "Task Canceled." });
         return;
       }
-      const contextWindow = createApiContextWindow(this.history, this.maxContextTurns);
+      const { messages: contextWindow, newAnchor, newCompressedTurnSliceCount } = await createApiContextWindow(
+        this.history,
+        this.sessionAnchor,
+        this.compressedTurnSliceCount,
+        this.llm,
+        this.getLlmUserContext()
+      );
+      this.sessionAnchor = newAnchor;
+      this.compressedTurnSliceCount = newCompressedTurnSliceCount;
+      this.persistSession();
       const llmService = this.llm;
       if (typeof llmService.chatCompletionStream === "function") {
         await this._handleStreamingResponse(contextWindow);
@@ -5814,7 +6284,7 @@ ${editData.error.display}`;
       const errorMessage = error instanceof Error ? error.message : "An unknown API error occurred.";
       this.eventBus.emit("backend_message", { type: "error", message: errorMessage });
     } finally {
-      await saveSessionHistory(this.sessionFile, this.history);
+      this.persistSession();
     }
   }
   async _handleStreamingResponse(contextWindow) {
@@ -6623,18 +7093,15 @@ var Agent = class {
 
 // src/app/ui/WorkingTimer.tsx
 import { useState as useState4, useEffect as useEffect4, memo as memo5 } from "react";
-import { Box as Box7, Text as Text7 } from "ink";
-import { jsx as jsx7, jsxs as jsxs7 } from "react/jsx-runtime";
+import { Box as Box8, Text as Text8 } from "ink";
+import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
 var WorkingTimerComponent = ({ eventBus, taskName, taskStatus }) => {
-  const [currentAction, setCurrentAction] = useState4("Thinking...");
+  const [currentAction, setCurrentAction] = useState4("working");
   const [shinePosition, setShinePosition] = useState4(0);
-  const [dots, setDots] = useState4("");
   useEffect4(() => {
     if (!eventBus) return;
     const handleActionStatus = (data) => {
-      if (data.action) {
-        setCurrentAction(data.action);
-      }
+      if (data.action) setCurrentAction(data.action);
     };
     eventBus.on("action_status", handleActionStatus);
     return () => {
@@ -6647,12 +7114,6 @@ var WorkingTimerComponent = ({ eventBus, taskName, taskStatus }) => {
     }, 120);
     return () => clearInterval(shineTimer);
   }, []);
-  useEffect4(() => {
-    const dotsTimer = setInterval(() => {
-      setDots((prev) => prev.length >= 3 ? "" : prev + ".");
-    }, 500);
-    return () => clearInterval(dotsTimer);
-  }, []);
   const displayAction = taskStatus || currentAction;
   const renderShineText = (text) => {
     const chars = text.split("");
@@ -6661,29 +7122,28 @@ var WorkingTimerComponent = ({ eventBus, taskName, taskStatus }) => {
     return chars.map((char, i) => {
       const distance = Math.abs(i - shineIdx);
       if (distance <= 1) {
-        return /* @__PURE__ */ jsx7(Text7, { color: "white", dimColor: true, children: char }, i);
-      } else {
-        return /* @__PURE__ */ jsx7(Text7, { color: "gray", dimColor: true, children: char }, i);
+        return /* @__PURE__ */ jsx8(Text8, { color: BLUMA_TERMINAL.brandMagenta, children: char }, i);
       }
+      return /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: char }, i);
     });
   };
-  return /* @__PURE__ */ jsxs7(Box7, { flexDirection: "column", paddingX: 1, children: [
-    /* @__PURE__ */ jsx7(Box7, { children: renderShineText(displayAction) }),
-    taskName && /* @__PURE__ */ jsx7(Box7, { paddingLeft: 2, children: /* @__PURE__ */ jsxs7(Text7, { dimColor: true, children: [
-      "\u203A ",
+  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", marginBottom: 1, children: [
+    /* @__PURE__ */ jsx8(M3StatusStrip, { children: renderShineText(displayAction) }),
+    taskName ? /* @__PURE__ */ jsx8(Box8, { paddingLeft: 2, children: /* @__PURE__ */ jsxs8(Text8, { dimColor: true, children: [
+      /* @__PURE__ */ jsx8(Text8, { color: BLUMA_TERMINAL.brandBlue, children: "\u2514 " }),
       taskName
-    ] }) })
+    ] }) }) : null
   ] });
 };
 var WorkingTimer = memo5(WorkingTimerComponent);
 
 // src/app/ui/components/ToolCallDisplay.tsx
 import { memo as memo6 } from "react";
-import { Box as Box9 } from "ink";
+import { Box as Box10 } from "ink";
 
 // src/app/ui/components/toolCallRenderers.tsx
-import { Box as Box8, Text as Text8 } from "ink";
-import { jsx as jsx8, jsxs as jsxs8 } from "react/jsx-runtime";
+import { Box as Box9, Text as Text9 } from "ink";
+import { jsx as jsx9, jsxs as jsxs9 } from "react/jsx-runtime";
 var parseArgs = (args) => {
   if (typeof args === "string") {
     try {
@@ -6705,9 +7165,9 @@ var getBasename = (filepath) => {
 var renderShellCommand2 = ({ args }) => {
   const parsed = parseArgs(args);
   const command = parsed.command || "[no command]";
-  return /* @__PURE__ */ jsxs8(Box8, { paddingX: 1, children: [
-    /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: "$" }),
-    /* @__PURE__ */ jsxs8(Text8, { color: "white", children: [
+  return /* @__PURE__ */ jsxs9(Box9, { children: [
+    /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandBlue, bold: true, children: "$" }),
+    /* @__PURE__ */ jsxs9(Text9, { children: [
       " ",
       truncate(command, 70)
     ] })
@@ -6716,9 +7176,9 @@ var renderShellCommand2 = ({ args }) => {
 var renderLsTool2 = ({ args }) => {
   const parsed = parseArgs(args);
   const path19 = parsed.directory_path || ".";
-  return /* @__PURE__ */ jsxs8(Box8, { paddingX: 1, children: [
-    /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: "ls" }),
-    /* @__PURE__ */ jsxs8(Text8, { children: [
+  return /* @__PURE__ */ jsxs9(Box9, { children: [
+    /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandBlue, bold: true, children: "ls" }),
+    /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
       " ",
       path19
     ] })
@@ -6727,9 +7187,9 @@ var renderLsTool2 = ({ args }) => {
 var renderCountFilesLines = ({ args }) => {
   const parsed = parseArgs(args);
   const filepath = parsed.filepath || "[no file]";
-  return /* @__PURE__ */ jsxs8(Box8, { paddingX: 1, children: [
-    /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: "wc -l" }),
-    /* @__PURE__ */ jsxs8(Text8, { children: [
+  return /* @__PURE__ */ jsxs9(Box9, { children: [
+    /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandBlue, bold: true, children: "wc -l" }),
+    /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
       " ",
       getBasename(filepath)
     ] })
@@ -6740,14 +7200,15 @@ var renderReadFileLines2 = ({ args }) => {
   const filepath = parsed.filepath || "[no file]";
   const start = parsed.start_line || 1;
   const end = parsed.end_line || start;
-  return /* @__PURE__ */ jsxs8(Box8, { paddingX: 1, children: [
-    /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: "cat" }),
-    /* @__PURE__ */ jsxs8(Text8, { children: [
+  return /* @__PURE__ */ jsxs9(Box9, { children: [
+    /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandBlue, bold: true, children: "cat" }),
+    /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
       " ",
       getBasename(filepath)
     ] }),
-    /* @__PURE__ */ jsxs8(Text8, { color: "white", children: [
-      " :",
+    /* @__PURE__ */ jsxs9(Text9, { color: BLUMA_TERMINAL.brandMagenta, children: [
+      " ",
+      ":",
       start,
       "-",
       end
@@ -6758,9 +7219,9 @@ var renderBlumaNotebook = ({ args }) => {
   const parsed = parseArgs(args);
   const thought = parsed.thought || parsed.content?.thought || "[thinking...]";
   const truncated = truncate(thought, 100);
-  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", paddingX: 1, children: [
-    /* @__PURE__ */ jsx8(Box8, { children: /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: "thinking" }) }),
-    /* @__PURE__ */ jsx8(Box8, { paddingLeft: 2, children: /* @__PURE__ */ jsx8(Text8, { dimColor: true, italic: true, children: truncated }) })
+  return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx9(Box9, { children: /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandMagenta, bold: true, children: "thinking" }) }),
+    /* @__PURE__ */ jsx9(Box9, { paddingLeft: 2, children: /* @__PURE__ */ jsx9(Text9, { dimColor: true, italic: true, children: truncated }) })
   ] });
 };
 var renderEditToolCall = ({ args, preview }) => {
@@ -6768,20 +7229,20 @@ var renderEditToolCall = ({ args, preview }) => {
   const filepath = parsed.file_path || "[no file]";
   const oldStr = parsed.old_string || "";
   const newStr = parsed.new_string || "";
-  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", paddingX: 1, children: [
-    /* @__PURE__ */ jsxs8(Box8, { children: [
-      /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: "edit" }),
-      /* @__PURE__ */ jsxs8(Text8, { children: [
+  return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs9(Box9, { children: [
+      /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandMagenta, bold: true, children: "edit" }),
+      /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
         " ",
         getBasename(filepath)
       ] })
     ] }),
-    preview ? /* @__PURE__ */ jsx8(Box8, { marginTop: 1, children: /* @__PURE__ */ jsx8(SimpleDiff, { text: preview, maxHeight: 8 }) }) : /* @__PURE__ */ jsxs8(Box8, { paddingLeft: 2, flexDirection: "column", children: [
-      /* @__PURE__ */ jsxs8(Text8, { color: "red", dimColor: true, children: [
+    preview ? /* @__PURE__ */ jsx9(Box9, { marginTop: 1, children: /* @__PURE__ */ jsx9(SimpleDiff, { text: preview, maxHeight: 8 }) }) : /* @__PURE__ */ jsxs9(Box9, { paddingLeft: 2, flexDirection: "column", children: [
+      /* @__PURE__ */ jsxs9(Text9, { color: "red", dimColor: true, children: [
         "- ",
         truncate(oldStr, 50)
       ] }),
-      /* @__PURE__ */ jsxs8(Text8, { color: "green", bold: true, children: [
+      /* @__PURE__ */ jsxs9(Text9, { color: "green", bold: true, children: [
         "+ ",
         truncate(newStr, 50)
       ] })
@@ -6797,36 +7258,40 @@ var renderTodoTool2 = ({ args }) => {
   const barWidth = 10;
   const filled = Math.round(progress / 100 * barWidth);
   const bar = "=".repeat(filled) + " ".repeat(barWidth - filled);
-  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", paddingX: 1, children: [
-    /* @__PURE__ */ jsxs8(Box8, { children: [
-      /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: "todo" }),
-      /* @__PURE__ */ jsxs8(Text8, { children: [
-        " [",
+  return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs9(Box9, { flexDirection: "row", flexWrap: "wrap", children: [
+      /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandBlue, bold: true, children: pending }),
+      /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: " open \xB7 " }),
+      /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandMagenta, bold: true, children: completed }),
+      /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: " done \xB7 " }),
+      /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
+        "[",
         bar,
         "] ",
         progress,
         "%"
       ] })
     ] }),
-    tasks.length > 0 && /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", paddingLeft: 2, children: [
-      tasks.slice(0, 15).map((task, i) => /* @__PURE__ */ jsxs8(
-        Text8,
-        {
-          color: task.isComplete === true ? "gray" : "white",
-          dimColor: task.isComplete === true,
-          strikethrough: task.isComplete === true,
-          children: [
-            task.isComplete === true ? "[x]" : "[ ]",
-            " ",
-            task.description
-          ]
-        },
-        i
-      )),
-      tasks.length > 15 && /* @__PURE__ */ jsxs8(Text8, { dimColor: true, children: [
-        "... +",
+    tasks.length > 0 && /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", marginTop: 1, paddingLeft: 1, children: [
+      tasks.slice(0, 15).map((task, i) => {
+        const done = task.isComplete === true;
+        return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "row", children: [
+          /* @__PURE__ */ jsx9(Text9, { color: done ? BLUMA_TERMINAL.brandBlue : BLUMA_TERMINAL.brandMagenta, children: done ? "\u25A0 " : "\u25A1 " }),
+          /* @__PURE__ */ jsx9(
+            Text9,
+            {
+              dimColor: done,
+              strikethrough: done,
+              color: done ? BLUMA_TERMINAL.muted : void 0,
+              children: task.description
+            }
+          )
+        ] }, i);
+      }),
+      tasks.length > 15 && /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
+        "\u2026 +",
         tasks.length - 15,
-        " more tasks"
+        " tasks"
       ] })
     ] })
   ] });
@@ -6835,14 +7300,14 @@ var renderFindByName = ({ args }) => {
   const parsed = parseArgs(args);
   const pattern = parsed.pattern || "*";
   const dir = parsed.directory || ".";
-  return /* @__PURE__ */ jsxs8(Box8, { paddingX: 1, children: [
-    /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: "find" }),
-    /* @__PURE__ */ jsxs8(Text8, { color: "white", children: [
+  return /* @__PURE__ */ jsxs9(Box9, { children: [
+    /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandBlue, bold: true, children: "find" }),
+    /* @__PURE__ */ jsxs9(Text9, { color: BLUMA_TERMINAL.brandMagenta, children: [
       ' "',
       pattern,
       '"'
     ] }),
-    /* @__PURE__ */ jsxs8(Text8, { children: [
+    /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
       " in ",
       dir
     ] })
@@ -6852,14 +7317,14 @@ var renderGrepSearch = ({ args }) => {
   const parsed = parseArgs(args);
   const query = parsed.query || "";
   const path19 = parsed.path || ".";
-  return /* @__PURE__ */ jsxs8(Box8, { paddingX: 1, children: [
-    /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: "grep" }),
-    /* @__PURE__ */ jsxs8(Text8, { color: "white", children: [
+  return /* @__PURE__ */ jsxs9(Box9, { children: [
+    /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandBlue, bold: true, children: "grep" }),
+    /* @__PURE__ */ jsxs9(Text9, { color: BLUMA_TERMINAL.brandMagenta, children: [
       ' "',
       truncate(query, 30),
       '"'
     ] }),
-    /* @__PURE__ */ jsxs8(Text8, { children: [
+    /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
       " ",
       path19
     ] })
@@ -6868,9 +7333,9 @@ var renderGrepSearch = ({ args }) => {
 var renderViewFileOutline = ({ args }) => {
   const parsed = parseArgs(args);
   const filepath = parsed.file_path || "[no file]";
-  return /* @__PURE__ */ jsxs8(Box8, { paddingX: 1, children: [
-    /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: "outline" }),
-    /* @__PURE__ */ jsxs8(Text8, { children: [
+  return /* @__PURE__ */ jsxs9(Box9, { children: [
+    /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandBlue, bold: true, children: "outline" }),
+    /* @__PURE__ */ jsxs9(Text9, { dimColor: true, children: [
       " ",
       getBasename(filepath)
     ] })
@@ -6879,9 +7344,9 @@ var renderViewFileOutline = ({ args }) => {
 var renderCommandStatus = ({ args }) => {
   const parsed = parseArgs(args);
   const id = parsed.command_id || "[no id]";
-  return /* @__PURE__ */ jsxs8(Box8, { paddingX: 1, children: [
-    /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: "status" }),
-    /* @__PURE__ */ jsxs8(Text8, { children: [
+  return /* @__PURE__ */ jsxs9(Box9, { children: [
+    /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandBlue, bold: true, children: "status" }),
+    /* @__PURE__ */ jsxs9(Text9, { color: BLUMA_TERMINAL.brandMagenta, children: [
       " #",
       id
     ] })
@@ -6893,36 +7358,36 @@ var renderTaskBoundary = ({ args }) => {
   const mode = parsed.mode || "EXECUTION";
   const status = parsed.task_status || "";
   const modeColors = {
-    PLANNING: "blue",
-    EXECUTION: "green",
-    VERIFICATION: "yellow"
+    PLANNING: BLUMA_TERMINAL.brandBlue,
+    EXECUTION: BLUMA_TERMINAL.brandBlue,
+    VERIFICATION: BLUMA_TERMINAL.brandMagenta
   };
   const modeSymbols = {
     PLANNING: "P",
     EXECUTION: "E",
     VERIFICATION: "V"
   };
-  return /* @__PURE__ */ jsxs8(Box8, { flexDirection: "column", paddingX: 1, children: [
-    /* @__PURE__ */ jsxs8(Box8, { children: [
-      /* @__PURE__ */ jsxs8(Text8, { color: modeColors[mode] || "gray", bold: true, children: [
+  return /* @__PURE__ */ jsxs9(Box9, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsxs9(Box9, { children: [
+      /* @__PURE__ */ jsxs9(Text9, { color: modeColors[mode] || BLUMA_TERMINAL.muted, bold: true, children: [
         "[",
         modeSymbols[mode] || "?",
         "]"
       ] }),
-      /* @__PURE__ */ jsxs8(Text8, { children: [
+      /* @__PURE__ */ jsxs9(Text9, { children: [
         " ",
         name
       ] })
     ] }),
-    status && /* @__PURE__ */ jsx8(Box8, { paddingLeft: 4, children: /* @__PURE__ */ jsx8(Text8, { dimColor: true, children: truncate(status, 60) }) })
+    status && /* @__PURE__ */ jsx9(Box9, { paddingLeft: 4, children: /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: truncate(status, 60) }) })
   ] });
 };
 var renderSearchWeb = ({ args }) => {
   const parsed = parseArgs(args);
   const query = parsed.query || "[no query]";
-  return /* @__PURE__ */ jsxs8(Box8, { paddingX: 1, children: [
-    /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: "search" }),
-    /* @__PURE__ */ jsxs8(Text8, { color: "white", children: [
+  return /* @__PURE__ */ jsxs9(Box9, { children: [
+    /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandBlue, bold: true, children: "search" }),
+    /* @__PURE__ */ jsxs9(Text9, { color: BLUMA_TERMINAL.brandMagenta, children: [
       ' "',
       truncate(query, 40),
       '"'
@@ -6932,9 +7397,9 @@ var renderSearchWeb = ({ args }) => {
 var renderLoadSkill = ({ args }) => {
   const parsed = parseArgs(args);
   const skillName = parsed.skill_name || "[no skill]";
-  return /* @__PURE__ */ jsxs8(Box8, { paddingX: 1, children: [
-    /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: "load skill" }),
-    /* @__PURE__ */ jsxs8(Text8, { color: "white", children: [
+  return /* @__PURE__ */ jsxs9(Box9, { children: [
+    /* @__PURE__ */ jsx9(Text9, { color: BLUMA_TERMINAL.brandBlue, bold: true, children: "load skill" }),
+    /* @__PURE__ */ jsxs9(Text9, { color: BLUMA_TERMINAL.brandMagenta, children: [
       " ",
       skillName
     ] })
@@ -6943,13 +7408,7 @@ var renderLoadSkill = ({ args }) => {
 var renderGeneric2 = ({ toolName, args }) => {
   const parsed = parseArgs(args);
   const keys = Object.keys(parsed).slice(0, 2);
-  return /* @__PURE__ */ jsxs8(Box8, { paddingX: 1, children: [
-    /* @__PURE__ */ jsx8(Text8, { color: "white", bold: true, children: toolName }),
-    keys.length > 0 && /* @__PURE__ */ jsxs8(Text8, { children: [
-      " ",
-      keys.map((k) => `${k}:${truncate(String(parsed[k]), 20)}`).join(" ")
-    ] })
-  ] });
+  return /* @__PURE__ */ jsx9(Box9, { children: keys.length > 0 ? /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: keys.map((k) => `${k}:${truncate(String(parsed[k]), 20)}`).join(" ") }) : /* @__PURE__ */ jsx9(Text9, { dimColor: true, children: "\u2014" }) });
 };
 var ToolRenderDisplay = {
   shell_command: renderShellCommand2,
@@ -6969,76 +7428,230 @@ var ToolRenderDisplay = {
 };
 
 // src/app/ui/components/ToolCallDisplay.tsx
-import { jsx as jsx9 } from "react/jsx-runtime";
+import { jsx as jsx10 } from "react/jsx-runtime";
 var ToolCallDisplayComponent = ({ toolName, args, preview }) => {
-  if (toolName.includes("message")) {
+  if (toolName.includes("message") || toolName.includes("task_boundary") || toolName === "todo") {
     return null;
   }
   const Renderer = ToolRenderDisplay[toolName] || ((props) => renderGeneric2({ ...props, toolName }));
-  return /* @__PURE__ */ jsx9(Box9, { marginBottom: 1, children: /* @__PURE__ */ jsx9(Renderer, { toolName, args, preview }) });
+  return /* @__PURE__ */ jsx10(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsx10(Box10, { flexDirection: "column", paddingLeft: 1, children: /* @__PURE__ */ jsx10(Renderer, { toolName, args, preview }) }) });
 };
 var ToolCallDisplay = memo6(ToolCallDisplayComponent);
 
 // src/app/ui/components/ToolResultDisplay.tsx
-import { memo as memo8 } from "react";
-import { Box as Box11, Text as Text10 } from "ink";
+import { memo as memo8, useEffect as useEffect5 } from "react";
+import { Box as Box12, Text as Text11 } from "ink";
 
 // src/app/ui/components/MarkdownRenderer.tsx
-import { memo as memo7 } from "react";
-import { Box as Box10, Text as Text9 } from "ink";
+import { cloneElement, isValidElement, memo as memo7 } from "react";
+import { Box as Box11, Text as Text10 } from "ink";
 import { marked } from "marked";
 import { highlight } from "cli-highlight";
-import { Fragment as Fragment3, jsx as jsx10, jsxs as jsxs9 } from "react/jsx-runtime";
-var COLORS = {
-  heading: "cyan",
-  code: "gray",
-  link: "blue",
-  quote: "gray",
-  listBullet: "gray"
-};
-function renderTokens(tokens) {
+import { jsx as jsx11, jsxs as jsxs10 } from "react/jsx-runtime";
+marked.setOptions({ gfm: true });
+function styleInlineNodes(nodes, keyPrefix, style) {
+  return nodes.map(
+    (n, j) => isValidElement(n) ? cloneElement(n, {
+      key: `${keyPrefix}-${j}`,
+      ...style
+    }) : n
+  );
+}
+function headingColor(depth) {
+  if (depth <= 1) return BLUMA_TERMINAL.heading1;
+  if (depth === 2) return BLUMA_TERMINAL.heading2;
+  return BLUMA_TERMINAL.headingDeep;
+}
+function bulletGlyph(ordered, index, start, task, checked, depth) {
+  if (task) return checked ? "[x]" : "[ ]";
+  if (ordered) {
+    const n = typeof start === "number" ? start + index : index + 1;
+    return `${n}.`;
+  }
+  return depth === 0 ? "\xB7" : "\u2514";
+}
+function walkInline(tokens, keyBase, opts = {}) {
+  if (!tokens?.length) return [];
+  const out = [];
+  tokens.forEach((t, i) => {
+    const k = `${keyBase}-i${i}`;
+    switch (t.type) {
+      case "text":
+        out.push(
+          /* @__PURE__ */ jsx11(
+            Text10,
+            {
+              bold: opts.bold,
+              italic: opts.italic,
+              strikethrough: opts.strike,
+              underline: opts.link,
+              color: opts.link ? BLUMA_TERMINAL.link : opts.bold ? BLUMA_TERMINAL.brandBlue : void 0,
+              children: t.text
+            },
+            k
+          )
+        );
+        break;
+      case "strong":
+        out.push(...walkInline(t.tokens, k, { ...opts, bold: true }));
+        break;
+      case "em":
+        out.push(...walkInline(t.tokens, k, { ...opts, italic: true }));
+        break;
+      case "codespan":
+        out.push(
+          /* @__PURE__ */ jsx11(
+            Text10,
+            {
+              color: opts.link ? BLUMA_TERMINAL.link : BLUMA_TERMINAL.code,
+              backgroundColor: opts.link ? void 0 : "black",
+              underline: opts.link,
+              children: opts.link ? t.text : `\xA0${t.text}\xA0`
+            },
+            k
+          )
+        );
+        break;
+      case "link": {
+        const L = t;
+        const inner = walkInline(L.tokens, k + "l", { ...opts, link: true });
+        out.push(
+          /* @__PURE__ */ jsx11(Box11, { flexDirection: "row", flexWrap: "wrap", children: inner.length > 0 ? inner : /* @__PURE__ */ jsx11(Text10, { color: BLUMA_TERMINAL.link, underline: true, children: L.text }) }, k)
+        );
+        break;
+      }
+      case "br":
+        out.push(
+          /* @__PURE__ */ jsx11(Text10, { dimColor: true, children: "\n" }, k)
+        );
+        break;
+      case "escape":
+        out.push(
+          /* @__PURE__ */ jsx11(
+            Text10,
+            {
+              bold: opts.bold,
+              italic: opts.italic,
+              underline: opts.link,
+              color: opts.link ? BLUMA_TERMINAL.link : void 0,
+              children: t.text
+            },
+            k
+          )
+        );
+        break;
+      case "del":
+        out.push(...walkInline(t.tokens, k, { ...opts, strike: true }));
+        break;
+      case "image": {
+        const Im = t;
+        out.push(
+          /* @__PURE__ */ jsxs10(Text10, { dimColor: true, italic: true, children: [
+            "[",
+            Im.text || "img",
+            "]"
+          ] }, k)
+        );
+        break;
+      }
+      default:
+        if ("text" in t && typeof t.text === "string") {
+          out.push(
+            /* @__PURE__ */ jsx11(Text10, { bold: opts.bold, italic: opts.italic, children: t.text }, k)
+          );
+        }
+    }
+  });
+  return out;
+}
+function renderParagraph(p, key) {
+  const nodes = walkInline(p.tokens, key);
+  return /* @__PURE__ */ jsx11(Box11, { marginBottom: 1, flexDirection: "row", flexWrap: "wrap", children: nodes.length > 0 ? nodes : /* @__PURE__ */ jsx11(Text10, { dimColor: true, children: p.text }) }, key);
+}
+function renderListItemBlocks(item, depth, keyBase) {
+  if (!item.tokens?.length) {
+    const nodes = walkInline(
+      [{ type: "text", raw: item.text, text: item.text }],
+      keyBase
+    );
+    return nodes.length ? [/* @__PURE__ */ jsx11(Box11, { flexDirection: "row", flexWrap: "wrap", children: nodes }, keyBase)] : [];
+  }
+  const blocks = [];
+  item.tokens.forEach((sub, si) => {
+    const sk = `${keyBase}-b${si}`;
+    if (sub.type === "paragraph") {
+      blocks.push(renderParagraph(sub, sk));
+    } else if (sub.type === "list") {
+      blocks.push(renderListBlock(sub, depth + 1, sk));
+    } else if (sub.type === "text") {
+      const n = walkInline([sub], sk);
+      if (n.length) blocks.push(/* @__PURE__ */ jsx11(Box11, { flexDirection: "row", flexWrap: "wrap", children: n }, sk));
+    }
+  });
+  return blocks;
+}
+function renderListBlock(list, depth, keyBase) {
+  return /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", marginBottom: 1, paddingLeft: depth > 0 ? 2 : 0, children: list.items.map((item, idx) => {
+    const glyph = bulletGlyph(
+      list.ordered,
+      idx,
+      list.start,
+      item.task,
+      item.checked,
+      depth
+    );
+    const gColor = depth === 0 ? BLUMA_TERMINAL.listBullet : BLUMA_TERMINAL.listBulletSub;
+    const body = renderListItemBlocks(item, depth, `${keyBase}-it${idx}`);
+    return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "row", alignItems: "flex-start", marginBottom: 0, children: [
+      /* @__PURE__ */ jsx11(Text10, { color: gColor, children: (item.task ? glyph : `${glyph} `).padEnd(item.task ? 4 : 3, " ") }),
+      /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", flexGrow: 1, children: body.length > 0 ? body : /* @__PURE__ */ jsx11(Text10, { dimColor: true, children: item.text }) })
+    ] }, `${keyBase}-row-${idx}`);
+  }) }, keyBase);
+}
+function renderBlockquote(q, key) {
+  const inner = q.tokens && q.tokens.length > 0 ? renderBlockTokens(q.tokens, `${key}-inner`) : /* @__PURE__ */ jsx11(Text10, { dimColor: true, italic: true, children: q.text });
+  return /* @__PURE__ */ jsxs10(
+    Box11,
+    {
+      flexDirection: "row",
+      marginBottom: 1,
+      borderStyle: "single",
+      borderColor: BLUMA_TERMINAL.brandMagenta,
+      paddingLeft: 1,
+      paddingY: 0,
+      children: [
+        /* @__PURE__ */ jsx11(Text10, { color: BLUMA_TERMINAL.brandMagenta, children: "\u2502 " }),
+        /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", flexGrow: 1, children: inner })
+      ]
+    },
+    key
+  );
+}
+function renderBlockTokens(tokens, keyRoot) {
   const elements = [];
   for (let i = 0; i < tokens.length; i++) {
     const token = tokens[i];
-    const key = `token-${i}`;
+    const key = `${keyRoot}-${i}`;
     switch (token.type) {
       case "heading": {
-        const heading = token;
-        const prefix = "#".repeat(heading.depth);
+        const h = token;
+        const color = headingColor(h.depth);
+        const prefix = h.depth <= 2 ? `${"#".repeat(h.depth)} ` : "";
+        const inner = walkInline(h.tokens, `${key}-h`);
         elements.push(
-          /* @__PURE__ */ jsx10(Box10, { marginBottom: 1, children: /* @__PURE__ */ jsxs9(Text9, { color: COLORS.heading, bold: true, children: [
-            prefix,
-            " ",
-            heading.text
-          ] }) }, key)
+          /* @__PURE__ */ jsxs10(Box11, { marginBottom: 1, flexDirection: "row", flexWrap: "wrap", alignItems: "flex-start", children: [
+            /* @__PURE__ */ jsx11(Text10, { color, bold: true, children: prefix }),
+            inner.length > 0 ? inner : /* @__PURE__ */ jsx11(Text10, { color, bold: true, children: h.text })
+          ] }, key)
         );
         break;
       }
-      case "paragraph": {
-        const para = token;
-        elements.push(
-          /* @__PURE__ */ jsx10(Box10, { marginBottom: 1, children: renderInline(para.text) }, key)
-        );
+      case "paragraph":
+        elements.push(renderParagraph(token, key));
         break;
-      }
-      case "list": {
-        const list = token;
-        list.items.forEach((item, idx) => {
-          const bullet = list.ordered ? `${idx + 1}.` : "\u2022";
-          const text = item.tokens?.filter((t) => t.type === "text").map((t) => t.text).join("") || item.text;
-          elements.push(
-            /* @__PURE__ */ jsxs9(Box10, { paddingLeft: 1, children: [
-              /* @__PURE__ */ jsx10(Text9, { color: COLORS.listBullet, children: bullet }),
-              /* @__PURE__ */ jsxs9(Text9, { children: [
-                " ",
-                renderInline(text)
-              ] })
-            ] }, `${key}-item-${idx}`)
-          );
-        });
-        elements.push(/* @__PURE__ */ jsx10(Box10, { marginBottom: 1 }, `${key}-spacer`));
+      case "list":
+        elements.push(renderListBlock(token, 0, key));
         break;
-      }
       case "code": {
         const code = token;
         let highlighted;
@@ -7051,110 +7664,144 @@ function renderTokens(tokens) {
           highlighted = code.text;
         }
         elements.push(
-          /* @__PURE__ */ jsxs9(Box10, { flexDirection: "column", marginBottom: 1, children: [
-            code.lang && /* @__PURE__ */ jsx10(Text9, { dimColor: true, children: code.lang }),
-            /* @__PURE__ */ jsx10(Box10, { paddingLeft: 1, children: /* @__PURE__ */ jsx10(Text9, { children: highlighted }) })
-          ] }, key)
+          /* @__PURE__ */ jsxs10(
+            Box11,
+            {
+              flexDirection: "column",
+              marginBottom: 1,
+              borderStyle: "single",
+              borderColor: BLUMA_TERMINAL.panelBorder,
+              paddingX: 1,
+              children: [
+                code.lang ? /* @__PURE__ */ jsx11(Text10, { color: BLUMA_TERMINAL.codeLabel, dimColor: true, children: code.lang }) : null,
+                /* @__PURE__ */ jsx11(Text10, { dimColor: true, children: highlighted })
+              ]
+            },
+            key
+          )
         );
         break;
       }
-      case "blockquote": {
-        const quote = token;
-        elements.push(
-          /* @__PURE__ */ jsxs9(Box10, { marginBottom: 1, children: [
-            /* @__PURE__ */ jsx10(Text9, { color: COLORS.quote, children: "\u2502 " }),
-            /* @__PURE__ */ jsx10(Text9, { dimColor: true, italic: true, children: quote.text })
-          ] }, key)
-        );
+      case "blockquote":
+        elements.push(renderBlockquote(token, key));
         break;
-      }
       case "table": {
         const table = token;
         elements.push(
-          /* @__PURE__ */ jsx10(Box10, { flexDirection: "row", children: table.header.map((cell, idx) => /* @__PURE__ */ jsx10(Box10, { paddingRight: 2, children: /* @__PURE__ */ jsx10(Text9, { bold: true, children: cell.text }) }, idx)) }, `${key}-header`)
+          /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", marginBottom: 1, children: [
+            /* @__PURE__ */ jsx11(Box11, { flexDirection: "row", children: table.header.map((cell, idx) => {
+              const headerNodes = walkInline(cell.tokens, `${key}-h${idx}`);
+              const styled = headerNodes.length > 0 ? styleInlineNodes(headerNodes, `${key}-h${idx}`, { bold: true, color: BLUMA_TERMINAL.brandBlue }) : [/* @__PURE__ */ jsx11(Text10, { bold: true, color: BLUMA_TERMINAL.brandBlue, children: cell.text }, `${key}-h${idx}-t`)];
+              return /* @__PURE__ */ jsx11(Box11, { paddingRight: 2, flexDirection: "row", flexWrap: "wrap", children: styled }, idx);
+            }) }),
+            table.rows.map((row, rowIdx) => /* @__PURE__ */ jsx11(Box11, { flexDirection: "row", children: row.map((cell, cellIdx) => {
+              const cellNodes = walkInline(cell.tokens, `${key}-c${rowIdx}-${cellIdx}`);
+              const styled = cellNodes.length > 0 ? styleInlineNodes(cellNodes, `${key}-c${rowIdx}-${cellIdx}`, { dimColor: true }) : [/* @__PURE__ */ jsx11(Text10, { dimColor: true, children: cell.text }, `${key}-c${rowIdx}-${cellIdx}-t`)];
+              return /* @__PURE__ */ jsx11(Box11, { paddingRight: 2, flexDirection: "row", flexWrap: "wrap", children: styled }, cellIdx);
+            }) }, `${key}-r${rowIdx}`))
+          ] }, key)
         );
-        table.rows.forEach((row, rowIdx) => {
-          elements.push(
-            /* @__PURE__ */ jsx10(Box10, { flexDirection: "row", children: row.map((cell, cellIdx) => /* @__PURE__ */ jsx10(Box10, { paddingRight: 2, children: /* @__PURE__ */ jsx10(Text9, { children: cell.text }) }, cellIdx)) }, `${key}-row-${rowIdx}`)
-          );
-        });
-        elements.push(/* @__PURE__ */ jsx10(Box10, { marginBottom: 1 }, `${key}-spacer`));
         break;
       }
-      case "hr": {
+      case "hr":
         elements.push(
-          /* @__PURE__ */ jsx10(Box10, { marginBottom: 1, children: /* @__PURE__ */ jsx10(Text9, { dimColor: true, children: "\u2500".repeat(40) }) }, key)
+          /* @__PURE__ */ jsx11(Box11, { marginY: 1, children: /* @__PURE__ */ jsx11(Text10, { dimColor: true, children: "\u2500".repeat(42) }) }, key)
         );
         break;
-      }
-      case "space": {
+      case "space":
         break;
-      }
-      default: {
+      default:
         if ("text" in token && typeof token.text === "string") {
-          elements.push(/* @__PURE__ */ jsx10(Text9, { children: token.text }, key));
+          elements.push(
+            /* @__PURE__ */ jsx11(Text10, { dimColor: true, children: token.text }, key)
+          );
         }
-      }
     }
   }
   return elements;
 }
-function renderInline(text) {
-  const parts = [];
-  let remaining = text;
-  let partIndex = 0;
-  const inlineRegex = /(\*\*(.+?)\*\*|\*(.+?)\*|`(.+?)`|\[(.+?)\]\((.+?)\))/;
-  while (remaining.length > 0) {
-    const match = remaining.match(inlineRegex);
-    if (!match) {
-      parts.push(/* @__PURE__ */ jsx10(Text9, { children: remaining }, `inline-${partIndex++}`));
-      break;
-    }
-    const matchIndex = match.index ?? 0;
-    if (matchIndex > 0) {
-      parts.push(
-        /* @__PURE__ */ jsx10(Text9, { children: remaining.slice(0, matchIndex) }, `inline-${partIndex++}`)
-      );
-    }
-    const fullMatch = match[0];
-    if (fullMatch.startsWith("**")) {
-      parts.push(
-        /* @__PURE__ */ jsx10(Text9, { bold: true, children: match[2] }, `inline-${partIndex++}`)
-      );
-    } else if (fullMatch.startsWith("*")) {
-      parts.push(
-        /* @__PURE__ */ jsx10(Text9, { italic: true, children: match[3] }, `inline-${partIndex++}`)
-      );
-    } else if (fullMatch.startsWith("`")) {
-      parts.push(
-        /* @__PURE__ */ jsxs9(Text9, { color: COLORS.code, children: [
-          "`",
-          match[4],
-          "`"
-        ] }, `inline-${partIndex++}`)
-      );
-    } else if (fullMatch.startsWith("[")) {
-      parts.push(
-        /* @__PURE__ */ jsx10(Text9, { color: COLORS.link, underline: true, children: match[5] }, `inline-${partIndex++}`)
-      );
-    }
-    remaining = remaining.slice(matchIndex + fullMatch.length);
-  }
-  return parts.length === 1 ? parts[0] : /* @__PURE__ */ jsx10(Fragment3, { children: parts });
-}
 var MarkdownRendererComponent = ({ markdown }) => {
   if (!markdown || markdown.trim() === "") {
     return null;
   }
   const tokens = marked.lexer(markdown);
-  return /* @__PURE__ */ jsx10(Box10, { flexDirection: "column", children: renderTokens(tokens) });
+  return /* @__PURE__ */ jsx11(Box11, { flexDirection: "column", paddingRight: 1, children: renderBlockTokens(tokens, "md") });
 };
 var MarkdownRenderer = memo7(MarkdownRendererComponent);
 
+// src/app/ui/utils/expandablePreviewStore.ts
+var latest = null;
+function parseResult(result) {
+  try {
+    return JSON.parse(result);
+  } catch {
+    return null;
+  }
+}
+function truncatedLineCount(text, maxVisible) {
+  const allLines = text.split("\n").filter((l) => l.trim());
+  if (allLines.length <= maxVisible) {
+    return { truncated: 0, totalKept: allLines.length };
+  }
+  return { truncated: allLines.length - maxVisible, totalKept: maxVisible };
+}
+function refreshExpandableFromToolResult(toolName, result) {
+  if (toolName.includes("task_boundary")) {
+    return;
+  }
+  const parsed = parseResult(result);
+  if (toolName.includes("read_file") && parsed && typeof parsed.content === "string") {
+    const { truncated } = truncatedLineCount(parsed.content, TOOL_PREVIEW_MAX_LINES);
+    if (truncated > 0) {
+      const fp = typeof parsed.filepath === "string" ? parsed.filepath : "file";
+      const sl = parsed.start_line;
+      const el = parsed.end_line;
+      const range = typeof sl === "number" && typeof el === "number" ? ` :${sl}-${el}` : "";
+      latest = {
+        fullText: parsed.content,
+        title: `${fp}${range}`,
+        toolName,
+        linesHidden: truncated
+      };
+    } else {
+      latest = null;
+    }
+    return;
+  }
+  if ((toolName.includes("shell_command") || toolName.includes("run_command") || toolName.includes("command_status")) && parsed) {
+    const output = String(parsed.stdout || parsed.output || "");
+    const stderr = String(parsed.stderr || "");
+    const status = String(parsed.status || "");
+    if (parsed.command_id && !output && !stderr && !status) {
+      return;
+    }
+    if (status === "running") {
+      return;
+    }
+    const blob = output || stderr;
+    if (!blob) {
+      return;
+    }
+    const { truncated } = truncatedLineCount(blob, TOOL_PREVIEW_MAX_LINES);
+    if (truncated > 0) {
+      latest = {
+        fullText: blob,
+        title: "shell output",
+        toolName,
+        linesHidden: truncated
+      };
+    } else {
+      latest = null;
+    }
+  }
+}
+function peekLatestExpandable() {
+  return latest;
+}
+
 // src/app/ui/components/ToolResultDisplay.tsx
-import { jsx as jsx11, jsxs as jsxs10 } from "react/jsx-runtime";
-var MAX_LINES = 8;
-var parseResult = (result) => {
+import { jsx as jsx12, jsxs as jsxs11 } from "react/jsx-runtime";
+var parseResult2 = (result) => {
   try {
     return JSON.parse(result);
   } catch {
@@ -7171,153 +7818,222 @@ var truncateLines = (text, max) => {
     truncated: allLines.length - max
   };
 };
+function TodoTaskLine({
+  done,
+  label
+}) {
+  return /* @__PURE__ */ jsxs11(Box12, { flexDirection: "row", children: [
+    /* @__PURE__ */ jsx12(Text11, { color: done ? BLUMA_TERMINAL.brandBlue : BLUMA_TERMINAL.brandMagenta, children: done ? "\u25A0 " : "\u25A1 " }),
+    /* @__PURE__ */ jsx12(Text11, { dimColor: done, strikethrough: done, color: done ? BLUMA_TERMINAL.muted : void 0, children: label })
+  ] });
+}
 var ToolResultDisplayComponent = ({ toolName, result }) => {
+  useEffect5(() => {
+    refreshExpandableFromToolResult(toolName, result);
+  }, [toolName, result]);
   if (toolName.includes("task_boundary")) {
     return null;
   }
-  const parsed = parseResult(result);
+  const parsed = parseResult2(result);
   if (toolName.includes("message")) {
-    const body = parsed?.content?.body || parsed?.body || parsed?.message;
+    const body = parsed?.content?.body ?? parsed?.body ?? parsed?.message;
     if (!body) return null;
-    return /* @__PURE__ */ jsx11(Box11, { paddingX: 1, marginBottom: 1, flexDirection: "column", children: /* @__PURE__ */ jsx11(MarkdownRenderer, { markdown: body }) });
-  }
-  if (toolName.includes("read_file") && parsed?.content) {
-    const { lines, truncated } = truncateLines(parsed.content, MAX_LINES);
-    return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", paddingLeft: 3, children: [
-      lines.map((line, i) => /* @__PURE__ */ jsx11(Text10, { dimColor: true, color: "gray", children: line.slice(0, 80) }, i)),
-      truncated > 0 && /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-        "... +",
+    return /* @__PURE__ */ jsx12(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsx12(Box12, { paddingLeft: 2, flexDirection: "column", children: /* @__PURE__ */ jsx12(MarkdownRenderer, { markdown: String(body) }) }) });
+  }
+  if (toolName.includes("read_file") && parsed && typeof parsed.content === "string") {
+    const { lines, truncated } = truncateLines(parsed.content, TOOL_PREVIEW_MAX_LINES);
+    return /* @__PURE__ */ jsx12(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", paddingLeft: 2, children: [
+      lines.map((line, i) => /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: line.slice(0, 120) }, i)),
+      truncated > 0 ? /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+        "\u2026 +",
         truncated,
-        " lines"
-      ] })
-    ] });
+        " lines \xB7 Ctrl+O expand"
+      ] }) : null
+    ] }) });
   }
   if ((toolName.includes("shell_command") || toolName.includes("run_command") || toolName.includes("command_status")) && parsed) {
-    const output = parsed.stdout || parsed.output || "";
-    const stderr = parsed.stderr || "";
+    const output = String(parsed.stdout || parsed.output || "");
+    const stderr = String(parsed.stderr || "");
     const exitCode = parsed.exit_code ?? parsed.exitCode ?? 0;
-    const status = parsed.status || "";
+    const status = String(parsed.status || "");
     if (parsed.command_id && !output && !stderr && !status) {
-      return /* @__PURE__ */ jsx11(Box11, { paddingLeft: 3, children: /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
+      return /* @__PURE__ */ jsx12(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsx12(Box12, { paddingLeft: 2, children: /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
         "started #",
-        parsed.command_id.slice(0, 8)
-      ] }) });
+        String(parsed.command_id).slice(0, 8)
+      ] }) }) });
     }
     if (status === "running") {
-      return /* @__PURE__ */ jsx11(Box11, { paddingLeft: 3, children: /* @__PURE__ */ jsx11(Text10, { dimColor: true, color: "yellow", children: "still running..." }) });
+      return /* @__PURE__ */ jsx12(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsx12(Box12, { paddingLeft: 2, children: /* @__PURE__ */ jsx12(Text11, { color: BLUMA_TERMINAL.warn, dimColor: true, children: "still running\u2026" }) }) });
     }
     if (!output && !stderr) return null;
-    const { lines, truncated } = truncateLines(output || stderr, MAX_LINES);
+    const { lines, truncated } = truncateLines(output || stderr, TOOL_PREVIEW_MAX_LINES);
     const isError = exitCode !== 0;
     const isSuccess = exitCode === 0 && status !== "running";
-    const textColor = isError ? "red" : isSuccess ? "green" : "gray";
-    return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", paddingLeft: 3, children: [
-      lines.map((line, i) => /* @__PURE__ */ jsx11(Text10, { dimColor: true, color: textColor, children: line.slice(0, 80) }, i)),
-      truncated > 0 && /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-        "... +",
+    const lineColor = isError ? BLUMA_TERMINAL.err : isSuccess ? BLUMA_TERMINAL.success : BLUMA_TERMINAL.muted;
+    return /* @__PURE__ */ jsx12(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", paddingLeft: 2, children: [
+      lines.map((line, i) => /* @__PURE__ */ jsx12(Text11, { dimColor: true, color: lineColor, children: line.slice(0, 120) }, i)),
+      truncated > 0 ? /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+        "\u2026 +",
         truncated,
-        " lines"
-      ] }),
-      exitCode !== 0 && /* @__PURE__ */ jsxs10(Text10, { dimColor: true, color: "red", children: [
-        "exit code: ",
+        " lines \xB7 Ctrl+O expand"
+      ] }) : null,
+      exitCode !== 0 ? /* @__PURE__ */ jsxs11(Text11, { dimColor: true, color: BLUMA_TERMINAL.err, children: [
+        "exit ",
         exitCode
-      ] })
-    ] });
+      ] }) : null
+    ] }) });
   }
   if ((toolName.includes("grep") || toolName.includes("find_by_name")) && parsed) {
     const matches = parsed.matches || parsed.results || parsed.files || [];
     if (matches.length === 0) {
-      return /* @__PURE__ */ jsx11(Box11, { paddingLeft: 3, children: /* @__PURE__ */ jsx11(Text10, { dimColor: true, children: "no matches" }) });
+      return /* @__PURE__ */ jsx12(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsx12(Box12, { paddingLeft: 2, children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: "no matches" }) }) });
     }
-    return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", paddingLeft: 3, children: [
-      /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
+    return /* @__PURE__ */ jsx12(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", paddingLeft: 2, children: [
+      /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
         matches.length,
         " matches"
       ] }),
-      matches.slice(0, 5).map((m, i) => /* @__PURE__ */ jsxs10(Text10, { dimColor: true, color: "gray", children: [
-        m.file || m.path || m.name || m,
-        m.line ? `:${m.line}` : ""
-      ] }, i)),
-      matches.length > 5 && /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-        "... +",
-        matches.length - 5,
-        " more"
-      ] })
-    ] });
+      matches.slice(0, 5).map((m, i) => {
+        const row = m;
+        const path19 = row.file || row.path || row.name || m;
+        const line = row.line;
+        return /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+          String(path19),
+          line != null ? `:${line}` : ""
+        ] }, i);
+      }),
+      matches.length > 5 ? /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+        "\u2026 +",
+        matches.length - 5
+      ] }) : null
+    ] }) });
   }
   if (toolName.includes("ls_tool") && parsed) {
     const entries = parsed.entries || parsed.files || [];
     if (entries.length === 0) return null;
-    return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", paddingLeft: 3, children: [
-      entries.slice(0, 6).map((e, i) => /* @__PURE__ */ jsxs10(Text10, { dimColor: true, color: e.isDirectory ? "blue" : "gray", children: [
-        e.isDirectory ? "d" : "f",
-        " ",
-        e.name || e
-      ] }, i)),
-      entries.length > 6 && /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-        "... +",
-        entries.length - 6,
-        " more"
-      ] })
-    ] });
+    return /* @__PURE__ */ jsx12(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", paddingLeft: 2, children: [
+      entries.slice(0, 6).map((e, i) => {
+        const row = e;
+        const name = row.name ?? e;
+        const isDir = Boolean(row.isDirectory);
+        return /* @__PURE__ */ jsxs11(Text11, { dimColor: true, color: isDir ? BLUMA_TERMINAL.brandBlue : BLUMA_TERMINAL.muted, children: [
+          isDir ? "d " : "f ",
+          String(name)
+        ] }, i);
+      }),
+      entries.length > 6 ? /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+        "\u2026 +",
+        entries.length - 6
+      ] }) : null
+    ] }) });
   }
   if (toolName.includes("load_skill") && parsed) {
     if (!parsed.success) {
-      return /* @__PURE__ */ jsx11(Box11, { paddingLeft: 3, children: /* @__PURE__ */ jsxs10(Text10, { dimColor: true, color: "red", children: [
-        "\u2717 Skill not found: ",
-        parsed.message
-      ] }) });
-    }
-    return /* @__PURE__ */ jsxs10(Box11, { paddingLeft: 3, marginBottom: 2, children: [
-      /* @__PURE__ */ jsx11(Text10, { dimColor: true, color: "green", children: "Skill loaded: " }),
-      /* @__PURE__ */ jsx11(Text10, { color: "green", bold: true, children: parsed.skill_name }),
-      /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-        " \u2014 ",
-        parsed.description?.slice(0, 50),
-        parsed.description?.length > 100 ? "..." : ""
+      return /* @__PURE__ */ jsx12(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsx12(Box12, { paddingLeft: 2, children: /* @__PURE__ */ jsxs11(Text11, { dimColor: true, color: BLUMA_TERMINAL.err, children: [
+        "Not found: ",
+        String(parsed.message || "")
+      ] }) }) });
+    }
+    const desc = parsed.description ? String(parsed.description) : "";
+    return /* @__PURE__ */ jsx12(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs11(Box12, { paddingLeft: 2, flexDirection: "row", flexWrap: "wrap", children: [
+      /* @__PURE__ */ jsx12(Text11, { color: BLUMA_TERMINAL.brandMagenta, bold: true, children: String(parsed.skill_name || "") }),
+      /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+        " ",
+        "\u2014 ",
+        desc.slice(0, 80),
+        desc.length > 80 ? "\u2026" : ""
       ] })
-    ] });
+    ] }) });
   }
   if (toolName.includes("todo")) {
-    return null;
+    if (parsed && Array.isArray(parsed.tasks)) {
+      const tasks = parsed.tasks;
+      const stats = parsed.stats;
+      const msg = typeof parsed.message === "string" ? parsed.message : "";
+      return /* @__PURE__ */ jsx12(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", paddingLeft: 2, children: [
+        msg ? /* @__PURE__ */ jsx12(Box12, { marginBottom: 1, children: /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: msg }) }) : null,
+        stats && typeof stats.progress === "number" ? /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+          stats.completed ?? 0,
+          "/",
+          stats.total ?? tasks.length,
+          " done \xB7 ",
+          stats.progress,
+          "%"
+        ] }) : null,
+        /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", marginTop: 1, children: [
+          tasks.slice(0, 12).map((t, i) => {
+            const done = t.status === "completed" || t.isComplete === true;
+            const line = `#${t.id ?? i + 1} ${t.description ?? ""}`;
+            return /* @__PURE__ */ jsx12(TodoTaskLine, { done, label: line }, i);
+          }),
+          tasks.length > 12 ? /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+            "\u2026 +",
+            tasks.length - 12,
+            " tasks"
+          ] }) : null
+        ] })
+      ] }) });
+    }
+    const lines = result.split("\n").filter(Boolean);
+    if (lines.length === 0) return null;
+    return /* @__PURE__ */ jsx12(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsx12(Box12, { flexDirection: "column", paddingLeft: 2, children: lines.slice(0, 14).map((line, i) => /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: line.slice(0, 100) }, i)) }) });
   }
   if (toolName.includes("view_file_outline") && parsed) {
     const symbols = parsed.symbols || parsed.outline || [];
     if (symbols.length === 0) return null;
-    return /* @__PURE__ */ jsxs10(Box11, { flexDirection: "column", paddingLeft: 3, children: [
-      symbols.slice(0, 5).map((s, i) => /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-        s.kind || "sym",
-        " ",
-        s.name
-      ] }, i)),
-      symbols.length > 5 && /* @__PURE__ */ jsxs10(Text10, { dimColor: true, children: [
-        "... +",
-        symbols.length - 5,
-        " more"
-      ] })
-    ] });
+    return /* @__PURE__ */ jsx12(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", paddingLeft: 2, children: [
+      symbols.slice(0, 5).map((s, i) => {
+        const row = s;
+        return /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+          String(row.kind || "sym"),
+          " ",
+          String(row.name || "")
+        ] }, i);
+      }),
+      symbols.length > 5 ? /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+        "\u2026 +",
+        symbols.length - 5
+      ] }) : null
+    ] }) });
   }
   return null;
 };
 var ToolResultDisplay = memo8(ToolResultDisplayComponent);
 
+// src/app/ui/SessionInfoConnectingMCP.tsx
+import { Box as Box13, Text as Text12 } from "ink";
+import Spinner from "ink-spinner";
+import { jsx as jsx13, jsxs as jsxs12 } from "react/jsx-runtime";
+var SessionInfoConnectingMCP = ({
+  sessionId,
+  workdir,
+  statusMessage
+}) => /* @__PURE__ */ jsx13(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs12(Box13, { flexDirection: "column", paddingLeft: 1, children: [
+  /* @__PURE__ */ jsxs12(Text12, { children: [
+    /* @__PURE__ */ jsx13(Text12, { bold: true, color: BLUMA_TERMINAL.brandBlue, children: "session" }),
+    /* @__PURE__ */ jsx13(Text12, { dimColor: true, children: " \xB7 " }),
+    /* @__PURE__ */ jsx13(Text12, { color: BLUMA_TERMINAL.brandMagenta, children: sessionId.slice(0, 12) })
+  ] }),
+  /* @__PURE__ */ jsxs12(Text12, { dimColor: true, children: [
+    /* @__PURE__ */ jsx13(Text12, { color: BLUMA_TERMINAL.brandMagenta, children: "\u2514 " }),
+    workdir
+  ] }),
+  /* @__PURE__ */ jsxs12(Box13, { marginTop: 1, flexDirection: "row", flexWrap: "wrap", children: [
+    /* @__PURE__ */ jsxs12(Text12, { color: BLUMA_TERMINAL.warn, children: [
+      /* @__PURE__ */ jsx13(Spinner, { type: "dots" }),
+      " "
+    ] }),
+    /* @__PURE__ */ jsx13(Text12, { dimColor: true, children: statusMessage || "Establishing MCP\u2026" })
+  ] })
+] }) });
+var SessionInfoConnectingMCP_default = SessionInfoConnectingMCP;
+
 // src/app/ui/components/SlashCommands.tsx
-import { Box as Box12, Text as Text11 } from "ink";
-import { Fragment as Fragment4, jsx as jsx12, jsxs as jsxs11 } from "react/jsx-runtime";
+import { Box as Box14, Text as Text13 } from "ink";
+import { Fragment as Fragment2, jsx as jsx14, jsxs as jsxs13 } from "react/jsx-runtime";
 var SlashCommands = ({ input, setHistory, agentRef }) => {
   const [cmd, ...args] = input.slice(1).trim().split(/\s+/);
-  const outBox = (children) => /* @__PURE__ */ jsx12(
-    Box12,
-    {
-      borderStyle: "single",
-      borderColor: "gray",
-      paddingX: 2,
-      paddingY: 0,
-      marginBottom: 1,
-      flexDirection: "column",
-      children
-    }
-  );
+  const outBox = (children) => /* @__PURE__ */ jsx14(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsx14(Box14, { paddingLeft: 1, flexDirection: "column", children }) });
   const render2 = () => {
     if (!cmd) {
       return null;
@@ -7325,11 +8041,11 @@ var SlashCommands = ({ input, setHistory, agentRef }) => {
     if (cmd === "help") {
       const cmds = getSlashCommands();
       return outBox(
-        /* @__PURE__ */ jsxs11(Fragment4, { children: [
-          /* @__PURE__ */ jsx12(Box12, { marginBottom: 1, children: /* @__PURE__ */ jsx12(Text11, { bold: true, color: "magenta", children: "Available Commands" }) }),
-          /* @__PURE__ */ jsx12(Box12, { flexDirection: "column", children: cmds.map((c, i) => /* @__PURE__ */ jsxs11(Box12, { children: [
-            /* @__PURE__ */ jsx12(Text11, { color: "cyan", children: c.name.padEnd(12) }),
-            /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: c.description })
+        /* @__PURE__ */ jsxs13(Fragment2, { children: [
+          /* @__PURE__ */ jsx14(Box14, { marginBottom: 1, children: /* @__PURE__ */ jsx14(Text13, { bold: true, color: BLUMA_TERMINAL.brandMagenta, children: "Available Commands" }) }),
+          /* @__PURE__ */ jsx14(Box14, { flexDirection: "column", children: cmds.map((c, i) => /* @__PURE__ */ jsxs13(Box14, { children: [
+            /* @__PURE__ */ jsx14(Text13, { color: BLUMA_TERMINAL.brandBlue, children: c.name.padEnd(12) }),
+            /* @__PURE__ */ jsx14(Text13, { dimColor: true, children: c.description })
           ] }, i)) })
         ] })
       );
@@ -7337,9 +8053,9 @@ var SlashCommands = ({ input, setHistory, agentRef }) => {
     if (cmd === "clear") {
       setHistory((prev) => prev.filter((item) => item.id === 0 || item.id === 1));
       return outBox(
-        /* @__PURE__ */ jsxs11(Box12, { children: [
-          /* @__PURE__ */ jsx12(Text11, { color: "green", children: "\u2713" }),
-          /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: " History cleared" })
+        /* @__PURE__ */ jsxs13(Box14, { children: [
+          /* @__PURE__ */ jsx14(Text13, { color: "green", children: "[ok]" }),
+          /* @__PURE__ */ jsx14(Text13, { dimColor: true, children: " History cleared" })
         ] })
       );
     }
@@ -7351,8 +8067,8 @@ var SlashCommands = ({ input, setHistory, agentRef }) => {
           setHistory((prev) => prev.concat({
             id: Date.now(),
             component: outBox(
-              /* @__PURE__ */ jsx12(Box12, { children: /* @__PURE__ */ jsxs11(Text11, { color: "red", children: [
-                "\u2716 Failed to execute /init: ",
+              /* @__PURE__ */ jsx14(Box14, { children: /* @__PURE__ */ jsxs13(Text13, { color: "red", children: [
+                "Failed to execute /init: ",
                 e?.message || String(e)
               ] }) })
             )
@@ -7372,41 +8088,41 @@ var SlashCommands = ({ input, setHistory, agentRef }) => {
       const colType = 10;
       const colSource = 18;
       return outBox(
-        /* @__PURE__ */ jsxs11(Fragment4, { children: [
-          /* @__PURE__ */ jsxs11(Box12, { marginBottom: 1, children: [
-            /* @__PURE__ */ jsx12(Text11, { bold: true, color: "magenta", children: "MCP Tools" }),
-            /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: " \u2022 " }),
-            /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+        /* @__PURE__ */ jsxs13(Fragment2, { children: [
+          /* @__PURE__ */ jsxs13(Box14, { marginBottom: 1, children: [
+            /* @__PURE__ */ jsx14(Text13, { bold: true, color: BLUMA_TERMINAL.brandMagenta, children: "MCP Tools" }),
+            /* @__PURE__ */ jsx14(Text13, { dimColor: true, children: " \u2022 " }),
+            /* @__PURE__ */ jsxs13(Text13, { dimColor: true, children: [
               tools.length,
               " total"
             ] }),
-            term && /* @__PURE__ */ jsxs11(Fragment4, { children: [
-              /* @__PURE__ */ jsx12(Text11, { dimColor: true, children: " \u2022 filter: " }),
-              /* @__PURE__ */ jsxs11(Text11, { color: "cyan", children: [
+            term && /* @__PURE__ */ jsxs13(Fragment2, { children: [
+              /* @__PURE__ */ jsx14(Text13, { dimColor: true, children: " \u2022 filter: " }),
+              /* @__PURE__ */ jsxs13(Text13, { color: BLUMA_TERMINAL.brandBlue, children: [
                 '"',
                 term,
                 '"'
               ] }),
-              /* @__PURE__ */ jsxs11(Text11, { dimColor: true, children: [
+              /* @__PURE__ */ jsxs13(Text13, { dimColor: true, children: [
                 " \u2022 showing: ",
                 filtered.length
               ] })
             ] })
           ] }),
-          filtered.length === 0 ? /* @__PURE__ */ jsx12(Text11, { color: "yellow", children: "No MCP tools found" }) : /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", children: [
-            /* @__PURE__ */ jsx12(Box12, { children: /* @__PURE__ */ jsxs11(Text11, { color: "gray", children: [
+          filtered.length === 0 ? /* @__PURE__ */ jsx14(Text13, { color: "yellow", children: "No MCP tools found" }) : /* @__PURE__ */ jsxs13(Box14, { flexDirection: "column", children: [
+            /* @__PURE__ */ jsx14(Box14, { children: /* @__PURE__ */ jsxs13(Text13, { color: "gray", children: [
               pad("Name", colName),
               " \u2502 ",
               pad("Type", colType),
               " \u2502 ",
               pad("Source", colSource)
             ] }) }),
-            /* @__PURE__ */ jsx12(Text11, { color: "gray", children: "\u2500".repeat(colName + colType + colSource + 6) }),
+            /* @__PURE__ */ jsx14(Text13, { color: "gray", children: "\u2500".repeat(colName + colType + colSource + 6) }),
             filtered.map((t, i) => {
               const name = t.function?.name || t.name || "tool";
               const type = t.function?.name ? "fn" : t.type || "tool";
               const source = t.source || t.provider || "mcp";
-              return /* @__PURE__ */ jsxs11(Text11, { color: "white", children: [
+              return /* @__PURE__ */ jsxs13(Text13, { color: "white", children: [
                 pad(name, colName),
                 " \u2502 ",
                 pad(String(type), colType),
@@ -7429,22 +8145,22 @@ var SlashCommands = ({ input, setHistory, agentRef }) => {
       const colType = 10;
       const colSource = 18;
       return outBox(
-        /* @__PURE__ */ jsxs11(Fragment4, { children: [
-          /* @__PURE__ */ jsx12(Text11, { color: "magenta", bold: true, children: "Native Tools" }),
-          /* @__PURE__ */ jsxs11(Text11, { color: "gray", children: [
+        /* @__PURE__ */ jsxs13(Fragment2, { children: [
+          /* @__PURE__ */ jsx14(Text13, { color: BLUMA_TERMINAL.brandMagenta, bold: true, children: "Native Tools" }),
+          /* @__PURE__ */ jsxs13(Text13, { color: "gray", children: [
             "Total Native: ",
             tools.length,
             term ? `  |  Filter: "${term}"  |  Showing: ${filtered.length}` : ""
           ] }),
-          filtered.length === 0 ? /* @__PURE__ */ jsx12(Text11, { color: "yellow", children: "No native tools to display." }) : /* @__PURE__ */ jsxs11(Box12, { flexDirection: "column", children: [
-            /* @__PURE__ */ jsxs11(Text11, { color: "gray", children: [
+          filtered.length === 0 ? /* @__PURE__ */ jsx14(Text13, { color: "yellow", children: "No native tools to display." }) : /* @__PURE__ */ jsxs13(Box14, { flexDirection: "column", children: [
+            /* @__PURE__ */ jsxs13(Text13, { color: "gray", children: [
               pad("Name", colName),
               " | ",
               pad("Type", colType),
               " | ",
               pad("Source", colSource)
             ] }),
-            /* @__PURE__ */ jsxs11(Text11, { color: "gray", children: [
+            /* @__PURE__ */ jsxs13(Text13, { color: "gray", children: [
               "".padEnd(colName, "-"),
               "---",
               "".padEnd(colType, "-"),
@@ -7455,7 +8171,7 @@ var SlashCommands = ({ input, setHistory, agentRef }) => {
               const name = t.function?.name || t.name || "tool";
               const type = t.function?.name ? "fn" : t.type || "tool";
               const source = t.source || "native";
-              return /* @__PURE__ */ jsxs11(Text11, { color: "white", children: [
+              return /* @__PURE__ */ jsxs13(Text13, { color: "white", children: [
                 pad(name, colName),
                 " | ",
                 pad(String(type), colType),
@@ -7467,18 +8183,18 @@ var SlashCommands = ({ input, setHistory, agentRef }) => {
         ] })
       );
     }
-    return outBox(/* @__PURE__ */ jsxs11(Text11, { color: "red", children: [
+    return outBox(/* @__PURE__ */ jsxs13(Text13, { color: "red", children: [
       "Command not recognized: /",
       cmd
     ] }));
   };
-  return /* @__PURE__ */ jsx12(Fragment4, { children: render2() });
+  return /* @__PURE__ */ jsx14(Fragment2, { children: render2() });
 };
 var SlashCommands_default = SlashCommands;
 
 // src/app/agent/utils/update_check.ts
 import updateNotifier from "update-notifier";
-import { fileURLToPath as fileURLToPath4 } from "url";
+import { fileURLToPath as fileURLToPath3 } from "url";
 import path18 from "path";
 import fs14 from "fs";
 var BLUMA_PACKAGE_NAME = "@nomad-e/bluma-cli";
@@ -7513,7 +8229,7 @@ async function checkForUpdates() {
       pkg = findBlumaPackageJson(path18.dirname(binPath));
     }
     if (!pkg) {
-      const __filename = fileURLToPath4(import.meta.url);
+      const __filename = fileURLToPath3(import.meta.url);
       const __dirname2 = path18.dirname(__filename);
       pkg = findBlumaPackageJson(__dirname2);
     }
@@ -7542,86 +8258,88 @@ Run: npm i -g ${BLUMA_PACKAGE_NAME} to update.`;
 }
 
 // src/app/ui/components/UpdateNotice.tsx
-import { Box as Box13, Text as Text12 } from "ink";
-import { jsx as jsx13, jsxs as jsxs12 } from "react/jsx-runtime";
+import { Box as Box15, Text as Text14 } from "ink";
+import { jsx as jsx15, jsxs as jsxs14 } from "react/jsx-runtime";
 function parseUpdateMessage(msg) {
   const lines = msg.split(/\r?\n/).map((l) => l.trim());
   const first = lines[0] || "";
   const hintLine = lines.slice(1).join(" ") || "";
   const nameMatch = first.match(/Update available for\s+([^!]+)!/i);
   const versionMatch = first.match(/!\s*([^\s]+)\s*→\s*([^\s]+)/);
-  const name = nameMatch?.[1]?.trim();
-  const current = versionMatch?.[1]?.trim();
-  const latest = versionMatch?.[2]?.trim();
   return {
-    name,
-    current,
-    latest,
+    name: nameMatch?.[1]?.trim(),
+    current: versionMatch?.[1]?.trim(),
+    latest: versionMatch?.[2]?.trim(),
     hint: hintLine || void 0
   };
 }
 var UpdateNotice = ({ message: message2 }) => {
-  const { name, current, latest, hint } = parseUpdateMessage(message2);
-  return /* @__PURE__ */ jsxs12(Box13, { flexDirection: "column", marginBottom: 1, children: [
-    /* @__PURE__ */ jsx13(Text12, { color: "yellow", bold: true, children: "Update Available" }),
-    name && current && latest ? /* @__PURE__ */ jsx13(Text12, { color: "gray", children: `${name}: ${current} \u2192 ${latest}` }) : /* @__PURE__ */ jsx13(Text12, { color: "gray", children: message2 }),
-    hint ? /* @__PURE__ */ jsx13(Text12, { color: "gray", children: hint }) : null
-  ] });
+  const { name, current, latest: latest2, hint } = parseUpdateMessage(message2);
+  return /* @__PURE__ */ jsx15(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs14(Box15, { flexDirection: "column", paddingLeft: 2, children: [
+    name && current && latest2 ? /* @__PURE__ */ jsx15(Text14, { color: BLUMA_TERMINAL.brandMagenta, bold: true, children: name }) : null,
+    name && current && latest2 ? /* @__PURE__ */ jsxs14(Text14, { dimColor: true, children: [
+      current,
+      " \u2192 ",
+      latest2
+    ] }) : /* @__PURE__ */ jsx15(Text14, { dimColor: true, children: message2 }),
+    hint ? /* @__PURE__ */ jsx15(Box15, { marginTop: 1, children: /* @__PURE__ */ jsx15(Text14, { dimColor: true, children: hint }) }) : null
+  ] }) });
 };
 var UpdateNotice_default = UpdateNotice;
 
 // src/app/ui/components/ErrorMessage.tsx
-import { Box as Box14, Text as Text13 } from "ink";
-import { jsx as jsx14, jsxs as jsxs13 } from "react/jsx-runtime";
-var ErrorMessage = ({ message: message2, details, hint }) => {
-  return /* @__PURE__ */ jsxs13(Box14, { flexDirection: "column", paddingX: 1, marginBottom: 1, children: [
-    /* @__PURE__ */ jsxs13(Box14, { children: [
-      /* @__PURE__ */ jsx14(Text13, { color: "red", children: "\u2717" }),
-      /* @__PURE__ */ jsx14(Text13, { color: "red", bold: true, children: " Error" })
-    ] }),
-    /* @__PURE__ */ jsx14(Box14, { paddingLeft: 2, children: /* @__PURE__ */ jsx14(Text13, { color: "red", children: message2 }) }),
-    details && /* @__PURE__ */ jsx14(Box14, { paddingLeft: 2, children: /* @__PURE__ */ jsx14(Text13, { dimColor: true, children: details }) }),
-    hint && /* @__PURE__ */ jsx14(Box14, { paddingLeft: 2, children: /* @__PURE__ */ jsxs13(Text13, { color: "gray", children: [
-      "hint: ",
-      hint
-    ] }) })
-  ] });
-};
+import { Box as Box16, Text as Text15 } from "ink";
+import { jsx as jsx16, jsxs as jsxs15 } from "react/jsx-runtime";
+var ErrorMessage = ({ message: message2, details, hint }) => /* @__PURE__ */ jsx16(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs15(Box16, { flexDirection: "column", paddingLeft: 2, children: [
+  /* @__PURE__ */ jsx16(Text15, { color: BLUMA_TERMINAL.err, children: message2 }),
+  details ? /* @__PURE__ */ jsx16(Box16, { marginTop: 1, children: /* @__PURE__ */ jsx16(Text15, { dimColor: true, children: details }) }) : null,
+  hint ? /* @__PURE__ */ jsx16(Box16, { marginTop: 1, children: /* @__PURE__ */ jsxs15(Text15, { dimColor: true, children: [
+    "hint: ",
+    hint
+  ] }) }) : null
+] }) });
 var ErrorMessage_default = ErrorMessage;
 
 // src/app/ui/components/ReasoningDisplay.tsx
-import { memo as memo9, useState as useState5 } from "react";
-import { Box as Box15, Text as Text14 } from "ink";
-import { jsx as jsx15, jsxs as jsxs14 } from "react/jsx-runtime";
+import { memo as memo9 } from "react";
+import { Box as Box17, Text as Text16 } from "ink";
+import { jsx as jsx17, jsxs as jsxs16 } from "react/jsx-runtime";
 var ReasoningDisplayComponent = ({
   reasoning,
   collapsed = false
 }) => {
-  const [isExpanded, setIsExpanded] = useState5(!collapsed);
   if (!reasoning || reasoning.trim() === "") {
     return null;
   }
-  const maxLines = 5;
+  const maxLines = collapsed ? 6 : 200;
   const lines = reasoning.split("\n");
-  const displayText = isExpanded ? reasoning : lines.slice(0, maxLines).join("\n") + (lines.length > maxLines ? "..." : "");
-  return /* @__PURE__ */ jsxs14(Box15, { flexDirection: "column", paddingX: 1, marginBottom: 1, marginTop: 1, children: [
-    /* @__PURE__ */ jsx15(Box15, {}),
-    /* @__PURE__ */ jsx15(Box15, { paddingLeft: 2, flexDirection: "column", children: displayText.split("\n").map((line, i) => /* @__PURE__ */ jsx15(Text14, { color: "gray", dimColor: true, children: line }, i)) })
-  ] });
+  const displayLines = lines.slice(0, maxLines);
+  const truncated = lines.length > maxLines;
+  return /* @__PURE__ */ jsx17(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs16(Box17, { flexDirection: "column", paddingLeft: 2, children: [
+    displayLines.map((line, i) => /* @__PURE__ */ jsx17(Text16, { dimColor: true, children: line }, i)),
+    truncated ? /* @__PURE__ */ jsxs16(Text16, { dimColor: true, children: [
+      "\u2026 +",
+      lines.length - maxLines,
+      " lines"
+    ] }) : null
+  ] }) });
 };
 var ReasoningDisplay = memo9(ReasoningDisplayComponent);
 
 // src/app/ui/components/StreamingText.tsx
-import { useState as useState6, useEffect as useEffect5, useRef as useRef4, memo as memo10 } from "react";
-import { Box as Box16, Text as Text15 } from "ink";
-import { jsx as jsx16, jsxs as jsxs15 } from "react/jsx-runtime";
-var StreamingTextComponent = ({ eventBus, onReasoningComplete }) => {
-  const [reasoning, setReasoning] = useState6("");
-  const [isStreaming, setIsStreaming] = useState6(false);
+import { useState as useState5, useEffect as useEffect6, useRef as useRef4, memo as memo10 } from "react";
+import { Box as Box18, Text as Text17 } from "ink";
+import { jsx as jsx18, jsxs as jsxs17 } from "react/jsx-runtime";
+var StreamingTextComponent = ({
+  eventBus,
+  onReasoningComplete
+}) => {
+  const [reasoning, setReasoning] = useState5("");
+  const [isStreaming, setIsStreaming] = useState5(false);
   const reasoningRef = useRef4("");
   const lastUpdateRef = useRef4(0);
   const pendingUpdateRef = useRef4(null);
-  useEffect5(() => {
+  useEffect6(() => {
     const handleStart = () => {
       setReasoning("");
       reasoningRef.current = "";
@@ -7677,19 +8395,56 @@ var StreamingTextComponent = ({ eventBus, onReasoningComplete }) => {
     truncatedCount = lines.length - MAX_VISIBLE_LINES;
     displayLines = lines.slice(-MAX_VISIBLE_LINES);
   }
-  return /* @__PURE__ */ jsxs15(Box16, { flexDirection: "column", paddingX: 1, marginBottom: 1, marginTop: 1, children: [
-    truncatedCount > 0 && /* @__PURE__ */ jsxs15(Text15, { color: "gray", dimColor: true, children: [
-      "... (ocultando ",
+  return /* @__PURE__ */ jsx18(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs17(Box18, { flexDirection: "column", paddingLeft: 2, children: [
+    truncatedCount > 0 ? /* @__PURE__ */ jsxs17(Text17, { dimColor: true, children: [
+      "\u2026 ",
       truncatedCount,
-      " linhas anteriores para performance) ..."
-    ] }),
-    /* @__PURE__ */ jsx16(Box16, { paddingLeft: 2, flexDirection: "column", children: displayLines.map((line, i) => /* @__PURE__ */ jsx16(Text15, { color: "gray", dimColor: true, children: line }, i)) })
-  ] });
+      " lines above hidden"
+    ] }) : null,
+    displayLines.map((line, i) => /* @__PURE__ */ jsx18(Text17, { dimColor: true, children: line }, i))
+  ] }) });
 };
 var StreamingText = memo10(StreamingTextComponent);
 
+// src/app/ui/components/ExpandedPreviewBlock.tsx
+import { memo as memo11 } from "react";
+import { Box as Box19, Text as Text18 } from "ink";
+import { jsx as jsx19, jsxs as jsxs18 } from "react/jsx-runtime";
+function ExpandedPreviewBlockComponent({ data }) {
+  const cols = typeof process.stdout?.columns === "number" ? process.stdout.columns : 80;
+  const rule = TERMINAL_RULE_CHAR.repeat(Math.max(8, cols));
+  const lines = data.fullText.split("\n");
+  const cap = EXPAND_OVERLAY_MAX_LINES;
+  const shown = lines.slice(0, cap);
+  const rest = lines.length - cap;
+  return /* @__PURE__ */ jsxs18(ChatBlock, { marginBottom: 1, children: [
+    /* @__PURE__ */ jsx19(Text18, { color: "white", children: rule }),
+    /* @__PURE__ */ jsxs18(Box19, { flexDirection: "column", paddingLeft: 1, children: [
+      /* @__PURE__ */ jsx19(Text18, { color: BLUMA_TERMINAL.brandMagenta, bold: true, children: "expand (Ctrl+O)" }),
+      /* @__PURE__ */ jsx19(Text18, { dimColor: true, children: data.title }),
+      /* @__PURE__ */ jsxs18(Text18, { dimColor: true, children: [
+        "+",
+        data.linesHidden,
+        " lines were clipped in chat \xB7 below: up to ",
+        cap,
+        " lines \xB7 use read_file_lines before edit_tool"
+      ] }),
+      /* @__PURE__ */ jsxs18(Box19, { flexDirection: "column", marginTop: 1, children: [
+        shown.map((line, i) => /* @__PURE__ */ jsx19(Text18, { dimColor: true, children: line.slice(0, 200) }, i)),
+        rest > 0 ? /* @__PURE__ */ jsxs18(Text18, { dimColor: true, children: [
+          "\u2026 +",
+          rest,
+          " more lines in this chunk"
+        ] }) : null
+      ] })
+    ] }),
+    /* @__PURE__ */ jsx19(Text18, { color: "white", children: rule })
+  ] });
+}
+var ExpandedPreviewBlock = memo11(ExpandedPreviewBlockComponent);
+
 // src/app/ui/App.tsx
-import { jsx as jsx17, jsxs as jsxs16 } from "react/jsx-runtime";
+import { jsx as jsx20, jsxs as jsxs19 } from "react/jsx-runtime";
 var SAFE_AUTO_APPROVE_TOOLS = [
   // Comunicação/UI
   "message",
@@ -7707,36 +8462,64 @@ var SAFE_AUTO_APPROVE_TOOLS = [
 ];
 var AppComponent = ({ eventBus, sessionId }) => {
   const agentInstance = useRef5(null);
-  const [history, setHistory] = useState7([]);
-  const [statusMessage, setStatusMessage] = useState7(
+  const [history, setHistory] = useState6([]);
+  const [statusMessage, setStatusMessage] = useState6(
     "Initializing agent..."
   );
-  const [toolsCount, setToolsCount] = useState7(null);
-  const [mcpStatus, setMcpStatus] = useState7(
+  const [toolsCount, setToolsCount] = useState6(null);
+  const [mcpStatus, setMcpStatus] = useState6(
     "connecting"
   );
-  const [isProcessing, setIsProcessing] = useState7(true);
-  const [pendingConfirmation, setPendingConfirmation] = useState7(
+  const [isProcessing, setIsProcessing] = useState6(true);
+  const [pendingConfirmation, setPendingConfirmation] = useState6(
     null
   );
-  const [confirmationPreview, setConfirmationPreview] = useState7(
+  const [confirmationPreview, setConfirmationPreview] = useState6(
     null
   );
-  const [isInitAgentActive, setIsInitAgentActive] = useState7(false);
+  const [isInitAgentActive, setIsInitAgentActive] = useState6(false);
   const alwaysAcceptList = useRef5([]);
   const workdir = process.cwd();
   const updateCheckRan = useRef5(false);
-  const sessionStartTime = useRef5(Date.now());
-  const [toolCallCount, setToolCallCount] = useState7(0);
+  const turnStartedAtRef = useRef5(null);
+  const appendExpandPreviewToHistory = useCallback2(() => {
+    const p = peekLatestExpandable();
+    setHistory((prev) => {
+      const id = prev.length;
+      if (!p) {
+        return [
+          ...prev,
+          {
+            id,
+            component: /* @__PURE__ */ jsx20(ChatMeta, { children: "Ctrl+O: no truncated preview to expand" }, id)
+          }
+        ];
+      }
+      return [
+        ...prev,
+        {
+          id,
+          component: /* @__PURE__ */ jsx20(ExpandedPreviewBlock, { data: p }, id)
+        }
+      ];
+    });
+  }, []);
+  useEffect7(() => {
+    expandPreviewHotkeyBus.on("expand", appendExpandPreviewToHistory);
+    return () => {
+      expandPreviewHotkeyBus.off("expand", appendExpandPreviewToHistory);
+    };
+  }, [appendExpandPreviewToHistory]);
   const handleInterrupt = useCallback2(() => {
     if (!isProcessing) return;
     eventBus.emit("user_interrupt");
+    turnStartedAtRef.current = null;
     setIsProcessing(false);
     setHistory((prev) => [
       ...prev,
       {
         id: prev.length,
-        component: /* @__PURE__ */ jsx17(Text16, { color: "yellow", children: "-- Task cancelled by dev. --" })
+        component: /* @__PURE__ */ jsx20(ChatMeta, { children: "cancelled (Esc)" })
       }
     ]);
   }, [isProcessing, eventBus]);
@@ -7752,6 +8535,7 @@ var AppComponent = ({ eventBus, sessionId }) => {
         if (cmd === "init") {
           setIsInitAgentActive(true);
           setIsProcessing(true);
+          turnStartedAtRef.current = Date.now();
         } else {
           setIsProcessing(false);
           setIsInitAgentActive(false);
@@ -7760,11 +8544,11 @@ var AppComponent = ({ eventBus, sessionId }) => {
           ...prev,
           {
             id: prev.length,
-            component: /* @__PURE__ */ jsx17(Box17, { marginBottom: 1, children: /* @__PURE__ */ jsx17(Text16, { color: "white", dimColor: true, children: text }) })
+            component: /* @__PURE__ */ jsx20(ChatUserMessage, { children: /* @__PURE__ */ jsx20(Text19, { dimColor: true, children: text }) })
           },
           {
             id: prev.length + 1,
-            component: /* @__PURE__ */ jsx17(
+            component: /* @__PURE__ */ jsx20(
               SlashCommands_default,
               {
                 input: text,
@@ -7783,17 +8567,15 @@ var AppComponent = ({ eventBus, sessionId }) => {
           return;
         }
         setIsProcessing(true);
+        turnStartedAtRef.current = Date.now();
         setHistory((prev) => [
           ...prev,
           {
             id: prev.length,
-            component: /* @__PURE__ */ jsxs16(Box17, { marginBottom: 1, children: [
-              /* @__PURE__ */ jsx17(Text16, { color: "white", bold: true, children: "$ " }),
-              /* @__PURE__ */ jsxs16(Text16, { color: "white", children: [
-                "!",
-                command
-              ] })
-            ] })
+            component: /* @__PURE__ */ jsx20(ChatUserMessage, { children: /* @__PURE__ */ jsxs19(Text19, { bold: true, color: "white", children: [
+              "$ !",
+              command
+            ] }) })
           }
         ]);
         Promise.resolve().then(() => (init_async_command(), async_command_exports)).then(async ({ runCommandAsync: runCommandAsync2 }) => {
@@ -7807,11 +8589,12 @@ Command ID: ${result.command_id}
 Please use command_status to check the result and report back to the user.`;
               agentInstance.current?.processTurn({ content: contextMessage });
             } else {
+              turnStartedAtRef.current = null;
               setHistory((prev) => [
                 ...prev,
                 {
                   id: prev.length,
-                  component: /* @__PURE__ */ jsxs16(Text16, { color: "red", children: [
+                  component: /* @__PURE__ */ jsxs19(Text19, { color: "red", children: [
                     "Failed to execute: ",
                     result.error || result.message
                   ] })
@@ -7820,11 +8603,12 @@ Please use command_status to check the result and report back to the user.`;
               setIsProcessing(false);
             }
           } catch (err) {
+            turnStartedAtRef.current = null;
             setHistory((prev) => [
               ...prev,
               {
                 id: prev.length,
-                component: /* @__PURE__ */ jsxs16(Text16, { color: "red", children: [
+                component: /* @__PURE__ */ jsxs19(Text19, { color: "red", children: [
                   "Error: ",
                   err.message
                 ] })
@@ -7836,21 +8620,13 @@ Please use command_status to check the result and report back to the user.`;
         return;
       }
       setIsProcessing(true);
+      turnStartedAtRef.current = Date.now();
       const displayText = text.length > 1e4 ? text.substring(0, 1e4) + "..." : text;
       setHistory((prev) => [
         ...prev,
         {
           id: prev.length,
-          component: (
-            // Uma única Box para o espaçamento
-            /* @__PURE__ */ jsx17(Box17, { marginBottom: 1, children: /* @__PURE__ */ jsxs16(Text16, { color: "white", dimColor: true, children: [
-              /* @__PURE__ */ jsxs16(Text16, { color: "white", children: [
-                ">",
-                " "
-              ] }),
-              displayText
-            ] }) })
-          )
+          component: /* @__PURE__ */ jsx20(ChatUserMessage, { children: /* @__PURE__ */ jsx20(Text19, { children: displayText }) })
         }
       ]);
       agentInstance.current.processTurn({ content: text });
@@ -7878,8 +8654,8 @@ Please use command_status to check the result and report back to the user.`;
     },
     []
   );
-  useEffect6(() => {
-    setHistory([{ id: 0, component: /* @__PURE__ */ jsx17(Header, { sessionId, workdir }) }]);
+  useEffect7(() => {
+    setHistory([{ id: 0, component: /* @__PURE__ */ jsx20(Header, { sessionId, workdir }) }]);
     const initializeAgent = async () => {
       try {
         agentInstance.current = new Agent(sessionId, eventBus);
@@ -7899,6 +8675,20 @@ Please use command_status to check the result and report back to the user.`;
     };
     const handleBackendMessage = (parsed) => {
       try {
+        const appendTurnDurationIfAny = () => {
+          const t = turnStartedAtRef.current;
+          if (t == null) return;
+          turnStartedAtRef.current = null;
+          const ms = Date.now() - t;
+          const sec = ms < 1e4 ? (ms / 1e3).toFixed(1) : String(Math.round(ms / 1e3));
+          setHistory((prev) => [
+            ...prev,
+            {
+              id: prev.length,
+              component: /* @__PURE__ */ jsx20(ChatTurnDuration, { secondsFormatted: sec })
+            }
+          ]);
+        };
         if (parsed.type === "done" || parsed.type === "error") {
           setIsInitAgentActive(false);
         }
@@ -7924,6 +8714,7 @@ Please use command_status to check the result and report back to the user.`;
         if (parsed.type === "done") {
           if (parsed.status !== "awaiting_confirmation") {
             setStatusMessage(null);
+            appendTurnDurationIfAny();
           }
           setIsProcessing(false);
           return;
@@ -7945,7 +8736,7 @@ Please use command_status to check the result and report back to the user.`;
                   ...prev,
                   {
                     id: prev.length,
-                    component: /* @__PURE__ */ jsx17(UpdateNotice_default, { message: msg })
+                    component: /* @__PURE__ */ jsx20(UpdateNotice_default, { message: msg })
                   }
                 ]);
               }
@@ -7959,25 +8750,14 @@ Please use command_status to check the result and report back to the user.`;
         }
         let newComponent = null;
         if (parsed.type === "debug") {
-          newComponent = /* @__PURE__ */ jsx17(Text16, { color: "gray", children: parsed.message });
+          newComponent = /* @__PURE__ */ jsx20(ChatMeta, { children: parsed.message });
         } else if (parsed.type === "protocol_violation") {
-          newComponent = /* @__PURE__ */ jsxs16(
-            Box17,
-            {
-              borderStyle: "round",
-              borderColor: "yellow",
-              flexDirection: "column",
-              marginBottom: 1,
-              paddingX: 1,
-              children: [
-                /* @__PURE__ */ jsx17(Text16, { color: "yellow", bold: true, children: "Protocol Violation" }),
-                /* @__PURE__ */ jsx17(Text16, { color: "gray", children: parsed.content }),
-                /* @__PURE__ */ jsx17(Text16, { color: "yellow", children: parsed.message })
-              ]
-            }
-          );
+          newComponent = /* @__PURE__ */ jsx20(ChatBlock, { marginBottom: 1, children: /* @__PURE__ */ jsxs19(Box20, { flexDirection: "column", paddingLeft: 2, children: [
+            /* @__PURE__ */ jsx20(Text19, { dimColor: true, children: parsed.content }),
+            /* @__PURE__ */ jsx20(Text19, { dimColor: true, children: parsed.message })
+          ] }) });
         } else if (parsed.type === "error") {
-          newComponent = /* @__PURE__ */ jsx17(
+          newComponent = /* @__PURE__ */ jsx20(
             ErrorMessage_default,
             {
               message: parsed.message,
@@ -7987,7 +8767,7 @@ Please use command_status to check the result and report back to the user.`;
           );
         } else if (parsed.type === "tool_call") {
           const nextId3 = history.length;
-          newComponent = /* @__PURE__ */ jsx17(
+          newComponent = /* @__PURE__ */ jsx20(
             ToolCallDisplay,
             {
               toolName: parsed.tool_name,
@@ -7996,7 +8776,7 @@ Please use command_status to check the result and report back to the user.`;
             }
           );
         } else if (parsed.type === "tool_result") {
-          newComponent = /* @__PURE__ */ jsx17(
+          newComponent = /* @__PURE__ */ jsx20(
             ToolResultDisplay,
             {
               toolName: parsed.tool_name,
@@ -8004,18 +8784,11 @@ Please use command_status to check the result and report back to the user.`;
             }
           );
         } else if (parsed.type === "user_overlay") {
-          newComponent = /* @__PURE__ */ jsx17(Box17, { marginBottom: 1, children: /* @__PURE__ */ jsxs16(Text16, { color: "gray", children: [
-            /* @__PURE__ */ jsxs16(Text16, { color: "magenta", children: [
-              ">",
-              " "
-            ] }),
-            parsed.payload
-          ] }) });
+          newComponent = /* @__PURE__ */ jsx20(ChatUserMessage, { children: /* @__PURE__ */ jsx20(Text19, { dimColor: true, children: parsed.payload }) });
         } else if (parsed.type === "reasoning") {
-          newComponent = /* @__PURE__ */ jsx17(ReasoningDisplay, { reasoning: parsed.content });
+          newComponent = /* @__PURE__ */ jsx20(ReasoningDisplay, { reasoning: parsed.content });
         } else if (parsed.type === "log") {
-          newComponent = /* @__PURE__ */ jsxs16(Text16, { color: "gray", children: [
-            "\u2139\uFE0F ",
+          newComponent = /* @__PURE__ */ jsxs19(ChatMeta, { children: [
             parsed.message,
             parsed.payload ? `: ${parsed.payload}` : ""
           ] });
@@ -8023,10 +8796,25 @@ Please use command_status to check the result and report back to the user.`;
           newComponent = null;
         }
         if (newComponent) {
-          setHistory((prev) => [
-            ...prev,
-            { id: prev.length, component: newComponent }
-          ]);
+          setHistory((prev) => {
+            const next = [
+              ...prev,
+              { id: prev.length, component: newComponent }
+            ];
+            if (parsed.type === "error") {
+              const t = turnStartedAtRef.current;
+              if (t != null) {
+                turnStartedAtRef.current = null;
+                const ms = Date.now() - t;
+                const sec = ms < 1e4 ? (ms / 1e3).toFixed(1) : String(Math.round(ms / 1e3));
+                next.push({
+                  id: next.length,
+                  component: /* @__PURE__ */ jsx20(ChatTurnDuration, { secondsFormatted: sec })
+                });
+              }
+            }
+            return next;
+          });
         }
       } catch (error) {
       }
@@ -8044,10 +8832,17 @@ Please use command_status to check the result and report back to the user.`;
   }, [eventBus, sessionId, handleConfirmation]);
   const renderInteractiveComponent = () => {
     if (mcpStatus !== "connected") {
-      return;
+      return /* @__PURE__ */ jsx20(
+        SessionInfoConnectingMCP_default,
+        {
+          sessionId,
+          workdir,
+          statusMessage
+        }
+      );
     }
     if (pendingConfirmation) {
-      return /* @__PURE__ */ jsx17(
+      return /* @__PURE__ */ jsx20(
         ConfirmationPrompt,
         {
           toolCalls: pendingConfirmation,
@@ -8059,9 +8854,9 @@ Please use command_status to check the result and report back to the user.`;
         }
       );
     }
-    return /* @__PURE__ */ jsxs16(Box17, { flexDirection: "column", children: [
-      isProcessing && !pendingConfirmation && /* @__PURE__ */ jsx17(WorkingTimer, { eventBus }),
-      /* @__PURE__ */ jsx17(
+    return /* @__PURE__ */ jsxs19(Box20, { flexDirection: "column", children: [
+      isProcessing && !pendingConfirmation && /* @__PURE__ */ jsx20(WorkingTimer, { eventBus }),
+      /* @__PURE__ */ jsx20(
         InputPrompt,
         {
           onSubmit: handleSubmit,
@@ -8072,9 +8867,9 @@ Please use command_status to check the result and report back to the user.`;
       )
     ] });
   };
-  return /* @__PURE__ */ jsxs16(Box17, { flexDirection: "column", children: [
-    /* @__PURE__ */ jsx17(Static, { items: history, children: (item) => /* @__PURE__ */ jsx17(Box17, { children: item.component }, item.id) }),
-    /* @__PURE__ */ jsx17(
+  return /* @__PURE__ */ jsxs19(Box20, { flexDirection: "column", children: [
+    /* @__PURE__ */ jsx20(Static, { items: history, children: (item) => /* @__PURE__ */ jsx20(Box20, { children: item.component }, item.id) }),
+    /* @__PURE__ */ jsx20(
       StreamingText,
       {
         eventBus,
@@ -8084,7 +8879,7 @@ Please use command_status to check the result and report back to the user.`;
               ...prev,
               {
                 id: prev.length,
-                component: /* @__PURE__ */ jsx17(ReasoningDisplay, { reasoning })
+                component: /* @__PURE__ */ jsx20(ReasoningDisplay, { reasoning })
               }
             ]);
           }
@@ -8094,7 +8889,7 @@ Please use command_status to check the result and report back to the user.`;
     renderInteractiveComponent()
   ] });
 };
-var App = memo11(AppComponent);
+var App = memo12(AppComponent);
 var App_default = App;
 
 // src/app/ui/utils/terminalTitle.ts
@@ -8218,7 +9013,7 @@ async function runAgentMode() {
       process.env.BLUMA_SANDBOX_NAME = String(envelope.metadata.sandbox_name);
     }
   }
-  const eventBus = new EventEmitter2();
+  const eventBus = new EventEmitter3();
   const sessionId = envelope.session_id || envelope.message_id || uuidv46();
   const uc = envelope.user_context;
   const userContextInput = {
@@ -8350,13 +9145,13 @@ async function runAgentMode() {
 function runCliMode() {
   const BLUMA_TITLE = process.env.BLUMA_TITLE || "BluMa - NomadEngenuity";
   startTitleKeeper(BLUMA_TITLE);
-  const eventBus = new EventEmitter2();
+  const eventBus = new EventEmitter3();
   const sessionId = uuidv46();
   const props = {
     eventBus,
     sessionId
   };
-  render(React11.createElement(App_default, props));
+  render(React12.createElement(App_default, props));
 }
 var argv = process.argv.slice(2);
 if (argv[0] === "agent") {