maiass 5.9.56 → 5.10.2

package/lib/maiass-pipeline.js

@@ -454,12 +454,33 @@ function shouldTagRelease(versionBump, forceTag = false) {
 async function handleVersionManagement(branchInfo, mergeResult, options = {}) {
   const { versionBump, versionBumpExplicit = false, dryRun = false, tag = false, force = false, silent = false, originalGitInfo = null } = options;
   const { developBranch } = branchInfo;
-  
+
   logger.header(SYMBOLS.INFO, 'Version Management Phase');
-  
-  // Check if we have version files
+
+  // Must be on develop branch for version management — check before reading version files
+  const currentBranch = getCurrentBranch();
+  if (currentBranch !== developBranch) {
+    console.error(colors.Red(`${SYMBOLS.CROSS} Version management must be done on ${developBranch} branch`));
+    console.error(colors.Red(`${SYMBOLS.CROSS} Current branch: ${currentBranch}`));
+    return { success: false, error: `Not on ${developBranch} branch` };
+  }
+
+  // Pull latest develop from remote before reading version files.
+  // This ensures we bump from the correct base even if remote has been updated
+  // since our last fetch (e.g. a GH Actions bump from a recently merged PR).
+  if (remoteExists()) {
+    logger.info(SYMBOLS.PULLING, `Pulling latest ${developBranch} before version bump...`);
+    const pullResult = executeGitCommand(`git pull origin ${developBranch}`);
+    if (!pullResult.success) {
+      logger.error(SYMBOLS.CROSS, 'Git operation failed: pull before version bump');
+      logger.error(SYMBOLS.CROSS, 'Please resolve any conflicts and try again');
+      return { success: false, error: pullResult.error };
+    }
+  }
+
+  // Read version files after pull so we have the freshest version on disk
   const versionInfo = await getCurrentVersion();
-  
+
   if (!versionInfo.hasVersionFiles) {
     // Only warn if the user explicitly asked for a version bump
     if (versionBumpExplicit) {
@@ -468,15 +489,7 @@ async function handleVersionManagement(branchInfo, mergeResult, options = {}) {
     logger.debug('No version files — skipping version management');
     return { success: true, skipped: true };
   }
-  
-  // Must be on develop branch for version management
-  const currentBranch = getCurrentBranch();
-  if (currentBranch !== developBranch) {
-    console.error(colors.Red(`${SYMBOLS.CROSS} Version management must be done on ${developBranch} branch`));
-    console.error(colors.Red(`${SYMBOLS.CROSS} Current branch: ${currentBranch}`));
-    return { success: false, error: `Not on ${developBranch} branch` };
-  }
-  
+
   // Determine new version
   const newVersion = bumpVersion(versionInfo.current, versionBump);
   if (!newVersion) {

package/maiass.mjs

@@ -7,6 +7,19 @@ import { hideBin } from 'yargs/helpers';
 import { initLogger, logger } from './lib/logger.js';
 import { loadEnvironmentConfig, ensureConfigDirectories } from './lib/config.js';
 
+// If running from a subdirectory of a git repo, cd to the repo root first so
+// that .env.maiass is loaded from the right place and git operations are
+// consistent with the project root.
+import { execSync } from 'child_process';
+try {
+  const gitRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();
+  if (gitRoot && gitRoot !== process.cwd()) {
+    process.chdir(gitRoot);
+  }
+} catch {
+  // Not in a git repo — leave cwd as-is, pipeline will handle it gracefully
+}
+
 // Load environment variables from multiple sources with cross-platform support
 ensureConfigDirectories();
 const envConfig = loadEnvironmentConfig();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "maiass",
   "type": "module",
-  "version": "5.9.56",
+  "version": "5.10.2",
   "description": "AI commit message generator, semantic versioning, and changelog automation for Git. One command stages, commits with AI, bumps version, and merges branches. Free credits on install — no sign-up needed.",
   "main": "maiass.mjs",
   "bin": {