omniharness-cli 0.1.37 → 0.1.38

package/dist/ui/terminalInterface.js

@@ -1,12 +1,16 @@
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useRef, useState } from 'react';
 import { Box, Text, useApp, useInput, useStdin, useStdout } from 'ink';
 import Spinner from 'ink-spinner';
 import { appendPromptHistory, loadPromptHistory } from '../promptHistory.js';
+import { listSessions, loadSnapshot, saveSnapshot, deleteSnapshot } from '../sessionList.js';
 import { deleteAt, deleteBefore, insertAt, layoutEditor, lineEndAt, lineStartAt, moveHorizontal, moveVerticalWrapped, normalizePaste } from './editor.js';
 import { renderMarkdown } from './markdown.js';
 import { looksLikeDiff, diffSegments } from './diff.js';
+import { foldToolGroups } from './groups.js';
 import { palette } from './palette.js';
+import { contextMeter, meterBar } from './modelWindows.js';
+import { BEL, SYNC_QUERY, isSyncOutputReply, osc9Notify, osc52Copy, shouldNudgeOnFinish, wrapSynchronizedOutput } from './termcaps.js';
 import { KITTY_POP, KITTY_PUSH, KITTY_QUERY, isEncodedKey, isKittyQueryResponse, parseRawKey } from './keys.js';
 function describeTarget(name, input) {
     if (input && typeof input === 'object') {
@@ -20,6 +24,22 @@ function describeTarget(name, input) {
     }
     return '';
 }
+/** Short verb shown on a tool card header, per tool type. */
+function toolVerb(tool) {
+    switch (tool) {
+        case 'read_file': return 'read';
+        case 'write_file': return 'edit';
+        case 'run_command': return '$';
+        case 'git_diff': return 'diff';
+        case 'semantic_search': return 'search';
+        case 'index_workspace': return 'index';
+        case 'update_todo': return 'plan';
+        case 'write_memory': return 'memory';
+        case 'start_preview': return 'preview';
+        case 'route': return 'route';
+        default: return tool;
+    }
+}
 function phaseFor(tool) {
     switch (tool) {
         case 'read_file': return 'reading files';
@@ -103,6 +123,46 @@ function SegmentText({ segments, role }) {
     const base = role === 'thinking' ? PALETTE.warn : role === 'tool' ? PALETTE.muted : role === 'assistant' ? PALETTE.success : role === 'user' ? PALETTE.info : undefined;
     return _jsx(Text, { color: base, children: segments.map((segment, index) => (_jsx(Text, { bold: segment.bold, italic: segment.italic, strikethrough: segment.strikethrough, underline: segment.underline, dimColor: segment.dim, color: segment.color ?? base, children: segment.text }, index))) });
 }
+/** Expanded body of a tool card, rendered per tool type. */
+function renderToolBody(card, width, p) {
+    const trail = card.trail;
+    if (!trail)
+        return card.summary ? _jsx(Text, { dimColor: true, children: card.summary.slice(0, width) }) : _jsx(Text, { dimColor: true, children: "(no output)" });
+    if (looksLikeDiff(trail)) {
+        return _jsx(_Fragment, { children: diffSegments(trail, width).slice(0, 14).map((segments, index) => _jsx(SegmentText, { segments: segments, role: "tool" }, index)) });
+    }
+    const rows = trail.split('\n').slice(0, 14);
+    if (card.name === 'write_file') {
+        // A write trail is the new file content — show it as added (green) lines.
+        return _jsx(_Fragment, { children: rows.map((line, index) => _jsx(Text, { color: p.success, children: line.slice(0, width) }, index)) });
+    }
+    if (card.name === 'run_command') {
+        return _jsx(_Fragment, { children: rows.map((line, index) => {
+                const exit = /^exit (\d+)/.exec(line);
+                const color = exit ? (exit[1] === '0' ? p.success : p.error) : undefined;
+                return _jsx(Text, { color: color, dimColor: color === undefined, children: line.slice(0, width) }, index);
+            }) });
+    }
+    return _jsx(_Fragment, { children: rows.map((line, index) => _jsx(Text, { dimColor: true, children: line.slice(0, width) }, index)) });
+}
+/** Render one Line into transcript Rows (label row + content rows). */
+function renderLineToRows(line, lineIndex, width, fallback) {
+    const baseLabel = labelFor(line.role, line.model, line.toolName, fallback);
+    // Route ribbon: the provider a given answer actually came from is provenance —
+    // it belongs on the answer's label, next to the model badge.
+    const label = line.role === 'assistant' && line.provider
+        ? `${baseLabel}  ·  via ${line.provider}${line.fallback ? ' (failover)' : ''}`
+        : baseLabel;
+    const markdown = line.role !== 'tool' && line.role !== 'error';
+    const wrapped = markdown
+        ? renderMarkdown(line.text, width)
+        : wrap(line.text, width).map((text) => [{ text }]);
+    const next = [];
+    wrapped.forEach((segments, rowIndex) => next.push({ key: `message-${lineIndex}-${rowIndex}`, role: line.role, segments, label, first: rowIndex === 0 }));
+    if (line.saved)
+        next.push({ key: `message-${lineIndex}-saved`, role: 'assistant', segments: [{ text: line.saved }], label: '', first: false, saved: line.saved });
+    return next;
+}
 export function TerminalInterface({ engine }) {
     const { exit } = useApp();
     const { stdout } = useStdout();
@@ -132,6 +192,10 @@ export function TerminalInterface({ engine }) {
     const [liveThink, setLiveThink] = useState('');
     const [liveAnswer, setLiveAnswer] = useState('');
     const [kitty, setKitty] = useState(null);
+    const [sessionsList, setSessionsList] = useState([]);
+    const [sessionsOpen, setSessionsOpen] = useState(false);
+    const [sessionsIndex, setSessionsIndex] = useState(0);
+    const [groupsExpanded, setGroupsExpanded] = useState(false);
     const [taskQueue, setTaskQueue] = useState(engine.state.taskQueue);
     const [currentTool, setCurrentTool] = useState();
     // Tool activity rendered as collapsible cards: each completed/ongoing tool
@@ -141,6 +205,13 @@ export function TerminalInterface({ engine }) {
     // Run timing: monotonic start time plus a ticking elapsed counter while busy.
     const runStartedAt = useRef(null);
     const [now, setNow] = useState(() => Date.now());
+    // A prompt typed while a run is in flight: stashed here and submitted when the run ends.
+    const queuedRef = useRef(null);
+    const [queued, setQueued] = useState();
+    // Ctrl+L paints the row budget of every layout region over the transcript.
+    const [layoutDebug, setLayoutDebug] = useState(false);
+    // Restores plain stdout.write when synchronized-output bracketing is torn down.
+    const syncRestoreRef = useRef(null);
     useEffect(() => {
         let alive = true;
         // Seed history from disk, but only if the user hasn't already submitted a
@@ -157,8 +228,14 @@ export function TerminalInterface({ engine }) {
         stdout.write(KITTY_PUSH);
         let kittyTimer;
         // Terminals with kitty support answer the query (ESC[? flags u); others ignore it.
+        // The same probe pass asks about synchronized output (DECSET 2026): a positive
+        // reply lets us bracket every frame so streaming never tears mid-repaint.
         const onKitty = (chunk) => {
-            if (!isKittyQueryResponse(chunk.toString()))
+            const text = chunk.toString();
+            if (isSyncOutputReply(text) && syncRestoreRef.current === null) {
+                syncRestoreRef.current = wrapSynchronizedOutput(stdout);
+            }
+            if (!isKittyQueryResponse(text))
                 return;
             if (kittyTimer)
                 clearTimeout(kittyTimer);
@@ -168,6 +245,7 @@ export function TerminalInterface({ engine }) {
         if (stdin) {
             stdin.on('data', onKitty);
             kittyTimer = setTimeout(() => { setKitty(false); stdin.off('data', onKitty); }, 300);
+            stdout.write(SYNC_QUERY);
             stdout.write(KITTY_QUERY);
         }
         else {
@@ -189,10 +267,19 @@ export function TerminalInterface({ engine }) {
                 case 'text':
                     setLines((current) => [...current, {
                             role: 'assistant', text: event.content, model: event.model,
+                            provider: event.provider, fallback: event.fallback,
                             saved: event.compression ? `${Math.round((1 - event.compression.ratio) * 100)}% saved (${event.compression.strategy.toUpperCase()}) · ${event.compression.savedTokens.toLocaleString()} tokens` : undefined,
                         }]);
                     setLiveAnswer('');
                     break;
+                case 'route':
+                    setLines((current) => [...current, {
+                            role: 'tool', toolName: 'route',
+                            text: event.fallback
+                                ? `route · failover → ${event.provider ?? 'unknown'} (attempt ${event.attempts + 1})${event.reason ? ` · ${event.reason}` : ''}`
+                                : `route · ${event.provider ?? 'unknown'}`,
+                        }]);
+                    break;
                 case 'tool_start':
                     setToolCards((current) => [...current, {
                             id: `tc-${Date.now().toString(36)}-${current.length}`, name: event.tool,
@@ -206,7 +293,9 @@ export function TerminalInterface({ engine }) {
                 case 'tool_result':
                     setToolCards((current) => current.length === 0
                         ? current
-                        : current.map((card, index) => index === current.length - 1 ? { ...card, status: 'done', summary: event.summary } : card));
+                        : current.map((card, index) => index === current.length - 1
+                            ? { ...card, status: 'done', summary: event.summary, trail: card.trail ?? event.detail }
+                            : card));
                     setCurrentTool(undefined);
                     break;
                 case 'todos':
@@ -233,10 +322,12 @@ export function TerminalInterface({ engine }) {
             stdout.off('resize', onResize);
             const pendingApproval = approvalResolve.current;
             approvalResolve.current = null;
-            pendingApproval?.(false);
+            pendingApproval?.({ approved: false });
             engine.stop();
             unsubscribe();
             process.off('exit', onUnload);
+            syncRestoreRef.current?.();
+            syncRestoreRef.current = null;
             stdout.write(KITTY_POP);
         };
     }, [engine, stdout, stdin]);
@@ -268,11 +359,77 @@ export function TerminalInterface({ engine }) {
         engine.state.mode = next;
         setLines((current) => [...current, { role: 'tool', text: `mode → ${next}`, toolName: 'mode' }]);
     };
-    const approve = (ok) => {
+    const approve = (approved, trust) => {
         const resolve = approvalResolve.current;
         setApproval(null);
         approvalResolve.current = null;
-        resolve?.(ok);
+        resolve?.({ approved, trust });
+    };
+    /** Copy the most recent assistant reply (or last transcript line) to the clipboard via OSC 52. */
+    const yankLastBlock = () => {
+        const target = [...lines].reverse().find((entry) => entry.role === 'assistant') ?? lines[lines.length - 1];
+        if (!target)
+            return;
+        const seq = osc52Copy(target.text);
+        if (!seq) {
+            setLines((current) => [...current, { role: 'tool', text: 'clipboard: block too large to copy', toolName: 'clipboard' }]);
+            return;
+        }
+        try {
+            stdout.write(seq);
+            setLines((current) => [...current, { role: 'tool', text: `copied ${target.text.length} chars to clipboard`, toolName: 'clipboard' }]);
+        }
+        catch { /* clipboard write is best-effort */ }
+    };
+    /** Kick off an engine run for `prompt`, attaching `attachSpec` files first when given. */
+    const startRun = (prompt, attachSpec) => {
+        followTranscriptRef.current = true;
+        setScrollOffset(0);
+        setEdit({ value: '', cursor: 0 });
+        setBusy(true);
+        setError(undefined);
+        setToolCards([]);
+        setExpandedTool(undefined);
+        if (runStartedAt.current === null)
+            runStartedAt.current = Date.now();
+        setNow(Date.now());
+        historyIdxRef.current = -1;
+        if (prompt) {
+            syncPromptHistory([prompt, ...promptHistoryRef.current.filter((entry) => entry !== prompt)].slice(0, 200));
+            void appendPromptHistory(prompt).catch(() => { });
+        }
+        if (!attachSpec)
+            setLines((current) => [...current, { role: 'user', text: prompt }]);
+        void (async () => {
+            try {
+                if (attachSpec)
+                    await engine.attach(attachSpec.split(/\s+/).filter(Boolean));
+                await engine.run(prompt);
+                /* answer is streamed live via text_delta / text events */
+            }
+            catch (reason) {
+                const message = reason instanceof Error ? reason.message : String(reason);
+                setError(message);
+                setLines((current) => [...current, { role: 'error', text: message }]);
+            }
+            finally {
+                const startedAt = runStartedAt.current;
+                setBusy(false);
+                setCurrentTool(undefined);
+                setToolCards((current) => current.map((card) => card.status === 'running' ? { ...card, status: 'error' } : card));
+                runStartedAt.current = null;
+                setLiveThink('');
+                setLiveAnswer('');
+                // A long run probably pulled focus elsewhere: nudge with a bell + OSC 9 notification.
+                if (startedAt !== null && shouldNudgeOnFinish(Date.now() - startedAt)) {
+                    try {
+                        stdout.write(osc9Notify('OmniHarness — run finished'));
+                        stdout.write(BEL);
+                    }
+                    catch { /* nudge is best-effort */ }
+                }
+            }
+        })();
     };
     /** ↑ walks older prompts, ↓ walks newer; ↓ past the newest clears the input. */
     const navigateHistory = (older) => {
@@ -288,6 +445,24 @@ export function TerminalInterface({ engine }) {
     };
     /** Whether ↑/↓ should browse prompt history instead of moving the text caret. */
     const browsingHistory = () => historyIdxRef.current >= 0 || edit.value === '';
+    // Kept current each render so jumpToLine (defined before the row layout is
+    // computed) can resolve a transcript-line index to a scroll position.
+    const allRowsRef = useRef([]);
+    const storedHeightRef = useRef(0);
+    /** Scroll so the first rendered row of transcript line `lineIndex` sits at the top. */
+    const jumpToLine = (lineIndex) => {
+        const rows = allRowsRef.current;
+        const targetRow = rows.findIndex((row) => row.key.startsWith(`message-${lineIndex}-`));
+        if (targetRow < 0)
+            return;
+        followTranscriptRef.current = false;
+        const desired = rows.length - targetRow - storedHeightRef.current;
+        setScrollOffset(clamp(desired, 0, maxScrollRef.current));
+    };
+    /** Chapters: one per user turn, titled by the prompt's first line. */
+    const chapters = () => lines.flatMap((line, index) => line.role === 'user'
+        ? [{ index, title: line.text.split('\n')[0].slice(0, 60) || '(empty prompt)' }]
+        : []);
     /** Scroll by rendered transcript rows; positive values move toward older output. */
     const scrollTranscript = (delta) => {
         if (delta > 0 && maxScrollRef.current > 0)
@@ -303,6 +478,8 @@ export function TerminalInterface({ engine }) {
     const applyAction = (action) => {
         if (approval && action.kind !== 'submit' && action.kind !== 'escape' && action.kind !== 'ctrlC')
             return;
+        if (sessionsOpen && action.kind !== 'submit' && action.kind !== 'escape' && action.kind !== 'up' && action.kind !== 'down')
+            return;
         if (pickerOpen && action.kind !== 'submit' && action.kind !== 'escape' && action.kind !== 'up' && action.kind !== 'down')
             return;
         switch (action.kind) {
@@ -311,6 +488,22 @@ export function TerminalInterface({ engine }) {
                     approve(true);
                     return;
                 }
+                if (sessionsOpen) {
+                    const selected = sessionsList[sessionsIndex];
+                    if (selected) {
+                        void loadSnapshot(engine.state.workspace.root, selected.name).then((snapshot) => {
+                            if (snapshot == null) {
+                                setLines((current) => [...current, { role: 'error', text: `snapshot ${selected.name} is unreadable` }]);
+                                return;
+                            }
+                            setLines(snapshot.messages.map(lineFromMessage));
+                            setTaskQueue(snapshot.taskQueue);
+                            setLines((current) => [...current, { role: 'tool', text: `session resumed: ${selected.name} (${snapshot.messages.length} messages)`, toolName: 'sessions' }]);
+                        });
+                    }
+                    setSessionsOpen(false);
+                    return;
+                }
                 if (pickerOpen) {
                     const selected = pickerItems[pickerIndex];
                     if (selected) {
@@ -327,13 +520,89 @@ export function TerminalInterface({ engine }) {
                         setLines((current) => [...current,
                             { role: 'tool', text: '/help — show commands', toolName: 'commands' },
                             { role: 'tool', text: '/clear — start a fresh conversation', toolName: 'commands' },
+                            { role: 'tool', text: '/sessions — list saved sessions (enter to resume)', toolName: 'commands' },
+                            { role: 'tool', text: '/save <name> — snapshot the current session', toolName: 'commands' },
+                            { role: 'tool', text: '/forget <name> — delete a saved session', toolName: 'commands' },
                             { role: 'tool', text: '/attach <files> — attach files to the next message', toolName: 'commands' },
-                            { role: 'tool', text: 'keys: Ctrl+O models · Ctrl+E mode · Ctrl+C cancel · PgUp/PgDn scroll · ↑/↓ prompt history', toolName: 'commands' },
+                            { role: 'tool', text: '/find <text> — jump to the most recent line containing <text>', toolName: 'commands' },
+                            { role: 'tool', text: '/chapters — list turns and jump: /chapters <n>', toolName: 'commands' },
+                            { role: 'tool', text: 'keys: Ctrl+O models · Ctrl+E mode · Ctrl+C cancel · PgUp/PgDn scroll · Ctrl+G fold tool groups · Ctrl+T tool card · Ctrl+Y copy last reply · Ctrl+L layout budget · ↑/↓ prompt history', toolName: 'commands' },
+                            { role: 'tool', text: 'a prompt typed while a run is working is queued and sent when it finishes', toolName: 'commands' },
+                        ]);
+                        setEdit({ value: '', cursor: 0 });
+                        historyIdxRef.current = -1;
+                        return;
+                    }
+                    const findMatch = /^\/find\s+(.+)$/.exec(raw);
+                    if (findMatch) {
+                        const needle = findMatch[1].toLowerCase();
+                        const hits = lines.map((line, index) => ({ line, index })).filter(({ line }) => line.text.toLowerCase().includes(needle));
+                        const last = hits[hits.length - 1];
+                        setLines((current) => [...current, {
+                                role: 'tool', toolName: 'find',
+                                text: last ? `find "${findMatch[1]}" · ${hits.length} match${hits.length === 1 ? '' : 'es'} · jumped to the most recent` : `no match for "${findMatch[1]}"`,
+                            }]);
+                        if (last)
+                            jumpToLine(last.index);
+                        setEdit({ value: '', cursor: 0 });
+                        historyIdxRef.current = -1;
+                        return;
+                    }
+                    const chapterJump = /^\/chapters?\s+(\d+)$/.exec(raw);
+                    if (chapterJump) {
+                        const list = chapters();
+                        const pick = list[Number(chapterJump[1]) - 1];
+                        if (pick)
+                            jumpToLine(pick.index);
+                        setLines((current) => [...current, { role: 'tool', toolName: 'chapters', text: pick ? `jumped to chapter ${chapterJump[1]}: ${pick.title}` : `no chapter ${chapterJump[1]}` }]);
+                        setEdit({ value: '', cursor: 0 });
+                        historyIdxRef.current = -1;
+                        return;
+                    }
+                    if (raw === '/chapters' || raw === '/chapter') {
+                        const list = chapters();
+                        setLines((current) => [...current,
+                            ...(list.length === 0 ? [{ role: 'tool', toolName: 'chapters', text: 'no chapters yet — each prompt starts one' }]
+                                : list.map((chapter, order) => ({ role: 'tool', toolName: 'chapters', text: `${order + 1}. ${chapter.title}` }))),
+                            ...(list.length > 0 ? [{ role: 'tool', toolName: 'chapters', text: '/chapters <n> to jump' }] : []),
                         ]);
                         setEdit({ value: '', cursor: 0 });
                         historyIdxRef.current = -1;
                         return;
                     }
+                    if (raw === '/sessions') {
+                        void listSessions(engine.state.workspace.root).then((sessions) => {
+                            setSessionsList(sessions);
+                            setSessionsIndex(0);
+                            setSessionsOpen(sessions.length > 0);
+                            if (sessions.length === 0) {
+                                setLines((current) => [...current, { role: 'tool', text: 'no saved sessions — use /save <name> to snapshot this one', toolName: 'sessions' }]);
+                            }
+                        });
+                        setEdit({ value: '', cursor: 0 });
+                        return;
+                    }
+                    const saveMatch = /^\/save\s+([\w.-]+)$/.exec(raw);
+                    if (saveMatch) {
+                        const name = saveMatch[1];
+                        void saveSnapshot(engine.state.workspace.root, name, {
+                            messages: [...engine.state.messages], taskQueue: [...engine.state.taskQueue], savedAt: new Date().toISOString(),
+                        }).then(() => {
+                            setLines((current) => [...current, { role: 'tool', text: `session saved: ${name}`, toolName: 'sessions' }]);
+                        }).catch((reason) => {
+                            setLines((current) => [...current, { role: 'error', text: `save failed: ${reason instanceof Error ? reason.message : String(reason)}` }]);
+                        });
+                        setEdit({ value: '', cursor: 0 });
+                        return;
+                    }
+                    const delMatch = /^\/forget\s+([\w.-]+)$/.exec(raw);
+                    if (delMatch) {
+                        void deleteSnapshot(engine.state.workspace.root, delMatch[1]).then(() => {
+                            setLines((current) => [...current, { role: 'tool', text: `session deleted: ${delMatch[1]}`, toolName: 'sessions' }]);
+                        });
+                        setEdit({ value: '', cursor: 0 });
+                        return;
+                    }
                     if (raw === '/clear') {
                         historyIdxRef.current = -1;
                         followTranscriptRef.current = true;
@@ -353,46 +622,19 @@ export function TerminalInterface({ engine }) {
                         return;
                     }
                     const prompt = attachMatch ? '' : raw;
-                    if (busy || (!prompt && !attachMatch))
+                    const attachSpec = attachMatch ? attachMatch[1] : undefined;
+                    if (!prompt && !attachSpec)
+                        return;
+                    // Input stays live during a run: a prompt typed now is queued, not dropped,
+                    // and fires the moment the current run ends.
+                    if (busy) {
+                        queuedRef.current = { prompt, attachSpec };
+                        setQueued(prompt || `/attach ${attachSpec ?? ''}`.trim());
+                        setEdit({ value: '', cursor: 0 });
+                        historyIdxRef.current = -1;
                         return;
-                    followTranscriptRef.current = true;
-                    setScrollOffset(0);
-                    setEdit({ value: '', cursor: 0 });
-                    setBusy(true);
-                    setError(undefined);
-                    setToolCards([]);
-                    setExpandedTool(undefined);
-                    if (runStartedAt.current === null)
-                        runStartedAt.current = Date.now();
-                    setNow(Date.now());
-                    historyIdxRef.current = -1;
-                    if (prompt) {
-                        syncPromptHistory([prompt, ...promptHistoryRef.current.filter((entry) => entry !== prompt)].slice(0, 200));
-                        void appendPromptHistory(prompt).catch(() => { });
                     }
-                    if (!attachMatch)
-                        setLines((current) => [...current, { role: 'user', text: prompt }]);
-                    void (async () => {
-                        try {
-                            if (attachMatch)
-                                await engine.attach(attachMatch[1].split(/\s+/).filter(Boolean));
-                            await engine.run(prompt);
-                            /* answer is streamed live via text_delta / text events */
-                        }
-                        catch (reason) {
-                            const message = reason instanceof Error ? reason.message : String(reason);
-                            setError(message);
-                            setLines((current) => [...current, { role: 'error', text: message }]);
-                        }
-                        finally {
-                            setBusy(false);
-                            setCurrentTool(undefined);
-                            setToolCards((current) => current.map((card) => card.status === 'running' ? { ...card, status: 'error' } : card));
-                            runStartedAt.current = null;
-                            setLiveThink('');
-                            setLiveAnswer('');
-                        }
-                    })();
+                    startRun(prompt, attachSpec);
                 }
                 return;
             case 'escape':
@@ -400,6 +642,10 @@ export function TerminalInterface({ engine }) {
                     approve(false);
                     return;
                 }
+                if (sessionsOpen) {
+                    setSessionsOpen(false);
+                    return;
+                }
                 if (pickerOpen) {
                     setPickerOpen(false);
                     return;
@@ -424,6 +670,10 @@ export function TerminalInterface({ engine }) {
                 cycleMode();
                 return;
             case 'up':
+                if (sessionsOpen) {
+                    setSessionsIndex((current) => clamp(current - 1, 0, Math.max(0, sessionsList.length - 1)));
+                    return;
+                }
                 if (pickerOpen) {
                     setPickerIndex((current) => clamp(current - 1, 0, Math.max(0, pickerItems.length - 1)));
                     return;
@@ -435,6 +685,10 @@ export function TerminalInterface({ engine }) {
                 setEdit((current) => ({ ...current, cursor: moveVerticalWrapped(current.value, current.cursor, -1, inputWidth) }));
                 return;
             case 'down':
+                if (sessionsOpen) {
+                    setSessionsIndex((current) => clamp(current + 1, 0, Math.max(0, sessionsList.length - 1)));
+                    return;
+                }
                 if (pickerOpen) {
                     setPickerIndex((current) => clamp(current + 1, 0, Math.max(0, pickerItems.length - 1)));
                     return;
@@ -474,10 +728,23 @@ export function TerminalInterface({ engine }) {
     // Legacy keys Ink parses correctly (\r, \n, \x08, ESC[A arrows, ctrl+letters) plus text and paste.
     useInput((value, key) => {
         if (approval) {
-            if (value === 'y' || value === 'Y' || key.return)
-                applyAction({ kind: 'submit' });
-            else if (value === 'n' || value === 'N' || key.escape)
-                applyAction({ kind: 'escape' });
+            if (value === 'y' || value === 'Y' || key.return) {
+                approve(true);
+                return;
+            }
+            if (value === 'n' || value === 'N' || key.escape) {
+                approve(false);
+                return;
+            }
+            if (value === 't' || value === 'T') {
+                approve(true, approval.scopes[0]?.id);
+                return;
+            }
+            const digit = Number(value);
+            if (Number.isInteger(digit) && digit >= 1 && digit <= approval.scopes.length) {
+                approve(true, approval.scopes[digit - 1]?.id);
+                return;
+            }
             return;
         }
         if (key.ctrl && value === 'c') {
@@ -515,6 +782,25 @@ export function TerminalInterface({ engine }) {
             }
             return;
         }
+        if (sessionsOpen) {
+            if (key.escape) {
+                applyAction({ kind: 'escape' });
+                return;
+            }
+            if (key.upArrow) {
+                applyAction({ kind: 'up' });
+                return;
+            }
+            if (key.downArrow) {
+                applyAction({ kind: 'down' });
+                return;
+            }
+            if (key.return) {
+                applyAction({ kind: 'submit' });
+                return;
+            }
+            return;
+        }
         if (key.pageUp || (key.ctrl && value.toLowerCase() === 'u')) {
             scrollTranscript(pageSizeRef.current);
             return;
@@ -523,6 +809,14 @@ export function TerminalInterface({ engine }) {
             scrollTranscript(-pageSizeRef.current);
             return;
         }
+        if (key.ctrl && value.toLowerCase() === 'l') {
+            setLayoutDebug((current) => !current);
+            return;
+        }
+        if (key.ctrl && value.toLowerCase() === 'y') {
+            yankLastBlock();
+            return;
+        }
         // Ctrl+T toggles the most recent tool card between collapsed and expanded.
         if (key.ctrl && value.toLowerCase() === 't') {
             const latest = toolCards[toolCards.length - 1];
@@ -609,8 +903,10 @@ export function TerminalInterface({ engine }) {
     const elapsed = busy
         ? (elapsedMs >= 60_000 ? `${Math.floor(elapsedMs / 60_000)}m${String(Math.floor((elapsedMs % 60_000) / 1000)).padStart(2, '0')}s` : `${Math.floor(elapsedMs / 1000)}s`)
         : '';
+    const meter = contextMeter(metrics.compression.inputTokens, engine.state.activeModel, metrics.fallback.activeProvider);
+    const meterColor = meter.zone === 'danger' ? PALETTE.error : meter.zone === 'warn' ? PALETTE.warn : PALETTE.muted;
     const contextLabel = metrics.compression.inputTokens > 0
-        ? `${(metrics.compression.inputTokens / 1000).toFixed(1)}k in`
+        ? `ctx ${meterBar(meter.fraction, 8)} ${Math.round(meter.fraction * 100)}%`
         : '';
     const contentWidth = Math.max(20, width - 8);
     const terminalRows = stdout.rows ?? 24;
@@ -643,22 +939,37 @@ export function TerminalInterface({ engine }) {
         lines.forEach((line, lineIndex) => {
             let rendered = cache.rows.get(line);
             if (rendered === undefined) {
-                const label = labelFor(line.role, line.model, line.toolName, fallback);
-                const markdown = line.role !== 'tool' && line.role !== 'error';
-                const wrapped = markdown
-                    ? renderMarkdown(line.text, contentWidth)
-                    : wrap(line.text, contentWidth).map((text) => [{ text }]);
-                const next = [];
-                wrapped.forEach((segments, rowIndex) => next.push({ key: `message-${lineIndex}-${rowIndex}`, role: line.role, segments, label, first: rowIndex === 0 }));
-                if (line.saved)
-                    next.push({ key: `message-${lineIndex}-saved`, role: 'assistant', segments: [{ text: line.saved }], label: '', first: false, saved: line.saved });
-                rendered = next;
+                rendered = renderLineToRows(line, lineIndex, contentWidth, fallback);
                 cache.rows.set(line, rendered);
             }
             out.push(...rendered);
         });
         return out;
     }, [lines, contentWidth, engine.state.activeModel]);
+    // Fold tool-role rows into collapsible groups. Expansion is global (Ctrl+G);
+    // folded groups render as a single summary line instead of a wall of output.
+    const displayRows = useMemo(() => {
+        const lastUserIdx = lines.map((line) => line.role).lastIndexOf('user');
+        const folded = foldToolGroups(lines.map((line) => ({ role: line.role, text: line.text, toolName: line.toolName })), groupsExpanded, lastUserIdx >= 0 ? lastUserIdx : lines.length);
+        const out = [];
+        const fallback = engine.state.activeModel;
+        folded.forEach((gline, lineIndex) => {
+            const isGroup = 'group' in gline && gline.group !== undefined;
+            const key = isGroup ? `group-${lineIndex}` : `message-${lineIndex}`;
+            if (isGroup) {
+                out.push({
+                    key, role: 'tool',
+                    segments: [{ text: gline.text, dim: true }],
+                    label: labelFor('tool', undefined, 'group'), first: true,
+                });
+                return;
+            }
+            const line = gline;
+            const rendered = renderLineToRows(line, lineIndex, contentWidth, fallback);
+            out.push(...rendered);
+        });
+        return out;
+    }, [lines, contentWidth, engine.state.activeModel, groupsExpanded]);
     const planRows = taskQueue.length > 0 ? 6 + Math.min(6, taskQueue.length) : 0;
     const pickerGroups = new Set(pickerItems.map((item) => item.group)).size;
     const pickerRows = pickerOpen ? 6 + pickerItems.length + pickerGroups + (pickerError || pickerItems.length === 0 ? 1 : 0) : 0;
@@ -674,6 +985,8 @@ export function TerminalInterface({ engine }) {
     const visibleLiveRows = liveHeight > 0 ? liveRows.slice(-liveHeight) : [];
     const maxScroll = Math.max(0, allRows.length - storedHeight);
     maxScrollRef.current = maxScroll;
+    allRowsRef.current = allRows;
+    storedHeightRef.current = storedHeight;
     pageSizeRef.current = Math.max(1, storedHeight - 2);
     const boundedScroll = clamp(scrollOffset, 0, maxScroll);
     const endRow = allRows.length - boundedScroll;
@@ -712,6 +1025,17 @@ export function TerminalInterface({ engine }) {
         const id = setInterval(() => setNow(Date.now()), 250);
         return () => clearInterval(id);
     }, [busy]);
+    // Drain a prompt that was queued while the previous run was in flight.
+    useEffect(() => {
+        if (busy)
+            return;
+        const pending = queuedRef.current;
+        if (!pending)
+            return;
+        queuedRef.current = null;
+        setQueued(undefined);
+        startRun(pending.prompt, pending.attachSpec);
+    }, [busy]);
     return _jsxs(Box, { flexDirection: "column", width: width, height: terminalRows, paddingX: 2, overflow: "hidden", children: [_jsxs(Box, { justifyContent: "space-between", paddingY: 1, children: [_jsxs(Text, { bold: true, color: "cyan", children: ["OMNIHARNESS ", _jsxs(Text, { dimColor: true, children: ["\u00B7 ", mode, " mode"] })] }), _jsx(Text, { dimColor: true, children: "OMNIROUTE :20128" })] }), _jsxs(Box, { flexDirection: "column", height: messageHeight, overflow: "hidden", children: [lines.length === 0 && _jsxs(Box, { flexDirection: "column", marginTop: 2, children: [_jsx(Text, { color: "cyan", bold: true, children: "Ready when you are." }), _jsxs(Text, { dimColor: true, children: ["Describe the work. OmniHarness routes it through your OmniRoute account. Ctrl+", modeKey, " cycles plan \u00B7 build \u00B7 research \u00B7 crazy."] })] }), visibleRows.map((row, index) => row.saved
                         ? _jsx(Text, { dimColor: true, children: row.saved }, row.key)
                         : row.first
@@ -721,27 +1045,22 @@ export function TerminalInterface({ engine }) {
                         : _jsx(SegmentText, { segments: row.segments, role: row.role }, row.key)), toolCards.slice(-6).map((card) => {
                         const expanded = expandedTool === card.id;
                         const status = card.status === 'running' ? _jsx(Text, { color: PALETTE.warn, children: "\u2022 running" }) : card.status === 'error' ? _jsx(Text, { color: PALETTE.error, children: "\u2715 error" }) : _jsx(Text, { color: PALETTE.success, children: "\u2713 done" });
-                        const target = card.target ? ` · ${clip(card.target, Math.max(10, contentWidth - 40))}` : '';
+                        const head = card.name === 'run_command'
+                            ? `$ ${clip(card.target || '…', Math.max(10, contentWidth - 26))}`
+                            : `${toolVerb(card.name)}${card.target ? ` · ${clip(card.target, Math.max(10, contentWidth - 30))}` : ''}`;
                         const badge = expanded ? '▾' : '▸';
-                        return _jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: [badge, " ", card.name, target, " \u00B7 ", status, expanded ? '  ·  Ctrl+T to collapse' : ''] }), expanded && (card.trail
-                                    ? looksLikeDiff(card.trail)
-                                        ? diffSegments(card.trail, contentWidth).slice(0, 12).map((segments, index) => _jsx(SegmentText, { segments: segments, role: "tool" }, index))
-                                        // A file-edit trail is the new content; show it as added (green) lines.
-                                        : card.trail.split('\n').slice(0, 12).map((line, index) => _jsx(Text, { color: PALETTE.success, children: line }, index))
-                                    : card.summary
-                                        ? _jsx(Text, { dimColor: true, children: clip(card.summary, contentWidth) })
-                                        : _jsx(Text, { dimColor: true, children: "(no output)" }))] }, card.id);
-                    }), engine.state.preview && _jsxs(Text, { color: "green", dimColor: true, children: ["preview live \u00B7 ", engine.state.preview.url] }), busy && _jsxs(Text, { color: "cyan", children: [_jsx(Spinner, { type: "dots" }), " working in ", mode, " mode on ", engine.state.activeModel, currentTool ? ` · now ${currentTool}` : ''] })] }), taskQueue.length > 0 && _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 2, paddingY: 1, marginTop: 1, children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsx(Text, { bold: true, color: "cyan", children: "plan" }), _jsxs(Text, { dimColor: true, children: [taskQueue.filter((item) => item.status === 'done').length, "/", taskQueue.length, " done"] })] }), taskQueue.slice(-6).map((item) => {
+                        return _jsxs(Box, { flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: [badge, " ", head, " \u00B7 ", status, expanded ? '  ·  Ctrl+T to collapse' : ''] }), expanded && renderToolBody(card, contentWidth, PALETTE)] }, card.id);
+                    }), engine.state.preview && _jsxs(Text, { color: "green", dimColor: true, children: ["preview live \u00B7 ", engine.state.preview.url] }), busy && _jsxs(Text, { color: "cyan", children: [_jsx(Spinner, { type: "dots" }), " working in ", mode, " mode on ", engine.state.activeModel, currentTool ? ` · now ${currentTool}` : ''] }), queued && _jsxs(Text, { color: PALETTE.warn, children: ["\u23CE queued \u00B7 ", clip(queued, Math.max(12, contentWidth - 12))] })] }), taskQueue.length > 0 && _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "cyan", paddingX: 2, paddingY: 1, marginTop: 1, children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsx(Text, { bold: true, color: "cyan", children: "plan" }), _jsxs(Text, { dimColor: true, children: [taskQueue.filter((item) => item.status === 'done').length, "/", taskQueue.length, " done"] })] }), taskQueue.slice(-6).map((item) => {
                         const marker = item.status === 'done' ? '✓' : item.status === 'active' ? '▸' : '○';
                         const color = item.status === 'done' ? 'green' : item.status === 'active' ? 'cyan' : undefined;
                         return _jsxs(Text, { color: color, dimColor: item.status === 'done', children: [marker, " ", clip(item.title, contentWidth - 4)] }, item.id);
-                    })] }), pickerOpen && _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "magenta", paddingX: 2, paddingY: 1, children: [_jsx(Text, { bold: true, color: "magenta", children: "Choose an OmniRoute model" }), _jsx(Text, { dimColor: true, children: "\u2191\u2193 / j k navigate \u00B7 enter select \u00B7 esc close" }), pickerError && _jsx(Text, { color: "red", children: clip(pickerError, contentWidth) }), pickerItems.length === 0 && !pickerError && _jsx(Text, { dimColor: true, children: "No models returned by OmniRoute." }), pickerItems.map((item, index) => {
+                    })] }), sessionsOpen && _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "blue", paddingX: 2, paddingY: 1, children: [_jsx(Text, { bold: true, color: "blue", children: "Saved sessions" }), _jsx(Text, { dimColor: true, children: "\u2191\u2193 navigate \u00B7 enter resume \u00B7 esc close" }), sessionsList.map((session, index) => (_jsxs(Text, { color: index === sessionsIndex ? 'blue' : undefined, children: [index === sessionsIndex ? '› ' : '  ', session.name, session.savedAt ? _jsxs(Text, { dimColor: true, children: ["  \u00B7  ", session.savedAt] }) : null] }, session.name)))] }), pickerOpen && _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "magenta", paddingX: 2, paddingY: 1, children: [_jsx(Text, { bold: true, color: "magenta", children: "Choose an OmniRoute model" }), _jsx(Text, { dimColor: true, children: "\u2191\u2193 / j k navigate \u00B7 enter select \u00B7 esc close" }), pickerError && _jsx(Text, { color: "red", children: clip(pickerError, contentWidth) }), pickerItems.length === 0 && !pickerError && _jsx(Text, { dimColor: true, children: "No models returned by OmniRoute." }), pickerItems.map((item, index) => {
                         const header = index === 0 || pickerItems[index - 1].group !== item.group
                             ? _jsx(Text, { dimColor: true, bold: true, children: item.group === 'combos' ? 'your combos' : 'auto engine' }, `h-${item.group}`)
                             : null;
                         return _jsxs(Box, { flexDirection: "column", children: [header, _jsxs(Text, { color: index === pickerIndex ? 'cyan' : undefined, children: [index === pickerIndex ? '› ' : '  ', item.id, item.strategy ? _jsxs(Text, { dimColor: true, children: ["  \u00B7 ", item.strategy] }) : null, item.id === engine.state.activeModel ? '  ✓' : ''] })] }, item.id);
-                    })] }), approval && _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 2, paddingY: 1, marginTop: 1, children: [_jsxs(Text, { bold: true, color: "yellow", children: ["Approve ", approval.tool, "?"] }), _jsxs(Text, { dimColor: true, children: ["args: ", clip(typeof approval.input === 'string' ? approval.input : JSON.stringify(approval.input), contentWidth)] }), _jsx(Text, { dimColor: true, children: "y approve \u00B7 n deny" })] }), _jsx(Box, { borderStyle: "round", borderColor: error ? 'red' : 'cyan', paddingX: 1, marginTop: 1, flexDirection: "column", children: edit.value === ''
+                    })] }), approval && _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "yellow", paddingX: 2, paddingY: 1, marginTop: 1, children: [_jsxs(Text, { bold: true, color: "yellow", children: ["Approve ", approval.tool, "?"] }), _jsxs(Text, { dimColor: true, children: ["args: ", clip(JSON.stringify(approval.input), contentWidth)] }), approval.scopes.map((scope, index) => _jsxs(Text, { dimColor: true, children: ["  ", index + 1, " \u00B7 ", clip(scope.label, Math.max(12, contentWidth - 6))] }, scope.id)), _jsxs(Text, { dimColor: true, children: ["y allow once \u00B7 n deny \u00B7 t always allow \u00B7 1\u2013", approval.scopes.length, " pick a trust scope"] })] }), layoutDebug && _jsxs(Box, { flexDirection: "column", borderStyle: "round", borderColor: "gray", paddingX: 2, children: [_jsxs(Text, { bold: true, dimColor: true, children: ["layout \u00B7 ", width, "\u00D7", terminalRows, " \u00B7 Ctrl+L to hide"] }), _jsxs(Text, { dimColor: true, children: ["chrome ", chromeRows, " \u00B7 input ", inputRows, " \u00B7 plan ", planRows, " \u00B7 overlay ", pickerRows + approvalRows, " \u00B7 caps ", kitty !== null ? 1 : 0] }), _jsxs(Text, { dimColor: true, children: ["message ", messageHeight, " = stored ", storedHeight, " + live ", liveHeight, " + status ", statusRows] }), _jsxs(Text, { dimColor: true, children: ["transcript rows ", allRows.length, " \u00B7 scroll ", boundedScroll, "/", maxScroll, " \u00B7 page ", pageSizeRef.current] })] }), _jsx(Box, { borderStyle: "round", borderColor: error ? 'red' : 'cyan', paddingX: 1, marginTop: 1, flexDirection: "column", children: edit.value === ''
                     ? _jsxs(Text, { color: "cyan", children: ["\u203A ", _jsx(Text, { dimColor: true, children: "type a task and press enter" })] })
-                    : editorLayout.lines.map((text, index) => _jsxs(Text, { color: "cyan", children: [index === 0 ? '› ' : '  ', text] }, index)) }), kitty !== null && _jsx(Text, { dimColor: true, children: kitty ? 'kitty protocol active — Shift+Enter makes a new line' : 'this terminal can\'t distinguish Shift+Enter from Enter — use Ctrl+J for a new line' }), _jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Text, { color: busy ? PALETTE.info : PALETTE.muted, children: [busy && _jsx(Spinner, { type: "dots" }), phase, elapsed ? ` · ${elapsed}` : ''] }), _jsx(Text, { color: PALETTE.muted, children: [engine.state.activeModel, mode, contextLabel, scrollStatus].filter(Boolean).join(' · ') })] }), _jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Text, { dimColor: true, children: ["Enter send \u00B7 Shift+Enter/Ctrl+J new line \u00B7 Ctrl+O models \u00B7 Ctrl+", modeKey, " mode \u00B7 Ctrl+C cancel/quit \u00B7 /help \u00B7 Ctrl+T tool"] }), hud.length > 0 && _jsx(Text, { dimColor: true, children: hud.join(' · ') })] })] })] });
+                    : editorLayout.lines.map((text, index) => _jsxs(Text, { color: "cyan", children: [index === 0 ? '› ' : '  ', text] }, index)) }), kitty !== null && _jsx(Text, { dimColor: true, children: kitty ? 'kitty protocol active — Shift+Enter makes a new line' : 'this terminal can\'t distinguish Shift+Enter from Enter — use Ctrl+J for a new line' }), _jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Text, { color: busy ? PALETTE.info : PALETTE.muted, children: [busy && _jsx(Spinner, { type: "dots" }), phase, elapsed ? ` · ${elapsed}` : ''] }), _jsxs(Text, { color: PALETTE.muted, children: [engine.state.activeModel, " \u00B7 ", mode, contextLabel ? _jsxs(Text, { color: meterColor, children: [" \u00B7 ", contextLabel] }) : null, " \u00B7 ", scrollStatus] })] }), _jsxs(Box, { justifyContent: "space-between", children: [_jsxs(Text, { dimColor: true, children: ["Enter send \u00B7 Ctrl+J new line \u00B7 Ctrl+O models \u00B7 Ctrl+", modeKey, " mode \u00B7 Ctrl+T tool \u00B7 Ctrl+Y copy \u00B7 Ctrl+L layout \u00B7 Ctrl+C cancel/quit \u00B7 /help"] }), hud.length > 0 && _jsx(Text, { dimColor: true, children: hud.join(' · ') })] })] })] });
 }
 //# sourceMappingURL=terminalInterface.js.map