@redplanethq/corebrain 2.8.30 → 2.8.32

package/dist/tui/chat.js

@@ -1,21 +1,23 @@
-import { TUI, Text, Editor, ProcessTerminal, Markdown, Loader, Spacer, Container, CombinedAutocompleteProvider, matchesKey, Key, } from '@mariozechner/pi-tui';
+import { TUI, Text, Editor, ProcessTerminal, Markdown, Loader, Spacer, Container, CombinedAutocompleteProvider, matchesKey, Key, } from '@earendil-works/pi-tui';
 import { buildAvatar } from './utils/avatar.js';
 import chalk from 'chalk';
 import { StatusLine } from './components/status-line.js';
 import { editorTheme, markdownTheme } from './themes.js';
 import { createConversation } from './hooks/use-conversation.js';
 import { ConversationSelector } from './components/conversation-selector.js';
-import { ReminderList } from './components/reminder-list.js';
 import { TaskList } from './components/task-list.js';
 import { TaskDetail } from './components/task-detail.js';
 import { IntegrationsView } from './components/integrations-view.js';
 import { WidgetsView } from './components/widgets-view.js';
-import { DashboardView } from './components/dashboard-view.js';
 import { loadWidgetBundle } from './utils/widget-loader.js';
 import { getPreferences } from '../config/preferences.js';
-import { fetchConversationHistory, fetchWorkspace, fetchIntegrationAccounts, createTaskApi } from './utils/stream.js';
+import { fetchConversationHistory, fetchWorkspace, fetchIntegrationAccounts, createTaskApi, isRecurringTask, summariseCatchup, fetchCredits, NoCreditsError } from './utils/stream.js';
 import { getToolDisplayName } from './utils/tool-names.js';
 import { ApprovalPanel } from './components/approval-panel.js';
+import { ContextBar } from './components/context-bar.js';
+import { SplitPane } from './components/split-pane.js';
+import { ScratchpadPanel } from './components/scratchpad-panel.js';
+import { TaskRuns } from './components/task-runs.js';
 export function startTuiApp(baseUrl, apiKey, version) {
     const terminal = new ProcessTerminal();
     const tui = new TUI(terminal);
@@ -28,20 +30,25 @@ export function startTuiApp(baseUrl, apiKey, version) {
     tui.addChild(new Spacer(1));
     // ── Messages area ─────────────────────────────────────────────────────────
     const messagesContainer = new Container();
-    tui.addChild(messagesContainer);
-    // ── Task title bar (shown above editor when in a task conversation) ─────
-    const taskTitleContainer = new Container();
-    tui.addChild(taskTitleContainer);
+    // SplitPane wraps messages so we can slot a scratchpad panel on the left
+    // half when `/today` is active. Without a left child it renders the right
+    // child at full width, i.e. behaves exactly like the plain container.
+    const messagesSplit = new SplitPane(messagesContainer);
+    tui.addChild(messagesSplit);
+    // ── Context bar (shown above editor when a task/scratchpad is active) ────
+    const contextBar = new ContextBar();
+    tui.addChild(contextBar);
     // ── Editor ────────────────────────────────────────────────────────────────
     const editor = new Editor(tui, editorTheme);
     editor.setAutocompleteProvider(new CombinedAutocompleteProvider([
+        { name: 'new-task', description: 'Create a new task from the next message' },
+        { name: 'today', description: 'Open today’s scratchpad' },
+        { name: 'catchup', description: 'Summarise unread inbox items' },
         { name: 'clear', description: 'Clear conversation and start fresh' },
         { name: 'resume', description: 'Resume a previous conversation' },
-        { name: 'reminders', description: 'View your reminders' },
         { name: 'tasks', description: 'View and manage your tasks' },
         { name: 'integrations', description: 'View and connect integrations' },
         { name: 'widgets', description: 'Configure widgets (below-input & overview)' },
-        { name: 'dashboard', description: 'Show overview widgets in TUI' },
         {
             name: 'incognito',
             description: 'Toggle incognito mode (new conversations only)',
@@ -49,8 +56,28 @@ export function startTuiApp(baseUrl, apiKey, version) {
         { name: 'exit', description: 'Exit CORE' },
     ], process.cwd()));
     tui.addChild(editor);
-    // ── Status line (incognito + below-input widget on one row) ──────────────
-    const statusLine = new StatusLine();
+    // ── Status line — badges + tasks + widget + G + C (focusable, 2 rows)
+    const statusLine = new StatusLine(baseUrl, apiKey, () => tui.requestRender());
+    statusLine.onBlur = () => {
+        tui.setFocus(editor);
+        tui.requestRender();
+    };
+    statusLine.onActivate = (zone) => {
+        tui.setFocus(editor);
+        if (zone === 'tasks') {
+            showTaskList();
+        }
+        else if (zone === 'catchup') {
+            runCatchup();
+        }
+        else if (zone === 'gateways') {
+            addToMessages(new Text(chalk.dim('Manage gateways: run ') +
+                chalk.white('corebrain gateway list') +
+                chalk.dim(' outside the chat.'), 1, 0));
+            addToMessages(new Spacer(1));
+            tui.requestRender();
+        }
+    };
     tui.addChild(statusLine);
     async function loadBelowInputWidget() {
         statusLine.setWidget(null);
@@ -108,6 +135,44 @@ export function startTuiApp(baseUrl, apiKey, version) {
     let autoApproveAll = false;
     let currentTask = null;
     let taskInfoOverlay = null;
+    // Pending catchup summary that will seed a new chat when the user presses `c`.
+    let pendingCatchupSummary = null;
+    // Container holding the catchup summary + hints while catchup view is active.
+    let catchupViewContainer = null;
+    // Active scratchpad side-panel (set while `/today` is in effect).
+    let scratchpadPanel = null;
+    // Cached credit balance for the workspace. `null` = not fetched yet.
+    // The webapp's `/api/v1/conversation` and `/api/v1/conversation/create`
+    // endpoints both server-gate the same check; we mirror it client-side so
+    // the input border can turn red immediately instead of waiting for the
+    // user to type + submit and see a 402.
+    let creditsInfo = null;
+    // Which context is driving the "normal" border colour right now. Kept
+    // separate from `contextBar.getContext()` because scratchpad mode hides
+    // the bar visually but still wants a yellow border.
+    let activeBorderKind = null;
+    function outOfCredits() {
+        if (!creditsInfo)
+            return false;
+        if (!creditsInfo.billingEnabled)
+            return false;
+        if (creditsInfo.byok)
+            return false;
+        return creditsInfo.available <= 0;
+    }
+    function refreshBorder() {
+        editor.borderColor = outOfCredits()
+            ? chalk.red
+            : ContextBar.borderColor(activeBorderKind);
+        tui.requestRender();
+    }
+    async function refreshCredits() {
+        const info = await fetchCredits(baseUrl, apiKey);
+        if (info) {
+            creditsInfo = info;
+            refreshBorder();
+        }
+    }
     const conversation = createConversation(baseUrl, apiKey);
     let avatarComponent = buildAvatar(butlerName, workspaceAccent);
     avatarContainer.addChild(avatarComponent);
@@ -132,6 +197,12 @@ export function startTuiApp(baseUrl, apiKey, version) {
         }
     })
         .catch(() => { });
+    // Initial credit probe + 60s poll so a top-up done in the webapp reflects
+    // back in the CLI within a minute (mirrors the webapp's polling cadence).
+    refreshCredits().catch(() => { });
+    setInterval(() => {
+        refreshCredits().catch(() => { });
+    }, 60_000);
     const loader = new Loader(tui, s => chalk.cyan(s), s => chalk.gray(s), 'Thinking...');
     // ── Helpers ───────────────────────────────────────────────────────────────
     function addToMessages(component) {
@@ -140,15 +211,23 @@ export function startTuiApp(baseUrl, apiKey, version) {
     }
     function insertBeforeLoader(component) {
         conversationComponents.push(component);
-        // Remove loader, add component, re-add loader
-        try {
-            messagesContainer.removeChild(loader);
-        }
-        catch {
-            // loader not in tree yet
+        // Insert new content ABOVE the loader when it's visible, otherwise
+        // just append. Do NOT re-add the loader here — that used to bypass
+        // the loaderVisible flag and stranded the loader in the tree after
+        // removeLoader() had already run, which the caller couldn't clear.
+        const loaderInTree = loaderVisible;
+        if (loaderInTree) {
+            try {
+                messagesContainer.removeChild(loader);
+            }
+            catch {
+                // ignore
+            }
         }
         messagesContainer.addChild(component);
-        messagesContainer.addChild(loader);
+        if (loaderInTree) {
+            messagesContainer.addChild(loader);
+        }
     }
     function toggleIncognito() {
         if (conversation.conversationId !== null) {
@@ -160,17 +239,27 @@ export function startTuiApp(baseUrl, apiKey, version) {
         statusLine.setIncognito(conversation.incognito);
         tui.requestRender();
     }
+    function applyContext(info) {
+        contextBar.setContext(info);
+        activeBorderKind = info?.kind ?? null;
+        refreshBorder();
+    }
     function setTaskContext(task) {
         currentTask = task;
-        taskTitleContainer.clear();
-        if (task) {
-            const id = task.displayId ? chalk.dim(`[${task.displayId}] `) : '';
-            const title = chalk.bold.white(task.title || 'Untitled');
-            const status = chalk.cyan(`(${task.status})`);
-            const hint = chalk.dim('   ctrl+o info');
-            taskTitleContainer.addChild(new Text(`${id}${title} ${status}${hint}`, 1, 0));
+        if (!task) {
+            applyContext(null);
+            return;
         }
-        tui.requestRender();
+        const pill = task.displayId ?? 'TASK';
+        const hint = isRecurringTask(task)
+            ? 'ctrl+o info · ctrl+r runs'
+            : 'ctrl+o info';
+        applyContext({
+            kind: 'task',
+            pill,
+            subtitle: `${task.title || 'Untitled'}  (${task.status})`,
+            hint,
+        });
     }
     function clearConversation() {
         requestId++; // invalidate any in-flight callbacks
@@ -234,10 +323,6 @@ export function startTuiApp(baseUrl, apiKey, version) {
             showResumeSelector();
             return;
         }
-        if (trimmed === '/reminders') {
-            showReminderList();
-            return;
-        }
         if (trimmed === '/tasks') {
             showTaskList();
             return;
@@ -250,8 +335,16 @@ export function startTuiApp(baseUrl, apiKey, version) {
             showWidgetsView();
             return;
         }
-        if (trimmed === '/dashboard') {
-            showDashboardView();
+        if (trimmed === '/new-task') {
+            setNewTaskMode(true);
+            return;
+        }
+        if (trimmed === '/catchup') {
+            runCatchup();
+            return;
+        }
+        if (trimmed === '/today') {
+            openScratchpad();
             return;
         }
         if (trimmed === '/incognito') {
@@ -259,6 +352,7 @@ export function startTuiApp(baseUrl, apiKey, version) {
             return;
         }
         if (trimmed === '/exit') {
+            statusLine.dispose();
             tui.stop();
             process.stdout.write('\n');
             process.exit(0);
@@ -268,13 +362,15 @@ export function startTuiApp(baseUrl, apiKey, version) {
         runMessage(trimmed);
     };
     function hideMainUI() {
+        if (statusLine.focused)
+            tui.setFocus(editor);
         try {
             tui.removeChild(statusLine);
         }
         catch { /* ignore */ }
-        tui.removeChild(messagesContainer);
+        tui.removeChild(messagesSplit);
         try {
-            tui.removeChild(taskTitleContainer);
+            tui.removeChild(contextBar);
         }
         catch { /* ignore */ }
         tui.removeChild(editor);
@@ -282,8 +378,8 @@ export function startTuiApp(baseUrl, apiKey, version) {
     }
     function restoreMainUI() {
         overlayActive = false;
-        tui.addChild(messagesContainer);
-        tui.addChild(taskTitleContainer);
+        tui.addChild(messagesSplit);
+        tui.addChild(contextBar);
         tui.addChild(editor);
         tui.addChild(statusLine);
         tui.setFocus(editor);
@@ -338,17 +434,27 @@ export function startTuiApp(baseUrl, apiKey, version) {
                         : chalk.green('●');
                 const header = `${dot} ${chalk.bold(displayName)}${argSummary ? chalk.dim(' (' + argSummary + ')') : ''}`;
                 addToMessages(new Text(header, 1, 0));
-                // Result preview (first 3 non-empty lines)
+                // Result preview — up to 2 non-empty lines, HTML stripped, prefixed
+                // with `│` / `└─` to match the streaming ToolCallItem style.
                 const resultStr = stringifyToolOutput(part.output);
                 if (resultStr) {
-                    const previewLines = resultStr
+                    const allLines = resultStr
                         .split('\n')
-                        .filter(l => l.trim().length > 0)
-                        .slice(0, 3);
-                    for (const line of previewLines) {
-                        addToMessages(new Text(chalk.dim('  ' + line), 1, 0));
+                        .map(cleanPreviewLine)
+                        .filter(l => l.length > 0);
+                    const previewLines = allLines.slice(0, 2);
+                    const extra = allLines.length - previewLines.length;
+                    previewLines.forEach((line, idx) => {
+                        const isLast = idx === previewLines.length - 1 && extra === 0;
+                        const prefix = isLast ? '  └ ' : '  │ ';
+                        addToMessages(new Text(chalk.dim(prefix + line), 1, 0));
+                    });
+                    if (extra > 0) {
+                        addToMessages(new Text(chalk.dim(`  └ +${extra} more lines`), 1, 0));
                     }
                 }
+                // Breathing room so consecutive tool calls don't run together.
+                addToMessages(new Spacer(1));
                 any = true;
                 continue;
             }
@@ -357,6 +463,26 @@ export function startTuiApp(baseUrl, apiKey, version) {
         }
         return any;
     }
+    /**
+     * Turn one line of a tool's raw output into something that scans in the
+     * preview strip: HTML tags stripped, whitespace collapsed, capped to a
+     * readable width. Preserves tag *content* so `<p>hello</p>` becomes `hello`
+     * (not empty), which is important for HTML-heavy tools like get_scratchpad.
+     */
+    function cleanPreviewLine(raw) {
+        const stripped = raw
+            .replace(/<[^>]+>/g, ' ')
+            .replace(/&nbsp;/gi, ' ')
+            .replace(/&amp;/gi, '&')
+            .replace(/&lt;/gi, '<')
+            .replace(/&gt;/gi, '>')
+            .replace(/&quot;/gi, '"')
+            .replace(/&#39;/gi, "'");
+        const collapsed = stripped.replace(/\s+/g, ' ').trim();
+        if (collapsed.length <= 120)
+            return collapsed;
+        return collapsed.slice(0, 120) + '…';
+    }
     function summarizeArgs(input) {
         if (!input || typeof input !== 'object')
             return '';
@@ -429,16 +555,6 @@ export function startTuiApp(baseUrl, apiKey, version) {
             loadConversationHistoryIntoMessages(conv.id);
         };
     }
-    function showReminderList() {
-        hideMainUI();
-        const list = new ReminderList(baseUrl, apiKey, tui, () => tui.requestRender());
-        tui.addChild(list);
-        tui.setFocus(list);
-        list.onCancel = () => {
-            tui.removeChild(list);
-            restoreMainUI();
-        };
-    }
     function showTaskList() {
         hideMainUI();
         const list = new TaskList(baseUrl, apiKey, tui, () => tui.requestRender());
@@ -507,6 +623,30 @@ export function startTuiApp(baseUrl, apiKey, version) {
             restoreMainUI();
         };
     }
+    function showTaskRunsOverlay(task) {
+        hideMainUI();
+        const runsView = new TaskRuns(baseUrl, apiKey, task, tui, () => tui.requestRender());
+        tui.addChild(runsView);
+        tui.setFocus(runsView);
+        runsView.onCancel = () => {
+            try {
+                tui.removeChild(runsView);
+            }
+            catch { /* ignore */ }
+            restoreMainUI();
+        };
+        runsView.onOpenRun = run => {
+            try {
+                tui.removeChild(runsView);
+            }
+            catch { /* ignore */ }
+            // Swap the active conversation to the picked run. `openTaskConversation`
+            // already handles clearing state, setting the task context, and
+            // loading history — reuse it so the flow matches picking a run from
+            // `/tasks`.
+            openTaskConversation(task, run.id);
+        };
+    }
     function showIntegrationsView() {
         hideMainUI();
         const view = new IntegrationsView(baseUrl, apiKey, tui, () => tui.requestRender());
@@ -528,17 +668,135 @@ export function startTuiApp(baseUrl, apiKey, version) {
             loadBelowInputWidget().then(() => restoreMainUI()).catch(() => restoreMainUI());
         };
     }
-    function showDashboardView() {
+    // ── Scratchpad (/today) ───────────────────────────────────────────────────
+    function updateScratchpadContextBar() {
+        if (!scratchpadPanel) {
+            // If a task was active, keep its context; otherwise clear.
+            if (currentTask)
+                setTaskContext(currentTask);
+            else
+                applyContext(null);
+            return;
+        }
+        // The ScratchpadPanel already shows the date + nav hints, so an extra
+        // context-bar row is just repetition. Keep the visual bar empty but
+        // drive the border colour off `activeBorderKind = 'scratchpad'`.
+        contextBar.setContext(null);
+        activeBorderKind = 'scratchpad';
+        refreshBorder();
+    }
+    function openScratchpad() {
+        if (scratchpadPanel) {
+            const currentDate = scratchpadPanel.getDate();
+            const today = new Date();
+            const onToday = currentDate.getUTCFullYear() === today.getUTCFullYear() &&
+                currentDate.getUTCMonth() === today.getUTCMonth() &&
+                currentDate.getUTCDate() === today.getUTCDate();
+            if (onToday) {
+                // Toggle off — /today acts as a "close scratchpad" too.
+                closeScratchpad();
+                return;
+            }
+            scratchpadPanel.setDate(today);
+            updateScratchpadContextBar();
+            tui.requestRender();
+            return;
+        }
+        scratchpadPanel = new ScratchpadPanel(baseUrl, apiKey, () => tui.requestRender());
+        scratchpadPanel.onDateChange = () => updateScratchpadContextBar();
+        messagesSplit.setLeft(scratchpadPanel);
+        updateScratchpadContextBar();
+        tui.requestRender();
+    }
+    function closeScratchpad() {
+        if (!scratchpadPanel)
+            return;
+        scratchpadPanel = null;
+        messagesSplit.setLeft(null);
+        updateScratchpadContextBar();
+        tui.requestRender();
+    }
+    // ── Catchup ───────────────────────────────────────────────────────────────
+    function showCatchupView(summary, count) {
         hideMainUI();
-        const view = new DashboardView(baseUrl, apiKey, tui, () => tui.requestRender());
-        tui.addChild(view);
-        tui.setFocus(view);
-        view.onCancel = () => {
-            tui.removeChild(view);
+        pendingCatchupSummary = summary;
+        const container = new Container();
+        catchupViewContainer = container;
+        container.addChild(new Spacer(1));
+        container.addChild(new Text(chalk.bold.cyan('Catchup') +
+            chalk.dim(` · ${count} item${count === 1 ? '' : 's'}`), 1, 0));
+        container.addChild(new Spacer(1));
+        container.addChild(new Markdown(summary, 1, 0, markdownTheme));
+        container.addChild(new Spacer(2));
+        container.addChild(new Text(chalk.bold.white('  c') +
+            chalk.dim('  continue in a new chat') +
+            chalk.dim('     ') +
+            chalk.bold.white('esc') +
+            chalk.dim('  close'), 1, 0));
+        container.addChild(new Spacer(1));
+        tui.addChild(container);
+        tui.setFocus(container);
+        tui.requestRender();
+    }
+    function closeCatchupView() {
+        if (!catchupViewContainer)
+            return;
+        try {
+            tui.removeChild(catchupViewContainer);
+        }
+        catch { /* ignore */ }
+        catchupViewContainer = null;
+        pendingCatchupSummary = null;
+        restoreMainUI();
+    }
+    function showCatchupEmptyToast() {
+        addToMessages(new Text(chalk.dim('Nothing to catch up on.'), 1, 0));
+        addToMessages(new Spacer(1));
+        tui.requestRender();
+    }
+    function runCatchup() {
+        if (isProcessing || catchupViewContainer)
+            return;
+        pendingCatchupSummary = null;
+        showLoader();
+        summariseCatchup(baseUrl, apiKey)
+            .then(({ summary, count }) => {
+            removeLoader();
+            if (count === 0 || !summary) {
+                showCatchupEmptyToast();
+                return;
+            }
+            showCatchupView(summary, count);
+        })
+            .catch((err) => {
+            removeLoader();
+            addToMessages(new Text(chalk.red('Catchup failed: ') + chalk.dim(err.message), 1, 0));
+            addToMessages(new Spacer(1));
+            tui.requestRender();
+        });
+    }
+    function continueCatchupInNewChat() {
+        if (!pendingCatchupSummary)
+            return;
+        const seed = pendingCatchupSummary;
+        if (catchupViewContainer) {
+            try {
+                tui.removeChild(catchupViewContainer);
+            }
+            catch { /* ignore */ }
+            catchupViewContainer = null;
             restoreMainUI();
-        };
+        }
+        pendingCatchupSummary = null;
+        clearConversation();
+        editor.setText(seed + '\n\n');
+        tui.setFocus(editor);
+        tui.requestRender();
     }
+    let loaderVisible = false;
     function removeLoader() {
+        if (!loaderVisible)
+            return;
         const idx = conversationComponents.lastIndexOf(loader);
         if (idx !== -1)
             conversationComponents.splice(idx, 1);
@@ -549,18 +807,40 @@ export function startTuiApp(baseUrl, apiKey, version) {
             // ignore
         }
         loader.stop();
+        loaderVisible = false;
     }
     function showLoader() {
+        if (loaderVisible) {
+            // Already in the tree — just restart the animation in case a
+            // previous stop() cleared the interval.
+            loader.stop();
+            loader.start();
+            return;
+        }
         conversationComponents.push(loader);
         messagesContainer.addChild(loader);
-        loader.stop(); // clear any existing interval before restarting
+        loader.stop();
         loader.start();
+        loaderVisible = true;
+    }
+    function showOutOfCreditsToast() {
+        addToMessages(new Text(chalk.red('You’re out of credits. ') +
+            chalk.dim('Top up at ') +
+            chalk.white(baseUrl + '/settings/billing'), 1, 0));
+        addToMessages(new Spacer(1));
     }
     function runMessage(message) {
+        if (outOfCredits()) {
+            showOutOfCreditsToast();
+            tui.requestRender();
+            return;
+        }
         isProcessing = true;
         editor.disableSubmit = true;
         const myRequestId = ++requestId;
-        // User bubble
+        // User bubble — leading blank line so consecutive turns don't run
+        // into the previous assistant reply.
+        addToMessages(new Spacer(1));
         addToMessages(new Text(chalk.bgHex('#3a3a3a').white(' \u276f ' + message + ' '), 0, 0));
         addToMessages(new Spacer(1));
         showLoader();
@@ -568,6 +848,42 @@ export function startTuiApp(baseUrl, apiKey, version) {
         let accumulated = '';
         let markdownInserted = false;
         let hadOutput = false;
+        let hadErrorMessage = false;
+        let finishFired = false;
+        // Safety net: if the server never sends `finish` and stops emitting
+        // events for this many ms after any output, treat the turn as done.
+        // Otherwise the editor stays disabled forever and the user is stuck.
+        const IDLE_TIMEOUT_MS = 5_000;
+        let idleTimer = null;
+        function clearIdleTimer() {
+            if (idleTimer) {
+                clearTimeout(idleTimer);
+                idleTimer = null;
+            }
+        }
+        function fireFinish() {
+            if (requestId !== myRequestId)
+                return;
+            clearIdleTimer();
+            removeLoader();
+            if (!finishFired) {
+                finishFired = true;
+                if (!hadOutput && !hadErrorMessage) {
+                    addToMessages(new Text(chalk.gray('(no response)'), 1, 0));
+                    addToMessages(new Spacer(1));
+                }
+                scratchpadPanel?.refresh().catch(() => { });
+            }
+            isProcessing = false;
+            editor.disableSubmit = false;
+            tui.requestRender();
+        }
+        function armIdleTimer() {
+            clearIdleTimer();
+            if (!hadOutput)
+                return; // wait until at least one event before arming
+            idleTimer = setTimeout(fireFinish, IDLE_TIMEOUT_MS);
+        }
         const callbacks = {
             onTextDelta(delta) {
                 if (requestId !== myRequestId)
@@ -578,8 +894,11 @@ export function startTuiApp(baseUrl, apiKey, version) {
                     insertBeforeLoader(responseMd);
                     markdownInserted = true;
                 }
+                // Re-show the loader if it was hidden after a previous step.
+                showLoader();
                 responseMd.setText(accumulated);
                 tui.requestRender();
+                armIdleTimer();
             },
             onToolStart(_id, _name, item) {
                 if (requestId !== myRequestId)
@@ -587,33 +906,35 @@ export function startTuiApp(baseUrl, apiKey, version) {
                 hadOutput = true;
                 allToolItems.push(item);
                 insertBeforeLoader(item);
+                showLoader();
                 tui.requestRender();
+                armIdleTimer();
             },
             onRerender() {
                 if (requestId !== myRequestId)
                     return;
                 tui.requestRender();
+                armIdleTimer();
             },
             onStepFinish() {
                 if (requestId !== myRequestId)
                     return;
+                // The visible turn is done — server-side bookkeeping
+                // (persistence, token accounting) can still delay `finish`
+                // by seconds. Drop the spinner so the UI reads as "reply
+                // delivered". It'll be re-shown by the next text/tool event
+                // if another step runs.
+                removeLoader();
                 tui.requestRender();
+                armIdleTimer();
             },
             onFinish() {
-                if (requestId !== myRequestId)
-                    return;
-                removeLoader();
-                if (!hadOutput) {
-                    addToMessages(new Text(chalk.gray('(no response)'), 1, 0));
-                }
-                addToMessages(new Spacer(1));
-                isProcessing = false;
-                editor.disableSubmit = false;
-                tui.requestRender();
+                fireFinish();
             },
             onAbort() {
                 if (requestId !== myRequestId)
                     return;
+                clearIdleTimer();
                 removeLoader();
                 // Remove pending approval panel if present
                 if (pendingApprovalPanel) {
@@ -637,8 +958,31 @@ export function startTuiApp(baseUrl, apiKey, version) {
             onError(err) {
                 if (requestId !== myRequestId)
                     return;
+                clearIdleTimer();
                 removeLoader();
-                addToMessages(new Text(chalk.red('Error: ') + chalk.gray(err.message), 1, 0));
+                hadErrorMessage = true;
+                const code = err.code;
+                const isNoCredits = err instanceof NoCreditsError || code === 'no_credits';
+                if (isNoCredits) {
+                    // Server told us we're out — flip local state so the border
+                    // turns red immediately and future submits short-circuit.
+                    if (creditsInfo)
+                        creditsInfo.available = 0;
+                    refreshBorder();
+                    addToMessages(new Text(chalk.red('You’re out of credits. ') +
+                        chalk.dim('Top up at ') +
+                        chalk.white(baseUrl + '/settings/billing'), 1, 0));
+                }
+                else {
+                    // Empty message often means the server emitted a bare SSE
+                    // `error` event with no payload — surface something
+                    // actionable instead of a lone "Error:" line.
+                    const message = err.message?.trim() || 'Stream ended unexpectedly (no error message from server).';
+                    addToMessages(new Text(chalk.red('Error: ') + chalk.gray(message), 1, 0));
+                    // Any stream failure could be a credit gate that raced past
+                    // our poll — refresh so the border reflects reality.
+                    refreshCredits().catch(() => { });
+                }
                 addToMessages(new Spacer(1));
                 isProcessing = false;
                 editor.disableSubmit = false;
@@ -703,6 +1047,7 @@ export function startTuiApp(baseUrl, apiKey, version) {
     // ── Global input ──────────────────────────────────────────────────────────
     tui.addInputListener(data => {
         if (data === '\x03') {
+            statusLine.dispose();
             tui.stop();
             process.stdout.write('\n');
             process.exit(0);
@@ -777,6 +1122,43 @@ export function startTuiApp(baseUrl, apiKey, version) {
             setNewTaskMode(false);
             return { consume: true };
         }
+        // ── Down arrow on empty editor → focus status line zone selector ───
+        if (!overlayActive &&
+            !isProcessing &&
+            !newTaskMode &&
+            !statusLine.focused &&
+            matchesKey(data, Key.down) &&
+            editor.getText().length === 0) {
+            statusLine.setSelectedZone('tasks');
+            tui.setFocus(statusLine);
+            tui.requestRender();
+            return { consume: true };
+        }
+        // ── Catchup view input (only when the modal view is up) ────────────
+        if (catchupViewContainer) {
+            if (data === 'c' || data === 'C') {
+                continueCatchupInNewChat();
+                return { consume: true };
+            }
+            if (matchesKey(data, Key.escape)) {
+                closeCatchupView();
+                return { consume: true };
+            }
+            // Block other keys while the catchup modal is up — no editor,
+            // no accidental slash-commands.
+            return { consume: true };
+        }
+        // ── Scratchpad day nav (Ctrl+P prev · Ctrl+N next) ─────────────────
+        if (scratchpadPanel && !overlayActive && !isProcessing && !statusLine.focused) {
+            if (matchesKey(data, Key.ctrl('p'))) {
+                scratchpadPanel.shiftDays(-1);
+                return { consume: true };
+            }
+            if (matchesKey(data, Key.ctrl('n'))) {
+                scratchpadPanel.shiftDays(1);
+                return { consume: true };
+            }
+        }
         if (matchesKey(data, Key.ctrl('o'))) {
             if (taskInfoOverlay) {
                 taskInfoOverlay.onCancel?.();
@@ -795,6 +1177,15 @@ export function startTuiApp(baseUrl, apiKey, version) {
             }
             return;
         }
+        // ── Ctrl+R → show runs of the current recurring task ──────────────
+        if (!overlayActive &&
+            !isProcessing &&
+            currentTask &&
+            isRecurringTask(currentTask) &&
+            matchesKey(data, Key.ctrl('r'))) {
+            showTaskRunsOverlay(currentTask);
+            return { consume: true };
+        }
         if (!overlayActive && matchesKey(data, Key.ctrl('i'))) {
             toggleIncognito();
             return;