genbox 1.0.20 → 1.0.21

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,
         };

package/dist/commands/rebuild.js

@@ -424,8 +424,8 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
     .argument('<name>', 'Name of the Genbox to rebuild')
     .option('-p, --profile <profile>', 'Use a predefined profile')
     .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 {
@@ -459,13 +459,27 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
         }
         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 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 = `${name}-${timestamp}`;
+            console.log(chalk_1.default.dim(`  Auto-generated branch name: ${newBranchName}`));
+        }
         // Build options for resolving
         const createOptions = {
             name,
             profile: options.profile,
             branch: options.branch,
-            newBranch: options.newBranch,
-            sourceBranch: options.sourceBranch,
+            newBranch: newBranchName,
+            sourceBranch: options.fromBranch,
             yes: options.yes,
         };
         console.log(chalk_1.default.blue('Resolving configuration...'));

package/package.json

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