dexto 1.2.4 → 1.2.5

package/dist/cli/commands/interactive-commands/session/session-commands.js

@@ -19,12 +19,23 @@
  */
 import chalk from 'chalk';
 import { logger } from '@dexto/core';
+import { getCLISessionId } from '../command-parser.js';
 import { formatSessionInfo, formatHistoryMessage } from '../../helpers/formatters.js';
+import { CommandOutputHelper } from '../utils/command-output.js';
 /**
- * Helper to get current session info
+ * Escape special regex characters in a string to prevent ReDoS attacks
+ */
+function escapeRegExp(string) {
+    return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}
+/**
+ * Helper to get current session info from CLI context
  */
 async function getCurrentSessionInfo(agent) {
-    const currentId = agent.getCurrentSessionId();
+    const currentId = getCLISessionId(agent);
+    if (!currentId) {
+        return null;
+    }
     const metadata = await agent.getSessionMetadata(currentId);
     return { id: currentId, metadata };
 }
@@ -65,8 +76,7 @@ export const sessionCommand = {
                     const sessionIds = await agent.listSessions();
                     const current = await getCurrentSessionInfo(agent);
                     if (sessionIds.length === 0) {
-                        console.log(chalk.dim('  No sessions found. Run `dexto` to start a new session, or use `dexto -c`/`dexto -r <id>`.\n'));
-                        return true;
+                        return CommandOutputHelper.info('📋 No sessions found.\n  Run `dexto` to start a new session, or use `dexto -r <id>` to resume.');
                     }
                     // Fetch metadata concurrently; errors do not abort listing
                     const entries = await Promise.all(sessionIds.map(async (id) => {
@@ -83,17 +93,17 @@ export const sessionCommand = {
                     for (const { id, metadata } of entries) {
                         if (!metadata)
                             continue;
-                        const isCurrent = id === current.id;
+                        const isCurrent = current ? id === current.id : false;
                         console.log(`  ${formatSessionInfo(id, metadata, isCurrent)}`);
                         displayed++;
                     }
                     console.log(chalk.dim(`\n  Total: ${displayed} of ${sessionIds.length} sessions`));
-                    console.log(chalk.dim('  💡 Use `dexto -r <id>` to resume a session\n'));
+                    console.log(chalk.dim('  💡 Use /resume to pick a session\n'));
+                    return CommandOutputHelper.noOutput(); // List is displayed above
                 }
                 catch (error) {
-                    logger.error(`Failed to list sessions: ${error instanceof Error ? error.message : String(error)}`);
+                    return CommandOutputHelper.error(error, 'Failed to list sessions');
                 }
-                return true;
             },
         },
         {
@@ -103,20 +113,21 @@ export const sessionCommand = {
             aliases: ['h'],
             handler: async (args, agent) => {
                 try {
-                    // Use provided session ID or current session
-                    const sessionId = args.length > 0 && args[0] ? args[0] : agent.getCurrentSessionId();
+                    // Use provided session ID or current session from CLI context
+                    const currentSessionId = getCLISessionId(agent);
+                    const sessionId = args.length > 0 && args[0] ? args[0] : currentSessionId;
+                    if (!sessionId) {
+                        return CommandOutputHelper.error(new Error('No session available. Create a session first.'));
+                    }
                     await displaySessionHistory(sessionId, agent);
+                    return CommandOutputHelper.noOutput(); // History is displayed by displaySessionHistory
                 }
                 catch (error) {
                     if (error instanceof Error && error.message.includes('not found')) {
-                        console.log(chalk.red(`❌ Session not found: ${args[0] || 'current'}`));
-                        console.log(chalk.dim('   Use /session list to see available sessions'));
-                    }
-                    else {
-                        logger.error(`Failed to get session history: ${error instanceof Error ? error.message : String(error)}`, null, 'red');
+                        return CommandOutputHelper.error(new Error(`Session not found: ${args[0] || 'current'}\n   Use /session list to see available sessions`));
                     }
+                    return CommandOutputHelper.error(error, 'Failed to get session history');
                 }
-                return true;
             },
         },
         {
@@ -124,26 +135,22 @@ export const sessionCommand = {
             description: 'Delete a session',
             usage: '/session delete <id>',
             handler: async (args, agent) => {
-                if (args.length === 0) {
-                    console.log(chalk.red('❌ Session ID required. Usage: /session delete <id>'));
-                    return true;
-                }
+                const validationError = CommandOutputHelper.validateRequiredArg(args, 0, 'Session ID', '/session delete <id>');
+                if (validationError)
+                    return validationError;
+                const sessionId = args[0];
                 try {
-                    const sessionId = args[0]; // Safe to assert non-null since we checked args.length
                     const current = await getCurrentSessionInfo(agent);
                     // Check if trying to delete current session
-                    if (sessionId === current.id) {
-                        console.log(chalk.yellow('⚠️  Cannot delete the currently active session.'));
-                        console.log(chalk.dim('   Switch to another session first, then delete this one.'));
-                        return true;
+                    if (current && sessionId === current.id) {
+                        return CommandOutputHelper.warning('⚠️  Cannot delete the currently active session.\n   Switch to another session first, then delete this one.');
                     }
                     await agent.deleteSession(sessionId);
-                    console.log(chalk.green(`✅ Deleted session: ${chalk.bold(sessionId)}`));
+                    return CommandOutputHelper.success(`✅ Deleted session: ${sessionId.slice(0, 8)}`);
                 }
                 catch (error) {
-                    logger.error(`Failed to delete session: ${error instanceof Error ? error.message : String(error)}`, null, 'red');
+                    return CommandOutputHelper.error(error, 'Failed to delete session');
                 }
-                return true;
             },
         },
         {
@@ -151,6 +158,17 @@ export const sessionCommand = {
             description: 'Show detailed help for session commands',
             usage: '/session help',
             handler: async (_args, _agent) => {
+                const helpText = [
+                    '\n📋 Session Management Commands:\n',
+                    'Available subcommands:',
+                    '  /session list - List all sessions with their status and activity',
+                    '  /session history [sessionId] - Display session history',
+                    '  /session delete <id> - Delete a session (cannot delete active session)',
+                    '  /session help - Show this help message',
+                    '\n💡 Sessions allow you to maintain separate chat sessions',
+                    '💡 Use /resume to switch between sessions',
+                    '💡 Use /clear to start a new session (preserves old sessions)\n',
+                ].join('\n');
                 console.log(chalk.bold.blue('\n📋 Session Management Commands:\n'));
                 console.log(chalk.cyan('Available subcommands:'));
                 console.log(`  ${chalk.yellow('/session list')} - List all sessions with their status and activity`);
@@ -158,9 +176,9 @@ export const sessionCommand = {
                 console.log(`  ${chalk.yellow('/session delete')} ${chalk.blue('<id>')} - Delete a session (cannot delete active session)`);
                 console.log(`  ${chalk.yellow('/session help')} - Show this help message`);
                 console.log(chalk.dim('\n💡 Sessions allow you to maintain separate chat sessions'));
-                console.log(chalk.dim('💡 Use `dexto -r <id>` to resume a different session'));
-                console.log(chalk.dim('💡 Use `dexto` to start a new session or `dexto -c` to continue most recent\n'));
-                return true;
+                console.log(chalk.dim('💡 Use /resume to switch between sessions'));
+                console.log(chalk.dim('💡 Use /clear to start a new session (preserves old sessions)\n'));
+                return helpText;
             },
         },
     ],
@@ -197,20 +215,46 @@ export const historyCommand = {
     aliases: ['hist'],
     handler: async (args, agent) => {
         try {
-            // Use provided session ID or current session
-            const sessionId = args.length > 0 && args[0] ? args[0] : agent.getCurrentSessionId();
+            // Use provided session ID or current session from CLI context
+            const currentSessionId = getCLISessionId(agent);
+            const sessionId = args.length > 0 && args[0] ? args[0] : currentSessionId;
+            if (!sessionId) {
+                return CommandOutputHelper.error(new Error('No session available. Create a session first.'));
+            }
             await displaySessionHistory(sessionId, agent);
+            return CommandOutputHelper.noOutput();
         }
         catch (error) {
             if (error instanceof Error && error.message.includes('not found')) {
-                console.log(chalk.red(`❌ Session not found: ${args[0] || 'current'}`));
-                console.log(chalk.dim('   Use /session list to see available sessions'));
-            }
-            else {
-                logger.error(`Failed to get session history: ${error instanceof Error ? error.message : String(error)}`);
+                return CommandOutputHelper.error(new Error(`Session not found: ${args[0] || 'current'}\n   Use /session list to see available sessions`));
             }
+            return CommandOutputHelper.error(error, 'Failed to get session history');
         }
-        return true;
+    },
+};
+/**
+ * Resume command - shows interactive session selector
+ * Note: In interactive CLI, this always shows the selector (args ignored)
+ * For headless CLI, use `dexto -r <sessionId>` instead
+ */
+export const resumeCommand = {
+    name: 'resume',
+    description: 'Switch to a different session (interactive selector)',
+    usage: '/resume',
+    category: 'General',
+    aliases: ['r'],
+    handler: async (_args, _agent) => {
+        // In interactive CLI, /resume always triggers the interactive selector
+        // The selector is shown via detectInteractiveSelector in inputParsing.ts
+        // This handler should not be called in ink-cli (selector shows instead)
+        // If called in headless mode, show help
+        const helpText = [
+            '📋 Resume Session',
+            '\nIn interactive mode: Type /resume to show the session selector',
+            'In headless mode: Use `dexto -r <sessionId>` instead\n',
+        ].join('\n');
+        console.log(chalk.blue(helpText));
+        return helpText;
     },
 };
 /**
@@ -218,19 +262,39 @@ export const historyCommand = {
  */
 export const searchCommand = {
     name: 'search',
-    description: 'Search session history',
-    usage: '/search <query> [options]',
-    category: 'Session Management',
+    description: 'Search messages across all sessions (or specific session)',
+    usage: '/search <query> [--session <id>] [--role <user|assistant>] [--limit <n>]',
+    category: 'General',
     aliases: ['find'],
     handler: async (args, agent) => {
         if (args.length === 0) {
-            console.log(chalk.red('❌ Search query is required'));
-            console.log(chalk.dim('Usage: /search <query> [--session <sessionId>] [--role <role>] [--limit <number>]'));
-            console.log(chalk.dim('Examples:'));
-            console.log(chalk.dim('  /search "hello world"'));
-            console.log(chalk.dim('  /search error --role assistant'));
-            console.log(chalk.dim('  /search deploy --session abc123'));
-            return true;
+            const helpText = [
+                '\n🔍 Search Session History:\n',
+                'Usage:',
+                '  /search <query> [--session <sessionId>] [--role <role>] [--limit <number>]',
+                '\nExamples:',
+                '  /search "hello world"           # Search all sessions',
+                '  /search error --role assistant  # Search assistant messages',
+                '  /search deploy --session abc123 # Search specific session',
+                '  /search bug --limit 20          # Show up to 20 results',
+                '\nOptions:',
+                '  --session <id>  Search only in specific session',
+                '  --role <role>   Filter by role (user, assistant, system, tool)',
+                '  --limit <n>     Max results to show (default: 10)\n',
+            ].join('\n');
+            console.log(chalk.bold.blue('\n🔍 Search Session History:\n'));
+            console.log(chalk.cyan('Usage:'));
+            console.log(chalk.dim('  /search <query> [--session <sessionId>] [--role <role>] [--limit <number>]'));
+            console.log(chalk.cyan('\nExamples:'));
+            console.log(chalk.dim('  /search "hello world"           # Search all sessions'));
+            console.log(chalk.dim('  /search error --role assistant  # Search assistant messages'));
+            console.log(chalk.dim('  /search deploy --session abc123 # Search specific session'));
+            console.log(chalk.dim('  /search bug --limit 20          # Show up to 20 results'));
+            console.log(chalk.cyan('\nOptions:'));
+            console.log(chalk.dim('  --session <id>  Search only in specific session'));
+            console.log(chalk.dim('  --role <role>   Filter by role (user, assistant, system, tool)'));
+            console.log(chalk.dim('  --limit <n>     Max results to show (default: 10)\n'));
+            return helpText;
         }
         try {
             // Parse arguments
@@ -275,9 +339,30 @@ export const searchCommand = {
                 }
             }
             if (!query.trim()) {
-                console.log(chalk.red('❌ Search query is required'));
-                return true;
+                return CommandOutputHelper.error(new Error('Search query is required'));
+            }
+            const results = await agent.searchMessages(query, options);
+            if (results.results.length === 0) {
+                const noResultsMsg = `📭 No messages found matching: "${query}"`;
+                console.log(chalk.yellow(noResultsMsg));
+                return noResultsMsg;
+            }
+            // Build output string for ink-cli
+            const outputLines = [];
+            outputLines.push(`\n🔍 Search results for: "${query}"`);
+            if (options.sessionId) {
+                outputLines.push(`   Session: ${options.sessionId}`);
+            }
+            if (options.role) {
+                outputLines.push(`   Role: ${options.role}`);
+            }
+            outputLines.push(`   Limit: ${options.limit}\n`);
+            outputLines.push(`✅ Found ${results.total} result${results.total === 1 ? '' : 's'}`);
+            if (results.hasMore) {
+                outputLines.push(`   Showing first ${results.results.length} results`);
             }
+            outputLines.push('');
+            // Console output header for regular CLI
             console.log(chalk.blue(`🔍 Searching for: "${query}"`));
             if (options.sessionId) {
                 console.log(chalk.dim(`   Session: ${options.sessionId}`));
@@ -287,11 +372,6 @@ export const searchCommand = {
             }
             console.log(chalk.dim(`   Limit: ${options.limit}`));
             console.log();
-            const results = await agent.searchMessages(query, options);
-            if (results.results.length === 0) {
-                console.log(chalk.yellow('📭 No messages found matching your search'));
-                return true;
-            }
             console.log(chalk.green(`✅ Found ${results.total} result${results.total === 1 ? '' : 's'}`));
             if (results.hasMore) {
                 console.log(chalk.dim(`   Showing first ${results.results.length} results`));
@@ -304,18 +384,23 @@ export const searchCommand = {
                     : result.message.role === 'assistant'
                         ? chalk.green
                         : chalk.yellow;
-                console.log(`${chalk.dim(`${index + 1}.`)} ${chalk.cyan(result.sessionId)} ${roleColor(`[${result.message.role}]`)}`);
-                console.log(`   ${result.context.replace(new RegExp(`(${query})`, 'gi'), chalk.inverse('$1'))}`);
+                console.log(`${chalk.dim(`${index + 1}.`)} ${chalk.cyan(result.sessionId.slice(0, 8))} ${roleColor(`[${result.message.role}]`)}`);
+                console.log(`   ${result.context.replace(new RegExp(`(${escapeRegExp(query.trim().slice(0, 256))})`, 'gi'), chalk.inverse('$1'))}`);
                 console.log();
+                // For ink-cli output (without color codes)
+                outputLines.push(`${index + 1}. ${result.sessionId.slice(0, 8)} [${result.message.role}]`);
+                outputLines.push(`   ${result.context}`);
+                outputLines.push('');
             });
             if (results.hasMore) {
+                outputLines.push('💡 Use --limit to see more results');
                 console.log(chalk.dim('💡 Use --limit to see more results'));
             }
+            const output = outputLines.join('\n');
+            return output;
         }
         catch (error) {
-            logger.error(`Search failed: ${error instanceof Error ? error.message : String(error)}`);
-            console.log(chalk.red('❌ Search failed. Please try again.'));
+            return CommandOutputHelper.error(error, 'Search failed');
         }
-        return true;
     },
 };

package/dist/cli/commands/interactive-commands/system/system-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"system-commands.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/interactive-commands/system/system-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAE9D;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,iBAAiB,EA8H7C,CAAC"}
+{"version":3,"file":"system-commands.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/interactive-commands/system/system-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAG9D;;GAEG;AACH,eAAO,MAAM,cAAc,EAAE,iBAAiB,EAqM7C,CAAC"}

package/dist/cli/commands/interactive-commands/system/system-commands.js

@@ -11,13 +11,14 @@
  */
 import chalk from 'chalk';
 import { logger } from '@dexto/core';
+import { formatForInkCli } from '../utils/format-output.js';
 /**
  * System commands for configuration and monitoring
  */
 export const systemCommands = [
     {
         name: 'log',
-        description: `Set or view log level. Available levels: ${chalk.cyan('error')}, ${chalk.cyan('warn')}, ${chalk.cyan('info')}, ${chalk.cyan('http')}, ${chalk.cyan('verbose')}, ${chalk.cyan('debug')}, ${chalk.cyan('silly')}.`,
+        description: 'View or change log level interactively',
         usage: '/log [level]',
         category: 'System',
         aliases: [],
@@ -25,23 +26,46 @@ export const systemCommands = [
             const validLevels = ['error', 'warn', 'info', 'http', 'verbose', 'debug', 'silly'];
             const level = args[0];
             if (!level) {
-                console.log(chalk.blue(`\nCurrent log level: ${chalk.cyan(logger.getLevel())}`));
+                // Interactive view: show current level and options
+                const currentLevel = logger.getLevel();
                 const logFilePath = logger.getLogFilePath();
+                console.log(chalk.bold.blue('\n📊 Logging Configuration:\n'));
+                console.log(`  Current level: ${chalk.green.bold(currentLevel)}`);
                 if (logFilePath) {
-                    console.log(chalk.blue(`Log file location: ${chalk.cyan(logFilePath)}`));
+                    console.log(`  Log file: ${chalk.cyan(logFilePath)}`);
                 }
-                console.log(chalk.dim('Available levels: error, warn, info, http, verbose, debug, silly'));
-                console.log(chalk.dim('💡 Use /log [level] to set the log level'));
-                return true;
+                console.log(chalk.dim('\n  Available levels (from least to most verbose):'));
+                validLevels.forEach((lvl) => {
+                    const isCurrent = lvl === currentLevel;
+                    const marker = isCurrent ? chalk.green('▶') : ' ';
+                    const levelText = isCurrent ? chalk.green.bold(lvl) : chalk.gray(lvl);
+                    console.log(`  ${marker} ${levelText}`);
+                });
+                console.log(chalk.dim('\n  💡 Use /log <level> to change level (e.g., /log debug)\n'));
+                const output = [
+                    '\n📊 Logging Configuration:',
+                    `Current level: ${currentLevel}`,
+                    logFilePath ? `Log file: ${logFilePath}` : '',
+                    '\nAvailable levels: error, warn, info, http, verbose, debug, silly',
+                    '💡 Use /log <level> to change level',
+                ]
+                    .filter(Boolean)
+                    .join('\n');
+                return formatForInkCli(output);
             }
             if (validLevels.includes(level)) {
                 logger.setLevel(level);
                 logger.info(`Log level set to ${level}`, null, 'green');
+                console.log(chalk.green(`✅ Log level changed to: ${chalk.bold(level)}`));
+                const output = `✅ Log level set to ${level}`;
+                return formatForInkCli(output);
             }
             else {
-                logger.error(`Invalid log level: ${level}. Valid levels are: ${validLevels.join(', ')}`);
+                const errorMsg = `❌ Invalid log level: ${level}\nValid levels: ${validLevels.join(', ')}`;
+                console.log(chalk.red(`❌ Invalid log level: ${chalk.bold(level)}`));
+                console.log(chalk.dim(`Valid levels: ${validLevels.join(', ')}`));
+                return formatForInkCli(errorMsg);
             }
-            return true;
         },
     },
     {
@@ -52,19 +76,39 @@ export const systemCommands = [
         handler: async (_args, agent) => {
             try {
                 const config = agent.getEffectiveConfig();
-                console.log(chalk.blue('\n⚙️  Current Configuration:\n'));
+                // Build output string
+                const outputLines = ['\n⚙️  Current Configuration:\n'];
                 // LLM Config
+                outputLines.push('🤖 LLM:');
+                outputLines.push(`  Provider: ${config.llm.provider}`);
+                outputLines.push(`  Model: ${config.llm.model}`);
+                outputLines.push(`  Router: ${config.llm.router}`);
+                // Session Config
+                outputLines.push('\n💬 Sessions:');
+                outputLines.push(`  Max Sessions: ${config.sessions?.maxSessions?.toString() || 'Default'}`);
+                outputLines.push(`  Session TTL: ${config.sessions?.sessionTTL ? `${config.sessions.sessionTTL / 1000}s` : 'Default'}`);
+                // MCP Servers
+                outputLines.push('\n🔌 MCP Servers:');
+                const servers = Object.keys(config.mcpServers || {});
+                if (servers.length > 0) {
+                    for (const server of servers) {
+                        outputLines.push(`  ${server}`);
+                    }
+                }
+                else {
+                    outputLines.push('  No MCP servers configured');
+                }
+                const output = outputLines.join('\n') + '\n';
+                // Log for regular CLI
+                console.log(chalk.blue('\n⚙️  Current Configuration:\n'));
                 console.log(chalk.bold('🤖 LLM:'));
                 console.log(`  Provider: ${chalk.cyan(config.llm.provider)}`);
                 console.log(`  Model: ${chalk.cyan(config.llm.model)}`);
                 console.log(`  Router: ${chalk.cyan(config.llm.router)}`);
-                // Session Config
                 console.log(chalk.bold('\n💬 Sessions:'));
                 console.log(`  Max Sessions: ${chalk.cyan(config.sessions?.maxSessions?.toString() || 'Default')}`);
                 console.log(`  Session TTL: ${chalk.cyan(config.sessions?.sessionTTL ? `${config.sessions.sessionTTL / 1000}s` : 'Default')}`);
-                // MCP Servers
                 console.log(chalk.bold('\n🔌 MCP Servers:'));
-                const servers = Object.keys(config.mcpServers || {});
                 if (servers.length > 0) {
                     for (const server of servers) {
                         console.log(`  ${chalk.cyan(server)}`);
@@ -74,11 +118,13 @@ export const systemCommands = [
                     console.log(chalk.dim('  No MCP servers configured'));
                 }
                 console.log();
+                return formatForInkCli(output);
             }
             catch (error) {
-                logger.error(`Failed to get configuration: ${error instanceof Error ? error.message : String(error)}`);
+                const errorMsg = `Failed to get configuration: ${error instanceof Error ? error.message : String(error)}`;
+                logger.error(errorMsg);
+                return formatForInkCli(`❌ ${errorMsg}`);
             }
-            return true;
         },
     },
     {
@@ -88,22 +134,42 @@ export const systemCommands = [
         category: 'System',
         handler: async (_args, agent) => {
             try {
-                console.log(chalk.blue('\n📊 System Statistics:\n'));
+                // Build output string
+                const outputLines = ['\n📊 System Statistics:\n'];
                 // Session stats
                 const sessionStats = await agent.sessionManager.getSessionStats();
+                outputLines.push('💬 Sessions:');
+                outputLines.push(`  Total Sessions: ${sessionStats.totalSessions.toString()}`);
+                outputLines.push(`  In Memory: ${sessionStats.inMemorySessions.toString()}`);
+                outputLines.push(`  Max Allowed: ${sessionStats.maxSessions.toString()}`);
+                // MCP stats
+                outputLines.push('\n🔌 MCP Servers:');
+                const connectedServers = agent.getMcpClients().size;
+                const failedConnections = Object.keys(agent.getMcpFailedConnections()).length;
+                outputLines.push(`  Connected: ${connectedServers.toString()}`);
+                if (failedConnections > 0) {
+                    outputLines.push(`  Failed: ${failedConnections.toString()}`);
+                }
+                // Tools
+                try {
+                    const tools = await agent.getAllMcpTools();
+                    outputLines.push(`  Available Tools: ${Object.keys(tools).length.toString()}`);
+                }
+                catch {
+                    outputLines.push('  Available Tools: Unable to count');
+                }
+                const output = outputLines.join('\n') + '\n';
+                // Log for regular CLI
+                console.log(chalk.blue('\n📊 System Statistics:\n'));
                 console.log(chalk.bold('💬 Sessions:'));
                 console.log(`  Total Sessions: ${chalk.cyan(sessionStats.totalSessions.toString())}`);
                 console.log(`  In Memory: ${chalk.cyan(sessionStats.inMemorySessions.toString())}`);
                 console.log(`  Max Allowed: ${chalk.cyan(sessionStats.maxSessions.toString())}`);
-                // MCP stats
                 console.log(chalk.bold('\n🔌 MCP Servers:'));
-                const connectedServers = agent.getMcpClients().size;
-                const failedConnections = Object.keys(agent.getMcpFailedConnections()).length;
                 console.log(`  Connected: ${chalk.green(connectedServers.toString())}`);
                 if (failedConnections > 0) {
                     console.log(`  Failed: ${chalk.red(failedConnections.toString())}`);
                 }
-                // Tools
                 try {
                     const tools = await agent.getAllMcpTools();
                     console.log(`  Available Tools: ${chalk.cyan(Object.keys(tools).length.toString())}`);
@@ -112,11 +178,13 @@ export const systemCommands = [
                     console.log(`  Available Tools: ${chalk.dim('Unable to count')}`);
                 }
                 console.log();
+                return formatForInkCli(output);
             }
             catch (error) {
-                logger.error(`Failed to get statistics: ${error instanceof Error ? error.message : String(error)}`);
+                const errorMsg = `Failed to get statistics: ${error instanceof Error ? error.message : String(error)}`;
+                logger.error(errorMsg);
+                return formatForInkCli(`❌ ${errorMsg}`);
             }
-            return true;
         },
     },
 ];

package/dist/cli/commands/interactive-commands/tool-commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tool-commands.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interactive-commands/tool-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAE7D;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,iBAAiB,EAmD3C,CAAC"}
+{"version":3,"file":"tool-commands.d.ts","sourceRoot":"","sources":["../../../../src/cli/commands/interactive-commands/tool-commands.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAG7D;;GAEG;AACH,eAAO,MAAM,YAAY,EAAE,iBAAiB,EA0E3C,CAAC"}

package/dist/cli/commands/interactive-commands/tool-commands.js

@@ -9,6 +9,7 @@
  */
 import chalk from 'chalk';
 import { logger } from '@dexto/core';
+import { formatForInkCli } from './utils/format-output.js';
 /**
  * Tool management commands
  */
@@ -24,10 +25,12 @@ export const toolCommands = [
                 const mcpTools = await agent.getAllMcpTools();
                 const toolEntries = Object.entries(allTools);
                 if (toolEntries.length === 0) {
-                    console.log(chalk.yellow('📋 No tools available'));
-                    return true;
+                    const output = '📋 No tools available';
+                    console.log(chalk.yellow(output));
+                    return formatForInkCli(output);
                 }
-                console.log(chalk.bold.green(`\n🔧 Available Tools (${toolEntries.length}):\n`));
+                // Build output string
+                const outputLines = [`\n🔧 Available Tools (${toolEntries.length}):\n`];
                 // Display tools with descriptions and source
                 for (const [toolName, toolInfo] of toolEntries) {
                     const description = toolInfo.description || 'No description available';
@@ -36,6 +39,25 @@ export const toolCommands = [
                     let source;
                     if (!isMcpTool && !toolName.startsWith('mcp--')) {
                         // Non-MCP tool that doesn't have mcp prefix = internal tool
+                        source = '[Internal]';
+                    }
+                    else if (isMcpTool || toolName.startsWith('mcp--')) {
+                        source = '[MCP]';
+                    }
+                    else {
+                        source = '[Unknown]';
+                    }
+                    outputLines.push(`  ${toolName} ${source} - ${description}`);
+                }
+                outputLines.push('\n💡 Tools are provided by connected MCP servers and internal tools');
+                const output = outputLines.join('\n');
+                // Log for regular CLI (with chalk formatting)
+                console.log(chalk.bold.green(`\n🔧 Available Tools (${toolEntries.length}):\n`));
+                for (const [toolName, toolInfo] of toolEntries) {
+                    const description = toolInfo.description || 'No description available';
+                    const isMcpTool = Object.keys(mcpTools).includes(toolName);
+                    let source;
+                    if (!isMcpTool && !toolName.startsWith('mcp--')) {
                         source = chalk.magenta('[Internal]');
                     }
                     else if (isMcpTool || toolName.startsWith('mcp--')) {
@@ -47,11 +69,13 @@ export const toolCommands = [
                     console.log(`  ${chalk.yellow(toolName)} ${source} - ${chalk.dim(description)}`);
                 }
                 console.log(chalk.dim('\n💡 Tools are provided by connected MCP servers and internal tools'));
+                return formatForInkCli(output);
             }
             catch (error) {
-                logger.error(`Failed to list tools: ${error instanceof Error ? error.message : String(error)}`);
+                const errorMsg = `Failed to list tools: ${error instanceof Error ? error.message : String(error)}`;
+                logger.error(errorMsg);
+                return formatForInkCli(`❌ ${errorMsg}`);
             }
-            return true;
         },
     },
 ];

package/dist/cli/commands/interactive-commands/utils/command-output.d.ts

@@ -0,0 +1,44 @@
+/**
+ * Command Output Helper
+ * Utilities for consistent command output handling across all slash commands
+ */
+/**
+ * Command output helper for consistent display and error handling
+ */
+export declare class CommandOutputHelper {
+    /**
+     * Display success message consistently
+     * Logs to console with color and returns formatted string for ink-cli
+     */
+    static success(message: string): string;
+    /**
+     * Display info message consistently
+     * Logs to console with color and returns formatted string for ink-cli
+     */
+    static info(message: string): string;
+    /**
+     * Display warning message consistently
+     * Logs to console with color and returns formatted string for ink-cli
+     */
+    static warning(message: string): string;
+    /**
+     * Handle errors consistently across all commands
+     * Logs error and returns formatted error string
+     */
+    static error(error: unknown, context?: string): string;
+    /**
+     * Build multi-line output with consistent formatting
+     * Logs to console and returns formatted string for ink-cli
+     */
+    static output(lines: string[]): string;
+    /**
+     * Validate required argument and return error if missing
+     * Returns null if valid, error string if invalid
+     */
+    static validateRequiredArg(args: string[], index: number, argName: string, usage: string): string | null;
+    /**
+     * No output (command executed successfully with no output to display)
+     */
+    static noOutput(): string;
+}
+//# sourceMappingURL=command-output.d.ts.map

package/dist/cli/commands/interactive-commands/utils/command-output.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"command-output.d.ts","sourceRoot":"","sources":["../../../../../src/cli/commands/interactive-commands/utils/command-output.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAMH;;GAEG;AACH,qBAAa,mBAAmB;IAC5B;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAKvC;;;OAGG;IACH,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAKpC;;;OAGG;IACH,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM;IAKvC;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM;IAStD;;;OAGG;IACH,MAAM,CAAC,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM;IAMtC;;;OAGG;IACH,MAAM,CAAC,mBAAmB,CACtB,IAAI,EAAE,MAAM,EAAE,EACd,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,GACd,MAAM,GAAG,IAAI;IAUhB;;OAEG;IACH,MAAM,CAAC,QAAQ,IAAI,MAAM;CAG5B"}