@launchframe/cli 1.0.0-beta.2 → 1.0.0-beta.21

package/CLAUDE.md

@@ -0,0 +1,27 @@
+# LaunchFrame CLI
+
+CLI tool for generating new projects from the LaunchFrame template.
+
+## Purpose
+
+The CLI takes user input (project name, domain, GitHub org, etc.) and:
+1. Copies the `services/` template
+2. Replaces all `{{TEMPLATE_VARIABLES}}`
+3. Generates secrets (DB password, auth secret)
+4. Sets up the project structure
+
+## Template Variables
+
+The CLI replaces these placeholders in all files:
+- `{{PROJECT_NAME}}` - lowercase project name
+- `{{PROJECT_NAME_UPPER}}` - uppercase project name
+- `{{GITHUB_ORG}}` - GitHub organization/username
+- `{{PRIMARY_DOMAIN}}` - main domain (e.g., mysaas.com)
+- `{{ADMIN_EMAIL}}` - admin email for Let's Encrypt
+- `{{VPS_HOST}}` - VPS hostname/IP
+- `{{BETTER_AUTH_SECRET}}` - auto-generated (32+ chars)
+- `{{DB_PASSWORD}}` - auto-generated
+
+## Development
+
+TODO: CLI implementation details

package/README.md

@@ -1,6 +1,12 @@
 # LaunchFrame CLI
 
-> Ship your B2B SaaS to production in hours, not weeks.
+> Ship your B2B SaaS to production in hours, not months.
+
+---
+
+**🚀 We're looking for beta testers!** Get free lifetime access to LaunchFrame [here](https://launchframe.dev/#beta-signup). Limited spots available.
+
+---
 
 LaunchFrame is a production-ready SaaS boilerplate that deploys to a single affordable VPS. Get subscriptions, credits, multi-tenancy, feature gating, and API management out of the box.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@launchframe/cli",
-  "version": "1.0.0-beta.2",
+  "version": "1.0.0-beta.21",
   "description": "Production-ready B2B SaaS boilerplate with subscriptions, credits, and multi-tenancy",
   "main": "src/index.js",
   "bin": {

package/src/commands/cache.js

@@ -1,11 +1,11 @@
 const chalk = require('chalk');
-const { clearCache, getCacheInfo } = require('../utils/module-cache');
+const { clearCache, getCacheInfo } = require('../utils/service-cache');
 
 /**
- * Clear module cache
+ * Clear service cache
  */
 async function cacheClear() {
-  console.log(chalk.yellow('\n⚠️  This will delete all cached modules'));
+  console.log(chalk.yellow('\n⚠️  This will delete all cached services'));
   console.log(chalk.gray('You will need to re-download on next init or service:add\n'));
   
   const inquirer = require('inquirer');
@@ -30,7 +30,7 @@ async function cacheClear() {
 async function cacheInfo() {
   const info = await getCacheInfo();
   
-  console.log(chalk.blue('\n📦 Module Cache Information\n'));
+  console.log(chalk.blue('\n📦 Service Cache Information\n'));
   
   console.log(chalk.white('Location:'));
   console.log(chalk.gray(`  ${info.path}\n`));
@@ -54,14 +54,14 @@ async function cacheInfo() {
     console.log(chalk.gray(`  ${info.lastUpdate.toLocaleString()}\n`));
   }
   
-  if (info.modules && info.modules.length > 0) {
-    console.log(chalk.white('Cached Modules:'));
-    info.modules.forEach(mod => {
+  if (info.services && info.services.length > 0) {
+    console.log(chalk.white('Cached Services:'));
+    info.services.forEach(mod => {
       console.log(chalk.gray(`  • ${mod}`));
     });
     console.log('');
   } else {
-    console.log(chalk.gray('No modules cached yet\n'));
+    console.log(chalk.gray('No services cached yet\n'));
   }
   
   console.log(chalk.gray('Commands:'));
@@ -73,21 +73,21 @@ async function cacheInfo() {
  * Force update cache
  */
 async function cacheUpdate() {
-  const { ensureCacheReady, getCacheInfo } = require('../utils/module-cache');
+  const { ensureCacheReady, getCacheInfo } = require('../utils/service-cache');
   
   console.log(chalk.blue('\n🔄 Forcing cache update...\n'));
   
   try {
     const info = await getCacheInfo();
-    const currentModules = info.modules || [];
+    const currentServices = info.services || [];
     
-    if (currentModules.length === 0) {
-      console.log(chalk.yellow('No modules in cache yet. Use init or service:add to populate.\n'));
+    if (currentServices.length === 0) {
+      console.log(chalk.yellow('No services in cache yet. Use init or service:add to populate.\n'));
       return;
     }
     
-    // Update cache with current modules
-    await ensureCacheReady(currentModules);
+    // Update cache with current services
+    await ensureCacheReady(currentServices);
     console.log(chalk.green('\n✓ Cache updated successfully\n'));
   } catch (error) {
     console.error(chalk.red(`\n❌ Failed to update cache: ${error.message}\n`));

package/src/commands/deploy-build.js

@@ -0,0 +1,76 @@
+const chalk = require('chalk');
+const path = require('path');
+const { requireProject, getProjectConfig } = require('../utils/project-helpers');
+const { buildAndPushWorkflow } = require('../utils/docker-helper');
+const { pullImagesOnVPS, restartServicesOnVPS } = require('../utils/ssh-helper');
+
+/**
+ * Build, push, and deploy Docker images
+ * @param {string} [serviceName] - Optional specific service to build (e.g., 'backend', 'admin-portal')
+ */
+async function deployBuild(serviceName) {
+  requireProject();
+
+  const serviceLabel = serviceName ? `(${serviceName})` : '(all services)';
+  console.log(chalk.blue.bold(`\n🔨 LaunchFrame Build & Deploy ${serviceLabel}\n`));
+
+  const config = getProjectConfig();
+  const projectRoot = process.cwd();
+
+  // Validate deployment is configured
+  if (!config.deployConfigured || !config.deployment) {
+    console.log(chalk.red('❌ Error: Deployment not configured yet\n'));
+    console.log(chalk.gray('Run this command first:'));
+    console.log(chalk.white('  launchframe deploy:configure\n'));
+    process.exit(1);
+  }
+
+  const { vpsHost, vpsUser, vpsAppFolder, githubOrg, ghcrToken } = config.deployment;
+  const { projectName, installedServices } = config;
+  const envProdPath = path.join(projectRoot, 'infrastructure', '.env.prod');
+
+  // Step 1-3: Build and push images
+  console.log(chalk.yellow('🐳 Step 1: Building and pushing images...\n'));
+
+  try {
+    await buildAndPushWorkflow({
+      projectRoot,
+      projectName,
+      githubOrg,
+      ghcrToken,
+      envProdPath,
+      installedServices,
+      serviceName
+    });
+  } catch (error) {
+    console.log(chalk.red(`\n❌ ${error.message}\n`));
+    process.exit(1);
+  }
+
+  // Step 4: Pull images on VPS
+  console.log(chalk.yellow('🚀 Step 2: Pulling images on VPS...\n'));
+
+  try {
+    await pullImagesOnVPS(vpsUser, vpsHost, vpsAppFolder);
+  } catch (error) {
+    console.log(chalk.red(`\n❌ ${error.message}\n`));
+    process.exit(1);
+  }
+
+  // Step 5: Restart services
+  console.log(chalk.yellow('\n🔄 Step 3: Restarting services...\n'));
+
+  try {
+    await restartServicesOnVPS(vpsUser, vpsHost, vpsAppFolder);
+  } catch (error) {
+    console.log(chalk.red(`\n❌ ${error.message}\n`));
+    process.exit(1);
+  }
+
+  // Success!
+  console.log(chalk.green.bold('\n✅ Build and deploy complete!\n'));
+
+  console.log(chalk.gray('Your updated application is now running.\n'));
+}
+
+module.exports = { deployBuild };

package/src/commands/deploy-configure.js

@@ -59,8 +59,8 @@ async function deployConfigure() {
   console.log(chalk.yellow('\n⚙️  Updating configuration files...\n'));
 
   // Files that need template variable replacement
+  // Note: infrastructure/.env is NOT updated - it's for local development only
   const filesToUpdate = [
-    'infrastructure/.env',
     'infrastructure/.env.example',
     'infrastructure/docker-compose.yml',
     'infrastructure/docker-compose.dev.yml',
@@ -71,16 +71,25 @@ async function deployConfigure() {
     'admin-portal/public/env-config.js',
     'admin-portal/src/config/runtime.ts',
     'admin-portal/src/config/pageMetadata.ts',
-    'admin-portal/src/pages/FirstProject.tsx',
-    'admin-portal/src/components/projects/NewProject.tsx',
-    'admin-portal/src/components/settings/CustomDomain.tsx',
     'admin-portal/src/App.tsx',
     'admin-portal/src/components/common/PageTitle.tsx',
     'admin-portal/src/sentry.tsx',
-    'admin-portal/src/pages/AppSumo.tsx',
-    'customers-portal/src/App.tsx'
   ];
 
+  if (config.variants.tenancy === 'multi-tenant') {
+    filesToUpdate.push(
+      'admin-portal/src/pages/FirstProject.tsx',
+      'admin-portal/src/components/projects/NewProject.tsx',
+    );
+  }
+
+  if (config.variants.userModel === 'b2b2c') {
+    filesToUpdate.push(
+      'admin-portal/src/components/settings/CustomDomain.tsx',
+      'customers-portal/src/App.tsx'
+    )
+  }
+
   const projectRoot = process.cwd();
   let filesUpdated = 0;
 

package/src/commands/deploy-init.js

@@ -1,6 +1,5 @@
 const chalk = require('chalk');
 const path = require('path');
-const fs = require('fs-extra');
 const ora = require('ora');
 const { requireProject, getProjectConfig } = require('../utils/project-helpers');
 const { validateEnvProd } = require('../utils/env-validator');
@@ -9,8 +8,10 @@ const {
   checkSSHKeys,
   executeSSH,
   copyFileToVPS,
-  copyDirectoryToVPS
+  copyDirectoryToVPS,
+  pullImagesOnVPS
 } = require('../utils/ssh-helper');
+const { buildAndPushWorkflow } = require('../utils/docker-helper');
 
 /**
  * Initial VPS setup - copy infrastructure files and configure environment
@@ -30,8 +31,8 @@ async function deployInit() {
     process.exit(1);
   }
 
-  const { vpsHost, vpsUser, vpsAppFolder, githubOrg } = config.deployment;
-  const { projectName } = config;
+  const { vpsHost, vpsUser, vpsAppFolder, githubOrg, ghcrToken } = config.deployment;
+  const { projectName, installedServices } = config;
   const projectRoot = process.cwd();
   const envProdPath = path.join(projectRoot, 'infrastructure', '.env.prod');
 
@@ -86,42 +87,18 @@ async function deployInit() {
   spinner.succeed('Connected to VPS successfully');
   console.log();
 
-  // Step 3.5: Build and push Docker images
-  console.log(chalk.yellow('🐳 Step 3.5: Building Docker images locally...\n'));
-
-  // Check if Docker is running
-  const {
-    checkDockerRunning,
-    loginToGHCR,
-    buildFullAppImages
-  } = require('../utils/docker-helper');
-
-  const dockerRunning = await checkDockerRunning();
-  if (!dockerRunning) {
-    console.log(chalk.red('❌ Docker is not running\n'));
-    console.log(chalk.gray('Please start Docker Desktop and try again.\n'));
-    console.log(chalk.gray('Docker is required to build production images for deployment.\n'));
-    process.exit(1);
-  }
-
-  // Validate GHCR token is configured
-  const { ghcrToken } = config.deployment || {};
-  if (!ghcrToken) {
-    console.log(chalk.red('❌ GHCR token not configured\n'));
-    console.log(chalk.gray('Run this command first:'));
-    console.log(chalk.white('  launchframe deploy:configure\n'));
-    process.exit(1);
-  }
+  // Step 4: Build and push Docker images
+  console.log(chalk.yellow('🐳 Step 4: Building Docker images locally...\n'));
 
   try {
-    // Login to GHCR
-    await loginToGHCR(githubOrg, ghcrToken);
-
-    // Build full-app images (only for installed services)
-    const installedServices = config.installedServices || ['backend', 'admin-portal', 'website'];
-    await buildFullAppImages(projectRoot, projectName, githubOrg, envProdPath, installedServices);
-
-    console.log(chalk.green.bold('\n✅ All images built and pushed to GHCR!\n'));
+    await buildAndPushWorkflow({
+      projectRoot,
+      projectName,
+      githubOrg,
+      ghcrToken,
+      envProdPath,
+      installedServices: installedServices || ['backend', 'admin-portal', 'website']
+    });
   } catch (error) {
     console.log(chalk.red('\n❌ Failed to build Docker images\n'));
     console.log(chalk.gray('Error:'), error.message, '\n');
@@ -135,16 +112,15 @@ async function deployInit() {
     process.exit(1);
   }
 
-
-  // Step 4: Create app directory and copy infrastructure files
-  console.log(chalk.yellow('📦 Step 4: Setting up application on VPS...\n'));
+  // Step 5: Create app directory and copy infrastructure files
+  console.log(chalk.yellow('📦 Step 5: Setting up application on VPS...\n'));
 
   const setupSpinner = ora('Creating app directory...').start();
 
   try {
     // Create infrastructure directory on VPS
     await executeSSH(vpsUser, vpsHost, `mkdir -p ${vpsAppFolder}/infrastructure`);
-    
+
     setupSpinner.text = 'Copying infrastructure files to VPS...';
 
     // Copy entire infrastructure directory to VPS
@@ -158,6 +134,22 @@ async function deployInit() {
     process.exit(1);
   }
 
+  // Create symlink for docker-compose.override.yml -> docker-compose.prod.yml
+  const symlinkSpinner = ora('Creating docker-compose.override.yml symlink...').start();
+
+  try {
+    await executeSSH(
+      vpsUser,
+      vpsHost,
+      `cd ${vpsAppFolder}/infrastructure && ln -sf docker-compose.prod.yml docker-compose.override.yml`
+    );
+    symlinkSpinner.succeed('Docker Compose override symlink created');
+  } catch (error) {
+    symlinkSpinner.fail('Failed to create symlink');
+    console.log(chalk.red(`\n❌ Error: ${error.message}\n`));
+    process.exit(1);
+  }
+
   // Check if waitlist is running and stop it (full-app deployment)
   try {
     const { stdout: psOutput } = await executeSSH(
@@ -189,8 +181,8 @@ async function deployInit() {
     // If error, waitlist probably not running - continue
   }
 
-  // Step 5: Copy .env.prod to VPS (overwrites .env copied from infrastructure/)
-  console.log(chalk.yellow('\n📄 Step 5: Configuring production environment...\n'));
+  // Step 6: Copy .env.prod to VPS (overwrites .env copied from infrastructure/)
+  console.log(chalk.yellow('\n📄 Step 6: Configuring production environment...\n'));
 
   const envSpinner = ora('Copying .env.prod to VPS...').start();
 
@@ -204,27 +196,18 @@ async function deployInit() {
     process.exit(1);
   }
 
-  // Step 6: Pull Docker images
-  console.log(chalk.yellow('\n🐳 Step 6: Pulling Docker images...\n'));
+  // Step 7: Pull Docker images
+  console.log(chalk.yellow('\n🐳 Step 7: Pulling Docker images on VPS...\n'));
   console.log(chalk.gray('This may take several minutes...\n'));
 
-  const dockerSpinner = ora('Pulling Docker images...').start();
-
   try {
-    await executeSSH(
-      vpsUser,
-      vpsHost,
-      `cd ${vpsAppFolder}/infrastructure && docker-compose -f docker-compose.yml -f docker-compose.prod.yml pull`,
-      { timeout: 600000 } // 10 minutes for image pull
-    );
-    dockerSpinner.succeed('Docker images pulled successfully');
+    await pullImagesOnVPS(vpsUser, vpsHost, vpsAppFolder);
   } catch (error) {
-    dockerSpinner.fail('Failed to pull Docker images');
     console.log(chalk.yellow(`\n⚠️  Warning: ${error.message}\n`));
     console.log(chalk.gray('This might mean Docker is not installed on the VPS.'));
     console.log(chalk.gray('Please install Docker and Docker Compose:\n'));
     console.log(chalk.white('  curl -fsSL https://get.docker.com | sh'));
-    console.log(chalk.white('  sudo usermod -aG docker ${vpsUser}\n'));
+    console.log(chalk.white(`  sudo usermod -aG docker ${vpsUser}\n`));
     process.exit(1);
   }
 

package/src/commands/deploy-set-env.js

@@ -71,7 +71,7 @@ async function deploySetEnv() {
   // Generate secure defaults
   const dbPassword = generateSecret(24);
   const redisPassword = generateSecret(24);
-  const jwtSecret = generateSecret(32);
+  const betterAuthSecret = generateSecret(32);
   const bullAdminToken = generateSecret(32);
 
   const answers = await inquirer.prompt([
@@ -91,9 +91,9 @@ async function deploySetEnv() {
     },
     {
       type: 'password',
-      name: 'jwtSecret',
-      message: 'JWT secret:',
-      default: jwtSecret,
+      name: 'betterAuthSecret',
+      message: 'Better Auth secret (min 32 chars):',
+      default: betterAuthSecret,
       mask: '*'
     },
     {
@@ -143,7 +143,7 @@ async function deploySetEnv() {
 
   replacements['DB_PASSWORD'] = answers.dbPassword;
   replacements['REDIS_PASSWORD'] = answers.redisPassword;
-  replacements['JWT_SECRET'] = answers.jwtSecret;
+  replacements['BETTER_AUTH_SECRET'] = answers.betterAuthSecret;
   replacements['BULL_ADMIN_TOKEN'] = answers.bullAdminToken;
   replacements['RESEND_API_KEY'] = answers.resendApiKey || 're_your_resend_api_key';
   replacements['POLAR_ACCESS_TOKEN'] = answers.polarAccessToken || 'polar_oat_your_token';
@@ -163,11 +163,21 @@ async function deploySetEnv() {
   // Update production URLs based on deployment config
   if (config.deployment?.primaryDomain) {
     const domain = config.deployment.primaryDomain;
+    const adminEmail = config.deployment.adminEmail || `admin@${domain}`;
+
+    // First, replace all {{PRIMARY_DOMAIN}} and {{ADMIN_EMAIL}} placeholders globally
+    envContent = envContent.split('{{PRIMARY_DOMAIN}}').join(domain);
+    envContent = envContent.split('{{ADMIN_EMAIL}}').join(adminEmail);
+
+    // Then update specific URL variables for production
     const urlReplacements = {
+      'PRIMARY_DOMAIN': domain,
+      'NODE_ENV': 'production',
       'API_BASE_URL': `https://api.${domain}`,
       'ADMIN_BASE_URL': `https://admin.${domain}`,
-      'FRONTEND_BASE_URL': `https://app.${domain}`,
-      'WEBSITE_BASE_URL': `https://${domain}`
+      'FRONTEND_BASE_URL': `https://${domain}`,
+      'WEBSITE_BASE_URL': `https://www.${domain}`,
+      'GOOGLE_REDIRECT_URI': `https://api.${domain}/auth/google/callback`
     };
 
     for (const [key, value] of Object.entries(urlReplacements)) {

package/src/commands/deploy-up.js

@@ -105,8 +105,8 @@ async function deployUp() {
   const verifySpinner = ora('Checking service status...').start();
 
   try {
-    const { stdout: psOutput} = await execAsync(
-      `ssh ${vpsUser}@${vpsHost} "cd ${vpsAppFolder}/infrastructure && docker-compose -f docker-compose.yml ps"`,
+    const { stdout: psOutput } = await execAsync(
+      `ssh ${vpsUser}@${vpsHost} "cd ${vpsAppFolder}/infrastructure && docker-compose -f docker-compose.yml -f docker-compose.prod.yml ps"`,
       { timeout: 30000 }
     );
 
@@ -114,6 +114,7 @@ async function deployUp() {
 
     console.log(chalk.gray('\n' + psOutput));
   } catch (error) {
+    console.error(chalk.red(`\n❌ Error: ${error.message}\n`));
     verifySpinner.warn('Could not verify services');
   }
 
@@ -138,7 +139,7 @@ async function deployUp() {
   console.log(chalk.gray('   Just push to GitHub - CI/CD will handle deployment automatically!\n'));
 
   console.log(chalk.white('3. Monitor services:'));
-  console.log(chalk.gray(`   Run: ssh ${vpsUser}@${vpsHost} "cd ${vpsAppFolder}/infrastructure && docker-compose logs -f"\n`));
+  console.log(chalk.gray(`   Run: ssh ${vpsUser}@${vpsHost} "cd ${vpsAppFolder}/infrastructure && docker-compose -f docker-compose.yml -f docker-compose.prod.yml logs -f"\n`));
 }
 
 module.exports = { deployUp };

package/src/commands/help.js

@@ -7,16 +7,20 @@ const { isLaunchFrameProject, isWaitlistInstalled } = require('../utils/project-
 function help() {
   const inProject = isLaunchFrameProject();
 
-  console.log(chalk.blue.bold('\n🚀 LaunchFrame CLI\n'));
+  console.log(chalk.blue.bold('\nLaunchFrame CLI\n'));
   console.log(chalk.white('Usage:'));
-  console.log(chalk.gray('  launchframe [command]\n'));
+  console.log(chalk.gray('  launchframe [command] [options]\n'));
+  console.log(chalk.white('Global options:'));
+  console.log(chalk.gray('  --verbose, -v           Show detailed output'));
+  console.log(chalk.gray('  --version               Show version number\n'));
 
   if (inProject) {
     console.log(chalk.white('Deployment commands:'));
     console.log(chalk.gray('  deploy:configure  Configure production deployment settings'));
     console.log(chalk.gray('  deploy:set-env    Configure production environment variables'));
     console.log(chalk.gray('  deploy:init       Initialize VPS and build Docker images'));
-    console.log(chalk.gray('  deploy:up         Start services on VPS\n'));
+    console.log(chalk.gray('  deploy:up         Start services on VPS'));
+    console.log(chalk.gray('  deploy:build [service]  Build, push, and deploy (all or specific service)\n'));
 
     // Conditionally show waitlist commands
     if (isWaitlistInstalled()) {
@@ -40,7 +44,7 @@ function help() {
     console.log(chalk.white('Available Services:'));
     console.log(chalk.gray('  waitlist          Coming soon page with email collection\n'));
     console.log(chalk.white('Cache Management:'));
-    console.log(chalk.gray('  cache:info        Show cache location, size, and cached modules'));
+    console.log(chalk.gray('  cache:info        Show cache location, size, and cached services'));
     console.log(chalk.gray('  cache:update      Force update cache to latest version'));
     console.log(chalk.gray('  cache:clear       Delete cache (re-download on next use)\n'));
     console.log(chalk.white('Other commands:'));
@@ -75,7 +79,7 @@ function help() {
     console.log(chalk.gray('    --user-model <b2b|b2b2c>  User model (skips prompt)'));
     console.log(chalk.gray('  help                        Show this help message\n'));
     console.log(chalk.white('Cache Management:'));
-    console.log(chalk.gray('  cache:info        Show cache location, size, and cached modules'));
+    console.log(chalk.gray('  cache:info        Show cache location, size, and cached services'));
     console.log(chalk.gray('  cache:update      Force update cache to latest version'));
     console.log(chalk.gray('  cache:clear       Delete cache (re-download on next use)\n'));
     console.log(chalk.white('Examples:'));
@@ -83,6 +87,8 @@ function help() {
     console.log(chalk.gray('  launchframe init\n'));
     console.log(chalk.gray('  # Non-interactive mode'));
     console.log(chalk.gray('  launchframe init --project-name my-saas --tenancy single --user-model b2b\n'));
+    console.log(chalk.gray('  # With verbose output'));
+    console.log(chalk.gray('  launchframe init --verbose\n'));
   }
 }