genbox 1.0.56 → 1.0.58

package/dist/commands/rebuild.js

@@ -278,6 +278,26 @@ function buildRebuildPayload(resolved, config, publicKey, privateKey, configLoad
         gitToken: envVars.GIT_TOKEN,
     };
 }
+/**
+ * Validate git configuration and warn about missing credentials
+ */
+function validateGitCredentials(repos, gitToken, privateKey) {
+    const warnings = [];
+    const errors = [];
+    for (const repo of repos) {
+        const isHttps = repo.url.startsWith('https://');
+        const isSsh = repo.url.startsWith('git@') || repo.url.includes('ssh://');
+        const isPrivateRepo = repo.url.includes('github.com') && !repo.url.includes('/public/');
+        if (isHttps && !gitToken && isPrivateRepo) {
+            warnings.push(`Repository '${repo.name}' uses HTTPS URL but GIT_TOKEN is not set.`);
+            warnings.push(`  Add GIT_TOKEN=<your-github-token> to .env.genbox for private repos.`);
+        }
+        if (isSsh && !privateKey) {
+            warnings.push(`Repository '${repo.name}' uses SSH URL but no SSH key was injected.`);
+        }
+    }
+    return { warnings, errors };
+}
 /**
  * Generate setup script
  */
@@ -494,9 +514,10 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
         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;
+        // For new branch creation: use CLI options OR stored values (to re-create branch if first attempt failed)
+        // If storedNewBranch exists with storedSourceBranch, the branch may not have been created yet
+        const effectiveNewBranch = newBranchName || (storedNewBranch && storedSourceBranch ? storedNewBranch : undefined);
+        const effectiveSourceBranch = options.fromBranch || (storedNewBranch && storedSourceBranch ? storedSourceBranch : undefined);
         // For database: use CLI option, or stored database config (convert 'snapshot' to 'copy')
         const storedDbMode = genbox.database?.mode === 'snapshot' ? 'copy' : genbox.database?.mode;
         const effectiveDbMode = options.db || storedDbMode;
@@ -708,6 +729,32 @@ exports.rebuildCommand = new commander_1.Command('rebuild')
                 }
             }
         }
+        // Validate git credentials before rebuilding
+        const envVarsForValidation = configLoader.loadEnvVars(process.cwd());
+        const gitValidation = validateGitCredentials(resolved.repos.map(r => ({ url: r.url, name: r.name })), envVarsForValidation.GIT_TOKEN, privateKeyContent);
+        if (gitValidation.warnings.length > 0) {
+            console.log('');
+            console.log(chalk_1.default.yellow('⚠ Git Authentication Warnings:'));
+            for (const warning of gitValidation.warnings) {
+                console.log(chalk_1.default.yellow(`  ${warning}`));
+            }
+            console.log('');
+            if (!options.yes) {
+                const proceed = await prompts.confirm({
+                    message: 'Git clone may fail without credentials. Continue anyway?',
+                    default: false,
+                });
+                if (!proceed) {
+                    console.log(chalk_1.default.dim('Cancelled. Add GIT_TOKEN to .env.genbox and try again.'));
+                    return;
+                }
+            }
+            else {
+                console.log(chalk_1.default.red('Error: Missing git credentials with --yes flag'));
+                console.log(chalk_1.default.dim('Add GIT_TOKEN=<your-github-token> to .env.genbox'));
+                return;
+            }
+        }
         // Build payload
         const payload = buildRebuildPayload(resolved, config, publicKey, privateKeyContent, configLoader);
         // Add database info to payload if we have a snapshot

package/package.json

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