termux-dev 1.8.1 → 1.8.2

package/dist/cli/ui.js

@@ -181,6 +181,17 @@ export function renderHeader(info, cols) {
     }
     return lines;
 }
+// ───────────────────────── prompt frame ─────────────────────────
+/** `◈ 2 bg` (running tasks); a failed one turns it red: `◈ 2 bg · 1 failed`. Empty when there is nothing to say. */
+export function backgroundBadge(bg, short = false) {
+    if (!bg || (bg.running <= 0 && !(bg.failed && bg.failed > 0)))
+        return '';
+    const failed = bg.failed && bg.failed > 0 ? bg.failed : 0;
+    const text = short
+        ? `◈${bg.running}${failed ? `!${failed}` : ''}`
+        : `◈ ${bg.running} bg${failed ? ` · ${failed} failed` : ''}`;
+    return failed ? palette.err(text) : palette.accent(text);
+}
 /** The part of the input that fits into `cells`, scrolled so that the cursor stays visible. */
 export function visibleWindow(input, cursorPos, cells) {
     const cps = Array.from(input);
@@ -242,6 +253,114 @@ export function visibleWindow(input, cursorPos, cells) {
         cursorCells: cellsBefore(Math.min(cursorCp, win.end), win.start),
     };
 }
+/** Cells of text per row inside the frame (the compact phone row has no side borders). */
+export function inputCells(cols) {
+    const W = frameWidth(cols);
+    return Math.max(4, isCompact(cols) ? W - 4 : W - 6);
+}
+/** Rows the input may take before it scrolls: a quarter of the terminal, at most 8. */
+export function maxInputRows(termRows = process.stdout.rows || 24) {
+    return Math.max(1, Math.min(8, Math.floor(termRows / 4)));
+}
+/**
+ * Cuts the input into rows of `cells` cells. A line breaks after a space when it can; an
+ * attachment tag such as `[Pasted text #1 +22 lines]` is never split unless it is wider than a row.
+ */
+export function wrapInput(input, cells) {
+    const cps = Array.from(input);
+    if (cps.length === 0)
+        return [{ start: 0, end: 0 }];
+    const widths = cps.map((c) => codePointWidth(c.codePointAt(0)));
+    // Where a tag starts (in code points) -> where it ends.
+    const offsets = [];
+    let unit = 0;
+    for (const c of cps) {
+        offsets.push(unit);
+        unit += c.length;
+    }
+    const atoms = new Map();
+    for (const m of input.matchAll(BADGE)) {
+        const from = offsets.indexOf(m.index);
+        const to = offsets.indexOf(m.index + m[0].length);
+        if (from >= 0)
+            atoms.set(from, to >= 0 ? to : cps.length);
+    }
+    const rows = [];
+    let i = 0;
+    while (i < cps.length) {
+        const start = i;
+        let used = 0;
+        let afterSpace = -1;
+        while (i < cps.length) {
+            let next = atoms.get(i) ?? i + 1;
+            let w = widths.slice(i, next).reduce((a, b) => a + b, 0);
+            if (next > i + 1 && w > cells) {
+                next = i + 1;
+                w = widths[i];
+            } // a tag wider than a row is split
+            if (used + w > cells)
+                break;
+            used += w;
+            i = next;
+            if (cps[i - 1] === ' ')
+                afterSpace = i;
+        }
+        if (i < cps.length && cps[i] !== ' ' && afterSpace > start)
+            i = afterSpace; // break between words
+        if (i === start)
+            i = start + 1; // a cell wider than the row
+        rows.push({ start, end: i });
+    }
+    return rows;
+}
+function layoutInput(input, cursorPos, cells) {
+    const cps = Array.from(input);
+    const widths = cps.map((c) => codePointWidth(c.codePointAt(0)));
+    let cursorCp = 0;
+    let units = 0;
+    while (cursorCp < cps.length && units < cursorPos) {
+        units += cps[cursorCp].length;
+        cursorCp++;
+    }
+    const rows = wrapInput(input, cells);
+    let cursorRow = rows.findIndex((r) => cursorCp < r.end);
+    if (cursorRow < 0)
+        cursorRow = rows.length - 1;
+    const row = rows[cursorRow];
+    const cursorCell = widths.slice(row.start, Math.min(cursorCp, row.end)).reduce((a, b) => a + b, 0);
+    return { cps, rows, widths, cursorRow, cursorCell };
+}
+/**
+ * The cursor one row up or down inside a wrapped input, or null when there is no such row
+ * (the arrow keys then walk the prompt history as before). Returns a UTF-16 index.
+ */
+export function moveCursorRow(input, cursorPos, cols, dir) {
+    const clean = input.replace(/[\x00-\x1f\x7f]/g, ' ');
+    const { cps, rows, widths, cursorRow, cursorCell } = layoutInput(clean, cursorPos, inputCells(cols));
+    const target = rows[cursorRow + dir];
+    if (!target)
+        return null;
+    // The last cell of a row that is not the last one belongs to the next row, so stop before it.
+    const limit = cursorRow + dir === rows.length - 1 ? target.end : Math.max(target.start, target.end - 1);
+    let at = target.start;
+    let used = 0;
+    while (at < limit && used + widths[at] <= cursorCell) {
+        used += widths[at];
+        at++;
+    }
+    return cps.slice(0, at).join('').length;
+}
+/** The rows of the input as drawn, with the cursor; scrolled so that the cursor row is visible. */
+function inputRows(f, cells) {
+    if (!f.input) {
+        return { rows: [palette.muted(truncateWidth(f.placeholder, cells))], firstRow: 0, cursorRow: 0, cursorCol: 0 };
+    }
+    const { cps, rows, cursorRow, cursorCell } = layoutInput(f.input, f.cursorPos, cells);
+    const limit = f.maxInputRows ?? maxInputRows();
+    const firstRow = rows.length <= limit ? 0 : Math.max(0, Math.min(cursorRow - limit + 1, rows.length - limit));
+    const shown = rows.slice(firstRow, firstRow + limit).map((r) => formatBadges(cps.slice(r.start, r.end).join('')));
+    return { rows: shown, firstRow, cursorRow: cursorRow - firstRow, cursorCol: cursorCell };
+}
 function keyHints(cols, mode) {
     const next = mode === 'plan' ? 'agent' : 'plan';
     const all = [
@@ -295,16 +414,14 @@ export function buildPromptFrame(input) {
         topRight = ' ' + palette.muted(fitModelLabel(f.model, Math.min(48, topFree - 4))) + ' ';
     }
     const top = rule('╭─') + pill + rule('─'.repeat(Math.max(0, topFree - displayWidth(topRight)))) + topRight + rule('─╮');
-    // ── input row: │ ❯ text │
+    // ── input rows: │ ❯ text │, the text wraps onto further rows instead of scrolling sideways
     const contentCells = W - 6;
-    const win = visibleWindow(f.input, f.cursorPos, contentCells);
-    const content = f.input
-        ? (win.leftEllipsis ? palette.faint('…') : '') +
-            formatBadges(win.text) +
-            (win.rightEllipsis ? palette.faint('…') : '')
-        : palette.muted(truncateWidth(f.placeholder, contentCells));
-    const inputRow = rule('│') + ' ' + palette.accent('❯') + ' ' + padEndWidth(content, contentCells) + ' ' + rule('│');
-    const cursorCol = 4 + (f.input ? (win.leftEllipsis ? 1 : 0) + win.cursorCells : 0);
+    const body = inputRows(f, contentCells);
+    const inputLines = body.rows.map((content, i) => {
+        const glyph = i === 0 ? (body.firstRow > 0 ? palette.faint('…') : palette.accent('❯')) : ' ';
+        return rule('│') + ' ' + glyph + ' ' + padEndWidth(content, contentCells) + ' ' + rule('│');
+    });
+    const cursorCol = 4 + body.cursorCol;
     // ── bottom border: ╰─ ~/project git:main* ──── ━━━━──── 12% · $0.0123 ─╯
     const bottomFree = W - 4;
     const pct = Math.max(0, Math.min(100, Math.round(f.contextPercent)));
@@ -316,7 +433,10 @@ export function buildPromptFrame(input) {
         : bottomFree >= displayWidth(stat) + 4
             ? ' ' + palette.muted(stat) + ' '
             : '';
-    const leftRoom = bottomFree - displayWidth(bottomRight) - 2;
+    // ◈ 2 bg: tasks that keep running while the conversation goes on (/tasks lists them)
+    const bgBadge = backgroundBadge(f.background);
+    const bgWidth = bgBadge ? displayWidth(stripAnsi(bgBadge)) + 2 : 0;
+    const leftRoom = bottomFree - displayWidth(bottomRight) - 2 - bgWidth;
     let bottomLeft = '';
     if (f.cwd && leftRoom >= 10) {
         const branch = f.branch ? `${palette.faint('git:')}${palette.muted(f.branch)}${f.dirty ? palette.warn('*') : ''}` : '';
@@ -325,6 +445,9 @@ export function buildPromptFrame(input) {
         const pathRoom = leftRoom - (showBranch ? branchW : 0);
         bottomLeft = ' ' + palette.muted(shortenPath(f.cwd, pathRoom)) + (showBranch ? ' ' + branch : '') + ' ';
     }
+    if (bgBadge && bottomFree - displayWidth(bottomLeft) - displayWidth(bottomRight) - 2 >= bgWidth) {
+        bottomLeft += (bottomLeft ? '' : ' ') + bgBadge + ' ';
+    }
     const bottom = rule('╰─') +
         bottomLeft +
         rule('─'.repeat(Math.max(0, bottomFree - displayWidth(bottomLeft) - displayWidth(bottomRight)))) +
@@ -332,7 +455,7 @@ export function buildPromptFrame(input) {
         rule('─╯');
     // ── footer: key hints, or the suggestion list while one is open
     const footer = f.below && f.below.length > 0 ? f.below.map((l) => '  ' + l) : [hintsRow(f.cols, f.mode)];
-    return { lines: [top, inputRow, bottom, ...footer], cursorRow: 1, cursorCol };
+    return { lines: [top, ...inputLines, bottom, ...footer], cursorRow: 1 + body.cursorRow, cursorCol };
 }
 /**
  * Phone layout: one row, no borders, no hints.
@@ -345,23 +468,26 @@ function buildCompactFrame(f) {
     const style = modeStyle(f.mode);
     const prefix = style.color(style.glyph) + ' ' + palette.accent('❯') + ' ';
     const pct = Math.max(0, Math.min(100, Math.round(f.contextPercent)));
-    const statText = `${pct}%`;
+    const bgShort = backgroundBadge(f.background, true);
+    const statText = `${bgShort ? stripAnsi(bgShort) + ' ' : ''}${pct}%`;
     const statColor = pct >= 90 ? palette.err : pct >= 75 ? palette.warn : palette.faint;
     const statWidth = displayWidth(statText) + 1;
-    const withStat = W - 4 - statWidth >= 14;
-    const cells = W - 4 - (withStat ? statWidth : 0);
-    const win = visibleWindow(f.input, f.cursorPos, cells);
-    const content = f.input
-        ? (win.leftEllipsis ? palette.faint('…') : '') +
-            formatBadges(win.text) +
-            (win.rightEllipsis ? palette.faint('…') : '')
-        : palette.muted(truncateWidth(f.placeholder, cells));
-    const row = prefix + padEndWidth(content, cells) + (withStat ? ' ' + statColor(statText) : '');
+    const cells = W - 4;
+    // The count sits at the end of the last row, and only when the text there leaves it room.
+    const withStat = cells - statWidth >= 14;
+    const body = inputRows(f, cells);
+    const statShown = bgShort && withStat ? bgShort + ' ' + statColor(`${pct}%`) : statColor(statText);
+    const rows = body.rows.map((content, i) => {
+        const lead = i === 0 ? (body.firstRow > 0 ? style.color(style.glyph) + ' ' + palette.faint('…') + ' ' : prefix) : '    ';
+        const room = cells - displayWidth(stripAnsi(content));
+        const stat = i === body.rows.length - 1 && withStat && room >= statWidth ? ' '.repeat(room - statWidth + 1) + statShown : '';
+        return lead + (stat ? content + stat : padEndWidth(content, cells));
+    });
     const below = (f.below ?? []).map((l) => '  ' + l);
     return {
-        lines: [row, ...below],
-        cursorRow: 0,
-        cursorCol: 4 + (f.input ? (win.leftEllipsis ? 1 : 0) + win.cursorCells : 0),
+        lines: [...rows, ...below],
+        cursorRow: body.cursorRow,
+        cursorCol: 4 + body.cursorCol,
     };
 }
 function hintsRow(cols, mode) {
@@ -614,7 +740,7 @@ export function summarizeToolResult(name, result, cols = 80, expanded = false) {
     }
     if (expanded && t !== 'bash' && !(t === 'edit_file' || t === 'write_file')) {
         // For these the first line is part of the output, not a summary of it.
-        const own = t.startsWith('mcp__') || t === 'web_search' || t === 'fetch_url';
+        const own = t.startsWith('mcp__') || t === 'web_search' || t === 'fetch_url' || t === 'background';
         const first = own ? [] : summarizeToolResult(name, result, cols, false);
         return [...first, ...fullRows(text, cols)];
     }
@@ -648,6 +774,17 @@ export function summarizeToolResult(name, result, cols = 80, expanded = false) {
         }
         catch { }
     }
+    // Background tasks: what happened on the first line (started / failed / matched), the rest folded.
+    if (t === 'background') {
+        const nonEmpty = outputRows(text).filter((l) => l.trim());
+        if (nonEmpty.length === 0)
+            return [renderResultLine('(no output)', 'muted', cols)];
+        const bad = /^(Error:|No background task|.* failed \(exit|.*ended right after)/.test(nonEmpty[0]);
+        const good = /^(Started bg|Stopped\.)/.test(nonEmpty[0]);
+        const rest = nonEmpty.length - 1;
+        const row = renderResultLine(nonEmpty[0].trim(), bad ? 'error' : good ? 'ok' : 'muted', cols);
+        return rest > 0 ? [row, moreHint(rest)] : [row];
+    }
     // Output of an MCP tool or a web fetch: the first line and how many more there are.
     if (t.startsWith('mcp__') || t === 'web_search' || t === 'fetch_url') {
         const nonEmpty = outputRows(text).filter((l) => l.trim());

package/dist/cli/updater.js

@@ -3,6 +3,7 @@ import path from 'path';
 import fs from 'fs/promises';
 import pc from 'picocolors';
 import { select } from '@inquirer/prompts';
+import { palette } from './ui.js';
 import { fileURLToPath } from 'url';
 const GITHUB_REPO_URL = 'https://github.com/apvcode/Termux-Dev';
 const REMOTE_PKG_URL = 'https://raw.githubusercontent.com/apvcode/Termux-Dev/main/package.json';
@@ -208,8 +209,9 @@ export async function runStartupUpdateCheck(config) {
     const spinner = setInterval(() => {
         if (isDone)
             return;
-        const frame = pc.cyan(frames[fIdx++ % frames.length]);
-        process.stdout.write(`\r  ${frame} ${pc.dim(`Checking for updates from`)} ${pc.cyan('apvcode/Termux-Dev')} ${pc.dim(`(v${currentVersion})...`)} `);
+        // The colours of the theme, like the rest of the interface.
+        const frame = palette.accent(frames[fIdx++ % frames.length]);
+        process.stdout.write(`\r  ${frame} ${palette.muted('Checking for updates from')} ${palette.accent('apvcode/Termux-Dev')} ${palette.faint(`(v${currentVersion})...`)} `);
     }, 75);
     const result = await checkForUpdates(10000);
     isDone = true;
@@ -218,14 +220,14 @@ export async function runStartupUpdateCheck(config) {
     process.stdout.write('\r\x1b[K');
     if (result.updateAvailable) {
         console.log();
-        console.log(pc.bold(pc.cyan('  ┌───────────────────────────────────────────────────────────┐')));
-        console.log(pc.bold(pc.cyan('  │')) + pc.bold(pc.yellow(`  A new update is available: `)) + pc.dim(`v${result.currentVersion}`) + pc.bold(pc.green(` → v${result.latestVersion}`)) + ' '.repeat(Math.max(1, 23 - result.currentVersion.length - result.latestVersion.length)) + pc.bold(pc.cyan('│')));
-        console.log(pc.bold(pc.cyan('  │')) + pc.dim(`  Repository: https://github.com/apvcode/Termux-Dev          `) + pc.bold(pc.cyan('│')));
-        console.log(pc.bold(pc.cyan('  └───────────────────────────────────────────────────────────┘')));
+        console.log(palette.rule('  ┌───────────────────────────────────────────────────────────┐'));
+        console.log(palette.rule('  │') + palette.bold(palette.accent(`  A new update is available: `)) + palette.muted(`v${result.currentVersion}`) + palette.bold(palette.ok(` → v${result.latestVersion}`)) + ' '.repeat(Math.max(1, 23 - result.currentVersion.length - result.latestVersion.length)) + palette.rule('│'));
+        console.log(palette.rule('  │') + palette.faint(`  Repository: https://github.com/apvcode/Termux-Dev          `) + palette.rule('│'));
+        console.log(palette.rule('  └───────────────────────────────────────────────────────────┘'));
         console.log();
         try {
             const choice = await select({
-                message: pc.bold('Do you want to update devx now?'),
+                message: palette.bold('Do you want to update devx now?'),
                 loop: false,
                 choices: [
                     {
@@ -250,7 +252,7 @@ export async function runStartupUpdateCheck(config) {
     }
     else {
         // Briefly show up to date message
-        process.stdout.write(`  ${pc.green('✓')} ${pc.dim(`devx is up to date (v${result.currentVersion})`)}\n`);
+        process.stdout.write(`  ${palette.ok('✓')} ${palette.muted(`devx is up to date (v${result.currentVersion})`)}\n`);
         await new Promise(r => setTimeout(r, 450));
         // Clean up line
         process.stdout.write('\x1b[1A\x1b[2K');