genbox 1.0.20 → 1.0.22

package/dist/commands/create.js

@@ -110,8 +110,8 @@ exports.createCommand = new commander_1.Command('create')
     .option('--db-source <source>', 'Database source: staging, production')
     .option('-s, --size <size>', 'Server size: small, medium, large, xl')
     .option('-b, --branch <branch>', 'Git branch to checkout')
-    .option('-nb, --new-branch <name>', 'Create a new branch with this name')
-    .option('-sb, --source-branch <branch>', 'Source branch to create new branch from (defaults to current/default branch)')
+    .option('-n, --new-branch <name>', 'Create a new branch with this name')
+    .option('-f, --from-branch <branch>', 'Source branch to create new branch from (defaults to current/default branch)')
     .option('-y, --yes', 'Skip interactive prompts')
     .option('--dry-run', 'Show what would be created without actually creating')
     .action(async (name, options) => {
@@ -128,6 +128,20 @@ exports.createCommand = new commander_1.Command('create')
         // Support both v3 and v4 configs
         const config = loadResult.config;
         const profileResolver = new profile_resolver_1.ProfileResolver(configLoader);
+        // Validate branch options
+        if (options.newBranch && !options.fromBranch) {
+            console.error(chalk_1.default.red('Error: --new-branch (-n) requires --from-branch (-f) to specify the source branch'));
+            console.log(chalk_1.default.dim('  Example: genbox create my-env -n feature/new -f main'));
+            return;
+        }
+        // Auto-generate branch name if only -f is provided
+        let newBranchName = options.newBranch;
+        if (options.fromBranch && !options.newBranch) {
+            // Generate unique branch name: {genbox-name}-{short-timestamp}
+            const timestamp = Date.now().toString(36); // Short alphanumeric timestamp
+            newBranchName = `${name}-${timestamp}`;
+            console.log(chalk_1.default.dim(`  Auto-generated branch name: ${newBranchName}`));
+        }
         // Build create options
         const createOptions = {
             name,
@@ -139,8 +153,8 @@ exports.createCommand = new commander_1.Command('create')
             dbSource: options.dbSource,
             size: options.size,
             branch: options.branch,
-            newBranch: options.newBranch,
-            sourceBranch: options.sourceBranch,
+            newBranch: newBranchName,
+            sourceBranch: options.fromBranch,
             yes: options.yes,
             dryRun: options.dryRun,
         };
@@ -627,6 +641,11 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
             mode: i.mode,
         })),
         database: resolved.database,
+        // Configuration tracking (for rebuild)
+        profile: resolved.profile,
+        branch: resolved.repos[0]?.branch,
+        newBranch: resolved.repos[0]?.newBranch,
+        sourceBranch: resolved.repos[0]?.sourceBranch,
     };
 }
 /**

package/dist/commands/rebuild.js

@@ -47,6 +47,7 @@ const os = __importStar(require("os"));
 const config_loader_1 = require("../config-loader");
 const profile_resolver_1 = require("../profile-resolver");
 const api_1 = require("../api");
+const genbox_selector_1 = require("../genbox-selector");
 const schema_v4_1 = require("../schema-v4");
 function getPublicSshKey() {
     const home = os.homedir();
@@ -76,10 +77,6 @@ function getPrivateSshKey() {
     }
     return undefined;
 }
-async function findGenboxByName(name) {
-    const genboxes = await (0, api_1.fetchApi)('/genboxes');
-    return genboxes.find((g) => g.name === name);
-}
 async function rebuildGenbox(id, payload) {
     return (0, api_1.fetchApi)(`/genboxes/${id}/rebuild`, {
         method: 'POST',
@@ -421,34 +418,48 @@ async function promptForBranchOptions(resolved, config) {
 }
 exports.rebuildCommand = new commander_1.Command('rebuild')
     .description('Rebuild an existing Genbox environment with updated configuration')
-    .argument('<name>', 'Name of the Genbox to rebuild')
+    .argument('[name]', 'Name of the Genbox to rebuild (optional - will prompt if not provided)')
     .option('-p, --profile <profile>', 'Use a predefined profile')
+    .option('-a, --all', 'Select from all genboxes (not just current project)')
     .option('-b, --branch <branch>', 'Git branch to checkout')
-    .option('-nb, --new-branch <name>', 'Create a new branch with this name')
-    .option('-sb, --source-branch <branch>', 'Source branch to create new branch from')
+    .option('-n, --new-branch <name>', 'Create a new branch with this name')
+    .option('-f, --from-branch <branch>', 'Source branch to create new branch from')
     .option('-y, --yes', 'Skip interactive prompts')
     .action(async (name, options) => {
     try {
-        // Find existing genbox
-        const spinner = (0, ora_1.default)(`Finding Genbox '${name}'...`).start();
-        let genbox;
-        try {
-            genbox = await findGenboxByName(name);
-        }
-        catch (error) {
-            spinner.fail(chalk_1.default.red(`Failed to find Genbox: ${error.message}`));
-            if (error instanceof api_1.AuthenticationError) {
-                console.log('');
-                console.log(chalk_1.default.yellow('  Please authenticate first:'));
-                console.log(chalk_1.default.cyan('  $ genbox login'));
-            }
+        // Select genbox (interactive if no name provided)
+        const { genbox, cancelled } = await (0, genbox_selector_1.selectGenbox)(name, {
+            all: options.all,
+            selectMessage: 'Select a genbox to rebuild:',
+        });
+        if (cancelled) {
+            console.log(chalk_1.default.dim('Cancelled.'));
             return;
         }
         if (!genbox) {
-            spinner.fail(chalk_1.default.red(`Genbox '${name}' not found`));
             return;
         }
-        spinner.succeed(`Found Genbox '${name}'`);
+        const selectedName = genbox.name;
+        // Check if genbox has stored configuration (profile/apps/branch)
+        const storedProfile = genbox.profile;
+        const storedApps = genbox.apps && genbox.apps.length > 0 ? genbox.apps : null;
+        const storedBranch = genbox.branch;
+        const storedNewBranch = genbox.newBranch;
+        const storedSourceBranch = genbox.sourceBranch;
+        if (storedProfile || storedApps || storedBranch) {
+            console.log(chalk_1.default.dim(`Using stored configuration from '${selectedName}':`));
+            if (storedProfile)
+                console.log(chalk_1.default.dim(`  Profile: ${storedProfile}`));
+            if (storedApps)
+                console.log(chalk_1.default.dim(`  Apps: ${storedApps.join(', ')}`));
+            if (storedNewBranch) {
+                console.log(chalk_1.default.dim(`  Branch: ${storedNewBranch} (created from ${storedSourceBranch || 'main'})`));
+            }
+            else if (storedBranch) {
+                console.log(chalk_1.default.dim(`  Branch: ${storedBranch}`));
+            }
+            console.log('');
+        }
         // Load configuration
         const configLoader = new config_loader_1.ConfigLoader();
         const loadResult = await configLoader.load();
@@ -459,26 +470,50 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
         }
         const config = loadResult.config;
         const profileResolver = new profile_resolver_1.ProfileResolver(configLoader);
-        // Build options for resolving
+        // Validate branch options
+        if (options.newBranch && !options.fromBranch) {
+            console.error(chalk_1.default.red('Error: --new-branch (-n) requires --from-branch (-f) to specify the source branch'));
+            console.log(chalk_1.default.dim('  Example: genbox rebuild my-env -n feature/new -f main'));
+            return;
+        }
+        // Auto-generate branch name if only -f is provided
+        let newBranchName = options.newBranch;
+        if (options.fromBranch && !options.newBranch) {
+            // Generate unique branch name: {genbox-name}-{short-timestamp}
+            const timestamp = Date.now().toString(36);
+            newBranchName = `${selectedName}-${timestamp}`;
+            console.log(chalk_1.default.dim(`  Auto-generated branch name: ${newBranchName}`));
+        }
+        // Use stored profile/apps/branch if available and not overridden by CLI options
+        const effectiveProfile = options.profile || storedProfile;
+        const effectiveApps = storedApps; // Use stored apps for rebuild
+        // For branch: CLI options override, then stored newBranch (if it was created), then stored branch
+        const effectiveBranch = options.branch || storedNewBranch || storedBranch;
+        // For new branch creation: only use CLI options (user must explicitly request new branch on rebuild)
+        const effectiveNewBranch = newBranchName;
+        const effectiveSourceBranch = options.fromBranch;
+        // Build options for resolving - use stored config, skip interactive prompts
         const createOptions = {
-            name,
-            profile: options.profile,
-            branch: options.branch,
-            newBranch: options.newBranch,
-            sourceBranch: options.sourceBranch,
-            yes: options.yes,
+            name: selectedName,
+            profile: effectiveProfile,
+            apps: effectiveApps || undefined, // Pre-select stored apps
+            branch: effectiveBranch,
+            newBranch: effectiveNewBranch,
+            sourceBranch: effectiveSourceBranch,
+            // Skip interactive prompts if we have stored config
+            yes: options.yes || !!(storedProfile || storedApps),
         };
         console.log(chalk_1.default.blue('Resolving configuration...'));
         console.log('');
         let resolved = await profileResolver.resolve(config, createOptions);
-        // Interactive branch selection if no branch was specified
-        if (!options.branch && !options.newBranch && !options.yes && resolved.repos.length > 0) {
+        // Interactive branch selection only if no branch specified and no stored branch
+        if (!options.branch && !storedBranch && !options.newBranch && !options.yes && resolved.repos.length > 0) {
             resolved = await promptForBranchOptions(resolved, config);
         }
         // Display what will be rebuilt
         console.log(chalk_1.default.bold('Rebuild Configuration:'));
         console.log(chalk_1.default.dim('───────────────────────────────────────────────'));
-        console.log(`  ${chalk_1.default.bold('Name:')}     ${name}`);
+        console.log(`  ${chalk_1.default.bold('Name:')}     ${selectedName}`);
         console.log(`  ${chalk_1.default.bold('Project:')}  ${resolved.project.name}`);
         if (resolved.profile) {
             console.log(`  ${chalk_1.default.bold('Profile:')}  ${resolved.profile}`);
@@ -509,7 +544,7 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
             console.log(chalk_1.default.yellow('All unsaved work on the server will be lost.'));
             console.log('');
             const confirm = await prompts.confirm({
-                message: `Rebuild genbox '${name}'?`,
+                message: `Rebuild genbox '${selectedName}'?`,
                 default: false,
             });
             if (!confirm) {
@@ -539,15 +574,15 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
         // Build payload
         const payload = buildRebuildPayload(resolved, config, publicKey, privateKeyContent, configLoader);
         // Execute rebuild
-        const rebuildSpinner = (0, ora_1.default)(`Rebuilding Genbox '${name}'...`).start();
+        const rebuildSpinner = (0, ora_1.default)(`Rebuilding Genbox '${selectedName}'...`).start();
         try {
             await rebuildGenbox(genbox._id, payload);
-            rebuildSpinner.succeed(chalk_1.default.green(`Genbox '${name}' rebuild initiated!`));
+            rebuildSpinner.succeed(chalk_1.default.green(`Genbox '${selectedName}' rebuild initiated!`));
             console.log('');
             console.log(chalk_1.default.dim('Server is rebuilding. This may take a few minutes.'));
             console.log(chalk_1.default.dim('SSH connection will be temporarily unavailable.'));
             console.log('');
-            console.log(`Run ${chalk_1.default.cyan(`genbox status ${name}`)} to check progress.`);
+            console.log(`Run ${chalk_1.default.cyan(`genbox status ${selectedName}`)} to check progress.`);
         }
         catch (error) {
             rebuildSpinner.fail(chalk_1.default.red(`Failed to rebuild: ${error.message}`));

package/package.json

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