luxlabs 1.0.20 → 1.0.21

package/lib/config.js

@@ -4,48 +4,78 @@ const os = require('os');
 
 // Shared storage directory (used by both Electron app and CLI)
 const LUX_STUDIO_DIR = path.join(os.homedir(), '.lux-studio');
-const ACTIVE_ORG_FILE = path.join(LUX_STUDIO_DIR, 'active-org.json');
+const UNIFIED_CONFIG_FILE = path.join(LUX_STUDIO_DIR, 'config.json');
 const INTERFACE_FILE = '.lux/interface.json';
 
+// Cache for unified config to avoid repeated file reads
+let _unifiedConfigCache = null;
+let _unifiedConfigMtime = null;
+
 /**
- * Load active org from shared storage
- * Returns { orgId, orgName } or null
+ * Load the unified config file (~/.lux-studio/config.json)
+ * This is the single source of truth used by both Electron app and CLI
  */
-function loadActiveOrg() {
-  if (!fs.existsSync(ACTIVE_ORG_FILE)) {
+function loadUnifiedConfig() {
+  if (!fs.existsSync(UNIFIED_CONFIG_FILE)) {
     return null;
   }
 
   try {
-    const content = fs.readFileSync(ACTIVE_ORG_FILE, 'utf8');
-    return JSON.parse(content);
+    // Check if file has changed since last read
+    const stats = fs.statSync(UNIFIED_CONFIG_FILE);
+    if (_unifiedConfigCache && _unifiedConfigMtime && stats.mtimeMs === _unifiedConfigMtime) {
+      return _unifiedConfigCache;
+    }
+
+    const content = fs.readFileSync(UNIFIED_CONFIG_FILE, 'utf8');
+    _unifiedConfigCache = JSON.parse(content);
+    _unifiedConfigMtime = stats.mtimeMs;
+    return _unifiedConfigCache;
   } catch (error) {
     return null;
   }
 }
 
 /**
- * Load credentials for a specific org
- * Returns { apiKey, orgId, orgName } or null
+ * Load active org from unified config
+ * Returns { orgId, orgName } or null
  */
-function loadOrgCredentials(orgId) {
-  const credentialsPath = path.join(LUX_STUDIO_DIR, orgId, 'credentials.json');
-
-  if (!fs.existsSync(credentialsPath)) {
+function loadActiveOrg() {
+  const unifiedConfig = loadUnifiedConfig();
+  if (!unifiedConfig || !unifiedConfig.currentOrg) {
     return null;
   }
 
-  try {
-    const content = fs.readFileSync(credentialsPath, 'utf8');
-    return JSON.parse(content);
-  } catch (error) {
+  const orgId = unifiedConfig.currentOrg;
+  const orgData = unifiedConfig.orgs?.[orgId];
+
+  return {
+    orgId,
+    orgName: orgData?.name || null,
+  };
+}
+
+/**
+ * Load credentials for a specific org from unified config
+ * Returns { apiKey, orgId, orgName } or null
+ */
+function loadOrgCredentials(orgId) {
+  const unifiedConfig = loadUnifiedConfig();
+  if (!unifiedConfig || !unifiedConfig.orgs?.[orgId]) {
     return null;
   }
+
+  const orgData = unifiedConfig.orgs[orgId];
+  return {
+    apiKey: orgData.apiKey,
+    orgId: orgId,
+    orgName: orgData.name || null,
+  };
 }
 
 /**
  * Load config for the currently active org
- * Reads from ~/.lux-studio/active-org.json to get org, then loads credentials
+ * Reads from unified ~/.lux-studio/config.json
  */
 function loadConfig() {
   // Check for env vars first (for CI/automation)
@@ -56,22 +86,22 @@ function loadConfig() {
     };
   }
 
-  // Load active org from shared storage
-  const activeOrg = loadActiveOrg();
-  if (!activeOrg || !activeOrg.orgId) {
+  const unifiedConfig = loadUnifiedConfig();
+  if (!unifiedConfig || !unifiedConfig.currentOrg) {
     return null;
   }
 
-  // Load credentials for that org
-  const credentials = loadOrgCredentials(activeOrg.orgId);
-  if (!credentials) {
+  const orgId = unifiedConfig.currentOrg;
+  const orgData = unifiedConfig.orgs?.[orgId];
+
+  if (!orgData || !orgData.apiKey) {
     return null;
   }
 
   return {
-    apiKey: credentials.apiKey,
-    orgId: credentials.orgId,
-    orgName: credentials.orgName,
+    apiKey: orgData.apiKey,
+    orgId: orgId,
+    orgName: orgData.name || null,
   };
 }
 
@@ -283,22 +313,14 @@ function deleteLocalFlow(flowId) {
 }
 
 /**
- * Get the current project ID from org config
+ * Get the current project ID from unified config
  * Defaults to 'default' if not set
  */
 function getProjectId() {
-  const orgId = getOrgId();
-  if (!orgId) return 'default';
+  const unifiedConfig = loadUnifiedConfig();
+  if (!unifiedConfig) return 'default';
 
-  const orgConfigPath = path.join(LUX_STUDIO_DIR, orgId, 'config.json');
-  if (!fs.existsSync(orgConfigPath)) return 'default';
-
-  try {
-    const orgConfig = JSON.parse(fs.readFileSync(orgConfigPath, 'utf8'));
-    return orgConfig.currentProject || 'default';
-  } catch {
-    return 'default';
-  }
+  return unifiedConfig.currentProject || 'default';
 }
 
 /**
@@ -392,6 +414,7 @@ module.exports = {
   saveConfig,
   loadActiveOrg,
   loadOrgCredentials,
+  loadUnifiedConfig,
   loadInterfaceConfig,
   saveInterfaceConfig,
   getApiUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "luxlabs",
-  "version": "1.0.20",
+  "version": "1.0.21",
   "description": "CLI tool for Lux - Upload and deploy interfaces from your terminal",
   "author": "Jason Henkel <jason@uselux.ai>",
   "license": "SEE LICENSE IN LICENSE",