maiass 5.9.21 → 5.9.22

package/lib/commit.js

@@ -252,6 +252,9 @@ async function createAnonymousSubscriptionIfNeeded() {
       if (subscriptionId) {
         process.env.MAIASS_SUBSCRIPTION_ID = subscriptionId;
       }
+      if (credits !== undefined && credits !== null) {
+        process.env.MAIASS_CREDITS_REMAINING = String(credits);
+      }
       
       return apiKey;
     }
@@ -539,6 +542,11 @@ ${gitDiff}`;
           log.info(SYMBOLS.INFO, `Total Tokens: ${totalTokens} (${promptTokens} + ${completionTokens})`);
         }
         
+        // Keep env updated so pipeline end can always read current balance
+        if (creditsRemaining !== undefined) {
+          process.env.MAIASS_CREDITS_REMAINING = String(creditsRemaining);
+        }
+
         return {
           suggestion,
           creditsUsed,
@@ -694,15 +702,6 @@ async function getCommitMessage(gitInfo, options = {}) {
     if (aiResult && aiResult.suggestion) {
       aiSuggestion = aiResult.suggestion;
       
-      // Display credits used and remaining (matching bashmaiass)
-      if (aiResult.creditsUsed !== undefined) {
-        log.branded(`Credits used: ${aiResult.creditsUsed}`, colors.White);
-      }
-      if (aiResult.creditsRemaining !== undefined) {
-        const creditColor = getCreditColor(aiResult.creditsRemaining);
-        console.log(`${colors.BSoftPink('|))')} ${creditColor(`${aiResult.creditsRemaining} Credits left`)}`);
-      }
-      
       // Display AI suggestion with gradient lines (matching bashmaiass)
       console.log(`${colors.BSoftPink('|))')} ${colors.BMagenta('Commit message suggestion from MAIASS:')}`);
       printGradientLine(60);

package/lib/maiass-command.js

@@ -25,7 +25,10 @@ export async function handleMaiassCommand(args) {
   if (positionalArgs.length > 0 && !bumpType) {
     bumpType = positionalArgs[0];
   }
-  
+
+  // Track whether the user explicitly requested a version bump
+  const versionBumpExplicit = !!bumpType;
+
   // Default to 'patch' if no version bump specified and not commits-only
   if (!bumpType && !commitsOnly) {
     bumpType = 'patch';
@@ -46,6 +49,7 @@ export async function handleMaiassCommand(args) {
       commitsOnly,
       autoStage,
       versionBump: bumpType,
+      versionBumpExplicit,
       dryRun,
       tag,
       force,

package/lib/maiass-pipeline.js

@@ -452,7 +452,7 @@ function shouldTagRelease(versionBump, forceTag = false) {
  * @returns {Promise<Object>} Version management result
  */
 async function handleVersionManagement(branchInfo, mergeResult, options = {}) {
-  const { versionBump, dryRun = false, tag = false, force = false, silent = false, originalGitInfo = null } = 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');
@@ -461,8 +461,11 @@ async function handleVersionManagement(branchInfo, mergeResult, options = {}) {
   const versionInfo = await getCurrentVersion();
   
   if (!versionInfo.hasVersionFiles) {
-    log.warning(SYMBOLS.WARNING, 'No version files detected');
-    log.blue(SYMBOLS.INFO, 'Skipping version management');
+    // Only warn if the user explicitly asked for a version bump
+    if (versionBumpExplicit) {
+      log.warning(SYMBOLS.WARNING, 'No version files detected');
+    }
+    logger.debug('No version files — skipping version management');
     return { success: true, skipped: true };
   }
   
@@ -793,6 +796,7 @@ export async function runMaiassPipeline(options = {}) {
     commitsOnly = false,
     autoStage = false,
     versionBump = null,
+    versionBumpExplicit = false,
     dryRun = false,
     tag = false,
     force = false,
@@ -883,13 +887,14 @@ export async function runMaiassPipeline(options = {}) {
     
     // Phase 4: Version Management
     log.blue(SYMBOLS.INFO, 'Phase 4: Version Management');
-    const versionResult = await handleVersionManagement(branchInfo, mergeResult, { 
-      versionBump, 
-      dryRun, 
-      tag, 
-      force, 
+    const versionResult = await handleVersionManagement(branchInfo, mergeResult, {
+      versionBump,
+      versionBumpExplicit,
+      dryRun,
+      tag,
+      force,
       silent,
-      originalGitInfo 
+      originalGitInfo
     });
     
     if (!versionResult.success) {
@@ -904,30 +909,27 @@ export async function runMaiassPipeline(options = {}) {
     // Match bashmaiass colors: green checkmark, aqua text, bold white branch
     console.log(`${colors.BSoftPink('|))')}  ${colors.BGreen('✅ Done!')} ${colors.Aqua('You are on')} ${colors.BWhite(finalBranch)} ${colors.Aqua('branch')}`);
     
-    // Display credit summary if AI was used
-    const subscriptionId = process.env.MAIASS_SUBSCRIPTION_ID;
-    if (commitResult && commitResult.aiUsed) {
-      console.log('📊 Credit Summary:');
-      if (commitResult.creditsUsed) {
-        console.log(`   Credits used this session: ${colors.SoftPink(commitResult.creditsUsed)} (${commitResult.aiModel || 'gpt-3.5-turbo'})`);
-      }
-      if (commitResult.creditsRemaining !== undefined) {
-        const creditColor = getCreditColor(commitResult.creditsRemaining);
-        console.log(`${creditColor(`Credits remaining: ${commitResult.creditsRemaining}`)}`);
-      }
-      console.log('');
-    }
-    
-    // Display thank you message with top-up link
+    // Display thank you message
     console.log(colors.Cyan('═'.repeat(40)));
     console.log(`${colors.BSoftPink('|))')}  Thank you for using MAIASS! ✨`);
     console.log(colors.Cyan('═'.repeat(40)));
-    
-    // Show top-up link if we have a subscription ID
+
+    // Show credit balance — use post-AI value if available, else initial subscription value
+    const subscriptionId = process.env.MAIASS_SUBSCRIPTION_ID;
+    const creditsRemaining = commitResult?.creditsRemaining ?? (
+      process.env.MAIASS_CREDITS_REMAINING !== undefined
+        ? parseFloat(process.env.MAIASS_CREDITS_REMAINING)
+        : undefined
+    );
+    if (creditsRemaining !== undefined) {
+      const creditColor = getCreditColor(creditsRemaining);
+      console.log(`${creditColor(`💳 Credits remaining: ${creditsRemaining}`)}`);
+    }
+
+    // Show top-up link for anonymous subscriptions
     if (subscriptionId && subscriptionId.startsWith('sub_anon_')) {
-      console.log(`💳 ${colors.BMagenta('Need more credits?')}`);
       const topupEndpoint = process.env.MAIASS_TOPUP_ENDPOINT || 'https://maiass.net/top-up';
-      console.log(colors.Blue(`${topupEndpoint}/${subscriptionId}`));
+      console.log(`${colors.BMagenta('Credit top-up link:')} ${colors.Blue(`${topupEndpoint}/${subscriptionId}`)}`);
     }
     
     return {

package/maiass.mjs

@@ -38,7 +38,7 @@ import { handleVersionCommand } from './lib/version-command.js';
 import { handleMaiassCommand } from './lib/maiass-command.js';
 import { handleAccountInfoCommand } from './lib/account-info.js';
 import { SYMBOLS } from './lib/symbols.js';
-import { bootstrapProject, needsBootstrap } from './lib/bootstrap.js';
+import { bootstrapProject } from './lib/bootstrap.js';
 
 // Simple CLI setup for pkg compatibility
 const args = process.argv.slice(2);
@@ -178,15 +178,48 @@ if (args.includes('--help') || args.includes('-h') || command === 'help') {
 
 // Command routing (wrapped in async IIFE to handle async commands)
 (async () => {
-  // Run bootstrap if needed (first-time setup)
-  if (needsBootstrap()) {
-    const completed = await bootstrapProject();
-    if (completed) {
-      // Bootstrap completed, exit so user can run maiass again
-      process.exit(0);
+  // --setup/--bootstrap: run the full interactive wizard and exit
+  if (process.env.MAIASS_FORCE_BOOTSTRAP === 'true') {
+    await bootstrapProject();
+    process.exit(0);
+  }
+
+  // First run (no .env.maiass and no .env.maiass.local): initialise and show welcome.
+  // We create .env.maiass.local as a marker so this only runs once per project.
+  if (!fs.existsSync('.env.maiass') && !fs.existsSync('.env.maiass.local')) {
+    // Create .env.maiass.local as a first-run marker (personal settings file)
+    fs.writeFileSync(
+      '.env.maiass.local',
+      `# .env.maiass.local — personal/local MAIASS settings (never committed)\n` +
+      `# Generated on first run: ${new Date().toISOString()}\n` +
+      `# Override any .env.maiass value here, e.g. MAIASS_AI_HOST=http://localhost:8787\n`,
+      'utf8'
+    );
+
+    // Add MAIASS entries to .gitignore if one already exists — avoids dirtying
+    // repos that don't have a .gitignore yet
+    if (fs.existsSync('.gitignore')) {
+      let gitignore = fs.readFileSync('.gitignore', 'utf8');
+      const needed = ['.env.maiass.local', 'maiass.log'].filter(p => !gitignore.includes(p));
+      if (needed.length > 0) {
+        if (!gitignore.endsWith('\n')) gitignore += '\n';
+        gitignore += `\n# MAIASS\n${needed.join('\n')}\n`;
+        fs.writeFileSync('.gitignore', gitignore, 'utf8');
+      }
     }
+
+    // Show what defaults are active so the user knows what they're getting
+    const aiMode = process.env.MAIASS_AI_MODE || 'ask';
+    console.log('');
+    console.log(colors.BCyan('👋 Welcome to MAIASS!'));
+    console.log(colors.Gray('   Running with smart defaults:'));
+    console.log(colors.Gray(`   • AI commit messages: ${aiMode}`));
+    console.log(colors.Gray('   • Version management: off'));
+    console.log(colors.Gray('   • Changelogging: off'));
+    console.log(colors.Gray('   Run maiass --setup to configure for this project.'));
+    console.log('');
   }
-  
+
   switch (command) {
     case 'hello':
       console.log(colors.BCyan('Hello from MAIASS!'));

package/package.json

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