maiass 5.10.2 → 5.10.5

package/lib/ci-templates.js

@@ -0,0 +1,92 @@
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import colors from './colors.js';
+import { SYMBOLS } from './symbols.js';
+
+// Resolve the templates directory relative to this file (works after npm install -g)
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const TEMPLATES_DIR = path.join(__dirname, '..', 'templates', 'ci');
+
+/**
+ * Copy a CI template file to the target path in the current project.
+ * Creates intermediate directories if needed.
+ * Prompts before overwriting an existing file.
+ */
+function copyTemplate(templateFile, targetPath, label) {
+  const src = path.join(TEMPLATES_DIR, templateFile);
+
+  // Verify the template exists in the package
+  if (!fs.existsSync(src)) {
+    console.error(colors.Red(`${SYMBOLS.CROSS} Template not found: ${src}`));
+    console.error(colors.Gray('This may indicate a broken installation — try: npm install -g maiass'));
+    process.exit(1);
+  }
+
+  // Warn rather than silently overwrite
+  if (fs.existsSync(targetPath)) {
+    console.warn(colors.Yellow(`${SYMBOLS.WARNING} ${targetPath} already exists — skipping.`));
+    console.warn(colors.Gray(`  Delete it first if you want a fresh copy.`));
+    return;
+  }
+
+  // Create parent directories (e.g. .github/workflows/)
+  fs.mkdirSync(path.dirname(targetPath), { recursive: true });
+  fs.copyFileSync(src, targetPath);
+
+  console.log(colors.BGreen(`${SYMBOLS.CHECKMARK} Created ${targetPath}`));
+  console.log(colors.Gray(`  ${label}`));
+}
+
+/**
+ * Print a template to stdout so the user can copy it manually.
+ * Used for Bitbucket where the file location varies per project.
+ */
+function showTemplate(templateFile, label) {
+  const src = path.join(TEMPLATES_DIR, templateFile);
+
+  if (!fs.existsSync(src)) {
+    console.error(colors.Red(`${SYMBOLS.CROSS} Template not found: ${src}`));
+    process.exit(1);
+  }
+
+  console.log(colors.BGreen(`\n${label}\n`));
+  console.log(colors.Gray('─'.repeat(60)));
+  console.log(fs.readFileSync(src, 'utf8'));
+  console.log(colors.Gray('─'.repeat(60)));
+  console.log(colors.Gray('Copy the above into your bitbucket-pipelines.yml\n'));
+}
+
+/**
+ * Handle --create-gh-action
+ * Copies the GitHub Actions version-bump workflow into .github/workflows/
+ */
+export function createGithubAction() {
+  copyTemplate(
+    'github-version-bump.yml',
+    path.join(process.cwd(), '.github', 'workflows', 'maiass-version-bump.yml'),
+    'Next: add a GH_PAT secret in your repo → Settings → Secrets → Actions'
+  );
+}
+
+/**
+ * Handle --show-gl-excerpt
+ * Prints the GitLab CI excerpt to stdout — users merge it into their existing .gitlab-ci.yml
+ */
+export function showGitlabExcerpt() {
+  showTemplate(
+    'gitlab-ci-excerpt.yml',
+    'MAIASS — GitLab CI excerpt (merge into your .gitlab-ci.yml)'
+  );
+}
+
+/**
+ * Handle --show-bb-excerpt
+ * Prints the Bitbucket Pipelines excerpt to stdout — users merge it into their existing bitbucket-pipelines.yml
+ */
+export function showBitbucketExcerpt() {
+  showTemplate(
+    'bitbucket-pipelines-excerpt.yml',
+    'MAIASS — Bitbucket Pipelines excerpt (merge into your bitbucket-pipelines.yml)'
+  );
+}

package/lib/maiass-pipeline.js

@@ -15,6 +15,7 @@ import { handleVersionCommand } from './version-command.js';
 import { getSingleCharInput, getLineInput } from './input-utils.js';
 import { updateChangelog as updateChangelogNew } from './changelog.js';
 import { displayHeader } from './header.js';
+import { checkForUpdates } from './update-check.js';
 import { execSync } from 'child_process';
 import path from 'path';
 import fs from 'fs';
@@ -723,81 +724,6 @@ async function handleReleaseBranchWorkflow(newVersion, versionInfo, developBranc
   }
 }
 
-/**
- * Check for MAIASS version updates from npm registry
- * @param {string} currentVersion - Current version to compare against
- * @returns {Promise<Object>} Update check result
- */
-async function checkForUpdates(currentVersion) {
-  try {
-    // Set a timeout to prevent hanging
-    const controller = new AbortController();
-    const timeoutId = setTimeout(() => controller.abort(), 3000); // 3 second timeout
-
-    const response = await fetch('https://registry.npmjs.org/maiass-dev', {
-      headers: {
-        'Accept': 'application/vnd.npm.install-v1+json',
-        'User-Agent': 'MAIASS-Version-Checker'
-      },
-      signal: controller.signal
-    });
-
-    clearTimeout(timeoutId);
-
-    if (!response.ok) {
-      return { updateAvailable: false, error: `HTTP ${response.status}` };
-    }
-
-    const registryData = await response.json();
-    const latestVersion = registryData['dist-tags']?.latest;
-    const releaseUrl = 'https://www.npmjs.com/package/maiass-dev';
-
-    if (!latestVersion) {
-      return { updateAvailable: false, error: 'No latest version found in npm registry' };
-    }
-
-    // Simple version comparison (assumes semantic versioning)
-    const current = currentVersion.split('.').map(num => parseInt(num, 10));
-    const latest = latestVersion.split('.').map(num => parseInt(num, 10));
-
-    let updateAvailable = false;
-    for (let i = 0; i < Math.max(current.length, latest.length); i++) {
-      const currentPart = current[i] || 0;
-      const latestPart = latest[i] || 0;
-      if (latestPart > currentPart) {
-        updateAvailable = true;
-        break;
-      } else if (latestPart < currentPart) {
-        break;
-      }
-    }
-
-    return {
-      updateAvailable,
-      currentVersion,
-      latestVersion,
-      releaseUrl,
-      error: null
-    };
-  } catch (error) {
-    // Handle timeout and other errors gracefully
-    const errorMsg = error.name === 'AbortError' ? 'Request timeout' : error.message;
-    return { updateAvailable: false, error: errorMsg };
-  }
-}
-
-/**
- * Display version information and update status
- * @param {string} currentVersion - Current MAIASS version
- */
-async function displayVersionInfo(currentVersion) {
-  // Display current version
-  logger.info(SYMBOLS.INFO, `MAIASS ${colors.Cyan(currentVersion)}`);
-  
-  // Note: Update checking is disabled for nodemaiass as it's in active development
-  // and not following npm registry releases. Bashmaiass uses Homebrew for updates.
-  // TODO: Re-enable when nodemaiass is published to npm with stable releases
-}
 
 /**
  * Main MAIASS pipeline orchestrator
@@ -818,6 +744,10 @@ export async function runMaiassPipeline(options = {}) {
   
   // Display branded header with MAIASS's own version (not project version)
   displayHeader(MAIASS_VERSION);
+
+  // Kick off update check in the background immediately so the network request
+  // runs concurrently with the rest of the pipeline — result shown at the end
+  const updateCheckPromise = checkForUpdates(MAIASS_VERSION);
   
   // Get git info early to show current branch
   const originalGitInfo = getGitInfo();
@@ -944,7 +874,15 @@ export async function runMaiassPipeline(options = {}) {
       const topupEndpoint = process.env.MAIASS_TOPUP_ENDPOINT || 'https://maiass.net/top-up';
       console.log(`${colors.BMagenta('Credit top-up link:')} ${colors.Blue(`${topupEndpoint}/${subscriptionId}`)}`);
     }
-    
+
+    // Show update notice if a newer version was found (check started at pipeline top)
+    const updateInfo = await updateCheckPromise;
+    if (updateInfo.updateAvailable) {
+      console.log('');
+      console.log(colors.Yellow(`  ⬆  Update available: ${updateInfo.currentVersion} → ${updateInfo.latestVersion}`));
+      console.log(colors.Gray(`     Run: npm install -g maiass`));
+    }
+
     return {
       success: true,
       branchInfo,

package/lib/update-check.js

@@ -0,0 +1,53 @@
+/**
+ * Check npm registry for a newer version of maiass.
+ * Resolves quickly (3s timeout) and never throws — callers can fire-and-forget.
+ *
+ * @param {string} currentVersion - The currently running version (e.g. "5.10.3")
+ * @param {Function} [fetchFn] - Optional fetch override for testing
+ * @returns {Promise<{updateAvailable: boolean, currentVersion: string, latestVersion?: string, error?: string}>}
+ */
+export async function checkForUpdates(currentVersion, fetchFn = fetch) {
+  try {
+    const controller = new AbortController();
+    const timeoutId = setTimeout(() => controller.abort(), 3000); // 3s timeout
+
+    const response = await fetchFn('https://registry.npmjs.org/maiass', {
+      headers: {
+        'Accept': 'application/vnd.npm.install-v1+json',
+        'User-Agent': 'MAIASS-Version-Checker'
+      },
+      signal: controller.signal
+    });
+
+    clearTimeout(timeoutId);
+
+    if (!response.ok) {
+      return { updateAvailable: false, currentVersion, error: `HTTP ${response.status}` };
+    }
+
+    const data = await response.json();
+    const latestVersion = data['dist-tags']?.latest;
+
+    if (!latestVersion) {
+      return { updateAvailable: false, currentVersion, error: 'No latest version in registry' };
+    }
+
+    // Semantic version comparison — compares each part left to right
+    const current = currentVersion.split('.').map(n => parseInt(n, 10));
+    const latest  = latestVersion.split('.').map(n => parseInt(n, 10));
+
+    let updateAvailable = false;
+    for (let i = 0; i < Math.max(current.length, latest.length); i++) {
+      const c = current[i] || 0;
+      const l = latest[i]  || 0;
+      if (l > c) { updateAvailable = true; break; }
+      if (l < c) { break; }
+    }
+
+    return { updateAvailable, currentVersion, latestVersion };
+
+  } catch (error) {
+    const msg = error.name === 'AbortError' ? 'Request timeout' : error.message;
+    return { updateAvailable: false, currentVersion, error: msg };
+  }
+}

package/maiass.mjs

@@ -12,7 +12,7 @@ import { loadEnvironmentConfig, ensureConfigDirectories } from './lib/config.js'
 // consistent with the project root.
 import { execSync } from 'child_process';
 try {
-  const gitRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8' }).trim();
+  const gitRoot = execSync('git rev-parse --show-toplevel', { encoding: 'utf8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
   if (gitRoot && gitRoot !== process.cwd()) {
     process.chdir(gitRoot);
   }
@@ -52,6 +52,7 @@ import { handleMaiassCommand } from './lib/maiass-command.js';
 import { handleAccountInfoCommand } from './lib/account-info.js';
 import { SYMBOLS } from './lib/symbols.js';
 import { bootstrapProject } from './lib/bootstrap.js';
+import { createGithubAction, showGitlabExcerpt, showBitbucketExcerpt } from './lib/ci-templates.js';
 
 // Simple CLI setup for pkg compatibility
 const args = process.argv.slice(2);
@@ -130,7 +131,10 @@ const validFlags = [
   '--force', '-f',
   '--silent', '-s',
   '--json',
-  '--tag', '-t'
+  '--tag', '-t',
+  '--create-gh-action',
+  '--show-gl-excerpt',
+  '--show-bb-excerpt'
 ];
 
 // Check for unrecognized flags
@@ -187,9 +191,18 @@ if (args.includes('--help') || args.includes('-h') || command === 'help') {
   console.log('  --dry-run          Run without making changes');
   console.log('  --force            Skip confirmation prompts');
   console.log('  --silent           Suppress non-essential output');
+  console.log('\nCI Setup:');
+  console.log('  --create-gh-action Create .github/workflows/maiass-version-bump.yml');
+  console.log('  --show-gl-excerpt  Print GitLab CI excerpt to stdout (merge into .gitlab-ci.yml)');
+  console.log('  --show-bb-excerpt  Print Bitbucket Pipelines excerpt to stdout');
   process.exit(0);
 }
 
+// CI template commands — these run and exit immediately, no pipeline needed
+if (args.includes('--create-gh-action')) { createGithubAction(); process.exit(0); }
+if (args.includes('--show-gl-excerpt'))  { showGitlabExcerpt(); process.exit(0); }
+if (args.includes('--show-bb-excerpt'))  { showBitbucketExcerpt(); process.exit(0); }
+
 // Command routing (wrapped in async IIFE to handle async commands)
 (async () => {
   // --setup/--bootstrap: run the full interactive wizard and exit

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "maiass",
   "type": "module",
-  "version": "5.10.2",
+  "version": "5.10.5",
   "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": {
@@ -20,6 +20,7 @@
   },
   "files": [
     "lib/",
+    "templates/",
     "maiass.mjs",
     "setup-env.js",
     "README.md",

package/templates/ci/bitbucket-pipelines-excerpt.yml

@@ -0,0 +1,43 @@
+# MAIASS — Bitbucket Pipelines: Auto Version Bump on Push to Develop
+#
+# What this does:
+#   Runs `maiass -a patch` whenever a commit lands on your develop branch
+#   (including merged pull requests). Bumps the patch version, commits, and pushes.
+#
+# ⚠️  Double-bump caveat:
+#   Unlike GitHub Actions, Bitbucket Pipelines cannot trigger exclusively on
+#   PR merge events — it fires on every push to the branch, including the
+#   version bump commit itself. The script below guards against this by checking
+#   the last commit message. If it looks like a MAIASS version bump, it exits early.
+#
+# Setup:
+#   1. Merge this excerpt into your bitbucket-pipelines.yml (or use as-is)
+#   2. In Bitbucket: Repository Settings → Pipelines → SSH Keys
+#      Add a key pair and grant write access, OR use an app password:
+#        - Create an app password with Repositories: Read & Write scope
+#        - Add it as a repository variable named BB_APP_PASSWORD (secured)
+#        - Add your Bitbucket username as BB_USERNAME
+#   3. Set MAIASS_DEVELOPBRANCH in your .env.maiass if your branch isn't 'develop'
+
+pipelines:
+  branches:
+    develop:  # Change to match your MAIASS_DEVELOPBRANCH if different
+      - step:
+          name: MAIASS Version Bump
+          image: node:20
+          script:
+            # Guard: skip if last commit was already a version bump
+            - |
+              LAST_MSG=$(git log -1 --pretty=format:'%s')
+              if echo "$LAST_MSG" | grep -qiE '^Bumped version'; then
+                echo "Version bump commit detected — skipping to avoid loop."
+                exit 0
+              fi
+            - npm install -g maiass --no-fund --no-audit
+            - git config user.name "Bitbucket Pipelines"
+            - git config user.email "pipelines@bitbucket.org"
+            # Authenticate push via app password
+            - git remote set-url origin "https://${BB_USERNAME}:${BB_APP_PASSWORD}@bitbucket.org/${BITBUCKET_REPO_FULL_NAME}.git"
+            - maiass -a patch
+          variables:
+            MAIASS_AI_MODE: "off"  # Disable AI — no credits used in CI

package/templates/ci/github-version-bump.yml

@@ -0,0 +1,66 @@
+# MAIASS — GitHub Actions: Auto Version Bump on PR Merge
+#
+# What this does:
+#   When a pull request is merged into your develop branch, this workflow
+#   automatically runs `maiass -a patch` to bump the patch version, commit
+#   the change, and push it back to develop.
+#
+# Setup:
+#   1. Copy this file to .github/workflows/maiass-version-bump.yml in your repo
+#   2. Create a fine-grained Personal Access Token (PAT) with:
+#        - Contents: Read & Write
+#        - Metadata: Read-only
+#        - Workflows: Read & Write
+#   3. Add the PAT as a repository secret named GH_PAT
+#   4. Set MAIASS_DEVELOPBRANCH in your .env.maiass if your branch isn't 'develop'
+#
+# Notes:
+#   - AI is disabled (MAIASS_AI_MODE: off) so no credits are used
+#   - The workflow reads MAIASS_DEVELOPBRANCH from your .env.maiass automatically
+#   - maiass pulls the latest develop before bumping to prevent stale version conflicts
+
+name: Version Bump on PR Merge
+
+on:
+  pull_request:
+    types: [closed]
+    branches:
+      - develop  # Change this to match your MAIASS_DEVELOPBRANCH if different
+
+jobs:
+  bump-version:
+    # Only run when the PR was actually merged (not just closed)
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write  # Required to push the version bump commit
+
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0          # Full history needed for changelog generation
+          token: ${{ secrets.GH_PAT }}  # PAT allows the bot to push back to the repo
+
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+          cache: 'npm'
+
+      - name: Install maiass
+        run: npm install -g maiass --no-fund --no-audit
+
+      - name: Configure git
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+
+      # Explicitly check out the develop branch head (the pull_request closed
+      # event checks out a merge ref, not the branch itself)
+      - name: Checkout develop
+        run: git checkout develop
+
+      - name: Bump version
+        run: maiass -a patch
+        env:
+          MAIASS_AI_MODE: off  # Disable AI — no credits used in CI

package/templates/ci/gitlab-ci-excerpt.yml

@@ -0,0 +1,42 @@
+# MAIASS — GitLab CI: Auto Version Bump on Merge to Develop
+#
+# What this does:
+#   Runs `maiass -a patch` whenever a commit lands on your develop branch
+#   (including merge requests). Bumps the patch version, commits, and pushes.
+#
+# Setup:
+#   1. Merge this excerpt into your existing .gitlab-ci.yml, or use it as-is
+#   2. In GitLab: Settings → Repository → Protected branches → allow pipelines to push
+#   3. Create a project access token or personal access token with write access
+#   4. Add it as a CI/CD variable named GITLAB_TOKEN (masked, protected)
+#   5. Set MAIASS_DEVELOPBRANCH in your .env.maiass if your branch isn't 'develop'
+#
+# Double-bump protection:
+#   The script checks the last commit author and skips if it was already made
+#   by the CI bot — preventing an infinite loop of version bumps.
+
+stages:
+  - version
+
+maiass-version-bump:
+  stage: version
+  image: node:20
+  only:
+    - develop  # Change to match your MAIASS_DEVELOPBRANCH if different
+  script:
+    # Skip if the last commit was already a version bump from this pipeline
+    - |
+      LAST_AUTHOR=$(git log -1 --pretty=format:'%an')
+      LAST_MSG=$(git log -1 --pretty=format:'%s')
+      if echo "$LAST_AUTHOR" | grep -q "GitLab CI" || echo "$LAST_MSG" | grep -qiE '^Bumped version'; then
+        echo "Version bump commit detected — skipping to avoid loop."
+        exit 0
+      fi
+    - npm install -g maiass --no-fund --no-audit
+    - git config user.name "GitLab CI"
+    - git config user.email "ci@gitlab.com"
+    # Authenticate push via HTTPS using the project token
+    - git remote set-url origin "https://oauth2:${GITLAB_TOKEN}@${CI_SERVER_HOST}/${CI_PROJECT_PATH}.git"
+    - maiass -a patch
+  variables:
+    MAIASS_AI_MODE: "off"  # Disable AI — no credits used in CI