@bubblebrain-ai/bubble 0.0.20 → 0.0.21

package/dist/tui/run.js

@@ -6,7 +6,7 @@ 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";
@@ -41,15 +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();
@@ -477,6 +478,10 @@ 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.
@@ -550,6 +555,10 @@ function OpenTuiApp(props) {
     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;
@@ -638,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;
@@ -811,7 +818,6 @@ function OpenTuiApp(props) {
         feishuSetupAbortController?.abort();
         promptModeLabels.clear();
         promptModelLabels.clear();
-        footerModeBadge = undefined;
     });
     function showCopyToast(toast, ttl = 2200) {
         if (copyToastClearTimer)
@@ -1129,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;
@@ -1139,22 +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(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) => {
@@ -1182,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;
@@ -1502,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 {
@@ -1511,6 +1496,7 @@ function OpenTuiApp(props) {
         }, delay);
     }
     function handleTranscriptMouseScroll() {
+        transcriptForceScrollPending = false;
         setTimeout(updateTranscriptScrollFollowingFromPosition, 0);
     }
     function syncQuestionUI(focusCustom = false) {
@@ -2460,8 +2446,8 @@ 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 addUserInputStatusDisplay(input, inputStatus) {
         const displayId = `queued-${++nextQueuedDisplayId}`;
@@ -2469,7 +2455,9 @@ function OpenTuiApp(props) {
             ...queuedDisplayMessages,
             { 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 addQueuedUserDisplay(input) {
@@ -2955,6 +2943,7 @@ function OpenTuiApp(props) {
         if (options.forceFollow) {
             transcriptScrollFollowing = true;
             transcriptScrollInitialized = true;
+            transcriptForceScrollPending = true;
         }
         const nextMessages = compactDisplayMessages([
             ...baseMessages,
@@ -3048,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();
@@ -3079,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;
@@ -3317,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`;
@@ -3337,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}`;
     }
@@ -3356,7 +3362,15 @@ function OpenTuiApp(props) {
         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 : 16;
+        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 };
@@ -3424,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();
@@ -3556,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);
@@ -4680,9 +4708,54 @@ function OpenTuiApp(props) {
         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 (!text || !shouldCollapsePastedContent(text))
+        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);
@@ -4692,6 +4765,62 @@ function OpenTuiApp(props) {
         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) {
@@ -4712,6 +4841,8 @@ function OpenTuiApp(props) {
     }
     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);
@@ -4775,6 +4906,14 @@ 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,
@@ -4821,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);
                 }
@@ -5092,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(", ")}` : "";
@@ -5216,7 +5404,9 @@ function OpenTuiApp(props) {
         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", {
@@ -6916,12 +7106,8 @@ function OpenTuiApp(props) {
         ]),
         renderFooter({
             cwd: props.args.cwd,
-            mode,
             running: isRunning,
             registerScanner: registerPromptScanner,
-            registerModeBadge: registerFooterModeBadge,
-            traceVerbose: verboseTrace,
-            registerTraceBadge: registerFooterTraceBadge,
         }),
         renderProviderDialog(),
         renderStatsPanel(),
@@ -7569,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,
@@ -7608,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;
@@ -7634,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}`));
@@ -7646,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)
@@ -7675,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)),
@@ -8431,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",
@@ -8523,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) {
@@ -8799,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,
         });
@@ -8977,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()) {
@@ -9162,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) {