genbox 1.0.9 → 1.0.11

package/dist/commands/create.js

@@ -48,6 +48,65 @@ 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");
+const child_process_1 = require("child_process");
+/**
+ * Poll for genbox IP address (servers take a few seconds to get an IP assigned)
+ */
+async function waitForIpAddress(genboxId, maxAttempts = 30, delayMs = 2000) {
+    for (let i = 0; i < maxAttempts; i++) {
+        try {
+            const genbox = await (0, api_1.fetchApi)(`/genboxes/${genboxId}`);
+            if (genbox.ipAddress) {
+                return genbox.ipAddress;
+            }
+        }
+        catch {
+            // Ignore errors during polling
+        }
+        await new Promise(resolve => setTimeout(resolve, delayMs));
+    }
+    return null;
+}
+/**
+ * Find SSH private key
+ */
+function findSshKeyPath() {
+    const home = os.homedir();
+    const keyPaths = [
+        path.join(home, '.ssh', 'id_ed25519'),
+        path.join(home, '.ssh', 'id_rsa'),
+    ];
+    for (const keyPath of keyPaths) {
+        if (fs.existsSync(keyPath)) {
+            return keyPath;
+        }
+    }
+    return null;
+}
+/**
+ * Wait for SSH to be available on the server
+ */
+async function waitForSsh(ipAddress, maxAttempts = 30, delayMs = 5000) {
+    const keyPath = findSshKeyPath();
+    if (!keyPath)
+        return false;
+    const sshOpts = `-i ${keyPath} -o IdentitiesOnly=yes -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -o LogLevel=ERROR -o ConnectTimeout=5`;
+    for (let i = 0; i < maxAttempts; i++) {
+        try {
+            (0, child_process_1.execSync)(`ssh ${sshOpts} dev@${ipAddress} "echo 'SSH ready'"`, {
+                encoding: 'utf8',
+                timeout: 10000,
+                stdio: ['pipe', 'pipe', 'pipe'],
+            });
+            return true;
+        }
+        catch {
+            // SSH not ready yet
+        }
+        await new Promise(resolve => setTimeout(resolve, delayMs));
+    }
+    return false;
+}
 async function provisionGenbox(payload) {
     return (0, api_1.fetchApi)('/genboxes', {
         method: 'POST',
@@ -171,17 +230,39 @@ exports.createCommand = new commander_1.Command('create')
         const spinner = (0, ora_1.default)(`Creating Genbox '${name}'...`).start();
         try {
             const genbox = await provisionGenbox(payload);
-            spinner.succeed(chalk_1.default.green(`Genbox '${name}' created successfully!`));
-            // Add SSH config
-            if (genbox.ipAddress) {
-                const sshAdded = (0, ssh_config_1.addSshConfigEntry)({
-                    name,
-                    ipAddress: genbox.ipAddress,
-                });
-                if (sshAdded) {
-                    console.log(chalk_1.default.dim(`  SSH config added: ssh ${(0, ssh_config_1.getSshAlias)(name)}`));
+            spinner.succeed(chalk_1.default.green(`Genbox '${name}' created!`));
+            // Wait for IP if not immediately available
+            let ipAddress = genbox.ipAddress;
+            if (!ipAddress && genbox._id) {
+                spinner.start('Waiting for IP address...');
+                ipAddress = await waitForIpAddress(genbox._id);
+                if (ipAddress) {
+                    spinner.succeed(`IP address assigned: ${ipAddress}`);
+                    genbox.ipAddress = ipAddress;
+                }
+                else {
+                    spinner.fail('Timed out waiting for IP. Run `genbox status` to check later.');
+                    displayGenboxInfo(genbox, resolved);
+                    return;
                 }
             }
+            // Wait for SSH to be available
+            spinner.start('Waiting for SSH to be ready...');
+            const sshReady = await waitForSsh(ipAddress);
+            if (sshReady) {
+                spinner.succeed(chalk_1.default.green('SSH is ready!'));
+            }
+            else {
+                spinner.warn('SSH not ready yet. Server may still be booting.');
+            }
+            // Add SSH config
+            const sshAdded = (0, ssh_config_1.addSshConfigEntry)({
+                name,
+                ipAddress,
+            });
+            if (sshAdded) {
+                console.log(chalk_1.default.dim(`  SSH config added: ssh ${(0, ssh_config_1.getSshAlias)(name)}`));
+            }
             // Display results
             displayGenboxInfo(genbox, resolved);
         }
@@ -250,6 +331,13 @@ function displayResolvedConfig(resolved) {
     }
     console.log('');
     console.log(`  ${chalk_1.default.bold('Database:')}  ${resolved.database.mode}${resolved.database.source ? ` (from ${resolved.database.source})` : ''}`);
+    if (Object.keys(resolved.env).length > 0) {
+        console.log('');
+        console.log(`  ${chalk_1.default.bold('Environment:')}`);
+        for (const [key, value] of Object.entries(resolved.env)) {
+            console.log(chalk_1.default.dim(`    ${key}=${value}`));
+        }
+    }
     if (resolved.warnings.length > 0) {
         console.log('');
         console.log(chalk_1.default.yellow('  Warnings:'));
@@ -264,7 +352,7 @@ function displayResolvedConfig(resolved) {
  * Build API payload from resolved config
  */
 function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
-    // Load env vars
+    // Load env vars from .env.genbox
     const envVars = configLoader.loadEnvVars(process.cwd());
     // Build services map
     const services = {};
@@ -280,6 +368,22 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
     }
     // Build files bundle
     const files = [];
+    // Send .env.genbox content to server for each app
+    const envGenboxPath = path.join(process.cwd(), '.env.genbox');
+    if (fs.existsSync(envGenboxPath)) {
+        const envContent = fs.readFileSync(envGenboxPath, 'utf-8');
+        // Add env file for each app (user should have already updated URLs manually)
+        for (const app of resolved.apps) {
+            const appPath = config.apps[app.name]?.path || app.name;
+            const repoPath = resolved.repos.find(r => r.name === app.name)?.path ||
+                (resolved.repos[0]?.path ? `${resolved.repos[0].path}/${appPath}` : `/home/dev/${config.project.name}/${appPath}`);
+            files.push({
+                path: `${repoPath}/.env`,
+                content: envContent,
+                permissions: '0644',
+            });
+        }
+    }
     // Add setup script if generated
     const setupScript = generateSetupScript(resolved, config);
     if (setupScript) {
@@ -465,15 +569,38 @@ async function createLegacy(name, options) {
             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 });
+        // Wait for IP if not immediately available
+        let ipAddress = genbox.ipAddress;
+        if (!ipAddress && genbox._id) {
+            spinner.start('Waiting for IP address...');
+            ipAddress = await waitForIpAddress(genbox._id);
+            if (ipAddress) {
+                spinner.succeed(`IP address assigned: ${ipAddress}`);
+                genbox.ipAddress = ipAddress;
+            }
+            else {
+                spinner.fail('Timed out waiting for IP. Run `genbox status` to check later.');
+                return;
+            }
+        }
+        // Wait for SSH to be available
+        spinner.start('Waiting for SSH to be ready...');
+        const sshReady = await waitForSsh(ipAddress);
+        if (sshReady) {
+            spinner.succeed(chalk_1.default.green('SSH is ready!'));
+        }
+        else {
+            spinner.warn('SSH not ready yet. Server may still be booting.');
+        }
+        // Add SSH config
+        const sshAdded = (0, ssh_config_1.addSshConfigEntry)({ name, ipAddress });
+        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('Status:')}      ${chalk_1.default.yellow(genbox.status)}`);
-        if (genbox.ipAddress) {
-            console.log(`  ${chalk_1.default.bold('IP:')}          ${genbox.ipAddress}`);
-        }
+        console.log(`  ${chalk_1.default.bold('IP:')}          ${ipAddress}`);
         console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
     }
     catch (error) {

package/dist/commands/init.js

@@ -137,6 +137,7 @@ exports.initCommand = new commander_1.Command('init')
         const configPath = path_1.default.join(process.cwd(), CONFIG_FILENAME);
         const nonInteractive = options.yes || !process.stdin.isTTY;
         // Check for existing config
+        let overwriteExisting = options.force || false;
         if (fs_1.default.existsSync(configPath) && !options.force) {
             if (nonInteractive) {
                 console.log(chalk_1.default.yellow('genbox.yaml already exists. Use --force to overwrite.'));
@@ -150,6 +151,7 @@ exports.initCommand = new commander_1.Command('init')
             if (!overwrite) {
                 return;
             }
+            overwriteExisting = true;
         }
         console.log(chalk_1.default.blue('Initializing Genbox...'));
         console.log('');
@@ -310,6 +312,13 @@ exports.initCommand = new commander_1.Command('init')
                     if (hasHttpsRepos) {
                         console.log('');
                         console.log(chalk_1.default.yellow('Private repositories require a GitHub token for cloning.'));
+                        console.log('');
+                        console.log(chalk_1.default.dim('  To create a token:'));
+                        console.log(chalk_1.default.dim('  1. Go to https://github.com/settings/tokens'));
+                        console.log(chalk_1.default.dim('  2. Click "Generate new token" → "Classic"'));
+                        console.log(chalk_1.default.dim('  3. Select scope: "repo" (Full control of private repositories)'));
+                        console.log(chalk_1.default.dim('  4. Generate and copy the token'));
+                        console.log('');
                         const gitToken = await prompts.password({
                             message: 'GitHub Personal Access Token (leave empty to skip):',
                         });
@@ -446,7 +455,7 @@ exports.initCommand = new commander_1.Command('init')
         fs_1.default.writeFileSync(configPath, yamlContent);
         console.log(chalk_1.default.green(`\n✔ Configuration saved to ${CONFIG_FILENAME}`));
         // Generate .env.genbox
-        await setupEnvFile(projectName, v3Config, nonInteractive, scan, isMultiRepo, envVarsToAdd);
+        await setupEnvFile(projectName, v3Config, nonInteractive, scan, isMultiRepo, envVarsToAdd, overwriteExisting);
         // Show warnings
         if (generated.warnings.length > 0) {
             console.log('');
@@ -455,11 +464,29 @@ exports.initCommand = new commander_1.Command('init')
                 console.log(chalk_1.default.dim(`  - ${warning}`));
             }
         }
+        // Show API URL guidance if environments are configured
+        if (v3Config.environments && Object.keys(v3Config.environments).length > 0) {
+            console.log('');
+            console.log(chalk_1.default.yellow('Important: Update API URLs in .env.genbox for remote environments'));
+            console.log('');
+            for (const [envName, envConfig] of Object.entries(v3Config.environments)) {
+                const apiUrl = envConfig.api?.api ||
+                    envConfig.api?.url ||
+                    envConfig.api?.gateway;
+                if (apiUrl) {
+                    console.log(chalk_1.default.dim(`  For ${envName} profiles (connect_to: ${envName}):`));
+                    console.log(chalk_1.default.cyan(`    VITE_API_BASE_URL="${apiUrl}"`));
+                    console.log(chalk_1.default.cyan(`    VITE_AUTH_SERVICE_URL="${apiUrl}"`));
+                    console.log(chalk_1.default.cyan(`    NEXT_PUBLIC_API_BASE_URL="${apiUrl}"`));
+                    console.log('');
+                }
+            }
+        }
         // Next steps
         console.log('');
         console.log(chalk_1.default.bold('Next steps:'));
         console.log(chalk_1.default.dim(`  1. Review and edit ${CONFIG_FILENAME}`));
-        console.log(chalk_1.default.dim(`  2. Add secrets to ${ENV_FILENAME}`));
+        console.log(chalk_1.default.dim(`  2. Update API URLs in ${ENV_FILENAME} for staging/production`));
         console.log(chalk_1.default.dim(`  3. Run 'genbox profiles' to see available profiles`));
         console.log(chalk_1.default.dim(`  4. Run 'genbox create <name> --profile <profile>' to create an environment`));
     }
@@ -739,11 +766,17 @@ async function setupEnvironments(scan, config, isMultiRepo = false) {
 /**
  * Setup .env.genbox file
  */
-async function setupEnvFile(projectName, config, nonInteractive = false, scan, isMultiRepo = false, extraEnvVars = {}) {
+async function setupEnvFile(projectName, config, nonInteractive = false, scan, isMultiRepo = false, extraEnvVars = {}, overwriteExisting = false) {
     const envPath = path_1.default.join(process.cwd(), ENV_FILENAME);
+    // If overwriting, delete existing file
     if (fs_1.default.existsSync(envPath)) {
-        console.log(chalk_1.default.dim(`  ${ENV_FILENAME} already exists, skipping...`));
-        return;
+        if (overwriteExisting) {
+            fs_1.default.unlinkSync(envPath);
+        }
+        else {
+            console.log(chalk_1.default.dim(`  ${ENV_FILENAME} already exists, skipping...`));
+            return;
+        }
     }
     // For multi-repo: find env files in app directories
     if (isMultiRepo && scan) {

package/dist/commands/status.js

@@ -42,6 +42,7 @@ const chalk_1 = __importDefault(require("chalk"));
 const api_1 = require("../api");
 const config_1 = require("../config");
 const genbox_selector_1 = require("../genbox-selector");
+const ssh_config_1 = require("../ssh-config");
 const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs"));
@@ -101,6 +102,16 @@ exports.statusCommand = new commander_1.Command('status')
             return;
         }
         const selectedName = target.name;
+        // Auto-add SSH config if missing
+        if (!(0, ssh_config_1.hasSshConfigEntry)(selectedName)) {
+            const sshAdded = (0, ssh_config_1.addSshConfigEntry)({
+                name: selectedName,
+                ipAddress: target.ipAddress,
+            });
+            if (sshAdded) {
+                console.log(chalk_1.default.dim(`  SSH config added: ssh ${(0, ssh_config_1.getSshAlias)(selectedName)}`));
+            }
+        }
         // 2. Get SSH key
         let keyPath;
         try {

package/dist/profile-resolver.js

@@ -113,7 +113,7 @@ class ProfileResolver {
             infrastructure,
             database,
             repos: this.resolveRepos(config, apps),
-            env: this.resolveEnvVars(config, apps, infrastructure, database),
+            env: this.resolveEnvVars(config, apps, infrastructure, database, profile.connect_to),
             hooks: config.hooks || {},
             profile: options.profile,
             warnings,
@@ -293,7 +293,10 @@ class ProfileResolver {
     getUrlForDependency(depName, envConfig) {
         // Check if it's an API dependency
         if (depName === 'api' && envConfig.api) {
-            return envConfig.api.url || envConfig.api.gateway;
+            // Check common fields: url, gateway, api, or first string value
+            const apiConfig = envConfig.api;
+            return apiConfig.url || apiConfig.gateway || apiConfig.api ||
+                Object.values(apiConfig).find(v => typeof v === 'string' && v.startsWith('http'));
         }
         // Check infrastructure
         const infraConfig = envConfig[depName];
@@ -454,9 +457,21 @@ class ProfileResolver {
     /**
      * Resolve environment variables
      */
-    resolveEnvVars(config, apps, infrastructure, database) {
+    resolveEnvVars(config, apps, infrastructure, database, connectTo) {
         const env = {};
-        // Add API URL based on resolution
+        // If connect_to is set, get API URL from environment config
+        if (connectTo && config.environments?.[connectTo]) {
+            const envConfig = config.environments[connectTo];
+            const apiUrl = this.getUrlForDependency('api', envConfig);
+            if (apiUrl) {
+                env['API_URL'] = apiUrl;
+                env['VITE_API_URL'] = apiUrl;
+                env['VITE_API_BASE_URL'] = apiUrl;
+                env['NEXT_PUBLIC_API_URL'] = apiUrl;
+                env['NEXT_PUBLIC_API_BASE_URL'] = apiUrl;
+            }
+        }
+        // Add API URL based on app dependency resolution (may override connect_to)
         for (const app of apps) {
             const apiDep = app.dependencies['api'];
             if (apiDep) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genbox",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Genbox CLI - AI-Powered Development Environments",
   "main": "dist/index.js",
   "bin": {