genbox 1.0.14 → 1.0.15

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

@@ -56,9 +56,53 @@ 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')
@@ -117,10 +161,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 +186,7 @@ function convertScanToDetected(scan, root) {
                 start: app.scripts.start,
             } : undefined,
             dependencies: app.dependencies,
+            git: appGit,
         };
     }
     // Convert infrastructure
@@ -341,11 +393,21 @@ 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}`));
+        }
+    }
     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`);

package/dist/config-loader.js

@@ -44,10 +44,42 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configLoader = exports.ConfigLoader = void 0;
+exports.isV4 = isV4;
+exports.getProfileConnection = getProfileConnection;
+exports.getAppDependencies = getAppDependencies;
+exports.getInfrastructure = getInfrastructure;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const yaml = __importStar(require("js-yaml"));
 const os = __importStar(require("os"));
+const schema_v4_1 = require("./schema-v4");
+// Helper to check if config is v4
+function isV4(config) {
+    return (0, schema_v4_1.getConfigVersion)(config) === 4;
+}
+// Helper to get profile connection (handles both v3 and v4)
+function getProfileConnection(profile) {
+    // v4 uses default_connection, v3 uses connect_to
+    return profile.default_connection || profile.connect_to;
+}
+// Helper to get app dependencies (handles both v3 and v4)
+function getAppDependencies(app) {
+    // v4 uses connects_to, v3 uses requires
+    if (app.connects_to) {
+        return Object.keys(app.connects_to);
+    }
+    if (app.requires) {
+        return Object.keys(app.requires);
+    }
+    return [];
+}
+// Helper to get infrastructure/provides (handles both v3 and v4)
+function getInfrastructure(config) {
+    if (isV4(config)) {
+        return config.provides;
+    }
+    return config.infrastructure;
+}
 const CONFIG_FILENAME = 'genbox.yaml';
 const ENV_FILENAME = '.env.genbox';
 const USER_CONFIG_DIR = path.join(os.homedir(), '.genbox');
@@ -189,17 +221,41 @@ class ConfigLoader {
     }
     /**
      * Merge configurations from all sources
+     * Supports both v3 and v4 config formats
      */
     mergeConfigs(sources, userConfig) {
-        // Start with default structure
-        const merged = {
-            version: '3.0',
-            project: {
-                name: 'unnamed',
-                structure: 'single-app',
-            },
-            apps: {},
-        };
+        // Detect version from first source that has it
+        let isVersion4 = false;
+        for (const source of sources) {
+            // Version can be number (v4) or string (v3)
+            if (source.config.version === 4) {
+                isVersion4 = true;
+                break;
+            }
+        }
+        // Start with appropriate default structure
+        const merged = isVersion4
+            ? {
+                version: 4,
+                project: {
+                    name: 'unnamed',
+                    structure: 'single-app',
+                },
+                apps: {},
+                strict: {
+                    enabled: true,
+                    allow_detect: true,
+                    warnings_as_errors: false,
+                },
+            }
+            : {
+                version: '3.0',
+                project: {
+                    name: 'unnamed',
+                    structure: 'single-app',
+                },
+                apps: {},
+            };
         // Merge sources in order (workspace first, then project)
         for (const source of sources) {
             this.deepMerge(merged, source.config);
@@ -244,11 +300,12 @@ class ConfigLoader {
         }
     }
     /**
-     * Validate configuration
+     * Validate configuration (supports both v3 and v4)
      */
     validate(config) {
         const errors = [];
         const warnings = [];
+        const configIsV4 = isV4(config);
         // Required fields
         if (!config.project?.name) {
             errors.push({
@@ -264,6 +321,8 @@ class ConfigLoader {
                 severity: 'warning',
             });
         }
+        // Get infrastructure (v4: provides, v3: infrastructure)
+        const infra = getInfrastructure(config);
         // Validate apps
         for (const [name, app] of Object.entries(config.apps || {})) {
             if (!app.path) {
@@ -280,18 +339,18 @@ class ConfigLoader {
                     severity: 'warning',
                 });
             }
-            // Validate dependencies reference existing apps/infrastructure
-            if (app.requires) {
-                for (const dep of Object.keys(app.requires)) {
-                    const isApp = config.apps?.[dep];
-                    const isInfra = config.infrastructure?.[dep];
-                    if (!isApp && !isInfra) {
-                        warnings.push({
-                            path: `apps.${name}.requires.${dep}`,
-                            message: `App '${name}' requires '${dep}' which is not defined`,
-                            severity: 'warning',
-                        });
-                    }
+            // Validate dependencies (v4: connects_to, v3: requires)
+            const deps = getAppDependencies(app);
+            const depField = configIsV4 ? 'connects_to' : 'requires';
+            for (const dep of deps) {
+                const isAppDep = config.apps?.[dep];
+                const isInfraDep = infra?.[dep];
+                if (!isAppDep && !isInfraDep) {
+                    warnings.push({
+                        path: `apps.${name}.${depField}.${dep}`,
+                        message: `App '${name}' ${configIsV4 ? 'connects to' : 'requires'} '${dep}' which is not defined`,
+                        severity: 'warning',
+                    });
                 }
             }
         }
@@ -315,11 +374,13 @@ class ConfigLoader {
                     severity: 'error',
                 });
             }
-            // Check connect_to
-            if (profile.connect_to && !config.environments?.[profile.connect_to]) {
+            // Check connection (v4: default_connection, v3: connect_to)
+            const connection = getProfileConnection(profile);
+            if (connection && !config.environments?.[connection]) {
+                const connField = configIsV4 ? 'default_connection' : 'connect_to';
                 warnings.push({
-                    path: `profiles.${name}.connect_to`,
-                    message: `Profile '${name}' connects to undefined environment '${profile.connect_to}'`,
+                    path: `profiles.${name}.${connField}`,
+                    message: `Profile '${name}' connects to undefined environment '${connection}'`,
                     severity: 'warning',
                 });
             }
@@ -339,12 +400,24 @@ class ConfigLoader {
                     }
                 }
             };
-            if (env.mongodb?.url)
-                checkValue(env.mongodb.url, `environments.${name}.mongodb.url`);
-            if (env.redis?.url)
-                checkValue(env.redis.url, `environments.${name}.redis.url`);
-            if (env.rabbitmq?.url)
-                checkValue(env.rabbitmq.url, `environments.${name}.rabbitmq.url`);
+            // v4 uses urls object, v3 uses separate mongodb/redis/rabbitmq objects
+            if (configIsV4) {
+                const v4Env = env;
+                if (v4Env.urls) {
+                    for (const [key, url] of Object.entries(v4Env.urls)) {
+                        checkValue(url, `environments.${name}.urls.${key}`);
+                    }
+                }
+            }
+            else {
+                const v3Env = env;
+                if (v3Env.mongodb?.url)
+                    checkValue(v3Env.mongodb.url, `environments.${name}.mongodb.url`);
+                if (v3Env.redis?.url)
+                    checkValue(v3Env.redis.url, `environments.${name}.redis.url`);
+                if (v3Env.rabbitmq?.url)
+                    checkValue(v3Env.rabbitmq.url, `environments.${name}.rabbitmq.url`);
+            }
         }
         return {
             valid: errors.length === 0,
@@ -353,7 +426,7 @@ class ConfigLoader {
         };
     }
     /**
-     * Get a specific profile, resolving extends
+     * Get a specific profile, resolving extends (supports both v3 and v4)
      */
     getProfile(config, profileName) {
         const profile = config.profiles?.[profileName];
@@ -368,7 +441,7 @@ class ConfigLoader {
         return this.resolveProfile(config, profile);
     }
     /**
-     * Resolve profile inheritance (extends)
+     * Resolve profile inheritance (extends) - supports both v3 and v4
      */
     resolveProfile(config, profile, userProfiles) {
         if (!profile.extends) {
@@ -385,25 +458,40 @@ class ConfigLoader {
         }
         // Resolve parent first (recursive)
         const resolvedParent = this.resolveProfile(config, parent, userProfiles);
-        // Merge parent into child
-        return {
+        // Merge parent into child - handle both v3 and v4
+        const merged = {
             ...resolvedParent,
             ...profile,
             // Arrays are replaced, not merged
             apps: profile.apps || resolvedParent.apps,
             // Objects are merged
-            infrastructure: {
-                ...resolvedParent.infrastructure,
-                ...profile.infrastructure,
-            },
             env: {
                 ...resolvedParent.env,
                 ...profile.env,
             },
         };
+        // Handle v4 connections override
+        if (isV4(config)) {
+            const v4Profile = profile;
+            const v4Parent = resolvedParent;
+            merged.connections = {
+                ...v4Parent.connections,
+                ...v4Profile.connections,
+            };
+        }
+        else {
+            // v3 infrastructure merge
+            const v3Profile = profile;
+            const v3Parent = resolvedParent;
+            merged.infrastructure = {
+                ...v3Parent.infrastructure,
+                ...v3Profile.infrastructure,
+            };
+        }
+        return merged;
     }
     /**
-     * List all available profiles
+     * List all available profiles (supports both v3 and v4)
      */
     listProfiles(config) {
         const profiles = [];
@@ -416,6 +504,7 @@ class ConfigLoader {
                 source: 'project',
                 apps: resolved?.apps || [],
                 size: resolved?.size,
+                connection: resolved ? getProfileConnection(resolved) : undefined,
             });
         }
         // User profiles
@@ -432,6 +521,7 @@ class ConfigLoader {
                     source: 'user',
                     apps: resolved?.apps || [],
                     size: resolved?.size,
+                    connection: resolved ? getProfileConnection(resolved) : undefined,
                 });
             }
         }

package/dist/index.js

@@ -29,6 +29,7 @@ const scan_1 = require("./commands/scan");
 const resolve_1 = require("./commands/resolve");
 const validate_1 = require("./commands/validate");
 const migrate_1 = require("./commands/migrate");
+const ssh_setup_1 = require("./commands/ssh-setup");
 program
     .addCommand(init_1.initCommand)
     .addCommand(create_1.createCommand)
@@ -50,5 +51,6 @@ program
     .addCommand(resolve_1.resolveCommand)
     .addCommand(validate_1.validateCommand)
     .addCommand(migrate_1.migrateCommand)
-    .addCommand(migrate_1.deprecationsCommand);
+    .addCommand(migrate_1.deprecationsCommand)
+    .addCommand(ssh_setup_1.sshSetupCommand);
 program.parse(process.argv);