@startanaicompany/cli 1.4.12 → 1.4.14

package/CLAUDE.md

@@ -493,7 +493,7 @@ The wrapper API expects Git repositories to be hosted on the StartAnAiCompany Gi
 - During registration, Gitea username can be auto-detected or manually provided
 - Applications reference repositories in the format: `git@git.startanaicompany.com:user/repo.git`
 
-## Current Status - Version 1.4.12
+## Current Status - Version 1.4.14
 
 ### Completed Features
 
@@ -706,4 +706,4 @@ Before publishing to npm:
 - `dotenv` - Environment variables
 - `open` - Open browser for OAuth (v8.4.2 for compatibility with chalk v4)
 
-**Version:** 1.4.12 (current)
+**Version:** 1.4.14 (current)

package/README.md

@@ -29,10 +29,16 @@ saac register --email user@example.com
 # 2. Verify your email (check MailHog)
 saac verify 123456
 
-# 3. Create a new application
-saac create my-recruitment-site
+# 3. Login with your API key
+saac login -e user@example.com -k cw_your_api_key
 
-# 4. Deploy!
+# 4. Connect your Git account (OAuth)
+saac git connect
+
+# 5. Create a new application
+saac create my-app -s myapp -r git@git.startanaicompany.com:user/repo.git
+
+# 6. Deploy!
 saac deploy
 ```
 
@@ -40,11 +46,11 @@ saac deploy
 
 ## Git Authentication
 
-SAAC CLI supports two methods for Git authentication:
+SAAC CLI uses **OAuth-only authentication** for Git access. You must connect your Git account before creating applications.
 
-### Method 1: OAuth (Recommended ✨ NEW in 1.4.0)
+### Connect Your Git Account
 
-Connect your Git account once, deploy unlimited applications without providing tokens:
+Connect your Git account once, deploy unlimited applications:
 
 ```bash
 # Connect Git account (interactive)
@@ -65,28 +71,18 @@ saac git disconnect git.startanaicompany.com
 - ✅ No need to remember or copy tokens
 - ✅ Tokens stored encrypted on server
 - ✅ Supports Gitea, GitHub, and GitLab
+- 🔒 More secure than manual tokens
 
 **Creating apps with OAuth:**
 ```bash
-# No token needed if OAuth connected!
+# OAuth connection required!
 saac create my-app -s myapp -r git@git.startanaicompany.com:user/repo.git
 
 # CLI automatically uses your connected account
 # ✅ Using connected account: username@git.startanaicompany.com
 ```
 
-### Method 2: Manual Token (Fallback)
-
-Provide Git API token for each application:
-
-```bash
-saac create my-app \
-  -s myapp \
-  -r git@git.startanaicompany.com:user/repo.git \
-  -t your_gitea_token_here
-```
-
-**Note:** OAuth automatically takes precedence. Manual tokens are only used as fallback if no OAuth connection exists.
+**⚠️ Important:** You must connect your Git account with `saac git connect` before creating applications. Manual tokens are no longer supported.
 
 ---
 
@@ -216,11 +212,11 @@ saac init
 Create a new application
 
 ```bash
-# Basic application
-saac create my-app -s myapp -r git@git.startanaicompany.com:user/repo.git -t abc123
+# Basic application (OAuth required!)
+saac create my-app -s myapp -r git@git.startanaicompany.com:user/repo.git
 
 # Advanced with health checks and migration
-saac create api -s api -r git@git... -t abc123 \
+saac create api -s api -r git@git... \
   --build-pack nixpacks \
   --port 8080 \
   --pre-deploy-cmd "npm run migrate" \
@@ -233,7 +229,9 @@ saac create api -s api -r git@git... -t abc123 \
 - `<name>` - Application name
 - `-s, --subdomain <subdomain>` - Subdomain for your app
 - `-r, --repository <url>` - Git repository URL (SSH format)
-- `-t, --git-token <token>` - Git API token (optional if OAuth connected)
+
+**Prerequisites:**
+- You must connect your Git account first: `saac git connect`
 
 **Optional:**
 - `-b, --branch <branch>` - Git branch (default: master)
@@ -413,20 +411,26 @@ saac register -e dev@company.com
 # Check MailHog for code
 saac verify 123456
 
-# Step 2: Clone or create your project
+# Step 2: Login
+saac login -e dev@company.com -k cw_your_api_key
+
+# Step 3: Connect your Git account (OAuth)
+saac git connect
+
+# Step 4: Clone or create your project
 git clone git@git.startanaicompany.com:user/mysite.git
 cd mysite
 
-# Step 3: Initialize SAAC
-saac init --subdomain mycompany
+# Step 5: Create application
+saac create mysite -s mysite -r git@git.startanaicompany.com:user/mysite.git
 
-# Step 4: Deploy
+# Step 6: Deploy
 saac deploy
 
-# Step 5: View logs
+# Step 7: View logs
 saac logs --follow
 
-# Step 6: Update environment variables
+# Step 8: Update environment variables
 saac env set COMPANY_NAME="My Company"
 saac deploy  # Redeploy to apply changes
 ```
@@ -448,7 +452,13 @@ saac env set CONTACT_EMAIL="contact@acme.com"
 
 ### "Not logged in"
 ```bash
-saac login
+saac login -e your@email.com -k cw_your_api_key
+```
+
+### "Git account not connected"
+You must connect your Git account before creating applications:
+```bash
+saac git connect
 ```
 
 ### "No application found"

package/bin/saac.js

@@ -117,7 +117,6 @@ program
   // Required options
   .option('-s, --subdomain <subdomain>', 'Subdomain')
   .option('-r, --repository <url>', 'Git repository URL (SSH format)')
-  .option('-t, --git-token <token>', 'Git API token')
   // Basic options
   .option('-b, --branch <branch>', 'Git branch', 'master')
   .option('-d, --domain-suffix <suffix>', 'Domain suffix', 'startanaicompany.com')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startanaicompany/cli",
-  "version": "1.4.12",
+  "version": "1.4.14",
   "description": "Official CLI for StartAnAiCompany.com - Deploy AI recruitment sites with ease",
   "main": "src/index.js",
   "bin": {

package/src/commands/create.js

@@ -29,7 +29,6 @@ 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('  -t, --git-token <token>              Git API token (optional if OAuth connected)');
       logger.newline();
       logger.info('Optional options:');
       logger.log('  -b, --branch <branch>                Git branch (default: master)');
@@ -51,9 +50,9 @@ 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 -t abc123');
-      logger.log('  saac create api -s api -r git@git... -t abc123 --build-pack nixpacks --port 8080');
-      logger.log('  saac create web -s web -r git@git... -t abc123 --health-check --pre-deploy-cmd "npm run migrate"');
+      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"');
       process.exit(1);
     }
 
@@ -62,7 +61,8 @@ async function create(name, options) {
       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... -t your_token  # With manual token`);
+      logger.newline();
+      logger.info('Note: Git OAuth connection required. Connect with: saac git connect');
       process.exit(1);
     }
 
@@ -77,36 +77,16 @@ async function create(name, options) {
     if (connection) {
       logger.success(`Using connected account: ${connection.gitUsername}@${connection.gitHost}`);
       logger.newline();
-    } else if (!options.gitToken) {
-      // No OAuth connection AND no manual token provided
-      logger.warn(`Git account not connected for ${gitHost}`);
+    } else {
+      // No OAuth connection - must connect
+      logger.error(`Git account not connected for ${gitHost}`);
       logger.newline();
-
-      const { shouldConnect } = await inquirer.prompt([
-        {
-          type: 'confirm',
-          name: 'shouldConnect',
-          message: 'Would you like to connect now?',
-          default: true,
-        },
-      ]);
-
-      if (!shouldConnect) {
-        logger.newline();
-        logger.error('Cannot create application without Git authentication');
-        logger.newline();
-        logger.info('Options:');
-        logger.log('  1. Connect Git account: saac git connect');
-        logger.log('  2. Provide token: saac create ... --git-token <token>');
-        process.exit(1);
-      }
-
-      // Initiate OAuth flow
-      await oauth.connectGitAccount(gitHost, user.sessionToken || user.apiKey);
-
+      logger.info('Git OAuth connection is required to create applications');
       logger.newline();
-      logger.section('Continuing with application creation');
+      logger.info('Connect now:');
+      logger.log('  saac git connect');
       logger.newline();
+      process.exit(1);
     }
 
     // Build application payload
@@ -118,26 +98,24 @@ async function create(name, options) {
       git_branch: options.branch || 'master',
     };
 
-    // Only include git_api_token if provided (OAuth will be used if available)
-    if (options.gitToken) {
-      appData.git_api_token = options.gitToken;
-    }
+    // OAuth tokens are retrieved from database by wrapper
+    // No manual git_api_token field needed
 
     // Optional: Port configuration
     if (options.port) {
       appData.ports_exposes = options.port;
     }
 
-    // Optional: Build pack
-    if (options.buildPack) {
-      const validBuildPacks = ['dockercompose', 'nixpacks', 'dockerfile', 'static'];
-      if (!validBuildPacks.includes(options.buildPack)) {
-        logger.error(`Invalid build pack: ${options.buildPack}`);
-        logger.info(`Must be one of: ${validBuildPacks.join(', ')}`);
-        process.exit(1);
-      }
-      appData.build_pack = options.buildPack;
+    // Optional: Build pack (defaults to dockercompose)
+    const validBuildPacks = ['dockercompose', 'nixpacks', 'dockerfile', 'static'];
+    const buildPack = options.buildPack || 'dockercompose';
+
+    if (!validBuildPacks.includes(buildPack)) {
+      logger.error(`Invalid build pack: ${buildPack}`);
+      logger.info(`Must be one of: ${validBuildPacks.join(', ')}`);
+      process.exit(1);
     }
+    appData.build_pack = buildPack;
 
     // Optional: Custom commands
     if (options.installCmd) {
@@ -304,9 +282,17 @@ async function create(name, options) {
         logger.error('Validation failed');
         if (data.details) {
           logger.newline();
-          Object.entries(data.details).forEach(([field, message]) => {
-            logger.log(`  ${logger.chalk.yellow(field)}: ${message}`);
-          });
+          // Backend sends details as array: [{field, message, type}, ...]
+          if (Array.isArray(data.details)) {
+            data.details.forEach((detail) => {
+              logger.log(`  ${logger.chalk.yellow(detail.field)}: ${detail.message}`);
+            });
+          } else {
+            // Fallback for object format: {field: message, ...}
+            Object.entries(data.details).forEach(([field, message]) => {
+              logger.log(`  ${logger.chalk.yellow(field)}: ${message}`);
+            });
+          }
         } else {
           logger.log(`  ${data.message || data.error}`);
         }

package/src/commands/update.js

@@ -259,9 +259,17 @@ async function update(options) {
         logger.error('Validation failed');
         if (data.details) {
           logger.newline();
-          Object.entries(data.details).forEach(([field, message]) => {
-            logger.log(`  ${logger.chalk.yellow(field)}: ${message}`);
-          });
+          // Backend sends details as array: [{field, message, type}, ...]
+          if (Array.isArray(data.details)) {
+            data.details.forEach((detail) => {
+              logger.log(`  ${logger.chalk.yellow(detail.field)}: ${detail.message}`);
+            });
+          } else {
+            // Fallback for object format: {field: message, ...}
+            Object.entries(data.details).forEach(([field, message]) => {
+              logger.log(`  ${logger.chalk.yellow(field)}: ${message}`);
+            });
+          }
         } else {
           logger.log(`  ${data.message || data.error}`);
         }