moderado 0.4.46 → 0.4.51

package/dist/ui/composer.d.ts.map

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

package/dist/ui/composer.js

@@ -7,7 +7,7 @@
 import readline from 'node:readline';
 import { spawnSync } from 'node:child_process';
 import { activeMentionToken, filterMentionCandidates } from './file_mentions.js';
-import { MOUSE_REPORT_OFF, MOUSE_REPORT_ON, MOUSE_REPORT_PATTERN, composerInputWindow, exitCleanly, getChatComposerRows, getChatLayout, getChatCardWidth, getMatchingCommands, getWelcomeBottomPadding, getWelcomeCardWidth, getWelcomeIndent, navigateQuestionHistory, renderCenteredWelcomeScreen, renderFullWelcomeScreen, renderHelpPopupBox, renderWelcomePopupLayer, windowChatTranscriptAt, buildChatTranscriptRows, } from './welcome.js';
+import { KEY_MODIFIER_REPORT_OFF, KEY_MODIFIER_REPORT_ON, MOUSE_REPORT_OFF, MOUSE_REPORT_ON, MOUSE_REPORT_PATTERN, composerCaretIndex, composerView, exitCleanly, getChatComposerRows, getChatLayout, getChatCardWidth, getComposerInputMaxRows, getMatchingCommands, getWelcomeBottomPadding, getWelcomeCardWidth, getWelcomeIndent, navigateQuestionHistory, renderCenteredWelcomeScreen, renderFullWelcomeScreen, renderHelpPopupBox, renderAboutPopupBox, renderWelcomePopupLayer, windowChatTranscriptAt, buildChatTranscriptRows, chatTranscriptOffsetForRow, getChatTranscriptWidth, } from './welcome.js';
 async function animateChatWordmark(stdout) {
     const wordmark = 'MODERADO';
     const frames = 6;
@@ -19,7 +19,7 @@ async function animateChatWordmark(stdout) {
         const endColumn = Math.max(1, columns - width + 1);
         const progress = frame / frames;
         const column = Math.round(startColumn + (endColumn - startColumn) * progress);
-        const startRow = Math.max(1, Math.floor(rows / 2) - 4);
+        const startRow = Math.max(1, Math.floor(rows / 2) - 5);
         const row = Math.round(startRow + (1 - startRow) * progress);
         stdout.write(`\x1b[H\x1b[J\x1b[${row};${column}H\x1b[1;38;5;75m${wordmark.slice(0, width)}\x1b[0m`);
         if (frame < frames)
@@ -44,6 +44,36 @@ function isMcpCommandInput(value) {
     const command = value.trim();
     return command === '/mcp' || command.startsWith('/mcp ');
 }
+/**
+ * Modified keys the terminal reports as escape sequences once XTMODKEYS is on:
+ * `CSI 27;modifier;key~` (xterm family) or `CSI key;modifier u` (kitty
+ * protocol). readline decodes those byte by byte, so the raw chunk is matched
+ * here instead and the derived keypresses are dropped.
+ */
+const MODIFIED_KEY_PATTERN = /\x1b\[(?:27;(\d+);(\d+)~|(\d+);(\d+)u)/;
+const WIN32_KEY_PATTERN = /\x1b\[(\d+);\d+;(\d+);([01]);(\d+);(\d+)_/g;
+const WIN32_INPUT_ON = '\x1b[?9001h';
+const WIN32_INPUT_OFF = '\x1b[?9001l';
+const WIN32_KEY_NAMES = {
+    8: 'backspace', 9: 'tab', 13: 'return', 27: 'escape',
+    33: 'pageup', 34: 'pagedown', 37: 'left', 38: 'up',
+    39: 'right', 40: 'down', 46: 'delete',
+};
+function decodeModifiedKey(text) {
+    const match = MODIFIED_KEY_PATTERN.exec(text);
+    if (!match)
+        return undefined;
+    const modifier = Number(match[1] ?? match[4]);
+    const keyCode = Number(match[2] ?? match[3]);
+    const bits = modifier - 1; // 1 = Shift, 2 = Alt, 4 = Ctrl
+    if (keyCode === 13 && (bits & 1))
+        return 'newline';
+    if (keyCode === 9 && (bits & 1))
+        return 'toggle-auto-approve';
+    if (keyCode === 99 && (bits & 4))
+        return 'cancel';
+    return undefined;
+}
 export async function promptInteractiveTurn(options) {
     const stdin = process.stdin;
     const stdout = process.stdout;
@@ -55,6 +85,10 @@ export async function promptInteractiveTurn(options) {
     let caret = 0;
     /** True while keypress events derived from a mouse report are being dropped. */
     let ignoreComposerKeypress = false;
+    const useWin32Input = process.platform === 'win32' && Boolean(process.env.WT_SESSION);
+    let win32InputBound = false;
+    let pendingWin32Key = '';
+    let handleWin32Keypress = () => { };
     /** Terminal height, with the same fallback the renderer uses. */
     const getRows = () => stdout.rows || 24;
     let commandSelection = 0;
@@ -106,6 +140,7 @@ export async function promptInteractiveTurn(options) {
         commandSelection,
         chatQuestion: options.chatQuestion,
         chatAnswer: options.chatAnswer,
+        chatHistory: options.chatHistory,
         chatAnswerOffset: answerOffset,
         // Live activity for the running turn, so a composer-driven repaint shows
         // the transcript the loop is painting rather than an empty answer area.
@@ -141,23 +176,26 @@ export async function promptInteractiveTurn(options) {
     stdin.resume();
     stdin.setRawMode(true);
     const getExtraLines = () => mentionFiles.length > 0 ? mentionFiles.length + 2 : 0;
-    /** Rows between the painted composer line and the terminal's last row. */
-    const getComposerOffset = () => getWelcomeBottomPadding(getOptions(), getRows()) + 4 + getExtraLines();
-    /** Screen row and 1-based column of the composer's first text cell. */
-    const getComposerAnchor = () => {
+    /** Columns of the card the input is painted in. */
+    const getCardWidth = () => getOptions().chatQuestion !== undefined
+        ? getChatCardWidth(stdout.columns)
+        : getWelcomeCardWidth(stdout.columns);
+    /** Painted rows of the input box plus where the caret sits in them. */
+    const getInputView = () => composerView(input, caret, getCardWidth(), getComposerInputMaxRows(getRows()));
+    /** Rows between the input's first row and the terminal's last row. */
+    const getComposerOffset = () => getWelcomeBottomPadding(getOptions(), getRows()) + 3 + getInputView().rows.length + getExtraLines();
+    /** Screen row and 1-based column of the caret's cell in the input box. */
+    const getComposerAnchor = (caretRow = getInputView().caretRow) => {
         const options = getOptions();
-        const cardWidth = options.chatQuestion !== undefined
-            ? getChatCardWidth(stdout.columns)
-            : getWelcomeCardWidth(stdout.columns);
-        const column = getWelcomeIndent(cardWidth, stdout.columns) + 3;
+        const column = getWelcomeIndent(getCardWidth(), stdout.columns) + 3;
         if (options.chatQuestion !== undefined) {
             // Chat frames place the composer at a computed row. Measure the card that
-            // is actually painted — a queued-commands or mention box makes it taller —
-            // so the caret never lands on the mode row or inside the box.
+            // is actually painted — a queued-commands box or a wrapped prompt makes it
+            // taller — so the caret never lands on the mode row or inside the box.
             const layout = getChatLayout(stdout.columns, getRows(), options.chatQuestion, getChatComposerRows(options));
-            return { row: layout.composerTop + 1, column };
+            return { row: layout.composerTop + 1 + caretRow, column };
         }
-        return { row: getRows() - getComposerOffset(), column };
+        return { row: getRows() - getComposerOffset() + caretRow, column };
     };
     /**
      * Move cursor to the ❯ input line (Line 2 inside the centered card).
@@ -166,20 +204,18 @@ export async function promptInteractiveTurn(options) {
      * pressed repeatedly, e.g. browsing history with Left/Right.
      */
     const positionCursorOnInput = () => {
-        const { row, column } = getComposerAnchor();
-        const cardWidth = getOptions().chatQuestion !== undefined
-            ? getChatCardWidth(stdout.columns)
-            : getWelcomeCardWidth(stdout.columns);
-        const { caretColumn } = composerInputWindow(input, caret, cardWidth);
-        stdout.write(`\x1b[1 q\x1b[?25h\x1b[${row};${column + caretColumn}H`);
+        const view = getInputView();
+        const { row, column } = getComposerAnchor(view.caretRow);
+        stdout.write(`\x1b[1 q\x1b[?25h\x1b[${row};${column + view.caretColumn}H`);
     };
     /** Full-screen redraw: clear everything, repaint welcome TUI, reposition cursor. */
     const redrawFull = () => {
+        stdout.write('\x1b[?2026h');
         stdout.write('\x1b[H\x1b[J');
         stdout.write(renderCenteredWelcomeScreen(getOptions(), stdout.rows));
         positionCursorOnInput();
+        stdout.write('\x1b[?2026l');
     };
-    /** Repaint the welcome view so it remains centered after every edit or resize. */
     const redrawCard = () => {
         redrawFull();
     };
@@ -201,7 +237,7 @@ export async function promptInteractiveTurn(options) {
         const layout = currentChatLayout();
         if (layout.answerRows <= 0)
             return 0;
-        return windowChatTranscriptAt(buildChatTranscriptRows(activity, answer ?? '', layout.area.textWidth).rows, layout.answerRows, 0).hiddenAbove;
+        return windowChatTranscriptAt(buildChatTranscriptRows(activity, answer ?? '', getChatTranscriptWidth(layout), options.chatHistory, options.chatQuestion).rows, layout.answerRows, 0).hiddenAbove;
     };
     /**
      * Move the transcript view; positive scrolls up towards older lines.
@@ -222,15 +258,84 @@ export async function promptInteractiveTurn(options) {
         options.onTranscriptScroll?.(next);
         redrawFull();
     };
+    const jumpAnswerToRow = (row) => {
+        const layout = currentChatLayout();
+        const rows = buildChatTranscriptRows(options.getChatActivity?.(), options.chatAnswer ?? '', getChatTranscriptWidth(layout), options.chatHistory, options.chatQuestion).rows;
+        if (rows.length <= layout.answerRows)
+            return;
+        const next = chatTranscriptOffsetForRow(rows.length, layout.answerRows, row);
+        if (next === answerOffset)
+            return;
+        answerOffset = next;
+        options.onTranscriptScroll?.(next);
+        redrawFull();
+    };
     /** One page is one screenful of answer rows, minus the overflow note. */
     const answerPage = () => Math.max(1, currentChatLayout().answerRows - 1);
+    /** Insert a line break at the caret — Shift+Enter and Ctrl+J land here. */
+    const insertLineFeed = () => {
+        input = input.slice(0, caret) + '\n' + input.slice(caret);
+        caret += 1;
+        commandSelection = 0;
+        questionHistoryIndex = questionHistory.length;
+        updateMentions();
+        redrawCard();
+    };
+    /** Toggle Plan/Execute; kept callable from a decoded escape sequence too. */
+    const toggleMode = () => {
+        currentMode = currentMode === 'Plan' ? 'Execute' : 'Plan';
+        redrawCard();
+    };
     /**
-     * Place the caret where the user clicked on the composer line. Only a primary
+     * Cancel the session from a decoded escape sequence (Ctrl+C reported as a
+     * modified key). Assigned once the cleanup path exists.
+     */
+    let cancelSession = () => { };
+    /**
+     * Place the caret where the user clicked inside the input box. Only a primary
      * press is honoured; releases, drags, wheel and other buttons are ignored.
      */
-    const onMouseData = (chunk) => {
+    const onComposerData = (chunk) => {
         const text = typeof chunk === 'string' ? chunk : chunk.toString('utf8');
         let reported = false;
+        // Windows Terminal's Win32 input mode reports every key as a record.
+        // Translate those records through the same composer handler as legacy keys.
+        if (win32InputBound) {
+            const keyData = pendingWin32Key + text;
+            const records = [...keyData.matchAll(WIN32_KEY_PATTERN)];
+            pendingWin32Key = /\x1b\[[0-9;]*$/.exec(keyData)?.[0] ?? '';
+            if (records.length || pendingWin32Key)
+                reported = true;
+            for (const record of records) {
+                if (record[3] !== '1')
+                    continue;
+                const virtualKey = Number(record[1]);
+                const unicode = Number(record[2]);
+                const state = Number(record[4]);
+                const repeat = Number(record[5]);
+                if (unicode > 65535 || repeat < 1 || repeat > 256)
+                    continue;
+                const char = unicode ? String.fromCharCode(unicode) : '';
+                const name = WIN32_KEY_NAMES[virtualKey] ?? (virtualKey >= 65 && virtualKey <= 90 ? String.fromCharCode(virtualKey).toLowerCase() : char.toLowerCase());
+                if (!name)
+                    continue;
+                const altGr = Boolean((state & 1) && (state & 8) && unicode >= 32);
+                const key = { name, shift: Boolean(state & 16), ctrl: Boolean(state & 12) && !altGr, meta: Boolean(state & 3) && !altGr };
+                for (let index = 0; index < repeat; index++)
+                    handleWin32Keypress(virtualKey === 13 ? '\r' : char, key);
+            }
+        }
+        // Shift+Enter arrives as one of these sequences once the terminal reports
+        // modified keys; readline would otherwise type it out as literal garbage.
+        const modified = decodeModifiedKey(text);
+        if (modified === 'newline')
+            insertLineFeed();
+        else if (modified === 'toggle-auto-approve')
+            toggleMode();
+        else if (modified === 'cancel')
+            cancelSession();
+        if (modified)
+            reported = true;
         for (const report of text.matchAll(MOUSE_REPORT_PATTERN)) {
             reported = true;
             // Wheel up (64) / down (65): three rows a notch, like every other pager.
@@ -240,10 +345,21 @@ export async function promptInteractiveTurn(options) {
             }
             if (report[4] !== 'M' || Number(report[1]) !== 0)
                 continue;
-            const { row, column } = getComposerAnchor();
-            if (Number(report[3]) !== row)
+            if (options.chatQuestion !== undefined) {
+                const layout = currentChatLayout();
+                const scrollbarColumn = layout.area.startColumn + getChatTranscriptWidth(layout);
+                const clickedRow = Number(report[3]) - layout.answerTop;
+                if (Number(report[2]) === scrollbarColumn && clickedRow >= 0 && clickedRow < layout.answerRows) {
+                    jumpAnswerToRow(clickedRow);
+                    continue;
+                }
+            }
+            const view = getInputView();
+            const { row, column } = getComposerAnchor(0);
+            const rowOffset = Number(report[3]) - row;
+            if (rowOffset < 0 || rowOffset >= view.rows.length)
                 continue;
-            caret = Math.max(0, Math.min(input.length, Number(report[2]) - column));
+            caret = composerCaretIndex(input, view.rows, rowOffset, Number(report[2]) - column);
             positionCursorOnInput();
         }
         if (reported) {
@@ -254,7 +370,7 @@ export async function promptInteractiveTurn(options) {
     };
     // Registered before readline's decoder so a report is consumed before it is
     // mistaken for typed text.
-    stdin.prependListener('data', onMouseData);
+    stdin.prependListener('data', onComposerData);
     stdout.on('resize', onResize);
     // Initial paint
     if (options.isFirstTurn) {
@@ -270,9 +386,9 @@ export async function promptInteractiveTurn(options) {
     return new Promise((resolve) => {
         const cleanup = () => {
             unbindComposerInput();
-            stdin.removeListener('data', onMouseData);
+            stdin.removeListener('data', onComposerData);
             stdout.removeListener('resize', onResize);
-            stdout.write(`${MOUSE_REPORT_OFF}\x1b[0 q\x1b[?25h`);
+            stdout.write(`${KEY_MODIFIER_REPORT_OFF}${MOUSE_REPORT_OFF}\x1b[0 q\x1b[?25h`);
             if (stdin.isTTY) {
                 try {
                     stdin.setRawMode(false);
@@ -284,6 +400,10 @@ export async function promptInteractiveTurn(options) {
             }
             catch { /* ignore */ }
         };
+        cancelSession = () => {
+            cleanup();
+            void exitCleanly('\x1b[33mSession cancelled.\x1b[0m');
+        };
         const onAbort = () => {
             cleanup();
             resolve({ text: '', mode: currentMode, autoApprove: currentAutoApprove });
@@ -295,11 +415,34 @@ export async function promptInteractiveTurn(options) {
         // Using a void async IIFE so we can await async operations (model selector)
         // inside a synchronous event listener.  For any async branch we first
         // remove ourselves from stdin so no duplicate events fire during the await.
-        const onKeypress = (str, key) => {
+        const onKeypress = (str, key, fromWin32 = false) => {
             void (async () => {
                 // Keystrokes decoded from a mouse report were already handled above.
-                if (ignoreComposerKeypress)
+                if (!fromWin32 && ignoreComposerKeypress)
+                    return;
+                // Intercept XTMODKEYS modified keys that readline cannot decode.
+                // The raw byte chunk `str` carries the escape sequence (e.g. CSI 27;1;13~
+                // for Shift+Enter); readline decodes those byte-by-byte and drops them,
+                // so we match the pattern directly and derive the keypress ourselves.
+                const modified = decodeModifiedKey(str);
+                if (modified === 'newline') {
+                    insertLineFeed();
+                    return;
+                }
+                if (modified === 'toggle-auto-approve') {
+                    currentAutoApprove = !currentAutoApprove;
+                    redrawCard();
                     return;
+                }
+                if (modified === 'cancel') {
+                    cleanup();
+                    return await exitCleanly('\\x1b[33mSession cancelled.\\x1b[0m');
+                }
+                // Enter submits; a line feed (Ctrl+J, or Shift+Enter where the terminal
+                // reports it) breaks the line instead.
+                const isEnter = Boolean(key) && (key.name === 'return' || key.name === 'enter');
+                const isLineFeed = isEnter && (str === '\n' || key.shift === true || key.meta === true || key.ctrl === true);
+                const isSubmit = isEnter && !isLineFeed;
                 if (options.signal?.aborted) {
                     cleanup();
                     resolve({ text: '', mode: currentMode, autoApprove: currentAutoApprove });
@@ -321,7 +464,7 @@ export async function promptInteractiveTurn(options) {
                 // ── /help overlay popup ───────────────────────────────────────────────
                 // Triggered when Enter is pressed with "/help" already in the input box.
                 // We keep the main TUI as background and layer the help box on top.
-                if (key && (key.name === 'return' || key.name === 'enter') && input.trim() === '/help') {
+                if (isSubmit && input.trim() === '/help') {
                     setInput('');
                     unbindComposerInput(); // pause main handler
                     // Paint: full welcome TUI (background) + help box on top
@@ -355,6 +498,37 @@ export async function promptInteractiveTurn(options) {
                     bindComposerInput(); // re-attach main handler
                     return;
                 }
+                // ── /about overlay popup ──────────────────────────────────────────────
+                // Triggered when Enter is pressed with "/about" already in the input box.
+                if (isSubmit && input.trim() === '/about') {
+                    setInput('');
+                    unbindComposerInput();
+                    const aboutLines = renderAboutPopupBox(options.version ?? 'v0.1');
+                    const paintAbout = () => {
+                        stdout.write('\x1b[H\x1b[J');
+                        stdout.write(renderWelcomePopupLayer(getOptions(), aboutLines, stdout.columns, stdout.rows));
+                    };
+                    const onAboutResize = () => paintAbout();
+                    stdout.on('resize', onAboutResize);
+                    paintAbout();
+                    await new Promise((dismissResolve) => {
+                        const onDismiss = (s, k) => {
+                            if ((k && (k.name === 'escape' || k.name === 'return' || k.name === 'enter')) ||
+                                s === 'q' || s === 'Q' ||
+                                (k && k.ctrl && k.name === 'c')) {
+                                stdin.removeListener('keypress', onDismiss);
+                                stdout.removeListener('resize', onAboutResize);
+                                dismissResolve();
+                            }
+                        };
+                        stdin.on('keypress', onDismiss);
+                    });
+                    stdout.write('\x1b[H\x1b[J');
+                    stdout.write(renderCenteredWelcomeScreen(getOptions(), stdout.rows));
+                    positionCursorOnInput();
+                    bindComposerInput();
+                    return;
+                }
                 // ── /model overlay popup ──────────────────────────────────────────────
                 // Triggered when Enter is pressed with "/model" in the input box.
                 // We temporarily detach the main keypress listener and hand the model
@@ -363,7 +537,7 @@ export async function promptInteractiveTurn(options) {
                 // layer on top of it (Cline/OpenCode style) — the popup never scrolls
                 // the background because every step redraws the whole frame.
                 // After it returns, we repaint the full welcome TUI and reposition cursor.
-                if (key && (key.name === 'return' || key.name === 'enter') && input.trim() === '/model') {
+                if (isSubmit && input.trim() === '/model') {
                     setInput('');
                     unbindComposerInput(); // pause main handler
                     if (options.onModelSelect) {
@@ -393,7 +567,7 @@ export async function promptInteractiveTurn(options) {
                     bindComposerInput(); // re-attach main handler
                     return;
                 }
-                if (key && (key.name === 'return' || key.name === 'enter') && input.trim() === '/connect') {
+                if (isSubmit && input.trim() === '/connect') {
                     setInput('');
                     unbindComposerInput();
                     const drawFrame = (popupLines) => {
@@ -414,7 +588,7 @@ export async function promptInteractiveTurn(options) {
                     bindComposerInput();
                     return;
                 }
-                if (key && (key.name === 'return' || key.name === 'enter') && input.trim() === '/transcript') {
+                if (isSubmit && input.trim() === '/transcript') {
                     setInput('');
                     unbindComposerInput();
                     stdout.write('\x1b[H\x1b[J');
@@ -447,7 +621,7 @@ export async function promptInteractiveTurn(options) {
                     bindComposerInput();
                     return;
                 }
-                if (key && (key.name === 'return' || key.name === 'enter') && input.trim().startsWith('/session')) {
+                if (isSubmit && input.trim().startsWith('/session')) {
                     const command = input.trim();
                     setInput('');
                     unbindComposerInput();
@@ -473,7 +647,7 @@ export async function promptInteractiveTurn(options) {
                     bindComposerInput();
                     return;
                 }
-                if (key && (key.name === 'return' || key.name === 'enter') && input.trim().startsWith('/queue')) {
+                if (isSubmit && input.trim().startsWith('/queue')) {
                     const command = input.trim();
                     setInput('');
                     unbindComposerInput();
@@ -502,7 +676,7 @@ export async function promptInteractiveTurn(options) {
                     bindComposerInput();
                     return;
                 }
-                if (key && (key.name === 'return' || key.name === 'enter') && input.trim().startsWith('/btw')) {
+                if (isSubmit && input.trim().startsWith('/btw')) {
                     const command = input.trim();
                     setInput('');
                     unbindComposerInput();
@@ -545,7 +719,7 @@ export async function promptInteractiveTurn(options) {
                     bindComposerInput();
                     return;
                 }
-                if (key && (key.name === 'return' || key.name === 'enter') && isMcpCommandInput(input)) {
+                if (isSubmit && isMcpCommandInput(input)) {
                     const command = input.trim();
                     setInput('');
                     unbindComposerInput();
@@ -564,7 +738,7 @@ export async function promptInteractiveTurn(options) {
                     bindComposerInput();
                     return;
                 }
-                if (key && (key.name === 'return' || key.name === 'enter') && input.trim() === '/init') {
+                if (isSubmit && input.trim() === '/init') {
                     setInput('');
                     unbindComposerInput();
                     if (options.onInit) {
@@ -582,7 +756,7 @@ export async function promptInteractiveTurn(options) {
                     bindComposerInput();
                     return;
                 }
-                if (key && (key.name === 'return' || key.name === 'enter') && input.trim().startsWith('/workflow')) {
+                if (isSubmit && input.trim().startsWith('/workflow')) {
                     const command = input.trim();
                     setInput('');
                     unbindComposerInput();
@@ -600,14 +774,14 @@ export async function promptInteractiveTurn(options) {
                     return;
                 }
                 // ── /clear ────────────────────────────────────────────────────────────
-                if (key && (key.name === 'return' || key.name === 'enter') && input.trim() === '/clear') {
+                if (isSubmit && input.trim() === '/clear') {
                     setInput('');
                     options.onClear?.();
                     redrawFull();
                     return;
                 }
                 // ── /exit ─────────────────────────────────────────────────────────────
-                if (key && (key.name === 'return' || key.name === 'enter') &&
+                if (isSubmit &&
                     (input.trim() === '/exit' || input.trim() === '/quit')) {
                     cleanup();
                     if (options.signal)
@@ -680,7 +854,11 @@ export async function promptInteractiveTurn(options) {
                     return;
                 }
                 // Enter — submit real user message
-                if (key.name === 'return' || key.name === 'enter') {
+                if (isLineFeed) {
+                    insertLineFeed();
+                    return;
+                }
+                if (isSubmit) {
                     const matching = getMatchingCommands(input);
                     if (input.startsWith('/') && matching.length > 0 && !matching.some((command) => command.name === input.trim())) {
                         setInput(matching[Math.min(commandSelection, matching.length - 1)].name);
@@ -695,7 +873,10 @@ export async function promptInteractiveTurn(options) {
                         options.signal.removeEventListener('abort', onAbort);
                     if (animateFirstChat)
                         await animateChatWordmark(stdout);
-                    const moveDown = 4 + getExtraLines();
+                    // Move past the rows below the caret's row, so the frame that follows
+                    // starts under the card however tall the input box grew.
+                    const inputView = getInputView();
+                    const moveDown = (inputView.rows.length - 1 - inputView.caretRow) + 4 + getExtraLines();
                     stdout.write(`\x1b[${moveDown}B\r\n\x1b[0 q\x1b[?25h`);
                     resolve({ text: trimmed, mode: currentMode, autoApprove: currentAutoApprove });
                     return;
@@ -742,6 +923,7 @@ export async function promptInteractiveTurn(options) {
                 }
             })();
         };
+        handleWin32Keypress = (str, key) => onKeypress(str, key, true);
         /**
          * Mouse reporting is only useful while the composer owns the keyboard: a
          * click on the composer line places the caret. Popups and sub-prompts take
@@ -749,12 +931,17 @@ export async function promptInteractiveTurn(options) {
          * normal text selection, and clicks never leak into their filter fields.
          */
         const bindComposerInput = () => {
-            stdout.write(MOUSE_REPORT_ON);
+            win32InputBound = useWin32Input;
+            stdout.write(MOUSE_REPORT_ON + KEY_MODIFIER_REPORT_ON + (useWin32Input ? WIN32_INPUT_ON : ''));
             stdin.on('keypress', onKeypress);
         };
         const unbindComposerInput = () => {
+            win32InputBound = false;
+            pendingWin32Key = '';
             stdin.removeListener('keypress', onKeypress);
-            stdout.write(MOUSE_REPORT_OFF);
+            // Key-modifier reporting is scoped to the composer: popups read plain
+            // legacy keys, and leaving XTMODKEYS on would change what they receive.
+            stdout.write((useWin32Input ? WIN32_INPUT_OFF : '') + KEY_MODIFIER_REPORT_OFF + MOUSE_REPORT_OFF);
         };
         bindComposerInput();
     });