@startanaicompany/cli 1.4.20 → 1.5.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);
     }
 

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);
     }
 

package/src/lib/api.js

@@ -290,6 +290,35 @@ async function getExecutionHistory(uuid, params = {}) {
   return response.data;
 }
 
+/**
+ * List repositories from a connected Git host
+ * @param {string} gitHost - Git host domain (e.g., 'github.com', 'git.startanaicompany.com')
+ * @param {object} options - Query options
+ * @param {number} options.page - Page number for pagination (default: 1)
+ * @param {number} options.perPage - Results per page (default: 100, max: 100)
+ * @param {string} options.sort - Sort order: 'updated', 'created', 'name' (default: 'updated')
+ * @param {string} options.visibility - Filter: 'all', 'public', 'private' (default: 'all')
+ * @param {boolean} options.includeCommits - Include latest commit info (default: false)
+ * @returns {Promise<object>} - Repository listing response
+ */
+async function listGitRepositories(gitHost, options = {}) {
+  const client = createClient();
+
+  // Build query parameters
+  const params = {};
+  if (options.page) params.page = options.page;
+  if (options.perPage) params.per_page = options.perPage;
+  if (options.sort) params.sort = options.sort;
+  if (options.visibility) params.visibility = options.visibility;
+  if (options.includeCommits) params.include_commits = true;
+
+  // URL encode the git host
+  const encodedHost = encodeURIComponent(gitHost);
+
+  const response = await client.get(`/git/connections/${encodedHost}/repos`, { params });
+  return response.data;
+}
+
 module.exports = {
   createClient,
   login,
@@ -315,4 +344,5 @@ module.exports = {
   getDeploymentLogs,
   executeCommand,
   getExecutionHistory,
+  listGitRepositories,
 };

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,