genbox 1.0.66 → 1.0.67

package/dist/commands/db-sync.js

@@ -227,10 +227,7 @@ exports.dbSyncCommand
                     uploadSpinner.succeed(chalk_1.default.green('Database snapshot uploaded'));
                     snapshotId = snapshotResult.snapshotId;
                     snapshotS3Key = snapshotResult.s3Key;
-                    // Only cleanup if we created the dump (not user-provided)
-                    if (!options.dump) {
-                        (0, db_utils_1.cleanupDump)(localDumpPath);
-                    }
+                    // Don't cleanup yet - we still need the file for SCP to genbox
                 }
                 else {
                     uploadSpinner.fail(chalk_1.default.red('Database snapshot upload failed'));
@@ -261,6 +258,9 @@ exports.dbSyncCommand
             if (!uploadResult.success) {
                 restoreSpinner.fail(chalk_1.default.red('Upload failed'));
                 console.error(chalk_1.default.red(`  Error: ${uploadResult.error}`));
+                if (localDumpPath && !options.dump) {
+                    (0, db_utils_1.cleanupDump)(localDumpPath);
+                }
                 return;
             }
             restoreSpinner.text = 'Restoring database...';
@@ -271,15 +271,26 @@ exports.dbSyncCommand
             if (!restoreResult.success) {
                 restoreSpinner.fail(chalk_1.default.red('Restore failed'));
                 console.error(chalk_1.default.red(`  Error: ${restoreResult.error}`));
+                if (localDumpPath && !options.dump) {
+                    (0, db_utils_1.cleanupDump)(localDumpPath);
+                }
                 return;
             }
             restoreSpinner.succeed(chalk_1.default.green('Database sync completed!'));
             console.log('');
             console.log(chalk_1.default.dim(`  Database has been restored from ${source} snapshot.`));
+            // Cleanup local dump file now that we're done
+            if (localDumpPath && !options.dump) {
+                (0, db_utils_1.cleanupDump)(localDumpPath);
+            }
         }
         catch (error) {
             restoreSpinner.fail(chalk_1.default.red('Database restore failed'));
             console.error(chalk_1.default.red(`  Error: ${error.message}`));
+            // Cleanup on error too
+            if (localDumpPath && !options.dump) {
+                (0, db_utils_1.cleanupDump)(localDumpPath);
+            }
         }
     }
     catch (error) {

package/dist/commands/rebuild.js

@@ -562,9 +562,10 @@ exports.rebuildCommand = new commander_1.Command('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: 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);
+        // If storedNewBranch exists, we need to re-create it - default sourceBranch to 'main' if not stored
+        const defaultSourceBranch = config.defaults?.branch || 'main';
+        const effectiveNewBranch = newBranchName || storedNewBranch;
+        const effectiveSourceBranch = options.fromBranch || (storedNewBranch ? (storedSourceBranch || defaultSourceBranch) : 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;

package/package.json

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