genbox 1.0.45 → 1.0.46

package/dist/commands/create.js

@@ -223,7 +223,7 @@ exports.createCommand = new commander_1.Command('create')
     .option('-s, --size <size>', 'Server size: small, medium, large, xl')
     .option('-b, --branch <branch>', 'Use existing git branch (skips new branch creation)')
     .option('-n, --new-branch <name>', 'Create a new branch with this name (defaults to env name)')
-    .option('-f, --from-branch <branch>', 'Source branch to create new branch from (defaults to main)')
+    .option('-f, --from-branch <branch>', 'Source branch to create new branch from (defaults to config default or main)')
     .option('-y, --yes', 'Skip interactive prompts')
     .option('--dry-run', 'Show what would be created without actually creating')
     .action(async (nameArg, options) => {
@@ -287,13 +287,13 @@ exports.createCommand = new commander_1.Command('create')
             // Silently continue for other errors - the create API will validate
         }
         // Determine branch configuration
-        // Default: create new branch from 'main' with name = environment name
+        // Default: create new branch from configured default (or 'main') with name = environment name
         let newBranchName = options.newBranch;
         let sourceBranch = options.fromBranch;
-        // If -n (--new-branch) is provided without -f (--from-branch), default source to 'main'
+        // If -n (--new-branch) is provided without -f (--from-branch), default source to configured default branch
         if (options.newBranch && !options.fromBranch) {
-            sourceBranch = 'main';
-            console.log(chalk_1.default.dim(`  Source branch not specified, using 'main'`));
+            sourceBranch = config.defaults?.branch || 'main';
+            console.log(chalk_1.default.dim(`  Source branch not specified, using '${sourceBranch}'`));
         }
         // If -f (--from-branch) is provided without -n (--new-branch), use env name as branch name
         if (options.fromBranch && !options.newBranch) {
@@ -325,18 +325,19 @@ exports.createCommand = new commander_1.Command('create')
         if (!options.branch && !options.fromBranch && !options.newBranch && !options.yes && resolved.repos.length > 0) {
             resolved = await promptForBranchOptions(resolved, config, name);
         }
-        // Default behavior when -y (non-interactive) and no branch options: create new branch from main
+        // Default behavior when -y (non-interactive) and no branch options: create new branch from configured default
         if (!options.branch && !options.fromBranch && !options.newBranch && options.yes && resolved.repos.length > 0) {
+            const baseBranch = config.defaults?.branch || 'main';
             resolved = {
                 ...resolved,
                 repos: resolved.repos.map(repo => ({
                     ...repo,
                     branch: name, // Branch name same as environment name
                     newBranch: name,
-                    sourceBranch: 'main',
+                    sourceBranch: baseBranch,
                 })),
             };
-            console.log(chalk_1.default.dim(`  Creating new branch '${name}' from 'main'`));
+            console.log(chalk_1.default.dim(`  Creating new branch '${name}' from '${baseBranch}'`));
         }
         // Display resolved configuration
         displayResolvedConfig(resolved);
@@ -528,19 +529,19 @@ function displayResolvedConfig(resolved) {
 }
 /**
  * Prompt for branch options interactively
- * Default behavior: create new branch from 'main' with branch name = environment name
+ * Default behavior: create new branch from configured default (or 'main') with branch name = environment name
  */
 async function promptForBranchOptions(resolved, config, envName) {
-    // Get the default branch from config or first repo
-    const defaultBranch = config.defaults?.branch || resolved.repos[0]?.branch || 'main';
+    // Get the default/base branch from config (used as source for new branches)
+    const baseBranch = config.defaults?.branch || 'main';
     console.log(chalk_1.default.blue('=== Branch Configuration ==='));
     console.log('');
     const branchChoice = await prompts.select({
         message: 'Branch option:',
         choices: [
             {
-                name: `${chalk_1.default.green('Create new branch')} '${chalk_1.default.cyan(envName)}' from 'main' ${chalk_1.default.dim('(recommended)')}`,
-                value: 'new-from-main',
+                name: `${chalk_1.default.green('Create new branch')} '${chalk_1.default.cyan(envName)}' from '${baseBranch}' ${chalk_1.default.dim('(recommended)')}`,
+                value: 'new-from-default',
             },
             {
                 name: `Create new branch from a different source`,
@@ -551,21 +552,21 @@ async function promptForBranchOptions(resolved, config, envName) {
                 value: 'existing',
             },
             {
-                name: `Use default branch (${defaultBranch}) without creating new branch`,
+                name: `Use '${baseBranch}' directly without creating new branch`,
                 value: 'default',
             },
         ],
-        default: 'new-from-main',
+        default: 'new-from-default',
     });
-    if (branchChoice === 'new-from-main') {
-        // Create new branch from main with name = environment name
+    if (branchChoice === 'new-from-default') {
+        // Create new branch from configured default with name = environment name
         return {
             ...resolved,
             repos: resolved.repos.map(repo => ({
                 ...repo,
                 branch: envName,
                 newBranch: envName,
-                sourceBranch: 'main',
+                sourceBranch: baseBranch,
             })),
         };
     }
@@ -604,7 +605,7 @@ async function promptForBranchOptions(resolved, config, envName) {
     if (branchChoice === 'existing') {
         const branchName = await prompts.input({
             message: 'Enter branch name:',
-            default: defaultBranch,
+            default: baseBranch,
             validate: (value) => {
                 if (!value.trim())
                     return 'Branch name is required';

package/dist/commands/init.js

@@ -675,12 +675,15 @@ exports.initCommand = new commander_1.Command('init')
                 v4Config.defaults.install_claude_code = true;
             }
         }
-        // Get default branch (use detected branch or allow override)
+        // Get default/base branch (source branch for creating new environment branches)
         const detectedBranch = scan.git?.branch || 'main';
         let defaultBranch = detectedBranch;
         if (!nonInteractive && !options.fromScan) {
+            console.log('');
+            console.log(chalk_1.default.dim('  When creating environments, a new branch is created from this base branch.'));
+            console.log(chalk_1.default.dim('  The new branch name defaults to the environment name.'));
             const branchInput = await prompts.input({
-                message: 'Default branch for new environments:',
+                message: 'Base branch for new environment branches:',
                 default: detectedBranch,
             });
             defaultBranch = branchInput || detectedBranch;

package/dist/commands/scan.js

@@ -1132,7 +1132,7 @@ function showSummary(detected) {
     if (detected.git?.remote) {
         console.log(`\n  Git: ${detected.git.provider || 'git'} (${detected.git.type})`);
         console.log(`    Remote: ${chalk_1.default.dim(detected.git.remote)}`);
-        console.log(`    Branch: ${chalk_1.default.cyan(detected.git.branch || 'main')} ${chalk_1.default.dim('← default branch for new environments')}`);
+        console.log(`    Branch: ${chalk_1.default.cyan(detected.git.branch || 'main')} ${chalk_1.default.dim('← base branch for new environment branches')}`);
     }
     // Per-app git repos (for multi-repo workspaces)
     const appsWithGit = Object.entries(detected.apps).filter(([, app]) => app.git);

package/package.json

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