@phren/agent 0.1.3 → 0.1.5

package/dist/tui.js

@@ -14,60 +14,17 @@ import * as path from "node:path";
 import { execSync } from "node:child_process";
 import { loadInputMode, saveInputMode, savePermissionMode } from "./settings.js";
 import { createRequire } from "node:module";
+import { ESC, s, cols, stripAnsi, PERMISSION_COLORS, PERMISSION_ICONS, PERMISSION_LABELS, nextPermissionMode, permTag, formatToolInput, renderToolCall, } from "./tui/index.js";
+import { enterMenuMode as enterMenu, exitMenuMode as exitMenu, handleMenuKeypress as handleMenuKey, } from "./tui/index.js";
 const _require = createRequire(import.meta.url);
 const AGENT_VERSION = _require("../package.json").version;
-// ── ANSI helpers ─────────────────────────────────────────────────────────────
-const ESC = "\x1b[";
-const s = {
-    reset: `${ESC}0m`,
-    bold: (t) => `${ESC}1m${t}${ESC}0m`,
-    dim: (t) => `${ESC}2m${t}${ESC}0m`,
-    italic: (t) => `${ESC}3m${t}${ESC}0m`,
-    cyan: (t) => `${ESC}36m${t}${ESC}0m`,
-    green: (t) => `${ESC}32m${t}${ESC}0m`,
-    yellow: (t) => `${ESC}33m${t}${ESC}0m`,
-    red: (t) => `${ESC}31m${t}${ESC}0m`,
-    blue: (t) => `${ESC}34m${t}${ESC}0m`,
-    magenta: (t) => `${ESC}35m${t}${ESC}0m`,
-    gray: (t) => `${ESC}90m${t}${ESC}0m`,
-    invert: (t) => `${ESC}7m${t}${ESC}0m`,
-    // Gradient-style brand text
-    brand: (t) => `${ESC}1;35m${t}${ESC}0m`,
-};
-function cols() {
-    return process.stdout.columns || 80;
-}
-// ── Permission mode helpers ─────────────────────────────────────────────────
-const PERMISSION_MODES = ["suggest", "auto-confirm", "full-auto"];
-function nextPermissionMode(current) {
-    const idx = PERMISSION_MODES.indexOf(current);
-    return PERMISSION_MODES[(idx + 1) % PERMISSION_MODES.length];
-}
-const PERMISSION_LABELS = {
-    "suggest": "suggest",
-    "auto-confirm": "auto",
-    "full-auto": "full-auto",
-};
-const PERMISSION_ICONS = {
-    "suggest": "○",
-    "auto-confirm": "◐",
-    "full-auto": "●",
-};
-const PERMISSION_COLORS = {
-    "suggest": s.cyan,
-    "auto-confirm": s.green,
-    "full-auto": s.yellow,
-};
-function permTag(mode) {
-    return PERMISSION_COLORS[mode](`${PERMISSION_ICONS[mode]} ${mode}`);
-}
 // ── Status bar ───────────────────────────────────────────────────────────────
 function renderStatusBar(provider, project, turns, cost, permMode, agentCount) {
     const modeLabel = permMode ? PERMISSION_LABELS[permMode] : "";
     const agentTag = agentCount && agentCount > 0 ? ` A${agentCount}` : "";
-    // Left: brand + provider + project
+    // Left: brand + provider (skip project if it matches "phren" to avoid "phren · codex · phren")
     const parts = [" ◆ phren", provider];
-    if (project)
+    if (project && project !== "phren")
         parts.push(project);
     const left = parts.join(" · ");
     // Right: mode + agents + cost + turns
@@ -84,62 +41,6 @@ function renderStatusBar(provider, project, turns, cost, permMode, agentCount) {
     const pad = Math.max(0, w - left.length - right.length);
     return s.invert(left + " ".repeat(pad) + right);
 }
-function stripAnsi(t) {
-    return t.replace(/\x1b\[[0-9;?]*[ -/]*[@-~]/g, "");
-}
-// ── Tool call rendering ──────────────────────────────────────────────────────
-const COMPACT_LINES = 3;
-function formatDuration(ms) {
-    if (ms < 1000)
-        return `${ms}ms`;
-    if (ms < 60_000)
-        return `${(ms / 1000).toFixed(1)}s`;
-    const mins = Math.floor(ms / 60_000);
-    const secs = Math.round((ms % 60_000) / 1000);
-    return `${mins}m ${secs}s`;
-}
-function formatToolInput(name, input) {
-    switch (name) {
-        case "read_file":
-        case "write_file":
-        case "edit_file": return input.file_path ?? "";
-        case "shell": return (input.command ?? "").slice(0, 60);
-        case "glob": return input.pattern ?? "";
-        case "grep": return `/${input.pattern ?? ""}/ ${input.path ?? ""}`;
-        case "git_commit": return (input.message ?? "").slice(0, 50);
-        case "phren_search": return input.query ?? "";
-        case "phren_add_finding": return (input.finding ?? "").slice(0, 50);
-        default: return JSON.stringify(input).slice(0, 60);
-    }
-}
-function renderToolCall(name, input, output, isError, durationMs) {
-    const preview = formatToolInput(name, input);
-    const dur = formatDuration(durationMs);
-    const icon = isError ? s.red("✗") : s.green("→");
-    const header = `  ${icon} ${s.bold(name)} ${s.gray(preview)}  ${s.dim(dur)}`;
-    // Compact: show first 3 lines only, with overflow count
-    const allLines = output.split("\n").filter(Boolean);
-    if (allLines.length === 0)
-        return header;
-    const shown = allLines.slice(0, COMPACT_LINES);
-    const body = shown.map((l) => s.dim(`    ${l.slice(0, cols() - 6)}`)).join("\n");
-    const overflow = allLines.length - COMPACT_LINES;
-    const more = overflow > 0 ? `\n${s.dim(`    ... +${overflow} lines`)}` : "";
-    return `${header}\n${body}${more}`;
-}
-// ── Menu mode helpers ────────────────────────────────────────────────────────
-let menuMod = null;
-async function loadMenuModule() {
-    if (!menuMod) {
-        try {
-            menuMod = await import("@phren/cli/shell/render-api");
-        }
-        catch {
-            menuMod = null;
-        }
-    }
-    return menuMod;
-}
 // ── Main TUI ─────────────────────────────────────────────────────────────────
 export async function startTui(config, spawner) {
     const contextLimit = config.provider.contextWindow ?? 200_000;
@@ -149,6 +50,7 @@ export async function startTui(config, spawner) {
     const startTime = Date.now();
     let inputMode = loadInputMode();
     let pendingInput = null;
+    const steerQueue = [];
     let running = false;
     let inputLine = "";
     let cursorPos = 0;
@@ -169,99 +71,68 @@ export async function startTui(config, spawner) {
     const inputHistory = [];
     let historyIndex = -1;
     let savedInput = "";
-    // ── Menu rendering ─────────────────────────────────────────────────────
-    async function renderMenu() {
-        const mod = await loadMenuModule();
-        if (!mod || !config.phrenCtx)
-            return;
-        const result = await mod.renderMenuFrame(config.phrenCtx.phrenPath, config.phrenCtx.profile, menuState);
-        menuListCount = result.listCount;
-        // Full-screen write: single write to avoid flicker
-        w.write(`${ESC}?25l${ESC}H${ESC}2J${result.output}${ESC}?25h`);
-    }
-    function enterMenuMode() {
-        if (!config.phrenCtx) {
-            w.write(s.yellow("  phren not configured — menu unavailable\n"));
-            return;
-        }
-        tuiMode = "menu";
-        menuState.project = config.phrenCtx.project ?? menuState.project;
-        w.write("\x1b[?1049h"); // enter alternate screen
-        renderMenu();
-    }
-    function exitMenuMode() {
-        tuiMode = "chat";
-        menuFilterActive = false;
-        menuFilterBuf = "";
-        w.write("\x1b[?1049l"); // leave alternate screen (restores chat)
-        setScrollRegion(); // re-establish scroll region after alt screen
-        statusBar();
-        prompt(true); // skip newline — alt screen restore already positioned cursor
+    // ── Menu context bridge ─────────────────────────────────────────────────
+    function getMenuCtx() {
+        return {
+            phrenCtx: config.phrenCtx ? {
+                phrenPath: config.phrenCtx.phrenPath,
+                profile: config.phrenCtx.profile,
+                project: config.phrenCtx.project ?? undefined,
+            } : undefined,
+            w,
+            menuState,
+            menuListCount,
+            menuFilterActive,
+            menuFilterBuf,
+            onExit: () => {
+                tuiMode = "chat";
+                statusBar();
+                prompt();
+            },
+            onStateChange: (st, lc, fa, fb) => {
+                menuState = st;
+                menuListCount = lc;
+                menuFilterActive = fa;
+                menuFilterBuf = fb;
+            },
+        };
     }
     // Print status bar
     function statusBar() {
-        if (!isTTY)
-            return;
-        const bar = renderStatusBar(config.provider.name, config.phrenCtx?.project ?? null, session.turns, costStr, config.registry.permissionConfig.mode, spawner?.listAgents().length);
-        w.write(`${ESC}s${ESC}H${bar}${ESC}u`); // save cursor, move to top, print, restore
+        // Intentionally empty — no top status bar. Info is in the bottom prompt area.
     }
-    // Print prompt — bordered input bar at bottom
+    // Print prompt — inline input bar (written at current cursor position)
     let bashMode = false;
-    function prompt(skipNewline = false) {
+    // Track how many lines the bottom bar occupies so we can clear it on submit
+    const PROMPT_LINES = 4; // separator, input, separator, permissions
+    function prompt() {
         if (!isTTY)
             return;
         const mode = config.registry.permissionConfig.mode;
         const color = PERMISSION_COLORS[mode];
         const icon = PERMISSION_ICONS[mode];
-        const rows = process.stdout.rows || 24;
         const c = cols();
-        if (!skipNewline) {
-            // Newline within the scroll region so content scrolls up naturally
-            cursorToScrollEnd();
-            w.write("\n");
-        }
-        // Draw the fixed bottom bar outside the scroll region.
-        // Temporarily reset DECSTBM so writes to rows (rows-4)..(rows) work.
-        w.write(`${ESC}r`); // reset scroll region temporarily
-        // Layout (bottom up): blank, permissions, separator, input, separator
         const sep = s.dim("─".repeat(c));
-        const permLine = `  ${color(`${icon} ${PERMISSION_LABELS[mode]} permissions`)} ${s.dim("(shift+tab to cycle)")}`;
-        w.write(`${ESC}${rows - 4};1H${ESC}2K${sep}`);
-        w.write(`${ESC}${rows - 3};1H${ESC}2K${bashMode ? `${s.yellow("!")} ` : `${s.dim("▸")} `}`);
-        w.write(`${ESC}${rows - 2};1H${ESC}2K${sep}`);
-        w.write(`${ESC}${rows - 1};1H${ESC}2K${permLine}`);
-        w.write(`${ESC}${rows};1H${ESC}2K`); // blank bottom row
-        // Re-establish scroll region and position cursor at the input line
-        setScrollRegion();
-        w.write(`${ESC}${rows - 3};${bashMode ? 3 : 4}H`);
+        const permLine = `  ${color(`${icon} ${PERMISSION_LABELS[mode]} permissions`)} ${s.dim("(shift+tab toggle · esc to interrupt)")}`;
+        // Write inline — this naturally sits at the bottom
+        w.write(`${sep}\n`);
+        w.write(`${bashMode ? `${s.yellow("!")} ` : `${s.dim("▸")} `}`);
+        w.write(`\n${sep}\n`);
+        w.write(`${permLine}\n`);
+        // Move cursor back up to the input line
+        w.write(`${ESC}${PROMPT_LINES - 1}A`); // move up to input line
+        w.write(`${ESC}${bashMode ? 3 : 4}G`); // move to column after prompt char
     }
     // Redraw the input line and position the terminal cursor at cursorPos
     function redrawInput() {
         w.write(`${ESC}2K\r`);
-        prompt(true);
+        w.write(`${bashMode ? `${s.yellow("!")} ` : `${s.dim("▸")} `}`);
         w.write(inputLine);
         // Move terminal cursor back from end to cursorPos
         const back = inputLine.length - cursorPos;
         if (back > 0)
             w.write(`${ESC}${back}D`);
     }
-    // ── Scroll region management ─────────────────────────────────────────
-    // DECSTBM: rows 1..(rows-5) scroll; bottom 5 rows are fixed for the input bar.
-    function setScrollRegion() {
-        if (!isTTY)
-            return;
-        const rows = process.stdout.rows || 24;
-        const scrollBottom = Math.max(1, rows - 5);
-        w.write(`${ESC}1;${scrollBottom}r`);
-    }
-    // Move cursor to the bottom of the scroll region so new output scrolls naturally.
-    function cursorToScrollEnd() {
-        if (!isTTY)
-            return;
-        const rows = process.stdout.rows || 24;
-        const scrollBottom = Math.max(1, rows - 5);
-        w.write(`${ESC}${scrollBottom};1H`);
-    }
     // Periodic status bar refresh (every 30s) — keeps cost/turns current during long tool runs
     const statusRefreshTimer = isTTY
         ? setInterval(() => { if (tuiMode === "chat")
@@ -273,7 +144,6 @@ export async function startTui(config, spawner) {
     function cleanupTerminal() {
         if (statusRefreshTimer)
             clearInterval(statusRefreshTimer);
-        w.write(`${ESC}r`); // reset scroll region
         w.write("\x1b[?1049l"); // leave alt screen if active
         if (process.stdin.isTTY) {
             try {
@@ -283,15 +153,8 @@ export async function startTui(config, spawner) {
         }
     }
     process.on("exit", cleanupTerminal);
-    // Re-establish scroll region on terminal resize.
-    // Node's "resize" event already fires on SIGWINCH — no separate signal handler needed.
-    process.stdout.on("resize", () => {
-        if (tuiMode === "chat") {
-            setScrollRegion();
-            statusBar();
-            prompt(true);
-        }
-    });
+    // Terminal resize: do nothing — scrollback text reflows naturally.
+    // The Ink TUI handles resize via React re-render. Legacy TUI just lets it be.
     // Setup: clear screen, status bar at top, content area clean
     if (isTTY) {
         w.write(`${ESC}2J${ESC}H`); // clear entire screen + home
@@ -312,7 +175,7 @@ export async function startTui(config, spawner) {
             `${s.dim(config.provider.name)}${project ? s.dim(` · ${project}`) : ""}`,
             `${s.dim(cwd)}`,
             ``,
-            `${permTag(permMode)} ${s.dim("permissions (shift+tab to cycle)")}`,
+            `${permTag(permMode)} ${s.dim("permissions (shift+tab toggle · esc to interrupt)")}`,
             ``,
             `${s.dim("Tab")} memory  ${s.dim("Shift+Tab")} perms  ${s.dim("/help")} cmds  ${s.dim("Ctrl+D")} exit`,
         ];
@@ -329,7 +192,6 @@ export async function startTui(config, spawner) {
             w.write(`\n  ${info[0]}\n  ${info[1]}  ${info[2]}\n  ${info[4]}\n\n  ${info[6]}\n\n`);
         }
         w.write("\n");
-        setScrollRegion(); // establish scroll region after banner
     }
     // Raw stdin for steering
     if (process.stdin.isTTY) {
@@ -338,57 +200,6 @@ export async function startTui(config, spawner) {
     }
     let resolve = null;
     const done = new Promise((r) => { resolve = r; });
-    // ── Menu keypress handler ───────────────────────────────────────────────
-    async function handleMenuKeypress(key) {
-        // Filter input mode: capture text for / search
-        if (menuFilterActive) {
-            if (key.name === "escape") {
-                menuFilterActive = false;
-                menuFilterBuf = "";
-                menuState = { ...menuState, filter: undefined, cursor: 0, scroll: 0 };
-                renderMenu();
-                return;
-            }
-            if (key.name === "return") {
-                menuFilterActive = false;
-                menuState = { ...menuState, filter: menuFilterBuf || undefined, cursor: 0, scroll: 0 };
-                menuFilterBuf = "";
-                renderMenu();
-                return;
-            }
-            if (key.name === "backspace") {
-                menuFilterBuf = menuFilterBuf.slice(0, -1);
-                menuState = { ...menuState, filter: menuFilterBuf || undefined, cursor: 0 };
-                renderMenu();
-                return;
-            }
-            if (key.sequence && !key.ctrl && !key.meta) {
-                menuFilterBuf += key.sequence;
-                menuState = { ...menuState, filter: menuFilterBuf, cursor: 0 };
-                renderMenu();
-            }
-            return;
-        }
-        // "/" starts filter input
-        if (key.sequence === "/") {
-            menuFilterActive = true;
-            menuFilterBuf = "";
-            return;
-        }
-        const mod = await loadMenuModule();
-        if (!mod) {
-            exitMenuMode();
-            return;
-        }
-        const newState = mod.handleMenuKey(menuState, key.name ?? "", menuListCount, config.phrenCtx?.phrenPath, config.phrenCtx?.profile);
-        if (newState === null) {
-            exitMenuMode();
-        }
-        else {
-            menuState = newState;
-            renderMenu();
-        }
-    }
     // ── Keypress router ────────────────────────────────────────────────────
     process.stdin.on("keypress", (_ch, key) => {
         if (!key)
@@ -407,8 +218,13 @@ export async function startTui(config, spawner) {
             const next = nextPermissionMode(config.registry.permissionConfig.mode);
             config.registry.setPermissions({ ...config.registry.permissionConfig, mode: next });
             savePermissionMode(next);
-            // Just update bottom bar in-place — no scrollback output
-            prompt(true);
+            // Redraw the entire prompt bar in-place (permissions line changed)
+            w.write(`\r${ESC}J`); // clear from cursor to end of screen
+            prompt();
+            w.write(inputLine);
+            const back = inputLine.length - cursorPos;
+            if (back > 0)
+                w.write(`${ESC}${back}D`);
             return;
         }
         // Tab — completion or toggle mode
@@ -428,10 +244,10 @@ export async function startTui(config, spawner) {
                     redrawInput();
                 }
                 else if (matches.length > 1) {
-                    // Show matches in scroll area, then redraw prompt
-                    cursorToScrollEnd();
+                    // Show matches above prompt, then redraw
+                    w.write(`\r${ESC}J`); // clear from cursor to end of screen
                     w.write(`\n${s.dim("  " + matches.join("  "))}\n`);
-                    prompt(true);
+                    prompt();
                     w.write(inputLine);
                     const back = inputLine.length - cursorPos;
                     if (back > 0)
@@ -462,7 +278,7 @@ export async function startTui(config, spawner) {
                     }
                     else if (matches.length > 1) {
                         const names = matches.map((e) => e.name + (e.isDirectory() ? "/" : ""));
-                        cursorToScrollEnd();
+                        w.write(`\r${ESC}J`); // clear from cursor to end of screen
                         w.write(`\n${s.dim("  " + names.join("  "))}\n`);
                         // Find longest common prefix for partial completion
                         let common = matches[0].name;
@@ -477,7 +293,7 @@ export async function startTui(config, spawner) {
                             inputLine = prefix + fullPath;
                             cursorPos = inputLine.length;
                         }
-                        prompt(true);
+                        prompt();
                         w.write(inputLine);
                         const back = inputLine.length - cursorPos;
                         if (back > 0)
@@ -489,16 +305,17 @@ export async function startTui(config, spawner) {
             }
             // Default: toggle menu mode
             if (tuiMode === "chat" && !running) {
-                enterMenuMode();
+                tuiMode = "menu";
+                enterMenu(getMenuCtx());
             }
             else if (tuiMode === "menu") {
-                exitMenuMode();
+                exitMenu(getMenuCtx());
             }
             return;
         }
         // Route to mode-specific handler
         if (tuiMode === "menu") {
-            handleMenuKeypress(key);
+            handleMenuKey(key, getMenuCtx());
             return;
         }
         // ── Chat mode keys ──────────────────────────────────────────────────
@@ -508,13 +325,13 @@ export async function startTui(config, spawner) {
                 bashMode = false;
                 inputLine = "";
                 cursorPos = 0;
-                prompt(true);
+                redrawInput();
                 return;
             }
             if (inputLine) {
                 inputLine = "";
                 cursorPos = 0;
-                prompt(true);
+                redrawInput();
                 return;
             }
         }
@@ -531,7 +348,7 @@ export async function startTui(config, spawner) {
                 bashMode = false;
                 inputLine = "";
                 cursorPos = 0;
-                prompt(true);
+                redrawInput();
                 ctrlCCount = 0;
                 return;
             }
@@ -539,15 +356,17 @@ export async function startTui(config, spawner) {
                 // Clear input
                 inputLine = "";
                 cursorPos = 0;
-                prompt(true);
+                redrawInput();
                 ctrlCCount = 0;
                 return;
             }
             // Nothing to cancel — progressive quit
             ctrlCCount++;
             if (ctrlCCount === 1) {
+                // Clear current prompt, print warning, redraw prompt
+                w.write(`\r${ESC}J`);
                 w.write(s.dim("\n  Press Ctrl+C again to exit.\n"));
-                prompt(true);
+                prompt();
                 // Reset after 2 seconds
                 setTimeout(() => { ctrlCCount = 0; }, 2000);
             }
@@ -564,11 +383,8 @@ export async function startTui(config, spawner) {
             const line = inputLine.trim();
             cursorPos = 0;
             inputLine = "";
-            // Move to the bottom of the scroll region so new output scrolls naturally
-            cursorToScrollEnd();
-            w.write("\n");
             if (!line) {
-                prompt();
+                redrawInput();
                 return;
             }
             // Push to history
@@ -586,7 +402,7 @@ export async function startTui(config, spawner) {
                     if (cdMatch) {
                         try {
                             const target = cdMatch[1].trim().replace(/^~/, os.homedir());
-                            const resolved = require("path").resolve(process.cwd(), target);
+                            const resolved = path.resolve(process.cwd(), target);
                             process.chdir(resolved);
                             w.write(s.dim(process.cwd()) + "\n");
                         }
@@ -631,14 +447,14 @@ export async function startTui(config, spawner) {
                 startTime,
                 phrenPath: config.phrenCtx?.phrenPath,
                 phrenCtx: config.phrenCtx,
-                onModelChange: (result) => {
+                onModelChange: async (result) => {
                     // Live model switch — re-resolve provider with new model
                     try {
-                        const { resolveProvider } = require("./providers/resolve.js");
+                        const { resolveProvider } = await import("./providers/resolve.js");
                         const newProvider = resolveProvider(config.provider.name, result.model);
                         config.provider = newProvider;
                         // Rebuild system prompt with new model info
-                        const { buildSystemPrompt } = require("./system-prompt.js");
+                        const { buildSystemPrompt } = await import("./system-prompt.js");
                         config.systemPrompt = buildSystemPrompt(config.systemPrompt.split("\n## Last session")[0], // preserve context, strip old summary
                         null, { name: newProvider.name, model: result.model });
                         statusBar();
@@ -654,14 +470,24 @@ export async function startTui(config, spawner) {
                 cmdResult.then(() => { prompt(); });
                 return;
             }
-            // If agent is running, buffer input
+            // If agent is running, add to steer queue
             if (running) {
-                pendingInput = line;
-                const label = inputMode === "steering" ? "steering" : "queued";
-                w.write(s.dim(`  ↳ ${label}: "${line.slice(0, 60)}"\n`));
+                if (inputMode === "steering") {
+                    steerQueue.push(line);
+                }
+                else {
+                    pendingInput = line;
+                }
+                // Show queued input above the thinking line
+                w.write(`${ESC}2K${s.dim(`  ↳ ${inputMode === "steering" ? "steer" : "queued"}: ${line.slice(0, 60)}`)}\n`);
                 return;
             }
-            // Run agent turn
+            // Clear input line, echo user input above prompt, redraw prompt
+            w.write(`\r${ESC}2K`); // clear input line
+            // Scroll up: move to line above prompt area, write content, redraw prompt
+            w.write(`${ESC}${PROMPT_LINES}A`); // move up past the prompt area
+            w.write(`${s.bold("❯")} ${line}\n`);
+            prompt(); // redraw prompt below
             runAgentTurn(line);
             return;
         }
@@ -803,7 +629,7 @@ export async function startTui(config, spawner) {
             // ! at start of empty input toggles bash mode
             if (key.sequence === "!" && inputLine === "" && !bashMode) {
                 bashMode = true;
-                prompt(true);
+                redrawInput();
                 return;
             }
             inputLine = inputLine.slice(0, cursorPos) + key.sequence + inputLine.slice(cursorPos);
@@ -814,6 +640,7 @@ export async function startTui(config, spawner) {
     // TUI hooks — render streaming text with markdown, compact tool output
     let textBuffer = "";
     let firstDelta = true;
+    let activeThinkTimer = null;
     function flushTextBuffer() {
         if (!textBuffer)
             return;
@@ -823,21 +650,43 @@ export async function startTui(config, spawner) {
     const tuiHooks = {
         onTextDelta: (text) => {
             if (firstDelta) {
-                w.write(`${ESC}2K\r`); // clear thinking timer line
+                if (activeThinkTimer) {
+                    clearInterval(activeThinkTimer);
+                    activeThinkTimer = null;
+                }
+                w.write(`${ESC}2K\r`);
+                w.write(`\n${s.brand("◆")} `); // blank line + diamond prefix for phren's response
                 firstDelta = false;
             }
-            // Stream directly for real-time feel — write each delta immediately
             w.write(text);
         },
         onTextDone: () => {
             flushTextBuffer();
         },
         onTextBlock: (text) => {
-            w.write(renderMarkdown(text));
+            if (activeThinkTimer) {
+                clearInterval(activeThinkTimer);
+                activeThinkTimer = null;
+            }
+            if (firstDelta) {
+                w.write(`${ESC}2K\r`);
+                w.write(`\n${s.brand("◆")} `); // diamond prefix + blank line before response
+                firstDelta = false;
+            }
+            w.write(text);
             if (!text.endsWith("\n"))
                 w.write("\n");
         },
         onToolStart: (name, input, count) => {
+            // Kill the thinking animation if it's still running (tools can fire before any text delta)
+            if (activeThinkTimer) {
+                clearInterval(activeThinkTimer);
+                activeThinkTimer = null;
+            }
+            if (firstDelta) {
+                w.write(`${ESC}2K\r`); // clear thinking line
+                firstDelta = false;
+            }
             flushTextBuffer();
             const preview = formatToolInput(name, input);
             const countLabel = count > 1 ? s.dim(` (${count} tools)`) : "";
@@ -854,6 +703,12 @@ export async function startTui(config, spawner) {
         },
         onStatus: (msg) => w.write(s.dim(msg)),
         getSteeringInput: () => {
+            // Drain steer queue first (newest steering inputs)
+            if (steerQueue.length > 0 && inputMode === "steering") {
+                const steer = steerQueue.shift();
+                w.write(s.yellow(`  ↳ steering: ${steer}\n`));
+                return steer;
+            }
             if (pendingInput && inputMode === "steering") {
                 const steer = pendingInput;
                 pendingInput = null;
@@ -866,39 +721,53 @@ export async function startTui(config, spawner) {
     async function runAgentTurn(userInput) {
         running = true;
         firstDelta = true;
-        cursorToScrollEnd(); // ensure all turn output stays within scroll region
         const thinkStart = Date.now();
-        // Phren thinking — subtle purple/cyan breath, no spinner gimmicks
+        // Phren thinking — subtle purple/cyan breath with rotating verbs
+        const THINK_VERBS = ["thinking", "reasoning", "recalling", "connecting", "processing"];
         let thinkFrame = 0;
-        const thinkTimer = setInterval(() => {
+        activeThinkTimer = setInterval(() => {
             const elapsed = (Date.now() - thinkStart) / 1000;
-            // Gentle sine-wave interpolation between phren purple and cyan
-            const t = (Math.sin(thinkFrame * 0.08) + 1) / 2; // 0..1, slow oscillation
+            const verb = THINK_VERBS[Math.floor(elapsed / 6) % THINK_VERBS.length];
+            const t = (Math.sin(thinkFrame * 0.08) + 1) / 2;
             const r = Math.round(155 * (1 - t) + 40 * t);
             const g = Math.round(140 * (1 - t) + 211 * t);
             const b = Math.round(250 * (1 - t) + 242 * t);
             const color = `${ESC}38;2;${r};${g};${b}m`;
-            w.write(`${ESC}2K  ${color}◆ thinking${ESC}0m ${s.dim(`${elapsed.toFixed(1)}s`)}\r`);
+            w.write(`${ESC}2K${color}◆ ${verb}${ESC}0m ${s.dim(`${elapsed.toFixed(1)}s`)}\r`);
             thinkFrame++;
         }, 50);
         try {
             await runTurn(userInput, session, config, tuiHooks);
-            clearInterval(thinkTimer);
+            if (activeThinkTimer) {
+                clearInterval(activeThinkTimer);
+                activeThinkTimer = null;
+            }
             const elapsed = ((Date.now() - thinkStart) / 1000).toFixed(1);
-            w.write(`${ESC}2K  ${s.dim(`◆ thought for ${elapsed}s`)}\n`);
+            const DONE_VERBS = ["◆ recalled", "◆ processed", "◆ connected", "◆ resolved"];
+            const doneVerb = DONE_VERBS[session.turns % DONE_VERBS.length];
+            w.write(`${ESC}2K${s.dim(`${doneVerb} in ${elapsed}s`)}\n\n`);
             statusBar();
         }
         catch (err) {
-            clearInterval(thinkTimer);
+            if (activeThinkTimer) {
+                clearInterval(activeThinkTimer);
+                activeThinkTimer = null;
+            }
             const msg = err instanceof Error ? err.message : String(err);
             w.write(`${ESC}2K\r`);
             w.write(s.red(`  Error: ${msg}\n`));
         }
         running = false;
-        // Process queued input
-        if (pendingInput) {
+        // Process queued input — steer queue first, then pending
+        if (steerQueue.length > 0) {
+            const queued = steerQueue.shift();
+            w.write(`${s.bold("❯")} ${queued}\n`);
+            runAgentTurn(queued);
+        }
+        else if (pendingInput) {
             const queued = pendingInput;
             pendingInput = null;
+            w.write(`${s.bold("❯")} ${queued}\n`);
             runAgentTurn(queued);
         }
         else {