maiass 5.9.53 → 5.10.1

package/README.md

@@ -4,7 +4,7 @@
 **Modular AI-Augmented Semantic Scribe** — intelligent Git workflow automation
 
 [![npm](https://img.shields.io/npm/v/maiass.svg)](https://www.npmjs.com/package/maiass)
-[![Node.js](https://img.shields.io/badge/Node.js-18+-green.svg)](https://nodejs.org/)
+[![Node.js](https://img.shields.io/badge/Node.js-20+-green.svg)](https://nodejs.org/)
 [![License](https://img.shields.io/badge/License-GPL--3.0-blue.svg)](LICENSE)
 
 ---
@@ -21,7 +21,7 @@ MAIASS automates the repetitive parts of your Git workflow: staging, AI-powered
 npm install -g maiass
 ```
 
-Requires Node.js 18+.
+Requires Node.js 20+.
 
 ---
 
@@ -60,9 +60,9 @@ maiass config set MAIASS_AI_TOKEN your_api_key
 AI mode is configured per-project in `.env.maiass`:
 
 ```bash
-MAIASS_AI_COMMITS=ask        # ask each time (default)
-MAIASS_AI_COMMITS=always     # always use AI
-MAIASS_AI_COMMITS=off        # disable AI
+MAIASS_AI_MODE=ask        # ask each time (default)
+MAIASS_AI_MODE=autosuggest  # always use AI
+MAIASS_AI_MODE=off          # disable AI
 ```
 
 ---
@@ -73,7 +73,7 @@ MAIASS_AI_COMMITS=off        # disable AI
 - **Version management** — detects and bumps `package.json`, `composer.json`, `VERSION`, `.pbxproj` (Swift/Xcode), and more
 - **Changelog generation** — user-facing `CHANGELOG.md` and internal developer changelog
 - **Branch workflow** — feature → develop → staging → main with merge handling
-- **JIRA integration** — ticket numbers auto-detected from branch names
+- **Ticket integration** — ticket numbers auto-detected from branch names (Jira `ABC-123`, GitHub/Trello `#123` or `123`)
 - **First-run friendly** — works immediately with sensible defaults, no blocking setup
 
 ---
@@ -92,10 +92,10 @@ Run `maiass --setup` to configure a project interactively, or edit `.env.maiass`
 Common variables:
 
 ```bash
-MAIASS_AI_COMMITS=ask
-MAIASS_MODE=full                  # full or ai_only
-MAIASS_MAIN_BRANCH=main
-MAIASS_DEVELOP_BRANCH=develop
+MAIASS_AI_MODE=ask
+MAIASS_MAINBRANCH=main
+MAIASS_DEVELOPBRANCH=develop
+MAIASS_STAGINGBRANCH=staging
 MAIASS_VERSION_PRIMARY_FILE=package.json
 MAIASS_DEBUG=true                 # verbose output
 ```

package/lib/changelog.js

@@ -82,8 +82,8 @@ export async function updateChangelog(changelogPath = '.', version) {
     });
     
     const formattedCommits = commits.map(commit => {
-      // Remove JIRA ticket from start
-      const cleaned = commit.replace(/^\[?[A-Z]+-[0-9]+\]?[\s:—-]+/gm, '');
+      // Remove ticket prefix from start of each line: ABC-123, #123, 123
+      const cleaned = commit.replace(/^\[?(?:[A-Z]+-[0-9]+|#?\d+)\]?[\s:—-]+/gm, '');
       const lines = cleaned.split('\n').filter(l => l.trim());
       
       if (lines.length === 0) return '';

package/lib/git-info.js

@@ -88,13 +88,20 @@ export function getGitAuthor() {
 export function extractJiraTicket(branchName) {
   if (!branchName) return null;
 
-  // Match after the last slash
-  const afterSlash = branchName.match(/.*\/([A-Z]+-[0-9]+)/);
-  if (afterSlash) return afterSlash[1];
+  // Jira: ABC-123 — after last slash or at branch root
+  const jiraAfterSlash = branchName.match(/.*\/([A-Z]+-[0-9]+)/);
+  if (jiraAfterSlash) return jiraAfterSlash[1];
 
-  // Match at the beginning of the branch name
-  const atStart = branchName.match(/^([A-Z]+-[0-9]+)/);
-  if (atStart) return atStart[1];
+  const jiraAtStart = branchName.match(/^([A-Z]+-[0-9]+)/);
+  if (jiraAtStart) return jiraAtStart[1];
+
+  // Numeric with optional hash prefix: #123 or 123 — after last slash or at branch root
+  // Requires a dash/underscore after the number to avoid matching version segments (e.g. release/1.2.3)
+  const numericAfterSlash = branchName.match(/.*\/(#?\d+)[-_]/);
+  if (numericAfterSlash) return numericAfterSlash[1];
+
+  const numericAtStart = branchName.match(/^(#?\d+)[-_]/);
+  if (numericAtStart) return numericAtStart[1];
 
   return null;
 }

package/lib/maiass-command.js

@@ -1,7 +1,6 @@
 import { log, logger } from './logger.js';
 import { SYMBOLS } from './symbols.js';
 import { runMaiassPipeline } from './maiass-pipeline.js';
-import { createAnonymousSubscriptionIfNeeded } from './commit.js';
 import colors from './colors.js';
 
 /**
@@ -37,16 +36,6 @@ export async function handleMaiassCommand(args) {
   logger.header('', 'MAIASS - Modular AI-Assisted Semantic Scribe');
   
   try {
-    // Create anonymous subscription if needed (matches bashmaiass behavior).
-    // Skip in CI environments (GitHub Actions / any env with CI=true) — each runner
-    // has a different virtual MAC/disk, so every run would generate a new machine
-    // fingerprint and burn an anonymous subscription slot.
-    const aiMode = process.env.MAIASS_AI_MODE || 'ask';
-    const isCI = process.env.CI === 'true' || process.env.CI === '1';
-    if (aiMode !== 'off' && !isCI) {
-      await createAnonymousSubscriptionIfNeeded();
-    }
-    
     // Run the complete MAIASS pipeline
     const result = await runMaiassPipeline({
       commitsOnly,

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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "maiass",
   "type": "module",
-  "version": "5.9.53",
+  "version": "5.10.1",
   "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": {
@@ -26,7 +26,7 @@
     "LICENSE"
   ],
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "keywords": [
     "ai-commit",
@@ -69,11 +69,18 @@
     "build:nexe": "./scripts/advanced-build.sh nexe",
     "build:source": "./scripts/advanced-build.sh source",
     "build:legacy": "node build.js",
-    "test": "node test/test-runner.js"
+    "test": "node test/test-runner.js",
+    "test:unit": "vitest run",
+    "test:unit:watch": "vitest",
+    "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
     "chalk": "^5.4.1",
     "dotenv": "^16.4.5",
     "yargs": "^17.7.2"
+  },
+  "devDependencies": {
+    "@vitest/coverage-v8": "^4.1.4",
+    "vitest": "^4.1.4"
   }
 }