termux-dev 1.5.0 → 1.8.0

package/dist/cli/statusline.js

@@ -65,6 +65,32 @@ export function formatCostBadge(cost, maxCostUSD) {
     }
     return pc.green(costFormatted);
 }
+function clipLabel(label, width) {
+    if (label.length <= width)
+        return label;
+    return width > 1 ? `${label.slice(0, width - 1)}…` : label.slice(0, width);
+}
+export function renderCleanStatus(opts) {
+    const cols = Math.max(20, opts.cols || process.stdout.columns || 80);
+    const available = cols - 2;
+    const mode = opts.isYolo ? 'YOLO' : opts.mode;
+    const modelWidth = Math.max(4, available - mode.length - 2);
+    const shortModel = opts.model.length > modelWidth && opts.model.includes('/')
+        ? opts.model.split('/').pop() || opts.model
+        : opts.model;
+    const model = clipLabel(shortModel, modelWidth);
+    const percent = Math.min(100, Math.round((opts.currentTokens / Math.max(1, opts.maxTokens)) * 100));
+    const contextLabel = cols < 38 ? 'ctx' : 'context';
+    let details = `${contextLabel} ${percent}% · $${opts.cost.toFixed(4)}`;
+    if (details.length > available)
+        details = `${percent}% · $${opts.cost.toFixed(2)}`;
+    const git = GitStatusCache.getStatus();
+    const branch = git ? ` · ${git.branch}${git.isDirty ? '*' : ''}` : '';
+    if (details.length + branch.length <= available)
+        details += branch;
+    details = clipLabel(details, available);
+    return `${pc.cyan(mode.toLowerCase())}  ${pc.bold(model)}\n${pc.dim(details)}`;
+}
 export function renderPowerlineStatus(opts) {
     const cols = opts.cols || process.stdout.columns || 80;
     const theme = getCurrentTheme();
@@ -90,7 +116,7 @@ export function renderPowerlineStatus(opts) {
     }
     // Git info
     const git = GitStatusCache.getStatus();
-    const gitStr = git ? ` · ${pc.magenta(git.branch)}${git.isDirty ? pc.yellow('✱') : ''}` : '';
+    const gitStr = git ? ` · ${pc.magenta(git.branch)}${git.isDirty ? pc.yellow('*') : ''}` : '';
     // Context progress
     const usagePercent = Math.min(100, Math.round((opts.currentTokens / Math.max(1, opts.maxTokens)) * 100));
     const barWidth = cols < 60 ? 6 : 10;

package/dist/cli/theme.js

@@ -1,113 +1,110 @@
 import pc from 'picocolors';
-export const THEMES = {
-    cyan: {
-        id: 'cyan',
-        name: 'Cyan Cyber',
-        desc: 'Electric neon cyan & obsidian (Default)',
-        emoji: '⚡',
-        colorFn: (s) => pc.cyan(s),
-        boldFn: (s) => pc.bold(pc.cyan(s)),
-        accentFn: (s) => pc.blue(s),
-        badgeFn: (s) => pc.bgCyan(pc.black(s)),
-        diffAddBg: (s) => pc.bgCyan(pc.black(s)),
-        diffRemoveBg: (s) => pc.bgBlue(pc.white(s)),
-        hex: '#00f2fe'
-    },
-    purple: {
-        id: 'purple',
-        name: 'Synthwave Purple',
-        desc: 'Vibrant neon magenta & violet retro',
-        emoji: '🟣',
-        colorFn: (s) => pc.magenta(s),
-        boldFn: (s) => pc.bold(pc.magenta(s)),
-        accentFn: (s) => pc.blue(s),
-        badgeFn: (s) => pc.bgMagenta(pc.black(s)),
-        diffAddBg: (s) => pc.bgMagenta(pc.black(s)),
-        diffRemoveBg: (s) => pc.bgBlue(pc.white(s)),
-        hex: '#d946ef'
-    },
-    matrix: {
-        id: 'matrix',
-        name: 'Matrix Hacker',
-        desc: 'Classic bright phosphor green terminal',
-        emoji: '🟢',
-        colorFn: (s) => pc.green(s),
-        boldFn: (s) => pc.bold(pc.green(s)),
-        accentFn: (s) => pc.cyan(s),
-        badgeFn: (s) => pc.bgGreen(pc.black(s)),
-        diffAddBg: (s) => pc.bgGreen(pc.black(s)),
-        diffRemoveBg: (s) => pc.bgRed(pc.white(s)),
-        hex: '#22c55e'
-    },
-    amber: {
-        id: 'amber',
-        name: 'Solar Amber',
-        desc: 'Warm vintage CRT amber gold',
-        emoji: '🟡',
-        colorFn: (s) => pc.yellow(s),
-        boldFn: (s) => pc.bold(pc.yellow(s)),
-        accentFn: (s) => pc.red(s),
-        badgeFn: (s) => pc.bgYellow(pc.black(s)),
-        diffAddBg: (s) => pc.bgYellow(pc.black(s)),
-        diffRemoveBg: (s) => pc.bgRed(pc.white(s)),
-        hex: '#f59e0b'
-    },
-    crimson: {
-        id: 'crimson',
-        name: 'Ruby Crimson',
-        desc: 'Aggressive cyberpunk scarlet red',
-        emoji: '🔴',
-        colorFn: (s) => pc.red(s),
-        boldFn: (s) => pc.bold(pc.red(s)),
-        accentFn: (s) => pc.magenta(s),
-        badgeFn: (s) => pc.bgRed(pc.white(s)),
-        diffAddBg: (s) => pc.bgRed(pc.white(s)),
-        diffRemoveBg: (s) => pc.bgMagenta(pc.white(s)),
-        hex: '#ef4444'
-    },
-    monochrome: {
-        id: 'monochrome',
-        name: 'Pure Monochrome',
-        desc: 'Crisp minimal pure white & gray',
-        emoji: '⚪',
-        colorFn: (s) => pc.white(s),
-        boldFn: (s) => pc.bold(pc.white(s)),
-        accentFn: (s) => pc.dim(s),
-        badgeFn: (s) => pc.bgWhite(pc.black(s)),
-        diffAddBg: (s) => pc.bgWhite(pc.black(s)),
-        diffRemoveBg: (s) => pc.bgBlack(pc.white(s)),
-        hex: '#ffffff'
+import { bgHex, fgHex } from './colors.js';
+const SPECS = [
+    {
+        id: 'cyan', name: 'Cyan Cyber', desc: 'Electric neon cyan & obsidian (Default)', aliases: ['blue', 'neon', 'cyber'],
+        colors: { accent: '#00f2fe', plan: '#b794f6', ok: '#5fd787', warn: '#ffb454', err: '#ff6b6b', yolo: '#ff8a5c', text: '#dadada', muted: '#bcbcbc', faint: '#8a8a8a', rule: '#767676', shade: '#262626' },
+    },
+    {
+        id: 'purple', name: 'Synthwave Purple', desc: 'Vibrant neon magenta & violet retro', aliases: ['magenta', 'violet', 'pink', 'synthwave'],
+        colors: { accent: '#d946ef', plan: '#22d3ee', ok: '#86efac', warn: '#fbbf24', err: '#fb7185', yolo: '#fb923c', text: '#e6e0f0', muted: '#b9b0c9', faint: '#8f869f', rule: '#6d6580', shade: '#221a2e' },
+    },
+    {
+        id: 'matrix', name: 'Matrix Hacker', desc: 'Classic bright phosphor green terminal', aliases: ['green', 'hacker', 'terminal'],
+        colors: { accent: '#22c55e', plan: '#a3e635', ok: '#4ade80', warn: '#facc15', err: '#f87171', yolo: '#fb923c', text: '#d4f5dc', muted: '#a7c9b0', faint: '#7fa38a', rule: '#5f7f6a', shade: '#10241a' },
+    },
+    {
+        id: 'amber', name: 'Solar Amber', desc: 'Warm vintage CRT amber gold', aliases: ['yellow', 'gold', 'solar', 'orange'],
+        colors: { accent: '#f59e0b', plan: '#fb7185', ok: '#a3e635', warn: '#fde047', err: '#f87171', yolo: '#ef6a3a', text: '#f1e6d0', muted: '#c9b896', faint: '#9f8f70', rule: '#7a6c52', shade: '#2a2012' },
+    },
+    {
+        id: 'crimson', name: 'Ruby Crimson', desc: 'Aggressive cyberpunk scarlet red', aliases: ['red', 'ruby', 'cyberpunk'],
+        colors: { accent: '#ef4444', plan: '#f472b6', ok: '#86efac', warn: '#fbbf24', err: '#fca5a5', yolo: '#f59e0b', text: '#f0dede', muted: '#c9b0b0', faint: '#9d8787', rule: '#7a6666', shade: '#2c1618' },
+    },
+    {
+        id: 'monochrome', name: 'Pure Monochrome', desc: 'Crisp minimal pure white & gray', aliases: ['white', 'mono', 'gray', 'grey'],
+        colors: { accent: '#f5f5f5', plan: '#a8a8a8', ok: '#bcd9bc', warn: '#e6e6e6', err: '#ff8f8f', yolo: '#ffffff', text: '#e4e4e4', muted: '#b8b8b8', faint: '#8c8c8c', rule: '#6e6e6e', shade: '#262626' },
+    },
+    {
+        id: 'nord', name: 'Nord Frost', desc: 'Arctic frost blues, calm and muted', aliases: ['nordic', 'frost', 'arctic'],
+        colors: { accent: '#88c0d0', plan: '#b48ead', ok: '#a3be8c', warn: '#ebcb8b', err: '#e5808b', yolo: '#d08770', text: '#eceff4', muted: '#b6bfd0', faint: '#8791a6', rule: '#616b80', shade: '#2e3440' },
+    },
+    {
+        id: 'dracula', name: 'Dracula', desc: 'Dark purple with vivid pink and green', aliases: ['drac', 'vampire'],
+        colors: { accent: '#bd93f9', plan: '#ff79c6', ok: '#50fa7b', warn: '#f1fa8c', err: '#ff6e6e', yolo: '#ffb86c', text: '#f8f8f2', muted: '#c3c7dc', faint: '#8e94b5', rule: '#626a8c', shade: '#282a36' },
+    },
+    {
+        id: 'tokyonight', name: 'Tokyo Night', desc: 'Neon-lit Tokyo night, indigo and blue', aliases: ['tokyo', 'night', 'tokyo-night'],
+        colors: { accent: '#7aa2f7', plan: '#bb9af7', ok: '#9ece6a', warn: '#e0af68', err: '#f7768e', yolo: '#ff9e64', text: '#c0caf5', muted: '#a9b1d6', faint: '#7f87b0', rule: '#565f89', shade: '#1a1b26' },
+    },
+    {
+        id: 'gruvbox', name: 'Gruvbox', desc: 'Retro warm earth tones, yellow and orange', aliases: ['gruv', 'retro'],
+        colors: { accent: '#fabd2f', plan: '#d3869b', ok: '#b8bb26', warn: '#fe8019', err: '#fb4934', yolo: '#e8742a', text: '#ebdbb2', muted: '#bdae93', faint: '#98897a', rule: '#7c6f64', shade: '#32302f' },
+    },
+    {
+        id: 'catppuccin', name: 'Catppuccin Mocha', desc: 'Soothing pastel mocha, mauve accents', aliases: ['mocha', 'cat', 'catppuccin-mocha'],
+        colors: { accent: '#cba6f7', plan: '#89b4fa', ok: '#a6e3a1', warn: '#f9e2af', err: '#f38ba8', yolo: '#fab387', text: '#cdd6f4', muted: '#bac2de', faint: '#9399b2', rule: '#6c7086', shade: '#1e1e2e' },
+    },
+    {
+        id: 'solarized', name: 'Solarized Dark', desc: 'Low-glare teal and olive classic', aliases: ['solarized-dark', 'sol'],
+        colors: { accent: '#2aa198', plan: '#8f94dc', ok: '#9bb000', warn: '#d9a21b', err: '#ee6a67', yolo: '#ea7b4b', text: '#bcc8c8', muted: '#9eb0b2', faint: '#7f9aa0', rule: '#586e75', shade: '#0b2a33' },
+    },
+    {
+        id: 'rosepine', name: 'Rose Pine', desc: 'Soft rose and gold on dusky violet', aliases: ['rose', 'pine', 'rose-pine'],
+        colors: { accent: '#ebbcba', plan: '#c4a7e7', ok: '#9ccfd8', warn: '#f6c177', err: '#eb6f92', yolo: '#ea9a97', text: '#e0def4', muted: '#c1bed6', faint: '#908caa', rule: '#6e6a86', shade: '#1f1d2e' },
+    },
+    {
+        id: 'monokai', name: 'Monokai', desc: 'Bold lime and magenta editor classic', aliases: ['mono-kai'],
+        colors: { accent: '#a6e22e', plan: '#ae81ff', ok: '#a6e22e', warn: '#e6db74', err: '#f92672', yolo: '#fd971f', text: '#f8f8f2', muted: '#cfcfc2', faint: '#9a9a8e', rule: '#75715e', shade: '#272822' },
+    },
+    {
+        id: 'github', name: 'GitHub Dark', desc: 'Clean blue and green, easy on the eyes', aliases: ['gh', 'git'],
+        colors: { accent: '#58a6ff', plan: '#bc8cff', ok: '#3fb950', warn: '#d29922', err: '#f85149', yolo: '#e3742f', text: '#e6edf3', muted: '#b1bac4', faint: '#8b949e', rule: '#6e7681', shade: '#161b22' },
+    },
+    {
+        id: 'ocean', name: 'Deep Ocean', desc: 'Deep sea cyan and indigo', aliases: ['sea', 'deepsea'],
+        colors: { accent: '#38bdf8', plan: '#818cf8', ok: '#34d399', warn: '#fbbf24', err: '#fb7185', yolo: '#fb923c', text: '#dbeafe', muted: '#a9c3dd', faint: '#7f9dba', rule: '#55708c', shade: '#0c1a2b' },
+    },
+    {
+        id: 'sunset', name: 'Sunset Glow', desc: 'Coral and violet dusk gradient', aliases: ['dusk', 'coral'],
+        colors: { accent: '#ff7e67', plan: '#c084fc', ok: '#86efac', warn: '#fcd34d', err: '#f87171', yolo: '#fb923c', text: '#f5e6e0', muted: '#d1b8b0', faint: '#a69089', rule: '#806560', shade: '#2b1621' },
+    },
+    {
+        id: 'forest', name: 'Forest Moss', desc: 'Mossy greens and woodland earth', aliases: ['moss', 'woods'],
+        colors: { accent: '#8fbc6a', plan: '#d4a373', ok: '#a3d977', warn: '#e9c46a', err: '#ef8a72', yolo: '#f4a261', text: '#e5e8d8', muted: '#b9c0a6', faint: '#8f987b', rule: '#66705a', shade: '#1c2418' },
+    },
+];
+const bold = (s) => (pc.isColorSupported ? `\x1b[1m${s}\x1b[22m` : s);
+function buildTheme(spec, options = {}) {
+    const c = spec.colors;
+    const tokens = {};
+    for (const key of Object.keys(c)) {
+        tokens[key] = key === 'shade' ? bgHex(c[key], options) : fgHex(c[key], options);
     }
-};
-const THEME_ALIASES = {
-    '1': 'cyan',
-    '2': 'purple',
-    '3': 'matrix',
-    '4': 'amber',
-    '5': 'crimson',
-    '6': 'monochrome',
-    'blue': 'cyan',
-    'neon': 'cyan',
-    'cyber': 'cyan',
-    'magenta': 'purple',
-    'violet': 'purple',
-    'pink': 'purple',
-    'synthwave': 'purple',
-    'green': 'matrix',
-    'hacker': 'matrix',
-    'terminal': 'matrix',
-    'yellow': 'amber',
-    'gold': 'amber',
-    'solar': 'amber',
-    'orange': 'amber',
-    'red': 'crimson',
-    'ruby': 'crimson',
-    'cyberpunk': 'crimson',
-    'white': 'monochrome',
-    'mono': 'monochrome',
-    'gray': 'monochrome',
-    'grey': 'monochrome'
-};
+    const black = fgHex('#000000', options);
+    return {
+        id: spec.id,
+        name: spec.name,
+        desc: spec.desc,
+        symbol: '●',
+        hex: c.accent,
+        colors: c,
+        tokens,
+        colorFn: tokens.accent,
+        boldFn: (s) => bold(tokens.accent(s)),
+        accentFn: tokens.plan,
+        badgeFn: (s) => bgHex(c.accent, options)(black(s)),
+        diffAddBg: (s) => bgHex(c.ok, options)(black(s)),
+        diffRemoveBg: (s) => bgHex(c.err, options)(black(s)),
+    };
+}
+export const THEMES = Object.fromEntries(SPECS.map((spec) => [spec.id, buildTheme(spec)]));
+const THEME_ALIASES = {};
+SPECS.forEach((spec, index) => {
+    THEME_ALIASES[String(index + 1)] = spec.id; // "1" ... "18"
+    for (const alias of spec.aliases ?? [])
+        THEME_ALIASES[alias] = spec.id;
+});
 let activeThemeId = 'cyan';
 export function getTheme(themeId) {
     const id = (themeId || activeThemeId).toLowerCase().trim();
@@ -138,3 +135,24 @@ export function getCurrentTheme() {
 export function listThemes() {
     return Object.values(THEMES);
 }
+/** Four dots showing the palette at a glance: accent, plan, ok, warn. */
+export function renderSwatch(theme) {
+    return [theme.tokens.accent, theme.tokens.plan, theme.tokens.ok, theme.tokens.warn].map((paint) => paint(theme.symbol)).join(' ');
+}
+/** A small sample screen painted with the theme, shown while choosing one. */
+export function renderThemePreview(theme) {
+    const k = theme.tokens;
+    const modes = [k.accent(`${theme.symbol} agent`), k.plan('◆ plan'), k.yolo('▲ yolo')].join('   ');
+    const states = [k.ok('✓ done'), k.warn('! careful'), k.err('✗ failed')].join('   ');
+    const text = [k.text('text'), k.muted('muted'), k.faint('faint'), k.rule('─────')].join('  ');
+    const message = k.shade(` ${k.accent('❯')} ${k.text('explain this project')}      `);
+    return [modes, states, text, message].join('\n');
+}
+/** Builds a theme with explicit colour options (tests, forced 256-colour output). */
+export function buildThemeFor(id, options) {
+    const spec = SPECS.find((s) => s.id === id);
+    if (!spec)
+        throw new Error(`Unknown theme: ${id}`);
+    return buildTheme(spec, options);
+}
+export const THEME_IDS = SPECS.map((s) => s.id);

package/dist/cli/transcript.js

@@ -0,0 +1,114 @@
+import { getActionDescription } from '../core/loop.js';
+import { formatDiffBox } from './diff.js';
+import { renderMarkdown } from './markdown.js';
+import { palette, renderPlanCard, renderResultLine, renderTaskCard, renderToolLine, renderUserEcho, summarizeToolResult } from './ui.js';
+import { displayWidth, truncateWidth, wrapText } from './width.js';
+import { t } from '../core/i18n.js';
+const MAX_ECHO_LINES = 300;
+/** The rows under a tool line: a plan card, a diff, or the output (one row folded, all of it unfolded). */
+export function toolResultRows(name, result, opts) {
+    const { cols } = opts;
+    try {
+        const parsed = JSON.parse(result);
+        if (parsed && typeof parsed === 'object') {
+            if (parsed.type === 'todo_list' && Array.isArray(parsed.tasks) && parsed.tasks.length > 0)
+                return renderTaskCard(parsed.tasks, cols);
+            if (parsed.type === 'plan_ready' && typeof parsed.summary === 'string')
+                return renderPlanCard({ summary: parsed.summary, files: parsed.files, steps: parsed.steps }, cols);
+            if (parsed.action === 'edit' && parsed.diffLines) {
+                const box = formatDiffBox(parsed.path, parsed.diffLines, Math.min(cols - 4, 80), undefined, !!opts.diffColors);
+                const rows = box.split('\n').map((l) => '    ' + l);
+                if (parsed.summary)
+                    rows.push(renderResultLine(parsed.summary, 'ok', cols));
+                return rows;
+            }
+            if (parsed.summary)
+                return [renderResultLine(String(parsed.summary), 'ok', cols)];
+        }
+    }
+    catch { }
+    return summarizeToolResult(name, result, cols, opts.expanded);
+}
+export function assistantRows(text) {
+    const rows = renderMarkdown(text).replace(/\s+$/, '').split('\n');
+    return rows.map((row, i) => (i === 0 ? '  ' + palette.accent('●') + ' ' : '    ') + row);
+}
+/** `  ∴ thought for 0.3s · 112 tok  (ctrl+p to expand)`, the hint dropped and the rest cut when the screen is narrow. */
+export function collapsedThoughtLine(summary, hasText, cols) {
+    const room = Math.max(10, cols - 1 - 4);
+    const hint = hasText ? `  (${t('view.expandThought')})` : '';
+    const text = displayWidth(summary + hint) <= room ? summary + hint : truncateWidth(summary, room);
+    return palette.muted('  ∴ ') + palette.faint(text);
+}
+function thoughtRows(item, opts) {
+    const summary = `${t('status.thoughtFor', { sec: item.sec })}${item.stats}`;
+    if (!opts.thinkingExpanded || !item.text.trim()) {
+        return [collapsedThoughtLine(summary, !!item.text.trim(), opts.cols)];
+    }
+    const bar = palette.faint('  │ ');
+    const body = item.text.trim().split('\n').flatMap((line) => (line.trim() === '' ? [''] : wrapText(line, Math.max(20, opts.cols - 8))));
+    return [palette.muted(`  ∴ ${t('status.thinkingLine')}`), ...body.map((l) => bar + palette.muted(l)), palette.faint(`  ╰ ${summary}`)];
+}
+/** One item as terminal rows (without the blank row that separates it from its neighbour). */
+export function renderItem(item, opts) {
+    switch (item.kind) {
+        case 'user': {
+            const lines = item.text.replace(/\t/g, '  ').split('\n');
+            const text = lines.length > MAX_ECHO_LINES ? [...lines.slice(0, MAX_ECHO_LINES), `… +${lines.length - MAX_ECHO_LINES} lines`].join('\n') : item.text;
+            return renderUserEcho(text, opts.cols);
+        }
+        case 'thought':
+            return thoughtRows(item, opts);
+        case 'assistant':
+            return assistantRows(item.text);
+        case 'tool': {
+            const rows = renderToolLine(item.desc, opts.cols, opts.outputExpanded).split('\n');
+            if (item.result !== undefined)
+                rows.push(...toolResultRows(item.name, item.result, { cols: opts.cols, expanded: opts.outputExpanded, diffColors: opts.diffColors }));
+            return rows;
+        }
+        default:
+            return item.rows;
+    }
+}
+/** Whether a blank row goes between two neighbours: everywhere, except between two tool calls and after the user's own padded echo. */
+export function gapBetween(prev, next) {
+    if (!prev)
+        return false;
+    if (prev.kind === 'user' || next.kind === 'user')
+        return false;
+    if (prev.kind === 'tool' && next.kind === 'tool')
+        return false;
+    return true;
+}
+export function renderTranscript(items, opts) {
+    const out = [];
+    items.forEach((item, i) => {
+        if (gapBetween(items[i - 1], item))
+            out.push('');
+        out.push(...renderItem(item, opts));
+    });
+    return out;
+}
+/** A saved conversation as items (a resumed session has no reasoning texts: they were never stored). */
+export function messagesToItems(messages) {
+    const results = new Map();
+    for (const m of messages)
+        if (m.role === 'tool' && m.tool_call_id)
+            results.set(m.tool_call_id, m);
+    const items = [];
+    for (const m of messages) {
+        if (m.role === 'user')
+            items.push({ kind: 'user', text: m.content.split('\n\n--- Attached Files ---')[0] });
+        else if (m.role === 'assistant') {
+            if (m.reasoning && m.reasoning.text.trim())
+                items.push({ kind: 'thought', text: m.reasoning.text, sec: m.reasoning.sec, stats: m.reasoning.stats });
+            if (m.content && m.content.trim())
+                items.push({ kind: 'assistant', text: m.content });
+            for (const call of m.tool_calls ?? []) {
+                items.push({ kind: 'tool', name: call.name, desc: getActionDescription(call.name, call.arguments ?? {}), result: results.get(call.id)?.content });
+            }
+        }
+    }
+    return items;
+}