@startanaicompany/cli 1.4.13 → 1.4.15

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.13
+## Current Status - Version 1.4.15
 
 ### 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.13 (current)
+**Version:** 1.4.15 (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/package.json

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

package/src/commands/create.js

@@ -3,10 +3,11 @@
  */
 
 const api = require('../lib/api');
-const { isAuthenticated, saveProjectConfig, getUser } = require('../lib/config');
+const { isAuthenticated, saveProjectConfig, getUser, getProjectConfig } = require('../lib/config');
 const logger = require('../lib/logger');
 const oauth = require('../lib/oauth');
 const inquirer = require('inquirer');
+const { execSync } = require('child_process');
 
 async function create(name, options) {
   try {
@@ -19,6 +20,65 @@ async function create(name, options) {
       process.exit(1);
     }
 
+    // Check if application already exists in this directory
+    const existingConfig = getProjectConfig();
+    if (existingConfig) {
+      logger.error('Application already published');
+      logger.newline();
+      logger.info('This directory is already linked to an application:');
+      if (existingConfig.applicationName) {
+        logger.field('Name', existingConfig.applicationName);
+      }
+      if (existingConfig.subdomain && existingConfig.domainSuffix) {
+        const domain = `https://${existingConfig.subdomain}.${existingConfig.domainSuffix}`;
+        logger.field('Domain', domain);
+        logger.newline();
+        logger.info(`Your application should be available at: ${domain}`);
+      }
+      logger.newline();
+      logger.info('To manage this application, use:');
+      logger.log('  saac deploy              Deploy changes');
+      logger.log('  saac update [options]    Update configuration');
+      logger.log('  saac env set KEY=VALUE   Set environment variables');
+      logger.log('  saac logs --follow       View logs');
+      logger.log('  saac status              Check status');
+      logger.newline();
+      logger.warn('To create a new application, use a different directory');
+      process.exit(1);
+    }
+
+    // Check current git branch
+    let currentBranch = null;
+    try {
+      currentBranch = execSync('git rev-parse --abbrev-ref HEAD', {
+        encoding: 'utf8',
+        stdio: ['pipe', 'pipe', 'ignore']
+      }).trim();
+    } catch (error) {
+      // Not in a git repository or git not available - continue anyway
+    }
+
+    if (currentBranch && currentBranch !== 'master' && currentBranch !== 'main') {
+      const specifiedBranch = options.branch;
+
+      if (!specifiedBranch || specifiedBranch !== currentBranch) {
+        logger.error(`You are currently on branch: ${logger.chalk.yellow(currentBranch)}`);
+        logger.newline();
+        logger.warn('This is not the master or main branch!');
+        logger.newline();
+        logger.info('If you really want to use this branch, confirm by specifying it explicitly:');
+        logger.log(`  saac create ${name} -s ${options.subdomain || '<subdomain>'} -r ${options.repository || '<repository>'} --branch ${currentBranch}`);
+        logger.newline();
+        logger.info('Or switch to master/main branch:');
+        logger.log('  git checkout master');
+        logger.log('  git checkout main');
+        process.exit(1);
+      } else {
+        logger.warn(`Using branch: ${logger.chalk.yellow(currentBranch)}`);
+        logger.newline();
+      }
+    }
+
     // Validate required fields
     if (!name) {
       logger.error('Application name is required');
@@ -106,16 +166,16 @@ async function create(name, options) {
       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) {

package/src/commands/status.js

@@ -92,12 +92,13 @@ async function status() {
         const hasMore = applications.length > 5;
 
         const data = [
-          ['Name', 'Domain', 'Status', 'Created'],
+          ['Name', 'Domain', 'Status', 'Branch', 'Created'],
         ];
 
         displayApps.forEach((app) => {
           const created = new Date(app.created_at).toLocaleDateString();
           const status = app.status || 'unknown';
+          const branch = app.git_branch || 'unknown';
 
           // Status with icons (handle both Coolify format and documented format)
           let statusDisplay;
@@ -128,6 +129,7 @@ async function status() {
             app.name,
             app.domain || `${app.subdomain}.startanaicompany.com`,
             statusDisplay,
+            branch,
             created
           ]);
         });