@aifabrix/builder 2.42.1 → 2.44.0

package/lib/commands/app-test.js

@@ -7,8 +7,8 @@
  */
 
 const { spawn } = require('child_process');
-const chalk = require('chalk');
 const logger = require('../utils/logger');
+const { infoLine, formatSuccessLine } = require('../utils/cli-test-layout-chalk');
 const config = require('../core/config');
 const containerHelpers = require('../utils/app-run-containers');
 const composeGenerator = require('../utils/compose-generator');
@@ -97,9 +97,9 @@ async function runTestsInDev(appName, developerId, testCmd) {
       `Container ${containerName} is not running.\nRun 'aifabrix run ${appName}' first.`
     );
   }
-  logger.log(chalk.blue(`Running tests in container ${containerName}: ${testCmd}\n`));
+  logger.log(infoLine(`ℹ Running tests in container ${containerName}: ${testCmd}\n`));
   const envFilePath = await secretsEnvWrite.resolveAndWriteEnvFile(appName, {});
-  return runDockerExec(containerName, testCmd, envFilePath);
+  return await runDockerExec(containerName, testCmd, envFilePath);
 }
 
 /**
@@ -123,14 +123,14 @@ async function runAppTest(appName, options = {}) {
   if (env === 'dev') {
     const code = await runTestsInDev(appName, developerId, testCmd);
     if (code !== 0) process.exit(code);
-    logger.log(chalk.green('✓ Tests completed'));
+    logger.log(formatSuccessLine('Tests completed.'));
     return;
   }
-  logger.log(chalk.blue(`Running tests in ephemeral container (${fullImage}): ${testCmd}\n`));
+  logger.log(infoLine(`ℹ Running tests in ephemeral container (${fullImage}): ${testCmd}\n`));
   const envFilePath = await secretsEnvWrite.resolveAndWriteEnvFile(appName, {});
   const code = await runDockerRunEphemeral(fullImage, testCmd, envFilePath);
   if (code !== 0) process.exit(code);
-  logger.log(chalk.green('✓ Tests completed'));
+  logger.log(formatSuccessLine('Tests completed.'));
 }
 
 /**
@@ -141,14 +141,17 @@ async function runAppTest(appName, options = {}) {
  * @param {string|null} [envFilePath] - Path to resolved .env for --env-file (optional)
  * @returns {Promise<number>} Exit code
  */
-function runDockerExec(containerName, testCmd, envFilePath = null) {
+async function runDockerExec(containerName, testCmd, envFilePath = null) {
+  const { getDockerExecEnv } = require('../utils/remote-docker-env');
+  const dockerEnv = await getDockerExecEnv();
   return new Promise((resolve) => {
     const args = ['exec'];
     if (envFilePath) args.push('--env-file', envFilePath);
     args.push(containerName, 'sh', '-c', testCmd);
     const proc = spawn('docker', args, {
       stdio: 'inherit',
-      shell: false
+      shell: false,
+      env: dockerEnv
     });
     proc.on('close', code => resolve(code !== null ? code : 1));
     proc.on('error', () => resolve(1));
@@ -162,14 +165,17 @@ function runDockerExec(containerName, testCmd, envFilePath = null) {
  * @param {string|null} [envFilePath] - Path to .env for docker run --env-file (optional)
  * @returns {Promise<number>} Exit code
  */
-function runDockerRunEphemeral(fullImage, testCmd, envFilePath = null) {
+async function runDockerRunEphemeral(fullImage, testCmd, envFilePath = null) {
+  const { getDockerExecEnv } = require('../utils/remote-docker-env');
+  const dockerEnv = await getDockerExecEnv();
   return new Promise((resolve) => {
     const args = ['run', '--rm'];
     if (envFilePath) args.push('--env-file', envFilePath);
     args.push(fullImage, 'sh', '-c', testCmd);
     const proc = spawn('docker', args, {
       stdio: 'inherit',
-      shell: false
+      shell: false,
+      env: dockerEnv
     });
     proc.on('close', code => resolve(code !== null ? code : 1));
     proc.on('error', () => resolve(1));
@@ -197,14 +203,14 @@ async function runAppTestE2e(appName, options = {}) {
   if (env === 'dev') {
     const code = await runTestsInDev(appName, developerId, cmd);
     if (code !== 0) process.exit(code);
-    logger.log(chalk.green('✓ Test-e2e completed'));
+    logger.log(formatSuccessLine('Test-e2e completed.'));
     return;
   }
-  logger.log(chalk.blue(`Running test-e2e in ephemeral container (${fullImage}): ${cmd}\n`));
+  logger.log(infoLine(`ℹ Running test-e2e in ephemeral container (${fullImage}): ${cmd}\n`));
   const envFilePath = await secretsEnvWrite.resolveAndWriteEnvFile(appName, {});
   const code = await runDockerRunEphemeral(fullImage, cmd, envFilePath);
   if (code !== 0) process.exit(code);
-  logger.log(chalk.green('✓ Test-e2e completed'));
+  logger.log(formatSuccessLine('Test-e2e completed.'));
 }
 
 /**
@@ -229,14 +235,14 @@ async function runAppTestIntegration(appName, options = {}) {
   if (env === 'dev') {
     const code = await runTestsInDev(appName, developerId, cmd);
     if (code !== 0) process.exit(code);
-    logger.log(chalk.green('✓ Test-integration completed'));
+    logger.log(formatSuccessLine('Test-integration completed.'));
     return;
   }
-  logger.log(chalk.blue(`Running test-integration in ephemeral container (${fullImage}): ${cmd}\n`));
+  logger.log(infoLine(`ℹ Running test-integration in ephemeral container (${fullImage}): ${cmd}\n`));
   const envFilePath = await secretsEnvWrite.resolveAndWriteEnvFile(appName, {});
   const code = await runDockerRunEphemeral(fullImage, cmd, envFilePath);
   if (code !== 0) process.exit(code);
-  logger.log(chalk.green('✓ Test-integration completed'));
+  logger.log(formatSuccessLine('Test-integration completed.'));
 }
 
 /**
@@ -260,14 +266,14 @@ async function runAppLint(appName, options = {}) {
   if (env === 'dev') {
     const code = await runTestsInDev(appName, developerId, cmd);
     if (code !== 0) process.exit(code);
-    logger.log(chalk.green('✓ Lint completed'));
+    logger.log(formatSuccessLine('Lint completed.'));
     return;
   }
-  logger.log(chalk.blue(`Running lint in ephemeral container (${fullImage}): ${cmd}\n`));
+  logger.log(infoLine(`ℹ Running lint in ephemeral container (${fullImage}): ${cmd}\n`));
   const envFilePath = await secretsEnvWrite.resolveAndWriteEnvFile(appName, {});
   const code = await runDockerRunEphemeral(fullImage, cmd, envFilePath);
   if (code !== 0) process.exit(code);
-  logger.log(chalk.green('✓ Lint completed'));
+  logger.log(formatSuccessLine('Lint completed.'));
 }
 
 module.exports = {

package/lib/commands/app.js

@@ -1,3 +1,4 @@
+const { formatBlockingError } = require('../utils/cli-test-layout-chalk');
 /**
  * AI Fabrix Builder - Application Registration Commands
  *
@@ -17,9 +18,20 @@ const { rotateSecret } = require('../app/rotate-secret');
 const { showApp } = require('../app/show');
 const { runAppDeploymentList } = require('./deployment-list');
 
+const APP_HELP_AFTER = `
+Subcommands:
+  register <appKey>     Register app; get pipeline client id/secret
+  list                  Applications in current environment
+  rotate-secret <key>   New ClientSecret (shown once)
+  show <key>            From controller (like show --online)
+  deployment <key>      Deployment history for app
+
+Requires: aifabrix login
+`;
+
 function setupAppRegisterCommand(app) {
   app.command('register <appKey>')
-    .description('Register application and get pipeline credentials')
+    .description('Register app; receive pipeline credentials')
     .option('-p, --port <port>', 'Application port (default: from application.yaml)')
     .option('-u, --url <url>', 'Application URL. If omitted: app.url, deployment.dataplaneUrl or deployment.appUrl in application.yaml; else http://localhost:{port})')
     .option('-n, --name <name>', 'Override display name')
@@ -28,7 +40,7 @@ function setupAppRegisterCommand(app) {
       try {
         await registerApplication(appKey, options);
       } catch (error) {
-        logger.error(chalk.red('❌ Registration failed:'), error.message);
+        logger.error(formatBlockingError('Registration failed:'), error.message);
         process.exit(1);
       }
     });
@@ -36,12 +48,12 @@ function setupAppRegisterCommand(app) {
 
 function setupAppListCommand(app) {
   app.command('list')
-    .description('List applications')
+    .description('List apps in current environment')
     .action(async(options) => {
       try {
         await listApplications(options);
       } catch (error) {
-        logger.error(chalk.red('❌ Failed to list applications:'), error.message);
+        logger.error(formatBlockingError('Failed to list applications:'), error.message);
         process.exit(1);
       }
     });
@@ -49,20 +61,20 @@ function setupAppListCommand(app) {
 
 function setupAppRotateSecretCommand(app) {
   app.command('rotate-secret <appKey>')
-    .description('Rotate pipeline ClientSecret for an application')
+    .description('Rotate pipeline ClientSecret (one-time display)')
     .action(async(appKey, options) => {
       try {
         await rotateSecret(appKey, options);
       } catch (error) {
-        logger.error(chalk.red('❌ Rotation failed:'), error.message);
+        logger.error(formatBlockingError('Rotation failed:'), error.message);
         process.exit(1);
       }
     });
 }
 
 function setupAppShowCommand(app) {
-  app.command('show <appKey>')
-    .description('Show application from controller (online). Same as aifabrix show <appKey> --online')
+  app.command('show <app>')
+    .description('App details from controller (same as show --online)')
     .option('--online', 'Fetch from controller (default for this command)')
     .option('--json', 'Output as JSON')
     .option('--permissions', 'Show only list of permissions')
@@ -78,7 +90,7 @@ function setupAppShowCommand(app) {
 
 function setupAppDeploymentCommand(app) {
   app.command('deployment <appKey>')
-    .description('List last N deployments for an application in current environment (default pageSize=50)')
+    .description('List recent deployments for app in current environment')
     .option('--controller <url>', 'Controller URL (default: from config)')
     .option('--environment <env>', 'Environment key (default: from config)')
     .option('--page-size <n>', 'Items per page', '50')
@@ -102,7 +114,7 @@ function setupAppDeploymentCommand(app) {
  * @param {Command} program - Commander program instance
  */
 function setupAppCommands(program) {
-  const app = program.command('app').description('Manage applications');
+  const app = program.command('app').description('Controller apps: register, list, secrets, deploy history').addHelpText('after', APP_HELP_AFTER);
   setupAppRegisterCommand(app);
   setupAppListCommand(app);
   setupAppRotateSecretCommand(app);

package/lib/commands/auth-config.js

@@ -8,7 +8,7 @@
  * @version 2.0.0
  */
 
-const chalk = require('chalk');
+const { formatBlockingError, formatSuccessLine } = require('../utils/cli-test-layout-chalk');
 const {
   setControllerUrl,
   setCurrentEnvironment,
@@ -42,23 +42,23 @@ async function handleSetController(url) {
     if (!loggedInControllerUrl) {
       // No stored credentials: allow setting controller so "aifabrix login" opens the right place
       await setControllerUrl(url);
-      logger.log(chalk.green(`✓ Controller URL set to: ${url}`));
+      logger.log(formatSuccessLine(`Controller URL set to: ${url}`));
       return;
     }
 
     const normalizedLoggedIn = loggedInControllerUrl.trim().replace(/\/+$/, '');
     if (normalizedLoggedIn === normalizedUrl) {
       await setControllerUrl(url);
-      logger.log(chalk.green(`✓ Controller URL set to: ${url}`));
+      logger.log(formatSuccessLine(`Controller URL set to: ${url}`));
       return;
     }
 
     throw new Error(
       `You have credentials for another controller (${loggedInControllerUrl}).\n` +
-      `To use ${url} either run "aifabrix login" with that controller, or run "aifabrix logout" first to clear credentials, then set the new controller with --set-controller.`
+      'To use a different controller either run "aifabrix login" with that controller, or run "aifabrix logout" first to clear credentials, then set the new controller with "aifabrix auth --set-controller <url>".'
     );
   } catch (error) {
-    logger.error(chalk.red(`✗ Failed to set controller URL: ${error.message}`));
+    logger.error(formatBlockingError(`Failed to set controller URL: ${error.message}`));
     throw error;
   }
 }
@@ -80,8 +80,7 @@ async function handleSetEnvironment(environment) {
     const controllerUrl = await getControllerUrl();
     if (!controllerUrl) {
       throw new Error(
-        'No controller URL found in config.\n' +
-        'Please run "aifabrix login" first to set the controller URL.'
+        'No controller URL found in config. Run "aifabrix login" first, or set the controller with "aifabrix auth --set-controller <url>".'
       );
     }
 
@@ -89,17 +88,16 @@ async function handleSetEnvironment(environment) {
     const isLoggedIn = await checkUserLoggedIn(controllerUrl);
     if (!isLoggedIn) {
       throw new Error(
-        `You are not logged in to controller ${controllerUrl}.\n` +
-        'Please run "aifabrix login" first to authenticate with this controller.'
+        `You are not logged in to controller ${controllerUrl}. Run "aifabrix login" first to authenticate.`
       );
     }
 
     // Save environment
     await setCurrentEnvironment(environment);
 
-    logger.log(chalk.green(`✓ Environment set to: ${environment}`));
+    logger.log(formatSuccessLine(`Environment set to: ${environment}`));
   } catch (error) {
-    logger.error(chalk.red(`✗ Failed to set environment: ${error.message}`));
+    logger.error(formatBlockingError(`Failed to set environment: ${error.message}`));
     throw error;
   }
 }
@@ -117,9 +115,7 @@ async function handleSetEnvironment(environment) {
 async function handleAuthConfig(options) {
   if (!options.setController && !options.setEnvironment) {
     throw new Error(
-      'No action specified. Use one of:\n' +
-      '  --set-controller <url>\n' +
-      '  --set-environment <env>'
+      'No action specified. Use "aifabrix auth --set-controller <url>" or "aifabrix auth --set-environment <env>".'
     );
   }
   if (options.setController) {

package/lib/commands/auth-status.js

@@ -9,6 +9,7 @@
  */
 
 const chalk = require('chalk');
+const { failureGlyph, successGlyph } = require('../utils/cli-test-layout-chalk');
 const logger = require('../utils/logger');
 const config = require('../core/config');
 const { getConfig } = config;
@@ -194,7 +195,7 @@ function displayUserInfo(user) {
  * @param {Object} tokenInfo - Token information
  */
 function displayTokenInfo(tokenInfo) {
-  const statusIcon = tokenInfo.authenticated ? chalk.green('✓') : chalk.red('✗');
+  const statusIcon = tokenInfo.authenticated ? successGlyph() : failureGlyph();
   const statusText = tokenInfo.authenticated ? 'Authenticated' : 'Not authenticated';
 
   logger.log(`  Status: ${statusIcon} ${statusText}`);
@@ -244,7 +245,7 @@ function displayDataplaneSection(dataplaneUrl, dataplaneConnected) {
   logger.log('');
   if (dataplaneUrl) {
     logger.log(`Dataplane: ${chalk.cyan(dataplaneUrl)}`);
-    const statusIcon = dataplaneConnected ? chalk.green('✓') : chalk.red('✗');
+    const statusIcon = dataplaneConnected ? successGlyph() : failureGlyph();
     const statusText = dataplaneConnected ? 'Connected' : 'Not reachable';
     displayOpenApiDocs(null, dataplaneUrl);
     logger.log('');
@@ -297,7 +298,7 @@ function displayStatus(controllerUrl, environment, tokenInfo, dataplaneInfo) {
   logger.log(`  Environment: ${chalk.cyan(environment || 'Not specified')}\n`);
 
   if (!tokenInfo) {
-    logger.log(`  Status: ${chalk.red('✗ Not authenticated')}`);
+    logger.log(`  Status: ${failureGlyph()} ${chalk.red('Not authenticated')}`);
     logger.log(`  Token Type: ${chalk.gray('None')}\n`);
     logger.log(chalk.yellow('💡 Run "aifabrix login" to authenticate\n'));
     return;

package/lib/commands/credential-env.js

@@ -1,6 +1,7 @@
+const { formatSuccessLine } = require('../utils/cli-test-layout-chalk');
 /**
  * Credential env command – prompts for KV_* values and writes .env.
- * Used by `aifabrix credential env <system-key>`.
+ * Used by `aifabrix credential env <systemKey>`.
  *
  * @fileoverview Credential env command – interactive credential capture to .env
  * @author AI Fabrix Team
@@ -120,7 +121,7 @@ function buildEnvContent(templateContent, promptValues) {
 /**
  * Runs credential env command: prompt for KV_* values and write .env.
  * @async
- * @param {string} systemKey - External system key (integration/<system-key>/)
+ * @param {string} systemKey - External system key (integration/<systemKey>/)
  * @returns {Promise<string>} Path to written .env file
  * @throws {Error} If env.template missing or write fails
  */
@@ -155,7 +156,7 @@ async function runCredentialEnv(systemKey) {
   const dir = path.dirname(envPath);
   if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true, mode: 0o700 });
   fs.writeFileSync(envPath, content, { mode: 0o600 });
-  logger.log(chalk.green(`✓ Wrote ${envPath}`));
+  logger.log(formatSuccessLine(`Wrote ${envPath}`));
   return envPath;
 }
 

package/lib/commands/credential-list.js

@@ -1,3 +1,4 @@
+const { formatBlockingError } = require('../utils/cli-test-layout-chalk');
 /**
  * Credential list command – list credentials from Dataplane
  * GET /api/v1/credential. Used by `aifabrix credential list`.
@@ -78,12 +79,12 @@ function displayCredentialList(list, baseUrl) {
 async function ensureControllerAndAuth(options = {}) {
   const controllerUrl = options.controller || (await resolveControllerUrl());
   if (!controllerUrl) {
-    logger.error(chalk.red('❌ Controller URL is required. Run "aifabrix login" first.'));
+    logger.error(formatBlockingError('Controller URL is required. Run "aifabrix login" first.'));
     process.exit(1);
   }
   const authResult = await getCredentialListAuth(controllerUrl);
   if (!authResult || !authResult.token) {
-    logger.error(chalk.red(`❌ No authentication token for controller: ${controllerUrl}`));
+    logger.error(formatBlockingError(`No authentication token for controller: ${controllerUrl}`));
     logger.error(chalk.gray('Run: aifabrix login'));
     process.exit(1);
   }
@@ -129,7 +130,7 @@ async function resolveDataplaneUrlOrExit(controllerUrl, authConfig) {
   try {
     return await resolveCredentialListDataplaneUrl(controllerUrl, authConfig);
   } catch (err) {
-    logger.error(chalk.red(`❌ Could not resolve Dataplane URL: ${err.message}`));
+    logger.error(formatBlockingError(`Could not resolve Dataplane URL: ${err.message}`));
     process.exit(1);
   }
 }
@@ -152,7 +153,7 @@ async function runCredentialList(options = {}) {
   try {
     await fetchAndDisplayCredentials(dataplaneUrl, authConfig, listOptions);
   } catch (error) {
-    logger.error(chalk.red(`❌ Failed to list credentials: ${error.message}`));
+    logger.error(formatBlockingError(`Failed to list credentials: ${error.message}`));
     process.exit(1);
   }
 }

package/lib/commands/credential-push.js

@@ -1,6 +1,7 @@
+const { formatSuccessLine } = require('../utils/cli-test-layout-chalk');
 /**
  * Credential push command – pushes KV_* from .env to dataplane.
- * Used by `aifabrix credential push <system-key>`.
+ * Used by `aifabrix credential push <systemKey>`.
  *
  * @fileoverview Credential push command – push credential secrets to dataplane
  * @author AI Fabrix Team
@@ -55,7 +56,7 @@ async function buildPayload(systemKey) {
 function logPushResult(pushResult) {
   if (pushResult.pushed > 0) {
     const keyList = pushResult.keys?.length ? ` (${pushResult.keys.join(', ')})` : '';
-    logger.log(chalk.green(`✓ Pushed ${pushResult.pushed} credential secret(s) to dataplane${keyList}.`));
+    logger.log(formatSuccessLine(`Pushed ${pushResult.pushed} credential secret(s) to dataplane${keyList}.`));
   } else if (pushResult.skipped) {
     logger.log(chalk.yellow('No credential secrets to push (empty .env or no KV_* vars with values).'));
   } else {
@@ -75,7 +76,7 @@ async function runCredentialPush(systemKey) {
   const authConfig = await getDeploymentAuth(controllerUrl, environment, systemKey);
 
   if (!authConfig.token && !authConfig.clientId) {
-    throw new Error('Authentication required. Run "aifabrix login" or "aifabrix app register <system-key>" first.');
+    throw new Error('Authentication required. Run "aifabrix login" or "aifabrix app register <systemKey>" first.');
   }
 
   requireBearerForDataplanePipeline(authConfig);