@bubblebrain-ai/bubble 0.0.19 → 0.0.21

package/dist/tui/run.js

@@ -6,11 +6,11 @@ import qrTerminal from "qrcode-terminal";
 import { existsSync, statSync } from "node:fs";
 import { basename, isAbsolute, resolve as resolvePath } from "node:path";
 import { homedir } from "node:os";
-import { AgentAbortError } from "../agent.js";
+import { AgentAbortError, INTERRUPTED_ASSISTANT_CONTENT } from "../agent.js";
 import { AgentRunInputQueue } from "../agent/input-controller.js";
 import { debugReasoningStream, summarizeDebugText } from "../reasoning-debug.js";
 import { isHiddenToolMetadata } from "../agent/discovery-barrier.js";
-import { sanitizeInternalReminderBlocks } from "../agent/internal-reminder-sanitizer.js";
+import { createStreamingInternalReminderSanitizer, sanitizeInternalReasoningText, sanitizeInternalReminderBlocks, } from "../agent/internal-reminder-sanitizer.js";
 import { summarizeAgentEventForTrace, summarizeTraceError, summarizeTraceValue, traceEvent, } from "../debug-trace.js";
 import { BUILTIN_PROVIDERS, decodeModel, displayModel, isUserVisibleProvider } from "../provider-registry.js";
 import { calculateUsageCost } from "../model-pricing.js";
@@ -22,7 +22,8 @@ import { registry as slashRegistry } from "../slash-commands/index.js";
 import { sourceRank } from "../slash-commands/unified.js";
 import { sidebarMcpRowsFromStates, renderMcpRowMarker } from "./sidebar-mcp.js";
 import { expandAtMentions, filterFileSuggestions, findAtContext, listProjectFiles } from "./file-mentions.js";
-import { appendTextPart, appendToolPart, compactDisplayMessages, contentFromParts, snapshotDisplayParts, toolCallsFromParts, } from "./display-history.js";
+import { appendTextPart, appendToolPart, compactDisplayMessages, contentFromParts, setUserInputStatus, snapshotDisplayParts, toolCallsFromParts, userInputStatusBadgeLabel, } from "./display-history.js";
+import { sanitizeDisplayMessage, sanitizeDisplayMessages } from "./display-sanitizer.js";
 import { createMarkdownSyntaxStyle, createSubtleMarkdownSyntaxStyle } from "./markdown-theme.js";
 import { markdownInlineSegments } from "./markdown-inline.js";
 import { hashString } from "./render-signature.js";
@@ -40,14 +41,16 @@ import { submitFeedback, FeedbackSubmitError } from "../feedback/submit.js";
 import { createFrames } from "./opencode-spinner.js";
 import { copyTextToClipboard } from "./clipboard.js";
 import { readGitSidebarState } from "./sidebar-state.js";
-import { buildImageContentPartsFromLabels, extractImagePathTokens, imageAttachmentLabelPattern, resolveComposerImagePaths, resolveImageInput, } from "./image-paste.js";
+import { buildImageContentPartsFromLabels, bareImageFilenameFromPaste, extractImagePathTokens, imageAttachmentLabelPattern, imageLabelForPath, ingestClipboardImage, ingestImagePath, isImagePathPaste, splitPastedPaths, resolveComposerImagePaths, resolveImageInput, } from "./image-paste.js";
+import { createPastedContentMarker, decodePastedBytes, expandPastedContentMarkers, shouldCollapsePastedContent, } from "./paste-placeholder.js";
 import { isModeCycleKeyEvent, isModeCycleSequence, isModifiedEnterSequence, PROMPT_TEXTAREA_KEYBINDINGS, } from "./prompt-keybindings.js";
 import { keyNameFromEvent, keyNameFromSequence } from "./global-key-router.js";
 import { EscapeConfirmationGate } from "./escape-confirmation.js";
 import { appendHistoryEntry, loadHistorySync, pushHistoryEntry } from "./input-history.js";
-import { buildTraceGroups, traceGroupLabel } from "./trace-groups.js";
+import { buildTraceGroups, executeCommandBlock, shouldInlineExecuteCommand, traceGroupLabel, } from "./trace-groups.js";
 import { sessionDisplayName } from "./session-display.js";
 import { bubbleWordmarkForWidth, bubbleWordmarkLineText, } from "./wordmark.js";
+import { resolveTranscriptScroll } from "./transcript-scroll.js";
 import { bootstrapConfig } from "../feishu/config.js";
 import { ScopeRegistry } from "../feishu/scope/scope-registry.js";
 const treeSitterClient = getTreeSitterClient();
@@ -71,6 +74,8 @@ const DEFAULT_THEME = {
     info: "#56b6c2",
     text: "#eeeeee",
     textMuted: "#808080",
+    selectionBg: "#3D5066",
+    selectionFg: "#eeeeee",
     background: "#0a0a0a",
     backgroundPanel: "#141414",
     backgroundElement: "#1e1e1e",
@@ -113,6 +118,8 @@ const LIGHT_THEME = {
     info: "#257E8A",
     text: "#171717",
     textMuted: "#6F7377",
+    selectionBg: "#B9D4F7",
+    selectionFg: "#171717",
     background: "#FCFCFA",
     backgroundPanel: "#F6F6F3",
     backgroundElement: "#ECEDEA",
@@ -186,6 +193,9 @@ const PROMPT_SCANNER_INTERVAL_MS = 80;
 const SESSION_SIDEBAR_WIDTH = 42;
 const SESSION_SIDEBAR_AUTO_WIDTH = 120;
 const PROVIDER_DIALOG_ROWS = 13;
+const PROVIDER_DIALOG_MIN_WIDTH = 56;
+const PROVIDER_DIALOG_MAX_WIDTH = 84;
+const PROVIDER_DIALOG_ROW_RESERVED_WIDTH = 10;
 const QUESTION_MAX_TABS = 4;
 const QUESTION_MAX_OPTIONS = 10;
 const QUESTION_MAX_CONFIRM_ROWS = 3;
@@ -221,6 +231,7 @@ const HOME_TIPS = [
     "Use /compact to summarize long sessions near context limits",
     "Shift+Enter or Ctrl+J inserts a newline in your prompt",
 ];
+const SELECTABLE_TEXT_TAGS = new Set(["text", "textarea", "code", "markdown", "diff", "input"]);
 function h(tag, props, ...children) {
     const allProps = props ?? {};
     const childList = children.length > 0 ? children : allProps.children !== undefined ? [allProps.children] : [];
@@ -232,6 +243,14 @@ function h(tag, props, ...children) {
     }
     const element = createElement(tag);
     const { children: _children, ...rest } = allProps;
+    // Without explicit selection colors OpenTUI inverts fg/bg; with our
+    // transparent backgrounds that degrades to black-on-black on light themes.
+    if (SELECTABLE_TEXT_TAGS.has(tag)) {
+        if (rest.selectionBg === undefined)
+            rest.selectionBg = theme.selectionBg;
+        if (rest.selectionFg === undefined)
+            rest.selectionFg = theme.selectionFg;
+    }
     spread(element, rest, false);
     if (childList.length === 1)
         insert(element, childList[0]);
@@ -239,6 +258,27 @@ function h(tag, props, ...children) {
         insert(element, childList);
     return element;
 }
+// OpenTUI hardcodes updateCursor=true for mouse-driven selection, so dragging
+// a selection yanks the editor cursor to the drag focus. Keep plain clicks
+// (empty selection) positioning the cursor and keyboard selection intact, but
+// freeze the cursor while a real range is being dragged.
+function preserveCursorOnMouseSelection(ref) {
+    const editor = ref?.editorView;
+    if (!editor || editor.__bubbleSelectionCursorPatch)
+        return;
+    editor.__bubbleSelectionCursorPatch = true;
+    for (const method of ["setLocalSelection", "updateLocalSelection"]) {
+        const original = editor[method]?.bind(editor);
+        if (!original)
+            continue;
+        editor[method] = (anchorX, anchorY, focusX, focusY, bg, fg, updateCursor, followCursor) => {
+            const keyboardDriven = ref?._keyboardSelectionActive === true;
+            const emptySelection = anchorX === focusX && anchorY === focusY;
+            const allowCursorMove = keyboardDriven || emptySelection;
+            return original(anchorX, anchorY, focusX, focusY, bg, fg, allowCursorMove ? updateCursor : false, allowCursorMove ? followCursor : false);
+        };
+    }
+}
 function isDestroyedRenderable(ref) {
     return !ref || ref.isDestroyed === true;
 }
@@ -438,6 +478,15 @@ function OpenTuiApp(props) {
     let promptHistory = initialPromptHistory(displayMessages);
     let nextImageAttachmentIndex = nextImageLabelIndex(displayMessages);
     const pendingImageAttachments = new Map();
+    // Image-path pastes insert their [image#N] label immediately and ingest the
+    // file in the background; sends await these so a quick Enter can't outrun
+    // attachment registration.
+    const pendingImageIngestions = new Set();
+    // Long pastes are collapsed to "[Pasted text #N +M lines]" in the composer
+    // and expanded back to the full content when the message is submitted,
+    // mirroring how image attachments use "[Image #N]" labels.
+    const pendingPastedTexts = new Map();
+    let nextPastedTextIndex = 1;
     let composerImageResolutionSeq = 0;
     let applyingComposerImageReplacement = false;
     let promptHistoryIndex;
@@ -467,7 +516,7 @@ function OpenTuiApp(props) {
     let copyToastRoot;
     let copyToastText;
     const [sessionActive, setSessionActive] = createSignal(false);
-    const [sidebarMode, setSidebarModeState] = createSignal("auto");
+    const [sidebarMode, setSidebarModeState] = createSignal("collapsed");
     const [sidebarTick, setSidebarTick] = createSignal(0);
     // Sidebar MCP section collapsed state. Persisted across sidebarTick bumps,
     // only reset on actual mount. Collapse toggle exposed when > 2 servers.
@@ -502,11 +551,14 @@ function OpenTuiApp(props) {
     let providerDialogModelItems;
     let providerDialogModelRefreshId = 0;
     let previousPickerForKey;
-    let homePromptRef;
     let sessionPromptRef;
     let scrollbox;
     let transcriptScrollFollowing = true;
     let transcriptScrollInitialized = false;
+    // Set by forceFollow renders (user sends, approvals). Survives intervening
+    // streaming redraws that recompute follow state from the (still-unscrolled)
+    // position before the deferred scroll runs; cleared on user mouse scroll.
+    let transcriptForceScrollPending = false;
     let rootBox;
     let sidebarShell;
     let homeSurfaceShell;
@@ -518,7 +570,6 @@ function OpenTuiApp(props) {
         defaultWritesExpanded: false,
     };
     let dock;
-    let homeComposerShell;
     let sessionComposerShell;
     const promptScannerSyncs = new Set();
     let approvalRoot;
@@ -596,8 +647,6 @@ function OpenTuiApp(props) {
     const providerDialogFooters = [];
     const promptModeLabels = new Set();
     const promptModelLabels = new Set();
-    let footerModeBadge;
-    let footerTraceBadge;
     let sidebarTokenText;
     let sidebarPercentText;
     let sidebarGaugeText;
@@ -619,9 +668,7 @@ function OpenTuiApp(props) {
     const sidebarFileAdditions = [];
     const sidebarFileDeletions = [];
     let sidebarFileSection;
-    const activePrompt = () => isHomeSurfaceActive()
-        ? homePromptRef ?? sessionPromptRef
-        : sessionPromptRef ?? homePromptRef;
+    const activePrompt = () => sessionPromptRef;
     function setPromptText(value) {
         promptText = value;
         const prompt = activePrompt();
@@ -703,7 +750,6 @@ function OpenTuiApp(props) {
         return true;
     }
     function blurInputsForModal() {
-        homePromptRef?.blur();
         sessionPromptRef?.blur();
         questionCustomInput?.blur();
         providerDialogInput?.blur();
@@ -760,9 +806,7 @@ function OpenTuiApp(props) {
                 activePrompt()?.focus();
         }, 0);
     }
-    const activeComposerShell = () => isHomeSurfaceActive()
-        ? homeComposerShell ?? sessionComposerShell
-        : sessionComposerShell ?? homeComposerShell;
+    const activeComposerShell = () => sessionComposerShell;
     onCleanup(() => {
         uiDisposed = true;
         if (copyToastClearTimer)
@@ -774,7 +818,6 @@ function OpenTuiApp(props) {
         feishuSetupAbortController?.abort();
         promptModeLabels.clear();
         promptModelLabels.clear();
-        footerModeBadge = undefined;
     });
     function showCopyToast(toast, ttl = 2200) {
         if (copyToastClearTimer)
@@ -894,6 +937,23 @@ function OpenTuiApp(props) {
         return dimensions().width > SESSION_SIDEBAR_AUTO_WIDTH;
     };
     const contentWidth = () => Math.max(20, dimensions().width - (sidebarVisible() ? SESSION_SIDEBAR_WIDTH : 0) - 4);
+    const liveTerminalDimensions = () => {
+        const reactive = dimensions();
+        // Some terminal split-pane flows leave OpenTUI's resize signal stale. Node's
+        // TTY size is sampled on demand, so use it for modal geometry when present.
+        const stdoutWidth = process.stdout.columns;
+        const stdoutHeight = process.stdout.rows;
+        const width = Number.isFinite(stdoutWidth) && stdoutWidth && stdoutWidth > 0
+            ? stdoutWidth
+            : reactive.width;
+        const height = Number.isFinite(stdoutHeight) && stdoutHeight && stdoutHeight > 0
+            ? stdoutHeight
+            : reactive.height;
+        return {
+            width: Math.max(1, Math.floor(width)),
+            height: Math.max(1, Math.floor(height)),
+        };
+    };
     const bumpSidebar = () => {
         setSidebarTick((value) => value + 1);
         syncSidebarContext();
@@ -1075,9 +1135,7 @@ function OpenTuiApp(props) {
     }
     const promptModeTitle = () => mode() === "plan" ? "Plan" : "Build";
     const promptModeBadge = () => promptModeBadgeContent(mode());
-    const footerModeText = () => footerPermissionModeText(mode());
     const effectiveShowThinking = () => showThinking() || verboseTrace();
-    const footerTraceText = () => footerTraceModeText(verboseTrace());
     function syncModeChrome() {
         if (uiDisposed)
             return;
@@ -1085,23 +1143,12 @@ function OpenTuiApp(props) {
             if (!safeSetText(label, promptModeBadge()))
                 promptModeLabels.delete(label);
         }
-        if (footerModeBadge) {
-            footerModeBadge.fg = permissionModeColor(mode());
-            if (!safeSetText(footerModeBadge, footerModeText()))
-                footerModeBadge = undefined;
-        }
-        safeRequestRender(homeComposerShell);
         safeRequestRender(sessionComposerShell);
         safeRequestRender(rootBox);
     }
     function syncTraceChrome() {
         if (uiDisposed)
             return;
-        if (footerTraceBadge) {
-            footerTraceBadge.fg = verboseTrace() ? theme.warning : theme.textMuted;
-            if (!safeSetText(footerTraceBadge, footerTraceText()))
-                footerTraceBadge = undefined;
-        }
         safeRequestRender(rootBox);
     }
     const registerPromptModeLabel = (ref) => {
@@ -1119,7 +1166,6 @@ function OpenTuiApp(props) {
             if (!safeSetText(label, promptModelTitle()))
                 promptModelLabels.delete(label);
         }
-        safeRequestRender(homeComposerShell);
         safeRequestRender(sessionComposerShell);
         safeRequestRender(rootBox);
     };
@@ -1130,21 +1176,6 @@ function OpenTuiApp(props) {
         if (!safeSetText(ref, promptModelTitle()))
             promptModelLabels.delete(ref);
     };
-    const registerFooterModeBadge = (ref) => {
-        if (uiDisposed)
-            return;
-        footerModeBadge = ref;
-        if (!safeSetText(ref, footerModeText()))
-            footerModeBadge = undefined;
-    };
-    const registerFooterTraceBadge = (ref) => {
-        if (uiDisposed)
-            return;
-        footerTraceBadge = ref;
-        ref.fg = verboseTrace() ? theme.warning : theme.textMuted;
-        if (!safeSetText(ref, footerTraceText()))
-            footerTraceBadge = undefined;
-    };
     const cycleMode = () => {
         if (picker || pendingPlan() || isRunning())
             return false;
@@ -1367,7 +1398,7 @@ function OpenTuiApp(props) {
         redrawApprovalPanel();
         if (approval || plan)
             focusApprovalPanel();
-        redrawTranscript();
+        redrawTranscript(streamingDisplay, displayMessages, { forceFollow: !!approval });
     };
     function questionStateFromRequest(request) {
         return {
@@ -1450,7 +1481,13 @@ function OpenTuiApp(props) {
         setTimeout(() => {
             if (!scrollbox)
                 return;
-            if (shouldFollow && transcriptScrollFollowing) {
+            const action = resolveTranscriptScroll({
+                forcePending: transcriptForceScrollPending,
+                shouldFollow,
+                following: transcriptScrollFollowing,
+            });
+            if (action === "scroll-bottom") {
+                transcriptForceScrollPending = false;
                 scrollTranscriptToBottom();
             }
             else {
@@ -1459,6 +1496,7 @@ function OpenTuiApp(props) {
         }, delay);
     }
     function handleTranscriptMouseScroll() {
+        transcriptForceScrollPending = false;
         setTimeout(updateTranscriptScrollFollowingFromPosition, 0);
     }
     function syncQuestionUI(focusCustom = false) {
@@ -2327,18 +2365,18 @@ function OpenTuiApp(props) {
     function isHomeSurfaceActive(extra) {
         return !hasTranscriptMessages(extra) && !pendingPlan() && !pendingQuestion() && !pendingFeedback() && !statsPanel && !pendingFeishuSetup();
     }
+    function isComposerHiddenByModal() {
+        return !!pendingQuestion() || !!pendingFeedback() || !!statsPanel || !!pendingFeishuSetup();
+    }
     function syncPromptSurfaces(focus = false) {
         const homeActive = isHomeSurfaceActive(streamingDisplay);
         const nextSessionActive = !homeActive;
         const surfaceChanged = sessionActive() !== nextSessionActive;
         setSessionActive(nextSessionActive);
-        const modalComposerHidden = !!pendingQuestion() || !!pendingFeedback() || !!statsPanel || !!pendingFeishuSetup();
         if (homeSurfaceShell)
             homeSurfaceShell.visible = homeActive;
-        if (homeComposerShell)
-            homeComposerShell.visible = homeActive && !modalComposerHidden;
         if (sessionComposerShell)
-            sessionComposerShell.visible = !homeActive && !modalComposerHidden;
+            sessionComposerShell.visible = !isComposerHiddenByModal();
         syncSidebarChrome();
         if (focus || surfaceChanged)
             setTimeout(() => activePrompt()?.focus(), 0);
@@ -2362,7 +2400,6 @@ function OpenTuiApp(props) {
             }
         }
         try {
-            homeComposerShell?.requestRender();
             sessionComposerShell?.requestRender();
             rootBox?.requestRender();
         }
@@ -2409,25 +2446,33 @@ function OpenTuiApp(props) {
     function queuedInputLabel(count = queuedInputCount()) {
         return `${count} queued message${count === 1 ? "" : "s"}`;
     }
-    function redrawTranscriptWithQueuedDisplays() {
-        redrawTranscript(streamingDisplay, displayMessages);
+    function redrawTranscriptWithQueuedDisplays(options = {}) {
+        redrawTranscript(streamingDisplay, displayMessages, options);
     }
-    function addQueuedUserDisplay(input) {
+    function addUserInputStatusDisplay(input, inputStatus) {
         const displayId = `queued-${++nextQueuedDisplayId}`;
         queuedDisplayMessages = [
             ...queuedDisplayMessages,
-            { role: "user", content: input, clientId: displayId, queued: true },
+            { role: "user", content: input, clientId: displayId, inputStatus },
         ];
-        redrawTranscriptWithQueuedDisplays();
+        // Sending a message is explicit user intent to look at the newest turn:
+        // snap to the bottom even if the transcript was scrolled up.
+        redrawTranscriptWithQueuedDisplays({ forceFollow: true });
         return displayId;
     }
-    function updateQueuedUserDisplay(displayId, queued) {
+    function addQueuedUserDisplay(input) {
+        return addUserInputStatusDisplay(input, "queued");
+    }
+    function addPendingSteerUserDisplay(input) {
+        return addUserInputStatusDisplay(input, "pending_steer");
+    }
+    function updateUserInputDisplayStatus(displayId, inputStatus) {
         let changed = false;
         const update = (message) => {
             if (message.clientId !== displayId)
                 return message;
             changed = true;
-            return { ...message, queued };
+            return setUserInputStatus(message, inputStatus);
         };
         displayMessages = displayMessages.map(update);
         queuedDisplayMessages = queuedDisplayMessages.map(update);
@@ -2452,11 +2497,14 @@ function OpenTuiApp(props) {
             return false;
         const index = queuedDisplayMessages.findIndex((message) => message.clientId === displayId);
         if (index === -1) {
-            return updateQueuedUserDisplay(displayId, false);
+            return updateUserInputDisplayStatus(displayId);
         }
         const message = queuedDisplayMessages[index];
         queuedDisplayMessages = queuedDisplayMessages.filter((_, itemIndex) => itemIndex !== index);
-        displayMessages = [...displayMessages, { ...message, content: message.content || fallbackContent || " ", queued: false }];
+        displayMessages = [
+            ...displayMessages,
+            setUserInputStatus({ ...message, content: message.content || fallbackContent || " " }),
+        ];
         redrawTranscriptWithQueuedDisplays();
         return true;
     }
@@ -2490,7 +2538,7 @@ function OpenTuiApp(props) {
     }
     function requeueRejectedSteer(input, displayId) {
         const queuedDisplayId = displayId ?? addQueuedUserDisplay(input);
-        updateQueuedUserDisplay(queuedDisplayId, true);
+        updateUserInputDisplayStatus(queuedDisplayId, "queued");
         rejectedSteerInputs.push({ input, displayId: queuedDisplayId });
         syncQueuedComposerInputCount();
         if (!isRunning())
@@ -2583,9 +2631,12 @@ function OpenTuiApp(props) {
             queueComposerInput(input, { showInTranscript: true });
             return;
         }
-        const displayId = addQueuedUserDisplay(input);
-        const pendingInput = run.inputController.enqueue(input);
-        pendingSteerInputs.push({ id: pendingInput.id, input, displayId });
+        // Expand here because steer inputs bypass handleInput; keep the expanded
+        // text in the record so a rejected steer requeues without stale markers.
+        const expandedInput = expandComposerPastedTexts(input);
+        const displayId = addPendingSteerUserDisplay(expandedInput);
+        const pendingInput = run.inputController.enqueue(expandedInput);
+        pendingSteerInputs.push({ id: pendingInput.id, input: expandedInput, displayId });
         syncPendingSteerInputCount();
         setNotice("Steer pending for next model call");
     }
@@ -2883,12 +2934,17 @@ function OpenTuiApp(props) {
         updateTranscriptHost(transcriptHost, transcriptState, messages, transcriptOptions(), props.syntaxStyle, props.subtleSyntaxStyle);
         syncPromptSurfaces();
     }
-    function redrawTranscript(extra, baseMessages = displayMessages) {
+    function redrawTranscript(extra, baseMessages = displayMessages, options = {}) {
         streamingDisplay = extra;
-        renderTranscriptNow(streamingDisplay, baseMessages);
+        renderTranscriptNow(streamingDisplay, baseMessages, options);
     }
-    function renderTranscriptNow(extra, baseMessages = displayMessages) {
-        const shouldFollow = shouldFollowTranscriptBeforeUpdate();
+    function renderTranscriptNow(extra, baseMessages = displayMessages, options = {}) {
+        const shouldFollow = options.forceFollow ? true : shouldFollowTranscriptBeforeUpdate();
+        if (options.forceFollow) {
+            transcriptScrollFollowing = true;
+            transcriptScrollInitialized = true;
+            transcriptForceScrollPending = true;
+        }
         const nextMessages = compactDisplayMessages([
             ...baseMessages,
             ...(extra ? [extra] : []),
@@ -2906,6 +2962,7 @@ function OpenTuiApp(props) {
         syncSidebarChrome();
         redrawQuestionPanel();
         redrawStatsPanel();
+        redrawProviderDialog();
         redrawFeishuSetupPanel();
         scrollbox?.requestRender();
         scheduleTranscriptScrollAfterUpdate(shouldFollow);
@@ -2980,7 +3037,12 @@ function OpenTuiApp(props) {
             step,
             providerId,
             query: "",
-            index: step === "models" ? preferredPickerIndex("model", items) : 0,
+            index: step === "models"
+                ? preferredPickerIndex("model", items)
+                // "(current)" sits at the bottom of the rewind list and is the safe default.
+                : step === "rewind"
+                    ? Math.max(0, items.length - 1)
+                    : 0,
             apiKey: "",
         };
         activePrompt()?.clear();
@@ -3011,6 +3073,10 @@ function OpenTuiApp(props) {
             return providerId ? buildPickerItems("provider-auth", providerId) : [];
         if (step === "skills")
             return buildSkillItems();
+        if (step === "rewind")
+            return buildRewindPickerItems();
+        if (step === "rewind-action")
+            return buildRewindActionItems(providerId);
         if (step === "models") {
             if (providerDialogModelItems?.key === modelPickerCacheKey(providerId)) {
                 return providerDialogModelItems.items;
@@ -3131,11 +3197,13 @@ function OpenTuiApp(props) {
             providerDialogRoot.requestRender();
             return;
         }
-        const width = Math.max(56, Math.min(76, dimensions().width - 4));
+        const terminal = liveTerminalDimensions();
+        const width = providerDialogPanelWidth(terminal.width);
         const height = PROVIDER_DIALOG_ROWS + 7;
+        const columnWidths = providerDialogColumnWidths(state, width);
         providerDialogRoot.visible = true;
-        providerDialogRoot.width = dimensions().width;
-        providerDialogRoot.height = dimensions().height;
+        providerDialogRoot.width = terminal.width;
+        providerDialogRoot.height = terminal.height;
         providerDialogRoot.left = 0;
         providerDialogRoot.top = 0;
         providerDialogRoot.backgroundColor = modalBackdropColor();
@@ -3143,8 +3211,8 @@ function OpenTuiApp(props) {
             providerDialogPanel.visible = true;
             providerDialogPanel.width = width;
             providerDialogPanel.height = height;
-            providerDialogPanel.left = Math.max(0, Math.floor((dimensions().width - width) / 2));
-            providerDialogPanel.top = Math.max(0, Math.floor(dimensions().height / 4));
+            providerDialogPanel.left = Math.max(0, Math.floor((terminal.width - width) / 2));
+            providerDialogPanel.top = Math.max(0, Math.floor(terminal.height / 4));
             providerDialogPanel.backgroundColor = theme.backgroundPanel;
             providerDialogPanel.borderColor = theme.backgroundPanel;
             providerDialogPanel.requestRender();
@@ -3218,20 +3286,20 @@ function OpenTuiApp(props) {
                     gutter.fg = active ? activeText : providerDialogGutterColor(row.item.gutter ?? (isCurrentModelItem(row.item) ? "●" : undefined));
                 }
                 if (label) {
-                    label.content = truncate(row.item.label, providerDialogLabelWidth(state));
+                    label.content = truncate(row.item.label, columnWidths.label);
                     label.fg = active ? activeText : isCurrentModelItem(row.item) ? theme.primary : theme.text;
                 }
                 if (detail) {
                     const detailText = state.query.trim() && state.step === "models"
                         ? row.item.category ?? row.item.detail ?? ""
                         : row.item.detail ?? "";
-                    detail.width = providerDialogDetailWidth(state);
-                    detail.content = truncate(detailText, providerDialogDetailWidth(state));
+                    detail.width = columnWidths.detail;
+                    detail.content = truncate(detailText, columnWidths.detail);
                     detail.fg = active ? activeText : theme.textMuted;
                 }
                 if (footer) {
-                    footer.width = providerDialogFooterWidth(state);
-                    footer.content = row.item.footer ?? "";
+                    footer.width = columnWidths.footer;
+                    footer.content = truncate(row.item.footer ?? "", columnWidths.footer);
                     footer.fg = active ? activeText : theme.textMuted;
                 }
             }
@@ -3247,6 +3315,10 @@ function OpenTuiApp(props) {
             return "Connect a provider";
         if (state.step === "skills")
             return "Select skill";
+        if (state.step === "rewind")
+            return "Rewind — restore to the point before…";
+        if (state.step === "rewind-action")
+            return "Rewind — what to restore?";
         const provider = providerDisplayName(state.providerId);
         if (state.step === "auth")
             return `${provider} auth method`;
@@ -3267,6 +3339,10 @@ function OpenTuiApp(props) {
         }
         if (state.step === "skills")
             return `↑/↓ move · enter insert · esc close${count}`;
+        if (state.step === "rewind")
+            return `↑/↓ move · enter continue · esc cancel${count}`;
+        if (state.step === "rewind-action")
+            return "↑/↓ move · enter confirm · esc back";
         const escLabel = state.step === "providers" ? "esc close" : "esc back";
         return `↑/↓ move · enter select · ${escLabel}${count}`;
     }
@@ -3279,14 +3355,25 @@ function OpenTuiApp(props) {
             return theme.warning;
         return theme.textMuted;
     }
-    function providerDialogLabelWidth(state) {
-        return state.step === "skills" ? 22 : 37;
-    }
-    function providerDialogDetailWidth(state) {
-        return state.step === "skills" ? 26 : 16;
-    }
-    function providerDialogFooterWidth(state) {
-        return state.step === "skills" ? 9 : 8;
+    function providerDialogPanelWidth(terminalWidth) {
+        return Math.max(PROVIDER_DIALOG_MIN_WIDTH, Math.min(PROVIDER_DIALOG_MAX_WIDTH, terminalWidth - 4));
+    }
+    function providerDialogColumnWidths(state, panelWidth) {
+        const contentWidth = Math.max(24, panelWidth - PROVIDER_DIALOG_ROW_RESERVED_WIDTH);
+        const footer = state.step === "skills" ? 10 : state.step === "providers" ? 9 : 8;
+        const minLabel = state.step === "skills" ? 18 : 24;
+        const desiredDetail = state.step === "skills"
+            ? 30
+            : state.step === "providers"
+                ? 24
+                : state.step === "rewind-action"
+                    ? 40
+                    : state.step === "rewind"
+                        ? 18
+                        : 16;
+        const detail = Math.max(8, Math.min(desiredDetail, contentWidth - footer - minLabel));
+        const label = Math.max(8, contentWidth - detail - footer);
+        return { label, detail, footer };
     }
     function isCurrentModelItem(item) {
         return item.value === props.agent.model || item.detail?.includes("current");
@@ -3351,8 +3438,8 @@ function OpenTuiApp(props) {
             else if (state.step === "key") {
                 openProviderDialog(state.providerId && registry.supportsOAuth(state.providerId) ? "auth" : "providers", state.providerId);
             }
-            else if (state.step === "models" || state.step === "skills") {
-                closeProviderDialog();
+            else if (state.step === "rewind-action") {
+                openProviderDialog("rewind");
             }
             else {
                 closeProviderDialog();
@@ -3483,6 +3570,20 @@ function OpenTuiApp(props) {
             await executeSlash(item.command);
             return;
         }
+        if (state.step === "rewind") {
+            if (!item.value) {
+                // "(current)" — keep everything as is.
+                closeProviderDialog();
+                return;
+            }
+            openProviderDialog("rewind-action", item.value);
+            return;
+        }
+        if (state.step === "rewind-action") {
+            closeProviderDialog();
+            await executeSlash(item.command);
+            return;
+        }
         if (state.step === "skills") {
             closeProviderDialog();
             insertSkillPrompt(item.value);
@@ -4597,6 +4698,129 @@ function OpenTuiApp(props) {
             applyingComposerImageReplacement = false;
         }
     }
+    // Replaces pasted-text markers with their full content. Runs after @mention
+    // expansion so mention-like tokens inside pasted content stay literal.
+    // References stay registered for the whole session so prompt-history recall
+    // and requeued drafts containing a marker expand again on resend.
+    function expandComposerPastedTexts(text) {
+        if (pendingPastedTexts.size === 0 || !text.includes("[Pasted text #"))
+            return text;
+        const references = [...pendingPastedTexts.entries()].map(([marker, content]) => ({ marker, content }));
+        return expandPastedContentMarkers(text, references);
+    }
+    // Inserts [image#N] labels at the cursor, padding with spaces when the
+    // paste lands glued to surrounding text. Returns false when no prompt is
+    // mounted (the caller should leave the paste alone).
+    function insertComposerImageLabels(event, labels) {
+        const prompt = activePrompt();
+        if (!prompt)
+            return false;
+        event.preventDefault?.();
+        const current = prompt.plainText ?? "";
+        const offset = Math.min(Math.max(prompt.cursorOffset ?? current.length, 0), current.length);
+        const needsLead = offset > 0 && !/\s/.test(current[offset - 1] ?? "");
+        const needsTrail = offset < current.length && !/\s/.test(current[offset] ?? "");
+        const joined = labels.map((label) => `[${label}]`).join(" ");
+        prompt.insertText(`${needsLead ? " " : ""}${joined}${needsTrail ? " " : ""}`);
+        onPromptContentChange(readPromptText());
+        return true;
+    }
+    function handleComposerPaste(event) {
+        const text = typeof event.text === "string" ? event.text : decodePastedBytes(event.bytes);
+        if (isImagePathPaste(text)) {
+            // Insert the final [image#N] label at paste time and ingest the file in
+            // the background. Inserting the raw path and swapping it later flashes
+            // the path and resets the cursor (setPromptText jumps it to the end).
+            const entries = splitPastedPaths(text).map((rawPath) => ({
+                rawPath,
+                label: imageLabelForPath(rawPath, nextImageAttachmentIndex),
+            }));
+            if (!insertComposerImageLabels(event, entries.map((entry) => entry.label)))
+                return;
+            nextImageAttachmentIndex += entries.length;
+            trackImagePathIngestion(entries);
+            return;
+        }
+        // Copying an image file in Finder pastes only the file's NAME; Cmd+V of
+        // raw image data pastes nothing at all. Both leave the real bits on the
+        // system clipboard, so attach from there.
+        const bareName = bareImageFilenameFromPaste(text);
+        if (bareName || !text.trim()) {
+            const label = bareName
+                ? imageLabelForPath(bareName, nextImageAttachmentIndex)
+                : `image#${nextImageAttachmentIndex}.png`;
+            if (!insertComposerImageLabels(event, [label]))
+                return;
+            nextImageAttachmentIndex += 1;
+            trackClipboardImageIngestion(label, text);
+            return;
+        }
+        if (!shouldCollapsePastedContent(text))
+            return;
+        event.preventDefault?.();
+        const marker = createPastedContentMarker(text, nextPastedTextIndex);
+        nextPastedTextIndex += 1;
+        pendingPastedTexts.set(marker, text);
+        const prompt = activePrompt();
+        prompt?.insertText(marker);
+        onPromptContentChange(readPromptText());
+    }
+    function trackImageIngestion(task) {
+        pendingImageIngestions.add(task);
+        void task.finally(() => pendingImageIngestions.delete(task));
+    }
+    function trackImagePathIngestion(entries) {
+        trackImageIngestion((async () => {
+            for (const { rawPath, label } of entries) {
+                const result = await ingestImagePath(rawPath);
+                if (result.attachment) {
+                    pendingImageAttachments.set(label, result.attachment);
+                }
+                else {
+                    addMessage("error", `Skipped image: ${rawPath}: ${result.error ?? "could not attach image"}`);
+                    replaceComposerImageLabel(label, "");
+                }
+            }
+        })());
+    }
+    function trackClipboardImageIngestion(label, originalText) {
+        trackImageIngestion((async () => {
+            const result = await ingestClipboardImage();
+            if (result.attachment) {
+                pendingImageAttachments.set(label, result.attachment);
+                return;
+            }
+            const restored = originalText.trim();
+            // A filename-looking text paste with no image on the clipboard is just
+            // text — restore it quietly. Only an empty paste (Cmd+V of image data)
+            // warrants an error, since there is nothing to restore.
+            if (!restored)
+                addMessage("error", `Could not attach image from clipboard: ${result.error ?? "unknown error"}`);
+            replaceComposerImageLabel(label, restored);
+        })());
+    }
+    // Swaps a failed image label for its replacement (or drops it) without
+    // moving the cursor relative to the surrounding text.
+    function replaceComposerImageLabel(label, replacement) {
+        const prompt = activePrompt();
+        const current = prompt?.plainText ?? promptText;
+        const token = `[${label}]`;
+        const start = current.indexOf(token);
+        if (start < 0)
+            return;
+        let end = start + token.length;
+        if (!replacement && current[end] === " ")
+            end += 1;
+        const next = current.slice(0, start) + replacement + current.slice(end);
+        if (prompt) {
+            const cursor = Math.min(Math.max(prompt.cursorOffset ?? next.length, 0), current.length);
+            prompt.setText(next);
+            prompt.cursorOffset = cursor <= start
+                ? cursor
+                : Math.min(next.length, Math.max(start + replacement.length, cursor - (end - start) + replacement.length));
+        }
+        onPromptContentChange(next);
+    }
     async function expandTextParts(parts) {
         const expandedParts = [];
         for (const part of parts) {
@@ -4607,14 +4831,18 @@ function OpenTuiApp(props) {
             const expansion = await expandAtMentions(part.text, props.args.cwd);
             if (expansion.missing.length)
                 addMessage("error", `Could not resolve @mention: ${expansion.missing.join(", ")}`);
-            for (const skipped of expansion.skipped)
-                addMessage("error", `Skipped @${skipped.path}: ${skipped.reason}`);
-            expandedParts.push({ type: "text", text: expansion.text });
+            for (const skipped of expansion.skipped) {
+                if (skipped.reason !== "too large")
+                    addMessage("error", `Skipped @${skipped.path}: ${skipped.reason}`);
+            }
+            expandedParts.push({ type: "text", text: expandComposerPastedTexts(expansion.text) });
         }
         return expandedParts;
     }
     async function handleInput(input, options = {}) {
         setNotice("");
+        if (pendingImageIngestions.size > 0)
+            await Promise.all([...pendingImageIngestions]);
         const labeledInput = buildImageContentPartsFromLabels(input, pendingImageAttachments);
         if (labeledInput.actualInput) {
             await runAgentInput(await expandTextParts(labeledInput.actualInput), labeledInput.displayInput, options);
@@ -4635,7 +4863,7 @@ function OpenTuiApp(props) {
         if (input.startsWith("/")) {
             const skillInvocation = parseSkillInvocation(input, skills);
             if (skillInvocation) {
-                await runAgentInput(skillInvocation.actualPrompt, input, options);
+                await runAgentInput(expandComposerPastedTexts(skillInvocation.actualPrompt), input, options);
                 return;
             }
             const handled = await executeSlash(input, options);
@@ -4645,9 +4873,11 @@ function OpenTuiApp(props) {
         const expansion = await expandAtMentions(input, props.args.cwd);
         if (expansion.missing.length)
             addMessage("error", `Could not resolve @mention: ${expansion.missing.join(", ")}`);
-        for (const skipped of expansion.skipped)
-            addMessage("error", `Skipped @${skipped.path}: ${skipped.reason}`);
-        await runAgentInput(expansion.text, input, options);
+        for (const skipped of expansion.skipped) {
+            if (skipped.reason !== "too large")
+                addMessage("error", `Skipped @${skipped.path}: ${skipped.reason}`);
+        }
+        await runAgentInput(expandComposerPastedTexts(expansion.text), input, options);
     }
     async function executeSlash(input, options = {}) {
         if (/^\/(?:thinking|toggle-thinking)(?:\s|$)/.test(input.trim())) {
@@ -4676,10 +4906,19 @@ function OpenTuiApp(props) {
             openPicker: (kind, providerId) => {
                 void openPicker(kind, providerId);
             },
+            openRewindPicker: () => {
+                openProviderDialog("rewind");
+            },
+            fillComposer: (text) => {
+                resetPromptHistoryBrowse();
+                setPromptText(text);
+                redrawDock();
+            },
             registry,
             skillRegistry: skills,
             bashAllowlist: props.options.bashAllowlist,
             settingsManager: props.options.settingsManager,
+            hookController: props.options.hookController,
             mcpManager: props.options.mcpManager,
             lspService,
             flushMemory: props.options.flushMemory,
@@ -4721,6 +4960,13 @@ function OpenTuiApp(props) {
                     redrawTranscript(undefined, displayMessages);
                     setTimeout(() => setNotice(""), 4000);
                 }
+                else if (result.startsWith("⏪")) {
+                    // /rewind truncated agent.messages — rebuild the transcript from the
+                    // rewound state before appending the summary.
+                    displayMessages = reconstructDisplayMessages(props.agent.messages);
+                    streamingDisplay = undefined;
+                    addMessage("assistant", result);
+                }
                 else {
                     addMessage("assistant", result);
                 }
@@ -4992,6 +5238,48 @@ function OpenTuiApp(props) {
             command: `/logout ${provider.id}`,
         }));
     }
+    function buildRewindPickerItems() {
+        const session = props.options.sessionManager;
+        if (!session)
+            return [];
+        const checkpoints = session.getCheckpoints();
+        const items = session.listUserTurns().map((turn, index) => {
+            const files = checkpoints.filesTouchedAt(turn.id).length;
+            return {
+                label: turn.preview,
+                detail: files > 0 ? `${files} file${files === 1 ? "" : "s"} changed` : "No code changes",
+                value: String(index + 1),
+                command: `/rewind ${index + 1}`,
+            };
+        });
+        // Selecting "(current)" keeps everything as is — mirrors Claude Code.
+        items.push({ label: "(current)", value: "", command: "" });
+        return items;
+    }
+    function buildRewindActionItems(turnNumber) {
+        if (!turnNumber)
+            return [];
+        return [
+            {
+                label: "Restore conversation and code",
+                detail: "Rewind the chat and undo tracked file edits",
+                value: turnNumber,
+                command: `/rewind ${turnNumber}`,
+            },
+            {
+                label: "Restore conversation only",
+                detail: "Keep file changes on disk",
+                value: turnNumber,
+                command: `/rewind ${turnNumber} --chat`,
+            },
+            {
+                label: "Restore code only",
+                detail: "Undo tracked file edits, keep the conversation",
+                value: turnNumber,
+                command: `/rewind ${turnNumber} --code`,
+            },
+        ];
+    }
     function buildSkillItems() {
         return skills.summaries().map((skill) => {
             const tags = skill.tags && skill.tags.length > 0 ? ` · ${skill.tags.join(", ")}` : "";
@@ -5106,14 +5394,19 @@ function OpenTuiApp(props) {
             return;
         }
         rememberPromptHistory(displayInput);
-        const reusedQueuedDisplay = promoteQueuedUserDisplay(options.displayId, displayInput);
+        // History keeps the short marker (it expands again on resend); the
+        // transcript shows the full pasted content once the message is sent.
+        const displayContent = expandComposerPastedTexts(displayInput);
+        const reusedQueuedDisplay = promoteQueuedUserDisplay(options.displayId, displayContent);
         const nextMessages = reusedQueuedDisplay
             ? displayMessages
-            : [...displayMessages, { role: "user", content: displayInput }];
+            : [...displayMessages, { role: "user", content: displayContent }];
         if (!reusedQueuedDisplay)
             displayMessages = nextMessages;
         streamingDisplay = undefined;
-        redrawTranscript(undefined, nextMessages);
+        // The user just sent this message — re-engage bottom-follow so the new
+        // turn is visible even if they had scrolled up to read earlier history.
+        redrawTranscript(undefined, nextMessages, { forceFollow: true });
         const taskStartedAt = Date.now();
         const run = beginAgentRun();
         traceEvent("tui_agent_run_begin", {
@@ -5127,6 +5420,8 @@ function OpenTuiApp(props) {
         }, { surface: "tui" });
         let assistantContent = "";
         let assistantReasoning = "";
+        let textDisplaySanitizer = createStreamingInternalReminderSanitizer();
+        let reasoningDisplaySanitizer = createStreamingInternalReminderSanitizer();
         const toolCalls = [];
         const assistantParts = [];
         let turnStartedAt;
@@ -5141,7 +5436,7 @@ function OpenTuiApp(props) {
         const buildStreamingDisplay = (status) => {
             const currentParts = snapshotDisplayParts(assistantParts);
             const partContent = assistantContent || contentFromParts(currentParts);
-            return {
+            return sanitizeDisplayMessage({
                 role: "assistant",
                 content: partContent,
                 reasoning: assistantReasoning || undefined,
@@ -5150,7 +5445,7 @@ function OpenTuiApp(props) {
                 status,
                 streaming: true,
                 turnStartedAt,
-            };
+            });
         };
         const flushStreamingRedraw = () => {
             if (pendingStreamingRedrawTimer === undefined)
@@ -5180,6 +5475,8 @@ function OpenTuiApp(props) {
                 if (event.type === "turn_start") {
                     assistantContent = "";
                     assistantReasoning = "";
+                    textDisplaySanitizer = createStreamingInternalReminderSanitizer();
+                    reasoningDisplaySanitizer = createStreamingInternalReminderSanitizer();
                     toolCalls.length = 0;
                     assistantParts.length = 0;
                     turnStartedAt = Date.now();
@@ -5192,22 +5489,42 @@ function OpenTuiApp(props) {
                     });
                 }
                 else if (event.type === "text_delta") {
-                    assistantContent += event.content;
-                    appendTextPart(assistantParts, event.content);
-                    scheduleStreamingRedraw();
+                    const content = textDisplaySanitizer.push(event.content);
+                    if (content) {
+                        assistantContent += content;
+                        appendTextPart(assistantParts, content);
+                        scheduleStreamingRedraw();
+                    }
                 }
                 else if (event.type === "reasoning_delta") {
+                    const content = reasoningDisplaySanitizer.push(event.content);
+                    if (!content)
+                        continue;
                     debugReasoningStream({
                         stage: "ui_append",
                         providerId: props.agent.providerId,
                         modelId: props.agent.apiModel,
                         beforeLength: assistantReasoning.length,
-                        delta: summarizeDebugText(event.content),
-                        afterLength: assistantReasoning.length + event.content.length,
+                        delta: summarizeDebugText(content),
+                        afterLength: assistantReasoning.length + content.length,
                     });
-                    assistantReasoning += event.content;
+                    assistantReasoning += content;
                     scheduleStreamingRedraw();
                 }
+                else if (event.type === "hook_start") {
+                    setNotice(`Hook ${event.eventName}: ${event.hookId}`);
+                }
+                else if (event.type === "hook_end") {
+                    if (event.decision === "deny") {
+                        setNotice(event.reason ?? `Hook ${event.hookId} denied ${event.eventName}`);
+                    }
+                }
+                else if (event.type === "hook_error") {
+                    setNotice(`Hook ${event.hookId} error: ${event.error}`);
+                }
+                else if (event.type === "provider_retry") {
+                    setNotice(`Connection interrupted — retrying (${event.attempt}/${event.maxAttempts})…`);
+                }
                 else if (event.type === "tool_call_start") {
                     // Insert a streaming placeholder so the user sees feedback the moment
                     // the model commits to a tool call, instead of waiting for the args
@@ -5336,6 +5653,15 @@ function OpenTuiApp(props) {
                         clearTimeout(pendingStreamingRedrawTimer);
                         pendingStreamingRedrawTimer = undefined;
                     }
+                    const flushedText = textDisplaySanitizer.flush();
+                    if (flushedText) {
+                        assistantContent += flushedText;
+                        appendTextPart(assistantParts, flushedText);
+                    }
+                    const flushedReasoning = reasoningDisplaySanitizer.flush();
+                    if (flushedReasoning) {
+                        assistantReasoning += flushedReasoning;
+                    }
                     if (event.usage) {
                         setSidebarUsage((current) => ({
                             contextTokens: event.usage.promptTokens || current.contextTokens,
@@ -5351,20 +5677,21 @@ function OpenTuiApp(props) {
                     }
                     bumpSidebar();
                     const currentParts = snapshotDisplayParts(assistantParts);
-                    const finalContent = assistantContent || contentFromParts(currentParts);
+                    const finalContent = sanitizeInternalReminderBlocks(assistantContent || contentFromParts(currentParts));
+                    const finalReasoning = sanitizeInternalReasoningText(assistantReasoning);
                     const finalToolCalls = toolCalls.length > 0
                         ? [...toolCalls]
                         : toolCallsFromParts(currentParts);
-                    const assistantMessage = {
+                    const assistantMessage = sanitizeDisplayMessage({
                         role: "assistant",
                         content: finalContent,
-                        reasoning: assistantReasoning || undefined,
+                        reasoning: finalReasoning || undefined,
                         toolCalls: finalToolCalls.length ? finalToolCalls : undefined,
                         parts: currentParts.length ? currentParts : undefined,
                         turnStartedAt,
                         turnCompletedAt: Date.now(),
                         turnUsage: event.usage,
-                    };
+                    });
                     const nextMessages = hasRenderableMessage(assistantMessage)
                         ? [...displayMessages, assistantMessage]
                         : displayMessages;
@@ -5464,16 +5791,16 @@ function OpenTuiApp(props) {
         return h("box", {
             ref: (ref) => {
                 sessionComposerShell = ref;
-                ref.visible = !isHomeSurfaceActive(streamingDisplay) && !pendingQuestion() && !pendingFeedback() && !statsPanel && !pendingFeishuSetup();
+                ref.visible = !isComposerHiddenByModal();
             },
             width: "100%",
             paddingLeft: 2,
             paddingRight: 2,
             flexShrink: 0,
-            visible: !isHomeSurfaceActive(streamingDisplay) && !pendingQuestion() && !statsPanel && !pendingFeishuSetup(),
+            visible: !isComposerHiddenByModal(),
         }, renderPrompt({
             ref: (ref) => { sessionPromptRef = ref; },
-            focused: !isHomeSurfaceActive(streamingDisplay),
+            focused: !isComposerHiddenByModal(),
             onSubmit: submitPrompt,
             isFallbackNewlineKey: isTrackedShiftReturn,
             onFallbackNewline: () => canInsertPromptNewline() && (activePrompt()?.newLine() ?? false),
@@ -5488,6 +5815,7 @@ function OpenTuiApp(props) {
             model: promptModelTitle,
             interruptHint: promptStatusText,
             tabHint: () => isRunning() ? "queue" : "mode",
+            onPaste: handleComposerPaste,
             placeholder: () => {
                 const approvalState = pendingApproval();
                 if (approvalState)
@@ -5508,7 +5836,6 @@ function OpenTuiApp(props) {
         }));
     }
     function renderHomeSurface() {
-        const homeHeight = Math.max(16, dimensions().height - 4);
         const logoLines = bubbleWordmarkForWidth(dimensions().width);
         return h("box", {
             ref: (ref) => {
@@ -5516,7 +5843,8 @@ function OpenTuiApp(props) {
                 ref.visible = isHomeSurfaceActive(streamingDisplay);
             },
             visible: isHomeSurfaceActive(streamingDisplay),
-            height: homeHeight,
+            height: "100%",
+            minHeight: 0,
             flexDirection: "column",
             alignItems: "center",
             justifyContent: "center",
@@ -5528,57 +5856,6 @@ function OpenTuiApp(props) {
             ...(props.options.updateNotice
                 ? [h("box", { flexShrink: 0, flexDirection: "column", alignItems: "center" }, h("text", { fg: theme.accent, content: props.options.updateNotice }))]
                 : []),
-            h("box", { height: 1, minHeight: 0, flexShrink: 1 }),
-            h("box", {
-                ref: (ref) => {
-                    homeComposerShell = ref;
-                    ref.visible = isHomeSurfaceActive(streamingDisplay) && !pendingQuestion() && !pendingFeedback() && !statsPanel && !pendingFeishuSetup();
-                },
-                width: "100%",
-                maxWidth: 75,
-                zIndex: 1000,
-                paddingTop: 1,
-                flexShrink: 0,
-                visible: isHomeSurfaceActive(streamingDisplay) && !pendingQuestion() && !statsPanel && !pendingFeishuSetup(),
-            }, renderPrompt({
-                ref: (ref) => {
-                    homePromptRef = ref;
-                    if (isHomeSurfaceActive(streamingDisplay))
-                        setTimeout(() => ref.focus(), 0);
-                },
-                focused: isHomeSurfaceActive(streamingDisplay),
-                onSubmit: submitPrompt,
-                isFallbackNewlineKey: isTrackedShiftReturn,
-                onFallbackNewline: () => canInsertPromptNewline() && (activePrompt()?.newLine() ?? false),
-                onContentChange: onPromptContentChange,
-                onKeyDown: handlePickerKey,
-                onUiKeyDown: promptUiKeyDown,
-                getText: readPromptText,
-                disabled: () => !!pendingFeedback() || !!statsPanel,
-                mode,
-                registerModeLabel: registerPromptModeLabel,
-                registerModelLabel: registerPromptModelLabel,
-                model: promptModelTitle,
-                interruptHint: promptStatusText,
-                tabHint: () => isRunning() ? "queue" : "mode",
-                placeholder: () => {
-                    const approvalState = pendingApproval();
-                    if (approvalState)
-                        return "Press Enter to approve or Esc to reject";
-                    if (pendingQuestion())
-                        return "Answer the question below";
-                    if (pendingFeedback())
-                        return "Describe feedback below";
-                    if (statsPanel)
-                        return "Stats panel is open";
-                    const plan = pendingPlan();
-                    if (plan)
-                        return "Press Enter to approve plan or Esc to reject";
-                    if (isRunning())
-                        return "Steer current run...";
-                    return `Ask anything... "${homePrompt}"`;
-                },
-            })),
         ]);
     }
     function renderQuestionPanelHost() {
@@ -5656,7 +5933,10 @@ function OpenTuiApp(props) {
             visible: false,
             flexShrink: 0,
         }, h("textarea", {
-            ref: (ref) => { questionCustomInput = ref; },
+            ref: (ref) => {
+                preserveCursorOnMouseSelection(ref);
+                questionCustomInput = ref;
+            },
             placeholder: "Type your own answer",
             placeholderColor: theme.textMuted,
             textColor: theme.text,
@@ -5745,7 +6025,10 @@ function OpenTuiApp(props) {
             wrapMode: "word",
             content: "Creates a public GitHub issue at DylanDDeng/bubble. Review before sending.",
         }), h("textarea", {
-            ref: (ref) => { feedbackInput = ref; },
+            ref: (ref) => {
+                preserveCursorOnMouseSelection(ref);
+                feedbackInput = ref;
+            },
             placeholder: "Describe what happened",
             placeholderColor: theme.textMuted,
             textColor: theme.text,
@@ -6657,11 +6940,9 @@ function OpenTuiApp(props) {
                 visible: !!approval,
                 focusable: true,
                 onKeyDown: handleApprovalKey,
-                position: "absolute",
-                left: 2,
-                right: 2,
-                bottom: 4,
-                zIndex: 200,
+                width: "100%",
+                flexShrink: 0,
+                marginTop: 1,
                 backgroundColor: theme.backgroundPanel,
                 border: ["left"],
                 borderColor: theme.warning,
@@ -6825,12 +7106,8 @@ function OpenTuiApp(props) {
         ]),
         renderFooter({
             cwd: props.args.cwd,
-            mode,
             running: isRunning,
             registerScanner: registerPromptScanner,
-            registerModeBadge: registerFooterModeBadge,
-            traceVerbose: verboseTrace,
-            registerTraceBadge: registerFooterTraceBadge,
         }),
         renderProviderDialog(),
         renderStatsPanel(),
@@ -6841,7 +7118,10 @@ function OpenTuiApp(props) {
 function renderPrompt(input) {
     const transparentBackground = "#00000000";
     return h("box", { flexDirection: "column", flexShrink: 0, marginTop: 1 }, h("box", { width: "100%", border: true, borderColor: theme.border, backgroundColor: transparentBackground }, h("box", { flexDirection: "column", paddingLeft: 2, paddingRight: 2, paddingTop: 1, paddingBottom: 1, backgroundColor: transparentBackground }, h("textarea", {
-        ref: input.ref,
+        ref: (ref) => {
+            preserveCursorOnMouseSelection(ref);
+            input.ref(ref);
+        },
         focused: input.focused,
         placeholder: input.placeholder(),
         placeholderColor: theme.textMuted,
@@ -6849,8 +7129,10 @@ function renderPrompt(input) {
         focusedTextColor: theme.text,
         backgroundColor: transparentBackground,
         focusedBackgroundColor: transparentBackground,
+        cursorColor: theme.primary,
         minHeight: 1,
         maxHeight: 6,
+        ...(input.onPaste ? { onPaste: input.onPaste } : {}),
         onContentChange: () => input.onContentChange(input.getText()),
         keyBindings: PROMPT_TEXTAREA_KEYBINDINGS,
         onKeyDown: (event) => {
@@ -6965,8 +7247,9 @@ function renderUserMessage(message, index) {
     const userChildren = [
         h("text", { fg: theme.messageUserText, wrapMode: "word" }, message.content || " "),
     ];
-    if (message.queued) {
-        userChildren.push(h("box", { paddingTop: 1 }, h("text", { fg: theme.textMuted }, h("span", { bg: theme.primary, fg: theme.background, bold: true }, " QUEUED "))));
+    const inputBadge = userInputStatusBadgeLabel(message.inputStatus);
+    if (inputBadge) {
+        userChildren.push(h("box", { paddingTop: 1 }, h("text", { fg: theme.textMuted }, h("span", { bg: theme.primary, fg: theme.background, bold: true }, ` ${inputBadge} `))));
     }
     return h("box", {
         border: ["left"],
@@ -6977,17 +7260,20 @@ function renderUserMessage(message, index) {
     }, h("box", { paddingTop: 1, paddingBottom: 1, paddingLeft: 2, backgroundColor: theme.backgroundPanel, flexShrink: 0, flexDirection: "column" }, ...userChildren));
 }
 function renderAssistantMessage(message, syntaxStyle, subtleSyntaxStyle, showThinking = true, verboseTrace = false, width = 80) {
+    message = sanitizeDisplayMessage(message);
     const visibleReasoning = showThinking
-        ? sanitizeInternalReminderBlocks(message.reasoning ?? "").trim()
+        ? sanitizeInternalReasoningText(message.reasoning ?? "").trim()
         : "";
-    const modelSwitch = parseModelSwitchMessage(message.content);
+    const sanitizedContent = sanitizeInternalReminderBlocks(message.content);
+    const modelSwitch = parseModelSwitchMessage(sanitizedContent);
     if (modelSwitch && !visibleReasoning && !(message.toolCalls?.length)) {
         return renderModelSwitchMessage(modelSwitch);
     }
     const children = [];
     const parts = message.parts ?? [];
     const hasParts = parts.length > 0;
-    if (message.status && !visibleReasoning && !message.content.trim() && !(message.toolCalls?.length) && !hasParts) {
+    const trimmedContent = sanitizedContent.trim();
+    if (message.status && !visibleReasoning && !trimmedContent && !(message.toolCalls?.length) && !hasParts) {
         children.push(h("box", { paddingLeft: 3, marginTop: 1, flexShrink: 0 }, h("text", { fg: theme.messageThinkingText }, assistantStatusLabel(message))));
     }
     if (visibleReasoning) {
@@ -7003,7 +7289,6 @@ function renderAssistantMessage(message, syntaxStyle, subtleSyntaxStyle, showThi
             fg: theme.messageThinkingContentText,
         })));
     }
-    const trimmedContent = message.content.trim();
     if (hasParts) {
         renderAssistantMessageParts(children, parts, syntaxStyle, verboseTrace, width, message.streaming === true);
     }
@@ -7041,7 +7326,7 @@ function renderAssistantMessage(message, syntaxStyle, subtleSyntaxStyle, showThi
 function renderAssistantMessageParts(children, parts, syntaxStyle, verboseTrace, width, streaming) {
     for (const part of parts) {
         if (part.type === "text") {
-            const content = part.content.trim();
+            const content = sanitizeInternalReminderBlocks(part.content).trim();
             if (!content)
                 continue;
             children.push(h("box", {
@@ -7067,7 +7352,7 @@ function renderAssistantMessageParts(children, parts, syntaxStyle, verboseTrace,
 }
 function lastPartHasText(parts) {
     const last = parts[parts.length - 1];
-    return last?.type === "text" && !!last.content.trim();
+    return last?.type === "text" && !!sanitizeInternalReminderBlocks(last.content).trim();
 }
 function parseModelSwitchMessage(content) {
     const match = content.trim().match(/^Model switched to (.+)\.$/);
@@ -7121,7 +7406,7 @@ function renderMarkdownContent(content, syntaxStyle, options) {
 function updateTranscriptHost(host, state, messages, options, syntaxStyle, subtleSyntaxStyle) {
     const showThinking = options?.showThinking ?? true;
     const verboseTrace = options?.verboseTrace ?? false;
-    const visibleMessages = messages.filter((message) => hasRenderableMessage(message, showThinking));
+    const visibleMessages = sanitizeDisplayMessages(messages).filter((message) => hasRenderableMessage(message, showThinking));
     const ctx = host.ctx;
     const nextEntries = [];
     if (!visibleMessages.length && !options?.plan) {
@@ -7200,6 +7485,7 @@ function transcriptMessageKey(message, index) {
     return `${index}:${message.role}`;
 }
 function transcriptMessageSignature(message, compactionExpanded = false) {
+    message = sanitizeDisplayMessage(message);
     if (message.role !== "assistant")
         return message.role;
     if (message.syntheticKind === "ui_compact_card") {
@@ -7217,12 +7503,13 @@ function transcriptMessageSignature(message, compactionExpanded = false) {
 }
 function updateMessageEntry(entry, message, showThinking = true, compactionExpanded = false, assistantOptions) {
     if (message.role === "user") {
+        const inputBadge = userInputStatusBadgeLabel(message.inputStatus);
         if (entry.refs.userText)
             entry.refs.userText.content = message.content || " ";
         if (entry.refs.userQueuedBox)
-            entry.refs.userQueuedBox.visible = message.queued === true;
+            entry.refs.userQueuedBox.visible = !!inputBadge;
         if (entry.refs.userQueuedText)
-            entry.refs.userQueuedText.content = message.queued ? " QUEUED " : "";
+            entry.refs.userQueuedText.content = inputBadge ? ` ${inputBadge} ` : "";
         return;
     }
     if (message.role === "error") {
@@ -7249,6 +7536,7 @@ function updateMessageEntry(entry, message, showThinking = true, compactionExpan
     }
 }
 function updateAssistantEntry(entry, message, showThinking, options) {
+    message = sanitizeDisplayMessage(message);
     const content = message.content.trim();
     const visibleReasoning = showThinking ? message.reasoning?.trim() ?? "" : "";
     const tools = message.toolCalls ?? [];
@@ -7345,7 +7633,7 @@ function updateAssistantPartEntries(entry, parts, options, streaming) {
         const key = `part:${index}:${part.type}`;
         const previous = previousEntries.get(key);
         if (part.type === "text") {
-            const content = part.content.trim();
+            const content = sanitizeInternalReminderBlocks(part.content).trim();
             let ref;
             if (previous?.kind === "text") {
                 ref = previous;
@@ -7467,6 +7755,25 @@ function createTraceGroupRenderable(ctx, group, syntaxStyle, width = 80) {
     const children = [
         createText(ctx, traceGroupHeaderStyledText(group, width), { wrapMode: "none" }),
     ];
+    const commandBlock = executeCommandBlockFor(group, width);
+    if (commandBlock) {
+        children.push(createBox(ctx, {
+            paddingLeft: 2,
+            flexDirection: "column",
+            flexShrink: 0,
+        }, [
+            ...commandBlock.lines.map((line, index) => createText(ctx, `${index === 0 ? "$ " : "  "}${line}`, {
+                fg: theme.toolText,
+                wrapMode: "word",
+            })),
+            commandBlock.omitted > 0
+                ? createText(ctx, `... +${commandBlock.omitted} lines, Ctrl+O to view`, {
+                    fg: theme.textMuted,
+                    wrapMode: "word",
+                })
+                : null,
+        ].filter((node) => !!node)));
+    }
     if (detailLines.length > 0) {
         children.push(createBox(ctx, {
             paddingLeft: 2,
@@ -7506,6 +7813,20 @@ function shouldRenderTraceGroupAsRawTool(tool) {
 function traceGroupDetailLines(group) {
     return group.previewLines.length > 0 ? group.previewLines : group.items;
 }
+const EXECUTE_COMMAND_BLOCK_MAX_LINES = 4;
+function executeInlineBudget(group, width) {
+    return Math.max(14, width - group.title.length - 20);
+}
+// Returns the wrapped command block for execute groups, or null when the
+// command is short enough to live inline in the header (nothing clipped).
+function executeCommandBlockFor(group, width) {
+    if (group.kind !== "execute")
+        return null;
+    if (shouldInlineExecuteCommand(group, executeInlineBudget(group, width)))
+        return null;
+    const block = executeCommandBlock(group, EXECUTE_COMMAND_BLOCK_MAX_LINES);
+    return block.lines.length > 0 ? block : null;
+}
 function traceGroupStatus(group) {
     if (group.hasError) {
         const count = group.errorCount || 1;
@@ -7532,8 +7853,15 @@ function traceGroupHeaderStyledText(group, width = 80) {
     const chunks = [
         fg(titleColor)(bold(group.title)),
     ];
-    if (group.command) {
-        chunks.push(fg(theme.toolText)(` ${truncate(group.command, commandWidth)}`));
+    if (group.kind === "execute" && group.description) {
+        chunks.push(fg(theme.toolText)(` ${truncate(group.description, commandWidth)}`));
+    }
+    else if (group.command) {
+        // Execute commands only render inline when they fit whole; longer ones
+        // move to the wrapped command block below instead of being clipped here.
+        if (group.kind !== "execute" || shouldInlineExecuteCommand(group, commandWidth)) {
+            chunks.push(fg(theme.toolText)(` ${truncate(group.command, commandWidth)}`));
+        }
     }
     else if (group.count !== undefined && group.noun) {
         chunks.push(fg(theme.textMuted)(` ${group.count} ${group.noun}`));
@@ -7544,6 +7872,8 @@ function traceGroupHeaderStyledText(group, width = 80) {
     return new StyledText(chunks);
 }
 function traceGroupCompactLabel(group) {
+    if (group.description)
+        return `${group.title} ${group.description}`;
     if (group.command)
         return `${group.title} ${group.command}`;
     if (group.count !== undefined && group.noun)
@@ -7573,6 +7903,8 @@ function traceGroupRenderableSignature(group) {
         group.count ?? "",
         group.noun ?? "",
         group.command ?? "",
+        group.description ?? "",
+        hashString(stableStringify(group.commandLines ?? [])),
         group.omitted,
         hashString(stableStringify(group.items)),
         hashString(stableStringify(group.previewLines)),
@@ -7896,14 +8228,15 @@ function createUserEntry(ctx, message, index, key, signature) {
         wrapMode: "word",
     });
     refs.userText = text;
-    const queuedText = createText(ctx, message.queued ? " QUEUED " : "", {
+    const inputBadge = userInputStatusBadgeLabel(message.inputStatus);
+    const queuedText = createText(ctx, inputBadge ? ` ${inputBadge} ` : "", {
         fg: theme.background,
         bg: theme.primary,
     });
     refs.userQueuedText = queuedText;
     const queuedBox = createBox(ctx, {
         paddingTop: 1,
-        visible: message.queued === true,
+        visible: !!inputBadge,
     }, [queuedText]);
     refs.userQueuedBox = queuedBox;
     const node = createBox(ctx, {
@@ -7944,6 +8277,7 @@ function createErrorEntry(ctx, message, key, signature) {
     return { key, signature, node, refs };
 }
 function createAssistantEntry(ctx, message, syntaxStyle, subtleSyntaxStyle, key, signature, showThinking = true, width = 80, verboseTrace = false, expandedWrites = new Set(), onToggleWrite) {
+    message = sanitizeDisplayMessage(message);
     const modelSwitch = parseModelSwitchMessage(message.content);
     if (modelSwitch && !message.reasoning?.trim() && !(message.toolCalls?.length)) {
         return createModelSwitchEntry(ctx, modelSwitch, key, signature);
@@ -8109,7 +8443,7 @@ function createCompactionCardEntry(ctx, message, key, signature, expanded, onTog
         statsParts.push(`${meta.turns} turn${meta.turns === 1 ? "" : "s"}`);
     if (meta?.messages)
         statsParts.push(`${meta.messages} message${meta.messages === 1 ? "" : "s"}`);
-    const statsLine = statsParts.length > 0 ? statsParts.join(" · ") : "Compacted";
+    const statsLine = statsParts.length > 0 ? `${statsParts.join(" · ")} collapsed` : "Collapsed";
     const children = [];
     const headerRow = createBox(ctx, {
         flexDirection: "row",
@@ -8118,8 +8452,8 @@ function createCompactionCardEntry(ctx, message, key, signature, expanded, onTog
         alignItems: "center",
     }, [
         createText(ctx, new StyledText([
-            fg(theme.info)(bold("◈ Context Compacted")),
-        ]), { width: 20 }),
+            fg(theme.info)(bold("◈ Earlier Conversation")),
+        ]), { width: 23 }),
         createText(ctx, new StyledText([
             fg(theme.textMuted)(`─ ${statsLine}`),
         ])),
@@ -8327,10 +8661,15 @@ function renderTraceGroup(group, syntaxStyle, width = 80) {
     const status = traceGroupStatus(group);
     const detailColor = traceGroupDetailColor(group);
     const detailWidth = Math.max(20, width - 10);
+    const commandBlock = executeCommandBlockFor(group, width);
     return h("box", { paddingLeft: 3, marginTop: 1, flexDirection: "column", flexShrink: 0 }, h("text", {
         content: traceGroupHeaderStyledText(group, width),
         wrapMode: "none",
-    }), detailLines.length > 0
+    }), commandBlock
+        ? h("box", { paddingLeft: 2, flexDirection: "column", flexShrink: 0 }, ...commandBlock.lines.map((line, index) => h("text", { fg: theme.toolText, wrapMode: "word" }, `${index === 0 ? "$ " : "  "}${line}`)), commandBlock.omitted > 0
+            ? h("text", { fg: theme.textMuted, wrapMode: "word" }, `... +${commandBlock.omitted} lines, Ctrl+O to view`)
+            : null)
+        : null, detailLines.length > 0
         ? h("box", { paddingLeft: 2, flexDirection: "column", flexShrink: 0 }, detailLines.map((line, index) => h("text", {
             fg: detailColor,
             wrapMode: "word",
@@ -8419,13 +8758,7 @@ function renderFooter(input) {
         idleContent: `${shortCwd(input.cwd)}  idle`,
         idleFg: theme.textMuted,
         runningFg: theme.primary,
-    }), h("text", {
-        fg: permissionModeColor(input.mode()),
-        ref: input.registerModeBadge,
-    }, footerPermissionModeText(input.mode())), h("text", {
-        fg: input.traceVerbose?.() ? theme.warning : theme.textMuted,
-        ref: input.registerTraceBadge,
-    }, footerTraceModeText(input.traceVerbose?.() === true)), h("box", { flexGrow: 1 }));
+    }), h("box", { flexGrow: 1 }));
 }
 function pickerTitle(kind, providerId) {
     switch (kind) {
@@ -8695,9 +9028,22 @@ function reconstructDisplayMessages(agentMessages) {
                     : "pending",
             });
         }
+        // The aborted-assistant interruption note is model-facing bookkeeping —
+        // strip it so it never renders as something the assistant "said".
+        const interrupted = message.error?.aborted === true;
+        let content = message.content;
+        if (interrupted) {
+            content = content === INTERRUPTED_ASSISTANT_CONTENT
+                ? ""
+                : content.endsWith(`\n\n${INTERRUPTED_ASSISTANT_CONTENT}`)
+                    ? content.slice(0, -`\n\n${INTERRUPTED_ASSISTANT_CONTENT}`.length)
+                    : content;
+            if (!content && !message.reasoning && toolCalls.length === 0)
+                continue;
+        }
         result.push({
             role: "assistant",
-            content: message.content,
+            content,
             reasoning: message.reasoning || undefined,
             toolCalls: toolCalls.length ? toolCalls : undefined,
         });
@@ -8716,7 +9062,7 @@ function renderTranscript(messages, options, syntaxStyle, subtleSyntaxStyle) {
     return items;
 }
 function renderSessionMessages(messages, syntaxStyle, subtleSyntaxStyle, showThinking = true, verboseTrace = false) {
-    const visibleMessages = messages.filter((message) => hasRenderableMessage(message, showThinking));
+    const visibleMessages = sanitizeDisplayMessages(messages).filter((message) => hasRenderableMessage(message, showThinking));
     if (!visibleMessages.length)
         return null;
     return visibleMessages.map((message, index) => renderMessage(message, index, syntaxStyle, subtleSyntaxStyle, showThinking, verboseTrace));
@@ -8724,7 +9070,7 @@ function renderSessionMessages(messages, syntaxStyle, subtleSyntaxStyle, showThi
 function formatTranscript(messages, options) {
     const showThinking = options?.showThinking ?? true;
     const verboseTrace = options?.verboseTrace ?? false;
-    const visibleMessages = messages.filter((message) => hasRenderableMessage(message, showThinking));
+    const visibleMessages = sanitizeDisplayMessages(messages).filter((message) => hasRenderableMessage(message, showThinking));
     const chunks = [];
     const append = (content, color = theme.text) => {
         if (content)
@@ -8873,6 +9219,15 @@ function appendTraceGroupTranscript(chunks, group) {
     appendLine("");
     if (group.pending)
         return;
+    // Verbose mode shows the full command with its original line structure
+    // whenever the header line alone doesn't already carry it verbatim.
+    const commandLines = group.commandLines ?? [];
+    if (group.kind === "execute" && (group.description || commandLines.length > 1)) {
+        for (const [index, line] of commandLines.entries()) {
+            append("     ", theme.borderSubtle);
+            appendLine(`${index === 0 ? "$ " : "  "}${line}`, theme.toolText);
+        }
+    }
     const detailLines = traceGroupDetailLines(group);
     const detailColor = traceGroupDetailColor(group);
     for (const [index, line] of detailLines.entries()) {
@@ -8901,6 +9256,7 @@ function renderHomeState(input) {
     }, h("box", { flexDirection: "column", flexShrink: 0, width: "100%" }, h("text", { fg: theme.text }, ""), h("text", { fg: theme.text }, ""), ...logoLines.map((line) => renderHomeLogoLine(line, width)), h("text", { fg: theme.text }, ""), h("text", { fg: theme.warning }, centerLine(`● Tip  ${input.tip}`, width)), cwd ? h("text", { fg: theme.textMuted }, centerLine(`  ${cwd}`, width)) : null));
 }
 function hasRenderableMessage(message, showThinking = true) {
+    message = sanitizeDisplayMessage(message);
     if (message.role === "error")
         return !!message.content.trim();
     if (message.role === "user")
@@ -9057,17 +9413,6 @@ function permissionModeBadgeLabel(mode) {
         case "bypassPermissions": return "Bypass";
     }
 }
-function footerPermissionModeText(mode) {
-    const info = PERMISSION_MODE_INFO[mode];
-    if (mode === "default")
-        return "  mode: build · shift+tab plan";
-    if (mode === "plan")
-        return "  mode: plan · shift+tab bypass";
-    return `  mode: ${info.shortTitle} · shift+tab build`;
-}
-function footerTraceModeText(verbose) {
-    return verbose ? "  trace: verbose · ctrl+o compact" : "  trace: compact · ctrl+o verbose";
-}
 function permissionModeColor(mode) {
     const info = PERMISSION_MODE_INFO[mode];
     switch (info.color) {