@lanonasis/cli 3.6.5 → 3.6.7

package/dist/utils/api.js

@@ -1,19 +1,13 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.apiClient = exports.APIClient = void 0;
-const axios_1 = __importDefault(require("axios"));
-const chalk_1 = __importDefault(require("chalk"));
-const crypto_1 = require("crypto");
-const config_js_1 = require("./config.js");
-class APIClient {
+import axios from 'axios';
+import chalk from 'chalk';
+import { randomUUID } from 'crypto';
+import { CLIConfig } from './config.js';
+export class APIClient {
     client;
     config;
     constructor() {
-        this.config = new config_js_1.CLIConfig();
-        this.client = axios_1.default.create({
+        this.config = new CLIConfig();
+        this.client = axios.create({
             proxy: false // Bypass proxy to avoid redirect loops in containerized environments
         });
         // Setup request interceptor to add auth token and headers
@@ -45,44 +39,44 @@ class APIClient {
                 config.headers['X-Auth-Method'] = 'jwt';
             }
             // Add request ID for correlation
-            const requestId = (0, crypto_1.randomUUID)();
+            const requestId = randomUUID();
             config.headers['X-Request-ID'] = requestId;
             // Add project scope for Golden Contract compliance
             config.headers['X-Project-Scope'] = 'lanonasis-maas';
             if (process.env.CLI_VERBOSE === 'true') {
-                console.log(chalk_1.default.dim(`→ ${config.method?.toUpperCase()} ${config.url} [${requestId}]`));
+                console.log(chalk.dim(`→ ${config.method?.toUpperCase()} ${config.url} [${requestId}]`));
             }
             return config;
         });
         // Setup response interceptor for error handling
         this.client.interceptors.response.use((response) => {
             if (process.env.CLI_VERBOSE === 'true') {
-                console.log(chalk_1.default.dim(`← ${response.status} ${response.statusText}`));
+                console.log(chalk.dim(`← ${response.status} ${response.statusText}`));
             }
             return response;
         }, (error) => {
             if (error.response) {
                 const { status, data } = error.response;
                 if (status === 401) {
-                    console.error(chalk_1.default.red('✖ Authentication failed'));
-                    console.log(chalk_1.default.yellow('Please run:'), chalk_1.default.white('memory login'));
+                    console.error(chalk.red('✖ Authentication failed'));
+                    console.log(chalk.yellow('Please run:'), chalk.white('memory login'));
                     process.exit(1);
                 }
                 if (status === 403) {
-                    console.error(chalk_1.default.red('✖ Permission denied'));
+                    console.error(chalk.red('✖ Permission denied'));
                     if (data.message) {
-                        console.error(chalk_1.default.gray(data.message));
+                        console.error(chalk.gray(data.message));
                     }
                     process.exit(1);
                 }
                 if (status === 429) {
-                    console.error(chalk_1.default.red('✖ Rate limit exceeded'));
-                    console.error(chalk_1.default.gray('Please wait a moment before trying again'));
+                    console.error(chalk.red('✖ Rate limit exceeded'));
+                    console.error(chalk.gray('Please wait a moment before trying again'));
                     process.exit(1);
                 }
                 if (process.env.CLI_VERBOSE === 'true') {
-                    console.error(chalk_1.default.dim(`← ${status} ${error.response.statusText}`));
-                    console.error(chalk_1.default.dim(JSON.stringify(data, null, 2)));
+                    console.error(chalk.dim(`← ${status} ${error.response.statusText}`));
+                    console.error(chalk.dim(JSON.stringify(data, null, 2)));
                 }
             }
             return Promise.reject(error);
@@ -189,5 +183,4 @@ class APIClient {
         return response.data;
     }
 }
-exports.APIClient = APIClient;
-exports.apiClient = new APIClient();
+export const apiClient = new APIClient();

package/dist/utils/config.d.ts

@@ -13,7 +13,7 @@ interface CLIConfigData {
     mcpServerPath?: string;
     mcpServerUrl?: string;
     mcpUseRemote?: boolean;
-    mcpPreference?: 'local' | 'remote' | 'auto';
+    mcpPreference?: 'local' | 'remote' | 'websocket' | 'auto';
     discoveredServices?: {
         auth_base: string;
         memory_base: string;
@@ -65,6 +65,7 @@ export declare class CLIConfig {
     private categorizeServiceDiscoveryError;
     private resolveFallbackEndpoints;
     private logFallbackUsage;
+    private pingAuthHealth;
     setManualEndpoints(endpoints: Partial<CLIConfigData['discoveredServices']>): Promise<void>;
     hasManualEndpointOverrides(): boolean;
     clearManualEndpointOverrides(): Promise<void>;

package/dist/utils/config.js

@@ -1,45 +1,9 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CLIConfig = void 0;
-const fs = __importStar(require("fs/promises"));
-const path = __importStar(require("path"));
-const os = __importStar(require("os"));
-const jwt_decode_1 = require("jwt-decode");
-const crypto_1 = require("crypto");
-class CLIConfig {
+import * as fs from 'fs/promises';
+import * as path from 'path';
+import * as os from 'os';
+import { jwtDecode } from 'jwt-decode';
+import { randomUUID } from 'crypto';
+export class CLIConfig {
     configDir;
     configPath;
     config = {};
@@ -119,7 +83,7 @@ class CLIConfig {
             this.config.version = CLIConfig.CONFIG_VERSION;
             this.config.lastUpdated = new Date().toISOString();
             // Create temporary file with unique name
-            const tempPath = `${this.configPath}.tmp.${(0, crypto_1.randomUUID)()}`;
+            const tempPath = `${this.configPath}.tmp.${randomUUID()}`;
             // Write to temporary file first
             await fs.writeFile(tempPath, JSON.stringify(this.config, null, 2), 'utf-8');
             // Atomic rename - this is the critical atomic operation
@@ -201,7 +165,7 @@ class CLIConfig {
     getApiUrl() {
         return process.env.MEMORY_API_URL ||
             this.config.apiUrl ||
-            'https://api.lanonasis.com/api/v1';
+            'https://mcp.lanonasis.com/api/v1';
     }
     // Enhanced Service Discovery Integration
     async discoverServices(verbose = false) {
@@ -228,14 +192,16 @@ class CLIConfig {
             if (authBase.includes('localhost') || authBase.includes('127.0.0.1')) {
                 authBase = 'https://auth.lanonasis.com';
             }
+            const memoryBase = discovered.endpoints?.http || 'https://mcp.lanonasis.com/api/v1';
             this.config.discoveredServices = {
                 auth_base: authBase || 'https://auth.lanonasis.com',
-                memory_base: 'https://api.lanonasis.com/api/v1',
-                mcp_base: discovered.endpoints?.http || 'https://mcp.lanonasis.com/api/v1',
+                memory_base: memoryBase,
+                mcp_base: memoryBase,
                 mcp_ws_base: discovered.endpoints?.websocket || 'wss://mcp.lanonasis.com/ws',
                 mcp_sse_base: discovered.endpoints?.sse || 'https://mcp.lanonasis.com/api/v1/events',
                 project_scope: 'lanonasis-maas'
             };
+            this.config.apiUrl = memoryBase;
             // Mark discovery as successful
             this.config.lastServiceDiscovery = new Date().toISOString();
             await this.save();
@@ -292,6 +258,7 @@ class CLIConfig {
             ...fallback.endpoints,
             project_scope: 'lanonasis-maas'
         };
+        this.config.apiUrl = fallback.endpoints.memory_base;
         // Mark as fallback (don't set lastServiceDiscovery)
         await this.save();
         this.logFallbackUsage(fallback.source, this.config.discoveredServices);
@@ -337,7 +304,7 @@ class CLIConfig {
         const nodeEnv = (process.env.NODE_ENV ?? '').toLowerCase();
         const isDevEnvironment = nodeEnv === 'development' || nodeEnv === 'test';
         const defaultAuthBase = isDevEnvironment ? 'http://localhost:4000' : 'https://auth.lanonasis.com';
-        const defaultMemoryBase = isDevEnvironment ? 'http://localhost:4000/api/v1' : 'https://api.lanonasis.com/api/v1';
+        const defaultMemoryBase = isDevEnvironment ? 'http://localhost:4000/api/v1' : 'https://mcp.lanonasis.com/api/v1';
         const defaultMcpBase = isDevEnvironment ? 'http://localhost:4100/api/v1' : 'https://mcp.lanonasis.com/api/v1';
         const defaultMcpWsBase = isDevEnvironment ? 'ws://localhost:4100/ws' : 'wss://mcp.lanonasis.com/ws';
         const defaultMcpSseBase = isDevEnvironment ? 'http://localhost:4100/api/v1/events' : 'https://mcp.lanonasis.com/api/v1/events';
@@ -368,6 +335,34 @@ class CLIConfig {
             process.emitWarning(message, 'ServiceDiscoveryFallback');
         }
     }
+    async pingAuthHealth(axiosInstance, authBase, headers, options = {}) {
+        const normalizedBase = authBase.replace(/\/$/, '');
+        const endpoints = [
+            `${normalizedBase}/health`,
+            `${normalizedBase}/api/v1/health`
+        ];
+        let lastError;
+        for (const endpoint of endpoints) {
+            try {
+                const requestConfig = {
+                    headers,
+                    timeout: options.timeout ?? 10000
+                };
+                if (options.proxy === false) {
+                    requestConfig.proxy = false;
+                }
+                await axiosInstance.get(endpoint, requestConfig);
+                return;
+            }
+            catch (error) {
+                lastError = error;
+            }
+        }
+        if (lastError instanceof Error) {
+            throw lastError;
+        }
+        throw new Error('Auth health endpoints unreachable');
+    }
     // Manual endpoint override functionality
     async setManualEndpoints(endpoints) {
         if (!this.config.discoveredServices) {
@@ -388,13 +383,15 @@ class CLIConfig {
         return !!this.config.manualEndpointOverrides;
     }
     async clearManualEndpointOverrides() {
-        this.config.manualEndpointOverrides = undefined;
-        this.config.lastManualEndpointUpdate = undefined;
+        delete this.config.manualEndpointOverrides;
+        delete this.config.lastManualEndpointUpdate;
         // Rediscover services
         await this.discoverServices();
     }
     getDiscoveredApiUrl() {
-        return this.config.discoveredServices?.auth_base || this.getApiUrl();
+        return process.env.AUTH_BASE ||
+            this.config.discoveredServices?.auth_base ||
+            'https://auth.lanonasis.com';
     }
     // Enhanced authentication support
     async setVendorKey(vendorKey) {
@@ -426,16 +423,11 @@ class CLIConfig {
             // Ensure service discovery is done
             await this.discoverServices();
             const authBase = this.config.discoveredServices?.auth_base || 'https://auth.lanonasis.com';
-            // Test vendor key with health endpoint
-            await axios.get(`${authBase}/health`, {
-                headers: {
-                    'X-API-Key': vendorKey,
-                    'X-Auth-Method': 'vendor_key',
-                    'X-Project-Scope': 'lanonasis-maas'
-                },
-                timeout: 10000,
-                proxy: false // Bypass proxy to avoid redirect loops
-            });
+            await this.pingAuthHealth(axios, authBase, {
+                'X-API-Key': vendorKey,
+                'X-Auth-Method': 'vendor_key',
+                'X-Project-Scope': 'lanonasis-maas'
+            }, { timeout: 10000, proxy: false });
         }
         catch (error) {
             // Provide specific error messages based on response
@@ -497,7 +489,7 @@ class CLIConfig {
         await this.resetFailureCount(); // Reset failure count on successful auth
         // Decode token to get user info and expiry
         try {
-            const decoded = (0, jwt_decode_1.jwtDecode)(token);
+            const decoded = jwtDecode(token);
             // Store token expiry
             if (typeof decoded.exp === 'number') {
                 this.config.tokenExpiry = decoded.exp;
@@ -554,7 +546,7 @@ class CLIConfig {
         else {
             // Handle JWT tokens
             try {
-                const decoded = (0, jwt_decode_1.jwtDecode)(token);
+                const decoded = jwtDecode(token);
                 const now = Date.now() / 1000;
                 locallyValid = typeof decoded.exp === 'number' && decoded.exp > now;
             }
@@ -568,8 +560,7 @@ class CLIConfig {
                 const axios = (await import('axios')).default;
                 const endpoints = [
                     'http://localhost:4000/v1/auth/verify-token',
-                    'https://auth.lanonasis.com/v1/auth/verify-token',
-                    'https://api.lanonasis.com/auth/verify'
+                    'https://auth.lanonasis.com/v1/auth/verify-token'
                 ];
                 for (const endpoint of endpoints) {
                     try {
@@ -607,8 +598,7 @@ class CLIConfig {
             // Try auth-gateway first (port 4000), then fall back to Netlify function
             const endpoints = [
                 'http://localhost:4000/v1/auth/verify-token',
-                'https://auth.lanonasis.com/v1/auth/verify-token',
-                'https://api.lanonasis.com/auth/verify'
+                'https://auth.lanonasis.com/v1/auth/verify-token'
             ];
             let response = null;
             for (const endpoint of endpoints) {
@@ -681,7 +671,7 @@ class CLIConfig {
             const axios = (await import('axios')).default;
             // Ensure service discovery is done
             await this.discoverServices();
-            const authBase = this.config.discoveredServices?.auth_base || 'https://api.lanonasis.com';
+            const authBase = this.config.discoveredServices?.auth_base || 'https://auth.lanonasis.com';
             const headers = {
                 'X-Project-Scope': 'lanonasis-maas'
             };
@@ -693,11 +683,7 @@ class CLIConfig {
                 headers['Authorization'] = `Bearer ${token}`;
                 headers['X-Auth-Method'] = 'jwt';
             }
-            // Validate against server with health endpoint
-            await axios.get(`${authBase}/api/v1/health`, {
-                headers,
-                timeout: 10000
-            });
+            await this.pingAuthHealth(axios, authBase, headers);
             // Update last validated timestamp
             this.config.lastValidated = new Date().toISOString();
             await this.resetFailureCount();
@@ -721,7 +707,7 @@ class CLIConfig {
                 // CLI tokens don't need refresh, they're long-lived
                 return;
             }
-            const decoded = (0, jwt_decode_1.jwtDecode)(token);
+            const decoded = jwtDecode(token);
             const now = Date.now() / 1000;
             const exp = typeof decoded.exp === 'number' ? decoded.exp : 0;
             // Refresh if token expires within 5 minutes
@@ -729,7 +715,7 @@ class CLIConfig {
                 // Import axios dynamically
                 const axios = (await import('axios')).default;
                 await this.discoverServices();
-                const authBase = this.config.discoveredServices?.auth_base || 'https://api.lanonasis.com';
+                const authBase = this.config.discoveredServices?.auth_base || 'https://auth.lanonasis.com';
                 // Attempt token refresh
                 const response = await axios.post(`${authBase}/v1/auth/refresh`, {}, {
                     headers: {
@@ -795,7 +781,7 @@ class CLIConfig {
     async getDeviceId() {
         if (!this.config.deviceId) {
             // Generate a new device ID
-            this.config.deviceId = (0, crypto_1.randomUUID)();
+            this.config.deviceId = randomUUID();
             await this.save();
         }
         return this.config.deviceId;
@@ -833,15 +819,16 @@ class CLIConfig {
     shouldUseRemoteMCP() {
         const preference = this.config.mcpPreference || 'auto';
         switch (preference) {
+            case 'websocket':
             case 'remote':
                 return true;
             case 'local':
                 return false;
             case 'auto':
             default:
-                // Use remote if authenticated, otherwise local
-                return !!this.config.token;
+                // Default to remote/websocket (production mode)
+                // Local mode should only be used when explicitly configured
+                return true;
         }
     }
 }
-exports.CLIConfig = CLIConfig;

package/dist/utils/formatting.js

@@ -1,12 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatOutput = formatOutput;
-exports.formatBytes = formatBytes;
-exports.truncateText = truncateText;
-exports.formatDuration = formatDuration;
-exports.formatDate = formatDate;
-exports.formatTableData = formatTableData;
-function formatOutput(data, format = 'table') {
+export function formatOutput(data, format = 'table') {
     switch (format) {
         case 'json':
             console.log(JSON.stringify(data, null, 2));
@@ -20,7 +12,7 @@ function formatOutput(data, format = 'table') {
             break;
     }
 }
-function formatBytes(bytes) {
+export function formatBytes(bytes) {
     if (bytes === 0)
         return '0 Bytes';
     const k = 1024;
@@ -28,23 +20,23 @@ function formatBytes(bytes) {
     const i = Math.floor(Math.log(bytes) / Math.log(k));
     return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
 }
-function truncateText(text, maxLength) {
+export function truncateText(text, maxLength) {
     if (text.length <= maxLength)
         return text;
     return text.substring(0, maxLength - 3) + '...';
 }
-function formatDuration(ms) {
+export function formatDuration(ms) {
     if (ms < 1000)
         return `${ms}ms`;
     if (ms < 60000)
         return `${(ms / 1000).toFixed(1)}s`;
     return `${(ms / 60000).toFixed(1)}m`;
 }
-function formatDate(date) {
+export function formatDate(date) {
     const d = new Date(date);
     return d.toLocaleString();
 }
-function formatTableData(data) {
+export function formatTableData(data) {
     return data.map(item => {
         if (Array.isArray(item))
             return item.map(String);