@nestbox-ai/cli 1.0.13 → 1.0.16

package/src/commands/auth.ts

@@ -127,6 +127,7 @@ export function registerAuthCommands(program: Command): void {
                 domain,
                 email,
                 token: authResponse.token,
+                accessToken, // Save the original accessToken
                 apiServerUrl,
                 name,
                 picture,

package/src/commands/compute.ts

@@ -129,14 +129,20 @@ export function registerComputeProgram(program: Command): void {
                     
                 } catch (error: any) {
                     spinner.fail('Failed to retrieve compute instances');
-                    if (error.response) {
+                    if (error.response && error.response.status === 401) {
+                        console.error(chalk.red('Authentication token has expired. Please login again using "nestbox login <domain>".'));
+                    } else if (error.response) {
                         console.error(chalk.red('API Error:'), error.response.data?.message || 'Unknown error');
                     } else {
                         console.error(chalk.red('Error:'), error.message || 'Unknown error');
                     }
                 }
             } catch (error: any) {
-                console.error(chalk.red('Error:'), error.message || 'Unknown error');
+                if (error.response && error.response.status === 401) {
+                    console.error(chalk.red('Authentication token has expired. Please login again using "nestbox login <domain>".'));
+                } else {
+                    console.error(chalk.red('Error:'), error.message || 'Unknown error');
+                }
             }
         });
 
@@ -293,7 +299,9 @@ export function registerComputeProgram(program: Command): void {
                 console.log(chalk.green("Instance created successfully!"));
               } catch (createError: any) {
                 creationSpinner.fail('Failed to create compute instance');
-                if (createError.response) {
+                if (createError.response && createError.response.status === 401) {
+                  console.error(chalk.red('Authentication token has expired. Please login again using "nestbox login <domain>".'));
+                } else if (createError.response) {
                   console.error(chalk.red('API Error:'), createError.response.data?.message || 'Unknown error');
                 } else {
                   console.error(chalk.red('Error:'), createError.message || 'Unknown error');
@@ -302,14 +310,20 @@ export function registerComputeProgram(program: Command): void {
               
             } catch (error: any) {
               spinner.fail('Failed to fetch available images');
-              if (error.response) {
+              if (error.response && error.response.status === 401) {
+                console.error(chalk.red('Authentication token has expired. Please login again using "nestbox login <domain>".'));
+              } else if (error.response) {
                 console.error(chalk.red('API Error:'), error.response.data?.message || 'Unknown error');
               } else {
                 console.error(chalk.red('Error:'), error.message || 'Unknown error');
               }
             }
           } catch (error: any) {
-            console.error(chalk.red('Error:'), error.message || 'Unknown error');
+            if (error.response && error.response.status === 401) {
+              console.error(chalk.red('Authentication token has expired. Please login again using "nestbox login <domain>".'));
+            } else {
+              console.error(chalk.red('Error:'), error.message || 'Unknown error');
+            }
           }
         });
 
@@ -417,7 +431,9 @@ export function registerComputeProgram(program: Command): void {
                 
               } catch (error: any) {
                 deleteSpinner.fail(`Failed to delete instances`);
-                if (error.response) {
+                if (error.response && error.response.status === 401) {
+                  console.error(chalk.red('Authentication token has expired. Please login again using "nestbox login <domain>".'));
+                } else if (error.response) {
                   console.error(chalk.red('API Error:'), error.response.data?.message || 'Unknown error');
                 } else {
                   console.error(chalk.red('Error:'), error.message || 'Unknown error');
@@ -426,14 +442,20 @@ export function registerComputeProgram(program: Command): void {
               
             } catch (error: any) {
               spinner.fail('Failed to retrieve compute instances');
-              if (error.response) {
+              if (error.response && error.response.status === 401) {
+                console.error(chalk.red('Authentication token has expired. Please login again using "nestbox login <domain>".'));
+              } else if (error.response) {
                 console.error(chalk.red('API Error:'), error.response.data?.message || 'Unknown error');
               } else {
                 console.error(chalk.red('Error:'), error.message || 'Unknown error');
               }
             }
           } catch (error: any) {
-            console.error(chalk.red('Error:'), error.message || 'Unknown error');
+            if (error.response && error.response.status === 401) {
+              console.error(chalk.red('Authentication token has expired. Please login again using "nestbox login <domain>".'));
+            } else {
+              console.error(chalk.red('Error:'), error.message || 'Unknown error');
+            }
           }
         });
 }

package/src/commands/document.ts

@@ -5,6 +5,7 @@ import { getAuthToken } from '../utils/auth';
 import { Configuration, DocumentsApi, ProjectsApi } from '@nestbox-ai/admin';
 import { readNestboxConfig } from './projects';
 import { resolveProject } from '../utils/project';
+import { handle401Error } from '../utils/error';
 
 
 /**
@@ -23,13 +24,12 @@ async function executeCommand<T>(
     return result;
   } catch (error: any) {
     spinner.fail('Operation failed');
-
+    handle401Error(error);
     if (error.response?.data?.message) {
       console.error(chalk.red('API Error:'), error.response.data.message);
     } else {
       console.error(chalk.red('Error:'), error.message || 'Unknown error');
     }
-    
     throw error;
   }
 }

package/src/commands/image.ts

@@ -5,151 +5,143 @@ import Table from 'cli-table3';
 import { getAuthToken } from '../utils/auth';
 import { Configuration, MiscellaneousApi, ProjectsApi } from '@nestbox-ai/admin';
 import { resolveProject } from '../utils/project';
+import { withTokenRefresh } from '../utils/error';
 
-/**
- * Executes an async command with proper error handling and spinner feedback
- */
-async function executeCommand<T>(
-  description: string, 
-  command: () => Promise<T>, 
-  successMessage: string
-): Promise<T> {
-  const spinner = ora(description).start();
-  
-  try {
-    const result = await command();
-    spinner.succeed(successMessage);
-    return result;
-  } catch (error: any) {
-    spinner.fail('Operation failed');
-
-    if (error.response?.data?.message) {
-      console.error(chalk.red('API Error:'), error.response.data.message);
-    } else {
-      console.error(chalk.red('Error:'), error.message || 'Unknown error');
+export function registerImageCommands(program: Command): void {
+  // Function to create/recreate API instances
+  const createApis = () => {
+    const authToken = getAuthToken();
+    if (!authToken) {
+      throw new Error('No authentication token found. Please log in first.');
     }
     
-    throw error;
-  }
-}
-
-export function registerImageCommands(program: Command): void {
-  const authToken = getAuthToken();
-
-  if (!authToken) {
-    console.error(chalk.red('No authentication token found. Please login first.'));
-    return;
-  }
-
-  const configuration = new Configuration({
-    basePath: authToken.serverUrl,
-    baseOptions: {
-      headers: {
-        Authorization: authToken.token,
+    const configuration = new Configuration({
+      basePath: authToken.serverUrl,
+      baseOptions: {
+        headers: {
+          Authorization: authToken.token,
+        },
       },
-    },
-  });
+    });
 
-  const miscellaneousApi = new MiscellaneousApi(configuration);
-  const projectsApi = new ProjectsApi(configuration);
+    return {
+      miscellaneousApi: new MiscellaneousApi(configuration),
+      projectsApi: new ProjectsApi(configuration)
+    };
+  };
 
   const imageCommand = program.command('image').description('Manage Nestbox images');
 
   // LIST command
-  const listCmd = imageCommand
+  imageCommand
     .command('list')
     .description('List images for a project')
-    .option('--project <projectId>', 'Project ID or name (defaults to the current project)');
-  
-  listCmd.action(async (options) => {
-    try {
-      const project = await resolveProject(projectsApi, options);
+    .option('--project <projectId>', 'Project ID or name (defaults to the current project)')
+    .action(async (options) => {
+      const spinner = ora('Processing...').start();
       
-      const images: any = await executeCommand(
-        `Listing images for project ${project.name}...`,
-        async () => {
-          const response = await miscellaneousApi.miscellaneousControllerGetMachineInstanceByImageId(project.id);
-          return response.data;
-        },
-        'Successfully retrieved images'
-      );
+      try {
+        let apis = createApis();
+        
+        // Execute all operations with token refresh support
+        const result = await withTokenRefresh(
+          async () => {
+            // Resolve project without showing its own spinner
+            spinner.text = 'Resolving project...';
+            const project = await resolveProject(apis.projectsApi, { 
+              ...options, 
+              showSpinner: false  // Disable resolveProject's spinner
+            });
+            
+            // Fetch images
+            spinner.text = `Listing images for project ${project.name}...`;
+            const response = await apis.miscellaneousApi.miscellaneousControllerGetData();
+            
+            return { project, images: response.data };
+          },
+          () => {
+            // Recreate APIs after token refresh
+            apis = createApis();
+          }
+        );
 
-      if (!images || images.length === 0) {
-        console.log(chalk.yellow('No images found for this project.'));
-        return;
-      }
+        spinner.succeed('Successfully retrieved images');
 
-      // Create a table for displaying the image data
-      const table = new Table({
-        head: [
-          chalk.white.bold('ID'), 
-          chalk.white.bold('Name'), 
-          chalk.white.bold('Machine Type'),
-          chalk.white.bold('Status'), 
-          chalk.white.bold('Region'),
-          chalk.white.bold('API Key'),
-          chalk.white.bold('Internal IP')
-        ],
-        style: {
-          head: [], // Disable the default styling
-          border: []
-        }
-      });
-      
-      // Status mappings
-      const statusMappings: Record<string, string> = {
-        'Job Scheduled': 'Scheduled',
-        'Job Executed': 'Ready',
-        'Job in Progress': 'Initializing',
-        'Job Failed': 'Failed',
-        'Deleting': 'Deleting',
-      };
-      
-      // Add rows to the table
-      images.forEach((image: any) => {
-        // Map the status if a mapping exists
-        const originalStatus = image.runningStatus || 'unknown';
-        const displayStatus = statusMappings[originalStatus] || originalStatus;
-        
-        // Color the status based on its mapped value
-        let statusColor;
-        
-        switch(displayStatus.toLowerCase()) {
-          case 'ready':
-            statusColor = chalk.green(displayStatus);
-            break;
-          case 'failed':
-            statusColor = chalk.red(displayStatus);
-            break;
-          case 'initializing':
-            statusColor = chalk.yellow(displayStatus);
-            break;
-          case 'scheduled':
-            statusColor = chalk.blue(displayStatus);
-            break;
-          case 'deleting':
-            statusColor = chalk.red(displayStatus);
-            break;
-          default:
-            statusColor = chalk.gray(displayStatus);
+        const project: any = result.project;
+        const images: any = result.images;
+
+        if (!images || images.length === 0) {
+          console.log(chalk.yellow(`No images found for project ${project.name}.`));
+          return;
         }
-        
-        table.push([
-          image.id || 'N/A',
-          image.instanceName || 'N/A',
-          image.machineTitle || 'N/A',
-          statusColor,
-          image.region || 'N/A',
-          image.instanceApiKey || 'N/A',
-          image.internalIP || 'N/A'
-        ]);
-      });
-      
-      // Display the table
-      console.log(table.toString());
 
-    } catch (error) {
-      // Error already handled by executeCommand
+        // Create and display the table
+        displayImagesTable(images);
+
+      } catch (error: any) {
+        spinner.fail('Operation failed');
+        handleError(error);
+      }
+    });
+
+  // Additional commands can be added here following the same pattern
+}
+
+// Helper function to display images in a table
+function displayImagesTable(images: any[]): void {
+  const table = new Table({
+    head: [
+      chalk.white.bold('Name'), 
+      chalk.white.bold('Type'),
+      chalk.white.bold('License'), 
+      chalk.white.bold('Category'),
+      chalk.white.bold('Pricing'),
+      chalk.white.bold('Source')
+    ],
+    style: {
+      head: [],
+      border: []
     }
   });
+  
+  // Status mappings (kept from original code for potential future use)
+  const statusMappings: Record<string, string> = {
+    'Job Scheduled': 'Scheduled',
+    'Job Executed': 'Ready',
+    'Job in Progress': 'Initializing',
+    'Job Failed': 'Failed',
+    'Deleting': 'Deleting',
+  };
+  
+  // Add rows to the table
+  images.forEach((image: any) => {
+    table.push([
+      image.name || 'N/A',
+      image.type || 'N/A',
+      image.metadata?.License || 'N/A',
+      image.metadata?.Type || 'N/A',
+      image.metadata?.Pricing || 'N/A',
+      image.source || 'N/A'
+    ]);
+  });
+  
+  console.log(table.toString());
+}
+
+// Helper function to handle errors
+function handleError(error: any): void {
+  if (error.message) {
+    if (error.message.includes('Authentication')) {
+      console.error(chalk.red(error.message));
+    } else if (error.message.includes('No project')) {
+      // Project-related errors are already well-formatted
+      console.error(chalk.red(error.message));
+    } else {
+      console.error(chalk.red('Error:'), error.message);
+    }
+  } else if (error.response?.data?.message) {
+    console.error(chalk.red('API Error:'), error.response.data.message);
+  } else {
+    console.error(chalk.red('Error:'), 'Unknown error occurred');
+  }
 }

package/src/commands/projects.ts

@@ -1,5 +1,6 @@
 import { Command } from 'commander';
 import chalk from 'chalk';
+import { withTokenRefresh } from '../utils/error';
 import fs from 'fs';
 import path from 'path';
 import { getAuthToken } from '../utils/auth';
@@ -39,18 +40,24 @@ export function writeNestboxConfig(config: NestboxConfig): void {
 }
 
 export function registerProjectCommands(program: Command): void {
-
-    const authToken = getAuthToken();
-    const configuration = new Configuration({
-        basePath: authToken?.serverUrl,
-        baseOptions:{
-            headers: {
-                "Authorization": authToken?.token,
-            }
+    // Function to create/recreate the ProjectsApi instance
+    const createProjectsApi = () => {
+        const authToken = getAuthToken();
+        if (!authToken) {
+            throw new Error('No authentication token found. Please log in first.');
         }
-    });
-
-    const projectsApi = new ProjectsApi(configuration);
+        
+        const configuration = new Configuration({
+            basePath: authToken.serverUrl,
+            baseOptions: {
+                headers: {
+                    "Authorization": authToken.token,
+                }
+            }
+        });
+        
+        return new ProjectsApi(configuration);
+    };
 
     // Create the main project command
     const projectCommand = program
@@ -61,35 +68,43 @@ export function registerProjectCommands(program: Command): void {
     projectCommand
         .command('use <project-name>')
         .description('Set default project for all commands')
-        .action((projectName: string) => {
+        .action(async (projectName: string) => {
             try {
-                if (!authToken) {
-                    console.error(chalk.red('No authentication token found. Please log in first.'));
-                    return;
-                }
                 const config = readNestboxConfig();
-
-                // Set the default project
                 config.projects = config.projects || {};
                 config.projects.default = projectName;
 
-                projectsApi.projectControllerGetAllProjects()
-                .then((response) => {
-                    // Check if the project exists
-                    const projectExists = response.data.data.projects.some((project: any) => project.name === projectName);
-                    if (!projectExists) {
-                        throw new Error(`Project '${projectName}' does not exist.`);
-                    }
-                    // Write the configuration
-                    writeNestboxConfig(config);
-                    console.log(chalk.green(`Default project set to '${projectName}'`));
-                })
-                .catch((error) => {
-                    console.error(error.message);
-                });
+                let projectsApi = createProjectsApi();
 
-            } catch (error) {
-                console.error(chalk.red('Error setting default project:'), error instanceof Error ? error.message : 'Unknown error');
+                // Use withTokenRefresh wrapper for automatic retry
+                const response = await withTokenRefresh(
+                    async () => {
+                        return await projectsApi.projectControllerGetAllProjects();
+                    },
+                    // Recreate the API client after token refresh
+                    () => {
+                        projectsApi = createProjectsApi();
+                    }
+                );
+                
+                // Check if the project exists
+                const projectExists = response.data.data.projects.some((project: any) => project.name === projectName);
+                if (!projectExists) {
+                    console.error(chalk.red(`Project '${projectName}' does not exist.`));
+                    return;
+                }
+                
+                // Write the configuration
+                writeNestboxConfig(config);
+                console.log(chalk.green(`Default project set to '${projectName}'`));
+            } catch (error: any) {
+                if (error.message && error.message.includes('Authentication')) {
+                    console.error(chalk.red(error.message));
+                } else if (error.message) {
+                    console.error(chalk.red('Error setting default project:'), error.message);
+                } else {
+                    console.error(chalk.red('Error setting default project:'), 'Unknown error');
+                }
             }
         });
 
@@ -99,6 +114,7 @@ export function registerProjectCommands(program: Command): void {
         .description('Add a project with optional alias')
         .action((projectName: string, alias?: string) => {
             try {
+                const authToken = getAuthToken();
                 if (!authToken) {
                     console.error(chalk.red('No authentication token found. Please log in first.'));
                     return;
@@ -136,4 +152,79 @@ export function registerProjectCommands(program: Command): void {
                 console.error(chalk.red('Error adding project:'), error instanceof Error ? error.message : 'Unknown error');
             }
         });
+
+    projectCommand
+    .command('list')
+    .description('List all projects')
+    .action(async () => {
+        try {
+            let projectsApi = createProjectsApi();
+                
+                // Use withTokenRefresh wrapper for automatic retry
+                const response = await withTokenRefresh(
+                    async () => {
+                        return await projectsApi.projectControllerGetAllProjects();
+                    },
+                    // Recreate the API client after token refresh
+                    () => {
+                        projectsApi = createProjectsApi();
+                    }
+                );
+
+            const apiProjects = response.data.data.projects;
+
+            if (!apiProjects || apiProjects.length === 0) {
+                console.log(chalk.yellow('No projects found.'));
+                return;
+            }
+
+            // Read local config to get default project and aliases
+            const config = readNestboxConfig();
+            const localProjects = config.projects || {};
+            const defaultProject = localProjects.default;
+
+            console.log(chalk.blue('Available Projects:'));
+            console.log(''); // Empty line for better formatting
+
+            // Display each project from the API
+            apiProjects.forEach((project: any) => {
+                const projectName = project.name;
+                const isDefault = defaultProject === projectName;
+                
+                // Find aliases for this project
+                const aliases = Object.entries(localProjects)
+                    .filter(([key, value]) => value === projectName && key !== 'default' && key !== projectName)
+                    .map(([alias]) => alias);
+
+                // Build the display line
+                let displayLine = `  ${projectName}`;
+                
+                if (aliases.length > 0) {
+                    displayLine += chalk.gray(` (aliases: ${aliases.join(', ')})`);
+                }
+                
+                if (isDefault) {
+                    displayLine += chalk.green(' [DEFAULT]');
+                }
+
+                console.log(displayLine);
+            });
+
+            // Show summary
+            console.log(''); // Empty line
+            if (defaultProject) {
+                console.log(chalk.gray(`Default project: ${defaultProject}`));
+            } else {
+                console.log(chalk.gray('No default project set. Use "nestbox project use <project-name>" to set one.'));
+            }
+        } catch (error: any) {
+            if (error.message && error.message.includes('Authentication')) {
+                console.error(chalk.red(error.message));
+            } else if (error.message) {
+                console.error(chalk.red('Error listing projects:'), error.message);
+            } else {
+                console.error(chalk.red('Error listing projects:'), 'Unknown error');
+            }
+        }
+    });
 }

package/src/types/agentType.ts

@@ -3,5 +3,5 @@
  */
 export enum AgentType {
   REGULAR = 'REGULAR',
-  CHATBOT = 'CHATBOT',
+  CHAT = 'CHAT',
 }