@aifabrix/builder 2.44.5 → 2.44.6

package/lib/build/index.js

@@ -1,4 +1,13 @@
-const { formatSuccessLine, formatSuccessParagraph } = require('../utils/cli-test-layout-chalk');
+const {
+  formatSuccessLine,
+  formatSuccessParagraph,
+  formatProgress,
+  formatWarningLine,
+  sectionTitle,
+  headerKeyValue,
+  metadata,
+  formatNextActions
+} = require('../utils/cli-test-layout-chalk');
 /**
  * AI Fabrix Builder Build Functions
  *
@@ -18,7 +27,6 @@ const paths = require('../utils/paths');
 const { detectAppType, getProjectRoot } = require('../utils/paths');
 const { resolveApplicationConfigPath } = require('../utils/app-config-resolver');
 const { loadConfigFile } = require('../utils/config-format');
-const chalk = require('chalk');
 const secrets = require('../core/secrets');
 const config = require('../core/config');
 const logger = require('../utils/logger');
@@ -28,6 +36,7 @@ const buildCopy = require('../utils/build-copy');
 const { buildDevImageName } = require('../utils/image-name');
 const buildHelpers = require('../utils/build-helpers');
 const secretsEnvWrite = require('../core/secrets-env-write');
+const { ensureRunSecretsForApp } = require('../app/run-env-compose');
 
 /**
  * Loads application config for an application
@@ -192,7 +201,7 @@ async function postBuildTasks(appName, buildConfig) {
     // Note: processEnvVariables is already called by generateEnvFile to generate local .env
     // at the envOutputPath, so we don't need to manually copy the docker .env file
   } catch (error) {
-    logger.log(chalk.yellow(`⚠  Warning: Could not generate .env file: ${error.message}`));
+    logger.log(formatWarningLine(`Could not generate .env file: ${error.message}`));
   }
 }
 
@@ -205,8 +214,11 @@ async function postBuildTasks(appName, buildConfig) {
 async function checkExternalAppType(appName) {
   const variables = await loadVariablesYaml(appName);
   if (variables.app && variables.app.type === 'external') {
-    logger.log(chalk.blue(`External system: ${appName}`));
-    logger.log(chalk.gray('To regenerate deployment JSON, run: aifabrix json ' + appName));
+    logger.log('');
+    logger.log(sectionTitle('External integration'));
+    logger.log(headerKeyValue('Application:', appName));
+    logger.log(metadata('No Docker image is built for external systems.'));
+    logger.log(formatNextActions([`aifabrix json ${appName}`]));
     return true;
   }
   return false;
@@ -269,9 +281,9 @@ async function prepareDevDirectory(appName, buildConfig, options) {
   const developerId = await config.getDeveloperId();
   const idNum = typeof developerId === 'string' ? parseInt(developerId, 10) : developerId;
   const directoryName = idNum === 0 ? 'applications' : `dev-${developerId}`;
-  logger.log(chalk.blue(`Copying files to developer-specific directory (${directoryName})...`));
+  logger.log(formatProgress(`Copying workspace (${directoryName})…`));
   const devDir = await buildCopy.copyBuilderToDevDirectory(appName, developerId);
-  logger.log(formatSuccessLine(`Files copied to: ${devDir}`));
+  logger.log(formatSuccessLine(`Workspace ready: ${devDir}`));
 
   const { config: appConfig, imageName } = await buildHelpers.loadAndValidateConfig(appName);
   const effectiveImageName = buildDevImageName(imageName, developerId);
@@ -297,8 +309,11 @@ function prepareBuildContext(buildConfig, devDir) {
   // Check if context is using old format (../appName) - these are incompatible with dev directory structure
   if (buildConfig.context && buildConfig.context.startsWith('../') && buildConfig.context !== '../..') {
     // Old format detected - always use devDir instead
-    logger.log(chalk.yellow(`⚠  Warning: Build context uses old format: ${buildConfig.context}`));
-    logger.log(chalk.yellow(`   Using dev directory instead: ${devDir}`));
+    logger.log(
+      formatWarningLine(
+        `Build context uses legacy path (${buildConfig.context}). Using dev workspace: ${devDir}`
+      )
+    );
     contextPath = devDir;
   } else if (buildConfig.context && buildConfig.context !== '../..') {
     // Resolve relative context path from dev directory
@@ -370,6 +385,53 @@ async function handleDockerfileGeneration(appName, params, options, buildHelpers
   }, generateDockerfile);
 }
 
+/**
+ * Resolve Docker build-args from resolved env map and merged BASH_* secrets.
+ * @param {string} appName
+ * @returns {Promise<Object.<string, string>>}
+ */
+async function resolveDockerBuildArgsForApp(appName) {
+  const envMap = await secretsEnvWrite.resolveAndGetEnvMap(appName, { environment: 'docker' });
+  const { getBashPrefixedProcessEnvOverlay } = require('../utils/bash-secret-env');
+  const bashOverlay = await getBashPrefixedProcessEnvOverlay(null, appName);
+  const buildArgs = {};
+  if (envMap.NPM_TOKEN) buildArgs.NPM_TOKEN = envMap.NPM_TOKEN;
+  if (envMap.PYPI_TOKEN) buildArgs.PYPI_TOKEN = envMap.PYPI_TOKEN;
+  for (const [k, v] of Object.entries(bashOverlay)) {
+    if (v && buildArgs[k] === undefined) buildArgs[k] = v;
+  }
+  return buildArgs;
+}
+
+/**
+ * Standard Docker build path after CLI header is printed (non-external apps).
+ * @param {string} appName
+ * @param {Object} options
+ * @returns {Promise<string>} Built image ref e.g. name:tag
+ */
+async function runStandardDockerBuild(appName, options) {
+  const { buildConfig } = await buildHelpers.loadAndValidateConfig(appName);
+  const { devDir, effectiveImageName, imageName, appConfig } = await prepareDevDirectory(appName, buildConfig, options);
+  const contextPath = prepareBuildContext(buildConfig, devDir);
+  const dockerfilePath = await handleDockerfileGeneration(appName, {
+    devDir,
+    buildConfig,
+    contextPath,
+    appConfig
+  }, options, buildHelpers);
+  await ensureRunSecretsForApp(appName);
+  const buildArgs = await resolveDockerBuildArgsForApp(appName);
+  const buildOptions = { ...options, buildArgs };
+  const tag = options.tag || 'latest';
+  if (typeof tag === 'string' && tag.includes(',')) {
+    throw new Error('Use a single image tag per build (comma-separated multiple tags are not supported).');
+  }
+  await dockerBuild.executeDockerBuildWithTag(effectiveImageName, imageName, dockerfilePath, contextPath, tag, buildOptions);
+  await postBuildTasks(appName, buildConfig);
+  logger.log(formatSuccessParagraph('Build completed successfully!'));
+  return `${effectiveImageName}:${tag}`;
+}
+
 /**
  * Builds a container image for the specified application
  * Auto-detects runtime and generates Dockerfile if needed
@@ -395,42 +457,10 @@ async function buildApp(appName, options = {}) {
   }
 
   try {
-    logger.log(chalk.blue(`\n🔨 Building application: ${appName}`));
-
-    // 1. Load and validate configuration
-    const { buildConfig } = await buildHelpers.loadAndValidateConfig(appName);
-
-    // 2. Prepare dev directory and copy files
-    const { devDir, effectiveImageName, imageName, appConfig } = await prepareDevDirectory(appName, buildConfig, options);
-
-    // 3. Prepare build context
-    const contextPath = prepareBuildContext(buildConfig, devDir);
-
-    // 4. Handle Dockerfile generation
-    const dockerfilePath = await handleDockerfileGeneration(appName, {
-      devDir,
-      buildConfig,
-      contextPath,
-      appConfig
-    }, options, buildHelpers);
-
-    // 5. Resolve NPM_TOKEN/PYPI_TOKEN for private registries and pass as build-args
-    const envMap = await secretsEnvWrite.resolveAndGetEnvMap(appName, { environment: 'docker' });
-    const buildArgs = {};
-    if (envMap.NPM_TOKEN) buildArgs.NPM_TOKEN = envMap.NPM_TOKEN;
-    if (envMap.PYPI_TOKEN) buildArgs.PYPI_TOKEN = envMap.PYPI_TOKEN;
-    const buildOptions = { ...options, buildArgs };
-
-    // 6. Execute Docker build
-    const tag = options.tag || 'latest';
-    await dockerBuild.executeDockerBuildWithTag(effectiveImageName, imageName, dockerfilePath, contextPath, tag, buildOptions);
-
-    // 7. Post-build tasks
-    await postBuildTasks(appName, buildConfig);
-
-    logger.log(formatSuccessParagraph('Build completed successfully!'));
-    return `${imageName}:${tag}`;
-
+    logger.log('');
+    logger.log(sectionTitle('Build'));
+    logger.log(headerKeyValue('Application:', appName));
+    return await runStandardDockerBuild(appName, options);
   } catch (error) {
     throw new Error(`Build failed: ${error.message}`);
   }

package/lib/cli/doctor-check.js

@@ -0,0 +1,117 @@
+/**
+ * @fileoverview `aifabrix doctor` action: environment validation + optional infra health.
+ * @author AI Fabrix Team
+ * @version 2.0.0
+ */
+
+const chalk = require('chalk');
+const {
+  sectionTitle,
+  formatBulletSection,
+  formatDatasourceListRow,
+  formatWarningLine,
+  metadata
+} = require('../utils/cli-test-layout-chalk');
+const validator = require('../validation/validator');
+const config = require('../core/config');
+const infra = require('../infrastructure');
+const logger = require('../utils/logger');
+
+/**
+ * @param {string} label
+ * @param {'ok'|'warning'|'fail'} variant
+ * @param {{ ok?: string, warn?: string, fail?: string }} text
+ * @returns {string}
+ */
+function formatDoctorEnvSummaryLine(label, variant, text) {
+  const base = chalk.gray(`${label}:`);
+  if (variant === 'ok') return `${base} ${chalk.green('✔')} ${chalk.white(text.ok || '')}`;
+  if (variant === 'warning') return `${base} ${chalk.yellow('⚠')} ${chalk.white(text.warn || '')}`;
+  return `${base} ${chalk.red('✖')} ${chalk.white(text.fail || '')}`;
+}
+
+/**
+ * @param {string} statusRaw
+ * @returns {'ok'|'warn'|'fail'}
+ */
+function doctorInfraRowAggregate(statusRaw) {
+  const s = String(statusRaw).trim().toLowerCase();
+  if (s === 'healthy') return 'ok';
+  if (s === 'unknown') return 'warn';
+  return 'fail';
+}
+
+/**
+ * @param {Object} result - `validator.checkEnvironment()` payload
+ */
+function logDoctorEnvironmentSection(result) {
+  logger.log('');
+  logger.log(sectionTitle('Environment check'));
+  logger.log('');
+  logger.log(
+    formatDoctorEnvSummaryLine(
+      'Docker',
+      result.docker === 'ok' ? 'ok' : 'fail',
+      { ok: 'Running', fail: 'Not available' }
+    )
+  );
+  logger.log(
+    formatDoctorEnvSummaryLine(
+      'Ports',
+      result.ports === 'ok' ? 'ok' : 'warning',
+      { ok: 'Available', warn: 'Some ports in use' }
+    )
+  );
+  logger.log(
+    formatDoctorEnvSummaryLine(
+      'Secrets',
+      result.secrets === 'ok' ? 'ok' : 'fail',
+      { ok: 'Configured', fail: 'Missing' }
+    )
+  );
+  if (result.recommendations.length > 0) {
+    logger.log('');
+    logger.log(formatBulletSection('Recommendations:', result.recommendations));
+  }
+}
+
+/**
+ * @param {Object} result - `validator.checkEnvironment()` payload
+ */
+async function logDoctorInfraHealthSection(result) {
+  if (result.docker !== 'ok') {
+    logger.log('');
+    logger.log(metadata('Infrastructure health skipped (Docker not available).'));
+    return;
+  }
+  try {
+    const cfg = await config.getConfig();
+    const health = await infra.checkInfraHealth(null, {
+      pgadmin: cfg.pgadmin !== false,
+      redisCommander: cfg.redisCommander !== false,
+      traefik: !!cfg.traefik
+    });
+    logger.log('');
+    logger.log(sectionTitle('Infrastructure health'));
+    Object.entries(health).forEach(([service, status]) => {
+      const agg = doctorInfraRowAggregate(status);
+      logger.log(formatDatasourceListRow(agg, `${service}: ${status}`, null));
+    });
+  } catch (_err) {
+    logger.log('');
+    logger.log(formatWarningLine('Infrastructure is not running or health could not be read.'));
+  }
+}
+
+/**
+ * Runs the doctor checks and prints the TTY summary.
+ * @returns {Promise<void>}
+ */
+async function runDoctorCheck() {
+  const result = await validator.checkEnvironment();
+  logDoctorEnvironmentSection(result);
+  await logDoctorInfraHealthSection(result);
+  logger.log('');
+}
+
+module.exports = { runDoctorCheck };

package/lib/cli/index.js

@@ -21,8 +21,11 @@ const { setupParametersCommands } = require('./setup-parameters');
 const { setupExternalSystemCommands } = require('./setup-external-system');
 const { setupAppCommands: setupAppManagementCommands } = require('../commands/app');
 const { setupDatasourceCommands } = require('../commands/datasource');
+const { setupDimensionCommands } = require('../commands/dimension');
+const { setupDimensionValueCommands } = require('../commands/dimension-value');
 const { setupCredentialDeploymentCommands } = require('./setup-credential-deployment');
-const { setupServiceUserCommands } = require('./setup-service-user');
+const { setupIntegrationClientCommands } = require('./setup-integration-client');
+const { setupPlatformCommands } = require('./setup-platform');
 
 /**
  * Sets up all CLI commands on the Commander program instance
@@ -35,13 +38,16 @@ function setupCommands(program) {
   setupEnvironmentCommands(program);
   setupAppManagementCommands(program);
   setupDatasourceCommands(program);
+  setupDimensionCommands(program);
+  setupDimensionValueCommands(program);
   setupUtilityCommands(program);
   setupCredentialDeploymentCommands(program);
-  setupServiceUserCommands(program);
+  setupIntegrationClientCommands(program);
   setupExternalSystemCommands(program);
   setupDevCommands(program);
   setupSecretsCommands(program);
   setupParametersCommands(program);
+  setupPlatformCommands(program);
 }
 
 module.exports = {