@startanaicompany/cli 1.4.21 → 1.6.0

package/src/commands/logs.js

@@ -3,14 +3,16 @@
  */
 
 const api = require('../lib/api');
-const { getProjectConfig, isAuthenticated } = require('../lib/config');
+const { getProjectConfig, ensureAuthenticated } = require('../lib/config');
 const logger = require('../lib/logger');
 
 async function logs(deploymentUuidArg, options) {
   try {
     // Check authentication
-    if (!isAuthenticated()) {
-      logger.error('Not logged in. Run: saac login');
+    if (!(await ensureAuthenticated())) {
+      logger.error('Not logged in');
+      logger.info('Run: saac login -e <email> -k <api-key>');
+      logger.info('Or set: SAAC_USER_API_KEY and SAAC_USER_EMAIL');
       process.exit(1);
     }
 
@@ -166,20 +168,26 @@ async function getRuntimeLogs(applicationUuid, applicationName, options) {
   logger.section(`Runtime Logs: ${applicationName}`);
   logger.newline();
 
+  // Follow mode - use SSE streaming
+  if (options.follow) {
+    return await streamRuntimeLogs(applicationUuid, applicationName, options);
+  }
+
+  // Regular mode - fetch logs once
   const spin = logger.spinner('Fetching runtime logs...').start();
 
   try {
     // Build query parameters
     const params = {};
-    if (options.follow) {
-      params.follow = true;
-    }
     if (options.tail) {
       params.tail = parseInt(options.tail, 10);
     }
     if (options.since) {
       params.since = options.since;
     }
+    if (options.type) {
+      params.type = options.type;
+    }
 
     const result = await api.getApplicationLogs(applicationUuid, params);
 
@@ -190,9 +198,16 @@ async function getRuntimeLogs(applicationUuid, applicationName, options) {
     // Display logs
     if (result.logs) {
       if (Array.isArray(result.logs)) {
-        // Logs is an array
+        // Logs is an array of objects
         result.logs.forEach(log => {
-          console.log(log);
+          if (log.message) {
+            // Format: [timestamp] [service] message
+            const timestamp = new Date(log.timestamp).toLocaleTimeString();
+            const service = logger.chalk.cyan(`[${log.service}]`);
+            console.log(`${logger.chalk.gray(timestamp)} ${service} ${log.message}`);
+          } else {
+            console.log(log);
+          }
         });
       } else if (typeof result.logs === 'string') {
         // Logs is a string (most common format from backend)
@@ -210,13 +225,6 @@ async function getRuntimeLogs(applicationUuid, applicationName, options) {
       logger.log('  saac deploy');
     }
 
-    // Note about follow mode
-    if (options.follow) {
-      logger.newline();
-      logger.info('Note: Follow mode (--follow) for live logs is not yet implemented');
-      logger.info('This command shows recent logs only');
-    }
-
   } catch (error) {
     spin.fail('Failed to fetch runtime logs');
 
@@ -238,4 +246,123 @@ async function getRuntimeLogs(applicationUuid, applicationName, options) {
   }
 }
 
+/**
+ * Stream runtime logs via SSE (Server-Sent Events)
+ */
+async function streamRuntimeLogs(applicationUuid, applicationName, options) {
+  const { getUser } = require('../lib/config');
+  const user = getUser();
+  const config = require('../lib/config');
+
+  // Get base URL from config
+  const baseUrl = config.getApiUrl();
+
+  // Build query parameters
+  const params = new URLSearchParams();
+  params.set('follow', 'true');
+  if (options.tail) {
+    params.set('tail', options.tail);
+  }
+  if (options.since) {
+    params.set('since', options.since);
+  }
+  if (options.type) {
+    params.set('type', options.type);
+  }
+
+  const url = `${baseUrl}/applications/${applicationUuid}/logs?${params.toString()}`;
+
+  logger.info('Streaming live logs... (Press Ctrl+C to stop)');
+  logger.newline();
+
+  try {
+    const headers = {
+      'Accept': 'text/event-stream',
+    };
+
+    // Add authentication header
+    if (process.env.SAAC_API_KEY) {
+      headers['X-API-Key'] = process.env.SAAC_API_KEY;
+    } else if (user.sessionToken) {
+      headers['X-Session-Token'] = user.sessionToken;
+    } else if (user.apiKey) {
+      headers['X-API-Key'] = user.apiKey;
+    }
+
+    const response = await fetch(url, { headers });
+
+    if (!response.ok) {
+      throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+    }
+
+    if (!response.body) {
+      throw new Error('Response body is null');
+    }
+
+    const reader = response.body.getReader();
+    const decoder = new TextDecoder();
+    let buffer = '';
+
+    // Handle Ctrl+C gracefully
+    const cleanup = () => {
+      reader.cancel();
+      logger.newline();
+      logger.info('Stream closed');
+      process.exit(0);
+    };
+    process.on('SIGINT', cleanup);
+    process.on('SIGTERM', cleanup);
+
+    while (true) {
+      const { done, value } = await reader.read();
+
+      if (done) {
+        break;
+      }
+
+      buffer += decoder.decode(value, { stream: true });
+      const lines = buffer.split('\n');
+      buffer = lines.pop() || '';
+
+      for (const line of lines) {
+        // Skip empty lines and comments (keepalive)
+        if (!line.trim() || line.startsWith(':')) {
+          continue;
+        }
+
+        // Parse SSE data lines
+        if (line.startsWith('data: ')) {
+          try {
+            const data = JSON.parse(line.slice(6));
+
+            // Skip connection event
+            if (data.event === 'connected') {
+              logger.success('Connected to log stream');
+              logger.newline();
+              continue;
+            }
+
+            // Display log message
+            if (data.message) {
+              const timestamp = new Date(data.timestamp).toLocaleTimeString();
+              const service = logger.chalk.cyan(`[${data.service}]`);
+              console.log(`${logger.chalk.gray(timestamp)} ${service} ${data.message}`);
+            }
+          } catch (parseError) {
+            logger.warn(`Failed to parse log entry: ${line}`);
+          }
+        }
+      }
+    }
+
+    logger.newline();
+    logger.info('Stream ended');
+
+  } catch (error) {
+    logger.error('Failed to stream logs');
+    logger.error(error.message);
+    process.exit(1);
+  }
+}
+
 module.exports = logs;

package/src/commands/run.js

@@ -3,7 +3,7 @@
  */
 
 const api = require('../lib/api');
-const { getProjectConfig, isAuthenticated } = require('../lib/config');
+const { getProjectConfig, ensureAuthenticated } = require('../lib/config');
 const logger = require('../lib/logger');
 const { spawn } = require('child_process');
 const fs = require('fs');
@@ -55,8 +55,10 @@ async function getEnvironmentVariables(appUuid, forceRefresh = false) {
 async function run(command, options = {}) {
   try {
     // Check authentication
-    if (!isAuthenticated()) {
-      logger.error('Not logged in. Run: saac login');
+    if (!(await ensureAuthenticated())) {
+      logger.error('Not logged in');
+      logger.info('Run: saac login -e <email> -k <api-key>');
+      logger.info('Or set: SAAC_USER_API_KEY and SAAC_USER_EMAIL');
       process.exit(1);
     }
 

package/src/commands/sessions.js

@@ -3,18 +3,17 @@
  */
 
 const api = require('../lib/api');
-const { isAuthenticated } = require('../lib/config');
+const { ensureAuthenticated } = require('../lib/config');
 const logger = require('../lib/logger');
 const { table } = require('table');
 
 async function sessions() {
   try {
     // Check authentication
-    if (!isAuthenticated()) {
+    if (!(await ensureAuthenticated())) {
       logger.error('Not logged in');
-      logger.newline();
-      logger.info('Run:');
-      logger.log('  saac login -e <email> -k <api-key>');
+      logger.info('Run: saac login -e <email> -k <api-key>');
+      logger.info('Or set: SAAC_USER_API_KEY and SAAC_USER_EMAIL');
       process.exit(1);
     }
 

package/src/commands/shell.js

@@ -7,7 +7,7 @@
 
 const WebSocket = require('ws');
 const readline = require('readline');
-const { getProjectConfig, isAuthenticated, getUser, getApiUrl } = require('../lib/config');
+const { getProjectConfig, ensureAuthenticated, getUser, getApiUrl } = require('../lib/config');
 const logger = require('../lib/logger');
 
 /**
@@ -320,8 +320,10 @@ class ShellClient {
 async function shell(options = {}) {
   try {
     // Check authentication
-    if (!isAuthenticated()) {
-      logger.error('Not logged in. Run: saac login');
+    if (!(await ensureAuthenticated())) {
+      logger.error('Not logged in');
+      logger.info('Run: saac login -e <email> -k <api-key>');
+      logger.info('Or set: SAAC_USER_API_KEY and SAAC_USER_EMAIL');
       process.exit(1);
     }
 

package/src/commands/status.js

@@ -3,7 +3,7 @@
  */
 
 const api = require('../lib/api');
-const { getUser, isAuthenticated, isTokenExpiringSoon } = require('../lib/config');
+const { getUser, ensureAuthenticated, isTokenExpiringSoon } = require('../lib/config');
 const logger = require('../lib/logger');
 const { table } = require('table');
 
@@ -13,11 +13,10 @@ async function status() {
     logger.newline();
 
     // Check if logged in locally (silently)
-    if (!isAuthenticated()) {
+    if (!(await ensureAuthenticated())) {
       logger.error('Not logged in');
-      logger.newline();
-      logger.info('Run:');
-      logger.log('  saac login -e <email> -k <api-key>');
+      logger.info('Run: saac login -e <email> -k <api-key>');
+      logger.info('Or set: SAAC_USER_API_KEY and SAAC_USER_EMAIL');
       process.exit(1);
     }
 

package/src/commands/update.js

@@ -3,17 +3,16 @@
  */
 
 const api = require('../lib/api');
-const { isAuthenticated, getProjectConfig } = require('../lib/config');
+const { ensureAuthenticated, getProjectConfig } = require('../lib/config');
 const logger = require('../lib/logger');
 
 async function update(options) {
   try {
-    // Check authentication
-    if (!isAuthenticated()) {
+    // Check authentication (with auto-login support)
+    if (!(await ensureAuthenticated())) {
       logger.error('Not logged in');
-      logger.newline();
-      logger.info('Run:');
-      logger.log('  saac login -e <email> -k <api-key>');
+      logger.info('Run: saac login -e <email> -k <api-key>');
+      logger.info('Or set: SAAC_USER_API_KEY and SAAC_USER_EMAIL');
       process.exit(1);
     }
 

package/src/commands/whoami.js

@@ -3,7 +3,7 @@
  */
 
 const api = require('../lib/api');
-const { isAuthenticated } = require('../lib/config');
+const { ensureAuthenticated } = require('../lib/config');
 const logger = require('../lib/logger');
 
 /**
@@ -12,11 +12,10 @@ const logger = require('../lib/logger');
 async function whoami() {
   try {
     // Check authentication
-    if (!isAuthenticated()) {
+    if (!(await ensureAuthenticated())) {
       logger.error('Not logged in');
-      logger.newline();
-      logger.info('Run:');
-      logger.log('  saac login -e <email> -k <api-key>');
+      logger.info('Run: saac login -e <email> -k <api-key>');
+      logger.info('Or set: SAAC_USER_API_KEY and SAAC_USER_EMAIL');
       process.exit(1);
     }
 
@@ -34,7 +33,7 @@ async function whoami() {
 
       logger.field('Email', user.email);
       logger.field('User ID', user.id);
-      logger.field('Verified', user.verified ? logger.chalk.green('Yes ✓') : logger.chalk.red('No ✗'));
+      logger.field('Verified', user.email_verified ? logger.chalk.green('Yes ✓') : logger.chalk.red('No ✗'));
       logger.field('Member Since', formatDate(user.created_at));
 
       logger.newline();

package/src/lib/config.js

@@ -106,6 +106,52 @@ function isTokenExpiringSoon() {
   return expirationDate <= sevenDaysFromNow && !isTokenExpired();
 }
 
+/**
+ * Ensure user is authenticated, with auto-login support via environment variables
+ * Checks for SAAC_USER_API_KEY and SAAC_USER_EMAIL environment variables
+ * If present and user is not authenticated, attempts automatic login
+ *
+ * @returns {Promise<boolean>} - True if authenticated, false otherwise
+ */
+async function ensureAuthenticated() {
+  // Step 1: Check if already authenticated (fast path)
+  if (isAuthenticated()) {
+    return true;
+  }
+
+  // Step 2: Check for environment variables
+  const apiKey = process.env.SAAC_USER_API_KEY;
+  const email = process.env.SAAC_USER_EMAIL;
+
+  if (!apiKey || !email) {
+    // No environment variables - cannot auto-login
+    return false;
+  }
+
+  // Step 3: Attempt auto-login via API
+  try {
+    // Dynamically require to avoid circular dependency
+    const api = require('./api');
+    const result = await api.login(email, apiKey);
+
+    // Step 4: Save session token to config
+    saveUser({
+      email: result.user.email,
+      userId: result.user.id,
+      sessionToken: result.session_token,
+      expiresAt: result.expires_at,
+      verified: result.user.verified,
+    });
+
+    // Auto-login successful
+    return true;
+
+  } catch (error) {
+    // Auto-login failed (invalid key, network error, etc.)
+    return false;
+  }
+}
+
 /**
  * Get user info
  */
@@ -146,6 +192,7 @@ module.exports = {
   getProjectConfig,
   saveProjectConfig,
   isAuthenticated,
+  ensureAuthenticated,
   isTokenExpired,
   isTokenExpiringSoon,
   getUser,