@aifabrix/builder 2.44.5 → 2.45.0

package/lib/app/show.js

@@ -14,7 +14,7 @@
 
 const path = require('path');
 const logger = require('../utils/logger');
-const { detectAppType, resolveApplicationConfigPath } = require('../utils/paths');
+const { detectAppType, resolveApplicationConfigPath, getBuilderPath } = require('../utils/paths');
 const { loadConfigFile } = require('../utils/config-format');
 const generator = require('../generator');
 const { getConfig, normalizeControllerUrl } = require('../core/config');
@@ -38,6 +38,58 @@ const {
   sanitizeCertificationForJson
 } = require('./certification-show-enrich');
 
+/**
+ * Attach `runReloadDefault` / `runProxyDefault` from ~/.aifabrix `applications.<appKey>`.
+ * @param {Object} summary
+ * @param {string} appKey
+ * @param {Object} userCfg
+ */
+function attachRunDefaultsFromUserConfig(summary, appKey, userCfg) {
+  const { isApplicationsReloadDefaultOn, getApplicationsRunProxyHint } = require('../utils/applications-config-defaults');
+  if (isApplicationsReloadDefaultOn(userCfg, appKey)) {
+    summary.runReloadDefault = true;
+  }
+  summary.runProxyDefault = getApplicationsRunProxyHint(userCfg, appKey);
+}
+
+/**
+ * Overlay `application.url` / `application.internalUrl` from declarative url:// rules (same profile as run `.env`, default `docker`).
+ * Used for offline and **online** show so controller metadata does not stale local proxy/TLS hints.
+ * @param {Object} summary
+ * @param {string} appKey
+ */
+async function attachDeclarativeUrlsToShowApplication(summary, appKey) {
+  if (!summary || summary.isExternal) return;
+  const t = summary.application && summary.application.type;
+  if (String(t || 'webapp').toLowerCase() === 'external') return;
+  try {
+    const { resolveDeclarativeShowUrlsForApp } = require('../core/secrets-env-declarative-expand');
+    const appPath = getBuilderPath(appKey);
+    const variablesPath = resolveApplicationConfigPath(appPath);
+    const urls = await resolveDeclarativeShowUrlsForApp(appKey, appPath, variablesPath, 'docker');
+    if (!urls) return;
+    summary.application.url = urls.publicUrl;
+    summary.application.internalUrl = urls.internalUrl;
+  } catch {
+    /* display-only */
+  }
+}
+
+/**
+ * Local manifest provenance for `--json` (plan 141); null when the app is not on disk locally.
+ * @param {string} appKey
+ * @returns {Promise<{ tier: string, tierLabel: string, configPath: string }|null>}
+ */
+async function tryGetLocalManifestSourceForJson(appKey) {
+  try {
+    const { getManifestSourcePayload } = require('../utils/manifest-source-emit');
+    const { appPath } = await detectAppType(appKey);
+    return getManifestSourcePayload(appKey, appPath);
+  } catch {
+    return { tier: 'unknown', tierLabel: 'unknown', configPath: '' };
+  }
+}
+
 /** Truncate deployment key for display */
 const DEPLOYMENT_KEY_TRUNCATE_LEN = 12;
 
@@ -651,16 +703,34 @@ async function loadOfflineShowSummary(appKey) {
   }
 }
 
+async function emitShowOfflineManifestLine(appKey, json) {
+  if (json) return;
+  try {
+    const { detectAppType } = require('../utils/paths');
+    const { emitManifestMetadataLineIfTTY } = require('../utils/manifest-source-emit');
+    const { appPath } = await detectAppType(appKey);
+    emitManifestMetadataLineIfTTY(logger, { appKey, appPath, envOnly: false, json: false });
+  } catch {
+    /* ignore */
+  }
+}
+
 async function runOffline(appKey, json, permissionsOnly, verifyCert = false) {
   const summary = await loadOfflineShowSummary(appKey);
+  await emitShowOfflineManifestLine(appKey, json);
+  const userCfg = await getConfig();
+  attachRunDefaultsFromUserConfig(summary, appKey, userCfg);
+  await attachDeclarativeUrlsToShowApplication(summary, appKey);
 
   if (json) {
+    const manifestSource = await tryGetLocalManifestSourceForJson(appKey);
     if (permissionsOnly) {
       const out = {
         source: summary.source,
         path: summary.path,
         appKey: summary.appKey,
-        permissions: summary.permissions || []
+        permissions: summary.permissions || [],
+        manifestSource
       };
       logger.log(JSON.stringify(out, null, 2));
       return;
@@ -669,6 +739,9 @@ async function runOffline(appKey, json, permissionsOnly, verifyCert = false) {
       source: summary.source,
       path: summary.path,
       appKey: summary.appKey,
+      runReloadDefault: Boolean(summary.runReloadDefault),
+      runProxyDefault: Boolean(summary.runProxyDefault),
+      manifestSource,
       application: {
         ...summary.application,
         roles: summary.roles,
@@ -717,13 +790,14 @@ async function fetchExternalSystemForOnline(controllerUrl, appKey, authConfig) {
   }
 }
 
-function outputOnlineJson(summary, permissionsOnly) {
+function outputOnlineJson(summary, permissionsOnly, manifestSource) {
   if (permissionsOnly) {
     const out = {
       source: summary.source,
       controllerUrl: summary.controllerUrl,
       appKey: summary.appKey,
-      permissions: summary.permissions || []
+      permissions: summary.permissions || [],
+      manifestSource
     };
     logger.log(JSON.stringify(out, null, 2));
     return;
@@ -733,6 +807,7 @@ function outputOnlineJson(summary, permissionsOnly) {
     source: summary.source,
     controllerUrl: summary.controllerUrl,
     appKey: summary.appKey,
+    manifestSource,
     application: {
       key: app.key,
       displayName: app.displayName,
@@ -751,6 +826,10 @@ function outputOnlineJson(summary, permissionsOnly) {
     }
   };
   if (app.version !== undefined && app.version !== null) out.application.version = app.version;
+  if (summary.runReloadDefault) {
+    out.runReloadDefault = true;
+  }
+  out.runProxyDefault = Boolean(summary.runProxyDefault);
   if (summary.externalSystem !== undefined && summary.externalSystem !== null) {
     out.externalSystem = summary.externalSystem && summary.externalSystem.error
       ? { error: summary.externalSystem.error }
@@ -787,8 +866,11 @@ async function runOnline(appKey, json, permissionsOnly, verifyCert = false) {
     token: authConfig.token,
     controllerUrl: authResult.actualControllerUrl
   });
+  attachRunDefaultsFromUserConfig(summary, appKey, await getConfig());
+  await attachDeclarativeUrlsToShowApplication(summary, appKey);
   if (json) {
-    outputOnlineJson(summary, permissionsOnly);
+    const manifestSource = await tryGetLocalManifestSourceForJson(appKey);
+    outputOnlineJson(summary, permissionsOnly, manifestSource);
     return;
   }
   displayShow(summary, { permissionsOnly: !!permissionsOnly });

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
@@ -187,12 +196,13 @@ async function generateDockerfile(appNameOrPath, language, config, buildConfig =
 
 async function postBuildTasks(appName, buildConfig) {
   try {
-    const envPath = await secrets.generateEnvFile(appName, buildConfig.secrets, 'docker');
-    logger.log(formatSuccessLine(`Generated .env file: ${envPath}`));
-    // 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
+    // Validate that env.template + secrets resolve cleanly, but never write <appPath>/.env or
+    // envOutputPath. Build args still flow through resolveAndGetEnvMap (in-memory). Run
+    // `aifabrix resolve <app>` to materialize an on-disk .env.
+    await secrets.generateEnvFile(appName, buildConfig.secrets, 'docker', false, { noWrite: true });
+    logger.log(formatSuccessLine('Env resolution validated (in-memory only; run "aifabrix resolve ' + appName + '" for on-disk .env)'));
   } catch (error) {
-    logger.log(chalk.yellow(`⚠  Warning: Could not generate .env file: ${error.message}`));
+    logger.log(formatWarningLine(`Could not resolve env: ${error.message}`));
   }
 }
 
@@ -205,8 +215,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 +282,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 +310,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 +386,56 @@ 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 { emitManifestMetadataLineIfTTY } = require('../utils/manifest-source-emit');
+  const { appPath } = await detectAppType(appName);
+  emitManifestMetadataLineIfTTY(logger, { appKey: appName, appPath, envOnly: false, json: false });
+  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 +461,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 = {