neoctl 0.2.10 → 0.2.12

package/dist/repl/index.js

@@ -22,6 +22,7 @@ import { searchTool } from "../tools/builtins/search-tool.js";
 import { planTool } from "../tools/builtins/plan-tool.js";
 import { createOpenAIImageGenerationTool } from "../tools/builtins/image-generation-tool.js";
 import { createLoadImageTool } from "../tools/builtins/image-loader-tool.js";
+import { createImageNoteTool } from "../tools/builtins/image-note-tool.js";
 import { createSecretTools } from "../tools/builtins/secret-tools.js";
 import { SecretStore } from "../secrets/secret-store.js";
 import { InMemorySecretRedactionRegistry } from "../secrets/secret-redaction.js";
@@ -30,12 +31,11 @@ import { AgentActivityStore } from "../agents/agent-activity.js";
 import { createTaskTools } from "../tasks/task-tools.js";
 import { TaskStore } from "../tasks/task-store.js";
 import { cliHelpText, isModelReasoningArgument, isValidReplCommandLine, parseCliReplCommandArgs, parseReplCommand, helpText, replCommandDefinitions } from "./commands.js";
-import { estimateMarkdownLineCount, markdownRenderKey, MarkdownText } from "./markdown-renderer.js";
+import { markdownRenderKey, MarkdownText } from "./markdown-renderer.js";
 import { DefaultContextManager } from "../context/context-manager.js";
 import { buildEffectiveSystemPrompt } from "../context/prompts.js";
 import { writeSessionMarkdownExport } from "../session/session-export.js";
 import { readClipboard } from "./clipboard.js";
-import { formatTipLine, initialTipIndex, tipAt } from "../tips.js";
 import { openDirectory } from "../open-directory.js";
 import { runWebServer } from "../web/index.js";
 import { getNeoctlHome } from "../paths.js";
@@ -258,6 +258,7 @@ async function createRuntime() {
     tools.register(grepTool);
     tools.register(searchTool);
     tools.register(createLoadImageTool());
+    tools.register(createImageNoteTool());
     if (modelConfig?.provider === "openai")
         tools.register(createOpenAIImageGenerationTool());
     tools.register(planTool);
@@ -523,15 +524,12 @@ function InkRepl({ runtime, initialCommandLine }) {
     const activeAbortController = useRef(undefined);
     const interruptArmed = useRef(false);
     const history = useRef([]);
-    const toolLineIds = useRef(new Map());
-    const pendingToolResultTimers = useRef(new Map());
     const [lines, setLines] = useState(() => initialLines(runtime, lineId));
     const [input, setInput] = useState("");
     const [queuedInput, setQueuedInput] = useState(undefined);
     const queuedAttachmentsRef = useRef(undefined);
     const [cursor, setCursor] = useState(0);
     const [promptPlaceholder, setPromptPlaceholder] = useState(undefined);
-    const [tipIndex, setTipIndex] = useState(() => initialTipIndex(runtime.engine.snapshot().session?.sessionId ?? process.cwd()));
     const [busy, setBusy] = useState(false);
     const [status, setStatus] = useState(() => initialStatus(runtime));
     const sessionTitleRef = useRef(sessionTerminalTitle(runtime.engine.snapshot().session));
@@ -720,11 +718,9 @@ function InkRepl({ runtime, initialCommandLine }) {
         }, PASTE_STATUS_DISPLAY_MS);
         pasteStatusTimerRef.current = timer;
     };
-    const advanceTip = () => setTipIndex((current) => current + 1);
     const insertAtCursor = (value) => {
         const currentText = inputRef.current;
         const currentCursor = cursorRef.current;
-        advanceTip();
         setPromptState(`${currentText.slice(0, currentCursor)}${value}${currentText.slice(currentCursor)}`, currentCursor + value.length);
     };
     const insertAttachmentLabel = (attachment) => {
@@ -852,8 +848,6 @@ function InkRepl({ runtime, initialCommandLine }) {
         assistantLineId.current = undefined;
         thinkingLineId.current = undefined;
         finalizedThinkingLineId.current = undefined;
-        toolLineIds.current.clear();
-        clearPendingToolResultTimers();
     };
     const resumeSnapshot = (snapshot, metrics) => {
         resetForegroundView(metrics);
@@ -888,47 +882,15 @@ function InkRepl({ runtime, initialCommandLine }) {
         finalizedThinkingLineId.current = id;
         thinkingLineId.current = undefined;
     };
-    const finalizeToolLine = (id) => {
-        if (id === undefined)
-            return;
-        setLines((current) => current.map((line) => line.id === id ? { ...line, live: false, pendingReplacement: false } : line));
-    };
-    const cancelPendingToolResultTimer = (toolUseId) => {
-        const timer = pendingToolResultTimers.current.get(toolUseId);
-        if (timer === undefined)
-            return;
-        clearTimeout(timer);
-        pendingToolResultTimers.current.delete(toolUseId);
-    };
-    const scheduleToolResultReplacement = (toolUseId, lineId, line) => {
-        cancelPendingToolResultTimer(toolUseId);
-        const timer = setTimeout(() => {
-            pendingToolResultTimers.current.delete(toolUseId);
-            replaceLine(lineId, { ...line, pendingReplacement: false });
-        }, TOOL_RESULT_REPLACEMENT_DELAY_MS);
-        pendingToolResultTimers.current.set(toolUseId, timer);
-    };
-    const clearPendingToolResultTimers = () => {
-        for (const timer of pendingToolResultTimers.current.values())
-            clearTimeout(timer);
-        pendingToolResultTimers.current.clear();
-    };
     useEffect(() => {
         return () => {
-            clearPendingToolResultTimers();
             if (pasteStatusTimerRef.current)
                 clearTimeout(pasteStatusTimerRef.current);
         };
     }, []);
-    const finalizeActiveToolLines = () => {
-        for (const id of toolLineIds.current.values())
-            finalizeToolLine(id);
-        toolLineIds.current.clear();
-    };
     const finalizeForegroundView = () => {
         finalizeLiveLine(assistantLineId.current);
         finalizeThinkingLine();
-        finalizeActiveToolLines();
         assistantLineId.current = undefined;
         finalizedThinkingLineId.current = undefined;
     };
@@ -938,22 +900,12 @@ function InkRepl({ runtime, initialCommandLine }) {
             runtime.usage.add(event.usage);
         if (event.type === "state")
             return;
-        if (event.type === "context.metrics" || event.type === "usage" || event.type === "tool_call.delta")
+        if (event.type === "context.metrics" ||
+            event.type === "usage" ||
+            event.type === "tool_call.delta" ||
+            event.type === "assistant.delta" ||
+            event.type === "thinking.delta")
             return;
-        if (event.type === "assistant.delta") {
-            finalizeThinkingLine();
-            const id = assistantLineId.current ?? append({ kind: "assistant", text: "", live: true });
-            assistantLineId.current = id;
-            updateLine(id, (text) => text + event.text);
-            return;
-        }
-        if (event.type === "thinking.delta") {
-            const id = thinkingLineId.current ?? finalizedThinkingLineId.current ?? append(thinkingLine("", true));
-            thinkingLineId.current = id;
-            finalizedThinkingLineId.current = undefined;
-            updateLine(id, (text) => text + event.text);
-            return;
-        }
         if (event.type === "message") {
             let replacedStreamingContent = false;
             if (event.message.role === "assistant" && assistantLineId.current !== undefined) {
@@ -979,7 +931,7 @@ function InkRepl({ runtime, initialCommandLine }) {
             if (replacedStreamingContent)
                 return;
             if (event.message.role === "tool_result") {
-                renderToolResultMessage(event.message, append, replaceLine, toolLineIds.current, scheduleToolResultReplacement);
+                renderToolResultMessage(event.message, append);
                 return;
             }
             if (event.message.role !== "assistant") {
@@ -998,23 +950,15 @@ function InkRepl({ runtime, initialCommandLine }) {
         if (event.type === "tool.started") {
             finalizeLiveLine(assistantLineId.current);
             finalizeThinkingLine();
-            const id = append({ ...formatToolUse(event.toolUse), live: true });
-            toolLineIds.current.set(event.toolUse.id, id);
             return;
         }
-        if (event.type === "tool.finished") {
-            const id = toolLineIds.current.get(event.toolUse.id);
-            if (id !== undefined) {
-                replaceLine(id, formatToolFinishedWithoutResult(event.toolUse, event.ok));
-            }
+        if (event.type === "tool.finished")
             return;
-        }
         if (event.type === "retrying")
             return;
         if (event.type === "terminal") {
             finalizeLiveLine(assistantLineId.current);
             finalizeThinkingLine();
-            finalizeActiveToolLines();
             assistantLineId.current = undefined;
             return;
         }
@@ -1190,8 +1134,6 @@ function InkRepl({ runtime, initialCommandLine }) {
             assistantLineId.current = undefined;
             thinkingLineId.current = undefined;
             finalizedThinkingLineId.current = undefined;
-            toolLineIds.current.clear();
-            clearPendingToolResultTimers();
             append(systemLine(snapshot ? `new session ${snapshot.sessionId}` : "new session"));
             return;
         }
@@ -1347,13 +1289,10 @@ function InkRepl({ runtime, initialCommandLine }) {
         }
     };
     useEffect(() => {
-        setTipIndex(initialTipIndex(runtime.engine.snapshot().session?.sessionId ?? process.cwd()));
         setLines(initialLines(runtime, lineId));
         assistantLineId.current = undefined;
         thinkingLineId.current = undefined;
         finalizedThinkingLineId.current = undefined;
-        toolLineIds.current.clear();
-        clearPendingToolResultTimers();
         setStatus(initialStatus(runtime));
         setSessionsBrowser(undefined);
         setSkillsBrowser(undefined);
@@ -1371,9 +1310,8 @@ function InkRepl({ runtime, initialCommandLine }) {
     const width = terminalSize.columns;
     const inputLockedByQueue = busy && queuedInput !== undefined;
     const prompt = promptPrefix(busy);
-    const currentTip = tipAt(tipIndex);
     const compactLiveLayout = terminalSize.rows <= COMPACT_LIVE_LAYOUT_ROWS && (agentActivities.length > 0 || backgroundTasks.length > 0 || busy);
-    const activePlaceholder = input.length === 0 && !compactLiveLayout ? promptPlaceholder ?? currentTip.placeholder : undefined;
+    const activePlaceholder = input.length === 0 && !compactLiveLayout ? promptPlaceholder : undefined;
     const promptDisplayText = input;
     const promptDisplayCursor = cursor;
     const promptLayoutText = activePlaceholder ? ` ${activePlaceholder}` : promptDisplayText;
@@ -1386,31 +1324,11 @@ function InkRepl({ runtime, initialCommandLine }) {
     if (selectedSlashCompletionIndex !== slashCompletionIndexRef.current) {
         slashCompletionIndexRef.current = selectedSlashCompletionIndex;
     }
-    const promptHeight = promptTextView(promptLayoutText, promptLayoutCursor, width, prompt).length + slashCompletionViewHeight(slashCompletions) + (queuedInput !== undefined ? QUEUED_INPUT_RENDER_ROWS : 0) + (pasteStatus ? 1 : 0);
     const firstDynamicLineIndex = lines.findIndex((line) => lineNeedsDynamicRender(line, messageContentWidth(width)));
     const staticLines = firstDynamicLineIndex === -1 ? lines : lines.slice(0, firstDynamicLineIndex);
     const dynamicLines = firstDynamicLineIndex === -1 ? [] : lines.slice(firstDynamicLineIndex);
-    const subagentRows = subagentLivePanelRenderRows(agentActivities, terminalSize.rows, compactLiveLayout);
+    const visibleDynamicLines = dynamicLines;
     const nonAgentBackgroundTasks = backgroundTasks.filter((task) => task.type !== "agent");
-    const statusRenderRows = STATUS_BAR_RENDER_ROWS + (showForegroundExecDetachHint && foregroundExecDetachHandle ? FOREGROUND_EXEC_DETACH_HINT_RENDER_ROWS : 0) + subagentRows + backgroundTaskStatusRenderRows(subagentRows > 0 ? nonAgentBackgroundTasks.length : backgroundTasks.length);
-    const managementBrowserHeight = sessionsBrowser
-        ? sessionsBrowserViewHeight(sessionsBrowser)
-        : skillsBrowser
-            ? skillsBrowserViewHeight(skillsBrowser)
-            : secretsBrowser
-                ? secretsBrowserViewHeight(secretsBrowser)
-                : 0;
-    const loginFormHeight = loginForm ? loginFormViewHeight(loginForm) : 0;
-    const maxDynamicBlocks = compactLiveLayout ? COMPACT_LIVE_DYNAMIC_BLOCKS : Number.POSITIVE_INFINITY;
-    const visibleDynamicLines = dynamicLines.length > maxDynamicBlocks ? dynamicLines.slice(-maxDynamicBlocks) : dynamicLines;
-    const visibleDynamicMarginOverhead = visibleDynamicLines.reduce((sum, _, i) => {
-        const blockIndex = staticLines.length + i;
-        return sum + (blockIndex > 0 ? MESSAGE_BLOCK_SPACING_LINES : 0);
-    }, 0);
-    const liveLineCount = Math.max(1, visibleDynamicLines.length);
-    const reservedRows = promptHeight + statusRenderRows + managementBrowserHeight + loginFormHeight + visibleDynamicMarginOverhead + FULLSCREEN_RENDER_GUARD_ROWS;
-    const dynamicRowsBudget = Math.max(MIN_LIVE_VIEWPORT_LINES, terminalSize.rows - reservedRows);
-    const liveViewportLines = Math.max(MIN_LIVE_VIEWPORT_LINES, Math.floor(dynamicRowsBudget / liveLineCount));
     useInput((value, key) => {
         if (isTerminalFocusInSequence(value)) {
             terminalFocusedRef.current = true;
@@ -1644,10 +1562,8 @@ function InkRepl({ runtime, initialCommandLine }) {
         if (key.backspace || key.delete) {
             const currentText = inputRef.current;
             const currentCursor = cursorRef.current;
-            if (currentText.length === 0) {
-                setTipIndex((current) => current + 1);
+            if (currentText.length === 0)
                 return;
-            }
             if (currentCursor > 0) {
                 setPromptState(`${currentText.slice(0, currentCursor - 1)}${currentText.slice(currentCursor)}`, currentCursor - 1);
             }
@@ -1659,10 +1575,8 @@ function InkRepl({ runtime, initialCommandLine }) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + completionCount - SLASH_COMPLETION_PAGE_SIZE) % completionCount);
                 return;
             }
-            if (inputRef.current.length === 0) {
-                setTipIndex((current) => current - 1);
+            if (inputRef.current.length === 0)
                 return;
-            }
             setPromptState(inputRef.current, cursorRef.current - 1);
             return;
         }
@@ -1672,32 +1586,24 @@ function InkRepl({ runtime, initialCommandLine }) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + SLASH_COMPLETION_PAGE_SIZE) % completionCount);
                 return;
             }
-            if (inputRef.current.length === 0) {
-                setTipIndex((current) => current + 1);
+            if (inputRef.current.length === 0)
                 return;
-            }
             setPromptState(inputRef.current, cursorRef.current + 1);
             return;
         }
         if (key.home) {
-            if (inputRef.current.length === 0)
-                setTipIndex(0);
-            else
+            if (inputRef.current.length > 0)
                 setPromptState(inputRef.current, 0);
             return;
         }
         if (key.end) {
-            if (inputRef.current.length === 0)
-                setTipIndex((current) => current + 1);
-            else
+            if (inputRef.current.length > 0)
                 setPromptState(inputRef.current, inputRef.current.length);
             return;
         }
         if (key.upArrow) {
-            if (inputRef.current.length === 0 && history.current.length === 0) {
-                setTipIndex((current) => current - 1);
+            if (inputRef.current.length === 0 && history.current.length === 0)
                 return;
-            }
             const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current, skillCompletions, secretCompletions);
             if (completionCount > 0) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + completionCount - 1) % completionCount);
@@ -1711,10 +1617,8 @@ function InkRepl({ runtime, initialCommandLine }) {
             return;
         }
         if (key.downArrow) {
-            if (inputRef.current.length === 0 && historyIndexRef.current === undefined) {
-                setTipIndex((current) => current + 1);
+            if (inputRef.current.length === 0 && historyIndexRef.current === undefined)
                 return;
-            }
             const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current, skillCompletions, secretCompletions);
             if (completionCount > 0) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + 1) % completionCount);
@@ -1736,10 +1640,8 @@ function InkRepl({ runtime, initialCommandLine }) {
         }
         if (key.tab) {
             const currentText = inputRef.current;
-            if (currentText.length === 0) {
-                setTipIndex((current) => current + 1);
+            if (currentText.length === 0)
                 return;
-            }
             const currentCursor = cursorRef.current;
             const completions = slashCommandCompletions(currentText, currentCursor, skillCompletions, secretCompletions);
             const completion = completions[Math.min(slashCompletionIndexRef.current, completions.length - 1)];
@@ -1754,9 +1656,9 @@ function InkRepl({ runtime, initialCommandLine }) {
             return;
         }
     });
-    return e(Box, { flexDirection: "column" }, e((Static), { items: staticLines, children: (line, index) => e(MessageBlock, { key: line.id, line, width, blockIndex: index }) }), e(MessageList, { lines: visibleDynamicLines, width, liveMaxLines: liveViewportLines, lineIndexOffset: staticLines.length, onMarkdownRenderComplete: markLineRendered }), sessionsBrowser ? e(SessionsBrowser, { state: sessionsBrowser, width }) : null, skillsBrowser ? e(SkillsBrowser, { state: skillsBrowser, width }) : null, secretsBrowser ? e(SecretsBrowser, { state: secretsBrowser, width }) : null, loginForm ? e(LoginFormView, { state: loginForm, width }) : null, e(StatusBar, { status, animationTick, width }), showForegroundExecDetachHint && foregroundExecDetachHandle ? e(ForegroundExecDetachHintLine, { handle: foregroundExecDetachHandle, width }) : null, agentActivities.length > 0 ? e(SubagentLivePanel, { activities: agentActivities, width, terminalRows: terminalSize.rows, compact: compactLiveLayout, animationTick }) : null, agentActivities.length === 0 && backgroundTasks.length > 0 ? e(BackgroundTaskStatusLine, { tasks: backgroundTasks, width }) : null, agentActivities.length > 0 && nonAgentBackgroundTasks.length > 0 ? e(BackgroundTaskStatusLine, { tasks: nonAgentBackgroundTasks, width }) : null, pasteStatus ? e(PasteStatusLine, { text: pasteStatus, width }) : null, queuedInput !== undefined ? e(QueuedInputLine, { text: queuedInput, width }) : null, e(PromptLine, { text: promptDisplayText, cursor: promptDisplayCursor, busy, locked: inputLockedByQueue, placeholder: input.length === 0 && promptPlaceholder !== undefined, ghostText: activePlaceholder, width, prompt, slashCompletions, selectedSlashCompletionIndex, attachments }));
+    return e(Box, { flexDirection: "column" }, e((Static), { items: staticLines, children: (line, index) => e(MessageBlock, { key: line.id, line, width, blockIndex: index }) }), e(MessageList, { lines: visibleDynamicLines, width, lineIndexOffset: staticLines.length, onMarkdownRenderComplete: markLineRendered }), sessionsBrowser ? e(SessionsBrowser, { state: sessionsBrowser, width }) : null, skillsBrowser ? e(SkillsBrowser, { state: skillsBrowser, width }) : null, secretsBrowser ? e(SecretsBrowser, { state: secretsBrowser, width }) : null, loginForm ? e(LoginFormView, { state: loginForm, width }) : null, e(StatusBar, { status, animationTick, width }), showForegroundExecDetachHint && foregroundExecDetachHandle ? e(ForegroundExecDetachHintLine, { handle: foregroundExecDetachHandle, width }) : null, agentActivities.length > 0 ? e(SubagentLivePanel, { activities: agentActivities, width, terminalRows: terminalSize.rows, compact: compactLiveLayout, animationTick }) : null, agentActivities.length === 0 && backgroundTasks.length > 0 ? e(BackgroundTaskStatusLine, { tasks: backgroundTasks, width }) : null, agentActivities.length > 0 && nonAgentBackgroundTasks.length > 0 ? e(BackgroundTaskStatusLine, { tasks: nonAgentBackgroundTasks, width }) : null, pasteStatus ? e(PasteStatusLine, { text: pasteStatus, width }) : null, queuedInput !== undefined ? e(QueuedInputLine, { text: queuedInput, width }) : null, e(PromptLine, { text: promptDisplayText, cursor: promptDisplayCursor, busy, locked: inputLockedByQueue, placeholder: input.length === 0 && promptPlaceholder !== undefined, ghostText: activePlaceholder, width, prompt, slashCompletions, selectedSlashCompletionIndex, attachments }));
 }
-const MessageList = React.memo(function MessageList({ lines, width, liveMaxLines, lineIndexOffset = 0, onMarkdownRenderComplete }) {
+const MessageList = React.memo(function MessageList({ lines, width, lineIndexOffset = 0, onMarkdownRenderComplete }) {
     const contentWidth = messageContentWidth(width);
     const toolWidth = toolContentWidth(width);
     return e(Box, { flexDirection: "column" }, ...lines.map((line, index) => e(MessageBlock, {
@@ -1766,51 +1668,30 @@ const MessageList = React.memo(function MessageList({ lines, width, liveMaxLines
         blockIndex: lineIndexOffset + index,
         contentWidth,
         toolWidth,
-        liveMaxLines,
         onMarkdownRenderComplete,
     })));
 });
-function MessageBlock({ line, width, blockIndex, contentWidth, toolWidth, liveMaxLines, onMarkdownRenderComplete }) {
-    return e(Box, { flexDirection: "column", marginTop: blockIndex > 0 ? MESSAGE_BLOCK_SPACING_LINES : 0 }, e(MessageLine, { line, width, contentWidth, toolWidth, liveMaxLines, onMarkdownRenderComplete }));
+function MessageBlock({ line, width, blockIndex, contentWidth, toolWidth, onMarkdownRenderComplete }) {
+    return e(Box, { flexDirection: "column", marginTop: blockIndex > 0 ? MESSAGE_BLOCK_SPACING_LINES : 0 }, e(MessageLine, { line, width, contentWidth, toolWidth, onMarkdownRenderComplete }));
 }
-function MessageLine({ line, width, contentWidth = messageContentWidth(width), toolWidth = toolContentWidth(width), liveMaxLines, onMarkdownRenderComplete }) {
+function MessageLine({ line, width, contentWidth = messageContentWidth(width), toolWidth = toolContentWidth(width), onMarkdownRenderComplete }) {
     if (line.previewStyle === "summary") {
         const useRoleMarker = summaryUsesRoleMarker(line);
         const summaryWidth = useRoleMarker ? contentWidth : toolWidth;
-        const display = displayWindowForLine(line, summaryWidth, line.live ? liveMaxLines : undefined);
-        return e(Box, { flexDirection: "row" }, useRoleMarker ? e(Text, { color: markerColorForKind(line.kind) }, messageRoleMarker(line.kind)) : null, e(Box, { flexDirection: "column", width: summaryWidth }, ...renderDisplayText(line, summaryWidth, display.maxLines, display.skipTop)));
+        return e(Box, { flexDirection: "row" }, useRoleMarker ? e(Text, { color: markerColorForKind(line.kind) }, messageRoleMarker(line.kind)) : null, e(Box, { flexDirection: "column", width: summaryWidth }, ...renderDisplayText(line, summaryWidth)));
     }
     const useRoleMarker = !titleProvidesToolMarker(line);
     const lineWidth = useRoleMarker ? contentWidth : toolWidth;
-    const clipPendingMarkdown = !line.live && onMarkdownRenderComplete !== undefined && lineNeedsDynamicRender(line, lineWidth);
-    const display = displayWindowForLine(line, lineWidth, line.live || clipPendingMarkdown ? liveMaxLines : undefined);
     const contentNodes = [];
     if (line.title)
         contentNodes.push(renderBlockTitle(line));
     if (line.bodyTitle)
         contentNodes.push(e(Text, { key: `body-title-${line.id}`, bold: true }, line.bodyTitle));
-    contentNodes.push(...renderDisplayText(line, lineWidth, display.maxLines, display.skipTop, onMarkdownRenderComplete));
+    contentNodes.push(...renderDisplayText(line, lineWidth, undefined, 0, onMarkdownRenderComplete));
     return e(Box, { flexDirection: "row" }, useRoleMarker ? e(Text, { color: markerColorForKind(line.kind) }, messageRoleMarker(line.kind)) : null, e(Box, { flexDirection: "column", width: lineWidth }, ...contentNodes));
 }
-function displayWindowForLine(line, width, maxLines) {
-    if (maxLines === undefined)
-        return { skipTop: 0 };
-    const safeMaxLines = Math.max(1, maxLines);
-    const lineCount = estimateRenderedLineCount(line, width);
-    return {
-        maxLines: safeMaxLines,
-        skipTop: Math.max(0, lineCount - safeMaxLines),
-    };
-}
-function estimateRenderedLineCount(line, width) {
-    if (line.previewStyle === "summary")
-        return renderSummaryLines(line, width).length;
-    if (line.format === "ansi")
-        return wrapAnsi(line.text, Math.max(10, width), { hard: true, trim: false }).split("\n").length;
-    return estimateMarkdownLineCount(line.text, width);
-}
 function lineNeedsDynamicRender(line, width) {
-    if (line.live || line.pendingReplacement)
+    if (line.live)
         return true;
     if (line.previewStyle === "summary" || line.format === "ansi")
         return false;
@@ -1861,10 +1742,10 @@ function summaryUsesRoleMarker(line) {
     return line.previewStyle === "summary" && (line.kind === "system" || line.kind === "meta");
 }
 function titleProvidesToolMarker(line) {
-    return line.kind === "tool" && !!line.title && (line.title.startsWith("◇ ") || line.title.startsWith("◆ "));
+    return line.kind === "tool" && !!line.title;
 }
 function titleStatusMarker(status) {
-    return status === "success" ? "✓" : "✗";
+    return status === "success" ? "\u2713" : "\u2717";
 }
 function titleStatusColor(status) {
     return status === "success" ? "green" : "red";
@@ -1894,7 +1775,7 @@ function renderSummaryBlock(line, width, maxLines, skipTop = 0) {
         }
         if (line.format === "ansi") {
             const baseStyle = detail
-                ? { color: "gray", dimColor: true }
+                ? {}
                 : { color: colorForKind(line.kind), bold: true };
             return e(Text, { key: `summary-${line.id}-${index}` }, ...renderAnsiInline(text, baseStyle));
         }
@@ -2127,7 +2008,7 @@ function SubagentLivePanel({ activities, width: terminalWidth, terminalRows, com
     if (!selected)
         return null;
     const activeCount = activities.filter((activity) => activity.status === "running" || activity.status === "pending").length;
-    const header = `◇ subagents: ${activeCount} active${activities.length > activeCount ? ` · ${activities.length - activeCount} recent` : ""}`;
+    const header = `◆ subagents: ${activeCount} active${activities.length > activeCount ? ` · ${activities.length - activeCount} recent` : ""}`;
     if (rows <= 1) {
         return e(Text, { color: "yellow" }, fitToWidth(`${header} · ${compactAgentSummary(selected, width - header.length - 3)}`, width));
     }
@@ -2242,7 +2123,7 @@ function spinnerFrame(tick) {
 }
 function BackgroundTaskStatusLine({ tasks, width: terminalWidth }) {
     const width = statusBarWidth(terminalWidth);
-    const summary = `◇ background tools: ${tasks.length} task${tasks.length === 1 ? "" : "s"}`;
+    const summary = `◆ background tools: ${tasks.length} task${tasks.length === 1 ? "" : "s"}`;
     const detailTasks = tasks.slice(0, 2);
     return e(Box, { flexDirection: "column", width, overflow: "hidden" }, e(Text, { color: "yellow" }, fitToWidth(summary, width)), ...detailTasks.map((task, index) => e(Text, { key: `bg-task-${task.taskId}-${index}`, color: "yellow" }, fitToWidth(`  ${task.type}:${truncateMiddle(task.description || task.agentId || task.taskId, Math.max(12, width - 30))} · ${task.status} · ${formatElapsed(Date.now() - new Date(task.createdAt).getTime())}`, width))));
 }
@@ -3034,27 +2915,12 @@ function renderMessage(message, append, activeAssistantId, options = {}) {
     }
     return rendered;
 }
-function renderToolResultMessage(message, append, replaceLine, activeToolLineIds, scheduleReplacement) {
+function renderToolResultMessage(message, append) {
     let rendered = false;
     for (const block of message.blocks) {
         if (block.type !== "tool_result")
             continue;
-        const line = formatToolResultLine(block.name, block.output, block.ok);
-        const id = activeToolLineIds.get(block.toolUseId);
-        if (id === undefined) {
-            append(line);
-        }
-        else {
-            replaceLine(id, {
-                kind: line.kind,
-                title: toolTitle(block.name, "finished"),
-                titleStatus: block.ok ? "success" : "failure",
-                live: true,
-                pendingReplacement: true,
-            });
-            activeToolLineIds.delete(block.toolUseId);
-            scheduleReplacement(block.toolUseId, id, line);
-        }
+        append(formatToolResultLine(block.name, block.output, block.ok));
         rendered = true;
     }
     return rendered;
@@ -3243,13 +3109,7 @@ async function handleDeleteSessionCommand(sessionId, current, runtime, setBrowse
     }
 }
 function initialLines(runtime, lineId) {
-    const session = runtime.engine.snapshot().session;
-    const suffix = session
-        ? ` Session: ${session.sessionId}${session.resumedMessages > 0 ? ` (${session.resumedMessages} resumed messages)` : ""}.`
-        : "";
-    const lines = [
-        { id: 0, kind: "system", title: "System", text: `Interactive UI enabled. Type /help for commands.${suffix}\n${formatTipLine(tipAt(initialTipIndex(session?.sessionId ?? process.cwd())))}`, previewStyle: "summary" },
-    ];
+    const lines = [];
     lineId.current = 0;
     if (runtime.envNotice)
         lines.push({ id: ++lineId.current, kind: "system", title: "Config", text: runtime.envNotice, format: "plain", previewStyle: "summary" });
@@ -3891,7 +3751,7 @@ function formatToolUse(toolUse) {
     if (toolUse.name === "plan" && isPlanToolPayload(toolUse.input)) {
         return {
             kind: "tool",
-            title: toolTitle(toolUse.name, "running"),
+            title: toolTitle(toolUse.name),
             bodyTitle: planToolBodyTitle(toolUse.input),
             text: formatPlanToolPayload(toolUse.input),
         };
@@ -3899,7 +3759,7 @@ function formatToolUse(toolUse) {
     const description = toolUse.name === "exec" ? execDescriptionFromInput(toolUse.input) : undefined;
     return {
         kind: "tool",
-        title: toolTitle(toolUse.name, "running"),
+        title: toolTitle(toolUse.name),
         bodyTitle: description,
         text: formatJson(toolUse.input, 1200),
         previewStyle: "summary",
@@ -3909,7 +3769,7 @@ function formatToolResultLine(toolName, output, ok) {
     const formatted = formatToolResult(toolName, output, ok);
     const line = {
         kind: ok ? "tool" : "error",
-        title: toolTitle(toolName, "finished"),
+        title: toolTitle(toolName),
         bodyTitle: formatted.bodyTitle,
         titleStatus: ok ? "success" : "failure",
         text: formatted.text,
@@ -3925,24 +3785,39 @@ function formatToolResultLine(toolName, output, ok) {
     }
     return line;
 }
-function formatToolFinishedWithoutResult(toolUse, ok) {
-    const inputText = formatJson(toolUse.input, 1200);
-    const description = toolUse.name === "exec" ? execDescriptionFromInput(toolUse.input) : undefined;
-    return {
-        kind: ok ? "tool" : "error",
-        title: toolTitle(toolUse.name, "finished"),
-        bodyTitle: description,
-        titleStatus: ok ? "success" : "failure",
-        text: inputText ? `${ok ? "finished" : "failed"}\n${inputText}` : ok ? "finished" : "failed",
-        previewStyle: "summary",
-        live: true,
-        pendingReplacement: true,
-    };
-}
-function toolTitle(toolName, phase) {
+function toolTitle(toolName) {
     if (toolName === "plan")
-        return `${phase === "running" ? "◇" : "◆"} plan`;
-    return `${phase === "running" ? "◇" : "◆"} ${toolName}`;
+        return "\u25c6 plan";
+    const labels = {
+        exec: "command",
+        read: "file read",
+        list: "directory listing",
+        grep: "search",
+        edit: "file edit",
+        write: "file write",
+        search: "web search",
+        plan: "plan",
+        agent: "subagent",
+        load_image: "image load",
+        image_note: "image note",
+        image2: "image generation",
+        secret_list: "secret list",
+        secret_info: "secret info",
+        secret_request: "secret request",
+        skill: "skill",
+        skill_list: "skill list",
+        skill_read: "skill read",
+        skill_validate: "skill validation",
+        skill_create: "skill create",
+        skill_update: "skill update",
+        TaskList: "task list",
+        TaskGet: "task detail",
+        TaskOutput: "task output",
+        TaskStop: "task stop",
+        TaskResume: "task resume",
+        SendMessage: "task message",
+    };
+    return `\u25c6 ${labels[toolName] ?? `tool: ${toolName}`}`;
 }
 function execDescriptionFromInput(input) {
     if (!isRecord(input))
@@ -3991,10 +3866,10 @@ function formatPlanItem(item, depth = 0) {
 }
 function planItemMarker(status) {
     if (status === "completed")
-        return "✓";
+        return "\u2713";
     if (status === "in_progress")
-        return "▶";
-    return "○";
+        return "\u25b6";
+    return "\u25cb";
 }
 function escapePlanMarkdown(text) {
     return text.replace(/([\\`*_{}[\]()#+.!|>~-])/g, "\\$1");
@@ -4078,24 +3953,109 @@ function formatToolResult(toolName, output, ok) {
         return { text: output, format: "ansi" };
     }
     if (toolName === "list" && isRecord(output)) {
-        return { text: formatListToolResult(output, ok) };
+        return { text: formatListToolResult(output, ok), format: "ansi" };
     }
     if (toolName === "read" && isRecord(output)) {
-        return { text: formatReadToolResult(output, ok) };
+        return { text: formatReadToolResult(output, ok), format: "ansi" };
     }
     if (toolName === "grep" && isRecord(output)) {
-        return { text: formatGrepToolResult(output, ok) };
+        return { text: formatGrepToolResult(output, ok), format: "ansi" };
     }
     if (toolName === "search" && isRecord(output)) {
         return { text: formatWebSearchToolResult(output, ok), summaryMaxLines: EXPANDED_SUMMARY_MAX_LINES };
     }
     if (toolName === "image2" && isRecord(output)) {
-        return { text: formatImageGenerationToolResult(output, ok), summaryMaxLines: 4 };
+        return { text: formatImageGenerationToolResult(output, ok), format: "ansi", summaryMaxLines: 8 };
+    }
+    if (toolName === "image_note" && isRecord(output)) {
+        return { text: formatImageNoteToolResult(output, ok), format: "ansi", summaryMaxLines: 16 };
     }
     if (toolName === "plan" && isPlanToolPayload(output)) {
         return { text: formatPlanToolPayload(output), bodyTitle: planToolBodyTitle(output), full: true };
     }
-    return { text: `${ok ? "ok" : "failed"}\n${formatJson(output, 6000)}`, summaryMaxLines: EXPANDED_SUMMARY_MAX_LINES };
+    return { text: formatGenericToolResult(output, ok), format: "ansi", summaryMaxLines: FALLBACK_PREVIEW_LINES };
+}
+function formatGenericToolResult(output, ok) {
+    if (typeof output === "string")
+        return previewGenericString(output);
+    if (!isRecord(output))
+        return `${ok ? "completed" : "failed"}\n${formatReplData(output, 1200)}`;
+    const error = typeof output.error === "string" ? output.error : undefined;
+    if (error)
+        return ["failed", error].join("\n");
+    const status = typeof output.status === "string" ? output.status : undefined;
+    const lines = [status ? `${ok ? "completed" : "failed"}: ${status}` : ok ? "completed" : "failed"];
+    const entries = Object.entries(output)
+        .filter(([key, value]) => value !== undefined && !LOW_VALUE_FALLBACK_FIELDS.has(key))
+        .slice(0, 24);
+    for (const [key, value] of entries) {
+        if (key === "status")
+            continue;
+        const label = formatFallbackLabel(key);
+        if (isReplScalar(value))
+            lines.push(`${dimAnsi(label)} ${formatReplValue(value)}`);
+        else
+            lines.push(`${dimAnsi(label)} ${truncate(formatReplValue(value), 500)}`);
+    }
+    if (entries.length === 0 && !status)
+        lines.push(dimAnsi("no additional details"));
+    return lines.slice(0, FALLBACK_PREVIEW_LINES).join("\n");
+}
+function formatFallbackLabel(key) {
+    const labels = {
+        task_id: "task",
+        taskId: "task",
+        agent_id: "agent",
+        agentId: "agent",
+        output_file: "output file",
+        outputFile: "output file",
+        can_read_output_file: "output readable",
+        returnedEntries: "entries shown",
+        totalFiles: "files",
+        totalDirectories: "directories",
+        updated_at: "updated",
+        created_at: "created",
+    };
+    return labels[key] ?? key.replace(/_/gu, " ");
+}
+function formatEditOperation(operation) {
+    const normalized = operation.trim().toLowerCase();
+    if (normalized === "created" || normalized === "create")
+        return "file created";
+    if (normalized === "written" || normalized === "write")
+        return "file written";
+    if (normalized === "deleted" || normalized === "delete")
+        return "file deleted";
+    return "file updated";
+}
+function previewTextLines(text, maxLines, label) {
+    const lines = text.replace(/\r\n/g, "\n").split("\n");
+    const preview = lines.slice(0, maxLines);
+    if (lines.length <= maxLines)
+        return preview;
+    return [...preview, dimAnsi(`showing first ${maxLines} of ${lines.length} ${label} lines`)];
+}
+function previewGenericString(text) {
+    return previewTextLines(text, FALLBACK_PREVIEW_LINES, "output").join("\n");
+}
+function formatCommandPreview(command) {
+    const normalized = command.replace(/\r\n/g, "\n").trimEnd();
+    const lines = normalized.split("\n");
+    if (lines.length === 1 && stripAnsi(normalized).length <= EXEC_COMMAND_PREVIEW_CHARS)
+        return [normalized];
+    const firstLine = lines[0]?.trim() ?? "";
+    const summary = lines.length > 1
+        ? `command omitted: ${lines.length} lines, ${normalized.length} chars`
+        : `command omitted: ${normalized.length} chars`;
+    const preview = firstLine ? truncate(firstLine, EXEC_COMMAND_PREVIEW_CHARS) : "(empty command)";
+    return [dimAnsi(summary), preview];
+}
+function formatDuration(durationMs) {
+    if (!Number.isFinite(durationMs))
+        return "?ms";
+    if (durationMs < 1000)
+        return `${Math.max(0, Math.round(durationMs))}ms`;
+    return `${Number((durationMs / 1000).toFixed(durationMs < 10_000 ? 1 : 0))}s`;
 }
 function isEditToolOutput(value) {
     return (typeof value.path === "string" &&
@@ -4115,8 +4075,12 @@ function isEditPatchHunk(value) {
         value.lines.every((line) => typeof line === "string"));
 }
 function formatEditToolDiff(output, ok) {
+    const replacementText = output.replacements === 1 ? "1 replacement" : `${output.replacements} replacements`;
+    const operation = ok ? formatEditOperation(output.operation) : "file edit failed";
     const lines = [
-        dimAnsi(`${ok ? output.operation : "failed"} ${output.path}, ${output.replacements} replacement(s)`),
+        operation,
+        output.path,
+        dimAnsi(replacementText),
         `\x1b[2;31m--- ${output.path}\x1b[0m`,
         `\x1b[2;32m+++ ${output.path}\x1b[0m`,
     ];
@@ -4190,20 +4154,19 @@ function formatExecToolResult(output, ok) {
             : `exit ${output.exitCode ?? output.signal ?? "unknown"}`;
     const description = typeof output.description === "string" ? output.description.trim() : "";
     const lines = [
-        "exec result",
-        ...(description ? [`purpose: ${description}`] : []),
-        `status: ${status}`,
-        `duration: ${output.durationMs}ms`,
-        `command: ${output.command}`,
+        `${ok && output.exitCode === 0 && !output.timedOut ? "command completed" : "command failed"}: ${status} in ${formatDuration(output.durationMs)}`,
+        ...formatCommandPreview(output.command),
     ];
+    if (description)
+        lines.push("", dimAnsi("purpose"), description);
     const stdout = output.stdout.replace(/\s+$/u, "");
     const stderr = output.stderr.replace(/\s+$/u, "");
     if (stdout)
-        lines.push("stdout:", stdout);
+        lines.push("", dimAnsi("stdout"), ...previewTextLines(stdout, EXEC_STDOUT_PREVIEW_LINES, "stdout"));
     if (stderr)
-        lines.push("stderr:", stderr);
+        lines.push("", dimAnsi("stderr"), ...previewTextLines(stderr, EXEC_STDERR_PREVIEW_LINES, "stderr"));
     if (!stdout && !stderr)
-        lines.push(ok ? "output: (none)" : "output: (not captured)");
+        lines.push("", dimAnsi("no output captured"));
     return lines.join("\n");
 }
 function isRecord(value) {
@@ -4229,42 +4192,87 @@ function formatImageGenerationToolResult(output, ok) {
         lines.push(`source images: ${sourceImages}`);
     const duration = imageGenerationDuration(output);
     if (duration !== undefined)
-        lines.push(`duration: ${duration}ms`);
+        lines.push(dimAnsi(`duration: ${duration}ms`));
+    const prompt = typeof output.prompt === "string" ? output.prompt.trim() : "";
+    if (prompt)
+        lines.push("", dimAnsi("prompt"), ...previewTextLines(prompt, IMAGE_PROMPT_PREVIEW_LINES, "prompt"));
     return lines.join("\n");
 }
+function formatImageNoteToolResult(output, ok) {
+    const failed = Array.isArray(output.failed) ? output.failed.filter(isImageNoteFailureLike) : [];
+    const recorded = Array.isArray(output.recorded) ? output.recorded.filter(isImageNoteRecordLike) : [];
+    const lines = [`${recorded.length} note${recorded.length === 1 ? "" : "s"} recorded`];
+    for (const item of recorded.slice(0, IMAGE_NOTE_PREVIEW_COUNT)) {
+        lines.push("", item.imageRef);
+        const note = item.note;
+        if (typeof note.caption === "string" && note.caption.trim())
+            lines.push(`${dimAnsi("caption")} ${note.caption.trim()}`);
+        if (typeof note.purpose === "string" && note.purpose.trim())
+            lines.push(`${dimAnsi("purpose")} ${note.purpose.trim()}`);
+        if (Array.isArray(note.detectedText) && note.detectedText.length > 0)
+            lines.push(`${dimAnsi("text")} ${note.detectedText.filter((value) => typeof value === "string" && value.trim().length > 0).join("; ")}`);
+        if (Array.isArray(note.tags) && note.tags.length > 0)
+            lines.push(`${dimAnsi("tags")} ${note.tags.filter((value) => typeof value === "string" && value.trim().length > 0).join(", ")}`);
+        if (typeof note.retention === "string")
+            lines.push(`${dimAnsi("retention")} ${note.retention}${typeof note.ttlTurns === "number" ? `, ${note.ttlTurns} turns` : ""}`);
+    }
+    if (recorded.length > IMAGE_NOTE_PREVIEW_COUNT)
+        lines.push(dimAnsi(`showing first ${IMAGE_NOTE_PREVIEW_COUNT} of ${recorded.length} notes`));
+    if (!ok || failed.length > 0) {
+        lines.push("", dimAnsi("failed"));
+        for (const failure of failed.slice(0, 5))
+            lines.push(`${failure.imageRef}: ${failure.error}`);
+        if (failed.length > 5)
+            lines.push(dimAnsi(`${failed.length - 5} more failures`));
+    }
+    return lines.join("\n");
+}
+function isImageNoteRecordLike(value) {
+    return isRecord(value) && typeof value.imageRef === "string" && isRecord(value.note);
+}
+function isImageNoteFailureLike(value) {
+    return isRecord(value) && typeof value.imageRef === "string" && typeof value.error === "string";
+}
 function imageGenerationDuration(output) {
     const value = output.duration ?? output.elapsed ?? output.durationMs ?? output.elapsedMs;
     return typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.round(value)) : undefined;
 }
 function formatListToolResult(output, ok) {
+    const error = typeof output.error === "string" ? output.error : undefined;
+    if (!ok || error)
+        return ["directory listing failed", error ?? formatReplData(output, 1200)].join("\n");
     const pathValue = typeof output.path === "string" ? output.path : "";
-    const typeValue = typeof output.type === "string" ? output.type : "result";
     const returnedEntries = typeof output.returnedEntries === "number" ? output.returnedEntries : undefined;
     const totalFiles = typeof output.totalFiles === "number" ? output.totalFiles : undefined;
     const totalDirectories = typeof output.totalDirectories === "number" ? output.totalDirectories : undefined;
     const entries = Array.isArray(output.entries) ? output.entries : [];
     const names = entries
-        .map((entry) => (isRecord(entry) && typeof entry.name === "string" ? entry.name : undefined))
-        .filter((name) => Boolean(name))
-        .slice(0, 3);
-    const lines = [ok ? typeValue : "failed"];
-    if (pathValue)
-        lines.push(pathValue);
+        .map((entry) => {
+        if (!isRecord(entry) || typeof entry.name !== "string")
+            return undefined;
+        return entry.type === "directory" ? `${entry.name}/` : entry.name;
+    })
+        .filter((name) => Boolean(name));
+    const lines = pathValue ? [pathValue] : [];
     const counts = [
-        returnedEntries !== undefined ? `${returnedEntries} shown` : undefined,
+        returnedEntries !== undefined ? `${returnedEntries} entries shown` : undefined,
         totalFiles !== undefined ? `${totalFiles} files` : undefined,
-        totalDirectories !== undefined ? `${totalDirectories} dirs` : undefined,
+        totalDirectories !== undefined ? `${totalDirectories} directories` : undefined,
     ].filter((value) => Boolean(value));
     if (counts.length > 0)
-        lines.push(counts.join(" · "));
-    for (const name of names)
-        lines.push(name);
+        lines.push(dimAnsi(counts.join(", ")));
+    if (names.length > 0) {
+        lines.push("");
+        lines.push(...names.slice(0, LIST_ENTRY_PREVIEW_COUNT));
+        if (names.length > LIST_ENTRY_PREVIEW_COUNT)
+            lines.push(dimAnsi(`showing first ${LIST_ENTRY_PREVIEW_COUNT} of ${names.length} entries`));
+    }
     return lines.join("\n");
 }
 function formatReadToolResult(output, ok) {
     const error = typeof output.error === "string" ? output.error : undefined;
     if (!ok || error)
-        return ["failed", error ?? formatJson(output, 1200)].join("\n");
+        return ["file read failed", error ?? formatReplData(output, 1200)].join("\n");
     const pathValue = typeof output.path === "string" ? output.path : undefined;
     const startLine = typeof output.startLine === "number" ? output.startLine : undefined;
     const endLine = typeof output.endLine === "number" ? output.endLine : undefined;
@@ -4272,17 +4280,23 @@ function formatReadToolResult(output, ok) {
     const hasMoreBefore = output.hasMoreBefore === true;
     const hasMoreAfter = output.hasMoreAfter === true;
     const content = typeof output.content === "string" ? output.content.trimEnd() : "";
-    const lines = ["read result"];
-    if (pathValue)
-        lines.push(`file: ${pathValue}`);
+    const contentLines = content ? content.split("\n") : [];
+    const lines = pathValue ? [pathValue] : [];
     if (startLine !== undefined && endLine !== undefined && totalLines !== undefined) {
-        const more = [hasMoreBefore ? "more before" : undefined, hasMoreAfter ? "more after" : undefined]
-            .filter((value) => Boolean(value))
-            .join(", ");
-        lines.push(`range: lines ${startLine}-${endLine} of ${totalLines}${more ? ` (${more})` : ""}`);
+        lines.push(dimAnsi(`lines ${startLine}-${endLine} of ${totalLines}`));
+    }
+    if (contentLines.length > 0) {
+        lines.push("");
+        lines.push(...contentLines.slice(0, READ_CONTENT_PREVIEW_LINES));
+        if (contentLines.length > READ_CONTENT_PREVIEW_LINES)
+            lines.push(dimAnsi(`showing first ${READ_CONTENT_PREVIEW_LINES} of ${contentLines.length} returned lines`));
     }
-    lines.push("content:");
-    lines.push(content || "(empty range)");
+    else {
+        lines.push("", dimAnsi("empty range"));
+    }
+    const more = [hasMoreBefore ? "before" : undefined, hasMoreAfter ? "after" : undefined].filter((value) => Boolean(value));
+    if (more.length > 0)
+        lines.push(dimAnsi(`more content exists ${more.join(" and ")} this range`));
     return lines.join("\n");
 }
 function formatWebSearchToolResult(output, ok) {
@@ -4320,7 +4334,7 @@ function formatWebSearchToolResult(output, ok) {
 function formatGrepToolResult(output, ok) {
     const error = typeof output.error === "string" ? output.error : undefined;
     if (!ok || error)
-        return ["failed", error ?? formatJson(output, 1200)].join("\n");
+        return ["search failed", error ?? formatReplData(output, 1200)].join("\n");
     const query = typeof output.query === "string" ? output.query : undefined;
     const grepPath = typeof output.grepPath === "string" ? output.grepPath : undefined;
     const returnedMatches = typeof output.returnedMatches === "number" ? output.returnedMatches : undefined;
@@ -4332,39 +4346,40 @@ function formatGrepToolResult(output, ok) {
         : [];
     const transportTruncation = isRecord(output.transportTruncation) ? output.transportTruncation : undefined;
     const omittedMatches = typeof transportTruncation?.omittedMatches === "number" ? transportTruncation.omittedMatches : undefined;
-    const lines = ["grep result"];
+    const total = totalMatchesKnown ?? returnedMatches ?? matches.length;
+    const lines = [`${total} ${total === 1 ? "match" : "matches"}`];
     if (query !== undefined)
-        lines.push(`query: ${query}`);
+        lines.push(`${dimAnsi("query")} ${query}`);
     if (grepPath !== undefined)
-        lines.push(`path: ${grepPath}`);
-    const countParts = [
-        `${returnedMatches ?? matches.length} shown`,
-        totalMatchesKnown !== undefined ? `${totalMatchesKnown} known` : undefined,
-        truncated ? "truncated" : undefined,
-        omittedMatches !== undefined && omittedMatches > 0 ? `${omittedMatches} omitted` : undefined,
-    ].filter((value) => Boolean(value));
-    lines.push(`matches: ${countParts.join(" · ")}`);
+        lines.push(`${dimAnsi("path")} ${grepPath}`);
     if (errors.length > 0) {
-        lines.push("errors:");
-        lines.push(...errors.slice(0, 5).map((message) => `  ${message}`));
+        lines.push("", dimAnsi("errors"));
+        lines.push(...errors.slice(0, 5));
         if (errors.length > 5)
-            lines.push(`  ... ${errors.length - 5} more error(s)`);
+            lines.push(dimAnsi(`${errors.length - 5} more errors`));
     }
     if (matches.length === 0) {
-        lines.push("no matches");
+        lines.push("", dimAnsi("no matches"));
         return lines.join("\n");
     }
-    lines.push("results:");
-    for (const match of matches) {
-        for (const context of match.contextBefore ?? []) {
-            lines.push(formatGrepContextLine(context, "-"));
-        }
+    lines.push("");
+    for (const match of matches.slice(0, GREP_MATCH_PREVIEW_COUNT)) {
+        const before = (match.contextBefore ?? []).slice(-GREP_CONTEXT_PREVIEW_LINES);
+        const after = (match.contextAfter ?? []).slice(0, GREP_CONTEXT_PREVIEW_LINES);
+        for (const context of before)
+            lines.push(dimAnsi(formatGrepContextLine(context, "-")));
         lines.push(formatGrepMatchLine(match));
-        for (const context of match.contextAfter ?? []) {
-            lines.push(formatGrepContextLine(context, "+"));
-        }
+        for (const context of after)
+            lines.push(dimAnsi(formatGrepContextLine(context, "+")));
+        lines.push("");
     }
-    return lines.join("\n");
+    if (matches.length > GREP_MATCH_PREVIEW_COUNT)
+        lines.push(dimAnsi(`showing first ${GREP_MATCH_PREVIEW_COUNT} of ${matches.length} returned matches`));
+    if (truncated)
+        lines.push(dimAnsi("results were truncated"));
+    if (omittedMatches !== undefined && omittedMatches > 0)
+        lines.push(dimAnsi(`${omittedMatches} additional matches omitted by transport`));
+    return lines.join("\n").replace(/\n{3,}/g, "\n\n").trimEnd();
 }
 function isGrepMatchLike(value) {
     if (!isRecord(value))
@@ -4671,7 +4686,6 @@ const SESSIONS_DEFAULT_PAGE_SIZE = 10;
 const TERMINAL_TITLE_WORKING_PREFIX = "● ";
 const TERMINAL_TITLE_READY_PREFIX = "✓ ";
 const REPL_ANIMATION_INTERVAL_MS = 420;
-const TOOL_RESULT_REPLACEMENT_DELAY_MS = 2000;
 const SUBAGENT_ACTIVITY_UPDATE_DEBOUNCE_MS = 1000;
 const SUBAGENT_COMPLETED_LINGER_MS = 8000;
 const TOKEN_PULSE_MS = 900;
@@ -4693,10 +4707,7 @@ const QUEUED_INPUT_RENDER_ROWS = 1;
 const EMPTY_CTRL_C_EXIT_PLACEHOLDER = "Press Ctrl+C again to exit";
 const LONG_CLIPBOARD_TEXT_THRESHOLD = 200;
 const PASTE_STATUS_DISPLAY_MS = 2500;
-const MIN_LIVE_VIEWPORT_LINES = 1;
-const FULLSCREEN_RENDER_GUARD_ROWS = 3;
 const COMPACT_LIVE_LAYOUT_ROWS = 24;
-const COMPACT_LIVE_DYNAMIC_BLOCKS = 1;
 const MESSAGE_BLOCK_SPACING_LINES = 1;
 const SUMMARY_BLOCK = {
     maxLines: 6,
@@ -4707,6 +4718,17 @@ const THINKING_MARKER = "◆";
 const THINKING_SUMMARY_MAX_LINES = 1000;
 const EXPANDED_SUMMARY_MAX_LINES = 1000;
 const EDIT_TOOL_SUMMARY_MAX_LINES = EXPANDED_SUMMARY_MAX_LINES;
+const EXEC_COMMAND_PREVIEW_CHARS = 120;
+const EXEC_STDOUT_PREVIEW_LINES = 40;
+const EXEC_STDERR_PREVIEW_LINES = 60;
+const READ_CONTENT_PREVIEW_LINES = 80;
+const IMAGE_PROMPT_PREVIEW_LINES = 8;
+const IMAGE_NOTE_PREVIEW_COUNT = 8;
+const GREP_MATCH_PREVIEW_COUNT = 20;
+const GREP_CONTEXT_PREVIEW_LINES = 2;
+const LIST_ENTRY_PREVIEW_COUNT = 12;
+const FALLBACK_PREVIEW_LINES = 40;
+const LOW_VALUE_FALLBACK_FIELDS = new Set(["ok", "summary", "metadata", "transportTruncation"]);
 function fixed(value, width, align = "right") {
     const stripped = stripAnsi(value);
     const trimmed = stripped.length > width ? stripped.slice(0, width) : stripped;