genbox 1.0.32 → 1.0.34

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 }),
@@ -1845,11 +1862,24 @@ function convertDetectedToScan(detected) {
     }));
     // Convert infrastructure to compose analysis
     let compose = null;
-    if (detected.infrastructure && detected.infrastructure.length > 0) {
+    const hasInfra = detected.infrastructure && detected.infrastructure.length > 0;
+    const hasDockerServices = detected.docker_services && detected.docker_services.length > 0;
+    if (hasInfra || hasDockerServices) {
         compose = {
             files: ['docker-compose.yml'],
-            applications: [],
-            databases: detected.infrastructure
+            applications: (detected.docker_services || []).map(svc => ({
+                name: svc.name,
+                image: svc.image,
+                build: svc.build_context ? {
+                    context: svc.build_context,
+                    dockerfile: svc.dockerfile,
+                } : undefined,
+                ports: svc.port ? [{ host: svc.port, container: svc.port }] : [],
+                environment: {},
+                dependsOn: svc.depends_on || [],
+                volumes: [],
+            })),
+            databases: (detected.infrastructure || [])
                 .filter(i => i.type === 'database')
                 .map(i => ({
                 name: i.name,
@@ -1859,7 +1889,7 @@ function convertDetectedToScan(detected) {
                 dependsOn: [],
                 volumes: [],
             })),
-            caches: detected.infrastructure
+            caches: (detected.infrastructure || [])
                 .filter(i => i.type === 'cache')
                 .map(i => ({
                 name: i.name,
@@ -1869,7 +1899,7 @@ function convertDetectedToScan(detected) {
                 dependsOn: [],
                 volumes: [],
             })),
-            queues: detected.infrastructure
+            queues: (detected.infrastructure || [])
                 .filter(i => i.type === 'queue')
                 .map(i => ({
                 name: i.name,

package/dist/commands/scan.js

@@ -239,6 +239,30 @@ async function interactiveSelection(detected) {
         // Filter scripts to only selected ones
         result.scripts = detected.scripts.filter(s => selectedScripts.includes(s.path));
     }
+    // === Docker Services Selection ===
+    if (detected.docker_services && detected.docker_services.length > 0) {
+        console.log('');
+        console.log(chalk_1.default.blue('=== Detected Docker Services ===\n'));
+        for (const svc of detected.docker_services) {
+            const portInfo = svc.port ? ` port:${svc.port}` : '';
+            console.log(`  ${chalk_1.default.cyan(svc.name)}${portInfo}`);
+            if (svc.build_context) {
+                console.log(chalk_1.default.dim(`    build: ${svc.dockerfile || 'Dockerfile'}`));
+            }
+        }
+        console.log();
+        const dockerChoices = detected.docker_services.map(svc => ({
+            name: `${svc.name}${svc.port ? ` (port ${svc.port})` : ''}`,
+            value: svc.name,
+            checked: true, // Default: include all
+        }));
+        const selectedDocker = await prompts.checkbox({
+            message: 'Select Docker services to include:',
+            choices: dockerChoices,
+        });
+        // Filter docker services to only selected ones
+        result.docker_services = detected.docker_services.filter(svc => selectedDocker.includes(svc.name));
+    }
     // === Infrastructure Selection ===
     if (detected.infrastructure && detected.infrastructure.length > 0) {
         console.log('');
@@ -482,6 +506,18 @@ function convertScanToDetected(scan, root) {
                 source: 'docker-compose.yml',
             });
         }
+        // Save Docker application services (services with build context)
+        if (scan.compose.applications && scan.compose.applications.length > 0) {
+            detected.docker_services = scan.compose.applications.map(app => ({
+                name: app.name,
+                build_context: app.build?.context,
+                dockerfile: app.build?.dockerfile,
+                image: app.image,
+                port: app.ports?.[0]?.host,
+                depends_on: app.dependsOn?.length ? app.dependsOn : undefined,
+                source: 'docker-compose.yml',
+            }));
+        }
     }
     // Git info
     if (scan.git) {
@@ -649,6 +685,17 @@ function showSummary(detected) {
             console.log(`    ${parts.join(' ')}`);
         }
     }
+    // Docker Services (applications with build context)
+    if (detected.docker_services && detected.docker_services.length > 0) {
+        console.log(`\n  Docker Services (${detected.docker_services.length}):`);
+        for (const svc of detected.docker_services) {
+            const portInfo = svc.port ? ` port:${svc.port}` : '';
+            console.log(`    ${chalk_1.default.cyan(svc.name)}${portInfo}`);
+            if (svc.build_context) {
+                console.log(chalk_1.default.dim(`      build: ${svc.build_context}`));
+            }
+        }
+    }
     // Infrastructure
     if (detected.infrastructure && detected.infrastructure.length > 0) {
         console.log(`\n  Infrastructure (${detected.infrastructure.length}):`);

package/package.json

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