termux-dev 1.8.1 → 1.9.0

package/dist/cli/keys.js

@@ -13,11 +13,20 @@ export function splitKeys(chunk) {
 }
 /** Erases the word before the cursor (Ctrl+W in a shell); Ctrl+Backspace and Alt+Backspace are mapped to it. */
 export const WORD_BACKSPACE = '\x17';
-/** What a terminal sends for Ctrl+Enter once the extended keyboard modes below are on. */
+/**
+ * What a terminal sends for Ctrl+Enter once the extended keyboard modes below are on. Ctrl+Enter
+ * and Alt+Enter break the line (a new paragraph) instead of sending it, like Shift+Enter.
+ */
 export const CTRL_ENTER = '\x1b[13;5u';
+/** Shift+Enter in the two extended encodings (a plain terminal sends the same byte as for Enter). */
+const SHIFT_ENTER = /^\x1b\[(?:13;2u|27;2;13~)$/;
+/** Does this key break the line instead of sending it? Ctrl+Enter, Alt+Enter and Shift+Enter, as far as the terminal tells them from Enter. */
+export function isNewlineKey(key) {
+    return normalizeKey(key) === CTRL_ENTER || SHIFT_ENTER.test(key);
+}
 /**
- * Asks the terminal to tell Ctrl+Enter apart from Enter (a plain terminal sends the same
- * byte for both). Two protocols are requested, a terminal answers the one it knows:
+ * Asks the terminal to tell Ctrl+Enter and Shift+Enter apart from Enter (a plain terminal sends
+ * the same byte for all of them). Two protocols are requested, a terminal answers the one it knows:
  * the kitty keyboard protocol (kitty, foot, ghostty, wezterm, alacritty, ...) and xterm's
  * modifyOtherKeys. Terminals that know neither ignore both, and Alt+Enter still works.
  * While on, the keys arrive as `CSI … u`: run them through `normalizeKey`.

package/dist/cli/liveblock.js

@@ -1,3 +1,4 @@
+import { displayWidth } from './width.js';
 /**
  * A block of terminal rows that is redrawn in place.
  *
@@ -5,41 +6,69 @@
  * rewrites every row and wipes the rows left over from a taller previous version, so the
  * screen never grows however often the content changes. The cursor is hidden while the
  * block is on screen.
+ *
+ * The way back up is counted in rows of the screen, not in lines of the block: when the window
+ * gets narrower the terminal wraps the lines it already drew onto more rows, and going up by the
+ * number of lines would leave the top of the old block on screen (the block would show up twice).
  */
 export class LiveBlock {
     out;
-    rows = 0;
+    /** Visible width of each line of the block as it was drawn. */
+    widths = [];
     constructor(out) {
         this.out = out;
     }
+    /** Number of lines of the block on screen. */
     get height() {
-        return this.rows;
+        return this.widths.length;
+    }
+    columns() {
+        return Math.max(1, this.out.columns || process.stdout.columns || 80);
+    }
+    /** Rows of the screen the given lines take at the current width. */
+    rowsOf(widths) {
+        const cols = this.columns();
+        return widths.reduce((n, w) => n + Math.max(1, Math.ceil(w / cols)), 0);
     }
     draw(lines) {
+        const before = this.rowsOf(this.widths);
         let buf = '\x1b[?25l';
-        if (this.rows > 1)
-            buf += `\x1b[${this.rows - 1}A`;
+        if (before > 1)
+            buf += `\x1b[${before - 1}A`;
         buf += '\r';
         lines.forEach((line, i) => {
             buf += '\x1b[2K' + line + '\x1b[0m' + (i < lines.length - 1 ? '\n' : '');
         });
+        const widths = lines.map((line) => displayWidth(line));
+        const now = this.rowsOf(widths);
         let extra = 0;
-        for (let k = lines.length; k < this.rows; k++) {
+        for (let k = now; k < before; k++) {
             buf += '\n\x1b[2K';
             extra++;
         }
         if (extra > 0)
             buf += `\x1b[${extra}A`;
         this.out.write(buf);
-        this.rows = lines.length;
+        this.widths = widths;
     }
     /** Removes the block from the screen and shows the cursor again. */
     erase() {
-        if (this.rows === 0) {
+        const rows = this.rowsOf(this.widths);
+        if (rows === 0) {
             this.out.write('\x1b[?25h');
             return;
         }
-        this.out.write(`\r${this.rows > 1 ? `\x1b[${this.rows - 1}A` : ''}\x1b[J\x1b[?25h`);
-        this.rows = 0;
+        this.out.write(`\r${rows > 1 ? `\x1b[${rows - 1}A` : ''}\x1b[J\x1b[?25h`);
+        this.widths = [];
+    }
+    /**
+     * Calls `redraw` when the window is resized, so the block is drawn again at the new width.
+     * Returns the function that stops watching (call it when the panel closes).
+     */
+    watchResize(redraw) {
+        this.out.on?.('resize', redraw);
+        return () => {
+            this.out.off?.('resize', redraw);
+        };
     }
 }

package/dist/cli/mcp-panel.js

@@ -314,11 +314,13 @@ export function runMcpPanel(controller, options = {}) {
         const wasRaw = !!input.isRaw;
         input.setRawMode?.(true);
         input.resume();
+        const stopWatching = block.watchResize(draw);
         const close = () => {
             if (closed)
                 return;
             closed = true;
             input.off('data', onData);
+            stopWatching();
             block.erase();
             if (!wasRaw)
                 input.setRawMode?.(false);

package/dist/cli/picker.js

@@ -99,9 +99,11 @@ export function runPicker(options, io = { input: process.stdin, output: process.
         const wasRaw = !!input.isRaw;
         input.setRawMode?.(true);
         input.resume();
+        const stopWatching = block.watchResize(draw);
         const finish = (value) => {
             done = true;
             input.off('data', onData);
+            stopWatching();
             block.erase();
             if (!wasRaw)
                 input.setRawMode?.(false);

package/dist/cli/prompt.js

@@ -6,8 +6,9 @@ import { CustomCommandManager } from '../core/commands.js';
 import { formatPromptHeader } from './modeborder.js';
 import { filterCommandPalette, estimatePromptTokens, formatPromptTokenBadge } from './prompt_palette.js';
 import { PromptHistoryNavigator } from './history_search.js';
-import { buildPromptFrame, palette, renderUserEcho, resolveMode } from './ui.js';
-import { padEndWidth, truncateWidth } from './width.js';
+import { buildPromptFrame, moveCursorRow, palette, renderUserEcho, resolveMode } from './ui.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' },
@@ -27,6 +28,7 @@ export const SLASH_COMMANDS = [
     { cmd: '/agent', desc: 'Switch to AGENT mode (coder & executor)' },
     { cmd: '/image', desc: 'Paste the image from the clipboard (same as Ctrl+V or Alt+V)' },
     { cmd: '/serve', desc: 'Start local web server for web/game preview' },
+    { cmd: '/tasks', desc: 'Background tasks: list, /tasks <id> output, /tasks stop <id|all>' },
     { cmd: '/copy', desc: 'Copy the last answer of the AI to the clipboard' },
     { cmd: '/rewind', desc: 'Go back to one of your messages: the chat after it is removed' },
     { cmd: '/rename', desc: 'Rename the chat (/rename <name>), or let the AI name it again' },
@@ -96,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 [];
@@ -133,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,
@@ -141,14 +150,16 @@ export function askPrompt(opts = {}) {
                 contextPercent: opts.contextPercent ?? 0,
                 cost: opts.cost ?? 0,
                 costState: opts.costState,
+                background: opts.background?.(),
                 input,
                 cursorPos,
                 placeholder,
                 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' : '');
@@ -164,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)
@@ -180,6 +196,35 @@ export function askPrompt(opts = {}) {
             render();
         };
         process.stdout.on('resize', onResize);
+        const unsubscribeOwner = opts.subscribe?.((kind) => {
+            if (disposed)
+                return;
+            if (kind === 'redraw') {
+                render();
+                return;
+            }
+            // News for the model: close the prompt, the owner starts a turn. What was typed is kept.
+            if (cleanLayout)
+                eraseFrame();
+            else
+                process.stdout.write(`\x1b[0m\r\x1b[2K`);
+            cleanup();
+            resolve(`__WAKE__:${input}`);
+        });
+        /** Up / down inside a text that wraps onto several rows; false when there is no row to go to (history takes over). */
+        function moveInInput(dir) {
+            if (!cleanLayout)
+                return false;
+            let to = moveCursorRow(input, cursorPos, process.stdout.columns || 80, dir);
+            if (to === null)
+                return false;
+            // Never land inside an attachment tag: go to its start.
+            const inside = getTagSpans().find((sp) => to > sp.start && to < sp.end);
+            if (inside)
+                to = inside.start;
+            cursorPos = to;
+            return true;
+        }
         function getTagSpans() {
             const spans = [];
             const regex = new RegExp(`\\[Pasted text #\\d+ \\+\\d+ lines\\]|${IMAGE_TAG_SOURCE}`, 'g');
@@ -505,8 +550,9 @@ export function askPrompt(opts = {}) {
         render();
         function cleanup() {
             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);
@@ -548,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;
@@ -624,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 &&
@@ -696,6 +775,9 @@ export function askPrompt(opts = {}) {
                     selectedIndex = Math.max(0, selectedIndex - 1); // stops at the first item
                     render();
                 }
+                else if (moveInInput(-1)) {
+                    render();
+                }
                 else {
                     const prev = historyNav.navigateUp(input);
                     if (prev !== null) {
@@ -712,6 +794,9 @@ export function askPrompt(opts = {}) {
                     selectedIndex = Math.min(items.length - 1, selectedIndex + 1); // stops at the last item
                     render();
                 }
+                else if (moveInInput(1)) {
+                    render();
+                }
                 else {
                     const next = historyNav.navigateDown();
                     if (next !== null) {

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": ""
     }
 ];