@aifabrix/builder 2.43.0 → 2.44.0

package/lib/commands/dev-cli-handlers.js

@@ -1,3 +1,4 @@
+const { formatSuccessLine } = require('../utils/cli-test-layout-chalk');
 /**
  * @fileoverview CLI action handlers for dev list/add/update/pin/delete (remote Builder Server)
  * @author AI Fabrix Team
@@ -9,6 +10,12 @@ const config = require('../core/config');
 const logger = require('../utils/logger');
 const devApi = require('../api/dev.api');
 const { getRemoteDevAuth } = require('../utils/remote-dev-auth');
+const { isValidIpv4 } = require('../utils/dev-hosts-helper');
+const {
+  parseDevGroupsOption,
+  validateDevGroups,
+  augmentDevUserGroupsServerError
+} = require('../utils/dev-user-groups');
 
 const REMOTE_NOT_CONFIGURED_MSG = 'Remote server is not configured. Set remote-server and run "aifabrix dev init" first.';
 
@@ -39,7 +46,7 @@ async function handleDevList() {
     logger.log(chalk.yellow(REMOTE_NOT_CONFIGURED_MSG));
     return;
   }
-  const users = await devApi.listUsers(auth.serverUrl, auth.clientCertPem);
+  const users = await devApi.listUsers(auth.serverUrl, auth.clientCertPem, auth.serverCaPem || undefined);
   if (users.length === 0) {
     logger.log(chalk.gray('No developers registered.'));
     return;
@@ -71,14 +78,23 @@ async function handleDevList() {
 async function handleDevAdd(options) {
   const auth = await getRemoteDevAuth();
   if (!auth) throw new Error(REMOTE_NOT_CONFIGURED_MSG);
-  const groups = (options.groups || 'developer').split(',').map(s => s.trim()).filter(Boolean);
-  const user = await devApi.createUser(auth.serverUrl, auth.clientCertPem, {
-    developerId: options.developerId,
-    name: options.name,
-    email: options.email,
-    groups: groups.length ? groups : ['developer']
-  });
-  logger.log(chalk.green(`✓ Developer ${user.id} created. Use "aifabrix dev pin ${user.id}" to create a PIN for onboarding.`));
+  let groups = parseDevGroupsOption(
+    options.groups !== undefined && options.groups !== null ? options.groups : 'developer'
+  );
+  if (groups.length === 0) groups = ['developer'];
+  validateDevGroups(groups);
+  try {
+    const user = await devApi.createUser(auth.serverUrl, auth.clientCertPem, {
+      developerId: options.developerId,
+      name: options.name,
+      email: options.email,
+      groups
+    }, auth.serverCaPem || undefined);
+    logger.log(formatSuccessLine(`Developer ${user.id} created. Use "aifabrix dev pin ${user.id}" to create a PIN for onboarding.`));
+  } catch (err) {
+    augmentDevUserGroupsServerError(err, groups);
+    throw err;
+  }
 }
 
 /**
@@ -95,27 +111,115 @@ async function handleDevUpdate(developerId, options) {
   const body = {};
   if (options.name) body.name = options.name;
   if (options.email) body.email = options.email;
-  if (options.groups) body.groups = options.groups.split(',').map(s => s.trim()).filter(Boolean);
+  if (options.groups) {
+    const groups = parseDevGroupsOption(options.groups);
+    if (groups.length === 0) {
+      throw new Error('--groups must list at least one valid group');
+    }
+    validateDevGroups(groups);
+    body.groups = groups;
+  }
   if (Object.keys(body).length === 0) {
     throw new Error('Provide at least one of --name, --email, --groups');
   }
-  await devApi.updateUser(auth.serverUrl, auth.clientCertPem, id, body);
-  logger.log(chalk.green(`✓ Developer ${id} updated.`));
+  try {
+    await devApi.updateUser(auth.serverUrl, auth.clientCertPem, id, body, auth.serverCaPem || undefined);
+    logger.log(formatSuccessLine(`Developer ${id} updated.`));
+  } catch (err) {
+    augmentDevUserGroupsServerError(err, body.groups);
+    throw err;
+  }
+}
+
+function logPinHostsVariantLines(baseInit, id, hostsIp) {
+  logger.log(
+    chalk.cyan('2) Hosts file / administrator')
+    + chalk.gray(
+      ' — use when the hostname does not resolve and your organisation does not publish DNS for it. '
+      + 'Run in an elevated terminal so the hosts file can be updated, or add the entry manually:'
+    )
+  );
+  if (hostsIp) {
+    logger.log(`   ${baseInit} --add-hosts --hosts-ip ${hostsIp}`);
+  } else {
+    logger.log(`   ${baseInit} --add-hosts --hosts-ip <server-LAN-IPv4>`);
+    logger.log(
+      chalk.gray(
+        `   Replace <server-LAN-IPv4> with the Builder Server IPv4, or re-run: aifabrix dev pin ${id} --hosts-ip <ip>`
+      )
+    );
+  }
+}
+
+/**
+ * Log copy-paste dev init commands for the developer (standard vs hosts-file).
+ * @param {Object} p
+ * @param {string} p.id - Developer ID
+ * @param {string} p.serverUrl - Builder Server base URL
+ * @param {string} p.pin - One-time PIN
+ * @param {string} p.expiresAt - PIN expiry (API string)
+ * @param {string} [p.hostsIp] - Optional IPv4 for the hosts variant
+ * @returns {void}
+ */
+function logDevPinShareInstructions(p) {
+  const { id, serverUrl, pin, expiresAt, hostsIp } = p;
+  const baseInit = `aifabrix dev init --developer-id ${id} --server ${serverUrl} --pin ${pin}`;
+  const pinOnly = `aifabrix dev init --pin ${pin}`;
+  logger.log(formatSuccessLine(`PIN created for ${id}, expires ${expiresAt}.`));
+  logger.log('');
+  logger.log(
+    chalk.bold('Share with the developer — they run one command (the PIN is one-time):')
+  );
+  logger.log('');
+  logger.log(
+    chalk.cyan('1) Standard')
+    + chalk.gray(' — use when this machine can resolve the server hostname (DNS or hosts already set):')
+  );
+  logger.log(`   ${baseInit}`);
+  logger.log('');
+  logPinHostsVariantLines(baseInit, id, hostsIp);
+  logger.log('');
+  logger.log(
+    chalk.cyan('3) Config already has remote-server + developer-id')
+    + chalk.gray(
+      ' — e.g. second machine / SSH session after settings were merged; same onboarding, PIN only:'
+    )
+  );
+  logger.log(`   ${pinOnly}`);
+  logger.log('');
 }
 
 /**
  * Handle dev pin – create/regenerate PIN (remote only).
  * @param {string} [developerId] - Developer ID (optional; uses config if omitted)
+ * @param {Object} [options] - Commander options
+ * @param {string} [options.hostsIp] - From --hosts-ip (embeds IPv4 in the hosts variant)
  * @returns {Promise<void>}
  */
-async function handleDevPin(developerId) {
+async function handleDevPin(developerId, options = {}) {
   const auth = await getRemoteDevAuth();
   if (!auth) throw new Error(REMOTE_NOT_CONFIGURED_MSG);
   const id = developerId || await config.getDeveloperId();
   if (!id) throw new Error('developerId is required (argument or set developer-id in config)');
-  const res = await devApi.createPin(auth.serverUrl, auth.clientCertPem, id);
-  logger.log(chalk.green(`✓ PIN created for ${id}, expires ${res.expiresAt}.`));
-  logger.log(chalk.yellow(`  Give this PIN once to the developer for: aifabrix dev init --developer-id ${id} --server ${auth.serverUrl} --pin ${res.pin}`));
+  const rawHostsIp = options.hostsIp ?? options['hosts-ip'];
+  let hostsIp = '';
+  if (rawHostsIp !== undefined && rawHostsIp !== null) {
+    const trimmed = String(rawHostsIp).trim();
+    if (trimmed !== '') {
+      if (!isValidIpv4(trimmed)) {
+        throw new Error('Invalid --hosts-ip (use an IPv4 address, e.g. 192.168.1.25)');
+      }
+      hostsIp = trimmed;
+    }
+  }
+  const res = await devApi.createPin(auth.serverUrl, auth.clientCertPem, id, auth.serverCaPem || undefined);
+  logDevPinShareInstructions({
+    id,
+    serverUrl: auth.serverUrl,
+    pin: res.pin,
+    expiresAt: res.expiresAt,
+    hostsIp: hostsIp || undefined
+  });
 }
 
 /**
@@ -128,8 +232,8 @@ async function handleDevDelete(developerId) {
   if (!auth) throw new Error(REMOTE_NOT_CONFIGURED_MSG);
   const id = developerId;
   if (!id) throw new Error('Developer ID is required (positional argument or --developer-id).');
-  await devApi.deleteUser(auth.serverUrl, auth.clientCertPem, id);
-  logger.log(chalk.green(`✓ Developer ${id} removed.`));
+  await devApi.deleteUser(auth.serverUrl, auth.clientCertPem, id, auth.serverCaPem || undefined);
+  logger.log(formatSuccessLine(`Developer ${id} removed.`));
 }
 
 module.exports = {

package/lib/commands/dev-down.js

@@ -1,3 +1,4 @@
+const { formatSuccessParagraph } = require('../utils/cli-test-layout-chalk');
 /**
  * dev down – stop Mutagen sync sessions and optionally app containers for this developer.
  *
@@ -38,7 +39,7 @@ async function stopMutagenSessions(developerId) {
     const toTerminate = sessions.filter(name => name.startsWith(prefix));
     for (const name of toTerminate) {
       await execAsync(`"${mutagenPath}" sync terminate "${name}"`, { timeout: 5000 });
-      logger.log(chalk.green(`  ✓ Stopped sync session: ${name}`));
+      logger.log(chalk.green(`  ✔ Stopped sync session: ${name}`));
     }
     if (toTerminate.length === 0 && sessions.length > 0) {
       logger.log(chalk.gray('No sync sessions for this developer.'));
@@ -98,7 +99,7 @@ async function handleDevDown(options = {}) {
       if (!appName) continue;
       try {
         await appLib.downApp(appName, {});
-        logger.log(chalk.green(`  ✓ Stopped app: ${appName}`));
+        logger.log(chalk.green(`  ✔ Stopped app: ${appName}`));
       } catch (err) {
         logger.log(chalk.yellow(`  ⚠ Could not stop ${appName}: ${err.message}`));
       }
@@ -108,7 +109,7 @@ async function handleDevDown(options = {}) {
     }
   }
 
-  logger.log(chalk.green('\n✓ dev down complete.\n'));
+  logger.log(formatSuccessParagraph('dev down complete.\n'));
 }
 
 module.exports = { handleDevDown };