neoctl 0.1.7 → 0.1.9

package/dist/repl/index.js

@@ -23,7 +23,7 @@ import { planTool } from "../tools/builtins/plan-tool.js";
 import { createAgentTool, resumeAgentTask } from "../agents/agent-tool.js";
 import { createTaskTools } from "../tasks/task-tools.js";
 import { TaskStore } from "../tasks/task-store.js";
-import { isModelReasoningArgument, isValidReplCommandLine, parseReplCommand, helpText, replCommandDefinitions } from "./commands.js";
+import { cliHelpText, isModelReasoningArgument, isValidReplCommandLine, parseCliReplCommandArgs, parseReplCommand, helpText, replCommandDefinitions } from "./commands.js";
 import { estimateMarkdownLineCount, markdownRenderKey, MarkdownText } from "./markdown-renderer.js";
 import { writeSessionMarkdownExport } from "../session/session-export.js";
 import { readClipboard } from "./clipboard.js";
@@ -86,14 +86,32 @@ function sumUsageTokens(left, right) {
         return undefined;
     return (left ?? 0) + (right ?? 0);
 }
-async function main() {
+async function main(argv = process.argv.slice(2)) {
+    const initialCommand = parseCliReplCommandArgs(argv);
+    if (argv.length > 0 && !initialCommand) {
+        console.error(`Unknown or incomplete command: ${argv.join(" ")}\n\n${cliHelpText(binaryName())}`);
+        process.exitCode = 1;
+        return;
+    }
+    if (initialCommand?.definition.name === "/help") {
+        console.log(cliHelpText(binaryName()));
+        return;
+    }
     const runtime = await createRuntime();
-    const instance = render(e(InkRepl, { runtime }), {
+    const instance = render(e(InkRepl, { runtime, initialCommandLine: initialCommand?.line }), {
         exitOnCtrlC: false,
     });
     await instance.waitUntilExit();
     console.log("bye.");
 }
+function binaryName() {
+    const arg = process.argv[1];
+    if (!arg)
+        return "neo";
+    const parsed = path.parse(arg);
+    const name = parsed.name || "neo";
+    return name === "index" ? "neo" : name;
+}
 function createTaskNotificationSource(taskStore) {
     return {
         collectUnnotifiedCompletions() {
@@ -205,6 +223,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",
@@ -216,8 +240,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)
@@ -346,7 +370,7 @@ function pushTextBlock(blocks, text) {
 function escapeRegExp(value) {
     return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
-function InkRepl({ runtime }) {
+function InkRepl({ runtime, initialCommandLine }) {
     const app = useApp();
     const lineId = useRef(0);
     const assistantLineId = useRef(undefined);
@@ -367,10 +391,15 @@ function InkRepl({ runtime }) {
     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);
@@ -398,15 +427,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) {
@@ -559,7 +588,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);
@@ -568,8 +634,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;
@@ -719,13 +804,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);
@@ -823,12 +902,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") {
@@ -859,8 +939,25 @@ function InkRepl({ runtime }) {
             }
             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") {
@@ -916,20 +1013,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;
@@ -969,6 +1087,11 @@ function InkRepl({ runtime }) {
         setQueuedPromptState(undefined);
         setPromptState("", 0);
     }, [runtime]);
+    useEffect(() => {
+        if (initialCommandLine === undefined)
+            return;
+        void submitLine(initialCommandLine);
+    }, []);
     const terminalSize = useTerminalSize();
     const width = terminalSize.columns;
     const inputLockedByQueue = busy && queuedInput !== undefined;
@@ -995,7 +1118,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);
@@ -1075,10 +1198,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;
             }
@@ -1220,7 +1350,7 @@ function InkRepl({ runtime }) {
             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, 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: 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);
@@ -1572,10 +1702,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;
@@ -1586,7 +1733,7 @@ function renderCompactStatusSegments(status, animationTick, width, inputTokens,
     const context = renderContextParts(status.metrics);
     const fixedText = [
         phaseText,
-        `ctx ${context.percent} of ${context.limit}`,
+        context.percent,
         `↑ ${inputValue}`,
         `↓ ${outputValue}`,
     ].join(STATUS_SEPARATOR);
@@ -1603,9 +1750,7 @@ function renderCompactStatusSegments(status, animationTick, width, inputTokens,
         statusDividerSegment(),
         { text: model },
         statusDividerSegment(),
-        statusLabelSegment("ctx"),
-        { text: ` ${context.percent}`, color: contextColor(status.metrics) },
-        { text: ` of ${context.limit}` },
+        { text: context.percent, color: contextColor(status.metrics) },
         statusDividerSegment(),
         statusLabelSegment("↑", tokenInputColor),
         { text: ` ${inputValue}` },
@@ -2144,14 +2289,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();
@@ -2169,7 +2314,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 };
     }
@@ -2196,6 +2345,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)),
             });
@@ -2342,7 +2492,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,
@@ -2685,16 +2835,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) {
@@ -2978,26 +3129,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" };
@@ -3104,6 +3240,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);
 }
@@ -3254,11 +3412,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;