@aifabrix/builder 2.42.1 → 2.44.0

package/lib/cli/setup-auth.js

@@ -14,9 +14,22 @@ const { handleLogout } = require('../commands/logout');
 const { handleAuthStatus } = require('../commands/auth-status');
 const { handleAuthConfig } = require('../commands/auth-config');
 
+const LOGIN_HELP_AFTER = `
+Examples:
+  $ aifabrix login
+  $ aifabrix login -m credentials -a myapp -e dev
+`;
+
+const AUTH_HELP_AFTER = `
+Without options: show auth status (same as: aifabrix auth status).
+With --set-controller or --set-environment: write defaults to config.yaml.
+Subcommand: auth status [--validate] for CI/scripts.
+`;
+
 function setupLoginCommand(program) {
   program.command('login')
-    .description('Authenticate with Miso Controller')
+    .description('Sign in to Miso Controller (device or credentials flow)')
+    .addHelpText('after', LOGIN_HELP_AFTER)
     .option('-c, --controller <url>', 'Controller URL (default: from config or developer ID, e.g. http://localhost:3000)')
     .option('-m, --method <method>', 'Authentication method (device|credentials)', 'device')
     .option('-a, --app <app>', 'Application name (required for credentials method, reads from secrets.local.yaml)')
@@ -29,7 +42,7 @@ function setupLoginCommand(program) {
       try {
         await handleLogin(options);
       } catch (error) {
-        logger.error(chalk.red('\n❌ Login failed:'), error.message);
+        logger.error(chalk.red('\n✖ Login failed:'), error.message);
         process.exit(1);
       }
     });
@@ -37,7 +50,7 @@ function setupLoginCommand(program) {
 
 function setupLogoutCommand(program) {
   program.command('logout')
-    .description('Clear authentication tokens')
+    .description('Clear stored tokens (optional filter by controller/env/app)')
     .option('-c, --controller <url>', 'Clear device tokens for specific controller')
     .option('-e, --environment <env>', 'Clear client tokens for specific environment')
     .option('-a, --app <app>', 'Clear client tokens for specific app (requires --environment)')
@@ -60,23 +73,32 @@ function setupAuthSubcommands(program) {
       process.exit(1);
     }
   };
-  const auth = program.command('auth').description('Authentication commands');
-  auth.command('status')
-    .description('Display authentication status for current controller and environment')
-    .option('--validate', 'Exit with code 1 when not authenticated (for scripted use, e.g. manual test setup)')
-    .action(authStatusHandler);
-  auth.command('config')
-    .description('Configure authentication settings (controller, environment)')
-    .option('--set-controller <url>', 'Set default controller URL')
-    .option('--set-environment <env>', 'Set default environment')
+  const auth = program.command('auth')
+    .description('Show auth status or set default controller/environment')
+    .addHelpText('after', AUTH_HELP_AFTER)
+    .option('--set-controller <url>', 'Set default controller URL in config')
+    .option('--set-environment <env>', 'Set default environment in config')
     .action(async(options) => {
       try {
-        await handleAuthConfig(options);
+        const setController = options.setController || options['set-controller'];
+        const setEnvironment = options.setEnvironment || options['set-environment'];
+        if (setController || setEnvironment) {
+          await handleAuthConfig({
+            setController,
+            setEnvironment
+          });
+          return;
+        }
+        await handleAuthStatus(options);
       } catch (error) {
-        handleCommandError(error, 'auth config');
+        handleCommandError(error, 'auth');
         process.exit(1);
       }
     });
+  auth.command('status')
+    .description('Show tokens/session for current controller and environment')
+    .option('--validate', 'Exit with code 1 when not authenticated (for scripted use, e.g. manual test setup)')
+    .action(authStatusHandler);
 }
 
 /**

package/lib/cli/setup-credential-deployment.js

@@ -15,10 +15,22 @@ const { runCredentialEnv } = require('../commands/credential-env');
 const { runCredentialPush } = require('../commands/credential-push');
 const { runDeploymentList } = require('../commands/deployment-list');
 
+const CREDENTIAL_HELP_AFTER = `
+Subcommands:
+  env <systemKey>   Prompt for KV_* values → integration/<key>/.env
+  push <systemKey>  Upload secrets from .env to Dataplane
+  list               List credentials (pagination: --page-size)
+`;
+
+const DEPLOYMENT_HELP_AFTER = `
+Subcommand:
+  list   Recent deployments for the current environment
+`;
+
 function setupCredentialEnvAndPush(credential) {
   credential
-    .command('env <system-key>')
-    .description('Prompt for KV_* credential values and write integration/<system-key>/.env')
+    .command('env <systemKey>')
+    .description('Interactive KV_* prompts → integration/<key>/.env')
     .action(async(systemKey, _options) => {
       try {
         await runCredentialEnv(systemKey);
@@ -29,8 +41,8 @@ function setupCredentialEnvAndPush(credential) {
       }
     });
   credential
-    .command('push <system-key>')
-    .description('Push credential secrets from .env to Dataplane (KV_* vars)')
+    .command('push <systemKey>')
+    .description('Push KV_* secrets from .env to Dataplane')
     .action(async(systemKey, _options) => {
       try {
         await runCredentialPush(systemKey);
@@ -49,11 +61,12 @@ function setupCredentialEnvAndPush(credential) {
 function setupCredentialDeploymentCommands(program) {
   const credential = program
     .command('credential')
-    .description('Manage credentials');
+    .description('Dataplane credentials: env, push, list')
+    .addHelpText('after', CREDENTIAL_HELP_AFTER);
   setupCredentialEnvAndPush(credential);
   credential
     .command('list')
-    .description('Get credentials from Dataplane')
+    .description('List credentials from Dataplane')
     .option('--active-only', 'List only active credentials')
     .option('--page-size <n>', 'Items per page', '50')
     .action(async(options) => {
@@ -72,11 +85,12 @@ function setupCredentialDeploymentCommands(program) {
 
   const deployment = program
     .command('deployment')
-    .description('List deployments');
+    .description('Controller deployments (list)')
+    .addHelpText('after', DEPLOYMENT_HELP_AFTER);
 
   deployment
     .command('list')
-    .description('List last N deployments for current environment (default pageSize=50)')
+    .description('List recent deployments for 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')

package/lib/cli/setup-dev-path-commands.js

@@ -0,0 +1,124 @@
+/**
+ * Dev subcommands: set-home, set-work, print-home, print-work, set-format.
+ *
+ * @fileoverview Path and format CLI registration for `aifabrix dev`
+ * @author AI Fabrix Team
+ * @version 2.0.0
+ */
+
+'use strict';
+const { formatSuccessLine } = require('../utils/cli-test-layout-chalk');
+
+const chalk = require('chalk');
+const config = require('../core/config');
+const logger = require('../utils/logger');
+const paths = require('../utils/paths');
+const { registerAifabrixShellEnvFromConfig } = require('../utils/register-aifabrix-shell-env');
+const { handleCommandError } = require('../utils/cli-utils');
+
+async function runShellEnvRegistration() {
+  try {
+    await registerAifabrixShellEnvFromConfig(config.getConfig);
+    logger.log(
+      chalk.gray('  User/shell environment updated. Open a new terminal for AIFABRIX_HOME / AIFABRIX_WORK.')
+    );
+  } catch (regErr) {
+    throw new Error(`Config saved but environment registration failed: ${regErr.message}`);
+  }
+}
+
+function addSetHomeCommand(dev) {
+  dev
+    .command('set-home <path>')
+    .description('Set or clear aifabrix-home in config; register AIFABRIX_HOME for new shells unless --no-register-env')
+    .option('--no-register-env', 'Do not update Windows user env or POSIX shell profile hooks')
+    .action(async(homePath, cmdOpts) => {
+      try {
+        const trimmed = (homePath || '').trim();
+        await config.setAifabrixHomeOverride(trimmed);
+        logger.log(trimmed === '' ? formatSuccessLine('Home path cleared') : formatSuccessLine(`Home path set to ${trimmed}`));
+        if (cmdOpts?.registerEnv !== false) {
+          await runShellEnvRegistration();
+        }
+      } catch (error) {
+        handleCommandError(error, 'dev set-home');
+        process.exit(1);
+      }
+    });
+}
+
+function addSetWorkCommand(dev) {
+  dev
+    .command('set-work <path>')
+    .description('Set or clear aifabrix-work (workspace root) in config; register AIFABRIX_WORK unless --no-register-env')
+    .option('--no-register-env', 'Do not update Windows user env or POSIX shell profile hooks')
+    .action(async(workPath, cmdOpts) => {
+      try {
+        const trimmed = (workPath || '').trim();
+        await config.setAifabrixWorkOverride(trimmed);
+        logger.log(trimmed === '' ? formatSuccessLine('Work path cleared') : formatSuccessLine(`Work path set to ${trimmed}`));
+        if (cmdOpts?.registerEnv !== false) {
+          await runShellEnvRegistration();
+        }
+      } catch (error) {
+        handleCommandError(error, 'dev set-work');
+        process.exit(1);
+      }
+    });
+}
+
+function addPrintHomeWorkCommands(dev) {
+  dev
+    .command('print-home')
+    .description('Print resolved AIFABRIX_HOME path (stdout only; for scripts)')
+    .action(() => {
+      try {
+        process.stdout.write(`${paths.getAifabrixHome()}\n`);
+      } catch (error) {
+        handleCommandError(error, 'dev print-home');
+        process.exit(1);
+      }
+    });
+
+  dev
+    .command('print-work')
+    .description('Print resolved workspace path or empty line (stdout only; for scripts)')
+    .action(() => {
+      try {
+        const w = paths.getAifabrixWork();
+        process.stdout.write(w ? `${w}\n` : '\n');
+      } catch (error) {
+        handleCommandError(error, 'dev print-work');
+        process.exit(1);
+      }
+    });
+}
+
+function addSetFormatCommand(dev, handleSetFormat) {
+  dev
+    .command('set-format <format>')
+    .description('Default json|yaml when --format is omitted (download/convert)')
+    .action(async(format) => {
+      try {
+        await handleSetFormat(format);
+      } catch (error) {
+        handleCommandError(error, 'dev set-format');
+        process.exit(1);
+      }
+    });
+}
+
+/**
+ * Register dev set-home, set-work, print-*, set-format.
+ * @param {import('commander').Command} dev - dev subcommand group
+ * @param {function(string): Promise<void>} handleSetFormat - handler that updates format and refreshes display
+ * @returns {void}
+ */
+function setupDevPathAndFormatCommands(dev, handleSetFormat) {
+  addSetHomeCommand(dev);
+  addSetWorkCommand(dev);
+  addPrintHomeWorkCommands(dev);
+  addSetFormatCommand(dev, handleSetFormat);
+}
+
+module.exports = { setupDevPathAndFormatCommands };