genbox 1.0.40 → 1.0.42

package/dist/commands/create.js

@@ -771,6 +771,8 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
             framework: a.framework,
             runner: a.runner,
             docker: a.docker,
+            healthcheck: a.healthcheck,
+            dependsOn: a.dependsOn,
             commands: a.commands,
         })),
         infrastructure: resolved.infrastructure.map(i => ({

package/dist/commands/init.js

@@ -583,8 +583,15 @@ exports.initCommand = new commander_1.Command('init')
                 console.log(`               ... and ${scan.apps.length - 5} more`);
             }
         }
-        if (scan.compose) {
-            console.log(`  ${chalk_1.default.dim('Docker:')}     ${scan.compose.applications.length} services`);
+        // Show Docker app count (apps with runner: 'docker')
+        const dockerApps = scan.apps.filter(a => a.runner === 'docker');
+        if (dockerApps.length > 0) {
+            console.log(`  ${chalk_1.default.dim('Docker:')}     ${dockerApps.length} app(s) with docker runner`);
+        }
+        // Show infrastructure services from docker-compose (databases, caches, etc.)
+        if (scan.compose && scan.compose.databases.length + scan.compose.caches.length + scan.compose.queues.length > 0) {
+            const infraCount = scan.compose.databases.length + scan.compose.caches.length + scan.compose.queues.length;
+            console.log(`  ${chalk_1.default.dim('Infra:')}      ${infraCount} infrastructure service(s)`);
         }
         if (scan.git) {
             console.log(`  ${chalk_1.default.dim('Git:')}        ${scan.git.remote} (${scan.git.type})`);
@@ -1886,24 +1893,28 @@ function convertDetectedToScan(detected) {
         lockfile: r.lockfile,
     }));
     // Convert infrastructure to compose analysis
+    // Note: docker_services is deprecated - apps with runner: 'docker' are now tracked per-app
     let compose = null;
     const hasInfra = detected.infrastructure && detected.infrastructure.length > 0;
-    const hasDockerServices = detected.docker_services && detected.docker_services.length > 0;
-    if (hasInfra || hasDockerServices) {
+    // Get docker apps from apps with runner: 'docker' (new approach)
+    const dockerApps = Object.entries(detected.apps || {})
+        .filter(([, app]) => app.runner === 'docker')
+        .map(([name, app]) => ({
+        name,
+        image: app.docker?.service || name,
+        build: app.docker?.build_context ? {
+            context: app.docker.build_context,
+            dockerfile: app.docker.dockerfile,
+        } : undefined,
+        ports: app.port ? [{ host: app.port, container: app.port }] : [],
+        environment: {},
+        dependsOn: app.depends_on || [],
+        volumes: [],
+    }));
+    if (hasInfra || dockerApps.length > 0) {
         compose = {
             files: ['docker-compose.yml'],
-            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: [],
-            })),
+            applications: dockerApps,
             databases: (detected.infrastructure || [])
                 .filter(i => i.type === 'database')
                 .map(i => ({

package/dist/commands/scan.js

@@ -330,15 +330,105 @@ async function interactiveEditMode(detected) {
         choices: appChoices,
     });
     // Edit each selected app
+    // Pass the scanned root dir for docker-compose lookup
+    const rootDir = detected._meta.scanned_root;
     for (const appName of appsToEdit) {
-        result.apps[appName] = await editAppConfig(appName, result.apps[appName]);
+        result.apps[appName] = await editAppConfig(appName, result.apps[appName], rootDir);
     }
     return result;
 }
+/**
+ * Look up service info from docker-compose.yml
+ */
+function getDockerComposeServiceInfo(rootDir, serviceName) {
+    const composeFiles = ['docker-compose.yml', 'docker-compose.yaml', 'compose.yml', 'compose.yaml'];
+    for (const filename of composeFiles) {
+        const composePath = path.join(rootDir, filename);
+        if (fs.existsSync(composePath)) {
+            try {
+                const content = fs.readFileSync(composePath, 'utf8');
+                const compose = yaml.load(content);
+                if (compose?.services?.[serviceName]) {
+                    const service = compose.services[serviceName];
+                    const info = {};
+                    // Parse port
+                    if (service.ports && service.ports.length > 0) {
+                        const portDef = service.ports[0];
+                        if (typeof portDef === 'string') {
+                            const parts = portDef.split(':');
+                            info.port = parseInt(parts[0], 10);
+                        }
+                        else if (typeof portDef === 'number') {
+                            info.port = portDef;
+                        }
+                        else if (portDef.published) {
+                            info.port = portDef.published;
+                        }
+                    }
+                    // Parse build context and dockerfile
+                    if (service.build) {
+                        if (typeof service.build === 'string') {
+                            info.buildContext = service.build;
+                        }
+                        else {
+                            info.buildContext = service.build.context;
+                            info.dockerfile = service.build.dockerfile;
+                        }
+                    }
+                    // Parse healthcheck
+                    if (service.healthcheck?.test) {
+                        const test = service.healthcheck.test;
+                        if (Array.isArray(test)) {
+                            // ["CMD", "curl", "-f", "http://localhost:3000/health"]
+                            const cmdIndex = test.indexOf('CMD') + 1 || test.indexOf('CMD-SHELL') + 1;
+                            if (cmdIndex > 0) {
+                                const healthCmd = test.slice(cmdIndex).join(' ');
+                                // Extract health endpoint from curl command
+                                const urlMatch = healthCmd.match(/https?:\/\/[^/]+(\S+)/);
+                                if (urlMatch) {
+                                    info.healthcheck = urlMatch[1];
+                                }
+                            }
+                        }
+                        else if (typeof test === 'string') {
+                            const urlMatch = test.match(/https?:\/\/[^/]+(\S+)/);
+                            if (urlMatch) {
+                                info.healthcheck = urlMatch[1];
+                            }
+                        }
+                    }
+                    // Parse depends_on
+                    if (service.depends_on) {
+                        if (Array.isArray(service.depends_on)) {
+                            info.dependsOn = service.depends_on;
+                        }
+                        else if (typeof service.depends_on === 'object') {
+                            info.dependsOn = Object.keys(service.depends_on);
+                        }
+                    }
+                    // Parse environment variables (names only)
+                    if (service.environment) {
+                        if (Array.isArray(service.environment)) {
+                            info.envVars = service.environment.map((e) => e.split('=')[0]);
+                        }
+                        else if (typeof service.environment === 'object') {
+                            info.envVars = Object.keys(service.environment);
+                        }
+                    }
+                    return info;
+                }
+            }
+            catch {
+                // Ignore parse errors
+            }
+        }
+    }
+    return undefined;
+}
 /**
  * Edit a single app's configuration
  */
-async function editAppConfig(name, app) {
+async function editAppConfig(name, app, rootDir) {
     console.log('');
     console.log(chalk_1.default.blue(`=== Editing: ${name} ===`));
     // Show current values
@@ -383,38 +473,78 @@ async function editAppConfig(name, app) {
         result.runner = newRunner;
         result.runner_reason = 'manually set';
     }
-    // If runner is docker, ask for docker config
+    // If runner is docker, ask for docker config and auto-detect from docker-compose
     if (newRunner === 'docker') {
+        // First ask for service name to look up in docker-compose
         const dockerService = await prompts.input({
             message: 'Docker service name:',
             default: app.docker?.service || name,
         });
+        // Look up service info from docker-compose.yml
+        const composeInfo = getDockerComposeServiceInfo(rootDir, dockerService);
+        if (composeInfo) {
+            console.log(chalk_1.default.blue('\n  Detected from docker-compose.yml:'));
+            if (composeInfo.buildContext)
+                console.log(chalk_1.default.dim(`    build context: ${composeInfo.buildContext}`));
+            if (composeInfo.dockerfile)
+                console.log(chalk_1.default.dim(`    dockerfile: ${composeInfo.dockerfile}`));
+            if (composeInfo.port)
+                console.log(chalk_1.default.dim(`    port: ${composeInfo.port}`));
+            if (composeInfo.healthcheck)
+                console.log(chalk_1.default.dim(`    healthcheck: ${composeInfo.healthcheck}`));
+            if (composeInfo.dependsOn?.length)
+                console.log(chalk_1.default.dim(`    depends_on: ${composeInfo.dependsOn.join(', ')}`));
+            if (composeInfo.envVars?.length)
+                console.log(chalk_1.default.dim(`    env vars: ${composeInfo.envVars.slice(0, 5).join(', ')}${composeInfo.envVars.length > 5 ? ` +${composeInfo.envVars.length - 5} more` : ''}`));
+            console.log('');
+        }
+        // Use detected values as defaults
+        const defaultContext = composeInfo?.buildContext || app.docker?.build_context || app.path || '.';
         const dockerContext = await prompts.input({
             message: 'Docker build context:',
-            default: app.docker?.build_context || app.path || '.',
+            default: defaultContext,
         });
+        const defaultDockerfile = composeInfo?.dockerfile || app.docker?.dockerfile;
+        const dockerfile = defaultDockerfile ? await prompts.input({
+            message: 'Dockerfile:',
+            default: defaultDockerfile,
+        }) : undefined;
         result.docker = {
             service: dockerService,
             build_context: dockerContext,
-            dockerfile: app.docker?.dockerfile,
+            dockerfile: dockerfile || app.docker?.dockerfile,
         };
+        // Auto-set values from docker-compose
+        if (composeInfo?.port) {
+            result.port = composeInfo.port;
+            result.port_source = 'docker-compose.yml';
+        }
+        if (composeInfo?.healthcheck) {
+            result.healthcheck = composeInfo.healthcheck;
+        }
+        if (composeInfo?.dependsOn?.length) {
+            result.depends_on = composeInfo.dependsOn;
+        }
     }
-    // Edit port (only if not a library)
+    // Edit port (only if not a library and not already set by docker-compose)
     if (newRunner !== 'none' && result.type !== 'library') {
+        // For docker runner, only ask if port wasn't auto-detected
+        const currentPort = result.port;
+        const portDefault = currentPort ? String(currentPort) : '';
         const portInput = await prompts.input({
-            message: 'Port (leave empty to skip):',
-            default: app.port ? String(app.port) : '',
+            message: currentPort ? `Port (detected: ${currentPort}, press Enter to keep):` : 'Port (leave empty to skip):',
+            default: portDefault,
         });
         if (portInput) {
             const portNum = parseInt(portInput, 10);
             if (!isNaN(portNum) && portNum > 0 && portNum < 65536) {
-                result.port = portNum;
-                if (portNum !== app.port) {
+                if (portNum !== currentPort) {
+                    result.port = portNum;
                     result.port_source = 'manually set';
                 }
             }
         }
-        else {
+        else if (!currentPort) {
             result.port = undefined;
             result.port_source = undefined;
         }

package/dist/profile-resolver.js

@@ -242,6 +242,8 @@ class ProfileResolver {
         const v4Config = appConfig;
         const runner = v4Config.runner;
         const docker = v4Config.docker;
+        const healthcheck = v4Config.healthcheck;
+        const dependsOn = v4Config.depends_on;
         return {
             name: appName,
             path: appConfig.path,
@@ -253,6 +255,8 @@ class ProfileResolver {
             env: appConfig.env,
             runner,
             docker,
+            healthcheck,
+            dependsOn,
             dependencies,
         };
     }

package/package.json

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