genbox 1.0.87 → 1.0.89

package/dist/commands/create.js

@@ -826,11 +826,12 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
             }
         }
     }
-    // Add setup script if generated
+    // Add env setup script if generated (processes .env.genbox for multi-app projects)
+    // Named setup-env.sh to avoid conflict with API's setup-genbox.sh
     const setupScript = generateSetupScript(resolved, config, envFilesToMove);
     if (setupScript) {
         files.push({
-            path: '/home/dev/setup-genbox.sh',
+            path: '/home/dev/setup-env.sh',
             content: setupScript,
             permissions: '0755',
         });

package/dist/commands/status.js

@@ -391,20 +391,28 @@ exports.statusCommand = new commander_1.Command('status')
                     sshAvailable = true;
                     // Check if cloud-init is still running
                     if (status.includes('running')) {
-                        // Calculate total elapsed from genbox creation time (DB timestamp)
+                        // Calculate total elapsed including local setup time (DB dump+upload)
                         const createdAt = target.createdAt;
-                        const totalElapsedSecs = createdAt
+                        const localSetupDuration = target.localSetupDuration || 0;
+                        // Time since genbox was created in DB
+                        const sinceCreationSecs = createdAt
                             ? Math.floor((Date.now() - new Date(createdAt).getTime()) / 1000)
                             : Math.floor((Date.now() - startTime) / 1000); // Fallback to CLI start time
+                        // Total elapsed = local setup + time since creation
+                        const totalElapsedSecs = localSetupDuration + sinceCreationSecs;
                         console.log(chalk_1.default.yellow(`[INFO] Setup in progress... (elapsed: ${formatDuration(totalElapsedSecs)})`));
                         console.log('');
                         // Show timing breakdown
                         const timing = getTimingBreakdown(target.ipAddress, keyPath);
-                        if (timing.total !== null || createdAt) {
+                        if (timing.total !== null || createdAt || localSetupDuration > 0) {
                             console.log(chalk_1.default.blue('[INFO] === Timing Breakdown ==='));
-                            // Provisioning time = total elapsed - server uptime
+                            // Local setup time (DB dump + upload)
+                            if (localSetupDuration > 0) {
+                                console.log(`  Local Setup:   ${formatDuration(localSetupDuration)} (DB dump+upload)`);
+                            }
+                            // Provisioning time = time since creation - server uptime
                             if (timing.total !== null && createdAt) {
-                                const provisioningSecs = Math.max(0, totalElapsedSecs - timing.total);
+                                const provisioningSecs = Math.max(0, sinceCreationSecs - timing.total);
                                 console.log(`  Provisioning:  ${formatDuration(provisioningSecs)} (before boot)`);
                             }
                             if (timing.total !== null) {
@@ -490,12 +498,18 @@ exports.statusCommand = new commander_1.Command('status')
             }
             // Cloud-init still running
             if (status.includes('running')) {
-                // Calculate total elapsed from genbox creation time (DB timestamp)
+                // Calculate total elapsed including local setup time (DB dump+upload)
                 const createdAt = target.createdAt;
+                const localSetupDuration = target.localSetupDuration || 0;
                 const timing = getTimingBreakdown(target.ipAddress, keyPath);
-                const totalElapsedSecs = createdAt
+                // Time since genbox was created in DB
+                const sinceCreationSecs = createdAt
                     ? Math.floor((Date.now() - new Date(createdAt).getTime()) / 1000)
                     : timing.total; // Fallback to server uptime
+                // Total elapsed = local setup + time since creation
+                const totalElapsedSecs = sinceCreationSecs !== null
+                    ? localSetupDuration + sinceCreationSecs
+                    : null;
                 if (totalElapsedSecs !== null) {
                     console.log(chalk_1.default.yellow(`[INFO] Setup in progress... (elapsed: ${formatDuration(totalElapsedSecs)})`));
                 }
@@ -504,11 +518,15 @@ exports.statusCommand = new commander_1.Command('status')
                 }
                 console.log('');
                 // Show timing breakdown
-                if (timing.total !== null || createdAt) {
+                if (timing.total !== null || createdAt || localSetupDuration > 0) {
                     console.log(chalk_1.default.blue('[INFO] === Timing Breakdown ==='));
-                    // Provisioning time = total elapsed - server uptime
-                    if (timing.total !== null && totalElapsedSecs !== null) {
-                        const provisioningSecs = Math.max(0, totalElapsedSecs - timing.total);
+                    // Local setup time (DB dump + upload)
+                    if (localSetupDuration > 0) {
+                        console.log(`  Local Setup:   ${formatDuration(localSetupDuration)} (DB dump+upload)`);
+                    }
+                    // Provisioning time = time since creation - server uptime
+                    if (timing.total !== null && sinceCreationSecs !== null) {
+                        const provisioningSecs = Math.max(0, sinceCreationSecs - timing.total);
                         console.log(`  Provisioning:  ${formatDuration(provisioningSecs)} (before boot)`);
                     }
                     if (timing.total !== null) {

package/package.json

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