@aifabrix/builder 2.22.0 → 2.22.1

package/lib/secrets.js

@@ -338,7 +338,16 @@ async function generateEnvContent(appName, secretsPath, environment = 'local', f
   const secretsPaths = await getActualSecretsPath(secretsPath, appName);
 
   if (force) {
-    await generateMissingSecrets(template, secretsPaths.userPath);
+    // Use the same path resolution logic as loadSecrets
+    // If explicit path provided, use it; otherwise use the path that loadUserSecrets() would use
+    let secretsFileForGeneration;
+    if (secretsPath) {
+      secretsFileForGeneration = resolveSecretsPath(secretsPath);
+    } else {
+      // Use the same path that loadUserSecrets() would use (now uses paths.getAifabrixHome())
+      secretsFileForGeneration = secretsPaths.userPath;
+    }
+    await generateMissingSecrets(template, secretsFileForGeneration);
   }
 
   const secrets = await loadSecrets(secretsPath, appName);

package/lib/utils/secrets-generator.js

@@ -11,10 +11,11 @@
 
 const fs = require('fs');
 const path = require('path');
-const yaml = require('js-yaml');
 const os = require('os');
+const yaml = require('js-yaml');
 const crypto = require('crypto');
 const logger = require('./logger');
+const pathsUtil = require('./paths');
 
 /**
  * Finds missing secret keys from template
@@ -123,11 +124,12 @@ function saveSecretsFile(resolvedPath, secrets) {
 /**
  * Generates missing secret keys in secrets file
  * Scans env.template for kv:// references and adds missing keys with secure defaults
+ * Uses paths.getAifabrixHome() to respect config.yaml aifabrix-home override when path not provided
  *
  * @async
  * @function generateMissingSecrets
  * @param {string} envTemplate - Environment template content
- * @param {string} secretsPath - Path to secrets file
+ * @param {string} [secretsPath] - Path to secrets file (optional)
  * @returns {Promise<string[]>} Array of newly generated secret keys
  * @throws {Error} If generation fails
  *
@@ -136,7 +138,7 @@ function saveSecretsFile(resolvedPath, secrets) {
  * // Returns: ['new-secret-key', 'another-secret']
  */
 async function generateMissingSecrets(envTemplate, secretsPath) {
-  const resolvedPath = secretsPath || path.join(os.homedir(), '.aifabrix', 'secrets.yaml');
+  const resolvedPath = secretsPath || path.join(pathsUtil.getAifabrixHome(), 'secrets.yaml');
   const existingSecrets = loadExistingSecrets(resolvedPath);
   const missingKeys = findMissingSecretKeys(envTemplate, existingSecrets);
 

package/lib/utils/secrets-utils.js

@@ -12,8 +12,8 @@
 const fs = require('fs');
 const path = require('path');
 const yaml = require('js-yaml');
-const os = require('os');
 const logger = require('./logger');
+const pathsUtil = require('./paths');
 
 /**
  * Loads secrets from file with cascading lookup support
@@ -46,11 +46,12 @@ async function loadSecretsFromFile(filePath) {
 
 /**
  * Loads user secrets from ~/.aifabrix/secrets.local.yaml
+ * Uses paths.getAifabrixHome() to respect config.yaml aifabrix-home override
  * @function loadUserSecrets
  * @returns {Object} Loaded secrets object or empty object
  */
 function loadUserSecrets() {
-  const userSecretsPath = path.join(os.homedir(), '.aifabrix', 'secrets.local.yaml');
+  const userSecretsPath = path.join(pathsUtil.getAifabrixHome(), 'secrets.local.yaml');
   if (!fs.existsSync(userSecretsPath)) {
     return {};
   }
@@ -73,11 +74,12 @@ function loadUserSecrets() {
 
 /**
  * Loads default secrets from ~/.aifabrix/secrets.yaml
+ * Uses paths.getAifabrixHome() to respect config.yaml aifabrix-home override
  * @function loadDefaultSecrets
  * @returns {Object} Loaded secrets object or empty object
  */
 function loadDefaultSecrets() {
-  const defaultPath = path.join(os.homedir(), '.aifabrix', 'secrets.yaml');
+  const defaultPath = path.join(pathsUtil.getAifabrixHome(), 'secrets.yaml');
   if (!fs.existsSync(defaultPath)) {
     return {};
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aifabrix/builder",
-  "version": "2.22.0",
+  "version": "2.22.1",
   "description": "AI Fabrix Local Fabric & Deployment SDK",
   "main": "lib/index.js",
   "bin": {