@startanaicompany/cli 1.4.21 → 1.6.0

package/src/commands/create.js

@@ -3,7 +3,7 @@
  */
 
 const api = require('../lib/api');
-const { isAuthenticated, saveProjectConfig, getUser, getProjectConfig } = require('../lib/config');
+const { ensureAuthenticated, saveProjectConfig, getUser, getProjectConfig } = require('../lib/config');
 const logger = require('../lib/logger');
 const oauth = require('../lib/oauth');
 const inquirer = require('inquirer');
@@ -12,12 +12,11 @@ const errorDisplay = require('../lib/errorDisplay');
 
 async function create(name, 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);
     }
 
@@ -90,6 +89,7 @@ async function create(name, options) {
       logger.info('Required options:');
       logger.log('  -s, --subdomain <subdomain>          Subdomain for your app');
       logger.log('  -r, --repository <url>               Git repository URL (SSH format)');
+      logger.log('  --org <organization_id>              Organization ID');
       logger.newline();
       logger.info('Optional options:');
       logger.log('  -b, --branch <branch>                Git branch (default: master)');
@@ -111,17 +111,17 @@ async function create(name, options) {
       logger.log('  --env <KEY=VALUE>                    Environment variable (can be used multiple times)');
       logger.newline();
       logger.info('Example:');
-      logger.log('  saac create my-app -s myapp -r git@git.startanaicompany.com:user/repo.git');
-      logger.log('  saac create api -s api -r git@git... --build-pack nixpacks --port 8080');
-      logger.log('  saac create web -s web -r git@git... --health-check --pre-deploy-cmd "npm run migrate"');
+      logger.log('  saac create my-app -s myapp -r git@git.startanaicompany.com:user/repo.git --org <org_id>');
+      logger.log('  saac create api -s api -r git@git... --org <org_id> --build-pack nixpacks --port 8080');
+      logger.log('  saac create web -s web -r git@git... --org <org_id> --health-check --pre-deploy-cmd "npm run migrate"');
       process.exit(1);
     }
 
-    if (!options.subdomain || !options.repository) {
-      logger.error('Missing required options: subdomain and repository are required');
+    if (!options.subdomain || !options.repository || !options.org) {
+      logger.error('Missing required options: subdomain, repository, and organization ID are required');
       logger.newline();
       logger.info('Example:');
-      logger.log(`  saac create ${name} -s myapp -r git@git.startanaicompany.com:user/repo.git`);
+      logger.log(`  saac create ${name} -s myapp -r git@git.startanaicompany.com:user/repo.git --org <org_id>`);
       logger.newline();
       logger.info('Note: Git OAuth connection required. Connect with: saac git connect');
       process.exit(1);
@@ -157,6 +157,7 @@ async function create(name, options) {
       domain_suffix: options.domainSuffix || 'startanaicompany.com',
       git_repository: options.repository,
       git_branch: options.branch || 'master',
+      organization_id: options.org,
     };
 
     // OAuth tokens are retrieved from database by wrapper

package/src/commands/delete.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 inquirer = require('inquirer');
 const fs = require('fs');
@@ -16,8 +16,10 @@ const path = require('path');
 async function deleteApp(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);
     }
 
@@ -111,7 +113,7 @@ async function deleteApp(options) {
 
       logger.newline();
 
-      logger.success(`Application '${result.application_name}' has been permanently deleted.`);
+      logger.success(`Application '${app.name}' has been permanently deleted.`);
 
       logger.newline();
 

package/src/commands/deploy.js

@@ -3,15 +3,17 @@
  */
 
 const api = require('../lib/api');
-const { getProjectConfig, isAuthenticated } = require('../lib/config');
+const { getProjectConfig, ensureAuthenticated } = require('../lib/config');
 const logger = require('../lib/logger');
 const errorDisplay = require('../lib/errorDisplay');
 
 async function deploy(options) {
   try {
-    // Check authentication
-    if (!isAuthenticated()) {
-      logger.error('Not logged in. Run: saac login');
+    // Check authentication (with auto-login support)
+    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/deployments.js

@@ -3,15 +3,17 @@
  */
 
 const api = require('../lib/api');
-const { getProjectConfig, isAuthenticated } = require('../lib/config');
+const { getProjectConfig, ensureAuthenticated } = require('../lib/config');
 const logger = require('../lib/logger');
 const { table } = require('table');
 
 async function deployments(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/domain.js

@@ -3,7 +3,7 @@
  */
 
 const api = require('../lib/api');
-const { getProjectConfig, isAuthenticated, saveProjectConfig } = require('../lib/config');
+const { getProjectConfig, ensureAuthenticated, saveProjectConfig } = require('../lib/config');
 const logger = require('../lib/logger');
 
 /**
@@ -14,8 +14,10 @@ const logger = require('../lib/logger');
 async function set(subdomain, 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);
     }
 
@@ -149,8 +151,10 @@ async function set(subdomain, options) {
 async function show() {
   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/env.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 { table } = require('table');
 
@@ -14,8 +14,10 @@ const { table } = require('table');
 async function get(key) {
   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);
     }
 
@@ -108,8 +110,10 @@ async function list() {
 async function set(vars) {
   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/exec.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 { table } = require('table');
 
@@ -15,8 +15,10 @@ const { table } = require('table');
 async function exec(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);
     }
 
@@ -156,8 +158,10 @@ async function exec(command, options = {}) {
 async function history(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/git.js

@@ -4,7 +4,7 @@
 
 const oauth = require('../lib/oauth');
 const api = require('../lib/api');
-const { isAuthenticated, getUser } = require('../lib/config');
+const { ensureAuthenticated, getUser } = require('../lib/config');
 const logger = require('../lib/logger');
 const { table } = require('table');
 const inquirer = require('inquirer');
@@ -15,11 +15,10 @@ const inquirer = require('inquirer');
 async function connect(host) {
   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);
     }
 
@@ -116,11 +115,10 @@ async function connect(host) {
 async function list() {
   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);
     }
 
@@ -193,11 +191,10 @@ async function list() {
 async function disconnect(host) {
   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);
     }
 
@@ -254,11 +251,10 @@ async function disconnect(host) {
 async function repos(gitHost, options) {
   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/init.js

@@ -7,18 +7,20 @@
  */
 
 const api = require('../lib/api');
-const { isAuthenticated, saveProjectConfig, getProjectConfig } = require('../lib/config');
+const { ensureAuthenticated, saveProjectConfig, getProjectConfig } = require('../lib/config');
 const logger = require('../lib/logger');
 const inquirer = require('inquirer');
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
 
 async function init(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);
     }
 
@@ -86,11 +88,58 @@ async function createAndInitialize(options) {
   // This would call the create command functionality, then save the config
 }
 
+/**
+ * Get Git remote URL from current directory
+ * @returns {string|null} - Git remote URL or null if not a git repo
+ */
+function getGitRemoteUrl() {
+  try {
+    // Check if .git directory exists
+    if (!fs.existsSync(path.join(process.cwd(), '.git'))) {
+      return null;
+    }
+
+    // Get remote.origin.url
+    const remoteUrl = execSync('git config --get remote.origin.url', {
+      encoding: 'utf8',
+      stdio: ['pipe', 'pipe', 'ignore'] // Suppress stderr
+    }).trim();
+
+    return remoteUrl || null;
+  } catch (error) {
+    // Not a git repo or no remote configured
+    return null;
+  }
+}
+
+/**
+ * Normalize Git URLs for comparison
+ * Converts both SSH and HTTPS URLs to a comparable format
+ */
+function normalizeGitUrl(url) {
+  if (!url) return '';
+
+  // Remove .git suffix
+  let normalized = url.replace(/\.git$/, '');
+
+  // Convert SSH to HTTPS-like format for comparison
+  // git@github.com:user/repo -> github.com/user/repo
+  normalized = normalized.replace(/^git@([^:]+):/, '$1/');
+
+  // Remove https:// or http://
+  normalized = normalized.replace(/^https?:\/\//, '');
+
+  return normalized.toLowerCase();
+}
+
 /**
  * Link an existing application to current directory (interactive)
  */
 async function linkExistingApplication() {
 
+  // Try to auto-detect Git repository
+  const gitRemoteUrl = getGitRemoteUrl();
+
   // Fetch user's applications
   const spin = logger.spinner('Fetching your applications...').start();
 
@@ -111,20 +160,67 @@ async function linkExistingApplication() {
 
     logger.newline();
 
-    // Interactive: Let user select application
-    const choices = applications.map(app => ({
-      name: `${app.name} - ${app.domain || `${app.subdomain}.startanaicompany.com`} (${app.status})`,
-      value: app,
-    }));
-
-    const { selectedApp } = await inquirer.prompt([
-      {
-        type: 'list',
-        name: 'selectedApp',
-        message: 'Select application to link to this directory:',
-        choices: choices,
-      },
-    ]);
+    let selectedApp = null;
+
+    // Try to auto-match based on Git remote URL
+    if (gitRemoteUrl) {
+      const normalizedRemote = normalizeGitUrl(gitRemoteUrl);
+
+      const matchedApp = applications.find(app => {
+        if (!app.git_repository) return false;
+        const normalizedAppRepo = normalizeGitUrl(app.git_repository);
+        return normalizedAppRepo === normalizedRemote;
+      });
+
+      if (matchedApp) {
+        // Found matching application!
+        logger.info(`Auto-detected Git repository: ${gitRemoteUrl}`);
+        logger.newline();
+        logger.field('Matched Application', matchedApp.name);
+        logger.field('Domain', matchedApp.domain || `${matchedApp.subdomain}.startanaicompany.com`);
+        logger.field('Status', matchedApp.status);
+        logger.newline();
+
+        const { confirm } = await inquirer.prompt([
+          {
+            type: 'confirm',
+            name: 'confirm',
+            message: 'Link this application to the current directory?',
+            default: true,
+          },
+        ]);
+
+        if (confirm) {
+          selectedApp = matchedApp;
+        } else {
+          logger.newline();
+          logger.info('Please select a different application:');
+          logger.newline();
+        }
+      } else {
+        logger.warn(`No application found matching Git remote: ${gitRemoteUrl}`);
+        logger.newline();
+      }
+    }
+
+    // If no auto-match or user declined, show interactive selection
+    if (!selectedApp) {
+      const choices = applications.map(app => ({
+        name: `${app.name} - ${app.domain || `${app.subdomain}.startanaicompany.com`} (${app.status})`,
+        value: app,
+      }));
+
+      const answer = await inquirer.prompt([
+        {
+          type: 'list',
+          name: 'selectedApp',
+          message: 'Select application to link to this directory:',
+          choices: choices,
+        },
+      ]);
+
+      selectedApp = answer.selectedApp;
+    }
 
     logger.newline();
 

package/src/commands/keys.js

@@ -3,7 +3,7 @@
  */
 
 const api = require('../lib/api');
-const { getUser, isAuthenticated } = require('../lib/config');
+const { getUser, ensureAuthenticated } = require('../lib/config');
 const logger = require('../lib/logger');
 const inquirer = require('inquirer');
 
@@ -13,7 +13,7 @@ const inquirer = require('inquirer');
 async function regenerate() {
   try {
     // Must be authenticated (via session token)
-    if (!isAuthenticated()) {
+    if (!(await ensureAuthenticated())) {
       logger.error('Not logged in');
       logger.newline();
       logger.info('You must be logged in to regenerate your API key');
@@ -21,6 +21,10 @@ async function regenerate() {
       logger.info('Login using email verification:');
       logger.log('  saac login -e <email>           # Request OTP');
       logger.log('  saac login -e <email> --otp <code>  # Verify OTP');
+      logger.newline();
+      logger.info('Or set environment variables:');
+      logger.log('  export SAAC_USER_API_KEY=your_api_key');
+      logger.log('  export SAAC_USER_EMAIL=your_email');
       process.exit(1);
     }
 
@@ -83,61 +87,6 @@ async function regenerate() {
   }
 }
 
-/**
- * Show API key info (without revealing full key)
- */
-async function show() {
-  try {
-    if (!isAuthenticated()) {
-      logger.error('Not logged in');
-      logger.newline();
-      logger.info('Login first:');
-      logger.log('  saac login -e <email>');
-      process.exit(1);
-    }
-
-    logger.section('API Key Information');
-    logger.newline();
-
-    const spin = logger.spinner('Fetching API key info...').start();
-
-    try {
-      const result = await api.getApiKeyInfo();
-
-      spin.succeed('API key info retrieved');
-
-      logger.newline();
-      logger.field('Key Prefix', result.key_prefix); // e.g., "cw_RJ1gH8..."
-      logger.field('Created', new Date(result.created_at).toLocaleDateString());
-      logger.field('Last Used', result.last_used_at
-        ? new Date(result.last_used_at).toLocaleString()
-        : 'Never');
-
-      logger.newline();
-      logger.info('Commands:');
-      logger.log('  saac keys regenerate    Generate new API key');
-      logger.log('  saac sessions           View active sessions');
-
-    } catch (error) {
-      spin.fail('Failed to fetch API key info');
-
-      // If endpoint doesn't exist yet, show helpful message
-      if (error.response?.status === 404) {
-        logger.newline();
-        logger.warn('API key info endpoint not available yet');
-        logger.info('You can still regenerate your key with:');
-        logger.log('  saac keys regenerate');
-      } else {
-        throw error;
-      }
-    }
-  } catch (error) {
-    logger.error(error.response?.data?.message || error.message);
-    process.exit(1);
-  }
-}
-
 module.exports = {
   regenerate,
-  show,
 };

package/src/commands/list.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 list() {
   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);
     }