genbox 1.0.14 → 1.0.16

package/dist/commands/profiles.js

@@ -44,6 +44,7 @@ const yaml = __importStar(require("js-yaml"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const config_loader_1 = require("../config-loader");
+const schema_v4_1 = require("../schema-v4");
 exports.profilesCommand = new commander_1.Command('profiles')
     .description('List and manage profiles')
     .option('--json', 'Output as JSON')
@@ -51,9 +52,15 @@ exports.profilesCommand = new commander_1.Command('profiles')
     try {
         const configLoader = new config_loader_1.ConfigLoader();
         const loadResult = await configLoader.load();
-        if (!loadResult.config || loadResult.config.version !== '3.0') {
-            console.log(chalk_1.default.yellow('Profiles require genbox.yaml v3.0'));
-            console.log(chalk_1.default.dim('Run "genbox init" to create a v3 configuration'));
+        if (!loadResult.config) {
+            console.log(chalk_1.default.yellow('No genbox.yaml found'));
+            console.log(chalk_1.default.dim('Run "genbox init" to create a configuration'));
+            return;
+        }
+        const version = (0, schema_v4_1.getConfigVersion)(loadResult.config);
+        if (version === 'unknown') {
+            console.log(chalk_1.default.yellow('Unknown config version'));
+            console.log(chalk_1.default.dim('Run "genbox init" to create a v4 configuration'));
             return;
         }
         const config = loadResult.config;
@@ -105,8 +112,13 @@ exports.profilesCommand
     try {
         const configLoader = new config_loader_1.ConfigLoader();
         const loadResult = await configLoader.load();
-        if (!loadResult.config || loadResult.config.version !== '3.0') {
-            console.log(chalk_1.default.yellow('Profiles require genbox.yaml v3.0'));
+        if (!loadResult.config) {
+            console.log(chalk_1.default.yellow('No genbox.yaml found'));
+            return;
+        }
+        const configVersion = (0, schema_v4_1.getConfigVersion)(loadResult.config);
+        if (configVersion === 'unknown') {
+            console.log(chalk_1.default.yellow('Unknown config version'));
             return;
         }
         const config = loadResult.config;
@@ -137,8 +149,10 @@ exports.profilesCommand
                 }
             }
         }
-        if (profile.connect_to) {
-            console.log(`  ${chalk_1.default.bold('Connect to:')} ${profile.connect_to} environment`);
+        // Show connection (v4: default_connection, v3: connect_to)
+        const connection = (0, config_loader_1.getProfileConnection)(profile);
+        if (connection) {
+            console.log(`  ${chalk_1.default.bold('Connect to:')} ${connection} environment`);
         }
         if (profile.database) {
             console.log(`  ${chalk_1.default.bold('Database:')}`);
@@ -147,9 +161,21 @@ exports.profilesCommand
                 console.log(`    Source: ${profile.database.source}`);
             }
         }
-        if (profile.infrastructure) {
+        // v4 uses connections, v3 uses infrastructure
+        const v4Profile = profile;
+        const v3Profile = profile;
+        if (v4Profile.connections) {
+            console.log(`  ${chalk_1.default.bold('Connections:')}`);
+            for (const [appName, appConns] of Object.entries(v4Profile.connections)) {
+                console.log(`    ${appName}:`);
+                for (const [targetName, mode] of Object.entries(appConns)) {
+                    console.log(`      ${targetName}: ${mode}`);
+                }
+            }
+        }
+        else if (v3Profile.infrastructure) {
             console.log(`  ${chalk_1.default.bold('Infrastructure:')}`);
-            for (const [name, mode] of Object.entries(profile.infrastructure)) {
+            for (const [name, mode] of Object.entries(v3Profile.infrastructure)) {
                 console.log(`    ${name}: ${mode}`);
             }
         }
@@ -169,8 +195,13 @@ exports.profilesCommand
     try {
         const configLoader = new config_loader_1.ConfigLoader();
         const loadResult = await configLoader.load();
-        if (!loadResult.config || loadResult.config.version !== '3.0') {
-            console.log(chalk_1.default.yellow('Profiles require genbox.yaml v3.0'));
+        if (!loadResult.config) {
+            console.log(chalk_1.default.yellow('No genbox.yaml found'));
+            return;
+        }
+        const configVersion = (0, schema_v4_1.getConfigVersion)(loadResult.config);
+        if (configVersion === 'unknown') {
+            console.log(chalk_1.default.yellow('Unknown config version'));
             return;
         }
         const config = loadResult.config;
@@ -286,8 +317,13 @@ exports.profilesCommand
     try {
         const configLoader = new config_loader_1.ConfigLoader();
         const loadResult = await configLoader.load();
-        if (!loadResult.config || loadResult.config.version !== '3.0') {
-            console.log(chalk_1.default.yellow('Profiles require genbox.yaml v3.0'));
+        if (!loadResult.config) {
+            console.log(chalk_1.default.yellow('No genbox.yaml found'));
+            return;
+        }
+        const configVersion = (0, schema_v4_1.getConfigVersion)(loadResult.config);
+        if (configVersion === 'unknown') {
+            console.log(chalk_1.default.yellow('Unknown config version'));
             return;
         }
         const config = loadResult.config;

package/dist/commands/scan.js

@@ -12,6 +12,7 @@
  *   genbox scan              # Output to .genbox/detected.yaml
  *   genbox scan --stdout     # Output to stdout
  *   genbox scan --json       # Output as JSON
+ *   genbox scan -i           # Interactive mode (select apps)
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -52,22 +53,69 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scanCommand = void 0;
 const commander_1 = require("commander");
+const prompts = __importStar(require("@inquirer/prompts"));
 const chalk_1 = __importDefault(require("chalk"));
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const yaml = __importStar(require("js-yaml"));
+const child_process_1 = require("child_process");
 const scanner_1 = require("../scanner");
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const { version } = require('../../package.json');
+/**
+ * Detect git repository info for a specific directory
+ */
+function detectGitForDirectory(dir) {
+    const gitDir = path.join(dir, '.git');
+    if (!fs.existsSync(gitDir))
+        return undefined;
+    try {
+        const remote = (0, child_process_1.execSync)('git remote get-url origin', {
+            cwd: dir,
+            stdio: 'pipe',
+            encoding: 'utf8',
+        }).trim();
+        if (!remote)
+            return undefined;
+        const isSSH = remote.startsWith('git@') || remote.startsWith('ssh://');
+        let provider = 'other';
+        if (remote.includes('github.com'))
+            provider = 'github';
+        else if (remote.includes('gitlab.com'))
+            provider = 'gitlab';
+        else if (remote.includes('bitbucket.org'))
+            provider = 'bitbucket';
+        let branch = 'main';
+        try {
+            branch = (0, child_process_1.execSync)('git rev-parse --abbrev-ref HEAD', {
+                cwd: dir,
+                stdio: 'pipe',
+                encoding: 'utf8',
+            }).trim();
+        }
+        catch { }
+        return {
+            remote,
+            type: isSSH ? 'ssh' : 'https',
+            provider,
+            branch,
+        };
+    }
+    catch {
+        return undefined;
+    }
+}
 exports.scanCommand = new commander_1.Command('scan')
     .description('Analyze project structure and output detected configuration')
     .option('--stdout', 'Output to stdout instead of .genbox/detected.yaml')
     .option('--json', 'Output as JSON instead of YAML')
     .option('--no-infra', 'Skip infrastructure detection (docker-compose)')
     .option('--no-scripts', 'Skip script detection')
+    .option('-i, --interactive', 'Interactive mode - select apps before writing')
     .option('-e, --exclude <patterns>', 'Comma-separated patterns to exclude', '')
     .action(async (options) => {
     const cwd = process.cwd();
+    const isInteractive = options.interactive && !options.stdout && process.stdin.isTTY;
     console.log(chalk_1.default.cyan('\n🔍 Scanning project...\n'));
     try {
         // Run the scanner
@@ -78,7 +126,21 @@ exports.scanCommand = new commander_1.Command('scan')
             skipScripts: !options.scripts,
         });
         // Convert scan result to DetectedConfig format
-        const detected = convertScanToDetected(scan, cwd);
+        let detected = convertScanToDetected(scan, cwd);
+        // Interactive mode: let user select apps
+        if (isInteractive && Object.keys(detected.apps).length > 0) {
+            detected = await interactiveAppSelection(detected);
+        }
+        // Scan env files for service URLs (only for selected frontend apps)
+        const frontendApps = Object.entries(detected.apps)
+            .filter(([, app]) => app.type === 'frontend')
+            .map(([name]) => name);
+        if (frontendApps.length > 0) {
+            const serviceUrls = scanEnvFilesForUrls(detected.apps, cwd);
+            if (serviceUrls.length > 0) {
+                detected.service_urls = serviceUrls;
+            }
+        }
         // Output
         if (options.stdout) {
             outputToStdout(detected, options.json);
@@ -89,10 +151,156 @@ exports.scanCommand = new commander_1.Command('scan')
         }
     }
     catch (error) {
+        if (error.name === 'ExitPromptError' || error.message?.includes('force closed')) {
+            console.log('\n' + chalk_1.default.dim('Cancelled.'));
+            process.exit(0);
+        }
         console.error(chalk_1.default.red('Scan failed:'), error);
         process.exit(1);
     }
 });
+/**
+ * Interactive app selection
+ */
+async function interactiveAppSelection(detected) {
+    const appEntries = Object.entries(detected.apps);
+    console.log(chalk_1.default.blue('=== Detected Apps ===\n'));
+    // Show detected apps
+    for (const [name, app] of appEntries) {
+        const parts = [
+            chalk_1.default.cyan(name),
+            app.type ? `(${app.type})` : '',
+            app.framework ? `[${app.framework}]` : '',
+            app.port ? `port:${app.port}` : '',
+        ].filter(Boolean);
+        console.log(`  ${parts.join(' ')}`);
+        if (app.git) {
+            console.log(chalk_1.default.dim(`    └─ ${app.git.remote}`));
+        }
+    }
+    console.log();
+    // Let user select which apps to include
+    const choices = appEntries.map(([name, app]) => ({
+        name: `${name} (${app.type || 'unknown'}${app.framework ? `, ${app.framework}` : ''})`,
+        value: name,
+        checked: app.type !== 'library', // Default: include non-libraries
+    }));
+    const selectedApps = await prompts.checkbox({
+        message: 'Select apps to include in detected.yaml:',
+        choices,
+    });
+    // Filter apps to only selected ones
+    const filteredApps = {};
+    for (const appName of selectedApps) {
+        filteredApps[appName] = detected.apps[appName];
+    }
+    return {
+        ...detected,
+        apps: filteredApps,
+    };
+}
+/**
+ * Scan env files in app directories for service URLs
+ */
+function scanEnvFilesForUrls(apps, rootDir) {
+    const serviceUrls = new Map();
+    const envPatterns = ['.env', '.env.local', '.env.development'];
+    for (const [appName, app] of Object.entries(apps)) {
+        // Only scan frontend apps
+        if (app.type !== 'frontend')
+            continue;
+        const appDir = path.join(rootDir, app.path);
+        // Find env file
+        let envContent;
+        let envSource;
+        for (const pattern of envPatterns) {
+            const envPath = path.join(appDir, pattern);
+            if (fs.existsSync(envPath)) {
+                envContent = fs.readFileSync(envPath, 'utf8');
+                envSource = pattern;
+                break;
+            }
+        }
+        if (!envContent)
+            continue;
+        // Find all HTTP URLs
+        const urlRegex = /^([A-Z_][A-Z0-9_]*)=["']?(https?:\/\/[a-zA-Z0-9_.-]+(?::\d+)?[^"'\s]*)["']?/gm;
+        let match;
+        while ((match = urlRegex.exec(envContent)) !== null) {
+            const varName = match[1];
+            const fullUrl = match[2];
+            // Extract hostname
+            const hostMatch = fullUrl.match(/^https?:\/\/([a-zA-Z0-9_.-]+)/);
+            if (!hostMatch)
+                continue;
+            const hostname = hostMatch[1];
+            // Only include local URLs (localhost, Docker internal names, IPs)
+            const isLocalUrl = hostname === 'localhost' ||
+                !hostname.includes('.') ||
+                /^\d+\.\d+\.\d+\.\d+$/.test(hostname);
+            if (!isLocalUrl)
+                continue;
+            // Extract base URL
+            const baseMatch = fullUrl.match(/^(https?:\/\/[a-zA-Z0-9_.-]+(?::\d+)?)/);
+            if (!baseMatch)
+                continue;
+            const baseUrl = baseMatch[1];
+            // Add to map
+            if (!serviceUrls.has(baseUrl)) {
+                serviceUrls.set(baseUrl, { vars: new Set(), apps: new Set() });
+            }
+            serviceUrls.get(baseUrl).vars.add(varName);
+            serviceUrls.get(baseUrl).apps.add(appName);
+        }
+    }
+    // Convert to DetectedServiceUrl array
+    const result = [];
+    for (const [baseUrl, { vars, apps: appNames }] of serviceUrls) {
+        const serviceInfo = getServiceInfoFromUrl(baseUrl);
+        result.push({
+            base_url: baseUrl,
+            var_name: serviceInfo.varName,
+            description: serviceInfo.description,
+            used_by: Array.from(vars),
+            apps: Array.from(appNames),
+            source: 'env files',
+        });
+    }
+    // Sort by port for consistent output
+    result.sort((a, b) => {
+        const portA = parseInt(a.base_url.match(/:(\d+)/)?.[1] || '0');
+        const portB = parseInt(b.base_url.match(/:(\d+)/)?.[1] || '0');
+        return portA - portB;
+    });
+    return result;
+}
+/**
+ * Get service info from URL
+ */
+function getServiceInfoFromUrl(baseUrl) {
+    const urlMatch = baseUrl.match(/^https?:\/\/([a-zA-Z0-9_.-]+)(?::(\d+))?/);
+    if (!urlMatch) {
+        return { varName: 'UNKNOWN_URL', description: 'Unknown service' };
+    }
+    const hostname = urlMatch[1];
+    const port = urlMatch[2] ? parseInt(urlMatch[2]) : undefined;
+    // Generate from hostname if not localhost
+    if (hostname !== 'localhost') {
+        const varName = hostname.toUpperCase().replace(/-/g, '_') + '_URL';
+        return {
+            varName,
+            description: `${hostname} service`,
+        };
+    }
+    // Generate from port for localhost
+    if (port) {
+        return {
+            varName: `PORT_${port}_URL`,
+            description: `localhost:${port}`,
+        };
+    }
+    return { varName: 'LOCALHOST_URL', description: 'localhost' };
+}
 /**
  * Convert ProjectScan to DetectedConfig
  */
@@ -117,10 +325,17 @@ function convertScanToDetected(scan, root) {
         })),
         apps: {},
     };
-    // Convert apps
+    // Convert apps (detect git info for each app in multi-repo workspaces)
+    const isMultiRepo = scan.structure.type === 'hybrid';
     for (const app of scan.apps) {
         // Map scanner AppType to DetectedApp type
         const mappedType = mapAppType(app.type);
+        // Detect git info for this app (for multi-repo workspaces)
+        let appGit;
+        if (isMultiRepo) {
+            const appDir = path.join(root, app.path);
+            appGit = detectGitForDirectory(appDir);
+        }
         detected.apps[app.name] = {
             path: app.path,
             type: mappedType,
@@ -135,6 +350,7 @@ function convertScanToDetected(scan, root) {
                 start: app.scripts.start,
             } : undefined,
             dependencies: app.dependencies,
+            git: appGit,
         };
     }
     // Convert infrastructure
@@ -341,11 +557,30 @@ function showSummary(detected) {
             console.log(`    ${chalk_1.default.cyan(infra.name)}: ${infra.type} (${infra.image})`);
         }
     }
-    // Git
+    // Git (root level)
     if (detected.git?.remote) {
         console.log(`\n  Git: ${detected.git.provider || 'git'} (${detected.git.type})`);
         console.log(chalk_1.default.dim(`    Branch: ${detected.git.branch || 'unknown'}`));
     }
+    // Per-app git repos (for multi-repo workspaces)
+    const appsWithGit = Object.entries(detected.apps).filter(([, app]) => app.git);
+    if (appsWithGit.length > 0) {
+        console.log(`\n  App Repositories (${appsWithGit.length}):`);
+        for (const [name, app] of appsWithGit) {
+            const git = app.git;
+            console.log(`    ${chalk_1.default.cyan(name)}: ${git.provider} (${git.type})`);
+            console.log(chalk_1.default.dim(`      ${git.remote}`));
+        }
+    }
+    // Service URLs (for staging URL configuration)
+    if (detected.service_urls && detected.service_urls.length > 0) {
+        console.log(`\n  Service URLs (${detected.service_urls.length}):`);
+        for (const svc of detected.service_urls) {
+            console.log(`    ${chalk_1.default.cyan(svc.var_name)}: ${svc.base_url}`);
+            console.log(chalk_1.default.dim(`      Used by: ${svc.used_by.slice(0, 3).join(', ')}${svc.used_by.length > 3 ? ` +${svc.used_by.length - 3} more` : ''}`));
+        }
+        console.log(chalk_1.default.dim('\n  These URLs will need staging equivalents in init.'));
+    }
     console.log(chalk_1.default.bold('\n📝 Next steps:\n'));
     console.log('  1. Review the detected configuration in .genbox/detected.yaml');
     console.log('  2. Run ' + chalk_1.default.cyan('genbox init --from-scan') + ' to create genbox.yaml');

package/dist/commands/ssh-setup.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sshSetupCommand = void 0;
+const commander_1 = require("commander");
+const api_1 = require("../api");
+const ssh_config_1 = require("../ssh-config");
+/**
+ * Internal command to poll for IP and add SSH config in background
+ * Called by: genbox ssh-setup <genboxId> <name>
+ */
+exports.sshSetupCommand = new commander_1.Command('ssh-setup')
+    .argument('<genboxId>', 'Genbox ID')
+    .argument('<name>', 'Genbox name')
+    .option('--max-attempts <n>', 'Max polling attempts', '90')
+    .option('--delay <ms>', 'Delay between attempts in ms', '2000')
+    .action(async (genboxId, name, options) => {
+    const maxAttempts = parseInt(options.maxAttempts, 10);
+    const delayMs = parseInt(options.delay, 10);
+    for (let i = 0; i < maxAttempts; i++) {
+        try {
+            const genbox = await (0, api_1.fetchApi)(`/genboxes/${genboxId}`);
+            if (genbox.ipAddress) {
+                (0, ssh_config_1.addSshConfigEntry)({ name, ipAddress: genbox.ipAddress });
+                process.exit(0);
+            }
+        }
+        catch {
+            // Ignore errors during polling
+        }
+        await new Promise(resolve => setTimeout(resolve, delayMs));
+    }
+    // Timed out - exit silently
+    process.exit(0);
+});

package/dist/config-explainer.js

@@ -200,7 +200,8 @@ class ConfigExplainer {
         if (!config)
             return warnings;
         // Check each app for implicit type/port/framework
-        for (const [appName, appConfig] of Object.entries(config.apps || {})) {
+        for (const [appName, rawAppConfig] of Object.entries(config.apps || {})) {
+            const appConfig = rawAppConfig;
             // Check type - was it inferred?
             if (appConfig.type) {
                 const typeExplanation = this.explain(`apps.${appName}.type`);