genbox 1.0.33 → 1.0.35

package/dist/commands/init.js

@@ -1021,7 +1021,20 @@ function createProfilesFromScan(scan, definedEnvironments = []) {
     const profiles = {};
     const frontendApps = scan.apps.filter(a => a.type === 'frontend');
     const backendApps = scan.apps.filter(a => a.type === 'backend' || a.type === 'api');
-    const hasApi = scan.apps.some(a => a.name === 'api' || a.type === 'backend');
+    // Docker services are also runnable (api, web services from docker-compose)
+    const dockerServices = scan.compose?.applications || [];
+    const dockerServiceNames = dockerServices.map(s => s.name);
+    // Combine backend apps + Docker services (avoid duplicates)
+    const allBackendNames = new Set([
+        ...backendApps.map(a => a.name),
+        ...dockerServiceNames.filter(name => {
+            // Include Docker services that aren't already in apps OR aren't frontend
+            const existingApp = scan.apps.find(a => a.name === name);
+            return !existingApp || existingApp.type !== 'frontend';
+        }),
+    ]);
+    const backendAppNames = Array.from(allBackendNames);
+    const hasBackend = backendAppNames.length > 0;
     // Determine which environment to use for remote connections
     // Priority: staging > production > first defined
     const remoteEnv = definedEnvironments.includes('staging')
@@ -1045,32 +1058,32 @@ function createProfilesFromScan(scan, definedEnvironments = []) {
         // No remote environment - create local-only profiles
         for (const frontend of frontendApps.slice(0, 3)) {
             profiles[`${frontend.name}-local`] = {
-                description: `${frontend.name} with local API`,
+                description: `${frontend.name} with local backend`,
                 size: 'medium',
-                apps: [frontend.name, ...(hasApi ? ['api'] : [])],
+                apps: [frontend.name, ...backendAppNames],
             };
         }
     }
     // Full local development (with DB copy from available environment)
-    if (hasApi && frontendApps.length > 0) {
+    if (hasBackend && frontendApps.length > 0) {
         const primaryFrontend = frontendApps[0];
         const dbSource = remoteEnv || 'staging'; // Use defined env or default
         profiles[`${primaryFrontend.name}-full`] = {
-            description: `${primaryFrontend.name} + local API + DB copy`,
+            description: `${primaryFrontend.name} + local backend + DB copy`,
             size: 'large',
-            apps: [primaryFrontend.name, 'api'],
+            apps: [primaryFrontend.name, ...backendAppNames],
             database: {
                 mode: remoteEnv ? 'copy' : 'local', // Only copy if we have a source
                 ...(remoteEnv && { source: dbSource }),
             },
         };
     }
-    // API development only
-    if (hasApi) {
-        profiles['api-dev'] = {
-            description: 'API with local infrastructure',
+    // Backend/service development only (for each backend app and Docker service)
+    for (const backendName of backendAppNames) {
+        profiles[`${backendName}-dev`] = {
+            description: `${backendName} with local infrastructure`,
             size: 'medium',
-            apps: ['api'],
+            apps: [backendName],
             database: {
                 mode: 'local',
             },
@@ -1085,13 +1098,17 @@ function createProfilesFromScan(scan, definedEnvironments = []) {
             default_connection: remoteEnv,
         };
     }
-    // Full stack
-    if (scan.apps.length > 1) {
+    // Full stack - combine apps + Docker services (deduplicated)
+    const allRunnableNames = new Set([
+        ...scan.apps.filter(a => a.type !== 'library').map(a => a.name),
+        ...dockerServiceNames,
+    ]);
+    if (allRunnableNames.size > 1) {
         const dbSource = remoteEnv || 'staging';
         profiles['full-stack'] = {
             description: 'Everything local' + (remoteEnv ? ' with DB copy' : ''),
             size: 'xl',
-            apps: scan.apps.filter(a => a.type !== 'library').map(a => a.name),
+            apps: Array.from(allRunnableNames),
             database: {
                 mode: remoteEnv ? 'copy' : 'local',
                 ...(remoteEnv && { source: dbSource }),

package/dist/commands/status.js

@@ -187,56 +187,124 @@ exports.statusCommand = new commander_1.Command('status')
             console.error(chalk_1.default.red(error.message));
             return;
         }
-        console.log(chalk_1.default.blue(`[INFO] Checking cloud-init progress on ${selectedName}...`));
+        console.log(chalk_1.default.blue(`[INFO] Checking status of ${selectedName}...`));
         console.log('');
-        // 3. Check cloud-init status
-        const status = sshExec(target.ipAddress, keyPath, 'cloud-init status 2>&1');
-        if (!status) {
-            console.log(chalk_1.default.yellow('[WARN] Unable to connect to server. It may still be booting.'));
-            return;
-        }
-        // Check for SSH connection errors (timeout, refused, etc.)
-        const sshErrors = [
-            'Operation timed out',
-            'Connection refused',
-            'Connection timed out',
-            'No route to host',
-            'Network is unreachable',
-            'ssh: connect to host',
-        ];
-        if (sshErrors.some(err => status.includes(err))) {
-            console.log(chalk_1.default.yellow('[INFO] Server is still initializing - SSH is not yet available.'));
-            console.log(chalk_1.default.dim('       This is normal for newly created servers.'));
-            console.log(chalk_1.default.dim('       Please wait 1-2 minutes and try again.'));
+        // 3. Check status from DB first (more reliable than SSH)
+        const dbStatus = target.status; // 'provisioning' | 'running' | 'error' etc.
+        const setupDuration = target.setupDuration;
+        const setupCompletedAt = target.setupCompletedAt;
+        // If DB says RUNNING and we have setupCompletedAt, setup is complete
+        if (dbStatus === 'running' && setupCompletedAt) {
+            const durationStr = setupDuration ? formatDuration(setupDuration) : 'unknown';
+            console.log(chalk_1.default.green(`[SUCCESS] Setup completed! (took ${durationStr})`));
+            console.log('');
+            // Show Docker containers status
+            const dockerStatus = sshExec(target.ipAddress, keyPath, 'docker ps --format "{{.Names}}\\t{{.Status}}" 2>/dev/null', 10);
+            if (dockerStatus && dockerStatus.trim()) {
+                console.log(chalk_1.default.blue('[INFO] === Docker Services ==='));
+                console.log('NAMES\tSTATUS');
+                console.log(dockerStatus);
+                console.log('');
+            }
+            // Show PM2 processes
+            const pm2Status = sshExec(target.ipAddress, keyPath, 'source ~/.nvm/nvm.sh 2>/dev/null; pm2 list 2>/dev/null || echo ""', 10);
+            if (pm2Status && pm2Status.trim() && !pm2Status.includes('No process')) {
+                console.log(chalk_1.default.blue('[INFO] === PM2 Services ==='));
+                console.log(pm2Status);
+                console.log('');
+            }
+            // Show URLs if available
+            if (target.urls && Object.keys(target.urls).length > 0) {
+                console.log(chalk_1.default.blue('[INFO] === Service URLs ==='));
+                for (const [service, url] of Object.entries(target.urls)) {
+                    console.log(`  ${service}: ${chalk_1.default.cyan(url)}`);
+                }
+            }
             return;
         }
-        if (status.includes('running')) {
-            // Get timing breakdown
-            const timing = getTimingBreakdown(target.ipAddress, keyPath);
-            if (timing.total !== null) {
-                console.log(chalk_1.default.yellow(`[WARN] Cloud-init is still running... (elapsed: ${formatDuration(timing.total)})`));
+        // If DB says PROVISIONING, check if we can SSH to get progress
+        if (dbStatus === 'provisioning') {
+            // Try to SSH and check cloud-init progress
+            let status = sshExec(target.ipAddress, keyPath, 'cloud-init status 2>&1');
+            if (!status) {
+                console.log(chalk_1.default.yellow('[WARN] Unable to connect to server. It may still be booting.'));
+                return;
             }
-            else {
-                console.log(chalk_1.default.yellow('[WARN] Cloud-init is still running...'));
+            // Check for SSH connection errors (timeout, refused, etc.)
+            const sshErrors = [
+                'Operation timed out',
+                'Connection refused',
+                'Connection timed out',
+                'No route to host',
+                'Network is unreachable',
+                'ssh: connect to host',
+            ];
+            if (sshErrors.some(err => status.includes(err))) {
+                console.log(chalk_1.default.yellow('[INFO] Server is still initializing - SSH is not yet available.'));
+                console.log(chalk_1.default.dim('       This is normal for newly created servers.'));
+                console.log(chalk_1.default.dim('       Please wait 1-2 minutes and try again.'));
+                return;
             }
-            console.log('');
-            // Show timing breakdown so far
-            if (timing.sshReady !== null) {
-                console.log(chalk_1.default.blue('[INFO] === Timing So Far ==='));
-                console.log(`  SSH Ready:   ${formatDuration(timing.sshReady)}`);
+            // Cloud-init still running
+            if (status.includes('running')) {
+                // Get timing breakdown
+                const timing = getTimingBreakdown(target.ipAddress, keyPath);
                 if (timing.total !== null) {
-                    console.log(`  Elapsed:     ${formatDuration(timing.total)}`);
+                    console.log(chalk_1.default.yellow(`[INFO] Setup in progress... (elapsed: ${formatDuration(timing.total)})`));
+                }
+                else {
+                    console.log(chalk_1.default.yellow('[INFO] Setup in progress...'));
                 }
                 console.log('');
+                // Show timing breakdown so far
+                if (timing.sshReady !== null) {
+                    console.log(chalk_1.default.blue('[INFO] === Timing So Far ==='));
+                    console.log(`  SSH Ready:   ${formatDuration(timing.sshReady)}`);
+                    if (timing.total !== null) {
+                        console.log(`  Elapsed:     ${formatDuration(timing.total)}`);
+                    }
+                    console.log('');
+                }
+                console.log(chalk_1.default.blue('[INFO] Latest setup progress:'));
+                // Tail cloud-init output log for progress
+                const logOutput = sshExec(target.ipAddress, keyPath, "sudo tail -30 /var/log/cloud-init-output.log 2>/dev/null | grep -E '^===|^#|Progress:|DONE|error|Error|failed|Failed' || sudo tail -20 /var/log/cloud-init-output.log", 15);
+                if (logOutput) {
+                    console.log(logOutput);
+                }
+                return;
+            }
+            // Cloud-init done but callback might not have been received yet
+            if (status.includes('done')) {
+                console.log(chalk_1.default.green('[SUCCESS] Setup completed!'));
+                console.log(chalk_1.default.dim('  (Waiting for status update...)'));
+                return;
+            }
+            // Cloud-init not found (already cleaned up) - show generic status
+            if (status.includes('not found') || status.includes('command not found')) {
+                console.log(chalk_1.default.yellow('[INFO] Setup is finalizing...'));
+                return;
             }
-            console.log(chalk_1.default.blue('[INFO] Latest setup progress:'));
-            // Tail cloud-init output log for progress
-            const logOutput = sshExec(target.ipAddress, keyPath, "sudo tail -30 /var/log/cloud-init-output.log 2>/dev/null | grep -E '^===|^#|Progress:|DONE|error|Error|failed|Failed' || sudo tail -20 /var/log/cloud-init-output.log", 15);
-            if (logOutput) {
-                console.log(logOutput);
+            // Other status
+            console.log(chalk_1.default.yellow(`[INFO] Status: ${status}`));
+            return;
+        }
+        // If DB says ERROR
+        if (dbStatus === 'error') {
+            console.log(chalk_1.default.red('[ERROR] Setup failed!'));
+            console.log(chalk_1.default.dim('  Run `genbox connect` to investigate.'));
+            return;
+        }
+        // Fallback: try legacy cloud-init check for backwards compatibility
+        let status = sshExec(target.ipAddress, keyPath, 'cloud-init status 2>&1');
+        if (!status || status.includes('not found')) {
+            // No cloud-init, check our status file
+            const genboxStatus = sshExec(target.ipAddress, keyPath, 'cat ~/.genbox-status 2>/dev/null');
+            if (genboxStatus && genboxStatus.includes('Setup Complete')) {
+                console.log(chalk_1.default.green('[SUCCESS] Setup completed!'));
+                return;
             }
         }
-        else if (status.includes('done')) {
+        if (status && status.includes('done')) {
             // Get timing breakdown
             const timing = getTimingBreakdown(target.ipAddress, keyPath);
             console.log(chalk_1.default.green(`[SUCCESS] Cloud-init completed!${timing.total !== null ? ` (${formatDuration(timing.total)})` : ''}`));

package/package.json

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