genbox 1.0.44 → 1.0.46

package/dist/commands/create.js

@@ -221,9 +221,9 @@ exports.createCommand = new commander_1.Command('create')
     .option('--db <mode>', 'Database mode: none, local, copy, remote')
     .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('-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('-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 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) => {
@@ -286,19 +286,19 @@ exports.createCommand = new commander_1.Command('create')
             }
             // Silently continue for other errors - the create API will validate
         }
-        // Validate branch options
+        // Determine branch configuration
+        // 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 configured default branch
         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;
+            sourceBranch = config.defaults?.branch || 'main';
+            console.log(chalk_1.default.dim(`  Source branch not specified, using '${sourceBranch}'`));
         }
-        // Auto-generate branch name if only -f is provided
-        let newBranchName = options.newBranch;
+        // If -f (--from-branch) is provided without -n (--new-branch), use env name as branch name
         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}`));
+            newBranchName = name;
+            console.log(chalk_1.default.dim(`  New branch name: ${newBranchName}`));
         }
         // Build create options
         const createOptions = {
@@ -312,7 +312,7 @@ exports.createCommand = new commander_1.Command('create')
             size: options.size,
             branch: options.branch,
             newBranch: newBranchName,
-            sourceBranch: options.fromBranch,
+            sourceBranch: sourceBranch,
             yes: options.yes,
             dryRun: options.dryRun,
         };
@@ -323,7 +323,21 @@ exports.createCommand = new commander_1.Command('create')
         // Interactive branch selection if no branch options were specified
         // Skip if: -b (existing branch), -f (new branch from source), -n (explicit new branch name), or -y (skip prompts)
         if (!options.branch && !options.fromBranch && !options.newBranch && !options.yes && resolved.repos.length > 0) {
-            resolved = await promptForBranchOptions(resolved, config);
+            resolved = await promptForBranchOptions(resolved, config, name);
+        }
+        // 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: baseBranch,
+                })),
+            };
+            console.log(chalk_1.default.dim(`  Creating new branch '${name}' from '${baseBranch}'`));
         }
         // Display resolved configuration
         displayResolvedConfig(resolved);
@@ -515,59 +529,51 @@ function displayResolvedConfig(resolved) {
 }
 /**
  * Prompt for branch options interactively
+ * Default behavior: create new branch from configured default (or 'main') with branch name = environment name
  */
-async function promptForBranchOptions(resolved, config) {
-    // Get the default branch from config or first repo
-    const defaultBranch = config.defaults?.branch || resolved.repos[0]?.branch || 'main';
+async function promptForBranchOptions(resolved, config, envName) {
+    // 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(chalk_1.default.dim(`Default branch: ${defaultBranch}`));
     console.log('');
     const branchChoice = await prompts.select({
         message: 'Branch option:',
         choices: [
             {
-                name: `Use default branch (${defaultBranch})`,
-                value: 'default',
+                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`,
+                value: 'new-custom',
             },
             {
-                name: 'Use a different existing branch',
+                name: 'Use an existing branch',
                 value: 'existing',
             },
             {
-                name: 'Create a new branch',
-                value: 'new',
+                name: `Use '${baseBranch}' directly without creating new branch`,
+                value: 'default',
             },
         ],
-        default: 'default',
+        default: 'new-from-default',
     });
-    if (branchChoice === 'default') {
-        // Keep resolved repos as-is
-        return resolved;
-    }
-    if (branchChoice === 'existing') {
-        const branchName = await prompts.input({
-            message: 'Enter branch name:',
-            default: defaultBranch,
-            validate: (value) => {
-                if (!value.trim())
-                    return 'Branch name is required';
-                return true;
-            },
-        });
-        // Update all repos with the selected branch
+    if (branchChoice === 'new-from-default') {
+        // Create new branch from configured default with name = environment name
         return {
             ...resolved,
             repos: resolved.repos.map(repo => ({
                 ...repo,
-                branch: branchName.trim(),
-                newBranch: undefined,
-                sourceBranch: undefined,
+                branch: envName,
+                newBranch: envName,
+                sourceBranch: baseBranch,
             })),
         };
     }
-    if (branchChoice === 'new') {
+    if (branchChoice === 'new-custom') {
         const newBranchName = await prompts.input({
             message: 'New branch name:',
+            default: envName,
             validate: (value) => {
                 if (!value.trim())
                     return 'Branch name is required';
@@ -578,7 +584,7 @@ async function promptForBranchOptions(resolved, config) {
         });
         const sourceBranch = await prompts.input({
             message: 'Create from branch:',
-            default: defaultBranch,
+            default: 'main',
             validate: (value) => {
                 if (!value.trim())
                     return 'Source branch is required';
@@ -596,6 +602,31 @@ async function promptForBranchOptions(resolved, config) {
             })),
         };
     }
+    if (branchChoice === 'existing') {
+        const branchName = await prompts.input({
+            message: 'Enter branch name:',
+            default: baseBranch,
+            validate: (value) => {
+                if (!value.trim())
+                    return 'Branch name is required';
+                return true;
+            },
+        });
+        // Update all repos with the selected branch
+        return {
+            ...resolved,
+            repos: resolved.repos.map(repo => ({
+                ...repo,
+                branch: branchName.trim(),
+                newBranch: undefined,
+                sourceBranch: undefined,
+            })),
+        };
+    }
+    if (branchChoice === 'default') {
+        // Keep resolved repos as-is (no new branch)
+        return resolved;
+    }
     return resolved;
 }
 /**
@@ -830,6 +861,7 @@ function buildPayload(resolved, config, publicKey, privateKey, configLoader) {
         gitToken: envVars.GIT_TOKEN,
         gitUserName: gitConfig.userName,
         gitUserEmail: gitConfig.userEmail,
+        installClaudeCode: config.defaults?.install_claude_code,
         envVars: resolved.env,
         apps: resolved.apps.map(a => a.name),
         appConfigs: resolved.apps.map(a => ({

package/dist/commands/init.js

@@ -665,12 +665,25 @@ exports.initCommand = new commander_1.Command('init')
             v4Config.defaults = {};
         }
         v4Config.defaults.size = serverSize;
-        // Get default branch (use detected branch or allow override)
+        // Ask about Claude Code installation
+        if (!nonInteractive && !options.fromScan) {
+            const installClaudeCode = await prompts.confirm({
+                message: 'Install Claude Code CLI on genbox servers?',
+                default: true,
+            });
+            if (installClaudeCode) {
+                v4Config.defaults.install_claude_code = true;
+            }
+        }
+        // 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.44",
+  "version": "1.0.46",
   "description": "Genbox CLI - AI-Powered Development Environments",
   "main": "dist/index.js",
   "bin": {