xibecode 0.0.5 → 0.0.7

package/README.md

@@ -642,7 +642,7 @@ XibeCode stores config in `~/.xibecode/`
   "plugins": [],                          // Array of plugin paths
   
   // Latest version
-  "mcpServers": []                        // MCP server configurations
+  "mcpServers": {}                        // MCP server configurations (object-based)
 }
 ```
 
@@ -688,26 +688,24 @@ nano ~/.xibecode/mcp-servers.json
 
 ```json
 {
-  "servers": [
-    {
-      "name": "filesystem",
-      "transport": "stdio",
+  "mcpServers": {
+    "filesystem": {
       "command": "mcp-server-filesystem",
       "args": ["--root", "/path/to/files"]
     },
-    {
-      "name": "github",
-      "transport": "stdio",
+    "github": {
       "command": "mcp-server-github",
       "args": ["--token", "YOUR_TOKEN"],
       "env": {
         "GITHUB_TOKEN": "your_token_here"
       }
     }
-  ]
+  }
 }
 ```
 
+> **Note:** The configuration format has been updated to use an object-based structure. If you have an existing configuration using the legacy array format with `"servers": [...]`, it will be automatically migrated to the new format when you run any MCP command.
+
 **File Management Commands:**
 
 ```bash
@@ -764,16 +762,20 @@ MCP servers support two transport types:
 
 For local MCP servers that run as a subprocess. Currently only stdio transport is supported:
 
+**Note:** The MCP configuration now uses a simpler object-based format. Instead of command-line flags, edit the configuration file directly:
+
 ```bash
-# Add via command line
-xibecode mcp add filesystem --command "mcp-server-filesystem" --args "--root /path/to/files"
+# Open the config file
+xibecode mcp edit
 
-# Configuration format (stored automatically)
+# Add your server to the file using the new format:
 {
-  "name": "filesystem",
-  "transport": "stdio",
-  "command": "mcp-server-filesystem",
-  "args": ["--root", "/path/to/files"]
+  "mcpServers": {
+    "filesystem": {
+      "command": "mcp-server-filesystem",
+      "args": ["--root", "/path/to/files"]
+    }
+  }
 }
 ```
 
@@ -804,17 +806,15 @@ MCP tools are prefixed with the server name (e.g., `filesystem::read_file`, `rem
 npm install -g @modelcontextprotocol/server-github
 
 # Open the config file to add the server
-xibecode mcp add
+xibecode mcp edit
 # Edit the file and add:
 # {
-#   "servers": [
-#     {
-#       "name": "github",
-#       "transport": "stdio",
+#   "mcpServers": {
+#     "github": {
 #       "command": "mcp-server-github",
 #       "args": ["--token", "YOUR_GITHUB_TOKEN"]
 #     }
-#   ]
+#   }
 # }
 
 # Reload servers

package/dist/commands/chat.d.ts

@@ -2,6 +2,8 @@ interface ChatOptions {
     model?: string;
     baseUrl?: string;
     apiKey?: string;
+    theme?: string;
+    session?: string;
 }
 export declare function chatCommand(options: ChatOptions): Promise<void>;
 export {};

package/dist/commands/chat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../src/commands/chat.ts"],"names":[],"mappings":"AAUA,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,iBAsVrD"}
+{"version":3,"file":"chat.d.ts","sourceRoot":"","sources":["../../src/commands/chat.ts"],"names":[],"mappings":"AAcA,UAAU,WAAW;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,WAAW,iBAgoBrD"}

package/dist/commands/chat.js

@@ -4,14 +4,26 @@ import { CodingToolExecutor } from '../core/tools.js';
 import { MCPClientManager } from '../core/mcp-client.js';
 import { EnhancedUI } from '../ui/enhanced-tui.js';
 import { ConfigManager } from '../utils/config.js';
+import { SessionManager } from '../core/session-manager.js';
+import { exportSessionToMarkdown } from '../core/export.js';
+import { ContextManager } from '../core/context.js';
+import { isThemeName, THEME_NAMES } from '../ui/themes.js';
 import chalk from 'chalk';
 import * as fs from 'fs/promises';
 import * as path from 'path';
 export async function chatCommand(options) {
-    const ui = new EnhancedUI(false);
     const config = new ConfigManager();
+    const preferredTheme = (options.theme || config.getTheme());
+    const themeName = isThemeName(preferredTheme) ? preferredTheme : 'default';
+    const ui = new EnhancedUI(false, themeName);
+    ui.setShowDetails(config.getShowDetails());
+    ui.setShowThinking(config.getShowThinking());
+    const sessionManager = new SessionManager(config.getSessionDirectory());
+    const contextManager = new ContextManager(process.cwd());
     ui.clear();
-    ui.header('1.0.0');
+    if (!config.isHeaderMinimal()) {
+        ui.header('1.0.0');
+    }
     // Get API key
     const apiKey = options.apiKey || config.getApiKey();
     if (!apiKey) {
@@ -25,16 +37,18 @@ export async function chatCommand(options) {
     // Load and connect to MCP servers
     const mcpClientManager = new MCPClientManager();
     const mcpServers = await config.getMCPServers();
-    if (mcpServers.length > 0) {
-        console.log(chalk.blue(`  ℹ Connecting to ${mcpServers.length} MCP server(s)...\n`));
-        for (const serverConfig of mcpServers) {
+    const serverNames = Object.keys(mcpServers);
+    if (serverNames.length > 0) {
+        console.log(chalk.blue(`  ℹ Connecting to ${serverNames.length} MCP server(s)...\n`));
+        for (const serverName of serverNames) {
+            const serverConfig = mcpServers[serverName];
             try {
-                await mcpClientManager.connect(serverConfig);
-                const tools = mcpClientManager.getAvailableTools().filter(t => t.serverName === serverConfig.name);
-                console.log(chalk.green(`  ✓ Connected to ${serverConfig.name} (${tools.length} tool(s))`));
+                await mcpClientManager.connect(serverName, serverConfig);
+                const tools = mcpClientManager.getAvailableTools().filter(t => t.serverName === serverName);
+                console.log(chalk.green(`  ✓ Connected to ${serverName} (${tools.length} tool(s))`));
             }
             catch (error) {
-                console.log(chalk.yellow(`  ✗ Failed to connect to ${serverConfig.name}: ${error.message}`));
+                console.log(chalk.yellow(`  ✗ Failed to connect to ${serverName}: ${error.message}`));
             }
         }
         console.log('');
@@ -46,77 +60,96 @@ export async function chatCommand(options) {
     // ── Create ONE agent for the entire chat session ──
     // This keeps conversation history (messages) across all turns,
     // so the AI remembers everything you talked about.
-    const agent = new EnhancedAgent({
-        apiKey,
+    let agent = new EnhancedAgent({
+        apiKey: apiKey,
         baseUrl,
         model,
         maxIterations: 150,
         verbose: false,
     });
-    let hasResponse = false;
-    // Set up event handlers ONCE (agent is reused across turns)
-    agent.on('event', (event) => {
-        switch (event.type) {
-            case 'thinking':
-                if (!hasResponse) {
-                    ui.thinking(event.data.message || 'Analyzing your request...');
-                }
-                break;
-            // ── Streaming ──
-            case 'stream_start':
-                ui.startAssistantResponse();
-                hasResponse = true;
-                break;
-            case 'stream_text':
-                ui.streamText(event.data.text);
-                break;
-            case 'stream_end':
-                ui.endAssistantResponse();
-                break;
-            // ── Non-streaming fallback ──
-            case 'response':
-                if (!hasResponse) {
-                    ui.response(event.data.text);
+    function setupAgentHandlers() {
+        agent.removeAllListeners('event');
+        agent.on('event', (event) => {
+            switch (event.type) {
+                case 'thinking':
+                    if (!hasResponse) {
+                        ui.thinking(event.data.message || 'Analyzing your request...');
+                    }
+                    break;
+                // ── Streaming ──
+                case 'stream_start':
+                    ui.startAssistantResponse();
                     hasResponse = true;
-                }
-                break;
-            // ── Tools ──
-            case 'tool_call':
-                if (enableTools) {
-                    ui.toolCall(event.data.name, event.data.input);
-                }
-                break;
-            case 'tool_result':
-                if (enableTools) {
-                    ui.toolResult(event.data.name, event.data.result, event.data.success);
-                    const r = event.data.result;
-                    if (r?.success && event.data.name === 'write_file') {
-                        ui.fileChanged('created', r.path, r.lines ? `${r.lines} lines` : undefined);
+                    break;
+                case 'stream_text':
+                    ui.streamText(event.data.text);
+                    break;
+                case 'stream_end':
+                    ui.endAssistantResponse();
+                    break;
+                // ── Non-streaming fallback ──
+                case 'response':
+                    if (!hasResponse) {
+                        ui.response(event.data.text);
+                        hasResponse = true;
                     }
-                    else if (r?.success && event.data.name === 'edit_file') {
-                        ui.fileChanged('modified', r.path || '', r.linesChanged ? `${r.linesChanged} lines` : undefined);
+                    break;
+                // ── Tools ──
+                case 'tool_call':
+                    if (enableTools) {
+                        ui.toolCall(event.data.name, event.data.input);
                     }
-                    else if (r?.success && event.data.name === 'edit_lines') {
-                        ui.fileChanged('modified', r.path || '', r.linesChanged ? `${r.linesChanged} lines` : undefined);
+                    break;
+                case 'tool_result':
+                    if (enableTools) {
+                        ui.toolResult(event.data.name, event.data.result, event.data.success);
+                        const r = event.data.result;
+                        if (r?.success && event.data.name === 'write_file') {
+                            ui.fileChanged('created', r.path, r.lines ? `${r.lines} lines` : undefined);
+                        }
+                        else if (r?.success && event.data.name === 'edit_file') {
+                            ui.fileChanged('modified', r.path || '', r.linesChanged ? `${r.linesChanged} lines` : undefined);
+                        }
+                        else if (r?.success && event.data.name === 'edit_lines') {
+                            ui.fileChanged('modified', r.path || '', r.linesChanged ? `${r.linesChanged} lines` : undefined);
+                        }
                     }
-                }
-                break;
-            // ── Iteration ──
-            case 'iteration':
-                if (!hasResponse && event.data?.current) {
-                    ui.updateThinking(`Thinking... step ${event.data.current}`);
-                }
-                hasResponse = false;
-                break;
-            // ── Errors / Warnings ──
-            case 'error':
-                ui.error(event.data.message || event.data.error);
-                break;
-            case 'warning':
-                ui.warning(event.data.message);
-                break;
+                    break;
+                // ── Iteration ──
+                case 'iteration':
+                    if (!hasResponse && event.data?.current) {
+                        ui.updateThinking(`Thinking... step ${event.data.current}`);
+                    }
+                    hasResponse = false;
+                    break;
+                // ── Errors / Warnings ──
+                case 'error':
+                    ui.error(event.data.message || event.data.error);
+                    break;
+                case 'warning':
+                    ui.warning(event.data.message);
+                    break;
+            }
+        });
+    }
+    let hasResponse = false;
+    setupAgentHandlers();
+    // ── Session bootstrap ──────────────────────────────────
+    let currentSession;
+    const existingId = options.session;
+    if (existingId) {
+        const loaded = await sessionManager.loadSession(existingId);
+        if (loaded) {
+            currentSession = loaded;
+            agent.setMessages(loaded.messages || []);
         }
-    });
+        else {
+            currentSession = await sessionManager.createSession({ model, cwd: process.cwd() });
+        }
+    }
+    else {
+        currentSession = await sessionManager.createSession({ model, cwd: process.cwd() });
+    }
     async function showPathSuggestions(raw) {
         const input = raw.trim().slice(1).trim(); // drop leading '@'
         const target = input ? path.resolve(process.cwd(), input) : process.cwd();
@@ -157,14 +190,198 @@ export async function chatCommand(options) {
         console.log('');
         console.log(chalk.bold('  XibeCode chat commands'));
         console.log('  ' + chalk.hex('#6B6B7B')('────────────────────────────'));
-        console.log('  ' + chalk.hex('#00D4FF')('/help') + chalk.hex('#6B6B7B')('      show this help, not an AI reply'));
-        console.log('  ' + chalk.hex('#00D4FF')('/mcp') + chalk.hex('#6B6B7B')('       show connected MCP servers and tools'));
-        console.log('  ' + chalk.hex('#00D4FF')('@path') + chalk.hex('#6B6B7B')('      list files/folders under path (or cwd if just "@")'));
-        console.log('  ' + chalk.hex('#00D4FF')('clear') + chalk.hex('#6B6B7B')('     clear screen and redraw header'));
-        console.log('  ' + chalk.hex('#00D4FF')('tools on') + chalk.hex('#6B6B7B')('  enable editor & filesystem tools'));
-        console.log('  ' + chalk.hex('#00D4FF')('tools off') + chalk.hex('#6B6B7B')(' disable tools (chat only)'));
-        console.log('  ' + chalk.hex('#00D4FF')('exit / quit') + chalk.hex('#6B6B7B')(' end the chat session'));
+        console.log('  ' + chalk.hex('#00D4FF')('/help') + chalk.hex('#6B6B7B')('        show this help, not an AI reply'));
+        console.log('  ' + chalk.hex('#00D4FF')('/mcp') + chalk.hex('#6B6B7B')('         show connected MCP servers and tools'));
+        console.log('  ' + chalk.hex('#00D4FF')('/new') + chalk.hex('#6B6B7B')('         start a new chat session'));
+        console.log('  ' + chalk.hex('#00D4FF')('/sessions') + chalk.hex('#6B6B7B')('    list and switch saved sessions'));
+        console.log('  ' + chalk.hex('#00D4FF')('/models') + chalk.hex('#6B6B7B')('      show/switch models'));
+        console.log('  ' + chalk.hex('#00D4FF')('/export') + chalk.hex('#6B6B7B')('      export this session to Markdown'));
+        console.log('  ' + chalk.hex('#00D4FF')('/compact') + chalk.hex('#6B6B7B')('     compact long conversation history'));
+        console.log('  ' + chalk.hex('#00D4FF')('/details') + chalk.hex('#6B6B7B')('     toggle verbose tool details'));
+        console.log('  ' + chalk.hex('#00D4FF')('/thinking') + chalk.hex('#6B6B7B')('    toggle thinking spinner'));
+        console.log('  ' + chalk.hex('#00D4FF')('/themes') + chalk.hex('#6B6B7B')('      choose a color theme'));
+        console.log('  ' + chalk.hex('#00D4FF')('@path') + chalk.hex('#6B6B7B')('        list files/folders under path (or cwd if just "@")'));
+        console.log('  ' + chalk.hex('#00D4FF')('clear') + chalk.hex('#6B6B7B')('       clear screen and redraw header'));
+        console.log('  ' + chalk.hex('#00D4FF')('tools on/off') + chalk.hex('#6B6B7B')(' toggle tools (editor & filesystem)'));
+        console.log('  ' + chalk.hex('#00D4FF')('exit / quit') + chalk.hex('#6B6B7B')('   end the chat session'));
+        console.log('  ' + chalk.hex('#00D4FF')('!cmd') + chalk.hex('#6B6B7B')('         run a shell command and feed output to AI'));
+        console.log('');
+    }
+    async function handleShellBang(input) {
+        const cmd = input.slice(1).trim();
+        if (!cmd) {
+            ui.warning('No command provided after "!". Example: !ls -la');
+            return;
+        }
+        ui.info(`Running shell command: ${cmd}`);
+        const result = await toolExecutor.execute('run_command', { command: cmd, cwd: process.cwd(), timeout: 300 });
+        const stdout = result.stdout || '';
+        const stderr = result.stderr || '';
+        console.log('');
+        console.log(chalk.bold('  Command Output'));
+        console.log('  ' + chalk.hex('#6B6B7B')('────────────────────────────'));
+        if (stdout) {
+            console.log(chalk.white(stdout));
+        }
+        if (stderr) {
+            console.log(chalk.red(stderr));
+        }
         console.log('');
+        const summary = [
+            `Shell command: ${cmd}`,
+            '',
+            stdout ? stdout : '',
+            stderr ? `STDERR:\n${stderr}` : '',
+        ].join('\n');
+        const tools = enableTools ? toolExecutor.getTools() : [];
+        await agent.run(summary, tools, toolExecutor);
+        const stats = agent.getStats();
+        if (config.isStatusBarEnabled()) {
+            ui.renderStatusBar({
+                model,
+                sessionTitle: currentSession.title,
+                cwd: process.cwd(),
+                toolsEnabled: enableTools,
+                themeName: ui.getThemeName(),
+            });
+        }
+        await sessionManager.saveMessagesAndStats({
+            id: currentSession.id,
+            messages: agent.getMessages(),
+            stats,
+        });
+    }
+    async function handleSessionsCommand() {
+        const sessions = await sessionManager.listSessions();
+        if (sessions.length === 0) {
+            ui.info('No saved sessions yet.');
+            return;
+        }
+        const { picked } = await inquirer.prompt([
+            {
+                type: 'list',
+                name: 'picked',
+                message: 'Select session',
+                choices: sessions.map(s => ({
+                    name: `${s.title}  ·  ${s.model}  ·  ${s.updated}`,
+                    value: s.id,
+                })),
+            },
+        ]);
+        const loaded = await sessionManager.loadSession(picked);
+        if (!loaded) {
+            ui.error('Failed to load selected session');
+            return;
+        }
+        currentSession = loaded;
+        agent.setMessages(loaded.messages || []);
+        ui.success(`Switched to session ${loaded.title}`);
+    }
+    async function handleNewSession() {
+        currentSession = await sessionManager.createSession({ model, cwd: process.cwd() });
+        agent = new EnhancedAgent({
+            apiKey: apiKey,
+            baseUrl,
+            model,
+            maxIterations: 150,
+            verbose: false,
+        });
+        setupAgentHandlers();
+        ui.success('Started new session');
+    }
+    async function handleModelsCommand() {
+        const current = model;
+        const models = [
+            current,
+            'claude-sonnet-4-5-20250929',
+            'claude-opus-4-5-20251101',
+            'claude-haiku-4-5-20251015',
+        ];
+        const unique = Array.from(new Set(models));
+        const { picked } = await inquirer.prompt([
+            {
+                type: 'list',
+                name: 'picked',
+                message: 'Select model',
+                choices: unique.map(m => ({
+                    name: m === current ? `${m} (current)` : m,
+                    value: m,
+                })),
+            },
+        ]);
+        config.set('model', picked);
+        ui.success(`Model set to: ${picked}`);
+    }
+    async function handleThemesCommand() {
+        const current = ui.getThemeName();
+        const { picked } = await inquirer.prompt([
+            {
+                type: 'list',
+                name: 'picked',
+                message: 'Select theme',
+                choices: THEME_NAMES.map(name => ({
+                    name: name === current ? `${name} (current)` : name,
+                    value: name,
+                })),
+            },
+        ]);
+        ui.setTheme(picked);
+        config.set('theme', picked);
+        ui.success(`Theme set to: ${picked}`);
+    }
+    async function handleExportCommand() {
+        const session = {
+            ...currentSession,
+            messages: agent.getMessages(),
+        };
+        const markdown = exportSessionToMarkdown(session);
+        const exportsDir = path.join(config['getConfigPath'], '..', 'sessions');
+        const fileName = `${session.id}.md`;
+        const fullPath = path.join(exportsDir, fileName);
+        await fs.mkdir(exportsDir, { recursive: true });
+        await fs.writeFile(fullPath, markdown, 'utf-8');
+        ui.success(`Session exported to ${fullPath}`);
+    }
+    async function handleCompactCommand() {
+        const messages = agent.getMessages();
+        if (messages.length <= 10) {
+            ui.info('Conversation is short; no compaction needed.');
+            return;
+        }
+        const preserved = messages.slice(-6);
+        const summaryMessage = {
+            role: 'assistant',
+            content: 'Earlier conversation has been compacted to save context. Key details from the last messages are preserved.',
+        };
+        const compacted = [summaryMessage, ...preserved];
+        agent.setMessages(compacted);
+        await sessionManager.saveMessagesAndStats({
+            id: currentSession.id,
+            messages: compacted,
+            stats: agent.getStats(),
+        });
+        ui.success('Conversation compacted.');
+    }
+    async function handleAtPathFuzzy(raw) {
+        const input = raw.trim().slice(1).trim();
+        const pattern = input ? `**/*${input}*` : '**/*';
+        try {
+            const files = await contextManager.searchFiles(pattern, { maxResults: 100 });
+            if (!files.length) {
+                ui.info(`No matches for pattern ${pattern}`);
+                return;
+            }
+            console.log('');
+            console.log('  ' + chalk.bold('Files'));
+            console.log('  ' + chalk.hex('#6B6B7B')('────────────────────────────'));
+            files.forEach(f => {
+                console.log('  ' + chalk.hex('#CE93D8')('📄') + ' ' + chalk.white(f));
+            });
+            console.log('');
+        }
+        catch (error) {
+            ui.error('Failed to search files for @ path', error);
+        }
     }
     // ── Chat loop ──
     while (true) {
@@ -227,6 +444,44 @@ export async function chatCommand(options) {
             showSlashHelp();
             continue;
         }
+        if (lowerMessage === '/new') {
+            await handleNewSession();
+            continue;
+        }
+        if (lowerMessage === '/sessions') {
+            await handleSessionsCommand();
+            continue;
+        }
+        if (lowerMessage === '/models') {
+            await handleModelsCommand();
+            continue;
+        }
+        if (lowerMessage === '/themes') {
+            await handleThemesCommand();
+            continue;
+        }
+        if (lowerMessage === '/export') {
+            await handleExportCommand();
+            continue;
+        }
+        if (lowerMessage === '/compact') {
+            await handleCompactCommand();
+            continue;
+        }
+        if (lowerMessage === '/details') {
+            const next = !ui.getShowDetails();
+            ui.setShowDetails(next);
+            config.set('showDetails', next);
+            ui.success(`Details ${next ? 'enabled' : 'disabled'}`);
+            continue;
+        }
+        if (lowerMessage === '/thinking') {
+            const next = !ui.getShowThinking();
+            ui.setShowThinking(next);
+            config.set('showThinking', next);
+            ui.success(`Thinking display ${next ? 'enabled' : 'disabled'}`);
+            continue;
+        }
         if (lowerMessage === '/mcp') {
             console.log('');
             console.log(chalk.bold('  MCP Servers'));
@@ -256,7 +511,12 @@ export async function chatCommand(options) {
             continue;
         }
         if (trimmed.startsWith('@')) {
-            await showPathSuggestions(trimmed);
+            await handleAtPathFuzzy(trimmed);
+            continue;
+        }
+        if (trimmed.startsWith('!')) {
+            await handleShellBang(trimmed);
+            console.log('');
             continue;
         }
         if (lowerMessage === 'exit' || lowerMessage === 'quit') {
@@ -270,11 +530,18 @@ export async function chatCommand(options) {
             console.log(chalk.hex('#3A3A4A')('  │') + chalk.hex('#00D4FF')('  👋 See you next time!             ') + chalk.hex('#3A3A4A')('│'));
             console.log(chalk.hex('#3A3A4A')('  ╰──────────────────────────────────╯'));
             console.log('');
+            await sessionManager.saveMessagesAndStats({
+                id: currentSession.id,
+                messages: agent.getMessages(),
+                stats,
+            });
             break;
         }
         if (lowerMessage === 'clear') {
             ui.clear();
-            ui.header('1.0.0');
+            if (!config.isHeaderMinimal()) {
+                ui.header('1.0.0');
+            }
             ui.chatBanner(process.cwd(), model, baseUrl);
             continue;
         }
@@ -296,6 +563,21 @@ export async function chatCommand(options) {
             // the conversation history (this.messages), so the AI has
             // full context of everything discussed in this session.
             await agent.run(message, tools, toolExecutor);
+            const stats = agent.getStats();
+            if (config.isStatusBarEnabled()) {
+                ui.renderStatusBar({
+                    model,
+                    sessionTitle: currentSession.title,
+                    cwd: process.cwd(),
+                    toolsEnabled: enableTools,
+                    themeName: ui.getThemeName(),
+                });
+            }
+            await sessionManager.saveMessagesAndStats({
+                id: currentSession.id,
+                messages: agent.getMessages(),
+                stats,
+            });
         }
         catch (error) {
             ui.error('Failed to process message', error);
@@ -303,7 +585,7 @@ export async function chatCommand(options) {
         console.log('');
     }
     // Cleanup: disconnect from all MCP servers
-    if (mcpServers.length > 0) {
+    if (serverNames.length > 0) {
         await mcpClientManager.disconnectAll();
     }
 }