cmdr-agent 2.5.0 → 2.5.2

package/dist/bin/cmdr.js

@@ -7,43 +7,133 @@
  */
 import { parseArgs, printHelp } from '../src/cli/args.js';
 import { startRepl } from '../src/cli/repl.js';
-import { GREEN, PURPLE, DIM, renderError, WHITE, CYAN } from '../src/cli/theme.js';
+import { GREEN, PURPLE, DIM, renderError, CYAN } from '../src/cli/theme.js';
 import { OllamaAdapter } from '../src/llm/ollama.js';
 import { checkForUpdate } from '../src/cli/update-checker.js';
 import * as readline from 'readline';
+import chalk from 'chalk';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
-const { version: VERSION } = require('../package.json');
+const { version: VERSION } = require('../../package.json');
+function isRecommendedModel(modelName) {
+    const name = modelName.toLowerCase();
+    return name.includes('coder') || name.includes('code') || name.includes('deepseek');
+}
+function defaultModelIndex(models) {
+    const recommended = models.findIndex(isRecommendedModel);
+    return recommended >= 0 ? recommended : 0;
+}
 /** Prompt user to pick a model from the list. */
 function promptModelSelection(models) {
+    const fallbackIndex = defaultModelIndex(models);
+    if (!process.stdin.isTTY ||
+        !process.stdout.isTTY ||
+        typeof process.stdin.setRawMode !== 'function') {
+        console.log(`  ${DIM('Non-interactive terminal detected, using:')} ${GREEN(models[fallbackIndex])}`);
+        return Promise.resolve(models[fallbackIndex]);
+    }
     return new Promise((resolve) => {
-        console.log('');
-        console.log(`  ${PURPLE.bold('Available models')}`);
-        console.log('');
-        for (let i = 0; i < models.length; i++) {
-            const label = models[i].toLowerCase().includes('coder')
-                ? `${WHITE(models[i])} ${DIM('(recommended)')}`
-                : WHITE(models[i]);
-            console.log(`  ${GREEN(`${i + 1}.`)} ${label}`);
-        }
-        console.log('');
-        const rl = readline.createInterface({
-            input: process.stdin,
-            output: process.stdout,
-            terminal: true,
-        });
-        rl.question(`  ${CYAN('Select model')} ${DIM(`[1-${models.length}]`)}: `, (answer) => {
-            rl.close();
-            const idx = parseInt(answer.trim(), 10) - 1;
-            if (idx >= 0 && idx < models.length) {
-                resolve(models[idx]);
+        const stdin = process.stdin;
+        const stdout = process.stdout;
+        const wasRaw = Boolean(stdin.isRaw);
+        let selected = fallbackIndex;
+        let renderedLines = 0;
+        const clearRendered = () => {
+            if (renderedLines <= 0)
+                return;
+            readline.moveCursor(stdout, 0, -renderedLines);
+            readline.clearScreenDown(stdout);
+            renderedLines = 0;
+        };
+        const renderMenu = () => {
+            clearRendered();
+            const menuWidth = process.stdout.columns || 80;
+            const maxModelWidth = Math.max(14, menuWidth - 24);
+            const compact = (value) => {
+                if (value.length <= maxModelWidth)
+                    return value;
+                return `${value.slice(0, Math.max(1, maxModelWidth - 3))}...`;
+            };
+            const lines = [
+                '',
+                `  ${PURPLE.bold('Model Matrix')}`,
+                `  ${DIM('Use ↑/↓ to target, Enter to initialize')}`,
+                '',
+            ];
+            for (let i = 0; i < models.length; i++) {
+                const isActive = i === selected;
+                const isRecommended = isRecommendedModel(models[i]);
+                const pointer = isActive ? CYAN.bold('▶') : DIM('·');
+                const ordinal = DIM(`${String(i + 1).padStart(2, ' ')}.`);
+                const modelName = compact(models[i]);
+                const modelLabel = isActive
+                    ? chalk.bgHex('#11303A').hex('#B7FFE3').bold(` ${modelName} `)
+                    : DIM(modelName);
+                const recommendation = isRecommended
+                    ? isActive
+                        ? ` ${GREEN('●')} ${DIM('recommended')}`
+                        : ` ${DIM('· recommended')}`
+                    : '';
+                lines.push(`  ${pointer} ${ordinal} ${modelLabel}${recommendation}`);
             }
-            else {
-                // Default to first model on invalid input
-                console.log(`  ${DIM('Invalid selection, using:')} ${GREEN(models[0])}`);
-                resolve(models[0]);
+            lines.push('');
+            lines.push(`  ${DIM('Esc picks default:')} ${GREEN(models[fallbackIndex])}`);
+            stdout.write(lines.join('\n'));
+            renderedLines = lines.length;
+        };
+        const cleanup = () => {
+            stdin.off('keypress', onKeypress);
+            if (typeof stdin.setRawMode === 'function') {
+                stdin.setRawMode(wasRaw);
             }
-        });
+            stdin.pause();
+            stdout.write('\x1B[?25h');
+        };
+        const finish = (chosenModel, statusLine) => {
+            cleanup();
+            clearRendered();
+            console.log(statusLine);
+            resolve(chosenModel);
+        };
+        const onKeypress = (input, key) => {
+            if (key.ctrl && key.name === 'c') {
+                cleanup();
+                clearRendered();
+                stdout.write('\n');
+                process.exit(130);
+            }
+            if (key.name === 'up') {
+                selected = (selected - 1 + models.length) % models.length;
+                renderMenu();
+                return;
+            }
+            if (key.name === 'down') {
+                selected = (selected + 1) % models.length;
+                renderMenu();
+                return;
+            }
+            if (key.name === 'return') {
+                finish(models[selected], `  ${DIM('Selected model:')} ${GREEN(models[selected])}`);
+                return;
+            }
+            if (key.name === 'escape') {
+                finish(models[fallbackIndex], `  ${DIM('Using default model:')} ${GREEN(models[fallbackIndex])}`);
+                return;
+            }
+            if (input && /^\d$/.test(input)) {
+                const idx = parseInt(input, 10) - 1;
+                if (idx >= 0 && idx < models.length) {
+                    selected = idx;
+                    renderMenu();
+                }
+            }
+        };
+        readline.emitKeypressEvents(stdin);
+        stdin.setRawMode?.(true);
+        stdin.resume();
+        stdout.write('\x1B[?25l');
+        stdin.on('keypress', onKeypress);
+        renderMenu();
     });
 }
 async function main() {

package/dist/bin/cmdr.js.map

@@ -1 +1 @@
-{"version":3,"file":"cmdr.js","sourceRoot":"","sources":["../../bin/cmdr.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"cmdr.js","sourceRoot":"","sources":["../../bin/cmdr.ts"],"names":[],"mappings":"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"}

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cmdr-agent",
-  "version": "2.5.0",
+  "version": "2.5.2",
   "description": "Open-source multi-agent coding tool for your terminal. Powered by Ollama.",
   "type": "module",
   "bin": {
@@ -34,18 +34,23 @@
   },
   "dependencies": {
     "chalk": "^5.3.0",
-    "ink": "^5.2.1",
+    "highlight.js": "^11.11.1",
+    "ink": "npm:@jrichman/ink@6.6.7",
+    "ink-spinner": "^5.0.0",
     "ink-text-input": "^6.0.0",
+    "lowlight": "^3.3.0",
     "marked": "^14.0.0",
     "marked-terminal": "^7.2.0",
     "ora": "^8.0.0",
-    "react": "^18.3.1",
+    "react": "^19.2.0",
     "smol-toml": "^1.6.1",
+    "string-width": "^8.1.0",
+    "strip-ansi": "^7.1.0",
     "zod": "^3.23.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",
-    "@types/react": "^18.3.28",
+    "@types/react": "^19.2.2",
     "tsx": "^4.21.0",
     "typescript": "^5.6.0",
     "vitest": "^2.1.0"

package/dist/src/cli/ink/App.d.ts

@@ -2,8 +2,8 @@
  * Ink-based REPL application — replaces raw readline.
  *
  * Architecture:
- * - <Static> renders all past output (scrollback, never re-rendered)
- * - Dynamic section: active spinner OR input prompt
+ * - Windowed transcript viewport for bounded scrollback rendering
+ * - Dynamic section: active spinner, approval prompts, and input composer
  * - State machine: idle | processing | waiting_approval | exiting
  */
 import React from 'react';

package/dist/src/cli/ink/App.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink/App.tsx"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAmD,MAAM,OAAO,CAAA;AAGvE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAClE,OAAO,KAAK,EAAE,UAAU,EAAkE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AACjI,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAI9D,OAAO,EACsD,cAAc,EAC1E,MAAM,sCAAsC,CAAA;AAE7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAA;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AAoEvE,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,cAAc,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;IACb,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,OAAO,EAAE,UAAU,CAAA;IACnB,YAAY,EAAE,YAAY,CAAA;IAC1B,gBAAgB,CAAC,EAAE,UAAU,CAAA;IAC7B,WAAW,EAAE,WAAW,CAAA;IACxB,WAAW,EAAE,WAAW,CAAA;IACxB,aAAa,EAAE,aAAa,CAAA;IAC5B,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,EAAE,YAAY,CAAA;IAC1B,aAAa,EAAE,aAAa,CAAA;IAC5B,aAAa,EAAE,aAAa,CAAA;IAC5B,aAAa,EAAE,aAAa,CAAA;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3B,SAAS,EAAE,cAAc,CAAA;IACzB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAoED,MAAM,CAAC,OAAO,UAAU,GAAG,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,CAAC,YAAY,CAm/BlE"}
+{"version":3,"file":"App.d.ts","sourceRoot":"","sources":["../../../../src/cli/ink/App.tsx"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAA4D,MAAM,OAAO,CAAA;AAGhF,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAA;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AACtE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAA;AAClE,OAAO,KAAK,EAAE,UAAU,EAAkE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AACjI,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAA;AAI9D,OAAO,EACsD,cAAc,EAC1E,MAAM,sCAAsC,CAAA;AAE7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAA;AAChE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAA;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAC3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAA;AAqEvE,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,cAAc,CAAA;IACvB,KAAK,EAAE,MAAM,CAAA;IACb,iBAAiB,EAAE,iBAAiB,CAAA;IACpC,OAAO,EAAE,UAAU,CAAA;IACnB,YAAY,EAAE,YAAY,CAAA;IAC1B,gBAAgB,CAAC,EAAE,UAAU,CAAA;IAC7B,WAAW,EAAE,WAAW,CAAA;IACxB,WAAW,EAAE,WAAW,CAAA;IACxB,aAAa,EAAE,aAAa,CAAA;IAC5B,SAAS,EAAE,SAAS,CAAA;IACpB,YAAY,EAAE,YAAY,CAAA;IAC1B,aAAa,EAAE,aAAa,CAAA;IAC5B,aAAa,EAAE,aAAa,CAAA;IAC5B,aAAa,EAAE,aAAa,CAAA;IAC5B,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC3B,SAAS,EAAE,cAAc,CAAA;IACzB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAoED,MAAM,CAAC,OAAO,UAAU,GAAG,CAAC,KAAK,EAAE,WAAW,GAAG,KAAK,CAAC,YAAY,CAyjClE"}

package/dist/src/cli/ink/App.js

@@ -3,12 +3,12 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * Ink-based REPL application — replaces raw readline.
  *
  * Architecture:
- * - <Static> renders all past output (scrollback, never re-rendered)
- * - Dynamic section: active spinner OR input prompt
+ * - Windowed transcript viewport for bounded scrollback rendering
+ * - Dynamic section: active spinner, approval prompts, and input composer
  * - State machine: idle | processing | waiting_approval | exiting
  */
-import { useState, useCallback, useEffect, useRef } from 'react';
-import { Box, Text, Static, useApp, useInput } from 'ink';
+import { useState, useCallback, useEffect, useMemo, useRef } from 'react';
+import { Box, Text, useApp, useInput } from 'ink';
 import TextInput from 'ink-text-input';
 import { getDefaultContextLength } from '../../llm/model-registry.js';
 import { isSlashCommand, parseSlashCommand, getCommand } from '../commands.js';
@@ -16,20 +16,11 @@ import { saveSession, loadSession, } from '../../session/session-persistence.js'
 import { getTeamPreset } from '../../core/presets.js';
 import { listAvailableServers, getServerDefinition, toMcpConfig, getMissingEnvVars } from '../../config/mcp-registry.js';
 import StatusBar from './StatusBar.js';
-// We use chalk directly for coloring since Ink <Text> color props are limited
-import chalk from 'chalk';
-const GREEN = chalk.hex('#00FF41');
-const GREEN_DIM = chalk.hex('#00BB30');
-const PURPLE = chalk.hex('#BF40FF');
-const CYAN = chalk.hex('#00FFFF');
-const DIM = chalk.hex('#555555');
-const WHITE = chalk.hex('#E0E0E0');
-const YELLOW = chalk.hex('#FFD700');
-const RED = chalk.hex('#FF3333');
+import PromptInput from './PromptInput.js';
+import { StreamingMarkdownRenderer } from '../renderer.js';
+import { GREEN, PURPLE, CYAN, DIM, WHITE, YELLOW, RED, SEPARATOR, } from '../theme.js';
 const SUCCESS_SYM = GREEN('✓');
 const ERROR_SYM = RED('✗');
-const TOOL_SYM = CYAN('⚡');
-const SEPARATOR = GREEN_DIM('─'.repeat(60));
 // ---------------------------------------------------------------------------
 // Verb pool for spinner
 // ---------------------------------------------------------------------------
@@ -57,6 +48,7 @@ function toPastTense(verb) {
     }
     return stem + 'ed';
 }
+const MAX_OUTPUT_LINES = 6000;
 // ---------------------------------------------------------------------------
 // Tool result summary
 // ---------------------------------------------------------------------------
@@ -116,8 +108,8 @@ export default function App(props) {
     const { agent, session, permissionManager, adapter, orchestrator, costTracker, undoManager, pluginManager, mcpClient, toolRegistry, agentRegistry, commandLoader, taskScheduler, ollamaUrl, verbose, doSave, autoSaver, } = props;
     const { exit } = useApp();
     const [state, setState] = useState('idle');
-    const [inputValue, setInputValue] = useState('');
     const [outputLines, setOutputLines] = useState([]);
+    const [historyScrollOffset, setHistoryScrollOffset] = useState(0);
     const [spinnerText, setSpinnerText] = useState('');
     const [approval, setApproval] = useState(null);
     const [approvalInput, setApprovalInput] = useState('');
@@ -137,42 +129,73 @@ export default function App(props) {
     }, [state]);
     // Append output to scrollback
     const appendOutput = useCallback((text) => {
-        setOutputLines(prev => [...prev, { id: nextId(), text }]);
+        setHistoryScrollOffset(0);
+        setOutputLines(prev => {
+            const next = [...prev, { id: nextId(), text }];
+            return next.length > MAX_OUTPUT_LINES ? next.slice(next.length - MAX_OUTPUT_LINES) : next;
+        });
     }, []);
     // Append multiple lines at once
     const appendLines = useCallback((lines) => {
-        setOutputLines(prev => [
-            ...prev,
-            ...lines.map(text => ({ id: nextId(), text })),
-        ]);
+        if (lines.length === 0)
+            return;
+        setHistoryScrollOffset(0);
+        setOutputLines(prev => {
+            const next = [
+                ...prev,
+                ...lines.map(text => ({ id: nextId(), text })),
+            ];
+            return next.length > MAX_OUTPUT_LINES ? next.slice(next.length - MAX_OUTPUT_LINES) : next;
+        });
     }, []);
+    const appendRenderedMarkdown = useCallback((rendered) => {
+        if (!rendered)
+            return;
+        const prefixed = rendered
+            .split('\n')
+            .map((line) => `  ${PURPLE('│')} ${line}`);
+        appendLines(prefixed);
+    }, [appendLines]);
+    const terminalRows = process.stdout.rows || 42;
+    const reservedRows = state === 'idle' ? 9 : state === 'waiting_approval' ? 13 : 6;
+    const historyWindowSize = Math.max(8, terminalRows - reservedRows);
+    const visibleOutputLines = useMemo(() => {
+        const end = Math.max(0, outputLines.length - historyScrollOffset);
+        const start = Math.max(0, end - historyWindowSize);
+        return outputLines.slice(start, end);
+    }, [outputLines, historyScrollOffset, historyWindowSize]);
     // ---------------------------------------------------------------------------
     // Spinner management
     // ---------------------------------------------------------------------------
     const spinnerRef = useRef(null);
     const verbRef = useRef(pickVerb());
     const spinnerStartRef = useRef(0);
+    const turnStartRef = useRef(0);
+    const lastVerbRotateSecondRef = useRef(0);
     const spinnerFrameRef = useRef(0);
     const SPINNER_FRAMES = ['◇ ', '◈ ', '◆ ', '◈ '];
     const startSpinner = useCallback((mode, toolName) => {
         stopSpinnerFn();
         spinnerStartRef.current = Date.now();
         verbRef.current = pickVerb();
+        lastVerbRotateSecondRef.current = 0;
         spinnerFrameRef.current = 0;
+        if (mode === 'tool') {
+            setSpinnerText(`  ${CYAN('⚡')} ${CYAN(toolName ?? 'tool')} ${DIM('executing...')}`);
+            return;
+        }
         const update = () => {
             spinnerFrameRef.current = (spinnerFrameRef.current + 1) % SPINNER_FRAMES.length;
             const frame = SPINNER_FRAMES[spinnerFrameRef.current];
             const elapsed = Math.round((Date.now() - spinnerStartRef.current) / 1000);
-            if (mode === 'thinking') {
-                // Rotate verb every ~3s
-                if (elapsed > 0 && elapsed % 3 === 0) {
-                    verbRef.current = pickVerb();
-                }
-                setSpinnerText(`  ${PURPLE(frame)}${PURPLE(verbRef.current + '...')} ${DIM(`(${elapsed}s)`)}`);
-            }
-            else {
-                setSpinnerText(`  ${CYAN('⚡')} ${CYAN(toolName ?? 'tool')} ${DIM('executing...')}`);
+            // Rotate verb every ~3s, once per threshold crossing.
+            if (elapsed > 0 &&
+                elapsed % 3 === 0 &&
+                elapsed !== lastVerbRotateSecondRef.current) {
+                verbRef.current = pickVerb();
+                lastVerbRotateSecondRef.current = elapsed;
             }
+            setSpinnerText(`  ${PURPLE(frame)}${PURPLE(verbRef.current + '...')} ${DIM(`(${elapsed}s)`)}`);
         };
         update();
         spinnerRef.current = setInterval(update, 120);
@@ -185,7 +208,8 @@ export default function App(props) {
         setSpinnerText('');
     }, []);
     const getCompletionSummary = useCallback(() => {
-        const elapsed = Math.round((Date.now() - spinnerStartRef.current) / 1000);
+        const start = turnStartRef.current || spinnerStartRef.current;
+        const elapsed = Math.round((Date.now() - start) / 1000);
         return `${toPastTense(verbRef.current)} for ${elapsed}s`;
     }, []);
     // ---------------------------------------------------------------------------
@@ -228,10 +252,14 @@ export default function App(props) {
     // Handle user message (streaming)
     // ---------------------------------------------------------------------------
     const handleUserMessage = useCallback(async (message) => {
+        turnStartRef.current = Date.now();
         appendOutput('');
         startSpinner('thinking');
-        let fullOutput = '';
+        const streamRenderer = new StreamingMarkdownRenderer({
+            width: Math.max(60, (process.stdout.columns || 96) - 8),
+        });
         let firstText = true;
+        let hadTextOutput = false;
         let currentTool = '';
         let currentToolInput = {};
         let toolCallCount = 0;
@@ -275,27 +303,22 @@ export default function App(props) {
                             firstText = false;
                         }
                         const chunk = event.data;
-                        fullOutput += chunk;
-                        // Stream text by appending to the last output line
-                        // We'll accumulate and print at the end for cleaner output
+                        const rendered = streamRenderer.push(chunk);
+                        if (rendered) {
+                            hadTextOutput = true;
+                            appendRenderedMarkdown(rendered);
+                        }
                         break;
                     }
                     case 'tool_use': {
                         stopSpinnerFn();
-                        if (!firstText) {
-                            // Flush accumulated text — strip raw tool_call/thought blocks
-                            if (fullOutput) {
-                                let displayText = fullOutput;
-                                displayText = displayText.replace(/```tool_call[\s\S]*?```/g, '').trim();
-                                displayText = displayText.replace(/```thought[\s\S]*?```/g, '').trim();
-                                if (displayText) {
-                                    const formatted = displayText.split('\n').map(l => `  ${PURPLE('│')} ${l}`).join('\n');
-                                    appendOutput(formatted);
-                                }
-                                fullOutput = '';
-                            }
-                            firstText = true;
+                        const rendered = streamRenderer.flush();
+                        if (rendered) {
+                            hadTextOutput = true;
+                            appendRenderedMarkdown(rendered);
+                            appendOutput('');
                         }
+                        firstText = true;
                         const block = event.data;
                         currentTool = block.name;
                         currentToolInput = block.input;
@@ -337,6 +360,11 @@ export default function App(props) {
                         break;
                     }
                     case 'done': {
+                        const rendered = streamRenderer.flush();
+                        if (rendered) {
+                            hadTextOutput = true;
+                            appendRenderedMarkdown(rendered);
+                        }
                         stopSpinnerFn();
                         break;
                     }
@@ -364,8 +392,9 @@ export default function App(props) {
                 // Retry once with compacted context
                 try {
                     startSpinner('thinking');
-                    fullOutput = '';
+                    streamRenderer.reset();
                     firstText = true;
+                    hadTextOutput = false;
                     for await (const event of agent.stream('', callbacks, abortController.signal)) {
                         switch (event.type) {
                             case 'text': {
@@ -373,11 +402,21 @@ export default function App(props) {
                                     stopSpinnerFn();
                                     firstText = false;
                                 }
-                                fullOutput += event.data;
+                                const rendered = streamRenderer.push(event.data);
+                                if (rendered) {
+                                    hadTextOutput = true;
+                                    appendRenderedMarkdown(rendered);
+                                }
                                 break;
                             }
                             case 'tool_use': {
                                 stopSpinnerFn();
+                                const rendered = streamRenderer.flush();
+                                if (rendered) {
+                                    hadTextOutput = true;
+                                    appendRenderedMarkdown(rendered);
+                                    appendOutput('');
+                                }
                                 const block = event.data;
                                 currentTool = block.name;
                                 currentToolInput = block.input;
@@ -412,6 +451,11 @@ export default function App(props) {
                             }
                         }
                     }
+                    const retryRemainder = streamRenderer.flush();
+                    if (retryRemainder) {
+                        hadTextOutput = true;
+                        appendRenderedMarkdown(retryRemainder);
+                    }
                 }
                 catch (retryErr) {
                     stopSpinnerFn();
@@ -426,17 +470,12 @@ export default function App(props) {
                 appendOutput(`\n  ${ERROR_SYM} ${RED.bold(msg)}\n`);
             }
         }
-        // Flush remaining text — strip raw tool_call/thought blocks from display
-        if (fullOutput) {
-            let displayText = fullOutput;
-            displayText = displayText.replace(/```tool_call[\s\S]*?```/g, '').trim();
-            displayText = displayText.replace(/```thought[\s\S]*?```/g, '').trim();
-            if (displayText) {
-                const formatted = displayText.split('\n').map(l => `  ${PURPLE('│')} ${l}`).join('\n');
-                appendOutput(formatted);
-            }
+        const remainder = streamRenderer.flush();
+        if (remainder) {
+            hadTextOutput = true;
+            appendRenderedMarkdown(remainder);
         }
-        if (fullOutput || !firstText) {
+        if (hadTextOutput || !firstText) {
             appendOutput('');
         }
         // Turn summary
@@ -467,11 +506,12 @@ export default function App(props) {
         appendOutput(SEPARATOR);
         appendOutput('');
     }, [agent, session, adapter, costTracker, undoManager, verbose, autoSaver, doSave,
-        appendOutput, startSpinner, stopSpinnerFn, getCompletionSummary]);
+        appendOutput, appendRenderedMarkdown, startSpinner, stopSpinnerFn, getCompletionSummary]);
     // ---------------------------------------------------------------------------
     // Handle team message
     // ---------------------------------------------------------------------------
     const handleTeamMessage = useCallback(async (goal, teamConfig) => {
+        turnStartRef.current = Date.now();
         appendOutput('');
         appendOutput(`  ${PURPLE('◈')} Running team ${PURPLE.bold(teamConfig.name)} with ${teamConfig.agents.length} agents...`);
         appendOutput('');
@@ -872,7 +912,6 @@ export default function App(props) {
     // ---------------------------------------------------------------------------
     const handleSubmit = useCallback(async (value) => {
         const input = value.trim();
-        setInputValue('');
         if (!input)
             return;
         if (stateRef.current !== 'idle')
@@ -946,6 +985,20 @@ export default function App(props) {
     // Keyboard input handling (Ctrl+C, Ctrl+D)
     // ---------------------------------------------------------------------------
     useInput((input, key) => {
+        const maxScrollOffset = Math.max(0, outputLines.length - historyWindowSize);
+        const pageStep = Math.max(1, Math.floor(historyWindowSize * 0.7));
+        if (key.pageUp) {
+            setHistoryScrollOffset((prev) => Math.min(maxScrollOffset, prev + pageStep));
+            return;
+        }
+        if (key.pageDown) {
+            setHistoryScrollOffset((prev) => Math.max(0, prev - pageStep));
+            return;
+        }
+        if (key.escape && historyScrollOffset > 0) {
+            setHistoryScrollOffset(0);
+            return;
+        }
         // Ctrl+C handling
         if (key.ctrl && input === 'c') {
             const now = Date.now();
@@ -1015,11 +1068,11 @@ export default function App(props) {
     // ---------------------------------------------------------------------------
     // Render
     // ---------------------------------------------------------------------------
-    return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Static, { items: outputLines, children: (line) => (_jsx(Text, { children: line.text }, line.id)) }), state === 'processing' && spinnerText && (_jsx(Text, { children: spinnerText })), state === 'waiting_approval' && approval && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: '' }), _jsx(Text, { children: `  ${YELLOW('⚠')}  ${WHITE('Tool approval required')} ${DIM('[')}${approval.riskLevel === 'dangerous' ? RED(approval.riskLevel.toUpperCase()) : YELLOW(approval.riskLevel.toUpperCase())}${DIM(']')}` }), _jsx(Text, { children: `  ${DIM('Tool:')}  ${CYAN(approval.toolName)}` }), Object.entries(approval.input).map(([key, val]) => {
+    return (_jsxs(Box, { flexDirection: "column", height: terminalRows, children: [_jsx(Box, { flexDirection: "column", flexGrow: 1, overflow: "hidden", children: visibleOutputLines.map((line) => (_jsx(Text, { children: line.text }, line.id))) }), historyScrollOffset > 0 && (_jsx(Text, { children: `  ${DIM('Scrollback')} ${WHITE(String(historyScrollOffset))} ${DIM('(PgUp/PgDn, Esc to jump to live)')}` })), state === 'processing' && spinnerText && (_jsx(Text, { children: spinnerText })), state === 'waiting_approval' && approval && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: '' }), _jsx(Text, { children: `  ${YELLOW('⚠')}  ${WHITE('Tool approval required')} ${DIM('[')}${approval.riskLevel === 'dangerous' ? RED(approval.riskLevel.toUpperCase()) : YELLOW(approval.riskLevel.toUpperCase())}${DIM(']')}` }), _jsx(Text, { children: `  ${DIM('Tool:')}  ${CYAN(approval.toolName)}` }), Object.entries(approval.input).map(([key, val]) => {
                         const display = typeof val === 'string'
                             ? val.length > 120 ? val.slice(0, 120) + DIM('...') : val
                             : JSON.stringify(val).slice(0, 120);
                         return _jsx(Text, { children: `  ${DIM(key + ':')}  ${WHITE(display)}` }, key);
-                    }), _jsx(Text, { children: '' }), _jsx(Text, { children: `  ${GREEN('y')}${DIM('es')}  ${DIM('/')}  ${RED('n')}${DIM('o')}  ${DIM('/')}  ${PURPLE('a')}${DIM('lways allow this tool')}` }), _jsxs(Box, { children: [_jsx(Text, { children: `  ${YELLOW('?')} ` }), _jsx(TextInput, { value: approvalInput, onChange: setApprovalInput, onSubmit: handleApprovalSubmit })] })] })), state === 'idle' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(StatusBar, { model: currentModelRef.current, tokensIn: tokensIn, tokensOut: tokensOut, turns: turnCount, agentCount: agentRegistry.list().length, permissionMode: permissionManager.getMode(), cwd: process.cwd(), gitBranch: props.gitBranch, contextPct: session.maxContextTokens ? Math.round((session.tokenCount / session.maxContextTokens) * 100) : 0, version: props.version }), _jsxs(Box, { children: [_jsxs(Text, { children: [GREEN.bold('❯'), " "] }), _jsx(TextInput, { value: inputValue, onChange: setInputValue, onSubmit: handleSubmit, placeholder: "Ask anything, @file to include, /help for commands" })] })] }))] }));
+                    }), _jsx(Text, { children: '' }), _jsx(Text, { children: `  ${GREEN('y')}${DIM('es')}  ${DIM('/')}  ${RED('n')}${DIM('o')}  ${DIM('/')}  ${PURPLE('a')}${DIM('lways allow this tool')}` }), _jsxs(Box, { children: [_jsx(Text, { children: `  ${YELLOW('?')} ` }), _jsx(TextInput, { value: approvalInput, onChange: setApprovalInput, onSubmit: handleApprovalSubmit })] })] })), _jsx(StatusBar, { model: currentModelRef.current, tokensIn: tokensIn, tokensOut: tokensOut, turns: turnCount, agentCount: agentRegistry.list().length, permissionMode: permissionManager.getMode(), cwd: process.cwd(), gitBranch: props.gitBranch, contextPct: session.maxContextTokens ? Math.round((session.tokenCount / session.maxContextTokens) * 100) : 0, version: props.version }), state === 'idle' && (_jsx(PromptInput, { onSubmit: handleSubmit, placeholder: "Ask anything, @file to include, /help for commands" }))] }));
 }
 //# sourceMappingURL=App.js.map