upfynai-code 2.2.0 → 2.3.0

package/server/cli.js

@@ -8,6 +8,7 @@
  * Commands:
  *   (no args)     - Start the server (default)
  *   start         - Start the server
+ *   connect       - Connect to hosted server (relay bridge)
  *   status        - Show configuration and data locations
  *   help          - Show help information
  *   version       - Show version information
@@ -18,37 +19,20 @@ import path from 'path';
 import os from 'os';
 import { fileURLToPath } from 'url';
 import { dirname } from 'path';
+import {
+    c,
+    showStyledHelp,
+    showStyledStatus,
+    showServerBanner,
+    showConnectStartup,
+    showConnectionBanner,
+    logRelayEvent,
+    createSpinner,
+} from './cli-ui.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
-// ANSI color codes for terminal output
-const colors = {
-    reset: '\x1b[0m',
-    bright: '\x1b[1m',
-    dim: '\x1b[2m',
-
-    // Foreground colors
-    cyan: '\x1b[36m',
-    green: '\x1b[32m',
-    yellow: '\x1b[33m',
-    blue: '\x1b[34m',
-    magenta: '\x1b[35m',
-    white: '\x1b[37m',
-    gray: '\x1b[90m',
-};
-
-// Helper to colorize text
-const c = {
-    info: (text) => `${colors.cyan}${text}${colors.reset}`,
-    ok: (text) => `${colors.green}${text}${colors.reset}`,
-    warn: (text) => `${colors.yellow}${text}${colors.reset}`,
-    error: (text) => `${colors.yellow}${text}${colors.reset}`,
-    tip: (text) => `${colors.blue}${text}${colors.reset}`,
-    bright: (text) => `${colors.bright}${text}${colors.reset}`,
-    dim: (text) => `${colors.dim}${text}${colors.reset}`,
-};
-
 // Load package.json for version info
 const packageJsonPath = path.join(__dirname, '../package.json');
 const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
@@ -83,123 +67,32 @@ function getInstallDir() {
     return path.join(__dirname, '..');
 }
 
-// Show status command
+// Show status command — styled
 function showStatus() {
-    console.log(`\n${c.bright('Upfyn-Code - Status')}\n`);
-    console.log(c.dim('═'.repeat(60)));
-
-    // Version info
-    console.log(`\n${c.info('[INFO]')} Version: ${c.bright(packageJson.version)}`);
-
-    // Installation location
     const installDir = getInstallDir();
-    console.log(`\n${c.info('[INFO]')} Installation Directory:`);
-    console.log(`       ${c.dim(installDir)}`);
-
-    // Database location
     const dbPath = getDatabasePath();
     const dbExists = fs.existsSync(dbPath);
-    console.log(`\n${c.info('[INFO]')} Database Location:`);
-    console.log(`       ${c.dim(dbPath)}`);
-    console.log(`       Status: ${dbExists ? c.ok('[OK] Exists') : c.warn('[WARN] Not created yet (will be created on first run)')}`);
-
+    let dbSize = '';
     if (dbExists) {
         const stats = fs.statSync(dbPath);
-        console.log(`       Size: ${c.dim((stats.size / 1024).toFixed(2) + ' KB')}`);
-        console.log(`       Modified: ${c.dim(stats.mtime.toLocaleString())}`);
+        dbSize = (stats.size / 1024).toFixed(2) + ' KB';
     }
 
-    // Environment variables
-    console.log(`\n${c.info('[INFO]')} Configuration:`);
-    console.log(`       PORT: ${c.bright(process.env.PORT || '3001')} ${c.dim(process.env.PORT ? '' : '(default)')}`);
-    console.log(`       DATABASE_PATH: ${c.dim(process.env.DATABASE_PATH || '(using default location)')}`);
-    console.log(`       CLAUDE_CLI_PATH: ${c.dim(process.env.CLAUDE_CLI_PATH || 'claude (default)')}`);
-    console.log(`       CONTEXT_WINDOW: ${c.dim(process.env.CONTEXT_WINDOW || '160000 (default)')}`);
-
-    // Claude projects folder
-    const claudeProjectsPath = path.join(os.homedir(), '.claude', 'projects');
-    const projectsExists = fs.existsSync(claudeProjectsPath);
-    console.log(`\n${c.info('[INFO]')} Claude Projects Folder:`);
-    console.log(`       ${c.dim(claudeProjectsPath)}`);
-    console.log(`       Status: ${projectsExists ? c.ok('[OK] Exists') : c.warn('[WARN] Not found')}`);
-
-    // Config file location
-    const envFilePath = path.join(__dirname, '../.env');
-    const envExists = fs.existsSync(envFilePath);
-    console.log(`\n${c.info('[INFO]')} Configuration File:`);
-    console.log(`       ${c.dim(envFilePath)}`);
-    console.log(`       Status: ${envExists ? c.ok('[OK] Exists') : c.warn('[WARN] Not found (using defaults)')}`);
-
-    console.log('\n' + c.dim('═'.repeat(60)));
-    console.log(`\n${c.tip('[TIP]')} Hints:`);
-    console.log(`      ${c.dim('>')} Use ${c.bright('uc --port 8080')} to run on a custom port`);
-    console.log(`      ${c.dim('>')} Use ${c.bright('uc --database-path /path/to/db')} for custom database`);
-    console.log(`      ${c.dim('>')} Run ${c.bright('uc help')} for all options`);
-    console.log(`      ${c.dim('>')} Access the UI at http://localhost:${process.env.PORT || '3001'}\n`);
+    showStyledStatus({
+        version: packageJson.version,
+        installDir,
+        dbPath,
+        dbExists,
+        dbSize,
+        port: process.env.PORT || '3001',
+        portDefault: !process.env.PORT,
+        claudeCli: process.env.CLAUDE_CLI_PATH || null,
+    });
 }
 
-// Show help
+// Show help — styled
 function showHelp() {
-    console.log(`
-╔═══════════════════════════════════════════════════════════════╗
-║         Upfyn-Code — by Thinqmesh Technologies          ║
-║      Visual AI Coding Interface with tldraw Canvas            ║
-╚═══════════════════════════════════════════════════════════════╝
-
-Usage:
-  upfynai-code [command] [options]
-  uc [command] [options]
-
-Commands:
-  start              Start the server (default)
-  connect            Connect local machine to hosted server (relay bridge)
-  status             Show configuration and data locations
-  install-commands   Install /upfynai-* slash commands to ~/.claude/commands/
-  uninstall-commands Remove /upfynai-* slash commands
-  update             Update to the latest version
-  help               Show this help information
-  version            Show version information
-
-Slash Commands (inside your AI CLI):
-  /upfynai           Start the web UI server
-  /upfynai-connect   Connect CLI session to web UI
-  /upfynai-disconnect Disconnect from web UI
-  /upfynai-status    Show connection status
-  /upfynai-doctor    Run diagnostics
-  /upfynai-export    Export session/canvas data
-  /upfynai-stop      Stop the web UI server
-  /upfynai-local     Full local installation setup
-  /upfynai-uninstall Remove Upfyn-Code
-
-Options:
-  -p, --port <port>           Set server port (default: 3001)
-  --database-path <path>      Set custom database location
-  -h, --help                  Show this help information
-  -v, --version               Show version information
-
-Options:
-  --server <url>     Server URL for connect (default: https://upfynai.thinqmesh.com)
-  --key <token>      Relay token for connect (get from Settings > Relay Tokens)
-
-Examples:
-  $ uc                              # Start with defaults
-  $ uc --port 8080                  # Start on port 8080
-  $ uc connect --key upfyn_xxx      # Bridge to hosted server
-  $ uc start --port 4000            # Explicit start command
-  $ uc status                       # Show configuration
-
-Environment Variables:
-  PORT                Set server port (default: 3001)
-  DATABASE_PATH       Set custom database location
-  CLAUDE_CLI_PATH     Set custom Claude CLI path
-  CONTEXT_WINDOW      Set context window size (default: 160000)
-
-Documentation:
-  ${packageJson.homepage || 'https://github.com/AnitChaudhry/UpfynAI-Code'}
-
-Report Issues:
-  ${packageJson.bugs?.url || 'https://github.com/AnitChaudhry/UpfynAI-Code/issues'}
-`);
+    showStyledHelp(packageJson.version);
 }
 
 // Show version
@@ -226,16 +119,18 @@ async function checkForUpdates(silent = false) {
         const currentVersion = packageJson.version;
 
         if (isNewerVersion(latestVersion, currentVersion)) {
-            console.log(`\n${c.warn('[UPDATE]')} New version available: ${c.bright(latestVersion)} (current: ${currentVersion})`);
-            console.log(`         Run ${c.bright('uc update')} to update\n`);
+            if (!silent) {
+                console.log(`\n  ${c.yellow('⬆')} New version available: ${c.bBright(latestVersion)} ${c.dim(`(current: ${currentVersion})`)}`);
+                console.log(`    Run ${c.bright('uc update')} to update\n`);
+            }
             return { hasUpdate: true, latestVersion, currentVersion };
         } else if (!silent) {
-            console.log(`${c.ok('[OK]')} You are on the latest version (${currentVersion})`);
+            console.log(`  ${c.green('✓')} You are on the latest version (${currentVersion})`);
         }
         return { hasUpdate: false, latestVersion, currentVersion };
     } catch (e) {
         if (!silent) {
-            console.log(`${c.warn('[WARN]')} Could not check for updates`);
+            console.log(`  ${c.yellow('!')} Could not check for updates`);
         }
         return { hasUpdate: false, error: e.message };
     }
@@ -245,21 +140,23 @@ async function checkForUpdates(silent = false) {
 async function updatePackage() {
     try {
         const { execSync } = await import('child_process');
-        console.log(`${c.info('[INFO]')} Checking for updates...`);
+        const spinner = createSpinner('Checking for updates...');
+        spinner.start();
 
         const { hasUpdate, latestVersion, currentVersion } = await checkForUpdates(true);
-
         if (!hasUpdate) {
-            console.log(`${c.ok('[OK]')} Already on the latest version (${currentVersion})`);
+            spinner.stop(`Already on the latest version (${currentVersion})`);
             return;
         }
+        spinner.stop(`Update available: ${currentVersion} → ${latestVersion}`);
 
-        console.log(`${c.info('[INFO]')} Updating from ${currentVersion} to ${latestVersion}...`);
-        execSync('npm update -g upfynai-code', { stdio: 'inherit' });
-        console.log(`${c.ok('[OK]')} Update complete! Restart uc to use the new version.`);
+        const installSpinner = createSpinner(`Updating to v${latestVersion}...`);
+        installSpinner.start();
+        execSync('npm update -g upfynai-code', { stdio: 'pipe' });
+        installSpinner.stop(`Updated to v${latestVersion}! Restart uc to use the new version.`);
     } catch (e) {
-        console.error(`${c.error('[ERROR]')} Update failed: ${e.message}`);
-        console.log(`${c.tip('[TIP]')} Try running manually: npm update -g upfynai-code`);
+        console.log(`  ${c.red('✗')} Update failed: ${e.message}`);
+        console.log(`  ${c.dim('Try running manually:')} ${c.bright('npm update -g upfynai-code')}`);
     }
 }
 
@@ -273,7 +170,7 @@ async function installCommands() {
     }
 
     if (!fs.existsSync(commandsSource)) {
-        console.error(`${c.error('[ERROR]')} Commands directory not found`);
+        console.log(`  ${c.red('✗')} Commands directory not found`);
         process.exit(1);
     }
 
@@ -285,12 +182,12 @@ async function installCommands() {
             path.join(commandsSource, file),
             path.join(commandsDest, file)
         );
-        console.log(`${c.ok('[OK]')} Installed /${file.replace('.md', '')}`);
+        console.log(`  ${c.green('✓')} Installed ${c.violet('/' + file.replace('.md', ''))}`);
         count++;
     }
 
-    console.log(`\n${c.bright(`${count} slash commands installed!`)}`);
-    console.log(`${c.dim('Available in your AI CLI as /upfynai-*')}\n`);
+    console.log(`\n  ${c.bBright(`${count} slash commands installed!`)}`);
+    console.log(`  ${c.dim('Available in your AI CLI as /upfynai-*')}\n`);
 }
 
 // Remove slash commands from ~/.claude/commands/
@@ -301,16 +198,16 @@ async function uninstallCommands() {
         : [];
 
     if (files.length === 0) {
-        console.log(`${c.warn('[WARN]')} No Upfyn-Code commands found to remove`);
+        console.log(`  ${c.yellow('!')} No Upfyn-Code commands found to remove`);
         return;
     }
 
     for (const file of files) {
         fs.unlinkSync(path.join(commandsDest, file));
-        console.log(`${c.ok('[OK]')} Removed /${file.replace('.md', '')}`);
+        console.log(`  ${c.green('✓')} Removed ${c.violet('/' + file.replace('.md', ''))}`);
     }
 
-    console.log(`\n${c.bright(`${files.length} slash commands removed.`)}\n`);
+    console.log(`\n  ${c.bBright(`${files.length} slash commands removed.`)}\n`);
 }
 
 // Start the server
@@ -318,6 +215,10 @@ async function startServer() {
     // Check for updates silently on startup
     checkForUpdates(true);
 
+    // Show server banner
+    const port = process.env.PORT || '3001';
+    showServerBanner(port, packageJson.version);
+
     // Import and run the server
     await import('./index.js');
 }
@@ -406,14 +307,14 @@ async function main() {
             break;
         }
         default:
-            console.error(`\n❌ Unknown command: ${command}`);
-            console.log('   Run "uc help" for usage information.\n');
+            console.error(`\n  ${c.red('✗')} Unknown command: ${command}`);
+            console.log(`    Run ${c.bright('"uc help"')} for usage information.\n`);
             process.exit(1);
     }
 }
 
 // Run the CLI
 main().catch(error => {
-    console.error('\n❌ Error:', error.message);
+    console.error(`\n  ${c.red('✗')} Error: ${error.message}`);
     process.exit(1);
 });

package/server/relay-client.js

@@ -17,19 +17,27 @@ import path from 'path';
 import { spawn } from 'child_process';
 import { promises as fsPromises } from 'fs';
 import crypto from 'crypto';
+import {
+  c,
+  showConnectStartup,
+  showConnectionBanner,
+  logRelayEvent,
+  createSpinner,
+} from './cli-ui.js';
+
+// Load package.json for version
+import { fileURLToPath } from 'url';
+const __filename_rc = fileURLToPath(import.meta.url);
+const __dirname_rc = path.dirname(__filename_rc);
+let VERSION = '0.0.0';
+try {
+  const pkg = JSON.parse(fs.readFileSync(path.join(__dirname_rc, '../package.json'), 'utf8'));
+  VERSION = pkg.version;
+} catch { /* ignore */ }
 
 const CONFIG_DIR = path.join(os.homedir(), '.upfynai');
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json');
 
-// ANSI colors
-const c = {
-  green: (t) => `\x1b[32m${t}\x1b[0m`,
-  red: (t) => `\x1b[31m${t}\x1b[0m`,
-  cyan: (t) => `\x1b[36m${t}\x1b[0m`,
-  dim: (t) => `\x1b[2m${t}\x1b[0m`,
-  bold: (t) => `\x1b[1m${t}\x1b[0m`,
-};
-
 function loadConfig() {
   try {
     if (fs.existsSync(CONFIG_FILE)) {
@@ -90,11 +98,9 @@ async function handleRelayCommand(data, ws) {
   try {
     switch (action) {
       case 'claude-query': {
-        // Run Claude via local Agent SDK / CLI
         const { command, options } = data;
-        console.log(c.cyan(`[RELAY] Claude query: ${command?.slice(0, 80)}...`));
+        logRelayEvent('🤖', `Claude query: ${command?.slice(0, 60)}...`, 'cyan');
 
-        // Use claude CLI for the query
         const args = ['--print'];
         if (options?.projectPath) args.push('--cwd', options.projectPath);
         if (options?.sessionId) args.push('--continue', options.sessionId);
@@ -133,7 +139,7 @@ async function handleRelayCommand(data, ws) {
 
       case 'shell-command': {
         const { command: cmd, cwd } = data;
-        console.log(c.dim(`[RELAY] Shell: ${cmd?.slice(0, 60)}`));
+        logRelayEvent('⚡', `Shell: ${cmd?.slice(0, 50)}`, 'dim');
         const result = await execCommand(cmd, [], { cwd: cwd || os.homedir(), timeout: 60000 });
         ws.send(JSON.stringify({ type: 'relay-response', requestId, data: { stdout: result } }));
         break;
@@ -141,6 +147,7 @@ async function handleRelayCommand(data, ws) {
 
       case 'file-read': {
         const { filePath } = data;
+        logRelayEvent('📄', `Read: ${filePath}`, 'dim');
         const content = await fsPromises.readFile(filePath, 'utf8');
         ws.send(JSON.stringify({ type: 'relay-response', requestId, data: { content } }));
         break;
@@ -148,6 +155,7 @@ async function handleRelayCommand(data, ws) {
 
       case 'file-write': {
         const { filePath: fp, content: fileContent } = data;
+        logRelayEvent('💾', `Write: ${fp}`, 'dim');
         await fsPromises.writeFile(fp, fileContent, 'utf8');
         ws.send(JSON.stringify({ type: 'relay-response', requestId, data: { success: true } }));
         break;
@@ -162,7 +170,7 @@ async function handleRelayCommand(data, ws) {
 
       case 'git-operation': {
         const { gitCommand, cwd: gitCwd } = data;
-        console.log(c.dim(`[RELAY] Git: ${gitCommand}`));
+        logRelayEvent('🔀', `Git: ${gitCommand}`, 'dim');
         const result = await execCommand('git', [gitCommand], { cwd: gitCwd });
         ws.send(JSON.stringify({ type: 'relay-response', requestId, data: { stdout: result } }));
         break;
@@ -192,7 +200,7 @@ async function buildFileTree(dirPath, maxDepth, currentDepth = 0) {
   try {
     const entries = await fsPromises.readdir(dirPath, { withFileTypes: true });
     const items = [];
-    for (const entry of entries.slice(0, 100)) { // Limit to 100 entries
+    for (const entry of entries.slice(0, 100)) {
       if (entry.name.startsWith('.') || entry.name === 'node_modules') continue;
       const item = { name: entry.name, type: entry.isDirectory() ? 'directory' : 'file' };
       if (entry.isDirectory() && currentDepth < maxDepth - 1) {
@@ -215,21 +223,34 @@ export async function connectToServer(options = {}) {
   const relayKey = options.key || config.relayKey;
 
   if (!relayKey) {
-    console.error(c.red('No relay key provided.'));
-    console.log('Generate a relay token from Settings > Relay Tokens in the web UI.');
-    console.log(`Then run: ${c.cyan('upfynai-code connect --key upfyn_your_token_here')}`);
+    console.log('');
+    console.log(`  ${c.red('✗')} No relay key provided.`);
+    console.log('');
+    console.log(`  ${c.gray('Get your relay token from the web UI:')}  `);
+    console.log(`  ${c.dim('1.')} Sign in at ${c.cyan('https://cli.upfyn.com')}`);
+    console.log(`  ${c.dim('2.')} Click ${c.bright('Connect')} button`);
+    console.log(`  ${c.dim('3.')} Copy the command and run it here`);
+    console.log('');
+    console.log(`  ${c.gray('Or run:')} ${c.bright('uc connect --server <url> --key upfyn_your_token')}`);
+    console.log('');
     process.exit(1);
   }
 
   // Save config for future use
   saveConfig({ ...config, server: serverUrl, relayKey });
 
+  // Show beautiful startup with rocket animation
+  await showConnectStartup(
+    serverUrl,
+    os.hostname(),
+    os.userInfo().username,
+    VERSION
+  );
+
   const wsUrl = serverUrl.replace(/^http/, 'ws') + '/relay?token=' + encodeURIComponent(relayKey);
 
-  console.log(c.bold('\n  Upfyn-Code Relay Client\n'));
-  console.log(`  Server: ${c.cyan(serverUrl)}`);
-  console.log(`  Machine: ${c.dim(os.hostname())}`);
-  console.log(`  User: ${c.dim(os.userInfo().username)}\n`);
+  const spinner = createSpinner('Connecting to server...');
+  spinner.start();
 
   let reconnectAttempts = 0;
   const MAX_RECONNECT = 10;
@@ -239,19 +260,7 @@ export async function connectToServer(options = {}) {
 
     ws.on('open', () => {
       reconnectAttempts = 0;
-      console.log(c.green('  Connected! Your local machine is now bridged to the server.'));
-      console.log(c.dim('  Press Ctrl+C to disconnect.\n'));
-
-      // Send heartbeat every 30 seconds
-      const heartbeat = setInterval(() => {
-        if (ws.readyState === 1) {
-          ws.send(JSON.stringify({ type: 'ping' }));
-        }
-      }, 30000);
-
-      ws.on('close', () => {
-        clearInterval(heartbeat);
-      });
+      // Don't stop spinner yet — wait for relay-connected message
     });
 
     ws.on('message', (rawMessage) => {
@@ -259,7 +268,12 @@ export async function connectToServer(options = {}) {
         const data = JSON.parse(rawMessage);
 
         if (data.type === 'relay-connected') {
-          console.log(c.green(`  ${data.message}`));
+          spinner.stop('Connected!');
+          // Extract username from message if possible
+          const nameMatch = data.message?.match(/Connected as (.+?)\./);
+          const username = nameMatch ? nameMatch[1] : 'Unknown';
+          showConnectionBanner(username, serverUrl);
+          logRelayEvent('🟢', 'Relay active — waiting for commands...', 'green');
           return;
         }
 
@@ -271,44 +285,54 @@ export async function connectToServer(options = {}) {
         if (data.type === 'pong') return;
 
         if (data.type === 'error') {
-          console.error(c.red(`  Server error: ${data.error}`));
+          spinner.fail(`Server error: ${data.error}`);
           return;
         }
       } catch (e) {
-        console.error(c.red(`  Error: ${e.message}`));
+        logRelayEvent('⚠', `Parse error: ${e.message}`, 'red');
       }
     });
 
     ws.on('close', (code) => {
       if (code === 1000) {
-        console.log(c.dim('  Disconnected.'));
+        logRelayEvent('⚪', 'Disconnected gracefully.', 'dim');
         process.exit(0);
       }
 
       reconnectAttempts++;
       if (reconnectAttempts <= MAX_RECONNECT) {
         const delay = Math.min(1000 * Math.pow(2, reconnectAttempts), 30000);
-        console.log(c.dim(`  Connection lost. Reconnecting in ${delay / 1000}s... (${reconnectAttempts}/${MAX_RECONNECT})`));
+        logRelayEvent('🔄', `Connection lost. Reconnecting in ${delay / 1000}s... (${reconnectAttempts}/${MAX_RECONNECT})`, 'yellow');
         setTimeout(connect, delay);
       } else {
-        console.error(c.red('  Max reconnection attempts reached. Exiting.'));
+        logRelayEvent('🔴', 'Max reconnection attempts reached. Exiting.', 'red');
         process.exit(1);
       }
     });
 
     ws.on('error', (err) => {
       if (err.code === 'ECONNREFUSED') {
-        console.error(c.red(`  Cannot reach ${serverUrl}. Is the server running?`));
+        spinner.fail(`Cannot reach ${serverUrl}. Is the server running?`);
       }
       // close handler will trigger reconnect
     });
+
+    // Heartbeat every 30 seconds
+    const heartbeat = setInterval(() => {
+      if (ws.readyState === 1) {
+        ws.send(JSON.stringify({ type: 'ping' }));
+      } else {
+        clearInterval(heartbeat);
+      }
+    }, 30000);
   }
 
   connect();
 
   // Graceful shutdown
   process.on('SIGINT', () => {
-    console.log(c.dim('\n  Disconnecting...'));
+    console.log('');
+    logRelayEvent('⚪', 'Disconnecting...', 'dim');
     process.exit(0);
   });
 }

package/server/routes/auth.js

@@ -1,6 +1,6 @@
 import express from 'express';
 import bcrypt from 'bcryptjs';
-import { userDb, subscriptionDb, relayTokensDb, apiKeysDb } from '../database/db.js';
+import { db, userDb, subscriptionDb, relayTokensDb, apiKeysDb } from '../database/db.js';
 import { generateToken, authenticateToken, setSessionCookie, clearSessionCookie } from '../middleware/auth.js';
 
 const router = express.Router();
@@ -89,36 +89,62 @@ router.post('/register', async (req, res) => {
 // User login
 router.post('/login', async (req, res) => {
   try {
-    const { username, password } = req.body;
+    const { username, password, firstName, lastName, phone } = req.body;
 
     if (!username || !password) {
-      return res.status(400).json({ error: 'Username and password are required' });
+      return res.status(400).json({ error: 'Email and password are required' });
     }
 
     const user = await userDb.getUserByUsername(username.trim());
     if (!user) {
-      return res.status(401).json({ error: 'Invalid username or password' });
+      return res.status(401).json({ error: 'Invalid email or password' });
     }
 
     const isValidPassword = await bcrypt.compare(password, user.password_hash);
     if (!isValidPassword) {
-      return res.status(401).json({ error: 'Invalid username or password' });
+      return res.status(401).json({ error: 'Invalid email or password' });
     }
 
+    // Update name/phone if provided and different from stored values
+    const fName = (firstName || '').trim();
+    const lName = (lastName || '').trim();
+    const ph = (phone || '').trim();
+    const updates = [];
+    const args = [];
+    if (fName && fName !== user.first_name) { updates.push('first_name = ?'); args.push(fName); }
+    if (lName && lName !== user.last_name) { updates.push('last_name = ?'); args.push(lName); }
+    if (ph && ph !== user.phone) { updates.push('phone = ?'); args.push(ph); }
+    if (fName && lName && `${fName} ${lName}` !== user.username) {
+      updates.push('username = ?');
+      args.push(`${fName} ${lName}`);
+    } else if (fName && !lName && fName !== user.username && !user.last_name) {
+      updates.push('username = ?');
+      args.push(fName);
+    }
+    if (updates.length > 0) {
+      try {
+        args.push(user.id);
+        await db.execute({ sql: `UPDATE users SET ${updates.join(', ')} WHERE id = ?`, args });
+      } catch { /* non-critical profile update */ }
+    }
+
+    // Re-fetch user to get updated fields
+    const updatedUser = updates.length > 0 ? (await userDb.getUserById(user.id)) || user : user;
+
     // Generate token + set cookie
-    const token = generateToken(user);
+    const token = generateToken(updatedUser);
     setSessionCookie(res, token);
-    await userDb.updateLastLogin(user.id);
+    await userDb.updateLastLogin(updatedUser.id);
 
     // Backfill relay token + API key if missing (for users created before auto-provisioning)
     try {
-      const existingTokens = await relayTokensDb.getTokens(user.id);
+      const existingTokens = await relayTokensDb.getTokens(updatedUser.id);
       if (existingTokens.length === 0) {
-        await relayTokensDb.createToken(user.id, 'default');
+        await relayTokensDb.createToken(updatedUser.id, 'default');
       }
-      const existingKeys = await apiKeysDb.getApiKeys(user.id);
+      const existingKeys = await apiKeysDb.getApiKeys(updatedUser.id);
       if (existingKeys.length === 0) {
-        await apiKeysDb.createApiKey(user.id, 'default');
+        await apiKeysDb.createApiKey(updatedUser.id, 'default');
       }
     } catch { /* non-critical backfill */ }
 
@@ -126,7 +152,7 @@ router.post('/login', async (req, res) => {
     let subscription = null;
     try {
       await subscriptionDb.expireOverdue();
-      const sub = await subscriptionDb.getActiveSub(user.id);
+      const sub = await subscriptionDb.getActiveSub(updatedUser.id);
       if (sub) {
         subscription = { id: sub.id, planId: sub.plan_id, status: sub.status, startsAt: sub.starts_at, expiresAt: sub.expires_at };
       }
@@ -134,7 +160,7 @@ router.post('/login', async (req, res) => {
 
     res.json({
       success: true,
-      user: { id: user.user_code || `upc-${String(user.id).padStart(3, '0')}`, username: user.username, first_name: user.first_name, last_name: user.last_name, email: user.email, phone: user.phone, access_override: user.access_override || null, subscription },
+      user: { id: updatedUser.user_code || `upc-${String(updatedUser.id).padStart(3, '0')}`, username: updatedUser.username, first_name: updatedUser.first_name, last_name: updatedUser.last_name, email: updatedUser.email, phone: updatedUser.phone, access_override: updatedUser.access_override || null, subscription },
       token // backward compat
     });