@aifabrix/builder 2.3.6 → 2.4.0

package/lib/config.js

@@ -13,14 +13,15 @@ const fs = require('fs').promises;
 const path = require('path');
 const yaml = require('js-yaml');
 const os = require('os');
-const paths = require('./utils/paths');
+// Avoid importing paths here to prevent circular dependency.
+// Config location is always under OS home at ~/.aifabrix/config.yaml
 
 // Default (for tests and constants): always reflects OS home
 const CONFIG_DIR = path.join(os.homedir(), '.aifabrix');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.yaml');
 
-// Runtime (respects AIFABRIX_HOME override)
-const RUNTIME_CONFIG_DIR = paths.getAifabrixHome();
+// Runtime config directory (always under OS home)
+const RUNTIME_CONFIG_DIR = path.join(os.homedir(), '.aifabrix');
 const RUNTIME_CONFIG_FILE = path.join(RUNTIME_CONFIG_DIR, 'config.yaml');
 
 // Cache for developer ID - loaded when getConfig() is first called
@@ -368,7 +369,8 @@ async function setSecretsEncryptionKey(key) {
  */
 async function getSecretsPath() {
   const config = await getConfig();
-  return config['secrets-path'] || null;
+  // Backward compatibility: prefer new key, fallback to legacy
+  return config['aifabrix-secrets'] || config['secrets-path'] || null;
 }
 
 /**
@@ -382,7 +384,54 @@ async function setSecretsPath(secretsPath) {
   }
 
   const config = await getConfig();
-  config['secrets-path'] = secretsPath;
+  // Store under new canonical key
+  config['aifabrix-secrets'] = secretsPath;
+  await saveConfig(config);
+}
+
+/**
+ * Get aifabrix-home override from configuration
+ * @returns {Promise<string|null>} Home override path or null if not set
+ */
+async function getAifabrixHomeOverride() {
+  const config = await getConfig();
+  return config['aifabrix-home'] || null;
+}
+
+/**
+ * Set aifabrix-home override in configuration
+ * @param {string} homePath - Base directory path for AI Fabrix files
+ * @returns {Promise<void>}
+ */
+async function setAifabrixHomeOverride(homePath) {
+  if (!homePath || typeof homePath !== 'string') {
+    throw new Error('Home path is required and must be a string');
+  }
+  const config = await getConfig();
+  config['aifabrix-home'] = homePath;
+  await saveConfig(config);
+}
+
+/**
+ * Get aifabrix-secrets path from configuration (canonical)
+ * @returns {Promise<string|null>} Secrets path or null if not set
+ */
+async function getAifabrixSecretsPath() {
+  const config = await getConfig();
+  return config['aifabrix-secrets'] || null;
+}
+
+/**
+ * Set aifabrix-secrets path in configuration (canonical)
+ * @param {string} secretsPath - Path to default secrets file
+ * @returns {Promise<void>}
+ */
+async function setAifabrixSecretsPath(secretsPath) {
+  if (!secretsPath || typeof secretsPath !== 'string') {
+    throw new Error('Secrets path is required and must be a string');
+  }
+  const config = await getConfig();
+  config['aifabrix-secrets'] = secretsPath;
   await saveConfig(config);
 }
 
@@ -405,6 +454,10 @@ const exportsObj = {
   setSecretsEncryptionKey,
   getSecretsPath,
   setSecretsPath,
+  getAifabrixHomeOverride,
+  setAifabrixHomeOverride,
+  getAifabrixSecretsPath,
+  setAifabrixSecretsPath,
   CONFIG_DIR,
   CONFIG_FILE
 };

package/lib/secrets.js

@@ -12,7 +12,6 @@
 const fs = require('fs');
 const path = require('path');
 const yaml = require('js-yaml');
-const os = require('os');
 const chalk = require('chalk');
 const logger = require('./utils/logger');
 const config = require('./config');
@@ -33,6 +32,7 @@ const {
   resolveUrlPort
 } = require('./utils/secrets-utils');
 const { decryptSecret, isEncrypted } = require('./utils/secrets-encryption');
+const pathsUtil = require('./utils/paths');
 
 /**
  * Loads environment configuration for docker/local context
@@ -414,7 +414,7 @@ async function generateAdminSecretsEnv(secretsPath) {
     secrets = await loadSecrets(secretsPath);
   } catch (error) {
     // If secrets file doesn't exist, create default secrets
-    const defaultSecretsPath = secretsPath || path.join(os.homedir(), '.aifabrix', 'secrets.yaml');
+    const defaultSecretsPath = secretsPath || path.join(pathsUtil.getAifabrixHome(), 'secrets.yaml');
 
     if (!fs.existsSync(defaultSecretsPath)) {
       logger.log('Creating default secrets file...');
@@ -425,7 +425,7 @@ async function generateAdminSecretsEnv(secretsPath) {
     }
   }
 
-  const aifabrixDir = path.join(os.homedir(), '.aifabrix');
+  const aifabrixDir = pathsUtil.getAifabrixHome();
   const adminEnvPath = path.join(aifabrixDir, 'admin-secrets.env');
 
   if (!fs.existsSync(aifabrixDir)) {

package/lib/utils/paths.js

@@ -13,25 +13,45 @@
 
 const path = require('path');
 const os = require('os');
+const fs = require('fs');
+const yaml = require('js-yaml');
+
+function safeHomedir() {
+  try {
+    if (typeof os.homedir === 'function') {
+      const hd = os.homedir();
+      if (typeof hd === 'string' && hd.length > 0) {
+        return hd;
+      }
+    }
+  } catch {
+    // ignore
+  }
+  return process.env.HOME || process.env.USERPROFILE || '/';
+}
 
 /**
  * Returns the base AI Fabrix directory.
- * Respects AIFABRIX_HOME environment variable, otherwise defaults to ~/.aifabrix
+ * Resolved from config.yaml `aifabrix-home` (stored under OS home).
+ * Falls back to ~/.aifabrix when not specified.
  *
  * @returns {string} Absolute path to the AI Fabrix home directory
  */
 function getAifabrixHome() {
-  // In test environments, ignore AIFABRIX_HOME to keep deterministic paths for unit tests
-  // Jest sets JEST_WORKER_ID; NODE_ENV may be 'test'
-  const isTestEnv = process.env.NODE_ENV === 'test' || process.env.JEST_WORKER_ID !== undefined;
-  if (isTestEnv) {
-    return path.join(os.homedir(), '.aifabrix');
-  }
-  const homeOverride = process.env.AIFABRIX_HOME && String(process.env.AIFABRIX_HOME).trim();
-  if (homeOverride) {
-    return path.resolve(homeOverride);
+  try {
+    const configPath = path.join(safeHomedir(), '.aifabrix', 'config.yaml');
+    if (fs.existsSync(configPath)) {
+      const content = fs.readFileSync(configPath, 'utf8');
+      const config = yaml.load(content) || {};
+      const homeOverride = config && typeof config['aifabrix-home'] === 'string' ? config['aifabrix-home'].trim() : '';
+      if (homeOverride) {
+        return path.resolve(homeOverride);
+      }
+    }
+  } catch {
+    // Ignore errors and fall back to default
   }
-  return path.join(os.homedir(), '.aifabrix');
+  return path.join(safeHomedir(), '.aifabrix');
 }
 
 /**

package/lib/utils/secrets-path.js

@@ -11,54 +11,32 @@
 
 const fs = require('fs');
 const path = require('path');
-const os = require('os');
 const yaml = require('js-yaml');
 const config = require('../config');
 const paths = require('./paths');
 
 /**
- * Resolves secrets file path (backward compatibility)
- * Checks common locations if path is not provided
+ * Resolves secrets file path when an explicit path is provided.
+ * If not provided, returns default fallback under <home>/secrets.yaml.
  * @function resolveSecretsPath
  * @param {string} [secretsPath] - Path to secrets file (optional)
  * @returns {string} Resolved secrets file path
  */
 function resolveSecretsPath(secretsPath) {
-  let resolvedPath = secretsPath;
-
-  if (!resolvedPath) {
-    // Check common locations for secrets.local.yaml
-    const commonLocations = [
-      path.join(process.cwd(), '..', 'aifabrix-setup', 'secrets.local.yaml'),
-      path.join(process.cwd(), '..', '..', 'aifabrix-setup', 'secrets.local.yaml'),
-      path.join(process.cwd(), 'secrets.local.yaml'),
-      path.join(process.cwd(), '..', 'secrets.local.yaml'),
-      path.join(paths.getAifabrixHome(), 'secrets.yaml')
-    ];
-
-    // Find first existing file
-    for (const location of commonLocations) {
-      if (fs.existsSync(location)) {
-        resolvedPath = location;
-        break;
-      }
-    }
-
-    // If none found, use default location
-    if (!resolvedPath) {
-      resolvedPath = path.join(paths.getAifabrixHome(), 'secrets.yaml');
-    }
-  } else if (secretsPath.startsWith('..')) {
-    resolvedPath = path.resolve(process.cwd(), secretsPath);
+  if (secretsPath && secretsPath.startsWith('..')) {
+    return path.resolve(process.cwd(), secretsPath);
   }
-
-  return resolvedPath;
+  if (secretsPath) {
+    return secretsPath;
+  }
+  // Default fallback
+  return path.join(paths.getAifabrixHome(), 'secrets.yaml');
 }
 
 /**
  * Determines the actual secrets file paths that loadSecrets would use
  * Mirrors the cascading lookup logic from loadSecrets
- * Checks config.yaml for general secrets-path as fallback
+ * Uses config.yaml for default secrets path as fallback
  *
  * @async
  * @function getActualSecretsPath
@@ -78,8 +56,8 @@ async function getActualSecretsPath(secretsPath, appName) {
     };
   }
 
-  // Cascading lookup: user's file first
-  const userSecretsPath = path.join(os.homedir(), '.aifabrix', 'secrets.local.yaml');
+  // Cascading lookup: user's file first (under configured home)
+  const userSecretsPath = path.join(paths.getAifabrixHome(), 'secrets.local.yaml');
 
   // Check build.secrets from variables.yaml if appName provided
   let buildSecretsPath = null;
@@ -102,15 +80,14 @@ async function getActualSecretsPath(secretsPath, appName) {
     }
   }
 
-  // If no build.secrets found in variables.yaml, check config.yaml for general secrets-path
+  // If no build.secrets found in variables.yaml, check config.yaml for canonical secrets path
   if (!buildSecretsPath) {
     try {
-      const generalSecretsPath = await config.getSecretsPath();
-      if (generalSecretsPath) {
-        // Resolve relative paths from current working directory
-        buildSecretsPath = path.isAbsolute(generalSecretsPath)
-          ? generalSecretsPath
-          : path.resolve(process.cwd(), generalSecretsPath);
+      const canonicalSecretsPath = await config.getAifabrixSecretsPath();
+      if (canonicalSecretsPath) {
+        buildSecretsPath = path.isAbsolute(canonicalSecretsPath)
+          ? canonicalSecretsPath
+          : path.resolve(process.cwd(), canonicalSecretsPath);
       }
     } catch (error) {
       // Ignore errors, continue

package/package.json

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

package/templates/applications/README.md.hbs

@@ -148,11 +148,13 @@ aifabrix login --method credentials --app {{appName}} --environment dev
 aifabrix login --method credentials --app {{appName}} --client-id $CLIENT_ID --client-secret $CLIENT_SECRET --environment dev
 ```
 
-### Environment Variables
+### Configuration
 
-```bash
-export AIFABRIX_HOME=/custom/path
-export AIFABRIX_SECRETS=/path/to/secrets.yaml
+Set overrides in `~/.aifabrix/config.yaml`:
+
+```yaml
+aifabrix-home: "/custom/path"
+aifabrix-secrets: "/path/to/secrets.yaml"
 ```
 
 ---