genbox 1.0.74 → 1.0.76

package/dist/commands/extend.js

@@ -0,0 +1,78 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.extendCommand = void 0;
+const commander_1 = require("commander");
+const chalk_1 = __importDefault(require("chalk"));
+const ora_1 = __importDefault(require("ora"));
+const api_1 = require("../api");
+const genbox_selector_1 = require("../genbox-selector");
+exports.extendCommand = new commander_1.Command('extend')
+    .description('Extend genbox and reset inactivity timer')
+    .argument('[name]', 'Name of the Genbox (optional - will auto-select or prompt)')
+    .argument('[hours]', 'Hours to extend (default: 1)', '1')
+    .option('--no-auto-destroy', 'Disable auto-destroy on inactivity')
+    .option('--enable-auto-destroy', 'Re-enable auto-destroy on inactivity')
+    .action(async (name, hoursArg, options) => {
+    try {
+        const hours = parseInt(hoursArg, 10) || 1;
+        // Select genbox
+        const { genbox: target, cancelled } = await (0, genbox_selector_1.selectGenbox)(name, {
+            selectMessage: 'Select a genbox to extend:',
+        });
+        if (cancelled) {
+            console.log(chalk_1.default.dim('Cancelled.'));
+            return;
+        }
+        if (!target) {
+            return;
+        }
+        if (target.status !== 'running') {
+            console.error(chalk_1.default.red(`Error: Genbox '${target.name}' is not running (status: ${target.status})`));
+            return;
+        }
+        // Determine disableAutoDestroy value
+        let disableAutoDestroy;
+        if (options.autoDestroy === false) {
+            disableAutoDestroy = true; // --no-auto-destroy flag
+        }
+        else if (options.enableAutoDestroy) {
+            disableAutoDestroy = false; // --enable-auto-destroy flag
+        }
+        const spinner = (0, ora_1.default)(`Extending ${target.name}...`).start();
+        const result = await (0, api_1.fetchApi)(`/genboxes/${target._id}/extend`, {
+            method: 'POST',
+            body: JSON.stringify({
+                hours,
+                disableAutoDestroy,
+            }),
+        });
+        spinner.stop();
+        if (result.success) {
+            console.log(chalk_1.default.green(`✓ ${result.message}`));
+            if (result.currentHourEnd) {
+                const endTime = new Date(result.currentHourEnd);
+                const minutesUntil = Math.ceil((endTime.getTime() - Date.now()) / (60 * 1000));
+                console.log(chalk_1.default.dim(`  Current hour ends in: ${minutesUntil} minutes`));
+            }
+            console.log(chalk_1.default.dim(`  Auto-destroy: ${result.autoDestroyEnabled ? 'enabled' : 'disabled'}`));
+        }
+        else {
+            console.error(chalk_1.default.red(`Error: ${result.message}`));
+        }
+    }
+    catch (error) {
+        if (error.name === 'ExitPromptError' || error.message?.includes('force closed')) {
+            console.log('');
+            console.log(chalk_1.default.dim('Cancelled.'));
+            return;
+        }
+        if (error instanceof api_1.AuthenticationError) {
+            (0, api_1.handleApiError)(error);
+            return;
+        }
+        console.error(chalk_1.default.red(`Error: ${error.message}`));
+    }
+});

package/dist/commands/rebuild.js

@@ -337,12 +337,17 @@ async function runSoftRebuild(options) {
                 log(`Warning: Database restore failed: ${error.message}`, 'error');
             }
         }
-        // Step 8: Start PM2 services
+        // Step 8: Start PM2 services (only for apps with runner: pm2 or unspecified)
         onStep?.('Starting application services...');
         for (const app of resolved.apps) {
             const appConfig = config.apps[app.name];
             if (!appConfig)
                 continue;
+            // Skip apps with runner: docker - they're already running via Docker Compose
+            if (appConfig.runner === 'docker') {
+                log(`Skipping ${app.name} (runner: docker, already started via Docker Compose)`, 'dim');
+                continue;
+            }
             // Find the repo path for this app
             const appPath = appConfig.path || app.name;
             const repoPath = resolved.repos.find(r => r.name === app.name)?.path ||
@@ -362,11 +367,12 @@ async function runSoftRebuild(options) {
                 }
             }
             else {
-                // Check for start script in package.json
-                const hasStartScript = await sshExec(ip, keyPath, `grep -q '"start"' ${repoPath}/package.json 2>/dev/null && echo yes || echo no`, 10);
-                if (hasStartScript.output === 'yes') {
-                    log(`Starting ${app.name} with PM2 (npm start)...`, 'info');
-                    const pm2Result = await sshExecStream(ip, keyPath, `cd ${repoPath} && source ~/.nvm/nvm.sh && pm2 start npm --name ${app.name} -- start`, {
+                // Use configured dev command, or fall back to dev script, then start script
+                const devCommand = appConfig.commands?.dev;
+                if (devCommand) {
+                    // Use the configured dev command
+                    log(`Starting ${app.name} with PM2 (${devCommand})...`, 'info');
+                    const pm2Result = await sshExecStream(ip, keyPath, `cd ${repoPath} && source ~/.nvm/nvm.sh && pm2 start "pnpm run ${devCommand}" --name ${app.name}`, {
                         onStdout: (line) => log(line, 'dim'),
                         timeoutSecs: 60,
                     });
@@ -374,6 +380,34 @@ async function runSoftRebuild(options) {
                         log(`✓ Started ${app.name}`, 'success');
                     }
                 }
+                else {
+                    // Check for dev script in package.json first, then start
+                    const hasDevScript = await sshExec(ip, keyPath, `grep -q '"dev"' ${repoPath}/package.json 2>/dev/null && echo yes || echo no`, 10);
+                    if (hasDevScript.output === 'yes') {
+                        log(`Starting ${app.name} with PM2 (pnpm dev)...`, 'info');
+                        const pm2Result = await sshExecStream(ip, keyPath, `cd ${repoPath} && source ~/.nvm/nvm.sh && pm2 start "pnpm run dev" --name ${app.name}`, {
+                            onStdout: (line) => log(line, 'dim'),
+                            timeoutSecs: 60,
+                        });
+                        if (pm2Result.success) {
+                            log(`✓ Started ${app.name}`, 'success');
+                        }
+                    }
+                    else {
+                        // Fall back to start script
+                        const hasStartScript = await sshExec(ip, keyPath, `grep -q '"start"' ${repoPath}/package.json 2>/dev/null && echo yes || echo no`, 10);
+                        if (hasStartScript.output === 'yes') {
+                            log(`Starting ${app.name} with PM2 (pnpm start)...`, 'info');
+                            const pm2Result = await sshExecStream(ip, keyPath, `cd ${repoPath} && source ~/.nvm/nvm.sh && pm2 start "pnpm run start" --name ${app.name}`, {
+                                onStdout: (line) => log(line, 'dim'),
+                                timeoutSecs: 60,
+                            });
+                            if (pm2Result.success) {
+                                log(`✓ Started ${app.name}`, 'success');
+                            }
+                        }
+                    }
+                }
             }
         }
         // Step 9: Save PM2 process list

package/dist/index.js

@@ -30,6 +30,7 @@ const validate_1 = require("./commands/validate");
 const migrate_1 = require("./commands/migrate");
 const ssh_setup_1 = require("./commands/ssh-setup");
 const rebuild_1 = require("./commands/rebuild");
+const extend_1 = require("./commands/extend");
 program
     .addCommand(init_1.initCommand)
     .addCommand(create_1.createCommand)
@@ -52,5 +53,6 @@ program
     .addCommand(migrate_1.migrateCommand)
     .addCommand(migrate_1.deprecationsCommand)
     .addCommand(ssh_setup_1.sshSetupCommand)
-    .addCommand(rebuild_1.rebuildCommand);
+    .addCommand(rebuild_1.rebuildCommand)
+    .addCommand(extend_1.extendCommand);
 program.parse(process.argv);

package/package.json

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