@aifabrix/builder 2.22.0 → 2.22.2

package/lib/commands/secrets-set.js

@@ -10,11 +10,11 @@
  */
 
 const path = require('path');
-const os = require('os');
 const chalk = require('chalk');
 const logger = require('../utils/logger');
 const { getAifabrixSecretsPath } = require('../config');
 const { saveLocalSecret, saveSecret } = require('../utils/local-secrets');
+const pathsUtil = require('../utils/paths');
 
 /**
  * Handle secrets set command action
@@ -61,7 +61,7 @@ async function handleSecretsSet(key, value, options) {
   } else {
     // Save to user secrets file
     await saveLocalSecret(key, value);
-    const userSecretsPath = path.join(os.homedir(), '.aifabrix', 'secrets.local.yaml');
+    const userSecretsPath = path.join(pathsUtil.getAifabrixHome(), 'secrets.local.yaml');
     logger.log(chalk.green(`✓ Secret '${key}' saved to user secrets file: ${userSecretsPath}`));
   }
 }

package/lib/commands/secure.js

@@ -11,7 +11,6 @@
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const yaml = require('js-yaml');
 const inquirer = require('inquirer');
 const chalk = require('chalk');
@@ -19,6 +18,7 @@ const logger = require('../utils/logger');
 const { setSecretsEncryptionKey, getSecretsEncryptionKey } = require('../config');
 const { validateEncryptionKey } = require('../utils/secrets-encryption');
 const { encryptYamlValues } = require('../utils/yaml-preserve');
+const pathsUtil = require('../utils/paths');
 
 /**
  * Finds all secrets.local.yaml files to encrypt
@@ -32,7 +32,7 @@ async function findSecretsFiles() {
   const files = [];
 
   // User's secrets file
-  const userSecretsPath = path.join(os.homedir(), '.aifabrix', 'secrets.local.yaml');
+  const userSecretsPath = path.join(pathsUtil.getAifabrixHome(), 'secrets.local.yaml');
   if (fs.existsSync(userSecretsPath)) {
     files.push({ path: userSecretsPath, type: 'user' });
   }

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/environment-checker.js

@@ -11,7 +11,6 @@
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const dockerUtils = require('./docker');
 const { getActualSecretsPath } = require('./secrets-path');
 
@@ -93,7 +92,8 @@ async function checkSecrets() {
     return { status: 'missing', paths: pathsChecked };
   } catch (error) {
     // Fallback to default path if there's an error
-    const defaultPath = path.join(os.homedir(), '.aifabrix', 'secrets.yaml');
+    const pathsUtil = require('./paths');
+    const defaultPath = path.join(pathsUtil.getAifabrixHome(), 'secrets.yaml');
     return {
       status: fs.existsSync(defaultPath) ? 'ok' : 'missing',
       paths: [defaultPath]

package/lib/utils/local-secrets.js

@@ -11,11 +11,12 @@
 const fs = require('fs');
 const path = require('path');
 const yaml = require('js-yaml');
-const os = require('os');
 const logger = require('../utils/logger');
+const pathsUtil = require('./paths');
 
 /**
  * Saves a secret to ~/.aifabrix/secrets.local.yaml
+ * Uses paths.getAifabrixHome() to respect config.yaml aifabrix-home override
  * Merges with existing secrets without overwriting other keys
  *
  * @async
@@ -37,7 +38,7 @@ async function saveLocalSecret(key, value) {
     throw new Error('Secret value is required');
   }
 
-  const secretsPath = path.join(os.homedir(), '.aifabrix', 'secrets.local.yaml');
+  const secretsPath = path.join(pathsUtil.getAifabrixHome(), 'secrets.local.yaml');
   const secretsDir = path.dirname(secretsPath);
 
   // Create directory if needed

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/lib/utils/token-manager.js

@@ -11,13 +11,15 @@
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const yaml = require('js-yaml');
 const config = require('../config');
 const { makeApiCall, refreshDeviceToken: apiRefreshDeviceToken } = require('./api');
 const logger = require('./logger');
+const pathsUtil = require('./paths');
 
-const SECRETS_FILE = path.join(os.homedir(), '.aifabrix', 'secrets.local.yaml');
+function getSecretsFilePath() {
+  return path.join(pathsUtil.getAifabrixHome(), 'secrets.local.yaml');
+}
 
 /**
  * Load client credentials from secrets.local.yaml
@@ -31,11 +33,12 @@ async function loadClientCredentials(appName) {
   }
 
   try {
-    if (!fs.existsSync(SECRETS_FILE)) {
+    const secretsFile = getSecretsFilePath();
+    if (!fs.existsSync(secretsFile)) {
       return null;
     }
 
-    const content = fs.readFileSync(SECRETS_FILE, 'utf8');
+    const content = fs.readFileSync(secretsFile, 'utf8');
     const secrets = yaml.load(content) || {};
 
     const clientIdKey = `${appName}-client-idKeyVault`;

package/package.json

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