genbox 1.0.79 → 1.0.81

package/dist/commands/forward.js

@@ -93,22 +93,43 @@ exports.forwardCommand = new commander_1.Command('forward')
         }
         // 3. Build port mappings from config or defaults
         const portMappings = [];
-        // Try to load config for service ports
+        // Try to load config for service ports from genbox.yaml
         try {
             const config = (0, config_1.loadConfig)();
-            if (config.services) {
-                for (const [serviceName, serviceConfig] of Object.entries(config.services)) {
-                    portMappings.push({
-                        name: serviceName,
-                        localPort: serviceConfig.port,
-                        remotePort: serviceConfig.port,
-                    });
+            // Read ports from genbox.yaml apps config
+            if (config.apps) {
+                for (const [appName, appConfig] of Object.entries(config.apps)) {
+                    const port = appConfig.port;
+                    if (port && typeof port === 'number') {
+                        portMappings.push({
+                            name: appName,
+                            localPort: port,
+                            remotePort: port,
+                        });
+                    }
+                }
+            }
+            // Also add infrastructure ports from provides
+            if (config.provides) {
+                for (const [infraName, infraConfig] of Object.entries(config.provides)) {
+                    if (infraConfig.port) {
+                        portMappings.push({
+                            name: infraName,
+                            localPort: infraConfig.port,
+                            remotePort: infraConfig.port,
+                        });
+                    }
                 }
             }
         }
         catch {
-            // No config, use default GoodPass ports
-            portMappings.push({ name: 'Web App', localPort: 3000, remotePort: 3000 }, { name: 'Gateway', localPort: 3050, remotePort: 3050 }, { name: 'Auth', localPort: 3051, remotePort: 3051 }, { name: 'Notifications', localPort: 3052, remotePort: 3052 }, { name: 'Products', localPort: 3053, remotePort: 3053 }, { name: 'Partner API', localPort: 3054, remotePort: 3054 }, { name: 'Admin UI', localPort: 5173, remotePort: 5173 });
+            // No config found - require genbox.yaml
+            console.error(chalk_1.default.red('No genbox.yaml found. Run "gb init" first to configure your project.'));
+            return;
+        }
+        if (portMappings.length === 0) {
+            console.error(chalk_1.default.yellow('No apps with ports found in genbox.yaml. Nothing to forward.'));
+            return;
         }
         // Add custom ports if specified
         if (options.ports) {

package/dist/commands/init.js

@@ -762,8 +762,10 @@ async function setupEnvironmentsAndServiceUrls(detected, existingEnvValues) {
     }
     // Service URL detection and mapping
     const serviceUrlMappings = await setupServiceUrls(detected, environments, existingEnvValues);
-    // Always add LOCAL_API_URL
-    envVars['LOCAL_API_URL'] = 'http://localhost:3050';
+    // Always add LOCAL_API_URL - get port from detected api app
+    const apiApp = detected.apps?.['api'];
+    const apiPort = apiApp?.port || 3050;
+    envVars['LOCAL_API_URL'] = `http://localhost:${apiPort}`;
     return {
         environments: Object.keys(environments).length > 0 ? environments : undefined,
         serviceUrlMappings,
@@ -817,9 +819,11 @@ async function setupServiceUrls(detected, environments, existingEnvValues) {
         console.log(chalk_1.default.dim(`Mapping selected URLs to ${primaryEnv} environment:`));
         for (const svc of selectedServices) {
             const serviceInfo = getServiceInfoFromUrl(svc.base_url);
+            // Get API port from detected config for URL matching
+            const detectedApiPort = detected.apps?.['api']?.port;
             // Auto-map API/gateway URLs
             const isApiService = serviceInfo.name === 'gateway' ||
-                svc.base_url.includes(':3050') ||
+                (detectedApiPort && svc.base_url.includes(`:${detectedApiPort}`)) ||
                 svc.used_by.some(v => v.toLowerCase().includes('api'));
             let remoteUrl = '';
             if (isApiService && apiUrl) {
@@ -1799,13 +1803,17 @@ exports.initCommand = new commander_1.Command('init')
             const yamlContent = yaml.dump(config, { lineWidth: 120, noRefs: true, quotingType: '"' });
             fs_1.default.writeFileSync(configPath, yamlContent);
             console.log(chalk_1.default.green(`\n✔ Configuration saved to ${CONFIG_FILENAME}`));
-            const envContent = generateEnvFile(settings.projectName, detected, { ...gitEnvVars, LOCAL_API_URL: 'http://localhost:3050' }, []);
+            // Get API port from detected config
+            const fastPathApiApp = detected.apps?.['api'];
+            const fastPathApiPort = fastPathApiApp?.port || 3050;
+            const fastPathLocalApiUrl = `http://localhost:${fastPathApiPort}`;
+            const envContent = generateEnvFile(settings.projectName, detected, { ...gitEnvVars, LOCAL_API_URL: fastPathLocalApiUrl }, []);
             fs_1.default.writeFileSync(path_1.default.join(rootDir, ENV_FILENAME), envContent);
             console.log(chalk_1.default.green(`✔ Created ${ENV_FILENAME}`));
             // Sync project to API if logged in
             if (config_store_1.ConfigStore.getToken()) {
                 try {
-                    const payload = configToSyncPayload(config, { ...gitEnvVars, LOCAL_API_URL: 'http://localhost:3050' });
+                    const payload = configToSyncPayload(config, { ...gitEnvVars, LOCAL_API_URL: fastPathLocalApiUrl });
                     const result = await (0, api_1.syncProject)(payload);
                     saveProjectCache(rootDir, {
                         _id: result._id,

package/dist/commands/rebuild.js

@@ -261,21 +261,42 @@ async function runSoftRebuild(options) {
                 }
             }
         }
-        // Step 6: Start Docker Compose services
+        // Step 6: Start Docker Compose services (only for apps with runner: docker + infrastructure)
         onStep?.('Starting Docker services...');
         for (const repo of resolved.repos) {
             const hasDockerCompose = await sshExec(ip, keyPath, `test -f ${repo.path}/docker-compose.yml -o -f ${repo.path}/docker-compose.yaml -o -f ${repo.path}/compose.yaml && echo yes || echo no`, 10);
             if (hasDockerCompose.output === 'yes') {
-                log(`Starting Docker Compose in ${repo.name}...`, 'info');
-                const composeResult = await sshExecStream(ip, keyPath, `cd ${repo.path} && docker compose up -d`, {
-                    onStdout: (line) => log(line, 'dim'),
-                    timeoutSecs: 180,
-                });
-                if (!composeResult.success) {
-                    log(`Warning: Docker Compose failed in ${repo.name}`, 'error');
+                // Get list of services to start: apps with runner: docker + infrastructure (provides)
+                const dockerServices = [];
+                // Add apps with runner: docker
+                for (const app of resolved.apps) {
+                    const appConfig = config.apps[app.name];
+                    if (appConfig?.runner === 'docker') {
+                        const serviceName = appConfig.docker?.service || app.name;
+                        dockerServices.push(serviceName);
+                    }
+                }
+                // Add infrastructure services (provides: mongo, redis, etc.)
+                if (config.provides) {
+                    for (const [name] of Object.entries(config.provides)) {
+                        dockerServices.push(name);
+                    }
+                }
+                if (dockerServices.length === 0) {
+                    log(`No Docker services to start in ${repo.name}`, 'dim');
                 }
                 else {
-                    log(`✓ Docker services started in ${repo.name}`, 'success');
+                    log(`Starting Docker Compose in ${repo.name} (${dockerServices.join(', ')})...`, 'info');
+                    const composeResult = await sshExecStream(ip, keyPath, `cd ${repo.path} && docker compose up -d ${dockerServices.join(' ')}`, {
+                        onStdout: (line) => log(line, 'dim'),
+                        timeoutSecs: 600, // 10 minutes for Docker builds with npm/pnpm install
+                    });
+                    if (!composeResult.success) {
+                        log(`Warning: Docker Compose failed in ${repo.name}`, 'error');
+                    }
+                    else {
+                        log(`✓ Docker services started in ${repo.name}`, 'success');
+                    }
                 }
             }
         }
@@ -348,6 +369,24 @@ async function runSoftRebuild(options) {
                 log(`Warning: Database restore failed: ${error.message}`, 'error');
             }
         }
+        // Step 7.5: Update localhost URLs in .env files to genbox URLs
+        {
+            const genboxName = genbox.name;
+            const workspace = genbox.workspace || resolved.project.name;
+            const baseDomain = 'genbox.dev';
+            log('Updating localhost URLs in .env files...', 'info');
+            // Replace localhost:{port} with genbox URL for each app based on its configured port
+            for (const app of resolved.apps) {
+                const appConfig = config.apps[app.name];
+                const port = appConfig?.port;
+                if (port) {
+                    const genboxAppUrl = `https://${genboxName}.${app.name}.${workspace}.${baseDomain}`;
+                    await sshExec(ip, keyPath, `find /home/dev -name ".env" -type f -exec sed -i 's|http://localhost:${port}|${genboxAppUrl}|g' {} \\;`, 30);
+                    log(`  localhost:${port} → ${genboxAppUrl}`, 'dim');
+                }
+            }
+            log(`✓ localhost URLs updated`, 'success');
+        }
         // Step 8: Start PM2 services (only for apps with runner: pm2 or unspecified)
         onStep?.('Starting application services...');
         for (const app of resolved.apps) {
@@ -378,12 +417,11 @@ async function runSoftRebuild(options) {
                 }
             }
             else {
-                // Use configured dev command, or fall back to dev script, then start script
-                const devCommand = appConfig.commands?.dev;
-                if (devCommand) {
-                    // Use the configured dev command
-                    log(`Starting ${app.name} with PM2 (${devCommand})...`, 'info');
-                    const pm2Result = await sshExecStream(ip, keyPath, `cd ${repoPath} && source ~/.nvm/nvm.sh && pm2 start "pnpm run ${devCommand}" --name ${app.name}`, {
+                // Check for dev script in package.json first (preferred), then start script
+                const hasDevScript = await sshExec(ip, keyPath, `grep -q '"dev"' ${repoPath}/package.json 2>/dev/null && echo yes || echo no`, 10);
+                if (hasDevScript.output === 'yes') {
+                    log(`Starting ${app.name} with PM2 (pnpm dev)...`, 'info');
+                    const pm2Result = await sshExecStream(ip, keyPath, `cd ${repoPath} && source ~/.nvm/nvm.sh && pm2 start "pnpm run dev" --name ${app.name}`, {
                         onStdout: (line) => log(line, 'dim'),
                         timeoutSecs: 60,
                     });
@@ -392,11 +430,11 @@ async function runSoftRebuild(options) {
                     }
                 }
                 else {
-                    // Check for dev script in package.json first, then start
-                    const hasDevScript = await sshExec(ip, keyPath, `grep -q '"dev"' ${repoPath}/package.json 2>/dev/null && echo yes || echo no`, 10);
-                    if (hasDevScript.output === 'yes') {
-                        log(`Starting ${app.name} with PM2 (pnpm dev)...`, 'info');
-                        const pm2Result = await sshExecStream(ip, keyPath, `cd ${repoPath} && source ~/.nvm/nvm.sh && pm2 start "pnpm run dev" --name ${app.name}`, {
+                    // Fall back to start script
+                    const hasStartScript = await sshExec(ip, keyPath, `grep -q '"start"' ${repoPath}/package.json 2>/dev/null && echo yes || echo no`, 10);
+                    if (hasStartScript.output === 'yes') {
+                        log(`Starting ${app.name} with PM2 (pnpm start)...`, 'info');
+                        const pm2Result = await sshExecStream(ip, keyPath, `cd ${repoPath} && source ~/.nvm/nvm.sh && pm2 start "pnpm run start" --name ${app.name}`, {
                             onStdout: (line) => log(line, 'dim'),
                             timeoutSecs: 60,
                         });
@@ -404,20 +442,6 @@ async function runSoftRebuild(options) {
                             log(`✓ Started ${app.name}`, 'success');
                         }
                     }
-                    else {
-                        // Fall back to start script
-                        const hasStartScript = await sshExec(ip, keyPath, `grep -q '"start"' ${repoPath}/package.json 2>/dev/null && echo yes || echo no`, 10);
-                        if (hasStartScript.output === 'yes') {
-                            log(`Starting ${app.name} with PM2 (pnpm start)...`, 'info');
-                            const pm2Result = await sshExecStream(ip, keyPath, `cd ${repoPath} && source ~/.nvm/nvm.sh && pm2 start "pnpm run start" --name ${app.name}`, {
-                                onStdout: (line) => log(line, 'dim'),
-                                timeoutSecs: 60,
-                            });
-                            if (pm2Result.success) {
-                                log(`✓ Started ${app.name}`, 'success');
-                            }
-                        }
-                    }
                 }
             }
         }

package/dist/profile-resolver.js

@@ -539,9 +539,13 @@ class ProfileResolver {
             const apiDep = app.dependencies['api'];
             if (apiDep) {
                 if (apiDep.mode === 'local') {
-                    env['API_URL'] = 'http://localhost:3050';
-                    env['VITE_API_URL'] = 'http://localhost:3050';
-                    env['NEXT_PUBLIC_API_URL'] = 'http://localhost:3050';
+                    // Get API port from config instead of hardcoding
+                    const apiAppConfig = config.apps?.['api'];
+                    const apiPort = (apiAppConfig?.port && typeof apiAppConfig.port === 'number') ? apiAppConfig.port : 3050;
+                    const localApiUrl = `http://localhost:${apiPort}`;
+                    env['API_URL'] = localApiUrl;
+                    env['VITE_API_URL'] = localApiUrl;
+                    env['NEXT_PUBLIC_API_URL'] = localApiUrl;
                 }
                 else if (apiDep.url) {
                     env['API_URL'] = apiDep.url;
@@ -555,7 +559,10 @@ class ProfileResolver {
         if (hasBackendApps) {
             // Add database URL
             if (database.mode === 'local') {
-                env['MONGODB_URI'] = `mongodb://localhost:27017/${config.project.name}`;
+                // Get MongoDB port from provides config instead of hardcoding
+                const mongoConfig = config.provides?.['mongodb'];
+                const mongoPort = mongoConfig?.port || 27017;
+                env['MONGODB_URI'] = `mongodb://localhost:${mongoPort}/${config.project.name}`;
             }
             else if (database.url) {
                 env['MONGODB_URI'] = database.url;

package/package.json

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