termux-dev 1.8.0 → 1.8.1

package/dist/cli/index.js

@@ -1,6 +1,5 @@
 import { Command } from 'commander';
 import * as p from '@clack/prompts';
-import { search, password, input } from '@inquirer/prompts';
 import pc from 'picocolors';
 import os from 'os';
 import path from 'path';
@@ -21,6 +20,8 @@ import { notifyDevice, acquireWakeLock, isTermux, notificationBody, sendDesktopN
 import { copyToClipboard } from './clipboard-write.js';
 import { REWIND_CURRENT, messageDraft, rewindItems, userEntries } from './rewind.js';
 import { runPicker } from './picker.js';
+import { runFinder, runTextInput } from './finder.js';
+import { renderWelcome } from './welcome.js';
 import { savePlanFile } from '../core/planfile.js';
 import { BASE_TITLE, RESTORE_TERMINAL_TITLE, SAVE_TERMINAL_TITLE, cleanTitle, generateChatTitle, provisionalTitle, terminalTitleSequence } from '../core/title.js';
 import { runDoctor } from './doctor.js';
@@ -32,7 +33,7 @@ import { SmoothStreamer } from './smooth.js';
 import { askPrompt } from './prompt.js';
 import { resolveAtMentions } from './files.js';
 import { runStartupUpdateCheck, checkForUpdates, performSelfUpdate } from './updater.js';
-import { setActiveTheme, getCurrentTheme, listThemes, findTheme, renderSwatch, renderThemePreview } from './theme.js';
+import { setActiveTheme, getCurrentTheme, listThemes, findTheme } from './theme.js';
 import { runHeadlessMode } from './headless.js';
 import { CustomCommandManager } from '../core/commands.js';
 import { UsageTracker } from '../core/usage.js';
@@ -54,7 +55,7 @@ import { askConfirm, askPlanDecision, printFarewell } from './confirm.js';
 import { createCheckpoint, diffCheckpoint, restoreCheckpoint } from '../core/checkpoint.js';
 import { log, note } from './log.js';
 import { displayWidth, tailWidth } from './width.js';
-import { collapsedThoughtLine, messagesToItems, renderTranscript, toolResultRows } from './transcript.js';
+import { COMPACT_MARK, collapsedThoughtLine, renderItem, messagesToItems, renderTranscript, toolResultRows } from './transcript.js';
 import { chooseEffort, effortCommand } from './effort.js';
 import { effectiveReasoning, parseEffortArg, detectRoute, thinkLabel } from '../core/reasoning.js';
 import { catalogInfo, installCapabilities, refreshCapabilities, refreshCatalog } from '../core/capabilities.js';
@@ -63,7 +64,7 @@ import { contextBreakdown } from '../core/context-stats.js';
 import { runUsagePanel } from './usage-panel.js';
 import { TurnComposer } from './typeahead.js';
 import { EXTENDED_KEYS_OFF, normalizeKey, splitKeys } from './keys.js';
-import { getLanguage, setLanguage, t } from '../core/i18n.js';
+import { LANGUAGES, getLanguage, setLanguage, t } from '../core/i18n.js';
 import { anthropicOnlyModels, formatFromBaseUrl, refreshFormats } from '../core/formats.js';
 import { providerFormat } from '../providers/index.js';
 const CONFIG_PATH = path.join(os.homedir(), '.devxrc.json');
@@ -138,9 +139,11 @@ const POPULAR_PROVIDER_MODELS = {
     groq: ['llama-3.3-70b-versatile', 'llama-3.1-8b-instant', 'mixtral-8x7b-32768'],
     mistral: ['mistral-large-latest', 'mistral-small-latest', 'codestral-latest'],
 };
-async function selectModel(baseUrl, apiKey, currentModel, providerId = '', allowCancel = true) {
+const formatContext = (n) => (n >= 1_000_000 ? `${(n / 1_000_000).toFixed(1)}M` : `${Math.round(n / 1000)}k`);
+/** `step` is "3/4" during the first run, so the card says where in the setup you are. */
+async function selectModel(baseUrl, apiKey, currentModel, providerId = '', _allowCancel = true, step) {
     const s = new UiSpinner();
-    s.start('Fetching available models from provider...');
+    s.start(t('onboard.model.fetching'));
     const result = await fetchModels(baseUrl, apiKey);
     // The same gateway may list more models (Claude) in its Anthropic format, with the same key.
     if (result.ok && probeEndpointsAllowed) {
@@ -160,201 +163,152 @@ async function selectModel(baseUrl, apiKey, currentModel, providerId = '', allow
             contextLength: getModelContextLimit(id)
         }));
     }
-    let modelChoice;
-    if (models.length > 0) {
-        try {
-            modelChoice = await search({
-                message: `Select a model (${models.length} available, type to filter):`,
-                source: async (term) => {
-                    const q = (term || '').trim().toLowerCase();
-                    const list = [];
-                    if (allowCancel) {
-                        list.push({ name: pc.yellow('← Back / Cancel'), value: '__cancel__', description: 'Keep current model' });
-                    }
-                    list.push({ name: pc.yellow('+ Type a custom model name...'), value: 'custom_input', description: 'Enter any model ID manually' });
-                    for (const m of models) {
-                        const isCurrent = m.id === currentModel;
-                        const prefix = isCurrent ? pc.cyan('› ') : '  ';
-                        const nameStr = isCurrent ? pc.bold(pc.cyan(m.id + ' (current)')) : m.id;
-                        const ctxStr = (m.viaAnthropic ? 'Anthropic format' + (m.contextLength ? ', ' : '') : '') + (m.contextLength ? `${m.contextLength >= 1_000_000 ? (m.contextLength / 1_000_000).toFixed(1) + 'M' : Math.round(m.contextLength / 1000) + 'k'} context` : '');
-                        list.push({
-                            name: prefix + nameStr,
-                            value: m.id,
-                            description: ctxStr
-                        });
-                    }
-                    if (!q)
-                        return list;
-                    return list.filter(item => item.value.toLowerCase().includes(q) || item.name.toLowerCase().includes(q));
-                },
-                pageSize: 10
-            });
-        }
-        catch {
-            return null;
-        }
-        if (modelChoice === '__cancel__') {
-            return null;
-        }
-        if (modelChoice === 'custom_input') {
-            try {
-                const customModel = await input({
-                    message: 'Type the model name (e.g. gpt-4o or claude-3-7-sonnet):',
-                });
-                if (!customModel || !customModel.trim())
-                    return null;
-                const name = customModel.trim();
-                return { model: name, contextLimit: getModelContextLimit(name) };
-            }
-            catch {
-                return null;
-            }
-        }
-        const found = models.find(m => m.id === modelChoice);
-        const limit = (found && found.contextLength) || getModelContextLimit(modelChoice);
-        return { model: modelChoice, contextLimit: limit };
-    }
-    else {
-        log.warn('Could not fetch models automatically.');
-        try {
-            const typedModel = await input({
-                message: 'Type the model name you want to use (e.g. gpt-4o):',
-                default: currentModel || ''
-            });
-            if (!typedModel || !typedModel.trim())
-                return null;
-            const name = typedModel.trim();
-            return { model: name, contextLimit: getModelContextLimit(name) };
-        }
-        catch {
+    const typeName = async (note) => {
+        const name = await runTextInput({
+            title: t('onboard.model.title'),
+            subtitle: step,
+            label: t('onboard.model.label'),
+            initial: models.length === 0 ? currentModel : '',
+            notes: note ? [note] : undefined,
+        });
+        return name ? { model: name, contextLimit: getModelContextLimit(name) } : null;
+    };
+    if (models.length === 0)
+        return typeName(t('onboard.model.manual'));
+    const CUSTOM = '__custom__';
+    for (;;) {
+        const choice = await runFinder({
+            title: t('onboard.model.title'),
+            subtitle: step ?? `${models.length}`,
+            placeholder: t('onboard.model.placeholder'),
+            current: currentModel,
+            items: [
+                { value: CUSTOM, label: t('onboard.model.custom'), detail: t('onboard.model.customDetail'), pinned: true },
+                ...models.map((m) => ({
+                    value: m.id,
+                    label: m.id,
+                    detail: [m.viaAnthropic ? t('onboard.model.anthropic') : '', m.contextLength ? t('onboard.model.context', { n: formatContext(m.contextLength) }) : ''].filter(Boolean).join(', '),
+                })),
+            ],
+        });
+        if (choice === undefined)
             return null;
+        if (choice === CUSTOM) {
+            const typed = await typeName();
+            if (typed)
+                return typed;
+            continue; // Esc in the field: back to the list
         }
+        const found = models.find(m => m.id === choice);
+        return { model: choice, contextLimit: (found && found.contextLength) || getModelContextLimit(choice) };
     }
 }
+/** The host of an address, for the detail column: `api.openai.com`. */
+const hostOf = (url) => url.replace(/^https?:\/\//, '').replace(/\/.*$/, '');
 async function selectProvider(currentConfig, allowCancel = true) {
     const apiKeys = currentConfig.apiKeys || {};
     const baseUrls = currentConfig.baseUrls || {};
     if (currentConfig.provider && currentConfig.apiKey) {
         apiKeys[currentConfig.provider] = currentConfig.apiKey;
     }
-    let providerId;
-    try {
-        providerId = await search({
-            message: 'Select AI Provider (type to filter, Esc to cancel):',
-            source: async (term) => {
-                const q = (term || '').trim().toLowerCase();
-                const filtered = q
-                    ? ALL_PROVIDERS.filter(pr => pr.label.toLowerCase().includes(q) || pr.value.toLowerCase().includes(q))
-                    : ALL_PROVIDERS;
-                const list = filtered.map(pr => {
-                    const isCurrent = pr.value === currentConfig.provider;
-                    const labelStr = isCurrent ? pc.bold(pc.cyan(pr.label + ' (current)')) : pr.label;
-                    const hasKey = apiKeys[pr.value] ? `[Key: ${maskApiKey(apiKeys[pr.value])}] ` : '';
-                    return {
-                        name: `${isCurrent ? pc.cyan('› ') : '  '}${labelStr}`,
-                        value: pr.value,
-                        description: `${hasKey}${pr.baseUrl || 'Custom endpoint'}`
-                    };
-                });
-                if (allowCancel) {
-                    list.unshift({
-                        name: pc.yellow('← Back / Cancel'),
-                        value: '__cancel__',
-                        description: 'Keep current provider'
-                    });
-                }
-                return list;
-            },
-            pageSize: 10
-        });
-    }
-    catch {
-        return null;
-    }
-    if (providerId === '__cancel__') {
-        return null;
-    }
-    const selectedProvider = ALL_PROVIDERS.find(pr => pr.value === providerId) || { baseUrl: '', label: providerId };
-    let baseUrl = baseUrls[providerId] || selectedProvider.baseUrl;
-    if (providerId === 'custom' || !baseUrl) {
-        try {
-            const customUrl = await input({
-                message: 'Enter Base URL (e.g. https://api.openai.com/v1):',
-                default: baseUrl || ''
+    const firstRun = !allowCancel;
+    const stepOf = (n) => (firstRun ? `${n}/5` : undefined);
+    let providerId = '';
+    let baseUrl = '';
+    let apiKey = '';
+    let stage = 'provider';
+    let modelRes = null;
+    while (!modelRes) {
+        if (stage === 'provider') {
+            const choice = await runFinder({
+                title: t('onboard.provider.title'),
+                subtitle: stepOf(3),
+                placeholder: t('onboard.provider.placeholder'),
+                current: currentConfig.provider,
+                notes: firstRun ? [t('onboard.provider.note')] : undefined,
+                items: ALL_PROVIDERS.map((pr) => ({
+                    value: pr.value,
+                    label: pr.label,
+                    detail: `${apiKeys[pr.value] ? maskApiKey(apiKeys[pr.value]) + '  ' : ''}${hostOf(pr.baseUrl || '')}`.trim(),
+                    keywords: `${pr.value} ${hostOf(pr.baseUrl || '')}`,
+                    pinned: pr.value === 'custom',
+                })),
             });
-            if (!customUrl || !customUrl.trim())
-                return null;
-            baseUrl = customUrl.trim();
-            baseUrls[providerId] = baseUrl;
+            if (choice === undefined)
+                return null; // Esc on the first step leaves the whole setup
+            providerId = choice;
+            const known = ALL_PROVIDERS.find(pr => pr.value === providerId);
+            baseUrl = baseUrls[providerId] || known?.baseUrl || '';
+            stage = providerId === 'custom' || !baseUrl ? 'url' : 'key';
         }
-        catch {
-            return null;
+        else if (stage === 'url') {
+            const url = await runTextInput({
+                title: t('onboard.baseUrl.title'),
+                subtitle: stepOf(3),
+                label: t('onboard.baseUrl.label'),
+                initial: baseUrl,
+                placeholder: t('onboard.baseUrl.placeholder'),
+            });
+            if (url === undefined) {
+                stage = 'provider';
+                continue;
+            }
+            baseUrl = url;
+            baseUrls[providerId] = baseUrl;
+            stage = 'key';
         }
-    }
-    let apiKey = '';
-    if (providerId === 'ollama') {
-        apiKey = 'ollama';
-    }
-    else {
-        const savedKey = apiKeys[providerId];
-        if (savedKey) {
-            let keyChoice;
-            try {
-                keyChoice = await search({
-                    message: `API key found for ${selectedProvider.label} (${maskApiKey(savedKey)}):`,
-                    source: async () => [
-                        { name: `● Continue with saved API key (${maskApiKey(savedKey)})`, value: 'use_saved' },
-                        { name: '+ Enter a new API key', value: 'new_key' },
-                        { name: pc.yellow('← Cancel'), value: '__cancel__' }
+        else if (stage === 'key') {
+            const label = ALL_PROVIDERS.find(pr => pr.value === providerId)?.label || providerId;
+            const back = providerId === 'custom' || !(ALL_PROVIDERS.find(pr => pr.value === providerId)?.baseUrl) ? 'url' : 'provider';
+            if (providerId === 'ollama') {
+                apiKey = 'ollama';
+                stage = 'model';
+                continue;
+            }
+            const saved = apiKeys[providerId];
+            let useSaved = false;
+            if (saved) {
+                const choice = await runPicker({
+                    title: t('onboard.key.title'),
+                    subtitle: label,
+                    items: [
+                        { value: 'saved', label: t('onboard.key.useSaved'), detail: maskApiKey(saved) },
+                        { value: 'new', label: t('onboard.key.enterNew') },
                     ],
-                    pageSize: 5
+                    notes: [t('onboard.key.savedTitle', { provider: label })],
                 });
+                if (choice === undefined) {
+                    stage = back;
+                    continue;
+                }
+                useSaved = choice === 'saved';
             }
-            catch {
-                return null;
-            }
-            if (keyChoice === '__cancel__')
-                return null;
-            if (keyChoice === 'use_saved') {
-                apiKey = savedKey;
+            if (useSaved) {
+                apiKey = saved;
             }
             else {
-                try {
-                    const key = await password({
-                        message: `Enter new API Key for ${selectedProvider.label}:`,
-                        mask: '•'
-                    });
-                    if (!key || !key.trim())
-                        return null;
-                    apiKey = key.trim();
-                    apiKeys[providerId] = apiKey;
-                }
-                catch {
-                    return null;
+                const key = await runTextInput({
+                    title: t('onboard.key.title'),
+                    subtitle: stepOf(4) ?? label,
+                    label: t('onboard.key.label', { provider: label }),
+                    secret: true,
+                    notes: [t('onboard.key.note')],
+                });
+                if (key === undefined) {
+                    stage = back;
+                    continue;
                 }
+                apiKey = key;
+                apiKeys[providerId] = apiKey;
             }
+            stage = 'model';
         }
         else {
-            try {
-                const key = await password({
-                    message: `Enter API Key for ${selectedProvider.label} (or press Esc to cancel):`,
-                    mask: '•'
-                });
-                if (!key || !key.trim())
-                    return null;
-                apiKey = key.trim();
-                apiKeys[providerId] = apiKey;
-            }
-            catch {
-                return null;
-            }
+            modelRes = await selectModel(baseUrl, apiKey, currentConfig.model || '', providerId, allowCancel, stepOf(5));
+            if (!modelRes)
+                stage = apiKey === 'ollama' ? 'provider' : 'key';
         }
     }
-    // Pick a model for this provider
-    const modelRes = await selectModel(baseUrl, apiKey, currentConfig.model || '', providerId, allowCancel);
-    if (!modelRes) {
-        return null;
-    }
     const updatedConfig = {
         ...currentConfig,
         provider: providerId,
@@ -369,15 +323,54 @@ async function selectProvider(currentConfig, allowCancel = true) {
     await saveConfig(updatedConfig);
     return updatedConfig;
 }
+/** The themes as a list; the interface takes the colours of the focused one at once, so you see what you pick. */
+async function chooseTheme(current, step) {
+    const before = current ?? getCurrentTheme().id;
+    const picked = await runPicker({
+        title: t('onboard.theme.title'),
+        subtitle: step,
+        items: listThemes().map((th) => ({ value: th.id, label: th.name, detail: th.desc })),
+        current: before,
+        labelWidth: 20,
+        notes: [t('onboard.theme.note')],
+        onFocus: (id) => { setActiveTheme(id); },
+    });
+    setActiveTheme(picked ?? before);
+    return picked;
+}
+/** First run: the welcome card, the language, then provider, key and model, each on its own small card. */
 async function runOnboarding() {
-    console.clear();
-    p.intro(pc.bgCyan(pc.black(' Welcome to devx ')));
-    p.note('No configuration found. Let\'s set up your AI provider.', 'Setup');
-    const res = await selectProvider({ apiKeys: {}, baseUrls: {} }, false);
+    const cols = () => process.stdout.columns || 80;
+    const show = (done) => {
+        process.stdout.write('\x1b[2J\x1b[3J\x1b[H');
+        console.log();
+        for (const line of renderWelcome(DEVX_VERSION, cols(), done))
+            console.log(line);
+        console.log();
+    };
+    show(0);
+    const language = await runPicker({
+        title: t('onboard.language.title'),
+        subtitle: '1/5',
+        items: LANGUAGES.map((l) => ({ value: l.id, label: l.name })),
+        current: getLanguage(),
+        notes: [t('onboard.language.note')],
+        labelWidth: 14,
+    });
+    if (language === undefined) {
+        process.exit(0);
+    }
+    setLanguage(language);
+    show(1);
+    const theme = await chooseTheme(undefined, '2/5');
+    show(2);
+    const res = await selectProvider({ apiKeys: {}, baseUrls: {}, language, ...(theme ? { theme } : {}), onboarded: true }, false);
     if (!res) {
         process.exit(0);
     }
-    p.outro(pc.green('Setup complete! Configuration saved to ~/.devxrc.json'));
+    show(5);
+    console.log(renderNotice('ok', t('onboard.done')));
+    console.log();
     return res;
 }
 /**
@@ -609,6 +602,11 @@ function formatToolGeneratingLabel(name, targetHint) {
         return `→ Clarifying questions...`;
     return `→ ${name}${target}...`;
 }
+/** `#ab526 · 2h ago · 12 msgs`: what tells two sessions with the same title apart. */
+function sessionDetail(s) {
+    const count = s.messages.filter((m) => m.role !== 'system').length;
+    return `#${s.id.split('_').pop()} · ${formatSessionTime(s.updatedAt)} · ${t('resume.msgs', { n: count })}`;
+}
 async function handleSessionDelete(bannerMode) {
     while (true) {
         const sessions = await SessionManager.listSessions();
@@ -617,36 +615,18 @@ async function handleSessionDelete(bannerMode) {
             log.warn('No saved sessions found.');
             break;
         }
-        let chosenSessionId;
-        try {
-            chosenSessionId = await search({
-                message: `Select session to DELETE (${sessions.length} sessions, Esc to finish):`,
-                source: async (term) => {
-                    const q = (term || '').trim().toLowerCase();
-                    const list = [
-                        { name: pc.yellow('← Done / Cancel'), value: '__cancel__', description: 'Return to chat' },
-                        { name: pc.red('× Delete ALL sessions'), value: '__all__', description: `Remove all ${sessions.length} saved sessions` }
-                    ];
-                    for (const s of sessions) {
-                        const timeStr = formatSessionTime(s.updatedAt);
-                        const msgCount = s.messages.filter(m => m.role !== 'system').length;
-                        const shortId = s.id.split('_').pop();
-                        list.push({
-                            name: `${pc.red('× ')} ${pc.dim(`[#${shortId}]`)} ${s.title}`,
-                            value: s.id,
-                            description: `${timeStr} • ${msgCount} msgs • ${s.model || 'default'}`
-                        });
-                    }
-                    if (!q)
-                        return list;
-                    return list.filter(item => item.name.toLowerCase().includes(q) || item.value.toLowerCase().includes(q));
-                },
-                pageSize: 10
-            });
-        }
-        catch {
-            break;
-        }
+        const DELETE_ALL = '__all__';
+        const chosen = await runFinder({
+            title: t('sessions.deleteTitle'),
+            subtitle: `${sessions.length}`,
+            placeholder: t('resume.placeholder'),
+            labelWidth: 36,
+            items: [
+                { value: DELETE_ALL, label: t('sessions.deleteAll', { n: sessions.length }), pinned: true },
+                ...sessions.map((s) => ({ value: s.id, label: s.title, detail: sessionDetail(s), keywords: `${s.id} ${s.model || ''}` })),
+            ],
+        });
+        const chosenSessionId = chosen ?? '__cancel__';
         if (!chosenSessionId || chosenSessionId === '__cancel__') {
             drawLogo(bannerMode);
             log.info('Session deletion finished.');
@@ -675,38 +655,17 @@ async function handleSessionDelete(bannerMode) {
     }
 }
 async function handleThemeSelect(config) {
-    const currentTh = getCurrentTheme();
-    const themeChoices = listThemes().map(t => ({
-        theme: t,
-        choice: {
-            name: `${renderSwatch(t)} ${t.boldFn(t.name.padEnd(18))} ${pc.dim(t.desc)} ${t.id === currentTh.id ? pc.green('(Active)') : ''}`,
-            value: t.id,
-            description: `${renderThemePreview(t)}\n\n${pc.dim(`${t.name}  ${t.hex}`)}`
-        }
-    }));
-    try {
-        const selected = await search({
-            message: `${pc.bold('Select UI Theme / Выберите цветовую тему')} ${pc.dim(`(${themeChoices.length} themes, type to filter):`)}`,
-            pageSize: 8,
-            source: async (term) => {
-                const q = (term || '').toLowerCase().trim();
-                return themeChoices
-                    .filter(({ theme: t }) => !q || `${t.id} ${t.name} ${t.desc}`.toLowerCase().includes(q))
-                    .map(({ choice }) => choice);
-            }
-        });
-        if (selected) {
-            config.theme = selected;
-            await saveConfig(config);
-            const th = setActiveTheme(selected);
-            // No redraw of the screen: that would wipe the conversation. New output uses the new colours.
-            if (config.ui?.layout === 'classic')
-                log.success(th.boldFn(`Theme switched to ${th.colorFn(th.symbol)} ${th.name}!`));
-            else
-                console.log(renderNotice('ok', `theme ${th.name}`));
-        }
+    const selected = await chooseTheme(config.theme);
+    if (selected) {
+        config.theme = selected;
+        await saveConfig(config);
+        const th = setActiveTheme(selected);
+        // No redraw of the screen: that would wipe the conversation. New output uses the new colours.
+        if (config.ui?.layout === 'classic')
+            log.success(th.boldFn(`Theme switched to ${th.colorFn(th.symbol)} ${th.name}!`));
+        else
+            console.log(renderNotice('ok', `theme ${th.name}`));
     }
-    catch { }
 }
 async function handleSettings(config) {
     const initial = {
@@ -863,31 +822,11 @@ export async function main() {
         };
     };
     if (!config.onboarded) {
-        const themeChoices = listThemes().map(t => ({
-            theme: t,
-            choice: {
-                name: `${renderSwatch(t)} ${t.boldFn(t.name.padEnd(18))} ${pc.dim(t.desc)}`,
-                value: t.id,
-                description: `${renderThemePreview(t)}\n\n${pc.dim('You can change this anytime with /theme')}`
-            }
-        }));
-        try {
-            clearTerminalScreen();
-            const selected = await search({
-                message: `${pc.bold('Pick a theme to personalize your workspace:')}`,
-                source: async (term) => {
-                    const q = (term || '').toLowerCase().trim();
-                    return themeChoices
-                        .filter(({ theme: t }) => !q || `${t.id} ${t.name} ${t.desc}`.toLowerCase().includes(q))
-                        .map(({ choice }) => choice);
-                },
-                pageSize: 8
-            });
-            if (selected) {
-                config.theme = selected;
-            }
-        }
-        catch { }
+        // A config from before the first-run setup had a theme step: ask it once.
+        clearTerminalScreen();
+        const selected = await chooseTheme(config.theme);
+        if (selected)
+            config.theme = selected;
         config.onboarded = true;
         await saveConfig(config);
     }
@@ -1148,21 +1087,17 @@ export async function main() {
                         ...customSlashItems
                     ];
                     try {
-                        const picked = await search({
-                            message: 'Commands (type to search or select):',
-                            source: async (term) => {
-                                const q = (term || '').trim().toLowerCase();
-                                const list = [
-                                    { name: pc.yellow('← Cancel'), value: '__cancel__' },
-                                    ...SLASH_COMMANDS
-                                ];
-                                if (!q)
-                                    return list;
-                                return list.filter(item => item.name.toLowerCase().includes(q) || item.value.toLowerCase().includes(q));
-                            },
-                            pageSize: 12
+                        const picked = await runFinder({
+                            title: t('commands.title'),
+                            subtitle: `${SLASH_COMMANDS.length}`,
+                            placeholder: t('commands.placeholder'),
+                            labelWidth: 14,
+                            items: SLASH_COMMANDS.map((c) => {
+                                const [name, ...rest] = c.name.split(/\s+-\s+/);
+                                return { value: c.value, label: name.trim(), detail: rest.join(' - ') };
+                            }),
                         });
-                        if (!picked || picked === '__cancel__') {
+                        if (!picked) {
                             continue;
                         }
                         if (picked === '/session del') {
@@ -1238,43 +1173,21 @@ export async function main() {
                     log.warn('No saved sessions found.');
                     continue;
                 }
-                let chosenSessionId;
-                try {
-                    chosenSessionId = await search({
-                        message: 'Select a session to resume (type to filter, Esc to cancel):',
-                        source: async (term) => {
-                            const q = (term || '').trim().toLowerCase();
-                            const list = [
-                                { name: pc.yellow('← Back / Cancel'), value: '__cancel__', description: 'Return to chat' },
-                                { name: pc.red('× Delete sessions... (/session del)'), value: '__delete_mode__', description: 'Selectively delete saved sessions' }
-                            ];
-                            for (const s of sessions) {
-                                const timeStr = formatSessionTime(s.updatedAt);
-                                const msgCount = s.messages.filter(m => m.role !== 'system').length;
-                                const shortId = s.id.split('_').pop();
-                                list.push({
-                                    name: `${pc.dim(`[#${shortId}]`)} ${s.title}`,
-                                    value: s.id,
-                                    description: `${timeStr} • ${msgCount} msgs • ${s.model || 'default'}`
-                                });
-                            }
-                            if (!q)
-                                return list;
-                            return list.filter(item => item.name.toLowerCase().includes(q) || item.value.toLowerCase().includes(q));
-                        },
-                        pageSize: 10
-                    });
-                }
-                catch {
-                    continue;
-                }
-                if (chosenSessionId === '__cancel__') {
-                    continue;
-                }
-                if (chosenSessionId === '__delete_mode__') {
-                    await handleSessionDelete(config.banner || 'full');
+                const picked = await runFinder({
+                    title: t('resume.title'),
+                    subtitle: `${sessions.length}`,
+                    placeholder: t('resume.placeholder'),
+                    labelWidth: 36,
+                    items: sessions.map((s) => ({
+                        value: s.id,
+                        label: s.title,
+                        detail: sessionDetail(s),
+                        keywords: `${s.id} ${s.model || ''}`,
+                    })),
+                });
+                if (picked === undefined)
                     continue;
-                }
+                const chosenSessionId = picked;
                 const loaded = await SessionManager.loadSession(chosenSessionId);
                 if (loaded) {
                     sessionManager.setLoadedSession(loaded);
@@ -1514,9 +1427,12 @@ export async function main() {
                     // A user message, not an assistant one: the Anthropic format cannot start with the assistant.
                     history.addMessage({
                         role: 'user',
-                        content: `[CONVERSATION COMPACTED] Summary of our conversation so far:\n${res.content}`
+                        content: `${COMPACT_MARK} Summary of our conversation so far:\n${res.content}`
                     });
-                    log.success(pc.bold(pc.green('Context successfully compacted! Freed up tokens while retaining task summary.')));
+                    const item = { kind: 'compact', summary: res.content };
+                    transcript.push(item);
+                    console.log();
+                    console.log(renderItem(item, { cols: process.stdout.columns || 80, thinkingExpanded, outputExpanded }).join('\n'));
                 }
                 catch (err) {
                     s.stop();