moderado 0.4.18 → 0.4.28

package/dist/ui/welcome.js

@@ -1,6 +1,7 @@
 import readline from 'node:readline';
 import { overlayCentered, dimLines, shadowUnder } from './popup.js';
 import { activeMentionToken, filterMentionCandidates } from './file_mentions.js';
+import { getHelpCommandGroups } from './help_content.js';
 export const MODERADO_ASCII_LOGO = [
     '\x1b[38;5;75m    __  _______  ____  __________  ___    ____  ____ \x1b[0m',
     '\x1b[38;5;75m   /  |/  / __ \\/ __ \\/ ____/ __ \\/   |  / __ \\/ __ \\\x1b[0m',
@@ -16,6 +17,11 @@ export function stripAnsi(str) {
 function visibleLen(str) {
     return stripAnsi(str).length;
 }
+function composerInputWindow(input, caret, width) {
+    const capacity = Math.max(1, width - 3);
+    const start = Math.max(0, Math.min(caret, input.length - capacity));
+    return { text: input.slice(start, start + capacity), caretColumn: caret - start };
+}
 /** Card width: nearly full terminal width, like OpenCode/Cline. */
 export function getWelcomeCardWidth(width) {
     const terminalWidth = width ?? (process.stdout.columns || 80);
@@ -26,13 +32,28 @@ export function getWelcomeIndent(blockWidth, width) {
     const terminalWidth = width ?? (process.stdout.columns || 80);
     return Math.max(0, Math.floor((terminalWidth - blockWidth) / 2));
 }
-/** Center each line of a block independently (used for the ASCII logo / hints). */
+/** Center each line of a block inside the input card's columns (used for the ASCII logo / hints). */
 function centerBlock(lines, width) {
+    const terminalWidth = width ?? (process.stdout.columns || 80);
+    const cardWidth = getWelcomeCardWidth(terminalWidth);
+    const cardIndent = getWelcomeIndent(cardWidth, terminalWidth);
     return lines.map((line) => {
-        const pad = getWelcomeIndent(visibleLen(line), width);
-        return ' '.repeat(pad) + line;
+        const pad = Math.max(0, Math.floor((cardWidth - visibleLen(line)) / 2));
+        return ' '.repeat(cardIndent + pad) + line;
     });
 }
+/**
+ * Geometry of the answer area: it occupies the same columns as the composer
+ * card, so the question row, the streamed answer, and the input box all share
+ * one width instead of stretching across a wide terminal.
+ */
+export function getChatAnswerArea(width) {
+    const terminalWidth = width ?? (process.stdout.columns || 80);
+    const cardWidth = getWelcomeCardWidth(terminalWidth);
+    const indent = getWelcomeIndent(cardWidth, terminalWidth);
+    const textWidth = Math.max(20, cardWidth - 2);
+    return { indent, cardWidth, textWidth, startColumn: indent + 1, wrapWidth: indent + textWidth };
+}
 export function renderQueuedCommandsBox(commands, width) {
     if (!commands || commands.length === 0)
         return [];
@@ -63,7 +84,7 @@ export function renderWelcomeCard(options) {
     const width = getWelcomeCardWidth(options.width);
     const indent = ' '.repeat(getWelcomeIndent(width, options.width));
     const displayInput = options.input && options.input.length > 0
-        ? options.input
+        ? composerInputWindow(options.input, options.inputCaret ?? options.input.length, width).text
         : '\x1b[38;5;242mAsk anything, I am all ears...\x1b[0m';
     const promptMarker = '\x1b[1;38;5;75m' + String.fromCodePoint(0x276F) + '\x1b[0;48;5;236m';
     const textBox = `${promptMarker} ${displayInput}`;
@@ -93,18 +114,21 @@ export function renderWelcomeCard(options) {
     const spaces4Count = Math.max(1, width - visibleLen(left4) - right4Raw.length);
     const line4 = left4 + ' '.repeat(spaces4Count) + right4;
     // Line 5: Working directory (left) ... model and Auto-approve (right)
-    const shortWs = options.workspace.length > 36
-        ? '...' + options.workspace.slice(-33)
+    const approvalLabelRaw = options.autoApprove
+        ? 'Auto-approve enabled (Shift+Tab)'
+        : 'Auto-approve off (Shift+Tab)';
+    const modelSpace = Math.max(8, width - approvalLabelRaw.length - 10);
+    const shortModel = options.model.length > modelSpace ? '...' + options.model.slice(-(modelSpace - 3)) : options.model;
+    const workspaceSpace = Math.max(3, width - approvalLabelRaw.length - shortModel.length - 2);
+    const shortWs = options.workspace.length > workspaceSpace
+        ? '...' + options.workspace.slice(-(workspaceSpace - 3))
         : options.workspace;
     const left5 = `\x1b[38;5;245m${shortWs}\x1b[0m`;
     const approvalLabel = options.autoApprove
         ? '\x1b[38;5;114mAuto-approve enabled (Shift+Tab)\x1b[0m'
         : '\x1b[38;5;242mAuto-approve off (Shift+Tab)\x1b[0m';
-    const approvalLabelRaw = options.autoApprove
-        ? 'Auto-approve enabled (Shift+Tab)'
-        : 'Auto-approve off (Shift+Tab)';
-    const modelLabel = `\x1b[38;5;180m${options.model}\x1b[0m`;
-    const spaces5Count = Math.max(1, width - shortWs.length - options.model.length - approvalLabelRaw.length - 2);
+    const modelLabel = `\x1b[38;5;180m${shortModel}\x1b[0m`;
+    const spaces5Count = Math.max(1, width - shortWs.length - shortModel.length - approvalLabelRaw.length - 1);
     const line5 = left5 + ' '.repeat(spaces5Count) + modelLabel + ' ' + approvalLabel;
     const cardLines = [];
     const queuedBox = renderQueuedCommandsBox(options.queuedCommands ?? [], width);
@@ -115,11 +139,11 @@ export function renderWelcomeCard(options) {
     if (!options.mentionFiles?.length && options.input?.startsWith('/')) {
         const matching = getMatchingCommands(options.input);
         if (matching.length)
-            cardLines.push(...renderSuggestionsBox(matching, width).map(line => indent + line));
+            cardLines.push(...renderSuggestionsBox(matching, width, options.commandSelection ?? 0).map(line => indent + line));
     }
     cardLines.push(indent + surfaceLine(), indent + surfaceLine(textBox), indent + surfaceLine(), indent + line4, indent + line5);
     if (options.mentionFiles && options.mentionFiles.length > 0) {
-        cardLines.push(...renderMentionSuggestionsBox(options.mentionFiles, options.mentionSelection ?? 0).map((line) => indent + line));
+        cardLines.push(...renderMentionSuggestionsBox(options.mentionFiles, options.mentionSelection ?? 0, width).map((line) => indent + line));
     }
     return cardLines.join('\n');
 }
@@ -153,60 +177,88 @@ export function selectCommandCandidate(input, currentIndex, direction) {
     const index = ((currentIndex + direction) % commands.length + commands.length) % commands.length;
     return commands[index];
 }
-export function renderSuggestionsBox(commands, width) {
+export function renderSuggestionsBox(commands, width, selectedIndex = 0) {
     if (commands.length === 0)
         return [];
-    const terminalWidth = width ?? (process.stdout?.columns || 80);
-    const targetWidth = 82;
-    const boxWidth = Math.max(78, Math.min(terminalWidth, targetWidth));
+    // Exactly the card width so the box shares the composer's columns instead of
+    // forcing its own (previously a 78–82 fixed width that escaped narrow cards).
+    const boxWidth = width ?? getWelcomeCardWidth(process.stdout?.columns || 80);
     const innerW = boxWidth - 4;
-    const title = 'Commands (Press Tab to autocomplete)';
+    const title = 'Commands (↑↓ browse, Tab to insert)';
     const remainingDashes = Math.max(0, boxWidth - title.length - 5);
     const nameColWidth = 10;
     const availDescWidth = Math.max(20, innerW - nameColWidth - 2);
     const lines = [];
     lines.push('\x1b[38;5;240m╭─ \x1b[1;38;5;75m' + title + '\x1b[0;38;5;240m ' + '─'.repeat(remainingDashes) + '╮\x1b[0m');
-    for (const cmd of commands) {
-        const nameStr = `\x1b[1;38;5;75m${cmd.name.padEnd(nameColWidth)}\x1b[0m`;
+    for (const [index, cmd] of commands.entries()) {
+        const isSelected = index === selectedIndex;
         let desc = cmd.desc;
         if (desc.length > availDescWidth) {
             desc = desc.slice(0, availDescWidth - 1) + '…';
         }
-        const descStr = `\x1b[38;5;244m${desc.padEnd(availDescWidth)}\x1b[0m`;
-        lines.push(`\x1b[38;5;240m│\x1b[0m  ${nameStr}  ${descStr}\x1b[38;5;240m│\x1b[0m`);
+        const nameCell = cmd.name.padEnd(nameColWidth);
+        const descCell = desc.padEnd(availDescWidth);
+        if (isSelected) {
+            // Highlight bar matches the app's list popups: a ❯ cursor plus a dark
+            // background across the whole row, so the arrow-key selection is visible.
+            lines.push('\x1b[38;5;240m│\x1b[0m' +
+                '\x1b[48;5;236m\x1b[1;38;5;75m❯ ' + nameCell +
+                '\x1b[0;48;5;236;38;5;253m  ' + descCell + '\x1b[0m' +
+                '\x1b[38;5;240m│\x1b[0m');
+        }
+        else {
+            lines.push('\x1b[38;5;240m│\x1b[0m' +
+                '  ' + `\x1b[1;38;5;75m${nameCell}\x1b[0m` + '  ' +
+                `\x1b[38;5;244m${descCell}\x1b[0m` +
+                '\x1b[38;5;240m│\x1b[0m');
+        }
     }
     lines.push('\x1b[38;5;240m╰' + '─'.repeat(boxWidth - 2) + '╯\x1b[0m');
     return lines;
 }
-export function renderMentionSuggestionsBox(files, selectedIndex = 0) {
+export function renderMentionSuggestionsBox(files, selectedIndex = 0, width) {
     if (files.length === 0)
         return [];
+    // Sized to the composer card (like the queued/commands boxes) so it never
+    // breaks the card's left/right boundary.
+    const boxWidth = width ?? getWelcomeCardWidth(process.stdout?.columns || 80);
+    const title = 'Files (@ to mention, Tab to insert)';
     const lines = [];
-    lines.push('\x1b[38;5;240m  ╭─ Files (@ to mention, Tab to insert) ──────────────╮\x1b[0m');
+    const remainingDashes = Math.max(0, boxWidth - title.length - 5);
+    lines.push('\x1b[38;5;240m╭─ \x1b[1;38;5;75m' + title + '\x1b[0;38;5;240m ' + '─'.repeat(remainingDashes) + '╮\x1b[0m');
     for (let i = 0; i < files.length; i++) {
         const file = files[i];
         const isSelected = i === selectedIndex;
         const marker = isSelected ? '\x1b[1;38;5;75m❯ \x1b[0m' : '  ';
-        const nameStr = isSelected ? `\x1b[1;38;5;75m@${file}\x1b[0m` : `\x1b[38;5;250m@${file}\x1b[0m`;
-        const lineContent = `${marker}${nameStr}`;
-        const plainLen = visibleLen(lineContent);
-        const pad = Math.max(0, 52 - plainLen);
-        lines.push(`\x1b[38;5;240m  │\x1b[0m ${lineContent}${' '.repeat(pad)}\x1b[38;5;240m│\x1b[0m`);
+        // Visible budget: │ + space + marker(2) + label + pad + │ = boxWidth.
+        const labelCapacity = Math.max(4, boxWidth - 5);
+        let label = `@${file}`;
+        if (label.length > labelCapacity)
+            label = `@${file.slice(0, Math.max(1, labelCapacity - 4))}...`;
+        const nameStr = isSelected ? `\x1b[1;38;5;75m${label}\x1b[0m` : `\x1b[38;5;250m${label}\x1b[0m`;
+        const pad = Math.max(0, boxWidth - 5 - label.length);
+        lines.push(`\x1b[38;5;240m│\x1b[0m ${marker}${nameStr}${' '.repeat(pad)}\x1b[38;5;240m│\x1b[0m`);
     }
-    lines.push('\x1b[38;5;240m  ╰─────────────────────────────────────────────────────╯\x1b[0m');
+    lines.push('\x1b[38;5;240m╰' + '─'.repeat(Math.max(0, boxWidth - 2)) + '╯\x1b[0m');
     return lines;
 }
-export function renderModeradoHeader() {
+export function renderModeradoHeader(width) {
     return [
         '',
-        ...centerBlock(MODERADO_ASCII_LOGO),
+        ...centerBlock(MODERADO_ASCII_LOGO, width),
         '',
-        ...centerBlock([COMMAND_HINT]),
+        ...centerBlock([COMMAND_HINT], width),
     ].join('\n');
 }
-/** Word-wrap plain text to `maxWidth` visible columns. */
+/** Word-wrap plain text to `maxWidth` visible columns, hard-breaking long words. */
 export function wrapText(text, maxWidth) {
     const out = [];
+    const pushWrapped = (word) => {
+        // A single word longer than the column budget is split so no line overflows.
+        for (let start = 0; start < word.length; start += maxWidth) {
+            out.push(word.slice(start, start + maxWidth));
+        }
+    };
     for (const rawLine of text.split('\n')) {
         if (rawLine.length <= maxWidth) {
             out.push(rawLine);
@@ -214,6 +266,14 @@ export function wrapText(text, maxWidth) {
         }
         let current = '';
         for (const word of rawLine.split(' ')) {
+            if (word.length > maxWidth) {
+                if (current.length > 0) {
+                    out.push(current);
+                    current = '';
+                }
+                pushWrapped(word);
+                continue;
+            }
             if (current.length === 0) {
                 current = word;
             }
@@ -238,27 +298,35 @@ export function wrapText(text, maxWidth) {
 export function renderChatScreen(options, height) {
     const terminalWidth = options.width ?? (process.stdout.columns || 80);
     const terminalHeight = height ?? process.stdout.rows ?? 24;
-    const maxWidth = Math.max(40, terminalWidth - 4);
-    const width = Math.max(40, terminalWidth - 2);
+    const area = getChatAnswerArea(terminalWidth);
+    const indent = ' '.repeat(area.indent);
     const lines = [];
-    lines.push(...renderModeradoHeader().split('\n'));
+    lines.push(...renderModeradoHeader(terminalWidth).split('\n'));
     lines.push('');
-    // Row 1: the user's question
+    // Row 1: the user's question, wrapped onto the same columns as the composer card.
     const questionMarker = '\x1b[1;38;5;75m' + String.fromCodePoint(0x276F) + '\x1b[0;48;5;236m';
-    const questionText = `${questionMarker} ${options.chatQuestion ?? ''}`;
-    lines.push(String.fromCharCode(27) + '[48;5;236m' + questionText + ' '.repeat(Math.max(0, width - visibleLen(questionText))) + String.fromCharCode(27) + '[0m');
+    for (const [index, questionLine] of wrapText(options.chatQuestion ?? '', area.textWidth - 2).entries()) {
+        const questionText = `${index === 0 ? questionMarker : '  '} ${questionLine}`;
+        lines.push(indent + String.fromCharCode(27) + '[48;5;236m' + questionText + ' '.repeat(Math.max(0, area.cardWidth - visibleLen(questionText))) + String.fromCharCode(27) + '[0m');
+    }
     const thoughtTime = options.chatThoughtTime ?? 0;
     const thoughtTimeLabel = thoughtTime > 0 && thoughtTime < 1 ? '<1s' : `${Math.round(thoughtTime)}s`;
-    const chatStatus = !options.tokenUsage && options.chatAnswer?.trim() ? `Thought for ${thoughtTimeLabel}` : '';
-    lines.push(chatStatus ? `\x1b[38;5;244m${chatStatus.slice(0, Math.max(0, terminalWidth - 1))}\x1b[0m` : '');
+    const chatStatus = !options.chatAnswer?.trim()
+        ? ''
+        : options.chatTaskDone
+            ? `✔ Done · Thought for ${thoughtTimeLabel}`
+            : options.tokenUsage
+                ? ''
+                : `Thought for ${thoughtTimeLabel}`;
+    lines.push(chatStatus ? indent + `\x1b[38;5;244m${chatStatus.slice(0, Math.max(0, area.cardWidth - 1))}\x1b[0m` : '');
     // Answer section: multi-line model answer
     if (options.chatAnswer && options.chatAnswer.trim().length > 0) {
         lines.push('');
-        for (const answerLine of wrapText(options.chatAnswer.trim(), maxWidth)) {
+        for (const answerLine of wrapText(options.chatAnswer.trim(), area.textWidth)) {
             const heading = answerLine.match(/^\s*(?:#{1,6}\s+([^#]+?)|\*\*(.+?)\*\*)\s*$/);
-            lines.push(heading
+            lines.push(indent + (heading
                 ? `\x1b[1;38;5;25m${(heading[1] ?? heading[2]).trim()}\x1b[0m`
-                : `\x1b[38;5;253m${answerLine}\x1b[0m`);
+                : `\x1b[38;5;253m${answerLine}\x1b[0m`));
         }
     }
     const composer = renderWelcomeCard(options).split('\n');
@@ -268,7 +336,8 @@ export function renderChatScreen(options, height) {
 }
 /** Place the terminal cursor on the first row of the bottom composer. */
 export function renderChatComposerCursor(options, inputLength) {
-    const column = getWelcomeIndent(getWelcomeCardWidth(options.width), options.width) + 2 + inputLength;
+    const width = getWelcomeCardWidth(options.width);
+    const column = getWelcomeIndent(width, options.width) + 2 + Math.min(inputLength, width - 3);
     return `\x1b[1 q\x1b[?25h\x1b[4A\r\x1b[${column}C`;
 }
 export function navigateQuestionHistory(history, direction, index, draft) {
@@ -276,34 +345,57 @@ export function navigateQuestionHistory(history, direction, index, draft) {
     return { input: nextIndex === history.length ? draft : history[nextIndex], index: nextIndex, draft };
 }
 /** Update the fixed chat elapsed-time row without repainting the terminal. */
-export function renderChatThoughtTimeUpdate(thoughtTime) {
+export function renderChatThoughtTimeUpdate(thoughtTime, taskStep, width) {
+    const area = getChatAnswerArea(width);
     const label = thoughtTime > 0 && thoughtTime < 1 ? '<1s' : `${Math.round(thoughtTime)}s`;
-    return `\x1b7\x1b[13;1H\r\x1b[K\x1b[38;5;244mThought for ${label}\x1b[0m\x1b8`;
+    const status = (taskStep && taskStep.maxSteps > 0 && taskStep.step >= 0
+        ? `Processing task… Step ${taskStep.step}/${taskStep.maxSteps} · ${label}`
+        : `Thought for ${label}`).slice(0, area.cardWidth);
+    return `\x1b7\x1b[13;${area.startColumn}H\x1b[K\x1b[38;5;244m${status}\x1b[0m\x1b8`;
 }
-/** Write one streamed fragment into the answer area without repainting the chat frame. */
-export function renderChatAnswerDelta(delta, start, width) {
+/**
+ * Write one streamed fragment into the answer area without repainting the chat
+ * frame. Wrapped lines return to `startColumn` so the answer keeps the same
+ * columns as the composer card instead of stretching across the terminal.
+ */
+export function renderChatAnswerDelta(delta, start, width, startColumn = 1) {
     let row = start.row;
     let column = start.column;
+    let writeColumn = start.column;
+    let sequence = '';
+    let line = '';
+    const flush = () => {
+        if (line.length === 0)
+            return;
+        sequence += `\x1b[${row};${writeColumn}H\x1b[38;5;253m${line}\x1b[0m`;
+        line = '';
+    };
     for (const character of delta) {
         if (character === '\n') {
+            flush();
             row++;
-            column = 1;
+            column = startColumn;
+            writeColumn = startColumn;
             continue;
         }
+        line += character;
         column++;
         if (column > width) {
+            flush();
             row++;
-            column = 1;
+            column = startColumn;
+            writeColumn = startColumn;
         }
     }
-    return { sequence: `\x1b[${start.row};${start.column}H\x1b[38;5;253m${delta}\x1b[0m`, row, column };
+    flush();
+    return { sequence, row, column };
 }
 export function renderFullWelcomeScreen(options, height) {
     if (options.chatQuestion !== undefined) {
         return renderChatScreen(options, height);
     }
     return [
-        renderModeradoHeader(),
+        renderModeradoHeader(options.width),
         '',
         renderWelcomeCard(options),
     ].join('\n') + '\n';
@@ -346,21 +438,10 @@ export function renderHelpPopupBox(version, workspace, width) {
     const remainingDashes = Math.max(0, boxWidth - titleStr.length - 5);
     const content = [
         '\x1b[1;38;5;75mSlash Commands:\x1b[0m',
-        '\x1b[1m/init\x1b[0m       Scaffold AGENTS.md from workspace scan',
-        '\x1b[1m/model\x1b[0m      Switch active AI model (Free, Paid, or Custom)',
-        '\x1b[1m/connect\x1b[0m   Choose a Gateway, hosted, or local provider',
-        '\x1b[1m/btw\x1b[0m        Ask an ephemeral side question (no session pollution)',
-        '\x1b[1m/mcp\x1b[0m       Manage local MCP servers',
-        '\x1b[1m/session\x1b[0m   Create, resume, undo, redo, share, export, or compact sessions',
-        '\x1b[1m/queue\x1b[0m     Add, inspect, or clear queued follow-up commands',
-        '\x1b[1m/workflow\x1b[0m  Inspect Git, build plans, or undo agent changes',
-        '\x1b[1m/review\x1b[0m    Review current workspace changes for bugs',
-        '\x1b[1m/map\x1b[0m       Show a compact workspace file map',
-        '\x1b[1m/budget\x1b[0m    Set a per-task token limit',
-        '\x1b[1m/skills\x1b[0m   List skills; enable or disable user skills',
-        '\x1b[1m/clear\x1b[0m      Reset conversation memory and context history',
-        '\x1b[1m/help\x1b[0m       Display this commands, shortcuts & version guide',
-        '\x1b[1m/exit\x1b[0m       Exit Moderado session cleanly',
+        ...getHelpCommandGroups().flatMap(({ name, commands }) => [
+            `\x1b[1;38;5;180m${name}:\x1b[0m`,
+            ...commands.map(([command, description]) => `\x1b[1m${command.padEnd(11)}\x1b[0m${description}`),
+        ]),
         '',
         '\x1b[1;38;5;114mKeyboard Shortcuts:\x1b[0m',
         '\x1b[1mTab\x1b[0m          Toggle between [Plan] and [Execute] mode',
@@ -368,6 +449,7 @@ export function renderHelpPopupBox(version, workspace, width) {
         '\x1b[1mCtrl+C\x1b[0m       Cancel active inference or exit session',
         '\x1b[1mEsc\x1b[0m          Stop the active task',
         '\x1b[1mLeft/Right\x1b[0m   Move the caret inside the bottom input line',
+        '\x1b[1mUp/Down\x1b[0m       Browse slash commands after "/", else recall history',
         '\x1b[1mMouse click\x1b[0m  Place the caret on the input line',
         '',
         `\x1b[38;5;245mWorkspace:\x1b[0m  \x1b[38;5;253m${shortWs}\x1b[0m`,
@@ -485,9 +567,12 @@ export async function promptInteractiveTurn(options) {
         mode: currentMode,
         autoApprove: currentAutoApprove,
         input,
+        inputCaret: caret,
+        commandSelection,
         chatQuestion: options.chatQuestion,
         chatAnswer: options.chatAnswer,
         chatThoughtTime: options.chatThoughtTime,
+        chatTaskDone: options.chatTaskDone,
         outputTokenRate: options.outputTokenRate,
         tokenUsage: options.tokenUsage,
         queuedCommands: options.queuedCommands,
@@ -527,7 +612,8 @@ export async function promptInteractiveTurn(options) {
      */
     const positionCursorOnInput = () => {
         const { row, column } = getComposerAnchor();
-        stdout.write(`\x1b[1 q\x1b[?25h\x1b[${row};${column + caret}H`);
+        const { caretColumn } = composerInputWindow(input, caret, getWelcomeCardWidth());
+        stdout.write(`\x1b[1 q\x1b[?25h\x1b[${row};${column + caretColumn}H`);
     };
     /** Full-screen redraw: clear everything, repaint welcome TUI, reposition cursor. */
     const redrawFull = () => {
@@ -670,6 +756,13 @@ export async function promptInteractiveTurn(options) {
                         if (newId && newId !== currentModel) {
                             currentModel = newId;
                         }
+                        const autoContinuePrompt = options.takeAutoContinuePrompt?.();
+                        if (autoContinuePrompt) {
+                            options.signal?.removeEventListener('abort', onAbort);
+                            cleanup();
+                            resolve({ text: autoContinuePrompt, mode: currentMode, autoApprove: currentAutoApprove });
+                            return;
+                        }
                     }
                     // Selection flow left stdin in non-raw mode — restore it for our TUI
                     readline.emitKeypressEvents(stdin);
@@ -712,6 +805,13 @@ export async function promptInteractiveTurn(options) {
                             stdout.write(renderWelcomePopupLayer(getOptions(), popupLines, stdout.columns, stdout.rows));
                         });
                     }
+                    const autoContinuePrompt = options.takeAutoContinuePrompt?.();
+                    if (autoContinuePrompt) {
+                        options.signal?.removeEventListener('abort', onAbort);
+                        cleanup();
+                        resolve({ text: autoContinuePrompt, mode: currentMode, autoApprove: currentAutoApprove });
+                        return;
+                    }
                     readline.emitKeypressEvents(stdin);
                     stdin.resume();
                     stdin.setRawMode(true);
@@ -1014,11 +1114,12 @@ export function formatTokenUsage(event) {
 }
 /** Update only the chat status row, preserving the answer/composer cursor. */
 export function renderChatUsageUpdate(event, width = process.stdout.columns || 80, budgetStatus, usageDetails, terminalHeight = process.stdout.rows || 24, mode) {
+    const area = getChatAnswerArea(width);
     const usageText = formatTokenUsage(event);
     const suffix = `${usageDetails ? ` | ${usageDetails}` : ''}${budgetStatus ? ` | ${budgetStatus}` : ''}`;
     const modeLabel = mode === 'Plan' ? '\x1b[1;38;5;75m[Plan]\x1b[0m / Execute (Tab)' : 'Plan / \x1b[1;38;5;75m[Execute]\x1b[0m (Tab)';
     const modeText = mode === 'Plan' ? '[Plan] / Execute (Tab)' : 'Plan / [Execute] (Tab)';
-    const rowWidth = Math.max(0, width - 1);
+    const rowWidth = area.cardWidth;
     const textLimit = Math.max(0, rowWidth - (mode ? modeText.length + 1 : 0));
     const usageLimit = Math.max(0, textLimit - suffix.length);
     const clippedUsage = mode && usageText.length > usageLimit
@@ -1026,14 +1127,15 @@ export function renderChatUsageUpdate(event, width = process.stdout.columns || 8
         : usageText;
     const text = `${clippedUsage}${suffix}`.slice(0, textLimit);
     const row = Math.max(1, terminalHeight - 2);
-    return `\x1b7\x1b[${row};1H\r\x1b[K\x1b[38;5;244m${text}\x1b[0m${mode ? `${' '.repeat(Math.max(1, rowWidth - text.length - modeText.length))}${modeLabel}` : ''}\x1b8`;
+    return `\x1b7\x1b[${row};${area.startColumn}H\x1b[K\x1b[38;5;244m${text}\x1b[0m${mode ? `${' '.repeat(Math.max(1, rowWidth - text.length - modeText.length))}${modeLabel}` : ''}\x1b8`;
 }
 /** Show trusted, schema-validated Gateway route changes without provider supplied prose. */
 export function renderGatewayFallbackUpdate(event, width = process.stdout.columns || 80) {
+    const area = getChatAnswerArea(width);
     const destination = event.toProvider ? `${event.toProvider}/${event.toModel}` : event.toModel;
     const reason = event.reason === 'rate_limited_or_unavailable' ? 'after an upstream route was rate limited or unavailable' : 'after a fallback';
-    const text = `Gateway route changed to ${destination} ${reason}`.slice(0, Math.max(0, width - 1));
+    const text = `Gateway route changed to ${destination} ${reason}`.slice(0, area.cardWidth);
     const row = renderModeradoHeader().split('\n').length + 3;
-    return `\x1b7\x1b[${row};1H\r\x1b[K\x1b[38;5;244m${text}\x1b[0m\x1b8`;
+    return `\x1b7\x1b[${row};${area.startColumn}H\x1b[K\x1b[38;5;244m${text}\x1b[0m\x1b8`;
 }
 //# sourceMappingURL=welcome.js.map