neoctl 0.1.6 → 0.1.8

package/dist/repl/index.js

@@ -27,6 +27,8 @@ import { isModelReasoningArgument, isValidReplCommandLine, parseReplCommand, hel
 import { estimateMarkdownLineCount, markdownRenderKey, MarkdownText } from "./markdown-renderer.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";
 const e = React.createElement;
 class SessionUsageTracker {
     totals = emptyUsageTotals();
@@ -172,7 +174,7 @@ async function createRuntime() {
     };
 }
 function formatCreatedEnvNotice(path) {
-    return `Created default config file: ${path}\nSet MODEL_PROVIDER and the matching provider section (for example OPENAI_API_KEY), then restart neo.`;
+    return `Created default config file: ${path}\nSet MODEL_PROVIDER and the matching provider section (for example OPENAI_API_KEY or KIMI_API_KEY), then restart neo.`;
 }
 function parseResumeFlag(value) {
     if (!value)
@@ -203,6 +205,12 @@ function initialContextMetrics(model, messageCount, toolCount) {
             : undefined,
     };
 }
+function activeBackgroundTasks(runtime) {
+    return runtime.taskStore.list().filter((task) => !runtime.taskStore.isTerminal(task));
+}
+function runningSessionIds(runs) {
+    return [...runs.keys()];
+}
 function initialStatus(runtime, metrics = runtime.initialMetrics) {
     return {
         phase: "ready",
@@ -214,8 +222,8 @@ function initialStatus(runtime, metrics = runtime.initialMetrics) {
         activityTick: 0,
     };
 }
-function resetStatus(runtime) {
-    return initialStatus(runtime, initialContextMetrics(runtime.engine.getModelSettings().model, runtime.engine.snapshot().messages, runtime.initialMetrics.toolCount));
+async function resetStatus(runtime) {
+    return initialStatus(runtime, await runtime.engine.contextMetrics());
 }
 function setTerminalTitle(title, prefix = TERMINAL_TITLE_WORKING_PREFIX) {
     if (!stdout.isTTY)
@@ -361,13 +369,19 @@ function InkRepl({ runtime }) {
     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));
-    const [backgroundTaskCount, setBackgroundTaskCount] = useState(() => runtime.taskStore.activeCount());
+    const [backgroundTasks, setBackgroundTasks] = useState(() => activeBackgroundTasks(runtime));
+    const [backgroundSessionRuns, setBackgroundSessionRuns] = useState([]);
+    const backgroundSessionRunsRef = useRef(new Map());
+    const suppressReattachedStreamingRef = useRef(new Set());
+    const activePromptRunRef = useRef(undefined);
     const [animationTick, setAnimationTick] = useState(0);
     const [terminalTitlePrefix, setTerminalTitlePrefix] = useState(TERMINAL_TITLE_READY_PREFIX);
-    const terminalTitleWorking = isActivePhase(status.phase) || backgroundTaskCount > 0;
+    const backgroundTaskCount = backgroundTasks.length;
+    const terminalTitleWorking = isActivePhase(status.phase) || backgroundTaskCount > 0 || backgroundSessionRuns.length > 0;
     const [sessionsBrowser, setSessionsBrowser] = useState(undefined);
     const inputRef = useRef(input);
     const queuedInputRef = useRef(undefined);
@@ -395,15 +409,15 @@ function InkRepl({ runtime }) {
         };
     }, []);
     useEffect(() => {
-        if (!busy && backgroundTaskCount === 0)
+        if (!busy && backgroundTaskCount === 0 && backgroundSessionRuns.length === 0)
             return undefined;
         const interval = setInterval(() => setAnimationTick((current) => current + 1), REPL_ANIMATION_INTERVAL_MS);
         return () => clearInterval(interval);
-    }, [busy, backgroundTaskCount]);
+    }, [busy, backgroundTaskCount, backgroundSessionRuns.length]);
     useEffect(() => {
-        const updateBackgroundTaskCount = () => setBackgroundTaskCount(runtime.taskStore.activeCount());
-        updateBackgroundTaskCount();
-        return runtime.taskStore.subscribe(updateBackgroundTaskCount);
+        const updateBackgroundTasks = () => setBackgroundTasks(activeBackgroundTasks(runtime));
+        updateBackgroundTasks();
+        return runtime.taskStore.subscribe(updateBackgroundTasks);
     }, [runtime]);
     useEffect(() => {
         if (!terminalTitleWorking) {
@@ -480,9 +494,11 @@ function InkRepl({ runtime }) {
         }, 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) => {
@@ -554,7 +570,44 @@ function InkRepl({ runtime }) {
     const replaceLine = (id, patch) => {
         setLines((current) => current.map((line) => line.id === id ? { ...line, ...patch, renderedKey: undefined } : line));
     };
-    const resumeSnapshot = (snapshot, metrics) => {
+    const syncBackgroundSessionRuns = () => {
+        setBackgroundSessionRuns([...backgroundSessionRunsRef.current.values()]);
+    };
+    const detachRunningForeground = (reason) => {
+        if (!busyRef.current)
+            return false;
+        const snapshot = runtime.engine.snapshot().session;
+        const sessionId = snapshot?.sessionId ?? `session-${Date.now().toString(36)}`;
+        const run = activePromptRunRef.current;
+        if (run && !backgroundSessionRunsRef.current.has(sessionId)) {
+            const backgroundRun = {
+                sessionId,
+                title: snapshot?.title,
+                reason,
+                startedAt: Date.now(),
+                engine: runtime.engine,
+                abortController: activeAbortController.current ?? new AbortController(),
+                promise: run,
+            };
+            backgroundSessionRunsRef.current.set(sessionId, backgroundRun);
+            syncBackgroundSessionRuns();
+            setSessionsBrowser((current) => current ? { ...current, runningSessionIds: runningSessionIds(backgroundSessionRunsRef.current) } : current);
+            run.finally(() => {
+                backgroundSessionRunsRef.current.delete(sessionId);
+                suppressReattachedStreamingRef.current.delete(backgroundRun.engine);
+                syncBackgroundSessionRuns();
+                setSessionsBrowser((current) => current ? { ...current, runningSessionIds: runningSessionIds(backgroundSessionRunsRef.current) } : current);
+            }).catch(() => undefined);
+        }
+        activeAbortController.current = undefined;
+        interruptArmed.current = false;
+        setQueuedPromptState(undefined);
+        setBusyState(false);
+        setStatus((current) => ({ ...current, phase: "ready", detail: undefined }));
+        append(systemLine(`Detached running ${sessionId} to background for ${reason}.`));
+        return true;
+    };
+    const resetForegroundView = (metrics) => {
         runtime.usage.reset();
         setStatus(initialStatus(runtime, metrics));
         resetLinesToHistory(runtime, setLines, lineId);
@@ -563,8 +616,27 @@ function InkRepl({ runtime }) {
         finalizedThinkingLineId.current = undefined;
         toolLineIds.current.clear();
         clearPendingToolResultTimers();
+    };
+    const resumeSnapshot = (snapshot, metrics) => {
+        resetForegroundView(metrics);
         append(systemLine(formatResume(snapshot)));
     };
+    const reattachRunningSession = async (run) => {
+        detachRunningForeground("session switch");
+        backgroundSessionRunsRef.current.delete(run.sessionId);
+        syncBackgroundSessionRuns();
+        setSessionsBrowser((current) => current ? { ...current, runningSessionIds: runningSessionIds(backgroundSessionRunsRef.current) } : current);
+        runtime.engine = run.engine;
+        activeAbortController.current = run.abortController;
+        interruptArmed.current = false;
+        activePromptRunRef.current = run.promise;
+        suppressReattachedStreamingRef.current.add(run.engine);
+        const metrics = await runtime.engine.contextMetrics();
+        resetForegroundView(metrics);
+        setBusyState(true);
+        setStatus((current) => ({ ...current, phase: "running", detail: "working" }));
+        append(systemLine(`reattached running session ${run.sessionId}`));
+    };
     const finalizeLiveLine = (id) => {
         if (id === undefined)
             return;
@@ -714,13 +786,7 @@ function InkRepl({ runtime }) {
             return;
         }
         if (busyRef.current) {
-            if (queuedInputRef.current !== undefined)
-                return;
-            setQueuedPromptState(text, submitAttachments);
-            setHistorySelection(undefined);
-            setPromptState("", 0);
-            clearAttachments();
-            return;
+            detachRunningForeground("new prompt");
         }
         history.current = [text, ...history.current.filter((entry) => entry !== text)].slice(0, 100);
         setHistorySelection(undefined);
@@ -818,12 +884,13 @@ function InkRepl({ runtime }) {
         if (command.type === "reset") {
             runtime.engine.reset();
             runtime.usage.reset();
-            setStatus(resetStatus(runtime));
+            setStatus(await resetStatus(runtime));
             append(systemLine("transcript reset"));
             return;
         }
         if (command.type === "state") {
-            append(systemLine(formatReplData({ ...runtime.engine.snapshot(), communicationLog: runtime.communicationLogger.snapshot() }, 12000), EXPANDED_SUMMARY_MAX_LINES));
+            const contextMetrics = await runtime.engine.contextMetrics();
+            append(systemLine(formatReplData({ ...runtime.engine.snapshot(), contextMetrics, communicationLog: runtime.communicationLogger.snapshot() }, 12000), EXPANDED_SUMMARY_MAX_LINES));
             return;
         }
         if (command.type === "export") {
@@ -842,8 +909,37 @@ function InkRepl({ runtime }) {
             }
             return;
         }
+        if (command.type === "env") {
+            const envDirectory = path.dirname(runtime.envPath);
+            try {
+                await fs.mkdir(envDirectory, { recursive: true });
+                await openDirectory(envDirectory);
+                append({ kind: "system", title: "System", text: `Opened env directory: ${envDirectory}`, format: "plain", previewStyle: "summary" });
+            }
+            catch (error) {
+                append({ kind: "error", text: `Failed to open env directory ${envDirectory}: ${error instanceof Error ? error.message : String(error)}`, format: "plain" });
+            }
+            return;
+        }
+        if (command.type === "new") {
+            detachRunningForeground("new session");
+            runtime.engine = runtime.engine.forkForSession(undefined, false);
+            await runtime.engine.initialize();
+            const snapshot = runtime.engine.snapshot().session;
+            const metrics = await runtime.engine.contextMetrics();
+            runtime.usage.reset();
+            setStatus(initialStatus(runtime, metrics));
+            resetLinesToHistory(runtime, setLines, lineId);
+            assistantLineId.current = undefined;
+            thinkingLineId.current = undefined;
+            finalizedThinkingLineId.current = undefined;
+            toolLineIds.current.clear();
+            clearPendingToolResultTimers();
+            append(systemLine(snapshot ? `new session ${snapshot.sessionId}` : "new session"));
+            return;
+        }
         if (command.type === "sessions") {
-            await handleSessionsCommand(runtime, setSessionsBrowser, (line) => append(line));
+            await handleSessionsCommand(runtime, runningSessionIds(backgroundSessionRunsRef.current), setSessionsBrowser, (line) => append(line));
             return;
         }
         if (command.type === "login") {
@@ -899,20 +995,41 @@ function InkRepl({ runtime }) {
             outputTokenUpdatedAt: undefined,
             retryCooldownUntil: undefined,
         }));
-        try {
-            for await (const event of runtime.engine.sendUserText(promptPayload.text, { abortSignal: abortController.signal, blocks: promptPayload.blocks, displayText: text })) {
+        const engine = runtime.engine;
+        const run = (async () => {
+            for await (const event of engine.sendUserText(promptPayload.text, { abortSignal: abortController.signal, blocks: promptPayload.blocks, displayText: text })) {
+                if (runtime.engine !== engine)
+                    continue;
+                if (suppressReattachedStreamingRef.current.has(engine)) {
+                    if (event.type === "message" || event.type === "terminal" || event.type === "error" || event.type === "context.metrics" || event.type === "usage") {
+                        if (event.type === "message" || event.type === "terminal" || event.type === "error")
+                            suppressReattachedStreamingRef.current.delete(engine);
+                        handleEvent(event);
+                    }
+                    continue;
+                }
                 handleEvent(event);
             }
+        })();
+        activePromptRunRef.current = run;
+        try {
+            await run;
         }
         catch (error) {
-            finalizeLiveLine(assistantLineId.current);
-            finalizeThinkingLine();
-            finalizeActiveToolLines();
-            assistantLineId.current = undefined;
-            finalizedThinkingLineId.current = undefined;
-            append({ kind: "error", text: error instanceof Error ? error.message : String(error) });
+            if (runtime.engine === engine) {
+                finalizeLiveLine(assistantLineId.current);
+                finalizeThinkingLine();
+                finalizeActiveToolLines();
+                assistantLineId.current = undefined;
+                finalizedThinkingLineId.current = undefined;
+                append({ kind: "error", text: error instanceof Error ? error.message : String(error) });
+            }
         }
         finally {
+            if (activePromptRunRef.current === run)
+                activePromptRunRef.current = undefined;
+            if (runtime.engine !== engine)
+                return;
             if (activeAbortController.current === abortController)
                 activeAbortController.current = undefined;
             interruptArmed.current = false;
@@ -939,6 +1056,7 @@ function InkRepl({ runtime }) {
         }
     };
     useEffect(() => {
+        setTipIndex(initialTipIndex(runtime.engine.snapshot().session?.sessionId ?? process.cwd()));
         setLines(initialLines(runtime, lineId));
         assistantLineId.current = undefined;
         thinkingLineId.current = undefined;
@@ -955,9 +1073,13 @@ function InkRepl({ runtime }) {
     const width = terminalSize.columns;
     const inputLockedByQueue = busy && queuedInput !== undefined;
     const prompt = promptPrefix(busy);
-    const promptDisplayText = input.length === 0 && promptPlaceholder ? promptPlaceholder : input;
-    const promptDisplayCursor = input.length === 0 && promptPlaceholder ? promptPlaceholder.length : cursor;
-    const slashCompletions = inputLockedByQueue || promptPlaceholder || loginForm ? [] : slashCommandCompletions(input, cursor);
+    const currentTip = tipAt(tipIndex);
+    const activePlaceholder = input.length === 0 ? promptPlaceholder ?? currentTip.placeholder : undefined;
+    const promptDisplayText = input;
+    const promptDisplayCursor = cursor;
+    const promptLayoutText = activePlaceholder ? ` ${activePlaceholder}` : promptDisplayText;
+    const promptLayoutCursor = activePlaceholder ? 0 : promptDisplayCursor;
+    const slashCompletions = inputLockedByQueue || (input.length === 0 && promptPlaceholder !== undefined) || loginForm ? [] : slashCommandCompletions(input, cursor);
     const visibleSlashCompletionCount = slashCompletions.length;
     const selectedSlashCompletionIndex = visibleSlashCompletionCount === 0
         ? 0
@@ -965,7 +1087,7 @@ function InkRepl({ runtime }) {
     if (selectedSlashCompletionIndex !== slashCompletionIndexRef.current) {
         slashCompletionIndexRef.current = selectedSlashCompletionIndex;
     }
-    const promptHeight = promptTextView(promptDisplayText, promptDisplayCursor, width, prompt).length + slashCompletionViewHeight(slashCompletions) + (queuedInput !== undefined ? QUEUED_INPUT_RENDER_ROWS : 0) + (pasteStatus ? 1 : 0);
+    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);
@@ -973,7 +1095,7 @@ function InkRepl({ runtime }) {
         const blockIndex = staticLines.length + i;
         return sum + (blockIndex > 0 ? MESSAGE_BLOCK_SPACING_LINES : 0);
     }, 0);
-    const statusRenderRows = STATUS_BAR_RENDER_ROWS + (backgroundTaskCount > 0 ? BACKGROUND_TASK_STATUS_RENDER_ROWS : 0);
+    const statusRenderRows = STATUS_BAR_RENDER_ROWS + backgroundTaskStatusRenderRows(backgroundTasks.length);
     const sessionsBrowserHeight = sessionsBrowser ? sessionsBrowserViewHeight(sessionsBrowser) : 0;
     const loginFormHeight = loginForm ? loginFormViewHeight(loginForm) : 0;
     const liveViewportLines = Math.max(MIN_LIVE_VIEWPORT_LINES, terminalSize.rows - promptHeight - statusRenderRows - sessionsBrowserHeight - loginFormHeight - dynamicMarginOverhead - 1);
@@ -1053,10 +1175,17 @@ function InkRepl({ runtime }) {
                 const selected = sessionsBrowser.sessions[sessionAbsoluteIndex(sessionsBrowser)];
                 if (selected) {
                     setSessionsBrowser(undefined);
-                    void handleResumeCommand(selected.sessionId, runtime, (line) => append(line)).then((result) => {
-                        if (result)
-                            resumeSnapshot(result.snapshot, result.metrics);
-                    });
+                    const running = backgroundSessionRunsRef.current.get(selected.sessionId);
+                    if (running) {
+                        void reattachRunningSession(running);
+                    }
+                    else {
+                        detachRunningForeground("session switch");
+                        void handleResumeCommand(selected.sessionId, runtime, (line) => append(line)).then((result) => {
+                            if (result)
+                                resumeSnapshot(result.snapshot, result.metrics);
+                        });
+                    }
                 }
                 return;
             }
@@ -1088,6 +1217,10 @@ function InkRepl({ runtime }) {
         if (key.backspace || key.delete) {
             const currentText = inputRef.current;
             const currentCursor = cursorRef.current;
+            if (currentText.length === 0) {
+                setTipIndex((current) => current + 1);
+                return;
+            }
             if (currentCursor > 0) {
                 setPromptState(`${currentText.slice(0, currentCursor - 1)}${currentText.slice(currentCursor)}`, currentCursor - 1);
             }
@@ -1099,6 +1232,10 @@ function InkRepl({ runtime }) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + completionCount - SLASH_COMPLETION_PAGE_SIZE) % completionCount);
                 return;
             }
+            if (inputRef.current.length === 0) {
+                setTipIndex((current) => current - 1);
+                return;
+            }
             setPromptState(inputRef.current, cursorRef.current - 1);
             return;
         }
@@ -1108,18 +1245,32 @@ function InkRepl({ runtime }) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + SLASH_COMPLETION_PAGE_SIZE) % completionCount);
                 return;
             }
+            if (inputRef.current.length === 0) {
+                setTipIndex((current) => current + 1);
+                return;
+            }
             setPromptState(inputRef.current, cursorRef.current + 1);
             return;
         }
         if (key.home) {
-            setPromptState(inputRef.current, 0);
+            if (inputRef.current.length === 0)
+                setTipIndex(0);
+            else
+                setPromptState(inputRef.current, 0);
             return;
         }
         if (key.end) {
-            setPromptState(inputRef.current, inputRef.current.length);
+            if (inputRef.current.length === 0)
+                setTipIndex((current) => current + 1);
+            else
+                setPromptState(inputRef.current, inputRef.current.length);
             return;
         }
         if (key.upArrow) {
+            if (inputRef.current.length === 0 && history.current.length === 0) {
+                setTipIndex((current) => current - 1);
+                return;
+            }
             const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current);
             if (completionCount > 0) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + completionCount - 1) % completionCount);
@@ -1133,6 +1284,10 @@ function InkRepl({ runtime }) {
             return;
         }
         if (key.downArrow) {
+            if (inputRef.current.length === 0 && historyIndexRef.current === undefined) {
+                setTipIndex((current) => current + 1);
+                return;
+            }
             const completionCount = slashCompletionSelectableCount(inputRef.current, cursorRef.current);
             if (completionCount > 0) {
                 setSlashCompletionSelection((slashCompletionIndexRef.current + 1) % completionCount);
@@ -1154,6 +1309,10 @@ function InkRepl({ runtime }) {
         }
         if (key.tab) {
             const currentText = inputRef.current;
+            if (currentText.length === 0) {
+                setTipIndex((current) => current + 1);
+                return;
+            }
             const currentCursor = cursorRef.current;
             const completions = slashCommandCompletions(currentText, currentCursor);
             const completion = completions[Math.min(slashCompletionIndexRef.current, completions.length - 1)];
@@ -1165,9 +1324,10 @@ function InkRepl({ runtime }) {
         }
         if (value && !key.ctrl && !key.meta) {
             insertAtCursor(value);
+            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: dynamicLines, width, liveMaxLines: liveViewportLines, lineIndexOffset: staticLines.length, onMarkdownRenderComplete: markLineRendered }), sessionsBrowser ? e(SessionsBrowser, { state: sessionsBrowser, width }) : null, loginForm ? e(LoginFormView, { state: loginForm, width }) : null, e(StatusBar, { status, animationTick, width }), backgroundTaskCount > 0 ? e(BackgroundTaskStatusLine, { count: backgroundTaskCount, 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, 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: dynamicLines, width, liveMaxLines: liveViewportLines, lineIndexOffset: staticLines.length, onMarkdownRenderComplete: markLineRendered }), sessionsBrowser ? e(SessionsBrowser, { state: sessionsBrowser, width }) : null, loginForm ? e(LoginFormView, { state: loginForm, width }) : null, e(StatusBar, { status, animationTick, width }), backgroundTasks.length > 0 ? e(BackgroundTaskStatusLine, { tasks: backgroundTasks, 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 contentWidth = messageContentWidth(width);
@@ -1193,9 +1353,17 @@ function MessageLine({ line, width, contentWidth = messageContentWidth(width), t
         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)));
     }
-    const clipPendingMarkdown = !line.live && onMarkdownRenderComplete !== undefined && lineNeedsDynamicRender(line, contentWidth);
-    const display = displayWindowForLine(line, contentWidth, line.live || clipPendingMarkdown ? liveMaxLines : undefined);
-    return e(Box, { flexDirection: "row" }, e(Text, { color: markerColorForKind(line.kind) }, messageRoleMarker(line.kind)), e(Box, { flexDirection: "column", width: contentWidth }, ...renderDisplayText(line, contentWidth, display.maxLines, display.skipTop, onMarkdownRenderComplete)));
+    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));
+    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)
@@ -1265,12 +1433,21 @@ function summaryTitle(line) {
 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("◆ "));
+}
 function titleStatusMarker(status) {
     return status === "success" ? "✓" : "✗";
 }
 function titleStatusColor(status) {
     return status === "success" ? "green" : "red";
 }
+function renderBlockTitle(line) {
+    const title = line.title ?? titleForKind(line.kind);
+    if (!line.titleStatus)
+        return e(Text, { key: `title-${line.id}`, color: colorForKind(line.kind), bold: true }, title);
+    return e(Text, { key: `title-${line.id}`, color: colorForKind(line.kind), bold: true }, `${title} `, e(Text, { color: titleStatusColor(line.titleStatus), bold: true }, titleStatusMarker(line.titleStatus)));
+}
 function renderSummaryBlock(line, width, maxLines, skipTop = 0) {
     const allPreviewLines = renderSummaryLines(line, width);
     const preview = clipStrings(allPreviewLines, maxLines, skipTop);
@@ -1502,10 +1679,27 @@ function StatusBar({ status, animationTick, width: terminalWidth }) {
     const segments = fitStatusSegments(renderCompactStatusSegments(status, animationTick, width, inputTokens, outputTokens, displayPhase), width);
     return e(Box, { marginTop: 1, width, height: 1, overflow: "hidden" }, ...segments.map((segment, index) => e(Text, { key: index, color: segment.color ?? "gray", bold: segment.bold ?? false }, segment.text)));
 }
-function BackgroundTaskStatusLine({ count, width: terminalWidth }) {
+function backgroundTaskStatusRenderRows(taskCount) {
+    if (taskCount <= 0)
+        return 0;
+    return 1 + Math.min(taskCount, 2);
+}
+function BackgroundTaskStatusLine({ tasks, width: terminalWidth }) {
     const width = statusBarWidth(terminalWidth);
-    const text = count <= 3 ? "◇".repeat(Math.max(0, count)) : `◇×${count}`;
-    return e(Box, { width, height: 1, overflow: "hidden" }, e(Text, { color: "yellow" }, fitToWidth(text, width)));
+    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) => e(Text, { key: task.taskId, 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))));
+}
+function formatElapsed(ms) {
+    const seconds = Math.max(0, Math.floor(ms / 1000));
+    if (seconds < 60)
+        return `${seconds}s`;
+    const minutes = Math.floor(seconds / 60);
+    const remainder = seconds % 60;
+    if (minutes < 60)
+        return `${minutes}m${remainder.toString().padStart(2, "0")}s`;
+    const hours = Math.floor(minutes / 60);
+    return `${hours}h${(minutes % 60).toString().padStart(2, "0")}m`;
 }
 function renderCompactStatusSegments(status, animationTick, width, inputTokens, outputTokens, displayPhase = status.phase) {
     const phase = displayPhase;
@@ -1516,7 +1710,7 @@ function renderCompactStatusSegments(status, animationTick, width, inputTokens,
     const context = renderContextParts(status.metrics);
     const fixedText = [
         phaseText,
-        `ctx ${context.used} / ${context.limit} (${context.percent})`,
+        context.percent,
         `↑ ${inputValue}`,
         `↓ ${outputValue}`,
     ].join(STATUS_SEPARATOR);
@@ -1533,9 +1727,7 @@ function renderCompactStatusSegments(status, animationTick, width, inputTokens,
         statusDividerSegment(),
         { text: model },
         statusDividerSegment(),
-        statusLabelSegment("ctx"),
-        { text: ` ${context.used} / ${context.limit}` },
-        { text: ` (${context.percent})`, color: contextColor(status.metrics) },
+        { text: context.percent, color: contextColor(status.metrics) },
         statusDividerSegment(),
         statusLabelSegment("↑", tokenInputColor),
         { text: ` ${inputValue}` },
@@ -1681,10 +1873,16 @@ function selectedSlashCommandCompletion(text, cursor, selectedIndex) {
         return undefined;
     return completions[Math.max(0, Math.min(selectedIndex, completions.length - 1))];
 }
-function PromptLine({ text, cursor, busy, locked, placeholder = false, width, prompt, slashCompletions, selectedSlashCompletionIndex, attachments }) {
-    const visualLines = promptTextView(text, cursor, width, prompt);
+function PromptLine({ text, cursor, busy, locked, placeholder = false, ghostText, width, prompt, slashCompletions, selectedSlashCompletionIndex, attachments }) {
+    const displayText = text.length === 0 && ghostText ? ` ${ghostText}` : text;
+    const displayCursor = text.length === 0 && ghostText ? 0 : cursor;
+    const visualLines = promptTextView(displayText, displayCursor, width, prompt);
     const inputColor = placeholder ? "gray" : (!locked && isValidReplCommandLine(text) ? "cyan" : undefined);
-    return e(Box, { flexDirection: "column" }, ...visualLines.map((line, index) => e(Box, { key: `prompt-${index}`, height: 1, overflow: "hidden" }, e(Text, { color: locked ? "gray" : "cyan" }, index === 0 ? prompt : " ".repeat(prompt.length)), ...renderPromptPart(line.before, inputColor, attachments, `prompt-${index}-before`), e(Text, { key: `prompt-${index}-cursor`, inverse: true, color: inputColor }, line.selected), ...renderPromptPart(line.after, inputColor, attachments, `prompt-${index}-after`))), ...SlashCompletionLines({ completions: slashCompletions, width, prompt, selectedIndex: selectedSlashCompletionIndex }));
+    return e(Box, { flexDirection: "column" }, ...visualLines.map((line, index) => {
+        const isGhostLine = text.length === 0 && ghostText !== undefined;
+        const afterColor = isGhostLine ? "gray" : inputColor;
+        return e(Box, { key: `prompt-${index}`, height: 1, overflow: "hidden" }, e(Text, { color: locked ? "gray" : "cyan" }, index === 0 ? prompt : " ".repeat(prompt.length)), ...renderPromptPart(line.before, inputColor, attachments, `prompt-${index}-before`), e(Text, { key: `prompt-${index}-cursor`, inverse: true, color: inputColor }, line.selected), ...renderPromptPart(line.after, afterColor, attachments, `prompt-${index}-after`));
+    }), ...SlashCompletionLines({ completions: slashCompletions, width, prompt, selectedIndex: selectedSlashCompletionIndex }));
 }
 function PasteStatusLine({ text, width: terminalWidth }) {
     const width = statusBarWidth(terminalWidth);
@@ -1821,7 +2019,11 @@ function currentModelProvider() {
     return parseLoginProvider(process.env.MODEL_PROVIDER) ?? "openai";
 }
 function modelEnvKeyForProvider(provider) {
-    return provider === "deepseek" ? "DEEPSEEK_MODEL" : "OPENAI_MODEL";
+    if (provider === "deepseek")
+        return "DEEPSEEK_MODEL";
+    if (provider === "kimi")
+        return "KIMI_MODEL";
+    return "OPENAI_MODEL";
 }
 function envValueForReasoning(reasoning) {
     if (reasoning === null)
@@ -2064,14 +2266,14 @@ function reduceStatus(status, event) {
     }
     return status;
 }
-async function handleSessionsCommand(runtime, setBrowser, append) {
+async function handleSessionsCommand(runtime, runningSessionIds, setBrowser, append) {
     const sessions = await runtime.engine.listSessions(Number.POSITIVE_INFINITY);
     if (sessions.length === 0) {
         setBrowser(undefined);
         append(systemLine("No saved sessions found."));
         return;
     }
-    setBrowser({ sessions, pageSize: SESSIONS_DEFAULT_PAGE_SIZE, pageIndex: 0, selectedIndex: 0 });
+    setBrowser({ sessions, runningSessionIds, pageSize: SESSIONS_DEFAULT_PAGE_SIZE, pageIndex: 0, selectedIndex: 0 });
 }
 async function handleExportCommand(command, runtime) {
     const snapshot = runtime.engine.snapshot();
@@ -2089,7 +2291,11 @@ async function handleExportCommand(command, runtime) {
 }
 async function handleResumeCommand(sessionId, runtime, append) {
     try {
-        const snapshot = await runtime.engine.resumeSession(sessionId);
+        runtime.engine = runtime.engine.forkForSession(sessionId, true);
+        await runtime.engine.initialize();
+        const snapshot = runtime.engine.snapshot().session;
+        if (!snapshot)
+            throw new Error("session transcripts are disabled");
         const metrics = await runtime.engine.contextMetrics();
         return { snapshot, metrics };
     }
@@ -2116,6 +2322,7 @@ async function handleDeleteSessionCommand(sessionId, current, runtime, setBrowse
             setBrowser({
                 ...current,
                 sessions: nextSessions,
+                runningSessionIds: current.runningSessionIds.filter((id) => id !== sessionId),
                 pageIndex,
                 selectedIndex: Math.min(current.selectedIndex, Math.max(0, pageLength - 1)),
             });
@@ -2132,11 +2339,11 @@ function initialLines(runtime, lineId) {
         ? ` 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}`, previewStyle: "summary" },
+        { 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" },
     ];
     lineId.current = 0;
     if (runtime.envNotice)
-        lines.push({ id: ++lineId.current, kind: "system", title: "Config", text: runtime.envNotice, previewStyle: "summary" });
+        lines.push({ id: ++lineId.current, kind: "system", title: "Config", text: runtime.envNotice, format: "plain", previewStyle: "summary" });
     for (const line of restoredHistoryLines(runtime))
         lines.push({ id: ++lineId.current, ...line });
     return lines;
@@ -2155,7 +2362,7 @@ function restoredHistoryLines(runtime) {
     }
     return lines;
 }
-const LOGIN_PROVIDERS = ["openai", "deepseek"];
+const LOGIN_PROVIDERS = ["openai", "deepseek", "kimi"];
 const SHARED_LOGIN_FIELDS = [
     { key: "reasoningEffort", label: "Reasoning effort", envKey: "MODEL_REASONING_EFFORT", scope: "shared", options: ["", "off", "none", "minimal", "low", "medium", "high", "xhigh", "max"] },
     { key: "reasoningSummary", label: "Reasoning summary", envKey: "MODEL_REASONING_SUMMARY", scope: "shared", options: ["", "auto", "concise", "detailed"] },
@@ -2180,6 +2387,13 @@ const LOGIN_FIELD_DEFINITIONS = {
         { key: "fallbackModel", label: "Fallback model", envKey: "DEEPSEEK_FALLBACK_MODEL", scope: "provider" },
         ...SHARED_LOGIN_FIELDS,
     ],
+    kimi: [
+        { key: "apiKey", label: "API key", envKey: "KIMI_API_KEY", scope: "provider", required: true, secret: true, placeholder: "sk-..." },
+        { key: "baseUrl", label: "Base URL", envKey: "KIMI_BASE_URL", scope: "provider", placeholder: "https://api.moonshot.cn/v1" },
+        { key: "model", label: "Model", envKey: "KIMI_MODEL", scope: "provider", required: true, placeholder: "kimi-k2.6" },
+        { key: "fallbackModel", label: "Fallback model", envKey: "KIMI_FALLBACK_MODEL", scope: "provider" },
+        ...SHARED_LOGIN_FIELDS,
+    ],
 };
 const DEPRECATED_MODEL_ENV_KEYS = [
     "MODEL_API_KEY",
@@ -2200,6 +2414,18 @@ const DEPRECATED_MODEL_ENV_KEYS = [
     "DEEPSEEK_TIMEOUT_MS",
     "DEEPSEEK_STREAM_IDLE_TIMEOUT_MS",
     "DEEPSEEK_MAX_RETRIES",
+    "KIMI_REASONING_EFFORT",
+    "KIMI_REASONING_SUMMARY",
+    "KIMI_MAX_OUTPUT_TOKENS",
+    "KIMI_TIMEOUT_MS",
+    "KIMI_STREAM_IDLE_TIMEOUT_MS",
+    "KIMI_MAX_RETRIES",
+    "MOONSHOT_REASONING_EFFORT",
+    "MOONSHOT_REASONING_SUMMARY",
+    "MOONSHOT_MAX_OUTPUT_TOKENS",
+    "MOONSHOT_TIMEOUT_MS",
+    "MOONSHOT_STREAM_IDLE_TIMEOUT_MS",
+    "MOONSHOT_MAX_RETRIES",
 ];
 function sessionsPageCount(state) {
     return Math.max(1, Math.ceil(state.sessions.length / state.pageSize));
@@ -2243,7 +2469,7 @@ function SessionsBrowser({ state, width }) {
     return e(Box, { flexDirection: "column", marginTop: 1 }, e(Text, { color: "cyan", bold: true }, fitToWidth(header, contentWidth)), ...pageItems.map((session, index) => {
         const selected = index === state.selectedIndex;
         const absoluteIndex = state.pageIndex * state.pageSize + index;
-        const row = formatSessionBrowserRow(session, absoluteIndex, contentWidth);
+        const row = formatSessionBrowserRow(session, absoluteIndex, contentWidth, state.runningSessionIds.includes(session.sessionId));
         return e(Text, { key: session.sessionId, color: "white" }, e(Text, {
             color: selected ? "black" : "white",
             backgroundColor: selected ? "cyan" : undefined,
@@ -2394,7 +2620,7 @@ function validateLoginForm(state) {
 }
 function createLoginFormState(envPath = getUserDotEnvPath()) {
     const env = parseEnvFileSafe(envPath);
-    const currentProvider = parseLoginProvider(env.MODEL_PROVIDER ?? process.env.MODEL_PROVIDER) ?? ((env.DEEPSEEK_API_KEY ?? process.env.DEEPSEEK_API_KEY) ? "deepseek" : "openai");
+    const currentProvider = parseLoginProvider(env.MODEL_PROVIDER ?? process.env.MODEL_PROVIDER) ?? guessLoginProvider(env);
     return loginFormForProvider(currentProvider, envPath, env);
 }
 function loginFormForProvider(provider, envPath, env = parseEnvFileSafe(envPath)) {
@@ -2415,19 +2641,46 @@ function loginValuesForProvider(provider, env) {
     for (const field of LOGIN_FIELD_DEFINITIONS[provider]) {
         values[field.key] = env[field.envKey] ?? "";
     }
+    if (provider === "kimi") {
+        values.apiKey ||= env.MOONSHOT_API_KEY ?? process.env.MOONSHOT_API_KEY ?? "";
+        values.baseUrl ||= env.MOONSHOT_BASE_URL ?? process.env.MOONSHOT_BASE_URL ?? "";
+        values.model ||= env.MOONSHOT_MODEL ?? process.env.MOONSHOT_MODEL ?? "";
+        values.fallbackModel ||= env.MOONSHOT_FALLBACK_MODEL ?? process.env.MOONSHOT_FALLBACK_MODEL ?? "";
+    }
     if (!values.baseUrl)
-        values.baseUrl = provider === "deepseek" ? "https://api.deepseek.com" : "https://api.openai.com";
+        values.baseUrl = defaultBaseUrlForLoginProvider(provider);
     if (!values.model)
-        values.model = provider === "deepseek" ? "deepseek-chat" : "gpt-5.5";
+        values.model = defaultModelForLoginProvider(provider);
     if (provider === "openai" && !values.endpoint)
         values.endpoint = "auto";
     return values;
 }
 function parseLoginProvider(value) {
-    if (value === "openai" || value === "deepseek")
+    if (value === "openai" || value === "deepseek" || value === "kimi")
         return value;
     return undefined;
 }
+function guessLoginProvider(env) {
+    if (env.KIMI_API_KEY ?? env.MOONSHOT_API_KEY ?? process.env.KIMI_API_KEY ?? process.env.MOONSHOT_API_KEY)
+        return "kimi";
+    if (env.DEEPSEEK_API_KEY ?? process.env.DEEPSEEK_API_KEY)
+        return "deepseek";
+    return "openai";
+}
+function defaultBaseUrlForLoginProvider(provider) {
+    if (provider === "deepseek")
+        return "https://api.deepseek.com";
+    if (provider === "kimi")
+        return "https://api.moonshot.cn/v1";
+    return "https://api.openai.com";
+}
+function defaultModelForLoginProvider(provider) {
+    if (provider === "deepseek")
+        return "deepseek-chat";
+    if (provider === "kimi")
+        return "kimi-k2.6";
+    return "gpt-5.5";
+}
 function loginFormViewHeight(state) {
     return state.step === "provider" ? state.providers.length + 3 : LOGIN_FIELD_DEFINITIONS[state.provider].length + 4;
 }
@@ -2444,7 +2697,7 @@ function LoginFormView({ state, width }) {
         const visibleValue = formatLoginFieldValue(field, rawValue, selected ? state.cursor : undefined);
         const placeholder = rawValue ? "" : (field.placeholder ? ` (${field.placeholder})` : "");
         return e(Text, { key: field.key, color: "white" }, e(Text, { color: selected ? "black" : "white", backgroundColor: selected ? "cyan" : undefined }, `${index + 1}.`.padStart(3)), e(Text, { color: field.required ? "yellow" : "gray" }, ` ${field.label.padEnd(maxLabel)} `), e(Text, { color: field.scope === "shared" ? "blue" : "gray" }, field.scope === "shared" ? "shared " : "provider "), e(Text, { color: rawValue ? "white" : "gray" }, fitToWidth(`${visibleValue}${placeholder}`, Math.max(8, contentWidth - maxLabel - 14))));
-    }), e(Text, { color: "gray" }, fitToWidth("↑/↓ field · ←/→ cursor · type edit · Tab cycle choices · Enter save · Esc back/cancel", contentWidth)), e(Text, { color: "gray" }, fitToWidth("Provider fields save as OPENAI_* / DEEPSEEK_*; shared runtime fields save as MODEL_*.", contentWidth)));
+    }), e(Text, { color: "gray" }, fitToWidth("↑/↓ field · ←/→ cursor · type edit · Tab cycle choices · Enter save · Esc back/cancel", contentWidth)), e(Text, { color: "gray" }, fitToWidth("Provider fields save as OPENAI_* / DEEPSEEK_* / KIMI_*; shared runtime fields save as MODEL_*.", contentWidth)));
 }
 function formatLoginFieldValue(field, value, cursor) {
     const display = field.secret && value ? "•".repeat(Math.min(value.length, 24)) : value;
@@ -2470,6 +2723,12 @@ function envEntriesForLoginForm(state) {
         const value = (state.values[field.key] ?? "").trim();
         entries[field.envKey] = value || undefined;
     }
+    if (state.provider === "kimi") {
+        entries.MOONSHOT_API_KEY = undefined;
+        entries.MOONSHOT_BASE_URL = undefined;
+        entries.MOONSHOT_MODEL = undefined;
+        entries.MOONSHOT_FALLBACK_MODEL = undefined;
+    }
     return entries;
 }
 function updateEnvContent(content, updates, removeKeys = []) {
@@ -2497,6 +2756,7 @@ function updateEnvContent(content, updates, removeKeys = []) {
         appendEnvGroup(updatedLines, "# Neo active provider", grouped.active);
         appendEnvGroup(updatedLines, "# OpenAI provider settings", grouped.openai);
         appendEnvGroup(updatedLines, "# DeepSeek provider settings", grouped.deepseek);
+        appendEnvGroup(updatedLines, "# Kimi provider settings", grouped.kimi);
         appendEnvGroup(updatedLines, "# Shared model runtime settings", grouped.shared);
     }
     return `${updatedLines.join("\n").replace(/\n*$/u, "")}\n`;
@@ -2506,6 +2766,7 @@ function groupLoginEnvEntries(entries) {
         active: entries.filter(([key]) => key === "MODEL_PROVIDER"),
         openai: entries.filter(([key]) => key.startsWith("OPENAI_")),
         deepseek: entries.filter(([key]) => key.startsWith("DEEPSEEK_")),
+        kimi: entries.filter(([key]) => key.startsWith("KIMI_") || key.startsWith("MOONSHOT_")),
         shared: entries.filter(([key]) => key.startsWith("MODEL_") && key !== "MODEL_PROVIDER"),
     };
 }
@@ -2551,16 +2812,17 @@ function stripEnvQuotes(value) {
         return value.slice(1, -1);
     return value;
 }
-function formatSessionBrowserRow(session, absoluteIndex, width) {
+function formatSessionBrowserRow(session, absoluteIndex, width, running = false) {
     const numberPrefix = `${absoluteIndex + 1}.`.padStart(4);
     const title = session.title?.trim() || "(untitled)";
+    const runningTag = running ? " · running" : "";
     const updated = session.updatedAt ? ` · ${formatSessionTimestamp(session.updatedAt)}` : "";
     const messages = ` · ${session.messages} messages`;
-    const fixedParts = `${numberPrefix} ${updated}${messages}`;
+    const fixedParts = `${numberPrefix} ${runningTag}${updated}${messages}`;
     const idBudget = Math.max(12, Math.min(32, Math.floor(width * 0.28)));
     const id = truncateMiddle(session.sessionId, idBudget);
     const titleBudget = Math.max(8, width - fixedParts.length - id.length - 5);
-    const row = fitToWidth(`${numberPrefix} ${truncateMiddle(title, titleBudget)} · ${id}${updated}${messages}`, width);
+    const row = fitToWidth(`${numberPrefix} ${truncateMiddle(title, titleBudget)} · ${id}${runningTag}${updated}${messages}`, width);
     return { numberPrefix, rest: row.slice(numberPrefix.length) };
 }
 function formatSessionTimestamp(value) {
@@ -2639,7 +2901,7 @@ function kindForRole(role) {
 }
 function titleForKind(kind) {
     if (kind === "thinking")
-        return `${THINKING_MARKER} Think`;
+        return `${THINKING_MARKER} think`;
     if (kind === "tool")
         return "Tool";
     if (kind === "error")
@@ -2693,6 +2955,7 @@ function formatToolUse(toolUse) {
         return {
             kind: "tool",
             title: toolTitle(toolUse.name, "running"),
+            bodyTitle: planToolBodyTitle(toolUse.input),
             text: formatPlanToolPayload(toolUse.input),
         };
     }
@@ -2708,6 +2971,7 @@ function formatToolResultLine(toolName, output, ok) {
     const line = {
         kind: ok ? "tool" : "error",
         title: toolTitle(toolName, "finished"),
+        bodyTitle: formatted.bodyTitle,
         titleStatus: ok ? "success" : "failure",
         text: formatted.text,
         format: formatted.format,
@@ -2749,10 +3013,12 @@ function isPlanToolPayload(value) {
             (item.status === "pending" || item.status === "in_progress" || item.status === "completed"));
     });
 }
+function planToolBodyTitle(payload) {
+    const title = payload.title?.trim();
+    return title ? title : undefined;
+}
 function formatPlanToolPayload(payload) {
     const sections = [];
-    if (payload.title?.trim())
-        sections.push(`**${payload.title.trim()}**`);
     if (payload.summary?.trim())
         sections.push(payload.summary.trim());
     if (payload.note?.trim())
@@ -2840,26 +3106,11 @@ function isReplScalar(value) {
     return value === null || value === undefined || typeof value !== "object" || value instanceof Date;
 }
 function formatToolResult(toolName, output, ok) {
-    if (toolName === "edit" && isRecord(output) && isEditToolOutput(output)) {
+    if ((toolName === "edit" || toolName === "write") && isRecord(output) && isEditToolOutput(output)) {
         return { text: formatEditToolDiff(output, ok), format: "ansi", summaryMaxLines: EDIT_TOOL_SUMMARY_MAX_LINES };
     }
     if (isExecOutput(output)) {
-        const status = output.timedOut
-            ? "timed out"
-            : output.exitCode === 0
-                ? "exit 0"
-                : `exit ${output.exitCode ?? output.signal ?? "unknown"}`;
-        const sections = [
-            `${status} · ${output.durationMs}ms`,
-            `$ ${output.command}`,
-        ];
-        if (output.stdout)
-            sections.push("stdout:", output.stdout.replace(/\s+$/u, ""));
-        if (output.stderr)
-            sections.push("stderr:", output.stderr.replace(/\s+$/u, ""));
-        if (!output.stdout && !output.stderr)
-            sections.push(ok ? "no output" : "no captured output");
-        return { text: sections.join("\n"), format: "ansi" };
+        return { text: formatExecToolResult(output, ok), format: "ansi", summaryMaxLines: EXPANDED_SUMMARY_MAX_LINES };
     }
     if (typeof output === "string" && hasAnsi(output)) {
         return { text: output, format: "ansi" };
@@ -2877,7 +3128,7 @@ function formatToolResult(toolName, output, ok) {
         return { text: formatWebSearchToolResult(output, ok), summaryMaxLines: EXPANDED_SUMMARY_MAX_LINES };
     }
     if (toolName === "plan" && isPlanToolPayload(output)) {
-        return { text: formatPlanToolPayload(output), full: true };
+        return { text: formatPlanToolPayload(output), bodyTitle: planToolBodyTitle(output), full: true };
     }
     return { text: `${ok ? "ok" : "failed"}\n${formatJson(output, 6000)}`, summaryMaxLines: EXPANDED_SUMMARY_MAX_LINES };
 }
@@ -2966,6 +3217,28 @@ function isExecOutput(value) {
         typeof record.stdout === "string" &&
         typeof record.stderr === "string");
 }
+function formatExecToolResult(output, ok) {
+    const status = output.timedOut
+        ? "timed out"
+        : output.exitCode === 0
+            ? "exit 0"
+            : `exit ${output.exitCode ?? output.signal ?? "unknown"}`;
+    const lines = [
+        "exec result",
+        `status: ${status}`,
+        `duration: ${output.durationMs}ms`,
+        `command: ${output.command}`,
+    ];
+    const stdout = output.stdout.replace(/\s+$/u, "");
+    const stderr = output.stderr.replace(/\s+$/u, "");
+    if (stdout)
+        lines.push("stdout:", stdout);
+    if (stderr)
+        lines.push("stderr:", stderr);
+    if (!stdout && !stderr)
+        lines.push(ok ? "output: (none)" : "output: (not captured)");
+    return lines.join("\n");
+}
 function isRecord(value) {
     return !!value && typeof value === "object" && !Array.isArray(value);
 }
@@ -3116,11 +3389,9 @@ function formatGrepContextLine(line, marker) {
 }
 function renderContextParts(metrics) {
     if (!metrics)
-        return { used: "?", limit: "?", percent: "?" };
-    const used = compactNumber(metrics.estimatedInputTokens);
-    const limit = metrics.contextWindowTokens ? compactNumber(metrics.contextWindowTokens) : "?";
+        return { percent: "?" };
     const percent = metrics.contextUsageRatio === undefined ? "?" : `${(metrics.contextUsageRatio * 100).toFixed(1)}%`;
-    return { used, limit, percent };
+    return { percent };
 }
 function contextColor(metrics) {
     const ratio = metrics?.contextUsageRatio;