maiass 5.8.9 → 5.8.10

package/lib/bootstrap.js

@@ -158,6 +158,11 @@ export async function bootstrapProject() {
   // Step 7: Save configuration
   await saveConfiguration(config);
   
+  // Step 8: Initialize branch structure if needed (full mode only)
+  if (config.features === 'full') {
+    await initializeBranchStructure(config.branches);
+  }
+  
   console.log('');
   log.success(SYMBOLS.CHECKMARK, 'Project setup complete!');
   log.info(SYMBOLS.INFO, 'You can modify these settings anytime by editing .env.maiass');
@@ -534,6 +539,119 @@ MAIASS_STAGINGBRANCH=${config.branches.staging}
   await ensureGitignore();
 }
 
+/**
+ * Step 8: Initialize branch structure for new repositories
+ */
+async function initializeBranchStructure(branchConfig) {
+  const { execSync } = await import('child_process');
+  
+  // Check if we're in a git repo
+  try {
+    execSync('git rev-parse --is-inside-work-tree', { stdio: 'pipe' });
+  } catch {
+    // Not a git repo, skip
+    return;
+  }
+  
+  // Check if there are any commits
+  let hasCommits = false;
+  try {
+    execSync('git rev-parse HEAD', { stdio: 'pipe' });
+    hasCommits = true;
+  } catch {
+    // No commits yet
+    hasCommits = false;
+  }
+  
+  // If there are already commits, check if develop branch exists
+  if (hasCommits) {
+    try {
+      execSync(`git rev-parse --verify ${branchConfig.develop}`, { stdio: 'pipe' });
+      // Develop branch exists, nothing to do
+      return;
+    } catch {
+      // Develop branch doesn't exist, offer to create it
+      console.log('');
+      console.log(colors.BCyan('🌿 Branch Structure Setup'));
+      console.log('');
+      console.log(`${SYMBOLS.INFO} Your repository has commits but no ${colors.BGreen(branchConfig.develop)} branch.`);
+      console.log(`${SYMBOLS.INFO} MAIASS works best with a ${colors.BGreen(branchConfig.develop)} branch for version management.`);
+      console.log('');
+      
+      const createBranch = await getSingleCharInput(`Create ${branchConfig.develop} branch from current branch? [Y/n]: `);
+      if (createBranch !== 'n') {
+        try {
+          execSync(`git checkout -b ${branchConfig.develop}`, { stdio: 'inherit' });
+          log.success(SYMBOLS.CHECKMARK, `Created and switched to ${colors.BGreen(branchConfig.develop)} branch`);
+        } catch (error) {
+          log.warning(SYMBOLS.WARNING, `Could not create ${branchConfig.develop} branch: ${error.message}`);
+        }
+      }
+      return;
+    }
+  }
+  
+  // No commits yet - this is a brand new repo
+  console.log('');
+  console.log(colors.BCyan('🌿 Branch Structure Setup'));
+  console.log('');
+  console.log(`${SYMBOLS.INFO} This appears to be a new repository with no commits yet.`);
+  console.log(`${SYMBOLS.INFO} MAIASS can set up the recommended branch structure for you:`);
+  console.log('');
+  console.log(`  1. Create initial commit on ${colors.BGreen(branchConfig.main)} branch`);
+  console.log(`  2. Create ${colors.BGreen(branchConfig.develop)} branch from ${branchConfig.main}`);
+  console.log(`  3. Switch to ${colors.BGreen(branchConfig.develop)} for development`);
+  console.log('');
+  console.log(colors.Gray('This ensures MAIASS has the proper branch structure for version management.'));
+  console.log('');
+  
+  const setupBranches = await getSingleCharInput('Set up branch structure now? [Y/n]: ');
+  if (setupBranches === 'n') {
+    log.info(SYMBOLS.INFO, 'Skipping branch setup. You can create branches manually later.');
+    return;
+  }
+  
+  try {
+    // Check if we're on a branch or in detached HEAD
+    let currentBranch;
+    try {
+      currentBranch = execSync('git rev-parse --abbrev-ref HEAD', { encoding: 'utf8', stdio: 'pipe' }).trim();
+    } catch {
+      currentBranch = null;
+    }
+    
+    // If not on a branch or on wrong branch, create/switch to main
+    if (!currentBranch || currentBranch === 'HEAD' || currentBranch !== branchConfig.main) {
+      log.info(SYMBOLS.INFO, `Creating ${colors.BGreen(branchConfig.main)} branch...`);
+      execSync(`git checkout -b ${branchConfig.main}`, { stdio: 'pipe' });
+    }
+    
+    // Create initial commit with the config files
+    log.info(SYMBOLS.INFO, 'Creating initial commit...');
+    execSync('git add .env.maiass .env.maiass.local .gitignore', { stdio: 'pipe' });
+    execSync('git commit -m "Initial commit: MAIASS configuration"', { stdio: 'inherit' });
+    log.success(SYMBOLS.CHECKMARK, `Initial commit created on ${colors.BGreen(branchConfig.main)}`);
+    
+    // Create develop branch
+    log.info(SYMBOLS.INFO, `Creating ${colors.BGreen(branchConfig.develop)} branch...`);
+    execSync(`git checkout -b ${branchConfig.develop}`, { stdio: 'pipe' });
+    log.success(SYMBOLS.CHECKMARK, `Created and switched to ${colors.BGreen(branchConfig.develop)} branch`);
+    
+    console.log('');
+    log.success(SYMBOLS.CHECKMARK, 'Branch structure initialized successfully!');
+    log.info(SYMBOLS.INFO, `You are now on the ${colors.BGreen(branchConfig.develop)} branch and ready to start development.`);
+    
+  } catch (error) {
+    console.log('');
+    log.warning(SYMBOLS.WARNING, 'Could not automatically set up branch structure');
+    log.info(SYMBOLS.INFO, 'You can create branches manually:');
+    console.log(`  ${colors.Gray(`git checkout -b ${branchConfig.main}`)}`);
+    console.log(`  ${colors.Gray('git add .')}`);
+    console.log(`  ${colors.Gray('git commit -m "Initial commit"')}`);
+    console.log(`  ${colors.Gray(`git checkout -b ${branchConfig.develop}`)}`);
+  }
+}
+
 /**
  * Ensure .gitignore includes necessary patterns
  */

package/lib/maiass-pipeline.js

@@ -551,6 +551,12 @@ async function handleMergeToDevelop(branchInfo, commitResult, options = {}) {
   const { force = false, silent = false, originalGitInfo = null, autoSwitch = true, versionBump = null, tag = false } = options;
   const { currentBranch, developBranch, originalBranch } = branchInfo;
   
+  // If no current branch (new repo with no commits), skip merge
+  if (!currentBranch || currentBranch === 'null') {
+    log.blue(SYMBOLS.INFO, 'New repository with no branch yet, skipping merge workflow');
+    return { success: true, skipped: true, newRepo: true };
+  }
+  
   // If we're already on develop or this was commits-only, skip merge
   if (currentBranch === developBranch || originalBranch === developBranch) {
     log.blue(SYMBOLS.INFO, `Already on ${developBranch} branch, skipping merge`);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "maiass",
   "type": "module",
-  "version": "5.8.9",
+  "version": "5.8.10",
   "description": "MAIASS - Modular AI-Augmented Semantic Scribe - Intelligent Git workflow automation",
   "main": "maiass.mjs",
   "bin": {