@aifabrix/builder 2.31.0 → 2.32.1

package/lib/cli.js

@@ -10,12 +10,12 @@
  * @version 2.0.0
  */
 
-const infra = require('./infra');
+const infra = require('./infrastructure');
 const app = require('./app');
-const secrets = require('./secrets');
+const secrets = require('./core/secrets');
 const generator = require('./generator');
-const validator = require('./validator');
-const config = require('./config');
+const validator = require('./validation/validator');
+const config = require('./core/config');
 const devConfig = require('./utils/dev-config');
 const chalk = require('chalk');
 const logger = require('./utils/logger');
@@ -26,11 +26,10 @@ const { handleSecure } = require('./commands/secure');
 const { handleSecretsSet } = require('./commands/secrets-set');
 
 /**
- * Sets up all CLI commands on the Commander program instance
+ * Sets up authentication commands
  * @param {Command} program - Commander program instance
  */
-function setupCommands(program) {
-  // Authentication command
+function setupAuthCommands(program) {
   program.command('login')
     .description('Authenticate with Miso Controller')
     .option('-c, --controller <url>', 'Controller URL', 'http://localhost:3000')
@@ -63,8 +62,13 @@ function setupCommands(program) {
         process.exit(1);
       }
     });
+}
 
-  // Infrastructure commands
+/**
+ * Sets up infrastructure commands
+ * @param {Command} program - Commander program instance
+ */
+function setupInfraCommands(program) {
   program.command('up')
     .description('Start local infrastructure services (Postgres, Redis, pgAdmin, Redis Commander)')
     .option('-d, --developer <id>', 'Set developer ID and start infrastructure')
@@ -110,7 +114,100 @@ function setupCommands(program) {
       }
     });
 
-  // Application commands
+  program.command('doctor')
+    .description('Check environment and configuration')
+    .action(async() => {
+      try {
+        const result = await validator.checkEnvironment();
+        logger.log('\n🔍 AI Fabrix Environment Check\n');
+
+        logger.log(`Docker: ${result.docker === 'ok' ? '✅ Running' : '❌ Not available'}`);
+        logger.log(`Ports: ${result.ports === 'ok' ? '✅ Available' : '⚠️  Some ports in use'}`);
+        logger.log(`Secrets: ${result.secrets === 'ok' ? '✅ Configured' : '❌ Missing'}`);
+
+        if (result.recommendations.length > 0) {
+          logger.log('\n📋 Recommendations:');
+          result.recommendations.forEach(rec => logger.log(`  • ${rec}`));
+        }
+
+        // Check infrastructure health if Docker is available
+        if (result.docker === 'ok') {
+          try {
+            const health = await infra.checkInfraHealth();
+            logger.log('\n🏥 Infrastructure Health:');
+            Object.entries(health).forEach(([service, status]) => {
+              const icon = status === 'healthy' ? '✅' : status === 'unknown' ? '❓' : '❌';
+              logger.log(`  ${icon} ${service}: ${status}`);
+            });
+          } catch (error) {
+            logger.log('\n🏥 Infrastructure: Not running');
+          }
+        }
+
+        logger.log('');
+      } catch (error) {
+        handleCommandError(error, 'doctor');
+        process.exit(1);
+      }
+    });
+
+  program.command('status')
+    .description('Show detailed infrastructure service status and running applications')
+    .action(async() => {
+      try {
+        const status = await infra.getInfraStatus();
+        logger.log('\n📊 Infrastructure Status\n');
+
+        Object.entries(status).forEach(([service, info]) => {
+          // Normalize status value for comparison (handle edge cases)
+          const normalizedStatus = String(info.status).trim().toLowerCase();
+          const icon = normalizedStatus === 'running' ? '✅' : '❌';
+          logger.log(`${icon} ${service}:`);
+          logger.log(`   Status: ${info.status}`);
+          logger.log(`   Port: ${info.port}`);
+          logger.log(`   URL: ${info.url}`);
+          logger.log('');
+        });
+
+        // Show running applications
+        const apps = await infra.getAppStatus();
+        if (apps.length > 0) {
+          logger.log('📱 Running Applications\n');
+          apps.forEach((app) => {
+            const normalizedStatus = String(app.status).trim().toLowerCase();
+            const icon = normalizedStatus.includes('running') || normalizedStatus.includes('up') ? '✅' : '❌';
+            logger.log(`${icon} ${app.name}:`);
+            logger.log(`   Container: ${app.container}`);
+            logger.log(`   Port: ${app.port}`);
+            logger.log(`   Status: ${app.status}`);
+            logger.log(`   URL: ${app.url}`);
+            logger.log('');
+          });
+        }
+      } catch (error) {
+        handleCommandError(error, 'status');
+        process.exit(1);
+      }
+    });
+
+  program.command('restart <service>')
+    .description('Restart a specific infrastructure service')
+    .action(async(service) => {
+      try {
+        await infra.restartService(service);
+        logger.log(`✅ ${service} service restarted successfully`);
+      } catch (error) {
+        handleCommandError(error, 'restart');
+        process.exit(1);
+      }
+    });
+}
+
+/**
+ * Sets up application lifecycle commands
+ * @param {Command} program - Commander program instance
+ */
+function setupAppCommands(program) {
   program.command('create <app>')
     .description('Create new application with configuration files')
     .option('-p, --port <port>', 'Application port', '3000')
@@ -125,6 +222,7 @@ function setupCommands(program) {
     .option('-g, --github', 'Generate GitHub Actions workflows')
     .option('--github-steps <steps>', 'Extra GitHub workflow steps (comma-separated, e.g., npm,test)')
     .option('--main-branch <branch>', 'Main branch name for workflows', 'main')
+    .option('--wizard', 'Use interactive wizard for external system creation')
     .action(async(appName, options) => {
       try {
         // Validate type if provided
@@ -132,13 +230,35 @@ function setupCommands(program) {
         if (options.type && !validTypes.includes(options.type)) {
           throw new Error(`Invalid type: ${options.type}. Must be one of: ${validTypes.join(', ')}`);
         }
-        await app.createApp(appName, options);
+        // If wizard flag is set and type is external, use wizard instead
+        if (options.wizard && (options.type === 'external' || (!options.type && validTypes.includes('external')))) {
+          const { handleWizard } = require('./commands/wizard');
+          await handleWizard({ app: appName, ...options });
+        } else {
+          await app.createApp(appName, options);
+        }
       } catch (error) {
         handleCommandError(error, 'create');
         process.exit(1);
       }
     });
 
+  program.command('wizard')
+    .description('Interactive wizard for creating external systems')
+    .option('-a, --app <app>', 'Application name (if not provided, will prompt)')
+    .option('-c, --controller <url>', 'Controller URL')
+    .option('-e, --environment <env>', 'Environment (dev, tst, pro)', 'dev')
+    .option('--dataplane <url>', 'Dataplane URL (overrides controller lookup)')
+    .action(async(options) => {
+      try {
+        const { handleWizard } = require('./commands/wizard');
+        await handleWizard(options);
+      } catch (error) {
+        handleCommandError(error, 'wizard');
+        process.exit(1);
+      }
+    });
+
   program.command('build <app>')
     .description('Build container image (auto-detects runtime)')
     .option('-l, --language <lang>', 'Override language detection')
@@ -167,7 +287,6 @@ function setupCommands(program) {
       }
     });
 
-  // Deployment commands
   program.command('push <app>')
     .description('Push image to Azure Container Registry')
     .option('-r, --registry <registry>', 'ACR registry URL (overrides variables.yaml)')
@@ -181,14 +300,47 @@ function setupCommands(program) {
       }
     });
 
-  // Environment deployment command
-  const environment = program
-    .command('environment')
-    .description('Manage environments');
+  program.command('deploy <app>')
+    .description('Deploy to Azure via Miso Controller')
+    .option('-c, --controller <url>', 'Controller URL')
+    .option('-e, --environment <env>', 'Environment (miso, dev, tst, pro)', 'dev')
+    .option('--client-id <id>', 'Client ID (overrides config)')
+    .option('--client-secret <secret>', 'Client Secret (overrides config)')
+    .option('--poll', 'Poll for deployment status', true)
+    .option('--no-poll', 'Do not poll for status')
+    .action(async(appName, options) => {
+      try {
+        await app.deployApp(appName, options);
+      } catch (error) {
+        handleCommandError(error, 'deploy');
+        process.exit(1);
+      }
+    });
 
+  program.command('dockerfile <app>')
+    .description('Generate Dockerfile for an application')
+    .option('-l, --language <lang>', 'Override language detection')
+    .option('-f, --force', 'Overwrite existing Dockerfile')
+    .action(async(appName, options) => {
+      try {
+        const dockerfilePath = await app.generateDockerfileForApp(appName, options);
+        logger.log(chalk.green('\n✅ Dockerfile generated successfully!'));
+        logger.log(chalk.gray(`Location: ${dockerfilePath}`));
+      } catch (error) {
+        handleCommandError(error, 'dockerfile');
+        process.exit(1);
+      }
+    });
+}
+
+/**
+ * Sets up environment deployment commands
+ * @param {Command} program - Commander program instance
+ */
+function setupEnvironmentCommands(program) {
   const deployEnvHandler = async(envKey, options) => {
     try {
-      const environmentDeploy = require('./environment-deploy');
+      const environmentDeploy = require('./deployment/environment');
       await environmentDeploy.deployEnvironment(envKey, options);
     } catch (error) {
       handleCommandError(error, 'environment deploy');
@@ -196,6 +348,10 @@ function setupCommands(program) {
     }
   };
 
+  const environment = program
+    .command('environment')
+    .description('Manage environments');
+
   environment
     .command('deploy <env>')
     .description('Deploy/setup environment in Miso Controller')
@@ -220,114 +376,13 @@ function setupCommands(program) {
     .option('--poll', 'Poll for deployment status', true)
     .option('--no-poll', 'Do not poll for status')
     .action(deployEnvHandler);
+}
 
-  program.command('deploy <app>')
-    .description('Deploy to Azure via Miso Controller')
-    .option('-c, --controller <url>', 'Controller URL')
-    .option('-e, --environment <env>', 'Environment (miso, dev, tst, pro)', 'dev')
-    .option('--client-id <id>', 'Client ID (overrides config)')
-    .option('--client-secret <secret>', 'Client Secret (overrides config)')
-    .option('--poll', 'Poll for deployment status', true)
-    .option('--no-poll', 'Do not poll for status')
-    .action(async(appName, options) => {
-      try {
-        await app.deployApp(appName, options);
-      } catch (error) {
-        handleCommandError(error, 'deploy');
-        process.exit(1);
-      }
-    });
-
-  // Infrastructure status and management
-  program.command('doctor')
-    .description('Check environment and configuration')
-    .action(async() => {
-      try {
-        const result = await validator.checkEnvironment();
-        logger.log('\n🔍 AI Fabrix Environment Check\n');
-
-        logger.log(`Docker: ${result.docker === 'ok' ? '✅ Running' : '❌ Not available'}`);
-        logger.log(`Ports: ${result.ports === 'ok' ? '✅ Available' : '⚠️  Some ports in use'}`);
-        logger.log(`Secrets: ${result.secrets === 'ok' ? '✅ Configured' : '❌ Missing'}`);
-
-        if (result.recommendations.length > 0) {
-          logger.log('\n📋 Recommendations:');
-          result.recommendations.forEach(rec => logger.log(`  • ${rec}`));
-        }
-
-        // Check infrastructure health if Docker is available
-        if (result.docker === 'ok') {
-          try {
-            const health = await infra.checkInfraHealth();
-            logger.log('\n🏥 Infrastructure Health:');
-            Object.entries(health).forEach(([service, status]) => {
-              const icon = status === 'healthy' ? '✅' : status === 'unknown' ? '❓' : '❌';
-              logger.log(`  ${icon} ${service}: ${status}`);
-            });
-          } catch (error) {
-            logger.log('\n🏥 Infrastructure: Not running');
-          }
-        }
-
-        logger.log('');
-      } catch (error) {
-        handleCommandError(error, 'doctor');
-        process.exit(1);
-      }
-    });
-
-  program.command('status')
-    .description('Show detailed infrastructure service status and running applications')
-    .action(async() => {
-      try {
-        const status = await infra.getInfraStatus();
-        logger.log('\n📊 Infrastructure Status\n');
-
-        Object.entries(status).forEach(([service, info]) => {
-          // Normalize status value for comparison (handle edge cases)
-          const normalizedStatus = String(info.status).trim().toLowerCase();
-          const icon = normalizedStatus === 'running' ? '✅' : '❌';
-          logger.log(`${icon} ${service}:`);
-          logger.log(`   Status: ${info.status}`);
-          logger.log(`   Port: ${info.port}`);
-          logger.log(`   URL: ${info.url}`);
-          logger.log('');
-        });
-
-        // Show running applications
-        const apps = await infra.getAppStatus();
-        if (apps.length > 0) {
-          logger.log('📱 Running Applications\n');
-          apps.forEach((app) => {
-            const normalizedStatus = String(app.status).trim().toLowerCase();
-            const icon = normalizedStatus.includes('running') || normalizedStatus.includes('up') ? '✅' : '❌';
-            logger.log(`${icon} ${app.name}:`);
-            logger.log(`   Container: ${app.container}`);
-            logger.log(`   Port: ${app.port}`);
-            logger.log(`   Status: ${app.status}`);
-            logger.log(`   URL: ${app.url}`);
-            logger.log('');
-          });
-        }
-      } catch (error) {
-        handleCommandError(error, 'status');
-        process.exit(1);
-      }
-    });
-
-  program.command('restart <service>')
-    .description('Restart a specific infrastructure service')
-    .action(async(service) => {
-      try {
-        await infra.restartService(service);
-        logger.log(`✅ ${service} service restarted successfully`);
-      } catch (error) {
-        handleCommandError(error, 'restart');
-        process.exit(1);
-      }
-    });
-
-  // Utility commands
+/**
+ * Sets up utility commands
+ * @param {Command} program - Commander program instance
+ */
+function setupUtilityCommands(program) {
   program.command('resolve <app>')
     .description('Generate .env file from template and validate application files')
     .option('-f, --force', 'Generate missing secret keys in secrets file')
@@ -341,7 +396,7 @@ function setupCommands(program) {
 
         // Validate application files after generating .env
         if (!options.skipValidation) {
-          const validate = require('./validate');
+          const validate = require('./validation/validate');
           const result = await validate.validateAppOrFile(appName);
           validate.displayValidationResults(result);
           if (!result.valid) {
@@ -439,12 +494,11 @@ function setupCommands(program) {
       }
     });
 
-  // Validation command
   program.command('validate <appOrFile>')
     .description('Validate application or external integration file')
     .action(async(appOrFile) => {
       try {
-        const validate = require('./validate');
+        const validate = require('./validation/validate');
         const result = await validate.validateAppOrFile(appOrFile);
         validate.displayValidationResults(result);
         if (!result.valid) {
@@ -456,12 +510,11 @@ function setupCommands(program) {
       }
     });
 
-  // Diff command
   program.command('diff <file1> <file2>')
     .description('Compare two configuration files (for deployment pipeline)')
     .action(async(file1, file2) => {
       try {
-        const diff = require('./diff');
+        const diff = require('./core/diff');
         const result = await diff.compareFiles(file1, file2);
         diff.formatDiffOutput(result);
         if (!result.identical) {
@@ -472,54 +525,46 @@ function setupCommands(program) {
         process.exit(1);
       }
     });
+}
 
-  program.command('dockerfile <app>')
-    .description('Generate Dockerfile for an application')
-    .option('-l, --language <lang>', 'Override language detection')
-    .option('-f, --force', 'Overwrite existing Dockerfile')
-    .action(async(appName, options) => {
-      try {
-        const dockerfilePath = await app.generateDockerfileForApp(appName, options);
-        logger.log(chalk.green('\n✅ Dockerfile generated successfully!'));
-        logger.log(chalk.gray(`Location: ${dockerfilePath}`));
-      } catch (error) {
-        handleCommandError(error, 'dockerfile');
-        process.exit(1);
-      }
-    });
+/**
+ * Helper function to display developer configuration
+ * @param {string} devId - Developer ID
+ */
+async function displayDevConfig(devId) {
+  const devIdNum = parseInt(devId, 10);
+  const ports = devConfig.getDevPorts(devIdNum);
+  const configVars = [
+    { key: 'aifabrix-home', value: await config.getAifabrixHomeOverride() },
+    { key: 'aifabrix-secrets', value: await config.getAifabrixSecretsPath() },
+    { key: 'aifabrix-env-config', value: await config.getAifabrixEnvConfigPath() }
+  ].filter(v => v.value);
+
+  logger.log('\n🔧 Developer Configuration\n');
+  logger.log(`Developer ID: ${devId}`);
+  logger.log('\nPorts:');
+  logger.log(`  App: ${ports.app}`);
+  logger.log(`  Postgres: ${ports.postgres}`);
+  logger.log(`  Redis: ${ports.redis}`);
+  logger.log(`  pgAdmin: ${ports.pgadmin}`);
+  logger.log(`  Redis Commander: ${ports.redisCommander}`);
+
+  if (configVars.length > 0) {
+    logger.log('\nConfiguration:');
+    configVars.forEach(v => logger.log(`  ${v.key}: ${v.value}`));
+  }
+  logger.log('');
+}
 
-  // Developer configuration commands
+/**
+ * Sets up developer configuration commands
+ * @param {Command} program - Commander program instance
+ */
+function setupDevCommands(program) {
   const dev = program
     .command('dev')
     .description('Developer configuration and isolation');
 
-  // Helper function to display developer configuration
-  async function displayDevConfig(devId) {
-    const devIdNum = parseInt(devId, 10);
-    const ports = devConfig.getDevPorts(devIdNum);
-    const configVars = [
-      { key: 'aifabrix-home', value: await config.getAifabrixHomeOverride() },
-      { key: 'aifabrix-secrets', value: await config.getAifabrixSecretsPath() },
-      { key: 'aifabrix-env-config', value: await config.getAifabrixEnvConfigPath() }
-    ].filter(v => v.value);
-
-    logger.log('\n🔧 Developer Configuration\n');
-    logger.log(`Developer ID: ${devId}`);
-    logger.log('\nPorts:');
-    logger.log(`  App: ${ports.app}`);
-    logger.log(`  Postgres: ${ports.postgres}`);
-    logger.log(`  Redis: ${ports.redis}`);
-    logger.log(`  pgAdmin: ${ports.pgadmin}`);
-    logger.log(`  Redis Commander: ${ports.redisCommander}`);
-
-    if (configVars.length > 0) {
-      logger.log('\nConfiguration:');
-      configVars.forEach(v => logger.log(`  ${v.key}: ${v.value}`));
-    }
-    logger.log('');
-  }
-
-  // Config subcommand
   dev
     .command('config')
     .description('Show or set developer configuration')
@@ -550,7 +595,6 @@ function setupCommands(program) {
       }
     });
 
-  // Set-id subcommand
   dev
     .command('set-id <id>')
     .description('Set developer ID (convenience alias for "dev config --set-id")')
@@ -571,8 +615,13 @@ function setupCommands(program) {
         process.exit(1);
       }
     });
+}
 
-  // Secrets management commands
+/**
+ * Sets up secrets and security commands
+ * @param {Command} program - Commander program instance
+ */
+function setupSecretsCommands(program) {
   const secretsCmd = program
     .command('secrets')
     .description('Manage secrets in secrets files');
@@ -590,7 +639,6 @@ function setupCommands(program) {
       }
     });
 
-  // Security command
   program.command('secure')
     .description('Encrypt secrets in secrets.local.yaml files for ISO 27001 compliance')
     .option('--secrets-encryption <key>', 'Encryption key (32 bytes, hex or base64)')
@@ -602,8 +650,13 @@ function setupCommands(program) {
         process.exit(1);
       }
     });
+}
 
-  // External system download command
+/**
+ * Sets up external system commands
+ * @param {Command} program - Commander program instance
+ */
+function setupExternalSystemCommands(program) {
   program.command('download <system-key>')
     .description('Download external system from dataplane to local development structure')
     .option('-e, --environment <env>', 'Environment (dev, tst, pro)', 'dev')
@@ -611,7 +664,7 @@ function setupCommands(program) {
     .option('--dry-run', 'Show what would be downloaded without actually downloading')
     .action(async(systemKey, options) => {
       try {
-        const download = require('./external-system-download');
+        const download = require('./external-system/download');
         await download.downloadExternalSystem(systemKey, options);
       } catch (error) {
         handleCommandError(error, 'download');
@@ -619,14 +672,13 @@ function setupCommands(program) {
       }
     });
 
-  // Unit test command (local validation)
   program.command('test <app>')
     .description('Run unit tests for external system (local validation, no API calls)')
     .option('-d, --datasource <key>', 'Test specific datasource only')
     .option('-v, --verbose', 'Show detailed validation output')
     .action(async(appName, options) => {
       try {
-        const test = require('./external-system-test');
+        const test = require('./external-system/test');
         const results = await test.testExternalSystem(appName, options);
         test.displayTestResults(results, options.verbose);
         if (!results.valid) {
@@ -638,7 +690,6 @@ function setupCommands(program) {
       }
     });
 
-  // Integration test command (via dataplane)
   program.command('test-integration <app>')
     .description('Run integration tests via dataplane pipeline API')
     .option('-d, --datasource <key>', 'Test specific datasource only')
@@ -649,7 +700,7 @@ function setupCommands(program) {
     .option('--timeout <ms>', 'Request timeout in milliseconds', '30000')
     .action(async(appName, options) => {
       try {
-        const test = require('./external-system-test');
+        const test = require('./external-system/test');
         const results = await test.testExternalSystemIntegration(appName, options);
         test.displayIntegrationTestResults(results, options.verbose);
         if (!results.success) {
@@ -662,6 +713,21 @@ function setupCommands(program) {
     });
 }
 
+/**
+ * Sets up all CLI commands on the Commander program instance
+ * @param {Command} program - Commander program instance
+ */
+function setupCommands(program) {
+  setupAuthCommands(program);
+  setupInfraCommands(program);
+  setupAppCommands(program);
+  setupEnvironmentCommands(program);
+  setupUtilityCommands(program);
+  setupDevCommands(program);
+  setupSecretsCommands(program);
+  setupExternalSystemCommands(program);
+}
+
 module.exports = {
   setupCommands,
   validateCommand,

package/lib/commands/app.js

@@ -11,9 +11,9 @@
 
 const chalk = require('chalk');
 const logger = require('../utils/logger');
-const { listApplications } = require('../app-list');
-const { registerApplication } = require('../app-register');
-const { rotateSecret } = require('../app-rotate-secret');
+const { listApplications } = require('../app/list');
+const { registerApplication } = require('../app/register');
+const { rotateSecret } = require('../app/rotate-secret');
 
 /**
  * Setup application management commands

package/lib/commands/datasource.js

@@ -11,10 +11,10 @@
 
 const chalk = require('chalk');
 const logger = require('../utils/logger');
-const { validateDatasourceFile } = require('../datasource-validate');
-const { listDatasources } = require('../datasource-list');
-const { compareDatasources } = require('../datasource-diff');
-const { deployDatasource } = require('../datasource-deploy');
+const { validateDatasourceFile } = require('../datasource/validate');
+const { listDatasources } = require('../datasource/list');
+const { compareDatasources } = require('../datasource/diff');
+const { deployDatasource } = require('../datasource/deploy');
 
 /**
  * Setup datasource management commands