termux-dev 1.8.2 → 1.9.1

package/dist/cli/prompt.js

@@ -7,7 +7,8 @@ import { formatPromptHeader } from './modeborder.js';
 import { filterCommandPalette, estimatePromptTokens, formatPromptTokenBadge } from './prompt_palette.js';
 import { PromptHistoryNavigator } from './history_search.js';
 import { buildPromptFrame, moveCursorRow, palette, renderUserEcho, resolveMode } from './ui.js';
-import { padEndWidth, truncateWidth } from './width.js';
+import { displayWidth, padEndWidth, rowsToTop, truncateWidth } from './width.js';
+import { EXTENDED_KEYS_OFF, EXTENDED_KEYS_ON, isNewlineKey, normalizeKey } from './keys.js';
 export const SLASH_COMMANDS = [
     { cmd: '/new', desc: 'Start a new clean chat session' },
     { cmd: '/resume', desc: 'Resume a previous chat session' },
@@ -97,12 +98,19 @@ export function askPrompt(opts = {}) {
         if (process.stdin.isTTY) {
             process.stdin.setRawMode(true);
             process.stdout.write('\x1b[?2004h'); // Enable bracketed paste mode
+            // Lets the terminal tell Ctrl+Enter and Shift+Enter (a new paragraph) from Enter (send).
+            process.stdout.write(EXTENDED_KEYS_ON);
         }
         // ── framed prompt (clean layout) ──
         // The frame is a block of rows; the cursor rests on the input row. Redrawing moves up
         // to the top of the block, rewrites every row and returns to the cursor position.
         let frameRowsDrawn = 0;
         let frameCursorRow = 0;
+        // The geometry of what is on screen, to find the top of the frame again after a resize
+        // (the terminal re-wraps the rows, so the number of lines is not the number of rows).
+        let frameLineWidths = [];
+        let frameCursorCol = 0;
+        const rowsUpToFrameTop = () => rowsToTop(frameLineWidths, frameCursorRow, frameCursorCol, process.stdout.columns || 80);
         function cleanDropdownRows(items, cols, rows) {
             if (items.length === 0)
                 return [];
@@ -134,7 +142,7 @@ export function askPrompt(opts = {}) {
             const rows = process.stdout.rows || 24;
             const frame = buildPromptFrame({
                 cols,
-                mode: resolveMode(!!opts.planMode, !!opts.isYolo),
+                mode: resolveMode(!!opts.planMode, !!opts.isYolo, !!opts.isExtra),
                 model: opts.model,
                 cwd: opts.cwd,
                 branch: opts.branch,
@@ -149,8 +157,9 @@ export function askPrompt(opts = {}) {
                 below: cleanDropdownRows(getDropdownItems(), cols, rows),
             });
             let buf = '\x1b[0m';
-            if (frameRowsDrawn > 0 && frameCursorRow > 0)
-                buf += `\x1b[${frameCursorRow}A`;
+            const up = frameRowsDrawn > 0 ? rowsUpToFrameTop() : 0;
+            if (up > 0)
+                buf += `\x1b[${up}A`;
             buf += '\r';
             frame.lines.forEach((line, i) => {
                 buf += '\x1b[2K' + line + '\x1b[0m' + (i < frame.lines.length - 1 ? '\n' : '');
@@ -166,13 +175,18 @@ export function askPrompt(opts = {}) {
             process.stdout.write(buf);
             frameRowsDrawn = frame.lines.length;
             frameCursorRow = frame.cursorRow;
+            frameCursorCol = frame.cursorCol;
+            frameLineWidths = frame.lines.map((line) => displayWidth(line));
         }
         function eraseFrame() {
             if (frameRowsDrawn === 0)
                 return;
-            process.stdout.write(`\x1b[0m${frameCursorRow > 0 ? `\x1b[${frameCursorRow}A` : ''}\r\x1b[J`);
+            const up = rowsUpToFrameTop();
+            process.stdout.write(`\x1b[0m${up > 0 ? `\x1b[${up}A` : ''}\r\x1b[J`);
             frameRowsDrawn = 0;
             frameCursorRow = 0;
+            frameCursorCol = 0;
+            frameLineWidths = [];
         }
         const onResize = () => {
             if (disposed)
@@ -538,7 +552,7 @@ export function askPrompt(opts = {}) {
             disposed = true;
             unsubscribeOwner?.();
             if (process.stdout.isTTY) {
-                process.stdout.write('\x1b[?2004l');
+                process.stdout.write('\x1b[?2004l' + EXTENDED_KEYS_OFF);
             }
             process.stdout.removeListener('resize', onResize);
             process.stdin.removeListener('data', onData);
@@ -580,10 +594,27 @@ export function askPrompt(opts = {}) {
             cleanup();
             resolve(fullText);
         }
+        /** Breaks the line at the cursor (a new paragraph). A badge such as [Pasted text #1] is never cut in two. */
+        function insertNewline() {
+            const inside = getTagSpans().find((s) => cursorPos > s.start && cursorPos < s.end);
+            if (inside)
+                cursorPos = inside.end;
+            input = input.slice(0, cursorPos) + '\n' + input.slice(cursorPos);
+            cursorPos++;
+            selectedIndex = 0;
+            render();
+        }
         function onData(data) {
             if (disposed)
                 return;
-            const str = data.toString('utf-8');
+            const raw = data.toString('utf-8');
+            // Ctrl+Enter, Alt+Enter and Shift+Enter break the line instead of sending it.
+            if (cleanLayout && isNewlineKey(raw)) {
+                insertNewline();
+                return;
+            }
+            // With the extended keyboard mode on, Ctrl+C, Esc, Ctrl+V... arrive as `CSI … u`: the usual keys again.
+            const str = normalizeKey(raw);
             // Bracketed paste mode handling
             if (str.includes('\x1b[200~')) {
                 inBracketedPaste = true;
@@ -656,10 +687,26 @@ export function askPrompt(opts = {}) {
                 return;
             }
             const items = getDropdownItems();
+            // Esc with the command list (or the file list of an @) open: that entry is cancelled, the line is cleared.
+            if (str === '\x1b' && cleanLayout && items.length > 0) {
+                input = '';
+                cursorPos = 0;
+                selectedIndex = 0;
+                render();
+                return;
+            }
             // Enter / Return
             if (str === '\r' ||
                 str === '\n' ||
                 (str.length === 1 && (str.charCodeAt(0) === 13 || str.charCodeAt(0) === 10))) {
+                // A backslash right before the cursor turns Enter into a line break (a terminal that cannot
+                // tell Ctrl+Enter from Enter, a phone keyboard for one).
+                if (cleanLayout && items.length === 0 && cursorPos > 0 && input[cursorPos - 1] === '\\') {
+                    input = input.slice(0, cursorPos - 1) + input.slice(cursorPos);
+                    cursorPos--;
+                    insertNewline();
+                    return;
+                }
                 // Direct /image command
                 if (input.trim() === '/image' ||
                     (items.length > 0 &&

package/dist/cli/provider-manager.js

@@ -0,0 +1,197 @@
+import { runPicker } from './picker.js';
+import { runTextInput } from './finder.js';
+import { askConfirm } from './confirm.js';
+import { renderNotice } from './ui.js';
+import { displayWidth } from './width.js';
+import { t } from '../core/i18n.js';
+import { NO_KEY, addCustomProvider, checkBaseUrl, customProviders, hostOfUrl, keyHint, nameProblem, removeCustomProvider, updateCustomProvider, usuallyNeedsNoKey, } from '../core/custom-providers.js';
+const realUi = { text: runTextInput, picker: runPicker, confirm: askConfirm };
+const defaultSay = (kind, text) => console.log(renderNotice(kind, text));
+const problemText = {
+    empty: () => t('provider.name.empty'),
+    long: () => t('provider.name.long'),
+    taken: () => t('provider.name.taken'),
+};
+/** The name of the provider; asked again with the reason when it cannot be used. undefined: Esc. */
+export async function askName(config, ui, opts = {}) {
+    let value = opts.initial ?? '';
+    let warning = '';
+    for (;;) {
+        const typed = await ui.text({
+            title: t('provider.new'),
+            subtitle: opts.subtitle,
+            label: t('provider.name.label'),
+            initial: value,
+            placeholder: t('provider.name.placeholder'),
+            notes: warning ? [warning] : undefined,
+        });
+        if (typed === undefined)
+            return undefined;
+        const problem = nameProblem(config, typed, opts.exceptId);
+        if (!problem)
+            return typed.trim();
+        value = typed;
+        warning = problemText[problem]();
+    }
+}
+/** The address of the API; asked again with the reason when it is not one. undefined: Esc. */
+export async function askUrl(ui, opts = {}) {
+    let value = opts.initial ?? '';
+    let warning = '';
+    for (;;) {
+        const typed = await ui.text({
+            title: t('onboard.baseUrl.title'),
+            subtitle: opts.subtitle,
+            label: t('onboard.baseUrl.label'),
+            initial: value,
+            placeholder: t('onboard.baseUrl.placeholder'),
+            notes: [...(warning ? [warning] : []), t('provider.url.note')],
+        });
+        if (typed === undefined)
+            return undefined;
+        const checked = checkBaseUrl(typed);
+        if (checked.ok)
+            return checked.url;
+        value = typed;
+        warning = checked.reason === 'scheme' ? t('provider.url.scheme') : t('provider.url.invalid');
+    }
+}
+/**
+ * The key of the provider. A server on this machine or network may need none: that is offered
+ * first. Returns the key, NO_KEY for "none", or undefined for Esc.
+ */
+export async function askKey(ui, opts) {
+    if (usuallyNeedsNoKey(opts.baseUrl)) {
+        const choice = await ui.picker({
+            title: t('onboard.key.title'),
+            subtitle: opts.name,
+            items: [
+                { value: 'none', label: t('provider.key.none'), detail: t('provider.key.noneDetail') },
+                { value: 'key', label: t('provider.key.enter') },
+            ],
+            current: 'none',
+        });
+        if (choice === undefined)
+            return undefined;
+        if (choice === 'none')
+            return NO_KEY;
+    }
+    const key = await ui.text({
+        title: t('onboard.key.title'),
+        subtitle: opts.subtitle ?? opts.name,
+        label: t('onboard.key.label', { provider: opts.name }),
+        secret: true,
+        notes: [t('onboard.key.note')],
+    });
+    return key === undefined ? undefined : key.trim();
+}
+/** Adds a provider: name, address, key. Returns its id, or null when the user went back out of the first step. */
+export async function addProviderFlow(config, deps = {}) {
+    const ui = deps.ui ?? realUi;
+    const say = deps.say ?? defaultSay;
+    let stage = 'name';
+    let name = '';
+    let baseUrl = '';
+    for (;;) {
+        if (stage === 'name') {
+            const got = await askName(config, ui, { initial: name, subtitle: '1/3' });
+            if (got === undefined)
+                return null;
+            name = got;
+            stage = 'url';
+        }
+        else if (stage === 'url') {
+            const got = await askUrl(ui, { initial: baseUrl, subtitle: '2/3' });
+            if (got === undefined) {
+                stage = 'name';
+                continue;
+            }
+            baseUrl = got;
+            stage = 'key';
+        }
+        else {
+            const got = await askKey(ui, { name, baseUrl, subtitle: '3/3' });
+            if (got === undefined) {
+                stage = 'url';
+                continue;
+            }
+            const id = addCustomProvider(config, { name, baseUrl, apiKey: got }, deps.listedIds);
+            await deps.save?.(config);
+            say('ok', t('provider.saved', { name }));
+            return id;
+        }
+    }
+}
+/**
+ * The card of one saved provider: use it, change its name, address or key, delete it.
+ * Returns `use` when the user wants to work with it, `back` for Esc or after a delete.
+ */
+export async function manageProviderFlow(config, id, deps = {}) {
+    const ui = deps.ui ?? realUi;
+    const say = deps.say ?? defaultSay;
+    for (;;) {
+        const own = customProviders(config)[id];
+        if (!own)
+            return 'back';
+        const key = config.apiKeys?.[id] ?? '';
+        const items = [
+            { value: 'use', label: t('provider.menu.use'), detail: hostOfUrl(own.baseUrl) },
+            { value: 'rename', label: t('provider.menu.rename'), detail: own.name },
+            { value: 'url', label: t('provider.menu.url'), detail: own.baseUrl },
+            { value: 'key', label: t('provider.menu.key'), detail: keyHint(key) },
+            { value: 'delete', label: t('provider.menu.delete'), detail: t('provider.menu.deleteDetail') },
+        ];
+        const action = await ui.picker({
+            title: t('onboard.provider.title'),
+            subtitle: own.name,
+            items,
+            current: 'use',
+            // The labels differ from language to language: the column is as wide as the longest one.
+            labelWidth: Math.max(...items.map((i) => displayWidth(i.label))) + 2,
+        });
+        if (action === undefined)
+            return 'back';
+        if (action === 'use')
+            return 'use';
+        if (action === 'rename') {
+            const name = await askName(config, ui, { initial: own.name, exceptId: id });
+            if (name === undefined || name === own.name)
+                continue;
+            updateCustomProvider(config, id, { name });
+            await deps.save?.(config);
+            say('ok', t('provider.updated', { name }));
+        }
+        else if (action === 'url') {
+            const url = await askUrl(ui, { initial: own.baseUrl });
+            if (url === undefined || url === own.baseUrl)
+                continue;
+            updateCustomProvider(config, id, { baseUrl: url });
+            await deps.save?.(config);
+            say('ok', t('provider.updated', { name: own.name }));
+        }
+        else if (action === 'key') {
+            const got = await askKey(ui, { name: own.name, baseUrl: own.baseUrl });
+            if (got === undefined)
+                continue;
+            updateCustomProvider(config, id, { apiKey: got });
+            await deps.save?.(config);
+            say('ok', t('provider.updated', { name: own.name }));
+        }
+        else {
+            const active = config.provider === id;
+            const yes = await ui.confirm({
+                title: t('onboard.provider.title'),
+                question: t('provider.delete.question', { name: own.name }),
+                details: [hostOfUrl(own.baseUrl), ...(active ? [t('provider.delete.active')] : [])],
+                yes: t('provider.menu.delete'),
+                initial: false,
+            });
+            if (!yes)
+                continue;
+            removeCustomProvider(config, id);
+            await deps.save?.(config);
+            say('ok', t('provider.deleted', { name: own.name }));
+            return 'back';
+        }
+    }
+}

package/dist/cli/providers.js

@@ -883,10 +883,5 @@ export const ALL_PROVIDERS = [
         "value": "zhipuai-coding-plan",
         "label": "Zhipu AI Coding Plan",
         "baseUrl": "https://open.bigmodel.cn/api/coding/paas/v4"
-    },
-    {
-        "value": "custom",
-        "label": "Custom (Any OpenAI-compatible API)",
-        "baseUrl": ""
     }
 ];

package/dist/cli/settings.js

@@ -30,6 +30,7 @@ export const ROWS = [
     row('layout', 'appearance', 'choice'),
     row('pureBlack', 'appearance', 'toggle'),
     row('autoApprove', 'agent', 'toggle'),
+    row('extra', 'agent', 'toggle'),
     row('maxIterations', 'agent', 'choice'),
     row('memory', 'agent', 'toggle'),
     row('updates', 'agent', 'toggle'),
@@ -37,6 +38,10 @@ export const ROWS = [
     row('language', 'general', 'choice'),
     row('about', 'about', 'info'),
 ];
+/** The rows on screen: Extra is there only while YOLO is on. */
+export function visibleRows(state) {
+    return ROWS.filter((r) => r.key !== 'extra' || state.autoApprove);
+}
 const hintFor = (key) => t(`settings.hint.${key}`);
 function cycle(items, current, direction) {
     const index = items.indexOf(current);
@@ -65,7 +70,10 @@ export function changeSetting(state, key, direction) {
         case 'pureBlack':
             return { ...state, pureBlack: !state.pureBlack };
         case 'autoApprove':
-            return { ...state, autoApprove: !state.autoApprove };
+            // Extra goes with YOLO: without it there is nothing to take the questions away from.
+            return { ...state, autoApprove: !state.autoApprove, extra: state.autoApprove ? false : !!state.extra };
+        case 'extra':
+            return state.autoApprove ? { ...state, extra: !state.extra } : state;
         case 'memory':
             return { ...state, memory: !state.memory };
         case 'updates':
@@ -81,8 +89,8 @@ export function changeSetting(state, key, direction) {
     }
 }
 /** Moves the focus one row. It stops at the first and the last row instead of wrapping. */
-export function moveFocus(focus, delta) {
-    return Math.max(0, Math.min(ROWS.length - 1, focus + delta));
+export function moveFocus(focus, delta, count = ROWS.length) {
+    return Math.max(0, Math.min(count - 1, focus + delta));
 }
 // ───────────────────────── rendering ─────────────────────────
 const LABEL_WIDTH = 21;
@@ -110,6 +118,8 @@ function valueText(key, state, version, room, withSwatch) {
             return onOff(state.pureBlack);
         case 'autoApprove':
             return onOff(state.autoApprove, palette.yolo, '▲');
+        case 'extra':
+            return onOff(!!state.extra, palette.err, '▲');
         case 'maxIterations':
             return palette.text(formatIterations(state.maxIterations));
         case 'memory':
@@ -136,7 +146,8 @@ function detailLines(state, key, width, maxLines, version) {
     }
     const hint = key === 'about' ? `devx v${version}. ${hintFor('about')}` : hintFor(key);
     // A warning is never the line that gets cut off: it keeps its row, the explanation gives way.
-    const warning = key === 'autoApprove' && state.autoApprove ? t('settings.warnYolo') : '';
+    const warning = key === 'autoApprove' && state.autoApprove ? t('settings.warnYolo')
+        : key === 'extra' && state.extra ? t('settings.warnExtra') : '';
     const hintRows = Math.max(1, maxLines - (warning ? 1 : 0));
     let wrapped = wrapText(hint, width);
     if (wrapped.length > hintRows) {
@@ -145,7 +156,7 @@ function detailLines(state, key, width, maxLines, version) {
     }
     const out = wrapped.map((line) => palette.muted(line));
     if (warning && out.length < maxLines)
-        out.push(palette.yolo(truncateWidth(warning, width)));
+        out.push((key === 'extra' ? palette.err : palette.yolo)(truncateWidth(warning, width)));
     return out;
 }
 /** The key hints, shortened step by step until they fit `width` cells. */
@@ -177,8 +188,9 @@ function renderCard(state, focus, cols, density, version) {
     if (density === 'roomy')
         lines.push(box(''));
     const labelWidth = labelColumn((r) => r.label, LABEL_WIDTH, Math.floor(iw / 2));
+    const shown = visibleRows(state);
     let section = '';
-    ROWS.forEach((row, index) => {
+    shown.forEach((row, index) => {
         if (row.sectionKey !== section) {
             if (section !== '' && density === 'roomy')
                 lines.push(box(''));
@@ -199,7 +211,7 @@ function renderCard(state, focus, cols, density, version) {
         lines.push(box(''));
     lines.push(rule('├' + '─'.repeat(W - 2) + '┤'));
     // The detail area always has the same height, so the panel does not jump while you move.
-    const detail = detailLines(state, ROWS[focus].key, iw - 2, maxDetail, version);
+    const detail = detailLines(state, shown[Math.min(focus, shown.length - 1)].key, iw - 2, maxDetail, version);
     for (let i = 0; i < maxDetail; i++)
         lines.push(box(detail[i] ? '  ' + detail[i] : ''));
     lines.push(rule('╰' + '─'.repeat(W - 2) + '╯'));
@@ -211,7 +223,8 @@ function renderCompact(state, focus, cols, rows, version) {
     const lines = [];
     const shortWidth = labelColumn((r) => r.short, SHORT_LABEL_WIDTH, Math.floor(width / 2));
     lines.push(' ' + palette.bold(palette.accent(t('settings.title'))) + palette.faint(` · v${version}`));
-    ROWS.forEach((row, index) => {
+    const shown = visibleRows(state);
+    shown.forEach((row, index) => {
         const focused = index === focus;
         const mark = focused ? palette.accent('❯') : ' ';
         const label = focused ? palette.bold(palette.text(row.short)) : palette.muted(row.short);
@@ -221,8 +234,8 @@ function renderCompact(state, focus, cols, rows, version) {
         lines.push(focused ? palette.shade(padEndWidth(content, width)) : content);
     });
     // The title, the rows and the key hints come first; the help text takes what is left of the screen.
-    const detailCount = Math.max(0, Math.min(rows >= 16 ? 2 : 1, rows - 1 - (ROWS.length + 2)));
-    const detail = detailLines(state, ROWS[focus].key, width - 2, detailCount, version);
+    const detailCount = Math.max(0, Math.min(rows >= 16 ? 2 : 1, rows - 1 - (shown.length + 2)));
+    const detail = detailLines(state, shown[Math.min(focus, shown.length - 1)].key, width - 2, detailCount, version);
     for (let i = 0; i < detailCount; i++)
         lines.push(detail[i] ? ' ' + detail[i] : '');
     lines.push(' ' + keyHints(width - 1));
@@ -233,9 +246,11 @@ function renderCompact(state, focus, cols, rows, version) {
  * depending on the height), narrow ones a plain list.
  */
 export function renderSettings(state, focus, cols, rows, version) {
-    if (cols < 60 || rows < 23)
+    // The card needs a line for each row of the list: it is lower when Extra is there.
+    const count = visibleRows(state).length;
+    if (cols < 60 || rows < count + 13)
         return renderCompact(state, focus, cols, rows, version);
-    return renderCard(state, focus, cols, rows >= 29 ? 'roomy' : 'tight', version);
+    return renderCard(state, focus, cols, rows >= count + 19 ? 'roomy' : 'tight', version);
 }
 /**
  * Shows the panel and resolves with the final state when it is closed (Esc, q or Ctrl+C).
@@ -251,16 +266,22 @@ export function runSettings(initial, options) {
         const wasRaw = !!input.isRaw;
         input.setRawMode?.(true);
         input.resume();
+        const stopWatching = block.watchResize(draw);
+        const rowsNow = () => visibleRows(state);
         const change = (direction) => {
-            const next = changeSetting(state, ROWS[focus].key, direction);
+            const key = rowsNow()[Math.min(focus, rowsNow().length - 1)].key;
+            const next = changeSetting(state, key, direction);
             if (next === state)
                 return;
             state = next;
-            options.onChange?.(ROWS[focus].key, state);
+            // The Extra row goes away with YOLO: the focus must not be left behind the end of the list.
+            focus = Math.min(focus, rowsNow().length - 1);
+            options.onChange?.(key, state);
             draw();
         };
         const close = () => {
             input.off('data', onData);
+            stopWatching();
             block.erase();
             if (!wasRaw)
                 input.setRawMode?.(false);
@@ -269,7 +290,7 @@ export function runSettings(initial, options) {
         let closed = false;
         const handleKey = (key) => {
             const move = (delta) => {
-                const next = moveFocus(focus, delta);
+                const next = moveFocus(focus, delta, rowsNow().length);
                 if (next !== focus) {
                     focus = next;
                     draw();
@@ -281,9 +302,9 @@ export function runSettings(initial, options) {
                 return move(1);
             // Home / End are sent differently by different terminals.
             if (key === '\x1b[H' || key === '\x1b[1~' || key === '\x1b[7~' || key === '\x1bOH' || key === 'g')
-                return move(-ROWS.length);
+                return move(-rowsNow().length);
             if (key === '\x1b[F' || key === '\x1b[4~' || key === '\x1b[8~' || key === '\x1bOF' || key === 'G')
-                return move(ROWS.length);
+                return move(rowsNow().length);
             if (key === '\x1b[C' || key === '\x1bOC' || key === 'l' || key === ' ' || key === '\r' || key === '\n')
                 return change(1);
             if (key === '\x1b[D' || key === '\x1bOD' || key === 'h')

package/dist/cli/typeahead.js

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import { CTRL_ENTER, EXTENDED_KEYS_OFF, EXTENDED_KEYS_ON, normalizeKey, splitKeys } from './keys.js';
+import { EXTENDED_KEYS_OFF, EXTENDED_KEYS_ON, isNewlineKey, normalizeKey, splitKeys } from './keys.js';
 import { buildPromptFrame, palette } from './ui.js';
 import { displayWidth, truncateWidth } from './width.js';
 import { t } from '../core/i18n.js';
@@ -31,13 +31,16 @@ export function applyKey(state, key) {
             start--;
         return start === pos ? { state } : set([...chars.slice(0, start), ...chars.slice(pos)], start);
     };
+    // Ctrl+Enter, Alt+Enter, Shift+Enter: a new paragraph, the line is not sent.
+    if (isNewlineKey(key))
+        return set([...cs.slice(0, at), '\n', ...cs.slice(at)], at + 1);
     switch (key) {
-        case CTRL_ENTER: {
-            const text = state.text.trim();
-            return { state: text ? { text: '', cursor: 0 } : state, submit: text || undefined, sendNow: true };
-        }
         case '\r':
         case '\n': {
+            // A backslash before the cursor makes Enter a line break instead (for terminals that cannot
+            // tell Ctrl+Enter from Enter, a phone keyboard for one).
+            if (at > 0 && cs[at - 1] === '\\')
+                return set([...cs.slice(0, at - 1), '\n', ...cs.slice(at)], at);
             const text = state.text.trim();
             return text ? { state: { text: '', cursor: 0 }, submit: text } : { state };
         }
@@ -103,7 +106,7 @@ export function renderComposer({ state, queued, cols, base }) {
         const last = queued[queued.length - 1].replace(/\s+/g, ' ');
         const label = queued.length === 1 ? t('composer.queued') : t('composer.queuedMany', { n: queued.length });
         const prefix = palette.warn('↳ ' + label) + palette.faint(': ');
-        // What can be done with it: ctrl+enter sends it now, the down arrow takes it back to edit.
+        // What can be done with it: the down arrow takes it back to edit.
         const hint = t('composer.queuedHint');
         const suffixWidth = displayWidth(' · ' + hint);
         const withHint = room - displayWidth(prefix) - suffixWidth >= 12;
@@ -144,7 +147,6 @@ export class TurnComposer {
     frameBase;
     onQueue;
     status;
-    onSendNow;
     active = false;
     suspended = false;
     shown = false;
@@ -159,14 +161,11 @@ export class TurnComposer {
     live;
     constructor(out = process.stdout, frameBase, onQueue, 
     /** The working line shown above the frame for the whole turn; called on every animation tick. */
-    status, 
-    /** Ctrl+Enter: the user wants the queued messages to reach the agent right now. */
-    onSendNow) {
+    status) {
         this.out = out;
         this.frameBase = frameBase;
         this.onQueue = onQueue;
         this.status = status;
-        this.onSendNow = onSendNow;
     }
     get enabled() {
         return this.active;
@@ -266,7 +265,6 @@ export class TurnComposer {
             return;
         if (process.env.DEVX_DEBUG_KEYS)
             logKeys(chunk, this.queue.length, this.state.text);
-        let sendNow = false;
         for (const raw of splitKeys(chunk)) {
             const key = normalizeKey(raw);
             // Ctrl+C is the app's (it stops the generation); Ctrl+D does nothing.
@@ -292,14 +290,9 @@ export class TurnComposer {
                 this.queue.push(result.submit);
                 this.onQueue?.(result.submit);
             }
-            if (result.sendNow && this.queue.length > 0)
-                sendNow = true;
         }
         this.lines = this.render();
         this.redraw();
-        // After the redraw: the caller takes the queue and stops the turn.
-        if (sendNow)
-            this.onSendNow?.();
     }
     // ── terminal output
     /** The write that replaces the terminal's own for the length of the turn. */