luxlabs 1.0.21 → 1.0.24

package/commands/interface/init.js

@@ -77,14 +77,14 @@ async function initInterface(options) {
   // Check authentication
   if (!isAuthenticated()) {
     console.log(
-      chalk.red('❌ Not authenticated. Run'),
+      chalk.red('Not authenticated. Run'),
       chalk.white('lux login'),
       chalk.red('first.')
     );
     process.exit(1);
   }
 
-  console.log(chalk.cyan('\n📦 Initialize New App\n'));
+  console.log(chalk.cyan('\nInitialize New App\n'));
   console.log(chalk.dim('─'.repeat(50)));
   console.log(chalk.blue('[STEP 0/6]'), 'Validating options...');
 
@@ -93,8 +93,8 @@ async function initInterface(options) {
   let description = options.description || '';
 
   if (!name) {
-    console.log(chalk.red('❌ --name flag is required'));
-    console.log(chalk.dim('Usage: lux i init --name <name> [--description <desc>]'));
+    console.log(chalk.red('--name flag is required'));
+    console.log(chalk.dim('Usage: lux i create --name <name> [--description <desc>]'));
     process.exit(1);
   }
 
@@ -105,12 +105,12 @@ async function initInterface(options) {
 
   // Check if interface with this slug already exists
   if (interfaceExists(slug)) {
-    console.log(chalk.red(`❌ Interface already exists: ${slug}`));
+    console.log(chalk.red(`Interface already exists: ${slug}`));
     console.log(chalk.dim('Use a different name or delete the existing interface first.'));
     process.exit(1);
   }
 
-  console.log(chalk.green('  ✓ Options validated'));
+  console.log(chalk.green('  Options validated'));
   console.log(chalk.dim('─'.repeat(50)));
 
   try {
@@ -138,23 +138,23 @@ async function initInterface(options) {
     const vercelProjectId = interfaceData.vercel_project_id;
     const vercelProjectUrl = interfaceData.vercel_project_url;
 
-    console.log(chalk.green('  ✓ Interface registered in database'));
+    console.log(chalk.green('  Interface registered in database'));
     console.log(chalk.dim('  Interface ID:'), interfaceId);
     if (githubRepoUrl) {
-      console.log(chalk.green('  ✓ GitHub repository created'));
+      console.log(chalk.green('  GitHub repository created'));
       console.log(chalk.dim('  GitHub URL:'), githubRepoUrl);
     } else {
-      console.log(chalk.yellow('  ⚠ No GitHub repository URL returned'));
+      console.log(chalk.yellow('  No GitHub repository URL returned'));
     }
 
     if (vercelProjectId) {
-      console.log(chalk.green('  ✓ Vercel project created'));
+      console.log(chalk.green('  Vercel project created'));
       console.log(chalk.dim('  Vercel Project ID:'), vercelProjectId);
       if (vercelProjectUrl) {
         console.log(chalk.dim('  Vercel Dashboard:'), vercelProjectUrl);
       }
     } else {
-      console.log(chalk.yellow('  ⚠ Vercel project not created (may need VERCEL_TOKEN)'));
+      console.log(chalk.yellow('  Vercel project not created (may need VERCEL_TOKEN)'));
     }
 
     console.log(chalk.dim('─'.repeat(50)));
@@ -175,15 +175,15 @@ async function initInterface(options) {
           });
           if (tokenRes.data?.token) {
             githubToken = tokenRes.data.token;
-            console.log(chalk.green('  ✓ GitHub token fetched from API'));
+            console.log(chalk.green('  GitHub token fetched from API'));
           } else {
-            console.log(chalk.yellow('  ⚠ No token returned from API'));
+            console.log(chalk.yellow('  No token returned from API'));
           }
         } catch (tokenErr) {
-          console.log(chalk.yellow('  ⚠ Failed to fetch token:'), tokenErr.message);
+          console.log(chalk.yellow('  Failed to fetch token:'), tokenErr.message);
         }
       } else {
-        console.log(chalk.green('  ✓ Using local GitHub token'));
+        console.log(chalk.green('  Using local GitHub token'));
       }
       console.log(chalk.dim('─'.repeat(50)));
 
@@ -200,7 +200,7 @@ async function initInterface(options) {
         console.log(chalk.dim('  Repo dir:'), repoDir);
 
         if (fs.existsSync(repoDir)) {
-          console.log(chalk.yellow('  ⚠ Project directory already exists'));
+          console.log(chalk.yellow('  Project directory already exists'));
         } else {
           fs.mkdirSync(repoDir, { recursive: true });
           console.log(chalk.dim('  Created directory'));
@@ -217,10 +217,10 @@ async function initInterface(options) {
           // List what was copied
           const copiedFiles = fs.readdirSync(repoDir);
           console.log(chalk.dim('  Copied files:'), copiedFiles.join(', '));
-          console.log(chalk.green('  ✓ Template files copied successfully'));
+          console.log(chalk.green('  Template files copied successfully'));
         }
       } catch (copyError) {
-        console.log(chalk.red('  ✗ Failed to copy templates:'), copyError.message);
+        console.log(chalk.red('  Failed to copy templates:'), copyError.message);
         throw copyError;
       }
       console.log(chalk.dim('─'.repeat(50)));
@@ -233,9 +233,9 @@ async function initInterface(options) {
         const npmStart = Date.now();
         await runNpmInstall(repoDir);
         const npmDuration = ((Date.now() - npmStart) / 1000).toFixed(1);
-        console.log(chalk.green(`  ✓ Dependencies installed (${npmDuration}s)`));
+        console.log(chalk.green(`  Dependencies installed (${npmDuration}s)`));
       } catch (npmError) {
-        console.log(chalk.yellow(`  ⚠ npm install failed: ${npmError.message}`));
+        console.log(chalk.yellow(`  npm install failed: ${npmError.message}`));
         console.log(chalk.dim('  Dependencies will be installed when you start the dev server'));
       }
       console.log(chalk.dim('─'.repeat(50)));
@@ -250,34 +250,34 @@ async function initInterface(options) {
           const hasNodeModules = gitignoreContent.includes('node_modules');
           console.log(chalk.dim('  .gitignore exists:'), hasNodeModules ? 'includes node_modules' : 'WARNING: missing node_modules!');
         } else {
-          console.log(chalk.yellow('  ⚠ No .gitignore found'));
+          console.log(chalk.yellow('  No .gitignore found'));
         }
 
         // Initialize git repo
         await runGitCommand(['init'], repoDir);
-        console.log(chalk.green('  ✓ git init completed'));
+        console.log(chalk.green('  git init completed'));
 
         // Add remote origin
         if (githubToken) {
           const targetUrl = githubRepoUrl.replace('https://github.com/', `https://${githubToken}@github.com/`) + '.git';
           await runGitCommand(['remote', 'add', 'origin', targetUrl], repoDir);
-          console.log(chalk.green('  ✓ Remote origin added'));
+          console.log(chalk.green('  Remote origin added'));
           console.log(chalk.dim('  Remote URL:'), githubRepoUrl + '.git');
         } else {
-          console.log(chalk.yellow('  ⚠ No GitHub token - remote not added'));
+          console.log(chalk.yellow('  No GitHub token - remote not added'));
         }
 
         // Set main branch
         await runGitCommand(['branch', '-M', 'main'], repoDir);
-        console.log(chalk.green('  ✓ Branch set to main'));
+        console.log(chalk.green('  Branch set to main'));
 
         // Initial commit (but don't push yet - that happens on first deploy)
         await runGitCommand(['add', '.'], repoDir);
         await runGitCommand(['commit', '-m', 'Initial commit from Lux Studio'], repoDir);
-        console.log(chalk.green('  ✓ Initial commit created'));
+        console.log(chalk.green('  Initial commit created'));
         console.log(chalk.dim('  Note: Push to GitHub will happen on first deploy'));
       } catch (gitError) {
-        console.log(chalk.yellow(`  ⚠ Git setup failed: ${gitError.message}`));
+        console.log(chalk.yellow(`  Git setup failed: ${gitError.message}`));
       }
       console.log(chalk.dim('─'.repeat(50)));
 
@@ -289,6 +289,7 @@ async function initInterface(options) {
           slug,  // Keep slug for display/reference
           name,
           description,
+          version: 0,  // Draft interfaces start at version 0
           status: 'draft',  // New interfaces are drafts until first deploy
           githubUrl: githubRepoUrl,
           vercelProjectId: vercelProjectId || null,
@@ -296,14 +297,14 @@ async function initInterface(options) {
           createdAt: new Date().toISOString(),
           updatedAt: new Date().toISOString(),
         });
-        console.log(chalk.green('  ✓ Metadata saved'));
+        console.log(chalk.green('  Metadata saved'));
         console.log(chalk.dim('  ID:'), interfaceId);
         console.log(chalk.dim('  Slug:'), slug);
         if (vercelProjectId) {
           console.log(chalk.dim('  Vercel:'), vercelProjectId);
         }
       } catch (metadataError) {
-        console.log(chalk.red('  ✗ Failed to save metadata:'), metadataError.message);
+        console.log(chalk.red('  Failed to save metadata:'), metadataError.message);
       }
       console.log(chalk.dim('─'.repeat(50)));
 
@@ -316,7 +317,7 @@ async function initInterface(options) {
         console.log(`Vercel project: ${vercelProjectId}`);
       }
 
-      console.log(chalk.green('\n✅ Interface created successfully!\n'));
+      console.log(chalk.green('\nInterface created successfully!\n'));
       console.log(chalk.dim('  Created:'));
       console.log(chalk.dim('    • Registered in system.interfaces'));
       console.log(chalk.dim('    • GitHub repository created'));
@@ -336,7 +337,7 @@ async function initInterface(options) {
       // No GitHub URL - output parseable format anyway (cloud-only interface)
       console.log(`App created: ${interfaceId}`);
 
-      console.log(chalk.yellow('\n⚠ No GitHub URL returned - skipping local setup'));
+      console.log(chalk.yellow('\nNo GitHub URL returned - skipping local setup'));
       console.log(chalk.dim('\n  Created:'));
       console.log(chalk.dim('    • Registered in system.interfaces'));
       console.log(chalk.cyan('\n  Next steps:'));
@@ -345,12 +346,12 @@ async function initInterface(options) {
 
     process.exit(0);
   } catch (error) {
-    console.log(chalk.red('\n❌ Failed to initialize interface'));
+    console.log(chalk.red('\nFailed to initialize interface'));
 
     // Detailed error logging
     if (error.response) {
       // Server responded with an error status
-      console.error(chalk.red('\n❌ API Error:'));
+      console.error(chalk.red('\nAPI Error:'));
       console.error(chalk.dim('  Status:'), error.response.status);
       console.error(chalk.dim('  Message:'), error.response.data?.error || error.response.data?.message || 'Unknown error');
       if (error.response.data?.details) {
@@ -361,12 +362,12 @@ async function initInterface(options) {
       }
     } else if (error.request) {
       // Request was made but no response received
-      console.error(chalk.red('\n❌ Network Error:'));
+      console.error(chalk.red('\nNetwork Error:'));
       console.error(chalk.dim('  No response received from server'));
       console.error(chalk.dim('  URL:'), error.config?.url);
     } else {
       // Something else went wrong
-      console.error(chalk.red('\n❌ Error:'), error.message);
+      console.error(chalk.red('\nError:'), error.message);
     }
 
     process.exit(1);

package/commands/interface.js

@@ -15,6 +15,9 @@ const chalk = require('chalk');
 // Import from modular files
 const { initInterface } = require('./interface/init');
 const { getInterfacePath } = require('./interface/path');
+const { screenshot, click, type: typeText, evaluate, getUrl, navigate, wait, startPreview } = require('./webview');
+const { getLogs: getTerminalLogs, getBrowserConsoleLogs, handleServers } = require('./servers');
+const { handleABTests } = require('./ab-tests');
 
 /**
  * Deploy interface to production
@@ -33,9 +36,9 @@ async function listInterfaces(options) {
 }
 
 /**
- * View interface logs
+ * View deployed interface logs (build or runtime from Vercel)
  */
-async function viewLogs(options) {
+async function viewDeployedLogs(options) {
   const { logs } = require('./logs');
   await logs(options);
 }
@@ -75,15 +78,20 @@ function showHelp() {
   console.log(chalk.dim('    Create new interface'));
   console.log(chalk.dim('    Required: --name <interface-name>'));
   console.log(chalk.dim('    Optional: --description <desc>\n'));
-  console.log(chalk.white('  lux interface init') + chalk.dim(' (alias for create)\n'));
   console.log(chalk.white('  lux interface list') + chalk.dim(' (or lux i list)'));
   console.log(chalk.dim('    List all interfaces\n'));
   console.log(chalk.white('  lux interface path <name-or-id>'));
   console.log(chalk.dim('    Get local repo path for an interface\n'));
   console.log(chalk.white('  lux interface deploy') + chalk.dim(' (or lux i deploy)'));
   console.log(chalk.dim('    Deploy interface to production\n'));
-  console.log(chalk.white('  lux interface logs') + chalk.dim(' (or lux i logs)'));
-  console.log(chalk.dim('    View interface logs\n'));
+  console.log(chalk.white('  lux interface logs <name-or-id>') + chalk.dim(' (or lux i logs)'));
+  console.log(chalk.dim('    View interface logs'));
+  console.log(chalk.dim('    Optional: --type <deployed|terminal|console> (default: terminal)'));
+  console.log(chalk.dim('    Optional: --lines <number> (default: 50)\n'));
+  console.log(chalk.white('  lux interface servers [subcommand]') + chalk.dim(' (or lux i servers)'));
+  console.log(chalk.dim('    Manage dev servers (list, restart)\n'));
+  console.log(chalk.white('  lux interface ab-tests [subcommand]') + chalk.dim(' (or lux i ab-tests)'));
+  console.log(chalk.dim('    Manage A/B tests (list-tests, get-test, get-variant)\n'));
 }
 
 /**
@@ -96,23 +104,140 @@ async function handleInterface(subcommand, args) {
   }
 
   switch (subcommand) {
-    case 'init':
     case 'create':
       await initInterface(parseOptions(args));
       break;
-    case 'deploy':
-      await deployInterface(parseOptions(args));
+    case 'deploy': {
+      const deployOpts = parseOptions(args);
+      // First non-flag arg is the interface ID
+      const deployId = args.find(a => !a.startsWith('-'));
+      if (deployId) deployOpts.id = deployId;
+      await deployInterface(deployOpts);
       break;
+    }
     case 'list':
     case 'ls':
       await listInterfaces(parseOptions(args));
       break;
-    case 'logs':
-      await viewLogs(parseOptions(args));
+    case 'logs': {
+      const logsId = args.find(a => !a.startsWith('-'));
+      const logsOpts = parseOptions(args);
+      const logType = logsOpts.type || 'terminal';
+      const logLines = parseInt(logsOpts.lines || '50', 10);
+
+      if (!logsId) {
+        console.log(chalk.red('Error: interface name or ID is required'));
+        console.log(chalk.dim('Usage: lux i logs <name-or-id> [--type deployed|terminal|console] [--lines <number>]'));
+        return;
+      }
+
+      if (logType === 'deployed') {
+        await viewDeployedLogs({ id: logsId, type: 'runtime' });
+      } else if (logType === 'console') {
+        await getBrowserConsoleLogs(logsId, { lines: logLines });
+      } else {
+        // Default: terminal logs
+        await getTerminalLogs(logsId, { lines: logLines });
+      }
       break;
+    }
     case 'path':
       await getInterfacePath(args[0]);
       break;
+    case 'screenshot': {
+      const interfaceId = args[0];
+      if (!interfaceId) {
+        console.log(chalk.red('Error: interface name or ID is required'));
+        console.log(chalk.dim('Usage: lux i screenshot <name-or-id>'));
+        return;
+      }
+      await screenshot(interfaceId, args[1]);
+      break;
+    }
+    case 'click': {
+      const interfaceId = args[0];
+      const selector = args[1];
+      if (!interfaceId || !selector) {
+        console.log(chalk.red('Error: interface name or ID and selector are required'));
+        console.log(chalk.dim('Usage: lux i click <name-or-id> <selector>'));
+        return;
+      }
+      await click(interfaceId, selector);
+      break;
+    }
+    case 'type': {
+      const interfaceId = args[0];
+      const selector = args[1];
+      const text = args.slice(2).join(' ');
+      if (!interfaceId || !selector || !text) {
+        console.log(chalk.red('Error: interface name or ID, selector, and text are required'));
+        console.log(chalk.dim('Usage: lux i type <name-or-id> <selector> <text>'));
+        return;
+      }
+      await typeText(interfaceId, selector, text);
+      break;
+    }
+    case 'eval': {
+      const interfaceId = args[0];
+      const code = args.slice(1).join(' ');
+      if (!interfaceId || !code) {
+        console.log(chalk.red('Error: interface name or ID and code are required'));
+        console.log(chalk.dim('Usage: lux i eval <name-or-id> <code>'));
+        return;
+      }
+      await evaluate(interfaceId, code);
+      break;
+    }
+    case 'url': {
+      const interfaceId = args[0];
+      if (!interfaceId) {
+        console.log(chalk.red('Error: interface name or ID is required'));
+        console.log(chalk.dim('Usage: lux i url <name-or-id>'));
+        return;
+      }
+      await getUrl(interfaceId);
+      break;
+    }
+    case 'nav':
+    case 'navigate': {
+      const interfaceId = args[0];
+      const url = args[1];
+      if (!interfaceId || !url) {
+        console.log(chalk.red('Error: interface name or ID and URL are required'));
+        console.log(chalk.dim('Usage: lux i nav <name-or-id> <url>'));
+        return;
+      }
+      await navigate(interfaceId, url);
+      break;
+    }
+    case 'wait': {
+      const interfaceId = args[0];
+      const ms = args[1];
+      if (!interfaceId || !ms) {
+        console.log(chalk.red('Error: interface name or ID and duration are required'));
+        console.log(chalk.dim('Usage: lux i wait <name-or-id> <ms>'));
+        return;
+      }
+      await wait(interfaceId, ms);
+      break;
+    }
+    case 'preview': {
+      const interfaceId = args[0];
+      if (!interfaceId) {
+        console.log(chalk.red('Error: interface name or ID is required'));
+        console.log(chalk.dim('Usage: lux i preview <name-or-id>'));
+        return;
+      }
+      await startPreview(interfaceId);
+      break;
+    }
+    case 'servers':
+      await handleServers(args);
+      break;
+    case 'ab-tests':
+    case 'experiments':
+      await handleABTests(args);
+      break;
     default:
       console.log(chalk.red(`Unknown subcommand: ${subcommand}`));
       showHelp();

package/commands/knowledge.js

@@ -27,7 +27,7 @@ async function handleKnowledge(args) {
   // Check authentication
   if (!isAuthenticated()) {
     console.log(
-      chalk.red('❌ Not authenticated. Run'),
+      chalk.red('Not authenticated. Run'),
       chalk.white('lux login'),
       chalk.red('first.')
     );
@@ -97,13 +97,13 @@ ${chalk.bold('Examples:')}
       function printTree(nodes, indent = '') {
         for (const node of nodes) {
           if (node.type === 'folder') {
-            console.log(`${indent}${chalk.blue('📁')} ${chalk.bold(node.name)}/`);
+            console.log(`${indent}${chalk.blue('[dir]')} ${chalk.bold(node.name)}/`);
             if (node.children && node.children.length > 0) {
               printTree(node.children, indent + '  ');
             }
           } else {
             const size = node.size ? ` (${formatFileSize(node.size)})` : '';
-            console.log(`${indent}${chalk.gray('📄')} ${node.name}${chalk.gray(size)}`);
+            console.log(`${indent}${chalk.gray('-')} ${node.name}${chalk.gray(size)}`);
           }
         }
       }

package/commands/list.js

@@ -6,7 +6,7 @@ async function list(options) {
   // Check authentication
   if (!isAuthenticated()) {
     console.log(
-      chalk.red('❌ Not authenticated. Run'),
+      chalk.red('Not authenticated. Run'),
       chalk.white('lux login'),
       chalk.red('first.')
     );
@@ -26,43 +26,25 @@ async function list(options) {
       console.log(chalk.yellow('\nNo interfaces found.'));
       console.log(
         chalk.dim('Create one with:'),
-        chalk.white('lux init'),
-        chalk.dim('and'),
-        chalk.white('lux up\n')
+        chalk.white('lux i create --name <name>\n')
       );
       return;
     }
 
-    console.log(chalk.cyan(`\n📦 Interfaces (${interfaces.length})\n`));
+    console.log(chalk.cyan(`\nInterfaces (${interfaces.length})\n`));
 
     for (const iface of interfaces) {
       const status = getStatusDisplay(iface.status);
 
       console.log(
-        `📱 ${chalk.white(iface.name)} ${chalk.dim(`(${iface.id})`)}`
+        `  ${chalk.white(iface.name)}  ${chalk.dim(iface.description || 'No description')}  ${chalk.dim(iface.id)}  ${status}`
       );
-      console.log(
-        `   ${status} ${chalk.dim(iface.description || 'No description')}`
-      );
-
-      if (iface.vercel_deployment_url) {
-        console.log(`   ${chalk.cyan(iface.vercel_deployment_url)}`);
-      }
-
-      if (iface.github_repo_url) {
-        console.log(`   ${chalk.dim(iface.github_repo_url)}`);
-      }
-
-      console.log('');
     }
 
-    console.log(
-      chalk.dim('Link to an interface: '),
-      chalk.white('lux link <interface-id>\n')
-    );
+    console.log('');
   } catch (error) {
     console.error(
-      chalk.red('\n❌ Error:'),
+      chalk.red('Error:'),
       error.response?.data?.error || error.message
     );
 

package/commands/login.js

@@ -4,7 +4,7 @@ const chalk = require('chalk');
 const ora = require('ora');
 const inquirer = require('inquirer');
 const axios = require('axios');
-const { saveConfig, getApiUrl, loadConfig } = require('../lib/config');
+const { getApiUrl, loadConfig, loadUnifiedConfig, saveUnifiedConfig } = require('../lib/config');
 
 async function login(options) {
   // Non-interactive mode with --key flag
@@ -19,8 +19,8 @@ async function login(options) {
       name: 'method',
       message: 'How do you want to authenticate?',
       choices: [
-        { name: '🌐 Browser (recommended)', value: 'browser' },
-        { name: '🔑 Enter API key manually', value: 'manual' },
+        { name: 'Browser (recommended)', value: 'browser' },
+        { name: 'Enter API key manually', value: 'manual' },
       ],
     },
   ]);
@@ -36,7 +36,7 @@ async function browserLogin() {
   const app = express();
   const port = 8976;
 
-  console.log(chalk.cyan('\n🔐 Authenticating with Lux...\n'));
+  console.log(chalk.cyan('\nAuthenticating with Lux...\n'));
 
   return new Promise((resolve, reject) => {
     let tokenReceived = false;
@@ -58,7 +58,7 @@ async function browserLogin() {
             </head>
             <body>
               <div class="container">
-                <div class="error">❌ Authentication Failed</div>
+                <div class="error">Authentication Failed</div>
                 <p>Please try again from your terminal.</p>
               </div>
             </body>
@@ -95,7 +95,7 @@ async function browserLogin() {
           </head>
           <body>
             <div class="container">
-              <div class="success">✓ Authentication Successful!</div>
+              <div class="success">Authentication Successful!</div>
               <p>You can now close this window and return to your terminal.</p>
               <p class="info">Org ID: ${orgId}</p>
             </div>
@@ -115,7 +115,7 @@ async function browserLogin() {
 
       try {
         await open(authUrl);
-        console.log(chalk.yellow('⏳ Waiting for authentication...\n'));
+        console.log(chalk.yellow('Waiting for authentication...\n'));
       } catch (error) {
         console.log(chalk.red('Could not open browser automatically.'));
         console.log(chalk.yellow(`\nPlease open this URL in your browser:\n`));
@@ -135,13 +135,13 @@ async function browserLogin() {
     );
   })
     .then((config) => {
-      console.log(chalk.green('✓ Successfully authenticated!\n'));
+      console.log(chalk.green('Successfully authenticated!\n'));
       console.log(chalk.dim(`Org ID: ${config.orgId}\n`));
       console.log(chalk.cyan('You can now use Lux CLI commands.\n'));
       process.exit(0);
     })
     .catch((error) => {
-      console.error(chalk.red('\n❌ Authentication failed:'), error.message);
+      console.error(chalk.red('\nAuthentication failed:'), error.message);
       process.exit(1);
     });
 }
@@ -176,28 +176,33 @@ async function manualLogin(providedKey) {
   try {
     const apiUrl = getApiUrl();
 
-    // Validate the API key by making a test request
-    const response = await axios.get(`${apiUrl}/api/flows`, {
+    // Validate the API key via the proper user-auth endpoint (SHA-256 hashed lookup)
+    const response = await axios.post(`${apiUrl}/api/user-auth/token/validate`, null, {
       headers: {
         Authorization: `Bearer ${apiKey}`,
-        'X-Org-Id': extractOrgIdFromKey(apiKey),
       },
     });
 
-    if (response.status === 200) {
-      spinner.succeed(chalk.green('✓ API key validated successfully!'));
+    if (response.status === 200 && response.data?.valid) {
+      spinner.succeed(chalk.green('API key validated successfully!'));
 
-      // Save config
-      const config = {
-        token: apiKey,
-        orgId: extractOrgIdFromKey(apiKey),
-        timestamp: Date.now(),
-      };
+      // Save credentials to unified config
+      const orgId = response.data.org_id || extractOrgIdFromKey(apiKey);
+      const unified = loadUnifiedConfig();
+      if (!unified.orgs) unified.orgs = {};
+      if (!unified.orgs[orgId]) unified.orgs[orgId] = {};
+      unified.orgs[orgId].apiKey = apiKey;
+      unified.currentOrg = orgId;
 
-      saveConfig(config);
+      // Restore currentProject if the org has projects and none is set
+      if (!unified.currentProject && unified.orgs[orgId]?.projects?.length) {
+        unified.currentProject = unified.orgs[orgId].projects[0];
+      }
 
-      console.log(chalk.green('\n✓ Successfully authenticated!\n'));
-      console.log(chalk.dim(`Org ID: ${config.orgId}\n`));
+      saveUnifiedConfig(unified);
+
+      console.log(chalk.green('\nSuccessfully authenticated!\n'));
+      console.log(chalk.dim(`Org ID: ${orgId}\n`));
       console.log(chalk.cyan('You can now use Lux CLI commands.\n'));
     }
   } catch (error) {
@@ -205,11 +210,11 @@ async function manualLogin(providedKey) {
 
     if (error.response?.status === 401 || error.response?.status === 403) {
       console.error(
-        chalk.red('\n❌ Invalid or expired API key. Please check your key and try again.\n')
+        chalk.red('\nInvalid or expired API key. Please check your key and try again.\n')
       );
     } else {
       console.error(
-        chalk.red('\n❌ Error:'),
+        chalk.red('\nError:'),
         error.response?.data?.error || error.message
       );
     }
@@ -238,7 +243,7 @@ async function logout() {
   const { saveConfig } = require('../lib/config');
   saveConfig({});
 
-  console.log(chalk.green('✓ Successfully logged out'));
+  console.log(chalk.green('Successfully logged out'));
 }
 
 module.exports = {