termux-dev 1.2.2 → 1.4.0

package/dist/cli/index.js

@@ -27,6 +27,11 @@ import { askPrompt } from './prompt.js';
 import { resolveAtMentions } from './files.js';
 import { runStartupUpdateCheck, checkForUpdates, performSelfUpdate } from './updater.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';
+import { SessionExporter } from './export.js';
+import { MCPManager } from '../mcp/manager.js';
 const CONFIG_PATH = path.join(os.homedir(), '.devxrc.json');
 function maskApiKey(key) {
     if (!key)
@@ -316,23 +321,111 @@ async function runOnboarding() {
     p.outro(pc.green('Setup complete! Configuration saved to ~/.devxrc.json'));
     return res;
 }
-async function loadConfig() {
+async function loadConfig(interactive = true) {
+    let globalConfig = {};
     try {
         const data = await fs.readFile(CONFIG_PATH, 'utf8');
-        const parsed = JSON.parse(data);
-        if (!parsed.model || !parsed.baseUrl)
+        globalConfig = JSON.parse(data);
+        if (!globalConfig.model || !globalConfig.baseUrl)
             throw new Error('Invalid config');
-        parsed.maxContextTokens = parsed.maxContextTokens || getModelContextLimit(parsed.model);
-        parsed.apiKeys = parsed.apiKeys || {};
-        parsed.baseUrls = parsed.baseUrls || {};
-        if (parsed.provider && parsed.apiKey) {
-            parsed.apiKeys[parsed.provider] = parsed.apiKey;
+        globalConfig.maxContextTokens = globalConfig.maxContextTokens || getModelContextLimit(globalConfig.model);
+        globalConfig.apiKeys = globalConfig.apiKeys || {};
+        globalConfig.baseUrls = globalConfig.baseUrls || {};
+        globalConfig.trustedProjects = globalConfig.trustedProjects || {};
+        if (globalConfig.provider && globalConfig.apiKey) {
+            globalConfig.apiKeys[globalConfig.provider] = globalConfig.apiKey;
         }
-        return parsed;
     }
     catch {
-        return await runOnboarding();
+        if (interactive) {
+            globalConfig = await runOnboarding();
+        }
+        else {
+            throw new Error('No configuration found in ~/.devxrc.json. Please run devx interactively first to set up your AI provider.');
+        }
+    }
+    // Check for local project config (.devx.json or .devxrc.json)
+    const localConfigPaths = [
+        path.join(process.cwd(), '.devx.json'),
+        path.join(process.cwd(), '.devxrc.json')
+    ];
+    let localConfig = null;
+    for (const lp of localConfigPaths) {
+        try {
+            if (fsSync.existsSync(lp)) {
+                const raw = await fs.readFile(lp, 'utf8');
+                localConfig = JSON.parse(raw);
+                break;
+            }
+        }
+        catch { }
     }
+    const effectiveConfig = { ...globalConfig };
+    const cwd = process.cwd();
+    let isTrusted = globalConfig.trustedProjects?.[cwd];
+    // Workspace & Project Trust Check on first time opening this directory
+    if (isTrusted === undefined) {
+        if (interactive) {
+            console.log('');
+            p.log.warn(pc.bold(pc.yellow(`🛡️  [WORKSPACE TRUST] First time opening this workspace:`)));
+            console.log(pc.dim(`   Directory: ${cwd}`));
+            if (localConfig) {
+                if (localConfig.autoApprove === true) {
+                    console.log(pc.yellow(`   • Local .devx.json requests Auto-approval (YOLO mode)`));
+                }
+                if (localConfig.bashAllowlist) {
+                    console.log(pc.yellow(`   • Local .devx.json requests Bash allowlist: ${localConfig.bashAllowlist.join(', ')}`));
+                }
+            }
+            const answer = await p.confirm({
+                message: 'Do you trust this workspace and allow agent operations?',
+                initialValue: true
+            });
+            if (p.isCancel(answer) || answer !== true) {
+                resetTerminalTheme();
+                p.outro(pc.yellow('Workspace not trusted. Exiting devx.'));
+                process.exit(0);
+            }
+            globalConfig.trustedProjects = globalConfig.trustedProjects || {};
+            globalConfig.trustedProjects[cwd] = true;
+            await saveConfig(globalConfig);
+            p.log.success(pc.green('Workspace marked as trusted. Full capabilities enabled.'));
+        }
+        else {
+            isTrusted = false; // Never auto-trust in non-interactive headless mode
+        }
+    }
+    if (localConfig && typeof localConfig === 'object') {
+        // Apply safe configuration overrides
+        if (localConfig.model)
+            effectiveConfig.model = localConfig.model;
+        if (localConfig.provider)
+            effectiveConfig.provider = localConfig.provider;
+        if (localConfig.apiKey)
+            effectiveConfig.apiKey = localConfig.apiKey;
+        if (localConfig.baseUrl)
+            effectiveConfig.baseUrl = localConfig.baseUrl;
+        if (localConfig.maxIterations)
+            effectiveConfig.maxIterations = localConfig.maxIterations;
+        if (localConfig.maxContextTokens)
+            effectiveConfig.maxContextTokens = localConfig.maxContextTokens;
+        if (localConfig.dataSaverLimitMB)
+            effectiveConfig.dataSaverLimitMB = localConfig.dataSaverLimitMB;
+        if (localConfig.pureBlackTheme !== undefined)
+            effectiveConfig.pureBlackTheme = localConfig.pureBlackTheme;
+        // Apply elevated permissions only if explicitly trusted
+        if (isTrusted) {
+            if (localConfig.autoApprove !== undefined)
+                effectiveConfig.autoApprove = localConfig.autoApprove;
+            if (Array.isArray(localConfig.bashAllowlist))
+                effectiveConfig.bashAllowlist = localConfig.bashAllowlist;
+        }
+    }
+    // Configure Data Saver threshold
+    if (effectiveConfig.dataSaverLimitMB) {
+        UsageTracker.getInstance().setLimit(effectiveConfig.dataSaverLimitMB);
+    }
+    return effectiveConfig;
 }
 function enableDarkTheme(enabled = true) {
     if (!enabled)
@@ -391,7 +484,7 @@ function drawLogo() {
             theme.colorFn('  █▀▀▄ █▀▀▀ █   █ █   █'),
             theme.colorFn('  █  █ █▀▀▀  ▀▄▀   ▀▄▀ '),
             theme.colorFn('  █▄▄▀ █▄▄▄   ▀    ▀ ▀ '),
-            '  ' + theme.boldFn('v1.2.2'),
+            '  ' + theme.boldFn('v1.4.0'),
             ''
         ];
         for (const line of logo) {
@@ -406,7 +499,7 @@ function drawLogo() {
             indent + theme.colorFn('▀▀▀█▀▀▀ █▀▀▀ █▀▀█ █▄ ▄█ █  █ ▀▄ ▄▀    █▀▀▄ █▀▀▀ █   █'),
             indent + theme.colorFn('   █    █▀▀▀ █▄▄▀ █ █ █ █  █   █   ▀▀ █  █ █▀▀▀ █   █'),
             indent + theme.colorFn('   █    █▄▄▄ █ ▀▄ █   █ ▀▄▄▀ ▄▀ ▀▄    █▄▄▀ █▄▄▄  ▀▄▀ '),
-            indent + theme.boldFn('v1.2.2'),
+            indent + theme.boldFn('v1.4.0'),
             ''
         ];
         for (const line of logo) {
@@ -523,16 +616,191 @@ async function handleSessionDelete() {
         }
     }
 }
+async function handleThemeSelect(config) {
+    const currentTh = getCurrentTheme();
+    const themeChoices = listThemes().map(t => ({
+        name: `${t.emoji} ${t.boldFn(t.name.padEnd(18))} ${pc.dim(t.desc)} ${t.id === currentTh.id ? pc.green('(Active)') : ''}`,
+        value: t.id,
+        description: `Apply ${t.name} color palette (${t.hex}) to banners, prompts, and actions`
+    }));
+    try {
+        const selected = await select({
+            message: `${pc.bold('🎨 Select UI Theme / Выберите цветовую тему:')}`,
+            choices: themeChoices
+        });
+        if (selected) {
+            config.theme = selected;
+            await saveConfig(config);
+            const th = setActiveTheme(selected);
+            drawLogo();
+            p.log.success(th.boldFn(`🎨 Theme switched to ${th.emoji} ${th.name}!`));
+        }
+    }
+    catch { }
+}
+async function handleSettings(config) {
+    while (true) {
+        try {
+            const maxIter = config.maxIterations || 100;
+            const maxIterLabel = maxIter >= 9999 ? 'Unlimited' : `${maxIter} steps`;
+            const currentTh = getCurrentTheme();
+            const choice = await select({
+                message: `${pc.bold('⚙️  Settings')} ${pc.dim(`(devx v1.4.0 • theme: ${currentTh.name})`)}`,
+                choices: [
+                    {
+                        name: `🎨 Color Theme: ${currentTh.emoji} ${currentTh.name}`,
+                        value: 'change_theme',
+                        description: `Switch UI accent colors (${currentTh.desc})`
+                    },
+                    {
+                        name: `${config.pureBlackTheme !== false ? pc.green('🖤 Pure Black Background: ON') : pc.yellow('🖤 Pure Black Background: OFF')}`,
+                        value: 'toggle_black_theme',
+                        description: config.pureBlackTheme !== false
+                            ? 'Apply deep OLED obsidian black background (#0a0a0c) like OpenCode'
+                            : 'Use standard system terminal background color'
+                    },
+                    {
+                        name: `${config.autoApprove ? pc.green('⚡ Auto-Approve (YOLO Mode): ON') : pc.yellow('🛡️  Auto-Approve (YOLO Mode): OFF')}`,
+                        value: 'toggle_auto_approve',
+                        description: config.autoApprove
+                            ? 'Permissions are automatically granted (no confirmation prompts for commands/files)'
+                            : 'Agent asks for confirmation before executing bash commands or writing files'
+                    },
+                    {
+                        name: `${config.enableMemory !== false ? pc.green('🧠 Project Memory Bank: ON') : pc.yellow('🧠 Project Memory Bank: OFF')}`,
+                        value: 'toggle_memory',
+                        description: config.enableMemory !== false
+                            ? 'Load persistent project rules and preferences from .devx/memory.md into AI context'
+                            : 'Start sessions with a clean state without loading project memory'
+                    },
+                    {
+                        name: `${config.checkUpdates !== false ? pc.green('🔔 Check for Updates on Startup: ON') : pc.yellow('🔔 Check for Updates on Startup: OFF')}`,
+                        value: 'toggle_check_updates',
+                        description: config.checkUpdates !== false
+                            ? 'Automatically check for updates from GitHub repository when launching devx'
+                            : 'Disable update checking on startup (run /update manually instead)'
+                    },
+                    {
+                        name: `🔄 Max Agent Iterations: ${currentTh.colorFn(maxIterLabel)}`,
+                        value: 'change_max_iterations',
+                        description: 'Limit how many tool steps (file edits, terminal commands) agent can do per request'
+                    },
+                    {
+                        name: `${currentTh.colorFn('✨ About devx')} ${pc.dim('(v1.4.0 by ApvCode)')}`,
+                        value: 'about',
+                        description: 'Terminal-Native AI Coding Agent created by ApvCode (https://github.com/apvcode/Termux-Dev)'
+                    },
+                    {
+                        name: '⬅️ Back / Save',
+                        value: 'back',
+                        description: 'Return to chat'
+                    }
+                ]
+            });
+            if (choice === 'change_theme') {
+                await handleThemeSelect(config);
+                continue;
+            }
+            if (choice === 'about') {
+                p.note(`⚡ devx v1.4.0 — Terminal-Native AI Coding Agent\n` +
+                    `🎨 Theme: ${currentTh.emoji} ${currentTh.name}\n` +
+                    `👤 Author: ApvCode (https://github.com/apvcode)\n` +
+                    `🌟 Repository: https://github.com/apvcode/Termux-Dev\n` +
+                    `📜 License: MIT License (2026)\n` +
+                    `Built for Android Termux, Windows, macOS, and Linux.`, 'About devx');
+                continue;
+            }
+            if (choice === 'toggle_black_theme') {
+                config.pureBlackTheme = config.pureBlackTheme === false ? true : false;
+                await saveConfig(config);
+                if (config.pureBlackTheme) {
+                    enableDarkTheme(true);
+                }
+                else {
+                    resetTerminalTheme();
+                }
+                drawLogo();
+                p.log.success(`Pure Black background: ${config.pureBlackTheme ? pc.bold(pc.green('ON (Deep Black)')) : pc.bold(pc.yellow('OFF (System Default)'))}`);
+                continue;
+            }
+            if (choice === 'toggle_auto_approve') {
+                config.autoApprove = !config.autoApprove;
+                await saveConfig(config);
+                p.log.success(`Auto-approve permissions: ${config.autoApprove ? pc.bold(pc.green('ON (Automatic Yes)')) : pc.bold(pc.yellow('OFF (Ask every time)'))}`);
+                continue;
+            }
+            if (choice === 'toggle_memory') {
+                config.enableMemory = config.enableMemory === false ? true : false;
+                await saveConfig(config);
+                p.log.success(`Project memory bank: ${config.enableMemory !== false ? pc.bold(pc.green('ON (Persistent .devx/memory.md)')) : pc.bold(pc.yellow('OFF'))}`);
+                continue;
+            }
+            if (choice === 'toggle_check_updates') {
+                config.checkUpdates = config.checkUpdates === false ? true : false;
+                await saveConfig(config);
+                p.log.success(`Check for updates: ${config.checkUpdates !== false ? pc.bold(pc.green('ON (Checked on startup)')) : pc.bold(pc.yellow('OFF (Manual only)'))}`);
+                continue;
+            }
+            if (choice === 'change_max_iterations') {
+                const val = await select({
+                    message: 'Select maximum iterations limit per prompt:',
+                    choices: [
+                        { name: '30 steps (Strict / Safe)', value: 30 },
+                        { name: '50 steps (Moderate)', value: 50 },
+                        { name: '100 steps (Recommended / Default)', value: 100 },
+                        { name: '200 steps (Very large refactors)', value: 200 },
+                        { name: 'Unlimited (No limit)', value: 9999 }
+                    ]
+                });
+                config.maxIterations = val;
+                await saveConfig(config);
+                p.log.success(`Max iterations updated to: ${pc.bold(val >= 9999 ? 'Unlimited' : `${val} steps`)}`);
+                continue;
+            }
+            break;
+        }
+        catch {
+            break;
+        }
+    }
+    process.stdin.resume();
+    return config;
+}
 export async function main() {
     const program = new Command();
     program
         .name('devx')
-        .description('CLI tool for vibe-coding')
-        .option('--plan', 'Start in plan mode')
+        .description('Terminal-native AI coding assistant and vibe-coding agent')
+        .version('1.4.0')
+        .option('-p, --prompt <task>', 'Run one-shot task non-interactively (headless mode)')
+        .option('-y, --yolo', 'Automatically approve all tool executions without confirmation')
+        .option('-m, --model <model>', 'Specify AI model to use for this execution')
+        .option('-q, --quiet', 'Quiet output in headless mode (suppress banners and tool logs)')
+        .option('--json', 'Output structured JSON in headless mode')
+        .option('--plan', 'Start in plan mode (architect & planner)')
         .parse(process.argv);
     const options = program.opts();
-    let planMode = !!options.plan;
-    let config = await loadConfig();
+    const planModeInitial = !!options.plan;
+    const isHeadless = !!options.prompt;
+    let config = await loadConfig(!isHeadless);
+    if (options.model) {
+        config.model = options.model;
+        config.maxContextTokens = getModelContextLimit(options.model);
+    }
+    if (options.yolo) {
+        config.autoApprove = true;
+    }
+    // If -p / --prompt is provided, execute one-shot headless mode and exit!
+    if (isHeadless) {
+        const exitCode = await runHeadlessMode(options.prompt, config, {
+            planMode: planModeInitial,
+            yolo: !!options.yolo,
+            quiet: !!options.quiet,
+            json: !!options.json
+        });
+        process.exit(exitCode);
+    }
+    let planMode = planModeInitial;
     if (!config.onboarded) {
         const cols = Math.min(process.stdout.columns || 40, 42);
         const fill = Math.max(2, cols - 16);
@@ -573,6 +841,7 @@ export async function main() {
     const sessionManager = new SessionManager(config.model, planMode);
     drawLogo();
     await runStartupUpdateCheck(config);
+    await MCPManager.getInstance().init();
     let totalSessionCost = 0;
     let currentDraft = '';
     let autoTriggerPrompt = '';
@@ -656,215 +925,84 @@ export async function main() {
         if (answer.startsWith('/')) {
             const parts = answer.split(' ');
             let cmd = parts[0];
-            async function handleThemeSelect(config) {
-                const currentTh = getCurrentTheme();
-                const themeChoices = listThemes().map(t => ({
-                    name: `${t.emoji} ${t.boldFn(t.name.padEnd(18))} ${pc.dim(t.desc)} ${t.id === currentTh.id ? pc.green('(Active)') : ''}`,
-                    value: t.id,
-                    description: `Apply ${t.name} color palette (${t.hex}) to banners, prompts, and actions`
-                }));
-                try {
-                    const selected = await select({
-                        message: `${pc.bold('🎨 Select UI Theme / Выберите цветовую тему:')}`,
-                        choices: themeChoices
-                    });
-                    if (selected) {
-                        config.theme = selected;
-                        await saveConfig(config);
-                        const th = setActiveTheme(selected);
-                        drawLogo();
-                        p.log.success(th.boldFn(`🎨 Theme switched to ${th.emoji} ${th.name}!`));
-                    }
-                }
-                catch { }
+            // 1. Check for custom slash commands (.devx/commands/*.md)
+            const customCmd = await CustomCommandManager.findCommand(cmd);
+            if (customCmd) {
+                const cmdArgs = answer.slice(cmd.length).trim();
+                const expandedPrompt = CustomCommandManager.expandTemplate(customCmd.promptTemplate, cmdArgs);
+                answer = expandedPrompt;
+                p.log.info(pc.cyan(`⚡ Executing custom command: ${pc.bold(customCmd.cmd)} (${customCmd.desc})`));
             }
-            async function handleSettings(config) {
-                while (true) {
+            else {
+                const VALID_COMMANDS = [
+                    '/new', '/reset', '/resume', '/session', '/sessions', '/history',
+                    '/theme', '/themes', '/usage', '/export', '/mcp',
+                    '/settings', '/update', '/model', '/provider', '/providers',
+                    '/plan', '/agent', '/image', '/serve', '/memory', '/undo',
+                    '/diff', '/commit', '/status', '/compact', '/init', '/doctor',
+                    '/config', '/clear', '/exit', '/quit', '/help'
+                ];
+                if (!VALID_COMMANDS.includes(cmd)) {
+                    const customList = await CustomCommandManager.listCommands();
+                    const customSlashItems = customList.map(c => ({
+                        name: `${c.cmd.padEnd(14)} - ${c.desc}`,
+                        value: c.cmd
+                    }));
+                    const SLASH_COMMANDS = [
+                        { name: '/new          - Start a new clean chat session', value: '/new' },
+                        { name: '/resume       - Resume a previous chat session', value: '/resume' },
+                        { name: '/session del  - Select and delete saved sessions', value: '/session del' },
+                        { name: '/usage        - Show network bandwidth, data saver & token cost', value: '/usage' },
+                        { name: '/export       - Export session conversation to Markdown', value: '/export' },
+                        { name: '/mcp          - Manage Model Context Protocol (MCP) servers & tools', value: '/mcp' },
+                        { name: '/theme        - Switch UI color theme', value: '/theme' },
+                        { name: '/doctor       - Run system & environment health diagnostics', value: '/doctor' },
+                        { name: '/settings     - Configure permissions & auto-approval', value: '/settings' },
+                        { name: '/update       - Check and install updates from GitHub', value: '/update' },
+                        { name: '/model        - Switch model for current provider', value: '/model' },
+                        { name: '/provider     - Change AI provider (Google, OpenRouter...)', value: '/provider' },
+                        { name: '/plan         - Switch to PLAN mode (architect)', value: '/plan' },
+                        { name: '/agent        - Switch to AGENT mode (coder)', value: '/agent' },
+                        { name: '/serve        - Start local web server for web preview', value: '/serve' },
+                        { name: '/memory       - View or edit project memory bank', value: '/memory' },
+                        { name: '/undo         - Revert last file changes made by AI', value: '/undo' },
+                        { name: '/diff         - Show git diff of modified files', value: '/diff' },
+                        { name: '/commit       - AI-generated git commit message', value: '/commit' },
+                        { name: '/status       - Show git repository status', value: '/status' },
+                        { name: '/compact      - Compact conversation context', value: '/compact' },
+                        { name: '/config       - View current configuration', value: '/config' },
+                        { name: '/clear        - Clear message history', value: '/clear' },
+                        { name: '/help         - Show commands overview', value: '/help' },
+                        { name: '/exit         - Exit devx', value: '/exit' },
+                        ...customSlashItems
+                    ];
                     try {
-                        const maxIter = config.maxIterations || 100;
-                        const maxIterLabel = maxIter >= 9999 ? 'Unlimited' : `${maxIter} steps`;
-                        const currentTh = getCurrentTheme();
-                        const choice = await select({
-                            message: `${pc.bold('⚙️  Settings')} ${pc.dim(`(devx v1.2.2 • theme: ${currentTh.name})`)}`,
-                            choices: [
-                                {
-                                    name: `🎨 Color Theme: ${currentTh.emoji} ${currentTh.name}`,
-                                    value: 'change_theme',
-                                    description: `Switch UI accent colors (${currentTh.desc})`
-                                },
-                                {
-                                    name: `${config.pureBlackTheme !== false ? pc.green('🖤 Pure Black Background: ON') : pc.yellow('🖤 Pure Black Background: OFF')}`,
-                                    value: 'toggle_black_theme',
-                                    description: config.pureBlackTheme !== false
-                                        ? 'Apply deep OLED obsidian black background (#0a0a0c) like OpenCode'
-                                        : 'Use standard system terminal background color'
-                                },
-                                {
-                                    name: `${config.autoApprove ? pc.green('⚡ Auto-Approve (YOLO Mode): ON') : pc.yellow('🛡️  Auto-Approve (YOLO Mode): OFF')}`,
-                                    value: 'toggle_auto_approve',
-                                    description: config.autoApprove
-                                        ? 'Permissions are automatically granted (no confirmation prompts for commands/files)'
-                                        : 'Agent asks for confirmation before executing bash commands or writing files'
-                                },
-                                {
-                                    name: `${config.enableMemory !== false ? pc.green('🧠 Project Memory Bank: ON') : pc.yellow('🧠 Project Memory Bank: OFF')}`,
-                                    value: 'toggle_memory',
-                                    description: config.enableMemory !== false
-                                        ? 'Load persistent project rules and preferences from .devx/memory.md into AI context'
-                                        : 'Start sessions with a clean state without loading project memory'
-                                },
-                                {
-                                    name: `${config.checkUpdates !== false ? pc.green('🔔 Check for Updates on Startup: ON') : pc.yellow('🔔 Check for Updates on Startup: OFF')}`,
-                                    value: 'toggle_check_updates',
-                                    description: config.checkUpdates !== false
-                                        ? 'Automatically check for updates from GitHub repository when launching devx'
-                                        : 'Disable update checking on startup (run /update manually instead)'
-                                },
-                                {
-                                    name: `🔄 Max Agent Iterations: ${currentTh.colorFn(maxIterLabel)}`,
-                                    value: 'change_max_iterations',
-                                    description: 'Limit how many tool steps (file edits, terminal commands) agent can do per request'
-                                },
-                                {
-                                    name: `${currentTh.colorFn('✨ About devx')} ${pc.dim('(v1.2.2 by ApvCode)')}`,
-                                    value: 'about',
-                                    description: 'Terminal-Native AI Coding Agent created by ApvCode (https://github.com/apvcode/Termux-Dev)'
-                                },
-                                {
-                                    name: '⬅️ Back / Save',
-                                    value: 'back',
-                                    description: 'Return to chat'
-                                }
-                            ]
+                        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
                         });
-                        if (choice === 'change_theme') {
-                            await handleThemeSelect(config);
+                        if (!picked || picked === '__cancel__') {
                             continue;
                         }
-                        if (choice === 'about') {
-                            p.note(`⚡ devx v1.2.2 — Terminal-Native AI Coding Agent\n` +
-                                `🎨 Theme: ${currentTh.emoji} ${currentTh.name}\n` +
-                                `👤 Author: ApvCode (https://github.com/apvcode)\n` +
-                                `🌟 Repository: https://github.com/apvcode/Termux-Dev\n` +
-                                `📜 License: MIT License (2026)\n` +
-                                `Built for Android Termux, Windows, macOS, and Linux.`, 'About devx');
+                        if (picked === '/session del') {
+                            await handleSessionDelete();
                             continue;
                         }
-                        if (choice === 'toggle_black_theme') {
-                            config.pureBlackTheme = config.pureBlackTheme === false ? true : false;
-                            await saveConfig(config);
-                            if (config.pureBlackTheme) {
-                                enableDarkTheme(true);
-                            }
-                            else {
-                                resetTerminalTheme();
-                            }
-                            drawLogo();
-                            p.log.success(`Pure Black background: ${config.pureBlackTheme ? pc.bold(pc.green('ON (Deep Black)')) : pc.bold(pc.yellow('OFF (System Default)'))}`);
-                            continue;
-                        }
-                        if (choice === 'toggle_auto_approve') {
-                            config.autoApprove = !config.autoApprove;
-                            await saveConfig(config);
-                            p.log.success(`Auto-approve permissions: ${config.autoApprove ? pc.bold(pc.green('ON (Automatic Yes)')) : pc.bold(pc.yellow('OFF (Ask every time)'))}`);
-                            continue;
-                        }
-                        if (choice === 'toggle_memory') {
-                            config.enableMemory = config.enableMemory === false ? true : false;
-                            await saveConfig(config);
-                            p.log.success(`Project memory bank: ${config.enableMemory !== false ? pc.bold(pc.green('ON (Persistent .devx/memory.md)')) : pc.bold(pc.yellow('OFF'))}`);
-                            continue;
-                        }
-                        if (choice === 'toggle_check_updates') {
-                            config.checkUpdates = config.checkUpdates === false ? true : false;
-                            await saveConfig(config);
-                            p.log.success(`Check for updates: ${config.checkUpdates !== false ? pc.bold(pc.green('ON (Checked on startup)')) : pc.bold(pc.yellow('OFF (Manual only)'))}`);
-                            continue;
-                        }
-                        if (choice === 'change_max_iterations') {
-                            const val = await select({
-                                message: 'Select maximum iterations limit per prompt:',
-                                choices: [
-                                    { name: '30 steps (Strict / Safe)', value: 30 },
-                                    { name: '50 steps (Moderate)', value: 50 },
-                                    { name: '100 steps (Recommended / Default)', value: 100 },
-                                    { name: '200 steps (Very large refactors)', value: 200 },
-                                    { name: 'Unlimited (No limit)', value: 9999 }
-                                ]
-                            });
-                            config.maxIterations = val;
-                            await saveConfig(config);
-                            p.log.success(`Max iterations updated to: ${pc.bold(val >= 9999 ? 'Unlimited' : `${val} steps`)}`);
-                            continue;
-                        }
-                        break;
+                        cmd = picked;
                     }
                     catch {
-                        break;
-                    }
-                }
-                process.stdin.resume();
-                return config;
-            }
-            const VALID_COMMANDS = [
-                '/new', '/reset', '/resume', '/session', '/sessions', '/history',
-                '/theme', '/themes',
-                '/settings', '/update', '/model', '/provider', '/providers',
-                '/plan', '/agent', '/image', '/serve', '/memory', '/undo',
-                '/diff', '/commit', '/status', '/compact', '/init', '/doctor',
-                '/config', '/clear', '/exit', '/quit', '/help'
-            ];
-            if (!VALID_COMMANDS.includes(cmd)) {
-                const SLASH_COMMANDS = [
-                    { name: '/new          - Start a new clean chat session', value: '/new' },
-                    { name: '/resume       - Resume a previous chat session', value: '/resume' },
-                    { name: '/session del  - Select and delete saved sessions', value: '/session del' },
-                    { name: '/theme        - Switch UI color theme', value: '/theme' },
-                    { name: '/doctor       - Run system & environment health diagnostics', value: '/doctor' },
-                    { name: '/settings     - Configure permissions & auto-approval', value: '/settings' },
-                    { name: '/update       - Check and install updates from GitHub', value: '/update' },
-                    { name: '/model        - Switch model for current provider', value: '/model' },
-                    { name: '/provider     - Change AI provider (Google, OpenRouter...)', value: '/provider' },
-                    { name: '/plan         - Switch to PLAN mode (architect)', value: '/plan' },
-                    { name: '/agent        - Switch to AGENT mode (coder)', value: '/agent' },
-                    { name: '/serve        - Start local web server for web preview', value: '/serve' },
-                    { name: '/memory       - View or edit project memory bank', value: '/memory' },
-                    { name: '/undo         - Revert last file changes made by AI', value: '/undo' },
-                    { name: '/diff         - Show git diff of modified files', value: '/diff' },
-                    { name: '/commit       - AI-generated git commit message', value: '/commit' },
-                    { name: '/status       - Show git repository status', value: '/status' },
-                    { name: '/compact      - Compact conversation context', value: '/compact' },
-                    { name: '/config       - View current configuration', value: '/config' },
-                    { name: '/clear        - Clear message history', value: '/clear' },
-                    { name: '/help         - Show commands overview', value: '/help' },
-                    { name: '/exit         - Exit devx', value: '/exit' },
-                ];
-                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
-                    });
-                    if (!picked || picked === '__cancel__') {
-                        continue;
-                    }
-                    if (picked === '/session del') {
-                        await handleSessionDelete();
                         continue;
                     }
-                    cmd = picked;
-                }
-                catch {
-                    continue;
                 }
             }
             if (cmd === '/settings') {
@@ -1055,13 +1193,7 @@ export async function main() {
                     p.log.warn('No changes to undo.');
                 }
                 else {
-                    const msgs = history.getMessages();
-                    while (msgs.length > 1 && msgs[msgs.length - 1].role !== 'user') {
-                        msgs.pop();
-                    }
-                    if (msgs.length > 1 && msgs[msgs.length - 1].role === 'user') {
-                        msgs.pop();
-                    }
+                    history.popLastTurn();
                     p.log.success(pc.bold(pc.green(`⏪ Successfully reverted changes in ${count} file(s):`)));
                     for (const f of revertedFiles) {
                         console.log(pc.cyan(`  • ${f}`));
@@ -1322,8 +1454,47 @@ export async function main() {
                 }
                 continue;
             }
+            if (cmd === '/usage') {
+                const card = UsageTracker.getInstance().renderUsageCard();
+                console.log('\n' + card);
+                continue;
+            }
+            if (cmd === '/export') {
+                const targetName = parts.slice(1).join(' ').trim();
+                const res = await SessionExporter.exportToMarkdown(history.getMessages(), config.model, targetName || undefined);
+                if (res.success) {
+                    p.log.success(pc.bold(pc.green(`📄 Session exported to: ${res.filePath}`)));
+                }
+                else {
+                    p.log.error(`Failed to export session: ${res.error}`);
+                }
+                continue;
+            }
+            if (cmd === '/mcp') {
+                const sub = (parts[1] || '').toLowerCase();
+                if (sub === 'reload' || sub === 'restart' || sub === 'r') {
+                    const s = p.spinner();
+                    s.start('Reloading MCP servers...');
+                    await MCPManager.getInstance().reload();
+                    s.stop();
+                    console.log('\n' + MCPManager.getInstance().renderStatusCard());
+                }
+                else {
+                    console.log('\n' + MCPManager.getInstance().renderStatusCard());
+                }
+                continue;
+            }
             if (cmd === '/config') {
-                p.note(JSON.stringify(config, null, 2), 'Configuration');
+                const masked = { ...config };
+                if (masked.apiKey)
+                    masked.apiKey = maskApiKey(masked.apiKey);
+                if (masked.apiKeys) {
+                    masked.apiKeys = { ...masked.apiKeys };
+                    for (const k of Object.keys(masked.apiKeys)) {
+                        masked.apiKeys[k] = maskApiKey(masked.apiKeys[k]);
+                    }
+                }
+                p.note(JSON.stringify(masked, null, 2), 'Configuration (Secrets Masked)');
                 continue;
             }
             if (cmd === '/model') {
@@ -1408,10 +1579,12 @@ export async function main() {
         });
         const provider = createProvider(config);
         const tools = getTools(planMode);
-        const guard = new CLIConsoleGuard(config.autoApprove);
+        const guard = new CLIConsoleGuard(config.autoApprove, config.bashAllowlist || []);
         const agentConfig = {
             maxContextTokens: config.maxContextTokens || 100000,
-            maxIterations: config.maxIterations || 100
+            maxIterations: config.maxIterations || 100,
+            autoApprove: config.autoApprove,
+            bashAllowlist: config.bashAllowlist
         };
         const agent = new Agent(agentConfig, provider, tools, history, guard);
         const taskStartTime = Date.now();
@@ -1755,5 +1928,19 @@ export async function main() {
             }
         }
     }
+    MCPManager.getInstance().stopAll();
 }
+process.on('exit', () => {
+    try {
+        MCPManager.getInstance().stopAll();
+    }
+    catch { }
+});
+process.on('SIGINT', () => {
+    try {
+        MCPManager.getInstance().stopAll();
+    }
+    catch { }
+    process.exit(130);
+});
 main().catch(console.error);