@indiccoder/mentis-cli 1.1.4 → 1.1.5

package/dist/repl/ReplManager.js

@@ -45,13 +45,16 @@ const OpenAIClient_1 = require("../llm/OpenAIClient");
 const ContextManager_1 = require("../context/ContextManager");
 const UIManager_1 = require("../ui/UIManager");
 const InputBox_1 = require("../ui/InputBox");
+const DiffViewer_1 = require("../ui/DiffViewer");
+const ToolExecutor_1 = require("../ui/ToolExecutor");
+const PlanModeUI_1 = require("../ui/PlanModeUI");
 const FileTools_1 = require("../tools/FileTools");
 const SearchTools_1 = require("../tools/SearchTools");
 const PersistentShellTool_1 = require("../tools/PersistentShellTool");
 const PersistentShell_1 = require("./PersistentShell");
 const WebSearchTool_1 = require("../tools/WebSearchTool");
 const GitTools_1 = require("../tools/GitTools");
-const McpClient_1 = require("../mcp/McpClient");
+const McpManager_1 = require("../mcp/McpManager");
 const CheckpointManager_1 = require("../checkpoint/CheckpointManager");
 const SkillsManager_1 = require("../skills/SkillsManager");
 const LoadSkillTool_1 = require("../skills/LoadSkillTool");
@@ -83,10 +86,14 @@ class ReplManager {
         this.contextVisualizer = new ContextVisualizer_1.ContextVisualizer();
         this.conversationCompacter = new ConversationCompacter_1.ConversationCompacter();
         this.commandManager = new CommandManager_1.CommandManager();
+        this.mcpManager = new McpManager_1.McpManager();
         this.shell = new PersistentShell_1.PersistentShell();
         // Create tools array without skill tools first
         this.tools = [
+            new FileTools_1.PlanModeTool(), // AI can suggest plan mode for complex tasks
+            new FileTools_1.AskQuestionTool(), // For plan mode questions
             new FileTools_1.WriteFileTool(),
+            new FileTools_1.EditFileTool(),
             new FileTools_1.ReadFileTool(),
             new FileTools_1.ListDirTool(),
             new SearchTools_1.SearchFileTool(), // grep
@@ -123,6 +130,24 @@ class ReplManager {
         this.tools.push(new LoadSkillTool_1.LoadSkillTool(this.skillsManager, (skill) => {
             this.activeSkill = skill ? skill.name : null;
         }), new LoadSkillTool_1.ListSkillsTool(this.skillsManager), new LoadSkillTool_1.ReadSkillFileTool(this.skillsManager), new SlashCommandTool_1.SlashCommandTool(this.commandManager), new SlashCommandTool_1.ListCommandsTool(this.commandManager));
+        // Auto-connect to MCP servers
+        await this.mcpManager.autoConnect();
+        this.refreshToolsFromMcp();
+    }
+    /**
+     * Refresh tools list from MCP connections
+     */
+    refreshToolsFromMcp() {
+        // Remove existing MCP tools (keep core tools)
+        this.tools = this.tools.filter(tool => !tool.name.startsWith('mcp_') &&
+            !['load_skill', 'list_skills', 'read_skill_file', 'slash_command', 'list_commands'].includes(tool.name));
+        // Add MCP tools
+        const mcpTools = this.mcpManager.getAllTools();
+        this.tools.push(...mcpTools);
+        // Re-add skill tools
+        this.tools.push(new LoadSkillTool_1.LoadSkillTool(this.skillsManager, (skill) => {
+            this.activeSkill = skill ? skill.name : null;
+        }), new LoadSkillTool_1.ListSkillsTool(this.skillsManager), new LoadSkillTool_1.ReadSkillFileTool(this.skillsManager), new SlashCommandTool_1.SlashCommandTool(this.commandManager), new SlashCommandTool_1.ListCommandsTool(this.commandManager));
     }
     /**
      * Check if a tool is allowed by the currently active skill
@@ -147,7 +172,7 @@ class ReplManager {
             'list_dir': 'ListDir',
             'search_file': 'SearchFile',
             'run_shell': 'RunShell',
-            'web_search': 'WebSearch',
+            'search_web': 'WebSearch',
             'git_status': 'GitStatus',
             'git_diff': 'GitDiff',
             'git_commit': 'GitCommit',
@@ -207,10 +232,17 @@ class ReplManager {
         });
         // Auto-resume if --resume flag is set
         if (this.options.resume) {
-            const cp = this.checkpointManager.load('latest');
+            // Prefer local (per-directory) session, fall back to global
+            const cwd = process.cwd();
+            let cp = this.checkpointManager.loadLocalSession(cwd);
+            let source = 'local';
+            if (!cp) {
+                cp = this.checkpointManager.load('latest');
+                source = 'global';
+            }
             if (cp) {
                 this.history = cp.history;
-                console.log(chalk_1.default.green(`\n✓ Resumed session from ${new Date(cp.timestamp).toLocaleString()}`));
+                console.log(chalk_1.default.green(`\n✓ Resumed ${source} session from ${new Date(cp.timestamp).toLocaleString()}`));
                 console.log(chalk_1.default.dim(`  Messages: ${this.history.length}\n`));
             }
             else {
@@ -256,7 +288,14 @@ class ReplManager {
                 await this.handleCommand(input);
                 continue;
             }
-            await this.handleChat(input);
+            // Wrap handleChat in try-catch to prevent REPL from entering inconsistent state
+            try {
+                await this.handleChat(input);
+            }
+            catch (error) {
+                console.error(chalk_1.default.red(`Error: ${error.message}`));
+                console.error(chalk_1.default.dim('The REPL has recovered. You can continue using the CLI.'));
+            }
         }
     }
     async handleCommand(input) {
@@ -279,7 +318,6 @@ class ReplManager {
                 console.log('  /skills <list|show|create|validate> - Manage Agent Skills');
                 console.log('  /commands <list|create|validate> - Manage Custom Commands');
                 console.log('  /resume  - Resume last session');
-                console.log('  /checkpoint <save|load|list> [name] - Manage checkpoints');
                 console.log('  /search <query> - Search codebase');
                 console.log('  /run <cmd> - Run shell command');
                 console.log('  /commit [msg] - Git commit all changes');
@@ -287,15 +325,15 @@ class ReplManager {
                 break;
             case '/plan':
                 this.mode = 'PLAN';
-                console.log(chalk_1.default.blue('Switched to PLAN mode.'));
-                break;
-            case '/build':
-                this.mode = 'BUILD';
-                console.log(chalk_1.default.yellow('Switched to BUILD mode.'));
+                UIManager_1.UIManager.logBullet('Entered plan mode', 'magenta');
+                PlanModeUI_1.PlanModeUI.showPlanHeader();
+                PlanModeUI_1.PlanModeUI.showQAHistory();
                 break;
             case '/build':
                 this.mode = 'BUILD';
-                console.log(chalk_1.default.yellow('Switched to BUILD mode.'));
+                UIManager_1.UIManager.logBullet('Entered build mode', 'green');
+                PlanModeUI_1.PlanModeUI.showPlanSummary();
+                UIManager_1.UIManager.logSystem('Mentis is building the solution...');
                 break;
             case '/model':
                 await this.handleModelCommand(args);
@@ -313,9 +351,6 @@ class ReplManager {
             case '/resume':
                 await this.handleResumeCommand();
                 break;
-            case '/checkpoint':
-                await this.handleCheckpointCommand(args);
-                break;
             case '/clear':
                 this.history = [];
                 this.contextManager.clear();
@@ -344,10 +379,13 @@ class ReplManager {
                 await this.handleConfigCommand();
                 break;
             case '/exit':
-                // Auto-save on exit
+                // Auto-save on exit (both local and global)
+                const cwd = process.cwd();
+                this.checkpointManager.saveLocalSession(cwd, this.history, this.contextManager.getFiles());
                 this.checkpointManager.save('latest', this.history, this.contextManager.getFiles());
                 this.shell.kill(); // Kill the shell process
-                console.log(chalk_1.default.green('Session saved. Goodbye!'));
+                this.mcpManager.disconnectAll(); // Disconnect all MCP connections
+                console.log(chalk_1.default.green('Session saved to .mentis/sessions/. Goodbye!'));
                 process.exit(0);
                 break;
             case '/update':
@@ -372,6 +410,26 @@ class ReplManager {
                 console.log(chalk_1.default.red(`Unknown command: ${command}`));
         }
     }
+    getLoadingMessage() {
+        const messages = [
+            "Reticulating splines...",
+            "Consulting the silicon oracle...",
+            "Compiling neural pathways...",
+            "Optimizing flux capacitors...",
+            "Analyzing project structure...",
+            "Deciphering your intent...",
+            "Brewing digital coffee...",
+            "Checking for infinite loops...",
+            "Connecting to the matrix...",
+            "Calculating the answer (42?)...",
+            "Refactoring the universe...",
+            "Downloading more RAM...",
+            "Searching for bugs...",
+            "Asking the rubber duck...",
+            "Hyperspacing..."
+        ];
+        return messages[Math.floor(Math.random() * messages.length)];
+    }
     async handleChat(input) {
         const context = this.contextManager.getContextString();
         const skillsContext = this.skillsManager.getSkillsContext();
@@ -397,7 +455,8 @@ class ReplManager {
             fullInput = `${context}\n\nUser Question: ${fullInput}`;
         }
         this.history.push({ role: 'user', content: fullInput });
-        let spinner = (0, ora_1.default)('Thinking... (Press Esc to cancel)').start();
+        const msg = this.getLoadingMessage();
+        let spinner = (0, ora_1.default)({ text: `  ${msg}`, color: 'cyan' }).start();
         const controller = new AbortController();
         // Setup cancellation listener
         const keyListener = (str, key) => {
@@ -438,59 +497,63 @@ class ReplManager {
                     const toolName = toolCall.function.name;
                     const toolArgsStr = toolCall.function.arguments;
                     const toolArgs = JSON.parse(toolArgsStr);
-                    // Truncate long arguments
-                    let displayArgs = toolArgsStr;
-                    if (displayArgs.length > 100) {
-                        displayArgs = displayArgs.substring(0, 100) + '...';
-                    }
-                    console.log(chalk_1.default.dim(`  [Action] ${toolName}(${displayArgs})`));
-                    // Safety check for write_file
+                    // Show tool execution with visual feedback
+                    ToolExecutor_1.ToolExecutor.showInline(toolName, toolArgs);
+                    // Safety checks for write/edit operations
                     // Skip confirmation if tool is allowed by active skill
-                    if (toolName === 'write_file' && !this.isToolAllowedBySkill('Write')) {
+                    let approved = true;
+                    const needsApproval = (toolName === 'write_file' || toolName === 'edit_file' || toolName === 'read_file')
+                        && !this.isToolAllowedBySkill(toolName === 'read_file' ? 'Read' : 'Write');
+                    if (needsApproval) {
                         // Pause cancellation listener during user interaction
                         if (process.stdin.isTTY) {
                             process.stdin.removeListener('keypress', keyListener);
                             process.stdin.setRawMode(false);
-                            process.stdin.pause(); // Explicitly pause before inquirer
+                            process.stdin.pause();
+                        }
+                        // Handle write_file with diff preview
+                        if (toolName === 'write_file') {
+                            approved = await this.handleWriteApproval(toolArgs.filePath, toolArgs.content);
+                        }
+                        // Handle edit_file with diff preview
+                        if (toolName === 'edit_file') {
+                            approved = await this.handleEditApproval(toolArgs);
+                        }
+                        // Handle read_file with multi-file selector
+                        if (toolName === 'read_file') {
+                            approved = await this.handleReadApproval(toolArgs.filePath);
                         }
-                        spinner.stop(); // Stop spinner to allow input
-                        const { confirm } = await inquirer_1.default.prompt([
-                            {
-                                type: 'confirm',
-                                name: 'confirm',
-                                message: `Allow writing to ${chalk_1.default.yellow(toolArgs.filePath)}?`,
-                                default: true
-                            }
-                        ]);
                         // Resume cancellation listener
                         if (process.stdin.isTTY) {
                             process.stdin.setRawMode(true);
-                            process.stdin.resume(); // Explicitly resume
+                            process.stdin.resume();
                             process.stdin.on('keypress', keyListener);
                         }
-                        if (!confirm) {
-                            this.history.push({
-                                role: 'tool',
-                                tool_call_id: toolCall.id,
-                                name: toolName,
-                                content: 'Error: User rejected write operation.'
-                            });
-                            console.log(chalk_1.default.red('  Action cancelled by user.'));
-                            // Do not restart spinner here. Let the outer loop logic or next step handle it.
-                            // If we continue, we go to next tool or finish loop.
-                            // If finished, lines following loop will start spinner.
-                            continue;
-                        }
-                        spinner = (0, ora_1.default)('Executing...').start();
+                    }
+                    if (!approved) {
+                        this.history.push({
+                            role: 'tool',
+                            tool_call_id: toolCall.id,
+                            name: toolName,
+                            content: 'Error: User rejected operation.'
+                        });
+                        console.log(chalk_1.default.red('  Action cancelled by user.'));
+                        continue;
                     }
                     const tool = this.tools.find(t => t.name === toolName);
                     let result = '';
                     if (tool) {
                         try {
-                            // Tools typically run synchronously or promise-based. 
-                            // Verify if we want Tools to be cancellable?
-                            // For now, if aborted during tool, we let tool finish but stop loop.
                             result = await tool.execute(toolArgs);
+                            // Record Q&A for ask_question tool in plan mode
+                            if (toolName === 'ask_question' && this.mode === 'PLAN') {
+                                PlanModeUI_1.PlanModeUI.recordQA(toolArgs.question, result);
+                            }
+                            // Handle plan mode switch approval
+                            if (toolName === 'enter_plan_mode' && result.includes('User approved')) {
+                                this.mode = 'PLAN';
+                                UIManager_1.UIManager.logBullet('Auto-switched to plan mode', 'magenta');
+                            }
                         }
                         catch (e) {
                             result = `Error: ${e.message}`;
@@ -499,9 +562,6 @@ class ReplManager {
                     else {
                         result = `Error: Tool ${toolName} not found.`;
                     }
-                    if (spinner.isSpinning) {
-                        spinner.stop();
-                    }
                     this.history.push({
                         role: 'tool',
                         tool_call_id: toolCall.id,
@@ -511,7 +571,8 @@ class ReplManager {
                 }
                 if (controller.signal.aborted)
                     throw new Error('Request cancelled by user');
-                spinner = (0, ora_1.default)('Thinking (processing tools)...').start();
+                const msg = this.getLoadingMessage();
+                spinner = (0, ora_1.default)({ text: `  ${msg}`, color: 'cyan' }).start();
                 // Get next response
                 response = await this.modelClient.chat(this.history, this.tools.map(t => ({
                     type: 'function',
@@ -525,7 +586,7 @@ class ReplManager {
             spinner.stop();
             console.log('');
             if (response.content) {
-                console.log(chalk_1.default.bold.blue('Mentis:'));
+                UIManager_1.UIManager.logBullet('Mentis:', 'magenta');
                 console.log((0, marked_1.marked)(response.content));
                 if (response.usage) {
                     const { input_tokens, output_tokens } = response.usage;
@@ -818,100 +879,251 @@ class ReplManager {
         console.log(chalk_1.default.green(`Switched to ${provider} ${model ? `using model ${model}` : ''}`));
     }
     async handleMcpCommand(args) {
-        if (args.length < 1) {
-            console.log(chalk_1.default.red('Usage: /mcp <connect|list|disconnect> [args]'));
+        if (args.length === 0) {
+            console.log(chalk_1.default.red('Usage: /mcp <list|connect|disconnect|add|remove|test|config> [args]'));
+            console.log(chalk_1.default.dim('\nExamples:'));
+            console.log(chalk_1.default.dim('  /mcp list                    - List all MCP servers'));
+            console.log(chalk_1.default.dim('  /mcp connect Exa\\ Search     - Connect to Exa Search'));
+            console.log(chalk_1.default.dim('  /mcp disconnect all           - Disconnect all servers'));
+            console.log(chalk_1.default.dim('  /mcp add MyServer npx -y @my/mcp-server'));
+            console.log(chalk_1.default.dim('  /mcp test Exa\\ Search         - Test connection'));
+            console.log(chalk_1.default.dim('  /mcp config                   - Show configuration'));
             return;
         }
         const action = args[0];
-        if (action === 'connect') {
-            const commandParts = args.slice(1);
-            if (commandParts.length === 0) {
-                console.log(chalk_1.default.red('Usage: /mcp connect <command> [args...]'));
-                return;
-            }
-            // Example: /mcp connect npx -y @modelcontextprotocol/server-memory
-            // On Windows, npx might be npx.cmd
-            const cmd = process.platform === 'win32' && commandParts[0] === 'npx' ? 'npx.cmd' : commandParts[0];
-            const cmdArgs = commandParts.slice(1);
-            const spinner = (0, ora_1.default)(`Connecting to MCP server: ${cmd} ${cmdArgs.join(' ')}...`).start();
-            try {
-                const client = new McpClient_1.McpClient(cmd, cmdArgs);
-                await client.initialize();
-                const mcpTools = await client.listTools();
-                this.mcpClients.push(client);
-                this.tools.push(...mcpTools);
-                spinner.succeed(chalk_1.default.green(`Connected to ${client.serverName}!`));
-                console.log(chalk_1.default.green(`Added ${mcpTools.length} tools:`));
-                mcpTools.forEach(t => console.log(chalk_1.default.dim(`  - ${t.name}: ${t.description.substring(0, 50)}...`)));
-            }
-            catch (e) {
-                spinner.fail(chalk_1.default.red(`Failed to connect: ${e.message}`));
-            }
+        switch (action) {
+            case 'list':
+                await this.mcpManager.listServers();
+                break;
+            case 'connect':
+                if (args.length < 2) {
+                    // Show interactive list of available servers
+                    const availableServers = this.mcpManager.getAvailableServers();
+                    if (availableServers.length === 0) {
+                        console.log(chalk_1.default.yellow('No MCP servers configured. Use /mcp add to add one.'));
+                        return;
+                    }
+                    const { serverName } = await inquirer_1.default.prompt([{
+                            type: 'list',
+                            name: 'serverName',
+                            message: 'Select server to connect:',
+                            choices: availableServers.map(s => s.name)
+                        }]);
+                    await this.mcpManager.connectToServer(serverName);
+                    this.refreshToolsFromMcp();
+                }
+                else {
+                    const serverName = args.slice(1).join(' ');
+                    await this.mcpManager.connectToServer(serverName);
+                    this.refreshToolsFromMcp();
+                }
+                break;
+            case 'disconnect':
+                if (args.length < 2) {
+                    // Interactive disconnect
+                    const connectedServers = this.mcpManager.getServerNames();
+                    if (connectedServers.length === 0) {
+                        console.log(chalk_1.default.yellow('No MCP connections to disconnect.'));
+                        return;
+                    }
+                    const { serverName } = await inquirer_1.default.prompt([{
+                            type: 'list',
+                            name: 'serverName',
+                            message: 'Select server to disconnect:',
+                            choices: [...connectedServers, 'all']
+                        }]);
+                    if (serverName === 'all') {
+                        this.mcpManager.disconnectAll();
+                        this.refreshToolsFromMcp();
+                    }
+                    else {
+                        await this.mcpManager.disconnectFromServer(serverName);
+                        this.refreshToolsFromMcp();
+                    }
+                }
+                else {
+                    const serverName = args.slice(1).join(' ');
+                    if (serverName === 'all') {
+                        this.mcpManager.disconnectAll();
+                        this.refreshToolsFromMcp();
+                    }
+                    else {
+                        await this.mcpManager.disconnectFromServer(serverName);
+                        this.refreshToolsFromMcp();
+                    }
+                }
+                break;
+            case 'add':
+                if (args.length < 3) {
+                    console.log(chalk_1.default.red('Usage: /mcp add <name> <command> [args...]'));
+                    console.log(chalk_1.default.dim('\nExamples:'));
+                    console.log(chalk_1.default.dim('  /mcp add "My Server" npx -y @my/mcp-server'));
+                    console.log(chalk_1.default.dim('  /mcp add "Local Server" node /path/to/server.js'));
+                    return;
+                }
+                const name = args[1];
+                const command = args[2];
+                const mcpArgs = args.slice(3);
+                const { description } = await inquirer_1.default.prompt([{
+                        type: 'input',
+                        name: 'description',
+                        message: 'Description (optional):',
+                        default: ''
+                    }]);
+                await this.mcpManager.addServer(name, command, mcpArgs, description);
+                break;
+            case 'remove':
+                if (args.length < 2) {
+                    // Interactive remove
+                    const availableServers = this.mcpManager.getAvailableServers();
+                    if (availableServers.length === 0) {
+                        console.log(chalk_1.default.yellow('No MCP servers configured.'));
+                        return;
+                    }
+                    const { serverName } = await inquirer_1.default.prompt([{
+                            type: 'list',
+                            name: 'serverName',
+                            message: 'Select server to remove:',
+                            choices: availableServers.map(s => s.name)
+                        }]);
+                    await this.mcpManager.removeServer(serverName);
+                }
+                else {
+                    const serverName = args.slice(1).join(' ');
+                    await this.mcpManager.removeServer(serverName);
+                }
+                break;
+            case 'test':
+                if (args.length < 2) {
+                    // Interactive test
+                    const connectedServers = this.mcpManager.getServerNames();
+                    if (connectedServers.length === 0) {
+                        console.log(chalk_1.default.yellow('No MCP connections to test.'));
+                        return;
+                    }
+                    const { serverName } = await inquirer_1.default.prompt([{
+                            type: 'list',
+                            name: 'serverName',
+                            message: 'Select server to test:',
+                            choices: connectedServers
+                        }]);
+                    await this.mcpManager.testConnection(serverName);
+                }
+                else {
+                    const serverName = args.slice(1).join(' ');
+                    await this.mcpManager.testConnection(serverName);
+                }
+                break;
+            case 'config':
+                const config = this.mcpManager.getConfig().getConfig();
+                console.log(chalk_1.default.cyan('\nMCP Configuration:\n'));
+                console.log(JSON.stringify(config, null, 2));
+                console.log(chalk_1.default.dim(`\nConfig file: ${require('os').homedir()}/.mentis/mcp.json`));
+                break;
+            default:
+                console.log(chalk_1.default.red(`Unknown MCP action: ${action}`));
+                console.log(chalk_1.default.yellow('Available actions: list, connect, disconnect, add, remove, test, config'));
         }
-        else if (action === 'list') {
-            if (this.mcpClients.length === 0) {
-                console.log('No active MCP connections.');
-            }
-            else {
-                console.log(chalk_1.default.cyan('Active MCP Connections:'));
-                this.mcpClients.forEach((client, idx) => {
-                    console.log(`${idx + 1}. ${client.serverName}`);
+    }
+    async handleResumeCommand() {
+        const cwd = process.cwd();
+        const localSessions = this.checkpointManager.listLocalSessions(cwd);
+        const globalCheckpoints = this.checkpointManager.list();
+        if (localSessions.length === 0 && globalCheckpoints.length === 0) {
+            console.log(chalk_1.default.yellow('No previous sessions found to resume.'));
+            return;
+        }
+        // Header like Claude's "Resume Session"
+        console.log('');
+        console.log(chalk_1.default.cyan.bold('Resume Session'));
+        console.log('');
+        // Helper for relative time
+        const relativeTime = (ts) => {
+            const diff = Date.now() - ts;
+            const mins = Math.floor(diff / 60000);
+            const hours = Math.floor(diff / 3600000);
+            const days = Math.floor(diff / 86400000);
+            if (days > 0)
+                return `${days} day${days > 1 ? 's' : ''} ago`;
+            if (hours > 0)
+                return `${hours} hour${hours > 1 ? 's' : ''} ago`;
+            if (mins > 0)
+                return `${mins} min${mins > 1 ? 's' : ''} ago`;
+            return 'just now';
+        };
+        // Build choices with simple single-line formatting
+        const choices = [];
+        // Local sessions first
+        for (const session of localSessions) {
+            const timeAgo = relativeTime(session.timestamp);
+            const shortPreview = session.preview.substring(0, 30).replace(/\n/g, ' ');
+            choices.push({
+                name: `${shortPreview}... (${timeAgo}, ${session.messageCount} msgs)`,
+                value: { type: 'local', id: session.id }
+            });
+        }
+        // Global checkpoints as fallback
+        if (localSessions.length === 0 && globalCheckpoints.length > 0) {
+            for (const name of globalCheckpoints) {
+                const cp = this.checkpointManager.load(name);
+                const timeAgo = cp ? relativeTime(cp.timestamp) : '';
+                const msgCount = cp?.history?.length || 0;
+                const preview = cp?.history?.find(m => m.role === 'user')?.content?.substring(0, 40)?.replace(/\n/g, ' ') || name;
+                choices.push({
+                    name: `${preview}${preview.length >= 40 ? '...' : ''} — ${timeAgo} · ${msgCount} msgs`,
+                    value: { type: 'global', id: name }
                 });
             }
         }
-        else if (action === 'disconnect') {
-            // Basic disconnect all for now or by index if we wanted
-            console.log(chalk_1.default.yellow('Disconnecting all MCP clients...'));
-            this.mcpClients.forEach(c => c.disconnect());
-            this.mcpClients = [];
-            // Re-init core tools
-            this.tools = [
-                new FileTools_1.WriteFileTool(),
-                new FileTools_1.ReadFileTool(),
-                new FileTools_1.ListDirTool(),
-                new SearchTools_1.SearchFileTool(),
-                new PersistentShellTool_1.PersistentShellTool(this.shell),
-                new WebSearchTool_1.WebSearchTool(),
-                new GitTools_1.GitStatusTool(),
-                new GitTools_1.GitDiffTool(),
-                new GitTools_1.GitCommitTool(),
-                new GitTools_1.GitPushTool(),
-                new GitTools_1.GitPullTool()
-            ];
+        // Show hint
+        console.log(chalk_1.default.dim('  ↑/↓ to navigate · Enter to select · Esc to cancel'));
+        console.log('');
+        // Guard against empty choices (would crash inquirer)
+        if (choices.length === 0) {
+            console.log(chalk_1.default.yellow('No sessions available. Start a conversation and /exit to save.'));
+            return;
         }
-        else {
-            console.log(chalk_1.default.red(`Unknown MCP action: ${action}`));
+        const { selected } = await inquirer_1.default.prompt([{
+                type: 'rawlist',
+                name: 'selected',
+                message: 'Pick a session:',
+                choices,
+                pageSize: 10
+            }]);
+        if (selected.type === 'local') {
+            await this.loadLocalCheckpoint(cwd, selected.id);
         }
-    }
-    async handleResumeCommand() {
-        if (!this.checkpointManager.exists('latest')) {
-            console.log(chalk_1.default.yellow('No previous session found to resume.'));
-            return;
+        else if (selected.type === 'global') {
+            await this.loadCheckpoint(selected.id);
         }
-        await this.loadCheckpoint('latest');
     }
-    async handleCheckpointCommand(args) {
-        if (args.length < 1) {
-            console.log(chalk_1.default.red('Usage: /checkpoint <save|load|list> [name]'));
+    async loadLocalCheckpoint(cwd, sessionId) {
+        const cp = this.checkpointManager.loadLocalSession(cwd, sessionId);
+        if (!cp) {
+            console.log(chalk_1.default.red('Session not found.'));
             return;
         }
-        const action = args[0];
-        const name = args[1] || 'default';
-        if (action === 'save') {
-            this.checkpointManager.save(name, this.history, this.contextManager.getFiles());
-            console.log(chalk_1.default.green(`Checkpoint '${name}' saved.`));
-        }
-        else if (action === 'load') {
-            await this.loadCheckpoint(name);
-        }
-        else if (action === 'list') {
-            const points = this.checkpointManager.list();
-            console.log(chalk_1.default.cyan('Available Checkpoints:'));
-            points.forEach(p => console.log(` - ${p}`));
+        this.history = cp.history;
+        this.contextManager.clear();
+        // Restore context files
+        if (cp.files && cp.files.length > 0) {
+            console.log(chalk_1.default.dim('Restoring context files...'));
+            for (const file of cp.files) {
+                await this.contextManager.addFile(file);
+            }
         }
-        else {
-            console.log(chalk_1.default.red(`Unknown action: ${action}`));
+        console.log(chalk_1.default.green(`✓ Resumed session (${new Date(cp.timestamp).toLocaleString()})`));
+        console.log(chalk_1.default.dim(`  Messages: ${this.history.length}`));
+        // Re-display last assistant message if any
+        const lastMsg = this.history[this.history.length - 1];
+        if (lastMsg && lastMsg.role === 'assistant' && lastMsg.content) {
+            console.log(chalk_1.default.blue('\nLast response:'));
+            const preview = lastMsg.content.length > 200
+                ? lastMsg.content.substring(0, 200) + '...'
+                : lastMsg.content;
+            console.log(chalk_1.default.dim(preview));
         }
+        console.log('');
     }
     async loadCheckpoint(name) {
         const cp = this.checkpointManager.load(name);
@@ -1080,6 +1292,66 @@ class ReplManager {
         const { validateCommands } = await Promise.resolve().then(() => __importStar(require('../commands/CommandCreator')));
         await validateCommands(this.commandManager);
     }
+    /**
+     * Handle write_file approval with diff preview
+     */
+    async handleWriteApproval(filePath, content) {
+        // Check if file exists and show diff
+        const fullPath = path.resolve(filePath);
+        if (fs.existsSync(fullPath)) {
+            const oldContent = fs.readFileSync(fullPath, 'utf-8');
+            DiffViewer_1.DiffViewer.showDiff(filePath, oldContent, content);
+        }
+        else {
+            console.log('');
+            console.log(chalk_1.default.cyan(`📄 Creating new file: ${filePath}`));
+            console.log(chalk_1.default.dim('─'.repeat(60)));
+            console.log(chalk_1.default.green('New file content:'));
+            const preview = content.split('\n').slice(0, 10).join('\n');
+            console.log(chalk_1.default.dim(preview));
+            if (content.split('\n').length > 10) {
+                console.log(chalk_1.default.dim('...'));
+            }
+            console.log(chalk_1.default.dim('─'.repeat(60)));
+        }
+        const { confirm } = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'confirm',
+                message: `Allow writing to ${chalk_1.default.yellow(filePath)}?`,
+                default: true
+            }
+        ]);
+        return confirm;
+    }
+    /**
+     * Handle edit_file approval with diff preview
+     */
+    async handleEditApproval(args) {
+        // Get diff from EditFileTool (which shows preview)
+        const editTool = this.tools.find(t => t.name === 'edit_file');
+        if (editTool) {
+            const diffResult = await editTool.execute(args);
+            console.log(diffResult);
+        }
+        const { confirm } = await inquirer_1.default.prompt([
+            {
+                type: 'confirm',
+                name: 'confirm',
+                message: `Apply edit to ${chalk_1.default.yellow(args.file_path)}?`,
+                default: true
+            }
+        ]);
+        return confirm;
+    }
+    /**
+     * Handle read_file approval (currently auto-approves, but can be enhanced)
+     */
+    async handleReadApproval(filePath) {
+        // For now, auto-approve single file reads
+        // In the future, could batch multiple reads into a single selector
+        return true;
+    }
     estimateCost(input, output) {
         const config = this.configManager.getConfig();
         const provider = config.defaultProvider;