@lanonasis/cli 1.4.2 → 1.5.0

package/dist/commands/mcp.js

@@ -19,9 +19,10 @@ export function mcpCommands(program) {
         const config = new CLIConfig();
         const isAuthenticated = !!config.get('token');
         if (isAuthenticated) {
-            console.log(chalk.green('✓ Authenticated - Using remote MCP mode'));
-            console.log('  Your memory operations will use api.lanonasis.com');
-            console.log('  with real-time SSE updates enabled');
+            console.log(chalk.green('✓ Authenticated - Using enterprise MCP modes'));
+            console.log('  SSE Mode: api.lanonasis.com (regular users)');
+            console.log('  WebSocket Mode: mcp.lanonasis.com (enterprise users)');
+            console.log('  with real-time updates enabled');
         }
         else {
             console.log(chalk.yellow('⚠️  Not authenticated - Using local MCP mode'));
@@ -30,7 +31,8 @@ export function mcpCommands(program) {
         console.log('');
         console.log(chalk.cyan('Available MCP Commands:'));
         console.log('  lanonasis mcp connect       # Auto-connect to best mode');
-        console.log('  lanonasis mcp connect -r    # Force remote mode');
+        console.log('  lanonasis mcp connect -r    # Force remote SSE mode');
+        console.log('  lanonasis mcp connect -w    # Force WebSocket mode (enterprise)');
         console.log('  lanonasis mcp connect -l    # Force local mode');
         console.log('  lanonasis mcp status        # Check connection status');
         console.log('  lanonasis mcp tools         # List available tools');
@@ -48,74 +50,79 @@ export function mcpCommands(program) {
                 spinner.fail('Failed to auto-connect to MCP');
             }
         }
-        catch {
+        catch (_error) {
             spinner.fail('MCP auto-connect failed');
         }
     });
     // Connect command
     mcp.command('connect')
-        .description('Connect to MCP server (local, remote, or WebSocket)')
+        .description('Connect to MCP server (local, remote SSE, or WebSocket)')
         .option('-l, --local', 'Connect to local MCP server')
-        .option('-r, --remote', 'Connect to remote MCP server (api.lanonasis.com)')
-        .option('-w, --websocket', 'Connect using WebSocket mode for enterprise users')
+        .option('-r, --remote', 'Connect to remote SSE server (api.lanonasis.com)')
+        .option('-w, --websocket', 'Connect to WebSocket server (mcp.lanonasis.com) - Enterprise')
         .option('-s, --server <path>', 'Local MCP server path')
-        .option('-u, --url <url>', 'Remote/WebSocket server URL')
+        .option('-u, --url <url>', 'Remote MCP server URL')
         .action(async (options) => {
         const spinner = ora('Connecting to MCP server...').start();
         const config = new CLIConfig();
         try {
-            let connectionMode;
-            // Determine connection mode - WebSocket takes precedence over remote and local
+            // Determine connection mode
+            let connectionMode = 'local';
             if (options.websocket) {
                 connectionMode = 'websocket';
             }
             else if (options.remote) {
                 connectionMode = 'remote';
             }
-            else if (options.local) {
-                connectionMode = 'local';
-            }
-            else {
-                // Default to remote if authenticated, otherwise local
-                connectionMode = !!config.get('token') ? 'remote' : 'local';
+            else if (!options.local && !options.remote && !options.websocket) {
+                // Auto-detect: WebSocket for enterprise, SSE for regular, local if not authenticated
+                const token = config.get('token');
+                if (token) {
+                    // Check if enterprise user (simplified check)
+                    connectionMode = 'remote'; // Default to SSE for now
+                }
             }
-            // Save preferences
+            // Save preference
             config.set('mcpConnectionMode', connectionMode);
             if (options.server) {
                 config.set('mcpServerPath', options.server);
             }
             if (options.url) {
-                if (connectionMode === 'websocket') {
-                    config.set('mcpWebSocketUrl', options.url);
-                }
-                else {
-                    config.set('mcpServerUrl', options.url);
-                }
+                config.set('mcpServerUrl', options.url);
             }
             const client = getMCPClient();
             const connected = await client.connect({
-                connectionMode,
+                mode: connectionMode,
                 serverPath: options.server,
                 serverUrl: options.url
             });
             if (connected) {
-                spinner.succeed(chalk.green(`Connected to MCP server in ${connectionMode} mode`));
+                const modeLabels = {
+                    local: 'local',
+                    remote: 'remote SSE',
+                    websocket: 'WebSocket (Enterprise)'
+                };
+                spinner.succeed(chalk.green(`Connected to ${modeLabels[connectionMode]} MCP server`));
                 if (connectionMode === 'remote') {
                     console.log(chalk.cyan('ℹ️  Using remote MCP via api.lanonasis.com'));
                     console.log(chalk.cyan('📡 SSE endpoint active for real-time updates'));
                 }
                 else if (connectionMode === 'websocket') {
-                    console.log(chalk.cyan('ℹ️  Using enterprise WebSocket MCP server'));
-                    console.log(chalk.cyan('📡 WebSocket connection active with auto-reconnect'));
+                    console.log(chalk.cyan('🚀 Using enterprise WebSocket MCP via mcp.lanonasis.com'));
+                    console.log(chalk.cyan('⚡ Real-time WebSocket connection active'));
+                    console.log(chalk.cyan('🏢 Enterprise features enabled'));
                 }
             }
             else {
                 spinner.fail('Failed to connect to MCP server');
+                if (connectionMode === 'websocket') {
+                    console.log(chalk.yellow('💡 WebSocket mode requires enterprise access'));
+                    console.log(chalk.yellow('   Try: lanonasis mcp connect -r (for SSE mode)'));
+                }
             }
         }
         catch (error) {
             spinner.fail(`Connection failed: ${error instanceof Error ? error.message : 'Unknown error'}`);
-            process.exit(1);
         }
     });
     // Disconnect command
@@ -215,7 +222,7 @@ export function mcpCommands(program) {
                 try {
                     args = JSON.parse(options.args);
                 }
-                catch {
+                catch (error) {
                     spinner.fail('Invalid JSON arguments');
                     process.exit(1);
                 }

package/dist/commands/memory.js

@@ -6,6 +6,8 @@ import wrap from 'word-wrap';
 import { format } from 'date-fns';
 import { apiClient } from '../utils/api.js';
 import { formatBytes, truncateText } from '../utils/formatting.js';
+import { output } from '../utils/output.js';
+// Using GetMemoriesParams from api.ts
 export function memoryCommands(program) {
     // Create memory
     program
@@ -21,7 +23,11 @@ export function memoryCommands(program) {
         .action(async (options) => {
         try {
             let { title, content, type, tags, topicId, interactive } = options;
-            if (interactive || (!title || !content)) {
+            // Validate required fields in silent mode
+            if (output.isSilent() && (!title || !content)) {
+                throw new Error('Title and content are required when using --output json or --silent');
+            }
+            if ((interactive || (!title || !content)) && !output.isSilent()) {
                 const answers = await inquirer.prompt([
                     {
                         type: 'input',
@@ -56,7 +62,7 @@ export function memoryCommands(program) {
                 type = answers.type;
                 tags = answers.tags;
             }
-            const spinner = ora('Creating memory...').start();
+            const spinner = output.isSilent() ? null : ora('Creating memory...').start();
             const memoryData = {
                 title,
                 content,
@@ -69,19 +75,25 @@ export function memoryCommands(program) {
                 memoryData.topic_id = topicId;
             }
             const memory = await apiClient.createMemory(memoryData);
-            spinner.succeed('Memory created successfully');
-            console.log();
-            console.log(chalk.green('✓ Memory created:'));
-            console.log(`  ID: ${chalk.cyan(memory.id)}`);
-            console.log(`  Title: ${memory.title}`);
-            console.log(`  Type: ${memory.memory_type}`);
-            if (memory.tags && memory.tags.length > 0) {
-                console.log(`  Tags: ${memory.tags.join(', ')}`);
+            if (spinner)
+                spinner.succeed('Memory created successfully');
+            if (output.isJsonOutput()) {
+                output.json(memory);
+            }
+            else {
+                console.log();
+                console.log(chalk.green('✓ Memory created:'));
+                console.log(`  ID: ${chalk.cyan(memory.id)}`);
+                console.log(`  Title: ${memory.title}`);
+                console.log(`  Type: ${memory.memory_type}`);
+                if (memory.tags && memory.tags.length > 0) {
+                    console.log(`  Tags: ${memory.tags.join(', ')}`);
+                }
             }
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : 'Unknown error';
-            console.error(chalk.red('✖ Failed to create memory:'), errorMessage);
+            output.error(chalk.red('✖ Failed to create memory:'), errorMessage);
             process.exit(1);
         }
     });
@@ -99,36 +111,41 @@ export function memoryCommands(program) {
         .option('--order <order>', 'sort order (asc, desc)', 'desc')
         .action(async (options) => {
         try {
-            const spinner = ora('Fetching memories...').start();
+            const spinner = output.isSilent() ? null : ora('Fetching memories...').start();
             const params = {
-                page: parseInt(options.page || '1'),
+                offset: (parseInt(options.page || '1') - 1) * parseInt(options.limit || '20'),
                 limit: parseInt(options.limit || '20'),
-                sort: options.sort || 'created_at',
-                order: options.order || 'desc'
+                sort_by: (options.sort || 'created_at'),
+                sort_order: (options.order || 'desc')
             };
             if (options.type)
                 params.memory_type = options.type;
             if (options.tags)
-                params.tags = options.tags;
-            if (options.userId)
-                params.user_id = options.userId;
+                params.tags = options.tags.split(',').map(t => t.trim());
+            // Note: user_id filtering removed as it's handled by authentication
             const result = await apiClient.getMemories(params);
-            spinner.stop();
-            const memories = result.memories || result.data || [];
-            if (memories.length === 0) {
-                console.log(chalk.yellow('No memories found'));
+            if (spinner)
+                spinner.stop();
+            if (result.data.length === 0) {
+                if (output.isJsonOutput()) {
+                    output.json({ data: [], pagination: result.pagination });
+                }
+                else {
+                    console.log(chalk.yellow('No memories found'));
+                }
                 return;
             }
-            console.log(chalk.blue.bold(`\n📚 Memories (${result.pagination.total} total)`));
-            console.log(chalk.gray(`Page ${result.pagination.page || 1} of ${result.pagination.pages || Math.ceil(result.pagination.total / result.pagination.limit)}`));
-            console.log();
-            const outputFormat = process.env.CLI_OUTPUT_FORMAT || 'table';
-            if (outputFormat === 'json') {
-                console.log(JSON.stringify(result, null, 2));
+            if (output.isJsonOutput()) {
+                output.json(result);
             }
             else {
+                console.log(chalk.blue.bold(`\n📚 Memories (${result.pagination.total} total)`));
+                const currentPage = Math.floor(result.pagination.offset / result.pagination.limit) + 1;
+                const totalPages = Math.ceil(result.pagination.total / result.pagination.limit);
+                console.log(chalk.gray(`Page ${currentPage} of ${totalPages}`));
+                console.log();
                 // Table format
-                const tableData = memories.map((memory) => [
+                const tableData = result.data.map((memory) => [
                     truncateText(memory.title, 30),
                     memory.memory_type,
                     memory.tags.slice(0, 3).join(', '),
@@ -136,7 +153,6 @@ export function memoryCommands(program) {
                     memory.access_count
                 ]);
                 const tableConfig = {
-                    header: ['Title', 'Type', 'Tags', 'Created', 'Access'],
                     columnDefault: {
                         width: 20,
                         wrapWord: true
@@ -149,13 +165,12 @@ export function memoryCommands(program) {
                         { width: 8 }
                     ]
                 };
-                console.log(table([tableConfig.header, ...tableData], {
-                    columnDefault: tableConfig.columnDefault,
-                    columns: tableConfig.columns
-                }));
+                const tableHeaders = ['Title', 'Type', 'Tags', 'Created', 'Access'];
+                console.log(table([tableHeaders, ...tableData], tableConfig));
                 // Pagination info
-                if (result.pagination.pages > 1) {
-                    console.log(chalk.gray(`\nUse --page ${result.pagination.page + 1} for next page`));
+                if (result.pagination.has_more) {
+                    const nextPage = currentPage + 1;
+                    console.log(chalk.gray(`\nUse --page ${nextPage} for next page`));
                 }
             }
         }
@@ -176,7 +191,7 @@ export function memoryCommands(program) {
         .option('--tags <tags>', 'filter by tags (comma-separated)')
         .action(async (query, options) => {
         try {
-            const spinner = ora(`Searching for "${query}"...`).start();
+            const spinner = output.isSilent() ? null : ora(`Searching for "${query}"...`).start();
             const searchOptions = {
                 limit: parseInt(options.limit || '20'),
                 threshold: parseFloat(options.threshold || '0.7')
@@ -188,25 +203,35 @@ export function memoryCommands(program) {
                 searchOptions.tags = options.tags.split(',').map((t) => t.trim());
             }
             const result = await apiClient.searchMemories(query, searchOptions);
-            spinner.stop();
-            const results = result.results || result.data || [];
-            if (results.length === 0) {
-                console.log(chalk.yellow('No memories found matching your search'));
+            if (spinner)
+                spinner.stop();
+            if (result.data.length === 0) {
+                if (output.isJsonOutput()) {
+                    output.json({ data: [], pagination: result.pagination, query });
+                }
+                else {
+                    console.log(chalk.yellow('No memories found matching your search'));
+                }
                 return;
             }
-            console.log(chalk.blue.bold(`\n🔍 Search Results (${result.total_results || results.length} found)`));
-            console.log(chalk.gray(`Query: "${query}" | Search time: ${result.search_time_ms || 0}ms`));
-            console.log();
-            results.forEach((memory, index) => {
-                const score = (memory.relevance_score * 100).toFixed(1);
-                console.log(chalk.green(`${index + 1}. ${memory.title}`) + chalk.gray(` (${score}% match)`));
-                console.log(chalk.white(`   ${truncateText(memory.content, 100)}`));
-                console.log(chalk.cyan(`   ID: ${memory.id}`) + chalk.gray(` | Type: ${memory.memory_type}`));
-                if (memory.tags.length > 0) {
-                    console.log(chalk.yellow(`   Tags: ${memory.tags.join(', ')}`));
-                }
+            if (output.isJsonOutput()) {
+                output.json({ ...result, query });
+            }
+            else {
+                console.log(chalk.blue.bold(`\n🔍 Search Results (${result.pagination.total} found)`));
+                console.log(chalk.gray(`Query: "${query}"`));
                 console.log();
-            });
+                result.data.forEach((memory, index) => {
+                    const score = (memory.relevance_score * 100).toFixed(1);
+                    console.log(chalk.green(`${index + 1}. ${memory.title}`) + chalk.gray(` (${score}% match)`));
+                    console.log(chalk.white(`   ${truncateText(memory.content, 100)}`));
+                    console.log(chalk.cyan(`   ID: ${memory.id}`) + chalk.gray(` | Type: ${memory.memory_type}`));
+                    if (memory.tags.length > 0) {
+                        console.log(chalk.yellow(`   Tags: ${memory.tags.join(', ')}`));
+                    }
+                    console.log();
+                });
+            }
         }
         catch (error) {
             const errorMessage = error instanceof Error ? error.message : 'Unknown error';