@aifabrix/builder 2.33.6 → 2.36.1

package/lib/generator/wizard-prompts.js

@@ -12,35 +12,41 @@ const fs = require('fs').promises;
  * Prompt for wizard mode selection
  * @async
  * @function promptForMode
+ * @param {string} [defaultMode] - Default value ('create-system' | 'add-datasource')
  * @returns {Promise<string>} Selected mode ('create-system' | 'add-datasource')
  */
-async function promptForMode() {
+async function promptForMode(defaultMode) {
+  const choices = [
+    { name: 'Create a new external system', value: 'create-system' },
+    { name: 'Add datasource to existing system', value: 'add-datasource' }
+  ];
   const { mode } = await inquirer.prompt([
     {
       type: 'list',
       name: 'mode',
       message: 'What would you like to do?',
-      choices: [
-        { name: 'Create a new external system', value: 'create-system' },
-        { name: 'Add datasource to existing system', value: 'add-datasource' }
-      ]
+      choices,
+      default: defaultMode && choices.some(c => c.value === defaultMode) ? defaultMode : undefined
     }
   ]);
   return mode;
 }
 
 /**
- * Prompt for existing system ID or key (for add-datasource mode)
+ * Prompt for existing system ID or key (for add-datasource mode).
+ * Only external systems (OpenAPI, MCP, custom) support add-datasource; webapps do not.
  * @async
  * @function promptForSystemIdOrKey
+ * @param {string} [defaultValue] - Default value (e.g. from loaded wizard.yaml)
  * @returns {Promise<string>} System ID or key
  */
-async function promptForSystemIdOrKey() {
+async function promptForSystemIdOrKey(defaultValue) {
   const { systemIdOrKey } = await inquirer.prompt([
     {
       type: 'input',
       name: 'systemIdOrKey',
-      message: 'Enter the existing system ID or key:',
+      message: 'Enter the existing external system ID or key (not a webapp):',
+      default: defaultValue,
       validate: (input) => {
         if (!input || typeof input !== 'string' || input.trim().length === 0) {
           return 'System ID or key is required';
@@ -55,20 +61,24 @@ async function promptForSystemIdOrKey() {
  * Prompt for source type selection
  * @async
  * @function promptForSourceType
+ * @param {Array<{key: string, displayName?: string}>} [platforms] - If provided and non-empty, include "Known platform"; otherwise omit it
  * @returns {Promise<string>} Selected source type
  */
-async function promptForSourceType() {
+async function promptForSourceType(platforms = []) {
+  const choices = [
+    { name: 'OpenAPI file (local file)', value: 'openapi-file' },
+    { name: 'OpenAPI URL (remote URL)', value: 'openapi-url' },
+    { name: 'MCP server', value: 'mcp-server' }
+  ];
+  if (Array.isArray(platforms) && platforms.length > 0) {
+    choices.push({ name: 'Known platform (pre-configured)', value: 'known-platform' });
+  }
   const { sourceType } = await inquirer.prompt([
     {
       type: 'list',
       name: 'sourceType',
       message: 'What is your source type?',
-      choices: [
-        { name: 'OpenAPI file (local file)', value: 'openapi-file' },
-        { name: 'OpenAPI URL (remote URL)', value: 'openapi-url' },
-        { name: 'MCP server', value: 'mcp-server' },
-        { name: 'Known platform (pre-configured)', value: 'known-platform' }
-      ]
+      choices
     }
   ]);
   return sourceType;
@@ -176,11 +186,74 @@ async function promptForMcpServer() {
   };
 }
 
+/**
+ * Prompt for credential action (skip / create new / use existing).
+ * Choose Skip if you don't have credentials yet; you can add them later in env.template.
+ * @async
+ * @function promptForCredentialAction
+ * @returns {Promise<Object>} Object with action ('skip'|'create'|'select') and optional credentialIdOrKey
+ */
+async function promptForCredentialAction() {
+  const { action } = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'action',
+      message: 'Credential (optional; choose Skip if you don\'t have credentials yet):',
+      choices: [
+        { name: 'Skip - configure credentials later', value: 'skip' },
+        { name: 'Create new', value: 'create' },
+        { name: 'Use existing', value: 'select' }
+      ]
+    }
+  ]);
+  if (action === 'select') {
+    const { credentialIdOrKey } = await inquirer.prompt([
+      {
+        type: 'input',
+        name: 'credentialIdOrKey',
+        message: 'Enter credential ID or key (must exist on the dataplane):',
+        validate: (input) => {
+          if (!input || typeof input !== 'string' || input.trim().length === 0) {
+            return 'Credential ID or key is required (or choose Skip at the previous step)';
+          }
+          return true;
+        }
+      }
+    ]);
+    return { action, credentialIdOrKey: credentialIdOrKey.trim() };
+  }
+  return { action };
+}
+
+/**
+ * Re-prompt for credential ID/key when validation failed (e.g. not found on dataplane).
+ * Empty input means skip.
+ * @async
+ * @function promptForCredentialIdOrKeyRetry
+ * @param {string} [previousError] - Error message from dataplane (e.g. "Credential not found")
+ * @returns {Promise<Object>} { credentialIdOrKey: string } or { skip: true } if user leaves empty
+ */
+async function promptForCredentialIdOrKeyRetry(previousError) {
+  const msg = previousError
+    ? `Credential not found or invalid (${String(previousError).slice(0, 60)}). Enter ID/key or leave empty to skip:`
+    : 'Enter credential ID or key (or leave empty to skip):';
+  const { credentialIdOrKey } = await inquirer.prompt([
+    {
+      type: 'input',
+      name: 'credentialIdOrKey',
+      message: msg,
+      default: ''
+    }
+  ]);
+  const trimmed = (credentialIdOrKey && credentialIdOrKey.trim()) || '';
+  return trimmed ? { credentialIdOrKey: trimmed } : { skip: true };
+}
+
 /**
  * Prompt for known platform selection
  * @async
  * @function promptForKnownPlatform
- * @param {string[]} [platforms] - List of available platforms (if provided)
+ * @param {Array<{key: string, displayName?: string}>} [platforms] - List of available platforms (if provided)
  * @returns {Promise<string>} Selected platform key
  */
 async function promptForKnownPlatform(platforms = []) {
@@ -236,10 +309,21 @@ async function promptForUserIntent() {
  * Prompt for user preferences
  * @async
  * @function promptForUserPreferences
- * @returns {Promise<Object>} User preferences object
+ * @returns {Promise<Object>} User preferences object (fieldOnboardingLevel, mcp, abac, rbac)
  */
 async function promptForUserPreferences() {
   const answers = await inquirer.prompt([
+    {
+      type: 'list',
+      name: 'fieldOnboardingLevel',
+      message: 'Field onboarding level:',
+      choices: [
+        { name: 'full - All fields mapped and indexed', value: 'full' },
+        { name: 'standard - Core and important fields only', value: 'standard' },
+        { name: 'minimal - Essential fields only', value: 'minimal' }
+      ],
+      default: 'full'
+    },
     {
       type: 'confirm',
       name: 'mcp',
@@ -260,6 +344,7 @@ async function promptForUserPreferences() {
     }
   ]);
   return {
+    fieldOnboardingLevel: answers.fieldOnboardingLevel,
     mcp: answers.mcp,
     abac: answers.abac,
     rbac: answers.rbac
@@ -297,7 +382,6 @@ async function promptForConfigReview(systemConfig, datasourceConfigs) {
       message: 'What would you like to do?',
       choices: [
         { name: 'Accept and save', value: 'accept' },
-        { name: 'Edit configuration manually', value: 'edit' },
         { name: 'Cancel', value: 'cancel' }
       ]
     }
@@ -307,32 +391,6 @@ async function promptForConfigReview(systemConfig, datasourceConfigs) {
     return { action: 'cancel' };
   }
 
-  if (action === 'edit') {
-    const { editedConfig } = await inquirer.prompt([
-      {
-        type: 'editor',
-        name: 'editedConfig',
-        message: 'Edit the configuration (JSON format):',
-        default: JSON.stringify({ systemConfig, datasourceConfigs }, null, 2),
-        validate: (input) => {
-          try {
-            JSON.parse(input);
-            return true;
-          } catch (error) {
-            return `Invalid JSON: ${error.message}`;
-          }
-        }
-      }
-    ]);
-
-    const parsed = JSON.parse(editedConfig);
-    return {
-      action: 'edit',
-      systemConfig: parsed.systemConfig,
-      datasourceConfigs: parsed.datasourceConfigs
-    };
-  }
-
   return { action: 'accept' };
 }
 
@@ -364,6 +422,24 @@ async function promptForAppName(defaultName) {
   return appName.trim();
 }
 
+/**
+ * Prompt: Run with saved config? (Y/n). Used when resuming from existing wizard.yaml.
+ * @async
+ * @function promptForRunWithSavedConfig
+ * @returns {Promise<boolean>} True to run with saved config, false to exit
+ */
+async function promptForRunWithSavedConfig() {
+  const { run } = await inquirer.prompt([
+    {
+      type: 'confirm',
+      name: 'run',
+      message: 'Run with saved config?',
+      default: true
+    }
+  ]);
+  return run;
+}
+
 module.exports = {
   promptForMode,
   promptForSystemIdOrKey,
@@ -371,10 +447,13 @@ module.exports = {
   promptForOpenApiFile,
   promptForOpenApiUrl,
   promptForMcpServer,
+  promptForCredentialAction,
+  promptForCredentialIdOrKeyRetry,
   promptForKnownPlatform,
   promptForUserIntent,
   promptForUserPreferences,
   promptForConfigReview,
-  promptForAppName
+  promptForAppName,
+  promptForRunWithSavedConfig
 };
 

package/lib/schema/env-config.yaml

@@ -20,7 +20,7 @@ environments:
     KEYCLOAK_PORT: 8082  # Internal port (container-to-container). KEYCLOAK_PUBLIC_PORT calculated automatically.
     KEYCLOAK_PUBLIC_PORT: 8082
     DATAPLANE_HOST: dataplane
-    DATAPLANE_PORT: 3001
+    DATAPLANE_PORT: 3001 # Internal port (container-to-container). DATAPLANE_PUBLIC_PORT calculated automatically.
     NODE_ENV: production
     PYTHONUNBUFFERED: 1
     PYTHONDONTWRITEBYTECODE: 1
@@ -33,10 +33,8 @@ environments:
     REDIS_PORT: 6379
     MISO_HOST: localhost
     MISO_PORT: 3010
-    MISO_PUBLIC_PORT: 3010
     KEYCLOAK_HOST: localhost
     KEYCLOAK_PORT: 8082
-    KEYCLOAK_PUBLIC_PORT: 8082
     DATAPLANE_HOST: localhost
     DATAPLANE_PORT: 3011
     NODE_ENV: development

package/lib/utils/cli-utils.js

@@ -8,6 +8,8 @@
  * @version 2.0.0
  */
 
+const path = require('path');
+const fs = require('fs').promises;
 const logger = require('./logger');
 
 /**
@@ -289,10 +291,47 @@ function logError(command, errorMessages) {
 function handleCommandError(error, command) {
   const errorMessages = formatError(error);
   logError(command, errorMessages);
+  if (error.wizardResumeMessage) {
+    logger.log(error.wizardResumeMessage);
+  }
+}
+
+/** Strip ANSI escape codes for plain-text logging (ESC [...] m) */
+// eslint-disable-next-line no-control-regex -- intentional: match ANSI CSI sequences
+const ANSI_CODE_RE = /\x1b\[[\d;]*m/g;
+function stripAnsi(str) {
+  return typeof str === 'string' ? str.replace(ANSI_CODE_RE, '') : str;
+}
+
+/**
+ * Appends a wizard error to integration/<appKey>/error.log (timestamp + message only; no stack or secrets).
+ * Uses full formatted message (with validation details) when error.formatted is set, stripped of ANSI.
+ * Does not throw; logs and ignores write failures.
+ * @param {string} appKey - Application/integration key (e.g. app name or system key)
+ * @param {Error} error - The error that occurred
+ * @returns {Promise<void>}
+ */
+async function appendWizardError(appKey, error) {
+  if (!appKey || typeof appKey !== 'string' || !/^[a-z0-9-_]+$/.test(appKey)) {
+    return;
+  }
+  const dir = path.join(process.cwd(), 'integration', appKey);
+  const logPath = path.join(dir, 'error.log');
+  const rawMessage = (error && error.message) ? String(error.message) : String(error);
+  const fullPlain = (error && error.formatted) ? stripAnsi(error.formatted) : null;
+  const message = fullPlain && fullPlain.length > rawMessage.length ? fullPlain : rawMessage;
+  const line = `${new Date().toISOString()} ${message}\n`;
+  try {
+    await fs.mkdir(dir, { recursive: true });
+    await fs.appendFile(logPath, line, 'utf8');
+  } catch (e) {
+    logger.warn(`Could not write wizard error.log: ${e.message}`);
+  }
 }
 
 module.exports = {
   validateCommand,
-  handleCommandError
+  handleCommandError,
+  appendWizardError
 };
 

package/lib/utils/token-manager.js

@@ -25,8 +25,9 @@ function getSecretsFilePath() {
 }
 
 /**
- * Load client credentials from secrets.local.yaml
- * Reads using pattern: <app-name>-client-idKeyVault and <app-name>-client-secretKeyVault
+ * Load client credentials from secrets.local.yaml or process.env (e.g. integration/hubspot/.env).
+ * Reads secrets file using pattern: <app-name>-client-idKeyVault and <app-name>-client-secretKeyVault.
+ * If not found, checks process.env.CLIENTID and process.env.CLIENTSECRET (set when .env is loaded).
  * @param {string} appName - Application name
  * @returns {Promise<{clientId: string, clientSecret: string}|null>} Credentials or null if not found
  */
@@ -37,31 +38,38 @@ async function loadClientCredentials(appName) {
 
   try {
     const secretsFile = getSecretsFilePath();
-    if (!fs.existsSync(secretsFile)) {
-      return null;
-    }
-
-    const content = fs.readFileSync(secretsFile, 'utf8');
-    const secrets = yaml.load(content) || {};
-
-    const clientIdKey = `${appName}-client-idKeyVault`;
-    const clientSecretKey = `${appName}-client-secretKeyVault`;
-
-    const clientId = secrets[clientIdKey];
-    const clientSecret = secrets[clientSecretKey];
-
-    if (!clientId || !clientSecret) {
-      return null;
+    if (fs.existsSync(secretsFile)) {
+      const content = fs.readFileSync(secretsFile, 'utf8');
+      const secrets = yaml.load(content) || {};
+
+      const clientIdKey = `${appName}-client-idKeyVault`;
+      const clientSecretKey = `${appName}-client-secretKeyVault`;
+
+      const clientId = secrets[clientIdKey];
+      const clientSecret = secrets[clientSecretKey];
+
+      if (clientId && clientSecret) {
+        return {
+          clientId: String(clientId),
+          clientSecret: String(clientSecret)
+        };
+      }
     }
+  } catch (error) {
+    logger.warn(`Failed to load credentials from secrets.local.yaml: ${error.message}`);
+  }
 
+  // Fallback: use CLIENTID/CLIENTSECRET from process.env (e.g. from integration/hubspot/.env)
+  const envClientId = process.env.CLIENTID || process.env.CLIENT_ID;
+  const envClientSecret = process.env.CLIENTSECRET || process.env.CLIENT_SECRET;
+  if (envClientId && envClientSecret) {
     return {
-      clientId: clientId,
-      clientSecret: clientSecret
+      clientId: String(envClientId).trim(),
+      clientSecret: String(envClientSecret).trim()
     };
-  } catch (error) {
-    logger.warn(`Failed to load credentials from secrets.local.yaml: ${error.message}`);
-    return null;
   }
+
+  return null;
 }
 
 /**

package/lib/validation/wizard-config-validator.js

@@ -114,6 +114,39 @@ async function loadWizardConfig(configPath) {
   }
 }
 
+/**
+ * Write wizard configuration to wizard.yaml (creates directory if needed).
+ * @async
+ * @function writeWizardConfig
+ * @param {string} configPath - Path to wizard.yaml file
+ * @param {Object} config - Configuration object to write (will be dumped as YAML)
+ * @returns {Promise<void>}
+ * @throws {Error} If write fails
+ */
+async function writeWizardConfig(configPath, config) {
+  const resolvedPath = path.resolve(configPath);
+  const dir = path.dirname(resolvedPath);
+  await fs.mkdir(dir, { recursive: true });
+  const content = yaml.dump(config, { lineWidth: -1 });
+  await fs.writeFile(resolvedPath, content, 'utf8');
+}
+
+/**
+ * Check if wizard.yaml exists at path
+ * @async
+ * @function wizardConfigExists
+ * @param {string} configPath - Path to wizard.yaml file
+ * @returns {Promise<boolean>}
+ */
+async function wizardConfigExists(configPath) {
+  try {
+    await fs.access(path.resolve(configPath));
+    return true;
+  } catch (error) {
+    return error.code === 'ENOENT' ? false : Promise.reject(error);
+  }
+}
+
 /**
  * Validate wizard configuration against schema
  * @function validateWizardConfigSchema
@@ -258,6 +291,8 @@ function displayValidationResults(result) {
 
 module.exports = {
   loadWizardConfig,
+  writeWizardConfig,
+  wizardConfigExists,
   validateWizardConfig,
   validateWizardConfigSchema,
   resolveEnvVar,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aifabrix/builder",
-  "version": "2.33.6",
+  "version": "2.36.1",
   "description": "AI Fabrix Local Fabric & Deployment SDK",
   "main": "lib/index.js",
   "bin": {
@@ -10,7 +10,7 @@
   "scripts": {
     "test": "node tests/scripts/test-wrapper.js",
     "test:ci": "bash tests/scripts/ci-simulate.sh",
-    "test:coverage": "jest --config jest.config.coverage.js --coverage --runInBand",
+    "test:coverage": "cross-env RUN_COVERAGE=1 node tests/scripts/test-wrapper.js",
     "test:coverage:nyc": "nyc --reporter=text --reporter=lcov --reporter=html jest --config jest.config.coverage.js --runInBand",
     "test:watch": "jest --watch",
     "test:integration": "jest --config jest.config.integration.js --runInBand",