@startanaicompany/cli 1.4.14 → 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.14
+## 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.14 (current)
+**Version:** 1.4.15 (current)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@startanaicompany/cli",
-  "version": "1.4.14",
+  "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');

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