genbox 1.0.3 → 1.0.4

package/dist/commands/create.js

@@ -38,27 +38,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCommand = void 0;
 const commander_1 = require("commander");
-const inquirer_1 = __importDefault(require("inquirer"));
+const prompts = __importStar(require("@inquirer/prompts"));
 const chalk_1 = __importDefault(require("chalk"));
 const ora_1 = __importDefault(require("ora"));
-const config_1 = require("../config");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const os = __importStar(require("os"));
+const config_loader_1 = require("../config-loader");
+const profile_resolver_1 = require("../profile-resolver");
 const api_1 = require("../api");
 const ssh_config_1 = require("../ssh-config");
-// Real API Client
-async function provisionGenbox(options) {
+async function provisionGenbox(payload) {
     return (0, api_1.fetchApi)('/genboxes', {
         method: 'POST',
-        body: JSON.stringify(options),
+        body: JSON.stringify(payload),
     });
 }
 function getPublicSshKey() {
     const home = os.homedir();
     const potentialKeys = [
-        path.join(home, '.ssh', 'id_rsa.pub'),
         path.join(home, '.ssh', 'id_ed25519.pub'),
+        path.join(home, '.ssh', 'id_rsa.pub'),
     ];
     for (const keyPath of potentialKeys) {
         if (fs.existsSync(keyPath)) {
@@ -67,172 +67,411 @@ function getPublicSshKey() {
                 return content;
         }
     }
-    throw new Error('No public SSH key found in ~/.ssh/ (checked id_rsa.pub and id_ed25519.pub)');
+    throw new Error('No public SSH key found in ~/.ssh/');
 }
 function getPrivateSshKey() {
     const home = os.homedir();
     const potentialKeys = [
-        path.join(home, '.ssh', 'id_rsa'),
         path.join(home, '.ssh', 'id_ed25519'),
+        path.join(home, '.ssh', 'id_rsa'),
     ];
     for (const keyPath of potentialKeys) {
         if (fs.existsSync(keyPath)) {
-            return keyPath;
+            return fs.readFileSync(keyPath, 'utf-8');
         }
     }
-    throw new Error('No SSH private key found in ~/.ssh/');
+    return undefined;
 }
 exports.createCommand = new commander_1.Command('create')
-    .description('Create a new Genbox')
+    .description('Create a new Genbox environment')
     .argument('<name>', 'Name of the Genbox')
-    .option('--size <size>', 'Size of the Genbox (small, medium, large, xl)')
+    .option('-p, --profile <profile>', 'Use a predefined profile')
+    .option('-a, --apps <apps>', 'Comma-separated list of apps to include')
+    .option('--add-apps <apps>', 'Add apps to the profile')
+    .option('--api <mode>', 'API mode: local, staging, production')
+    .option('--db <mode>', 'Database mode: none, local, copy, remote')
+    .option('--db-source <source>', 'Database source: staging, production')
+    .option('-s, --size <size>', 'Server size: small, medium, large, xl')
+    .option('-b, --branch <branch>', 'Git branch to checkout')
+    .option('-y, --yes', 'Skip interactive prompts')
+    .option('--dry-run', 'Show what would be created without actually creating')
     .action(async (name, options) => {
     try {
-        const config = (0, config_1.loadConfig)();
-        const size = options.size || 'small';
+        // Load configuration
+        const configLoader = new config_loader_1.ConfigLoader();
+        const loadResult = await configLoader.load();
+        if (!loadResult.config || loadResult.config.version !== '3.0') {
+            // Fall back to legacy v1/v2 handling
+            await createLegacy(name, options);
+            return;
+        }
+        const config = loadResult.config;
+        const profileResolver = new profile_resolver_1.ProfileResolver(configLoader);
+        // Build create options
+        const createOptions = {
+            name,
+            profile: options.profile,
+            apps: options.apps ? options.apps.split(',').map((a) => a.trim()) : undefined,
+            addApps: options.addApps ? options.addApps.split(',').map((a) => a.trim()) : undefined,
+            api: options.api,
+            db: options.db,
+            dbSource: options.dbSource,
+            size: options.size,
+            branch: options.branch,
+            yes: options.yes,
+            dryRun: options.dryRun,
+        };
+        // Resolve configuration
+        console.log(chalk_1.default.blue('Resolving configuration...'));
+        console.log('');
+        const resolved = await profileResolver.resolve(config, createOptions);
+        // Display resolved configuration
+        displayResolvedConfig(resolved);
+        // Ask to save as profile (if not using one already)
+        if (!options.profile && !options.yes && !options.dryRun) {
+            await profileResolver.askSaveProfile(config, resolved);
+        }
+        // Dry run mode
+        if (options.dryRun) {
+            console.log(chalk_1.default.yellow('\nDry run mode - no genbox created'));
+            return;
+        }
+        // Confirm creation
+        if (!options.yes) {
+            const confirm = await prompts.confirm({
+                message: `Create genbox '${name}'?`,
+                default: true,
+            });
+            if (!confirm) {
+                console.log(chalk_1.default.dim('Cancelled.'));
+                return;
+            }
+        }
+        // Get SSH keys
         const publicKey = getPublicSshKey();
-        // Check if SSH auth is needed for git repos (only ask if using SSH, not PAT)
+        // Check if SSH auth is needed for git
         let privateKeyContent;
-        const usesSSHAuth = config.git_auth?.method === 'ssh' ||
-            (config.repos && Object.values(config.repos).some(r => r.auth === 'ssh'));
-        if (usesSSHAuth) {
-            const { injectKey } = await inquirer_1.default.prompt([{
-                    type: 'confirm',
-                    name: 'injectKey',
-                    message: 'Inject local SSH Private Key for git cloning?',
-                    default: true
-                }]);
+        const usesSSH = config.git_auth?.method === 'ssh' ||
+            Object.values(config.repos || {}).some(r => r.auth === 'ssh');
+        if (usesSSH && !options.yes) {
+            const injectKey = await prompts.confirm({
+                message: 'Inject SSH private key for git cloning?',
+                default: true,
+            });
             if (injectKey) {
-                const home = os.homedir();
-                const privKeyPath = [path.join(home, '.ssh', 'id_rsa'), path.join(home, '.ssh', 'id_ed25519')].find(kv => fs.existsSync(kv));
-                if (privKeyPath) {
-                    privateKeyContent = fs.readFileSync(privKeyPath, 'utf-8');
-                    console.log(chalk_1.default.dim(`  Using private key: ${privKeyPath}`));
-                }
-                else {
-                    console.warn(chalk_1.default.yellow('No private key found to inject!'));
+                privateKeyContent = getPrivateSshKey();
+                if (privateKeyContent) {
+                    console.log(chalk_1.default.dim('  Using local SSH private key'));
                 }
             }
         }
-        const spinner = (0, ora_1.default)(`Creating Genbox '${name}' for project '${config.project_name}'...`).start();
+        // Build payload
+        const payload = buildPayload(resolved, config, publicKey, privateKeyContent, configLoader);
+        // Create genbox
+        const spinner = (0, ora_1.default)(`Creating Genbox '${name}'...`).start();
         try {
-            // Prepare files bundle
-            const filesBundle = [];
-            if (config.files) {
-                for (const f of config.files) {
-                    const sourcePath = path.resolve(process.cwd(), f.source);
-                    if (fs.existsSync(sourcePath)) {
-                        const content = fs.readFileSync(sourcePath, 'utf-8');
-                        filesBundle.push({
-                            path: f.target,
-                            content: content,
-                            permissions: f.permissions || '0644'
-                        });
-                    }
-                    else {
-                        console.warn(chalk_1.default.yellow(`Warning: File ${f.source} not found. Skipping.`));
-                    }
-                }
-            }
-            // Scripts handling (simplistic: upload and run)
-            const postDetails = [];
-            if (config.scripts) {
-                for (const s of config.scripts) {
-                    const scriptName = path.basename(s);
-                    const targetPath = `/home/dev/${scriptName}`;
-                    const sourcePath = path.resolve(process.cwd(), s);
-                    if (fs.existsSync(sourcePath)) {
-                        const content = fs.readFileSync(sourcePath, 'utf-8');
-                        filesBundle.push({
-                            path: targetPath,
-                            content: content,
-                            permissions: '0755'
-                        });
-                        postDetails.push(`su - dev -c "${targetPath}"`);
-                    }
-                }
-            }
-            // project_name from config becomes 'workspace' in the API
-            const workspace = config.project_name || 'default';
-            // Load environment variables (including GIT_TOKEN for PAT auth)
-            const envVars = (0, config_1.loadEnvVars)();
-            const gitToken = envVars.GIT_TOKEN;
-            const genbox = await provisionGenbox({
-                name,
-                size,
-                publicKey,
-                workspace,
-                services: config.services,
-                files: filesBundle,
-                postDetails,
-                repos: config.repos,
-                privateKey: privateKeyContent,
-                gitToken,
-            });
+            const genbox = await provisionGenbox(payload);
             spinner.succeed(chalk_1.default.green(`Genbox '${name}' created successfully!`));
-            // Add SSH config entry for easy access
+            // Add SSH config
             if (genbox.ipAddress) {
-                const sshConfigAdded = (0, ssh_config_1.addSshConfigEntry)({
+                const sshAdded = (0, ssh_config_1.addSshConfigEntry)({
                     name,
                     ipAddress: genbox.ipAddress,
                 });
-                if (sshConfigAdded) {
+                if (sshAdded) {
                     console.log(chalk_1.default.dim(`  SSH config added: ssh ${(0, ssh_config_1.getSshAlias)(name)}`));
                 }
             }
-            console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
-            console.log(`  ${chalk_1.default.bold('Environment:')} ${name}`);
-            console.log(`  ${chalk_1.default.bold('Workspace:')}   ${genbox.workspace || workspace}`);
-            console.log(`  ${chalk_1.default.bold('Size:')}        ${genbox.size}`);
-            console.log(`  ${chalk_1.default.bold('Status:')}      ${chalk_1.default.yellow(genbox.status)}`);
-            if (genbox.ipAddress) {
-                console.log(`  ${chalk_1.default.bold('IP:')}          ${genbox.ipAddress}`);
-            }
-            console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
-            // Display URLs
-            if (genbox.urls && Object.keys(genbox.urls).length > 0) {
-                console.log('\n' + chalk_1.default.bold('Access URLs:'));
-                for (const [service, url] of Object.entries(genbox.urls)) {
-                    console.log(`  ${chalk_1.default.cyan(service.padEnd(10))} ${url}`);
-                }
-            }
-            console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
-            console.log(`\n${chalk_1.default.bold('Quick Commands:')}`);
-            console.log(`  SSH:     ${chalk_1.default.cyan(`genbox connect ${name}`)}`);
-            console.log(`  Status:  ${chalk_1.default.cyan(`genbox status ${name}`)}`);
-            console.log(`  URLs:    ${chalk_1.default.cyan(`genbox urls ${name}`)}`);
-            console.log(`  Destroy: ${chalk_1.default.cyan(`genbox destroy ${name}`)}`);
-        }
-        catch (innerError) {
-            if (innerError instanceof api_1.AuthenticationError) {
-                spinner.fail(chalk_1.default.red('Not logged in'));
-                console.error('');
-                console.error(chalk_1.default.yellow('  Please authenticate first:'));
-                console.error(chalk_1.default.cyan('  $ genbox login'));
-                console.error('');
-            }
-            else {
-                spinner.fail(chalk_1.default.red(`Failed to create Genbox '${name}': ${innerError.message}`));
+            // Display results
+            displayGenboxInfo(genbox, resolved);
+        }
+        catch (error) {
+            spinner.fail(chalk_1.default.red(`Failed to create Genbox: ${error.message}`));
+            if (error instanceof api_1.AuthenticationError) {
+                console.log('');
+                console.log(chalk_1.default.yellow('  Please authenticate first:'));
+                console.log(chalk_1.default.cyan('  $ genbox login'));
             }
         }
     }
     catch (error) {
-        // Handle user cancellation (Ctrl+C) gracefully
         if (error.name === 'ExitPromptError' || error.message?.includes('force closed')) {
             console.log('');
             console.log(chalk_1.default.dim('Cancelled.'));
             return;
         }
-        // Handle authentication errors with a helpful message
         if (error instanceof api_1.AuthenticationError) {
-            console.error('');
-            console.error(chalk_1.default.red('✖ Not logged in'));
-            console.error('');
-            console.error(chalk_1.default.yellow('  Please authenticate first:'));
-            console.error(chalk_1.default.cyan('  $ genbox login'));
-            console.error('');
+            console.log(chalk_1.default.red('✖ Not logged in'));
+            console.log('');
+            console.log(chalk_1.default.yellow('  Please authenticate first:'));
+            console.log(chalk_1.default.cyan('  $ genbox login'));
             return;
         }
         console.error(chalk_1.default.red(`Error: ${error.message}`));
     }
 });
+/**
+ * Display resolved configuration
+ */
+function displayResolvedConfig(resolved) {
+    console.log(chalk_1.default.bold('Configuration:'));
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log(`  ${chalk_1.default.bold('Name:')}     ${resolved.name}`);
+    console.log(`  ${chalk_1.default.bold('Project:')}  ${resolved.project.name}`);
+    console.log(`  ${chalk_1.default.bold('Size:')}     ${resolved.size}`);
+    if (resolved.profile) {
+        console.log(`  ${chalk_1.default.bold('Profile:')}  ${resolved.profile}`);
+    }
+    console.log('');
+    console.log(`  ${chalk_1.default.bold('Apps:')}`);
+    for (const app of resolved.apps) {
+        const deps = Object.entries(app.dependencies)
+            .map(([name, d]) => `${name}:${d.mode}`)
+            .join(', ');
+        console.log(`    • ${app.name} (${app.type}${app.framework ? `, ${app.framework}` : ''})`);
+        if (deps) {
+            console.log(chalk_1.default.dim(`      deps: ${deps}`));
+        }
+    }
+    if (resolved.infrastructure.length > 0) {
+        console.log('');
+        console.log(`  ${chalk_1.default.bold('Infrastructure:')}`);
+        for (const infra of resolved.infrastructure) {
+            console.log(`    • ${infra.name} (${infra.mode})`);
+        }
+    }
+    console.log('');
+    console.log(`  ${chalk_1.default.bold('Database:')}  ${resolved.database.mode}${resolved.database.source ? ` (from ${resolved.database.source})` : ''}`);
+    if (resolved.warnings.length > 0) {
+        console.log('');
+        console.log(chalk_1.default.yellow('  Warnings:'));
+        for (const warning of resolved.warnings) {
+            console.log(chalk_1.default.dim(`    - ${warning}`));
+        }
+    }
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log('');
+}
+/**
+ * Build API payload from resolved config
+ */
+function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
+    // Load env vars
+    const envVars = configLoader.loadEnvVars(process.cwd());
+    // Build services map
+    const services = {};
+    for (const app of resolved.apps) {
+        if (app.services) {
+            for (const [name, svc] of Object.entries(app.services)) {
+                services[name] = { port: svc.port, healthcheck: svc.healthcheck };
+            }
+        }
+        else if (app.port) {
+            services[app.name] = { port: app.port };
+        }
+    }
+    // Build files bundle
+    const files = [];
+    // Add setup script if generated
+    const setupScript = generateSetupScript(resolved, config);
+    if (setupScript) {
+        files.push({
+            path: '/home/dev/setup-genbox.sh',
+            content: setupScript,
+            permissions: '0755',
+        });
+    }
+    // Build post details (scripts to run)
+    const postDetails = [];
+    if (setupScript) {
+        postDetails.push('su - dev -c "/home/dev/setup-genbox.sh"');
+    }
+    // Build repos
+    const repos = {};
+    for (const repo of resolved.repos) {
+        repos[repo.name] = {
+            url: repo.url,
+            path: repo.path,
+            branch: repo.branch,
+        };
+    }
+    return {
+        name: resolved.name,
+        size: resolved.size,
+        publicKey,
+        workspace: resolved.project.name,
+        services,
+        files,
+        postDetails,
+        repos,
+        privateKey,
+        gitToken: envVars.GIT_TOKEN,
+        envVars: resolved.env,
+        apps: resolved.apps.map(a => a.name),
+        infrastructure: resolved.infrastructure.map(i => ({
+            name: i.name,
+            type: i.type,
+            mode: i.mode,
+        })),
+        database: resolved.database,
+    };
+}
+/**
+ * Generate setup script
+ */
+function generateSetupScript(resolved, config) {
+    const lines = [
+        '#!/bin/bash',
+        '# Generated by genbox create',
+        'set -e',
+        '',
+    ];
+    // Change to project directory
+    if (resolved.repos.length > 0) {
+        lines.push(`cd ${resolved.repos[0].path} || exit 1`);
+        lines.push('');
+    }
+    // Install dependencies - detect package manager from lockfiles
+    lines.push('# Install dependencies');
+    lines.push('if [ -f "pnpm-lock.yaml" ]; then');
+    lines.push('  echo "Installing dependencies with pnpm..."');
+    lines.push('  pnpm install --frozen-lockfile');
+    lines.push('elif [ -f "yarn.lock" ]; then');
+    lines.push('  echo "Installing dependencies with yarn..."');
+    lines.push('  yarn install --frozen-lockfile');
+    lines.push('elif [ -f "bun.lockb" ]; then');
+    lines.push('  echo "Installing dependencies with bun..."');
+    lines.push('  bun install --frozen-lockfile');
+    lines.push('elif [ -f "package-lock.json" ]; then');
+    lines.push('  echo "Installing dependencies with npm..."');
+    lines.push('  npm ci');
+    lines.push('fi');
+    // Start Docker if API is included locally
+    const hasLocalApi = resolved.apps.some(a => a.name === 'api' || a.type === 'backend');
+    if (hasLocalApi) {
+        lines.push('');
+        lines.push('echo "Starting Docker services..."');
+        lines.push('if [ -f "docker-compose.yml" ] || [ -f "compose.yml" ]; then');
+        lines.push('  docker compose up -d');
+        lines.push('fi');
+    }
+    lines.push('');
+    lines.push('echo "Setup complete!"');
+    return lines.join('\n');
+}
+/**
+ * Display genbox info after creation
+ */
+function displayGenboxInfo(genbox, resolved) {
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log(`  ${chalk_1.default.bold('Environment:')} ${genbox.name || resolved.name}`);
+    console.log(`  ${chalk_1.default.bold('Workspace:')}   ${genbox.workspace || resolved.project.name}`);
+    console.log(`  ${chalk_1.default.bold('Size:')}        ${genbox.size || resolved.size}`);
+    console.log(`  ${chalk_1.default.bold('Status:')}      ${chalk_1.default.yellow(genbox.status || 'creating')}`);
+    if (genbox.ipAddress) {
+        console.log(`  ${chalk_1.default.bold('IP:')}          ${genbox.ipAddress}`);
+    }
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    // Display URLs
+    if (genbox.urls && Object.keys(genbox.urls).length > 0) {
+        console.log('');
+        console.log(chalk_1.default.bold('Access URLs:'));
+        for (const [service, url] of Object.entries(genbox.urls)) {
+            console.log(`  ${chalk_1.default.cyan(service.padEnd(12))} ${url}`);
+        }
+    }
+    console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    console.log('');
+    console.log(chalk_1.default.bold('Quick Commands:'));
+    console.log(`  SSH:     ${chalk_1.default.cyan(`genbox connect ${resolved.name}`)}`);
+    console.log(`  Status:  ${chalk_1.default.cyan(`genbox status ${resolved.name}`)}`);
+    console.log(`  URLs:    ${chalk_1.default.cyan(`genbox urls ${resolved.name}`)}`);
+    console.log(`  Destroy: ${chalk_1.default.cyan(`genbox destroy ${resolved.name}`)}`);
+}
+/**
+ * Legacy v1/v2 create handling
+ */
+async function createLegacy(name, options) {
+    // Import legacy config handling
+    const { loadConfig, loadEnvVars } = await Promise.resolve().then(() => __importStar(require('../config')));
+    const config = loadConfig();
+    const size = options.size || config.system?.server_size || 'small';
+    const publicKey = getPublicSshKey();
+    // Check if SSH auth needed
+    let privateKeyContent;
+    const usesSSH = config.git_auth?.method === 'ssh' ||
+        (config.repos && Object.values(config.repos).some((r) => r.auth === 'ssh'));
+    if (usesSSH && !options.yes) {
+        const injectKey = await prompts.confirm({
+            message: 'Inject SSH private key for git cloning?',
+            default: true,
+        });
+        if (injectKey) {
+            privateKeyContent = getPrivateSshKey();
+        }
+    }
+    const spinner = (0, ora_1.default)(`Creating Genbox '${name}'...`).start();
+    try {
+        // Prepare files
+        const filesBundle = [];
+        if (config.files) {
+            for (const f of config.files) {
+                const sourcePath = path.resolve(process.cwd(), f.source);
+                if (fs.existsSync(sourcePath)) {
+                    filesBundle.push({
+                        path: f.target,
+                        content: fs.readFileSync(sourcePath, 'utf-8'),
+                        permissions: f.permissions || '0644',
+                    });
+                }
+            }
+        }
+        // Prepare scripts
+        const postDetails = [];
+        if (config.scripts) {
+            for (const s of config.scripts) {
+                const scriptName = path.basename(s);
+                const targetPath = `/home/dev/${scriptName}`;
+                const sourcePath = path.resolve(process.cwd(), s);
+                if (fs.existsSync(sourcePath)) {
+                    filesBundle.push({
+                        path: targetPath,
+                        content: fs.readFileSync(sourcePath, 'utf-8'),
+                        permissions: '0755',
+                    });
+                    postDetails.push(`su - dev -c "${targetPath}"`);
+                }
+            }
+        }
+        const envVars = loadEnvVars();
+        const genbox = await provisionGenbox({
+            name,
+            size,
+            publicKey,
+            workspace: config.project_name || 'default',
+            services: config.services,
+            files: filesBundle,
+            postDetails,
+            repos: config.repos,
+            privateKey: privateKeyContent,
+            gitToken: envVars.GIT_TOKEN,
+        });
+        spinner.succeed(chalk_1.default.green(`Genbox '${name}' created!`));
+        if (genbox.ipAddress) {
+            (0, ssh_config_1.addSshConfigEntry)({ name, ipAddress: genbox.ipAddress });
+        }
+        console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+        console.log(`  ${chalk_1.default.bold('Environment:')} ${name}`);
+        console.log(`  ${chalk_1.default.bold('Status:')}      ${chalk_1.default.yellow(genbox.status)}`);
+        if (genbox.ipAddress) {
+            console.log(`  ${chalk_1.default.bold('IP:')}          ${genbox.ipAddress}`);
+        }
+        console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
+    }
+    catch (error) {
+        spinner.fail(chalk_1.default.red(`Failed: ${error.message}`));
+        if (error instanceof api_1.AuthenticationError) {
+            console.log(chalk_1.default.yellow('\n  Run: genbox login'));
+        }
+    }
+}