genbox 1.0.41 → 1.0.43

package/dist/commands/create.js

@@ -51,6 +51,20 @@ const ssh_config_1 = require("../ssh-config");
 const schema_v4_1 = require("../schema-v4");
 const child_process_1 = require("child_process");
 const random_name_1 = require("../random-name");
+// Credits consumed per hour for each size (matches API billing.config.ts)
+const CREDITS_PER_HOUR = {
+    cx22: 1,
+    cx32: 2,
+    cx42: 4,
+    cx52: 8,
+    small: 1,
+    medium: 2,
+    large: 4,
+    xl: 8,
+};
+function getCreditsPerHour(size) {
+    return CREDITS_PER_HOUR[size.toLowerCase()] || 2; // Default to medium
+}
 /**
  * Spawn a background process to poll for IP and add SSH config
  * This runs detached so the main process can exit immediately
@@ -296,11 +310,41 @@ exports.createCommand = new commander_1.Command('create')
         if (!selectedProfile && !options.yes && !options.dryRun) {
             await profileResolver.askSaveProfile(config, resolved);
         }
+        // Calculate credits that will be consumed
+        const creditsPerHour = getCreditsPerHour(resolved.size);
+        // Fetch user's current credit balance
+        let userCredits = 0;
+        let addonCredits = 0;
+        try {
+            const user = await (0, api_1.fetchApi)('/users/me');
+            userCredits = user.credits || 0;
+            addonCredits = user.addonCredits || 0;
+        }
+        catch {
+            // Continue without balance info if fetch fails
+        }
+        const totalCredits = userCredits + addonCredits;
+        const estimatedHours = totalCredits > 0 ? Math.floor(totalCredits / creditsPerHour) : 0;
+        // Display billing info
+        console.log(chalk_1.default.blue('=== Billing ==='));
+        console.log(`  Credits to start: ${chalk_1.default.yellow(creditsPerHour)} (${creditsPerHour} credit${creditsPerHour > 1 ? 's' : ''}/hr for ${resolved.size})`);
+        if (totalCredits > 0) {
+            console.log(`  Your balance: ${chalk_1.default.green(totalCredits)} credits${addonCredits > 0 ? chalk_1.default.dim(` (${userCredits} regular + ${addonCredits} addon)`) : ''}`);
+            console.log(`  After creation: ${chalk_1.default.cyan(totalCredits - creditsPerHour)} credits`);
+            console.log(`  Estimated runtime: ${chalk_1.default.cyan('~' + estimatedHours + ' hours')}`);
+        }
+        console.log('');
         // Dry run mode
         if (options.dryRun) {
             console.log(chalk_1.default.yellow('\nDry run mode - no genbox created'));
             return;
         }
+        // Check if user has enough credits
+        if (totalCredits < creditsPerHour) {
+            console.log(chalk_1.default.red(`Insufficient credits. Need ${creditsPerHour}, have ${totalCredits}.`));
+            console.log(chalk_1.default.dim('Run `genbox balance` to check your balance or purchase more credits.'));
+            return;
+        }
         // Confirm creation
         if (!options.yes) {
             const confirm = await prompts.confirm({
@@ -771,6 +815,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

@@ -514,11 +514,17 @@ async function editAppConfig(name, app, rootDir) {
             build_context: dockerContext,
             dockerfile: dockerfile || app.docker?.dockerfile,
         };
-        // Auto-set port from docker-compose
+        // 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 and not already set by docker-compose)
     if (newRunner !== 'none' && result.type !== 'library') {

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.41",
+  "version": "1.0.43",
   "description": "Genbox CLI - AI-Powered Development Environments",
   "main": "dist/index.js",
   "bin": {