@entro314labs/ai-changelog-generator 3.0.5 → 3.1.1

package/CHANGELOG.md

@@ -5,6 +5,98 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [3.1.1] - 2025-08-01 ([480d3bc...a55fbc9](https://github.com/entro314-labs/AI-changelog-generator/compare/480d3bc9ac50fb983ddcf856aa99f9cc05cfc601...a55fbc98c36bd95d44d1582ed290b432e696058a))
+
+### 📋 Release Summary
+Release 3.1.1 includes 10 commits (3 chore, 2 feature, 2 fix, 2 refactor, 1 docs). Complexity: low. Affected areas: configuration, documentation, source, other, assets.
+
+**Business Impact**: minor
+**Complexity**: low
+
+## Changes
+
+### 🔧 Maintenance
+
+- **Update package.json**: The package version was incremented from 3.0.4 to 3.0.5 in package.json. No functional or dependency changes were made. ([641ad94](https://github.com/entro314-labs/AI-changelog-generator/commit/641ad94a5907d587f4427d1bfab195f7590a20a6))
+- **Update package.json**: The version field in package.json was incremented from 3.0.3 to 3.0.4. No functionality, dependencies, or APIs were changed. ([787425e](https://github.com/entro314-labs/AI-changelog-generator/commit/787425e6f9b8524a3a2ee894ee201fcf29fc2e44))
+
+### 📚 Documentation
+
+- **minor updates**: A comprehensive new setup guide was added, while several older, more detailed documentation files were removed for clarity and maintainability. Minor updates were made to documentation references and copyright information. ([28c0949](https://github.com/entro314-labs/AI-changelog-generator/commit/28c0949bcf455be78efae9162a4463bfc54afe3e))
+
+### 🐛 Bug Fixes
+
+- **fix: add publishConfig for public access**: Added a publishConfig section to package.json to specify public access for npm publishing. No application logic or user-facing functionality was changed. ([0f78591](https://github.com/entro314-labs/AI-changelog-generator/commit/0f7859165c80f29383afe6d02f88999664c29459))
+- **fix: remove prepublishOnly hook with missing test-runner**: The 'prepublishOnly' npm script, which referenced a non-existent test runner, was removed from package.json. This prevents publishing errors caused by the missing script. ([0e7d691](https://github.com/entro314-labs/AI-changelog-generator/commit/0e7d691da1da409e57cabf77baf55f92b2d47d41))
+- **fix: remove missing validate:mcp script from prepublishOnly**: Removed the call to the non-existent 'validate:mcp' script from the 'prepublishOnly' lifecycle step in package.json. Only 'test:comprehensive' now runs before publishing. ([215c644](https://github.com/entro314-labs/AI-changelog-generator/commit/215c6440005607ed56684e8d7906be5fe252e6fc))
+
+### ♻️ Refactoring
+
+- **minor naming changes**: Internal code references to utility functions were updated to use a new file naming convention, changing imports from 'consolidated-utils.js' to 'utils.js' across multiple modules. No new features, APIs, or behavioral changes were introduced. ([3b99ef2](https://github.com/entro314-labs/AI-changelog-generator/commit/3b99ef20c6c3d39c5c1d7c0ea0ed8a84da07de34))
+- **minor naming updates**: This update removes sample DXT extension files and documentation, and restructures the MCP server entry point for clarity and maintainability. Internal naming and initialization logic were adjusted, but no APIs or user commands were added or removed. ([480d3bc](https://github.com/entro314-labs/AI-changelog-generator/commit/480d3bc9ac50fb983ddcf856aa99f9cc05cfc601))
+
+### 🔧 Working Directory Changes
+
+- (feature) Expanded color constants in colors.js - Added new color entries including 'dracula', 'draculaDark', 'draculaLight', 'draculaYellow', 'draculaCyan', 'draculaOrange', 'draculaPink', 'draculaPurple', 'draculaRed', 'draculaGreen', and 'draculaBackground' to the exported COLORS object.
+
+- (docs) Added changelog for version 3.1.0 - Created CHANGELOG-3.1.0.md with 50 lines detailing changes for version 3.1.0 dated 2025-08-01.
+
+- (other) Added demo tape and video files - Created demo-basic.tape, demo-features.tape, demo-interactive.tape, demo-quick-real.tape, demo-quick.tape, demo-simple.tape, and demo.tape with various demo scripts; added demo.mp4 and demo-interactive.mp4 video files.
+
+- (assets) Added demo GIF assets - Created demo-interactive-optimized.gif and demo-quick-real.gif with image data; added empty demo-interactive.gif, demo-optimized.gif, and demo-simple.gif files.
+
+---
+
+*Generated using [ai-changelog-generator](https://github.com/entro314-labs/AI-changelog-generator) - AI-powered changelog generation for Git repositories*
+
+## [3.1.0] - 2025-08-01 ([480d3bc...a55fbc9](https://github.com/entro314-labs/AI-changelog-generator/compare/480d3bc9ac50fb983ddcf856aa99f9cc05cfc601...a55fbc98c36bd95d44d1582ed290b432e696058a))
+
+### 📋 Release Summary
+Release 3.1.0 includes 10 commits (3 chore, 2 feature, 2 fix, 2 refactor, 1 docs). Complexity: low. Affected areas: configuration, documentation, source, other, assets.
+
+**Business Impact**: minor
+**Complexity**: low
+
+## Changes
+
+### 🔧 Maintenance
+
+- **Update package.json**: The package.json file version was updated from 3.0.4 to 3.0.5. No functionality, dependencies, or configuration were changed. ([641ad94](https://github.com/entro314-labs/AI-changelog-generator/commit/641ad94a5907d587f4427d1bfab195f7590a20a6))
+- **Update package.json**: The package version was updated from 3.0.3 to 3.0.4 in package.json. No code, features, or dependencies were changed. ([787425e](https://github.com/entro314-labs/AI-changelog-generator/commit/787425e6f9b8524a3a2ee894ee201fcf29fc2e44))
+
+### 📚 Documentation
+
+- **minor updates**: A new comprehensive 'AI Provider Setup Guide' was added, consolidating and simplifying provider configuration instructions; several outdated or redundant documentation files were removed, and the .gitignore was updated to exclude these files. No application code or user-facing features were changed. ([28c0949](https://github.com/entro314-labs/AI-changelog-generator/commit/28c0949bcf455be78efae9162a4463bfc54afe3e))
+
+### 🐛 Bug Fixes
+
+- **fix: add publishConfig for public access**: Added a publishConfig section with 'access: public' to package.json, ensuring the package is published with public visibility. No application code or runtime behavior was changed. ([0f78591](https://github.com/entro314-labs/AI-changelog-generator/commit/0f7859165c80f29383afe6d02f88999664c29459))
+- **fix: remove prepublishOnly hook with missing test-runner**: The 'prepublishOnly' npm script, which referenced a non-existent 'test:comprehensive' command, was removed from package.json. This prevents npm publish operations from being blocked by missing scripts. ([0e7d691](https://github.com/entro314-labs/AI-changelog-generator/commit/0e7d691da1da409e57cabf77baf55f92b2d47d41))
+- **fix: remove missing validate:mcp script from prepublishOnly**: The prepublishOnly script no longer tries to run the removed validate:mcp command, which previously caused errors if the script was absent. Only the comprehensive test suite is now run before publishing. ([215c644](https://github.com/entro314-labs/AI-changelog-generator/commit/215c6440005607ed56684e8d7906be5fe252e6fc))
+
+### ♻️ Refactoring
+
+- **minor naming changes**: The update consolidates utility imports by renaming and redirecting them from 'consolidated-utils.js' to 'utils.js' across core modules and provider integrations. No APIs, commands, or outputs were changed; only internal code references were updated for consistency. ([3b99ef2](https://github.com/entro314-labs/AI-changelog-generator/commit/3b99ef20c6c3d39c5c1d7c0ea0ed8a84da07de34))
+- 🔥 **minor naming updates**: This update removes all sample DXT extension packages, documentation, and related files, and restructures the MCP server entry point and supporting utilities for improved clarity and maintainability. No new tools or APIs were introduced, and no user-facing commands or behaviors were modified. ([480d3bc](https://github.com/entro314-labs/AI-changelog-generator/commit/480d3bc9ac50fb983ddcf856aa99f9cc05cfc601))
+
+### 🔧 Working Directory Changes
+
+- (feature) Added demo-optimized.gif asset - Created new empty file demo-optimized.gif in assets.
+
+- (feature) Added demo-simple.gif asset - Created new empty file demo-simple.gif in assets.
+
+- (feature) Added demo-quick.tape script - Created new file demo-quick.tape with 70 lines, including commands for outputting demo-quick.gif, setting font size, width, height, theme, typing speed, and various typing and enter actions.
+
+- (feature) Added demo-simple.tape script - Created new file demo-simple.tape with 24 lines, including commands for outputting demo-simple.gif, setting font size, width, height, theme, typing speed, and typing a demo title.
+
+- (feature) Added demo.mp4 media file - Created new file demo.mp4 with 3243 lines of binary content.
+
+- (feature) Added demo.tape script - Created new file demo.tape with 129 lines, including documentation comments and commands for outputting GIF and MP4 files, setting font size, width, height, theme, typing speed, and various typing and enter actions.
+
+---
+
+*Generated using [ai-changelog-generator](https://github.com/entro314-labs/AI-changelog-generator) - AI-powered changelog generation for Git repositories*
+
 ## [3.0.3]
 
 ### 🔧 **Maintenance & Bug Fixes**

package/README.md

@@ -148,6 +148,27 @@ ai-changelog --help
 
 That's it! Your AI-powered changelog is ready to generate.
 
+## Demo
+
+### Interactive Mode
+See the tool in action with our interactive mode demo:
+
+![Interactive Demo](docs/media/demo-interactive-optimized.gif)
+
+*Interactive mode with guided setup and provider selection*
+
+### Quick Generation
+Watch how fast you can generate professional changelogs:
+
+![Quick Demo](docs/media/demo-quick-real.gif)
+
+*Generate changelogs from recent commits in seconds*
+
+### Video Walkthrough
+For a complete walkthrough of features and capabilities:
+
+[📺 Watch Full Demo Video](docs/media/demo-interactive.mp4)
+
 ## How It Works
 
 1. **Code Analysis**: Analyzes actual git diffs and file changes using advanced AI models
@@ -326,6 +347,7 @@ ai-changelog health --detailed
 - **[Configuration Reference](./docs/configuration.md)** - All YAML and environment options
 - **[MCP Integration](./docs/mcp-integration.md)** - Claude Desktop and MCP server setup
 - **[API Reference](./docs/api-reference.md)** - All commands, options, and programmatic usage
+- **[Demo Media](./docs/media/)** - Interactive demos, GIFs, and video walkthroughs
 
 ## Contributing
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@entro314labs/ai-changelog-generator",
   "displayName": "AI Changelog Generator",
-  "version": "3.0.5",
+  "version": "3.1.1",
   "type": "module",
   "description": "AI-powered changelog generator with MCP server support - works with most providers, online and local models",
   "main": "src/ai-changelog-generator.js",
@@ -21,28 +21,28 @@
     "CHANGELOG.md"
   ],
   "dependencies": {
-    "@anthropic-ai/sdk": "^0.57.0",
-    "@aws-sdk/client-bedrock-runtime": "^3.857.0",
-    "@azure/identity": "^4.10.2",
+    "@anthropic-ai/sdk": "^0.58.0",
+    "@aws-sdk/client-bedrock-runtime": "^3.861.0",
+    "@azure/identity": "^4.11.1",
     "@clack/prompts": "^0.11.0",
     "@google/genai": "^1.12.0",
     "@google/generative-ai": "^0.24.1",
     "@huggingface/hub": "^2.4.0",
     "@huggingface/inference": "^4.6.1",
     "@lmstudio/sdk": "^1.4.0",
-    "@modelcontextprotocol/sdk": "^1.17.0",
-    "@modelcontextprotocol/server-filesystem": "2025.7.1",
-    "chalk": "^5.4.1",
+    "@modelcontextprotocol/sdk": "^1.17.1",
+    "@modelcontextprotocol/server-filesystem": "2025.7.29",
+    "chalk": "^5.5.0",
     "dotenv": "^17.2.1",
-    "google-auth-library": "^10.2.0",
+    "google-auth-library": "^10.2.1",
     "js-yaml": "^4.1.0",
     "ollama": "^0.5.16",
-    "openai": "^5.11.0",
+    "openai": "^5.12.0",
     "yargs": "^18.0.0"
   },
   "devDependencies": {
     "@anthropic-ai/dxt": "^0.2.6",
-    "@types/node": "22.15.30"
+    "@types/node": "22.17.1"
   },
   "keywords": [
     "changelog",

package/src/application/orchestrators/changelog.orchestrator.js

@@ -4,6 +4,8 @@ import { ChangelogService } from '../../domains/changelog/changelog.service.js';
 import { AnalysisEngine } from '../../domains/analysis/analysis.engine.js';
 import { ProviderManagerService } from '../../infrastructure/providers/provider-manager.service.js';
 import { InteractiveWorkflowService } from '../../infrastructure/interactive/interactive-workflow.service.js';
+import { InteractiveStagingService } from '../../infrastructure/interactive/interactive-staging.service.js';
+import { CommitMessageValidationService } from '../../infrastructure/validation/commit-message-validation.service.js';
 import colors from '../../shared/constants/colors.js';
 
 export class ChangelogOrchestrator {
@@ -54,6 +56,8 @@ export class ChangelogOrchestrator {
       this.analysisEngine = new AnalysisEngine(this.gitService, this.aiAnalysisService);
       this.changelogService = new ChangelogService(this.gitService, this.aiAnalysisService, this.analysisEngine, this.configManager);
       this.interactiveService = new InteractiveWorkflowService(this.gitService, this.aiAnalysisService, this.changelogService);
+      this.stagingService = new InteractiveStagingService(this.gitManager);
+      this.validationService = new CommitMessageValidationService(this.configManager);
 
       // Only log if not in MCP server mode
       if (!process.env.MCP_SERVER_MODE) {
@@ -727,4 +731,469 @@ export class ChangelogOrchestrator {
       this.aiAnalysisService.resetMetrics();
     }
   }
+
+  // Interactive commit workflow
+  async executeCommitWorkflow(options = {}) {
+    await this.ensureInitialized();
+
+    console.log(colors.header('🚀 Interactive Commit Workflow'));
+
+    try {
+      // Step 1: Show current git status
+      const statusResult = await this.stagingService.showGitStatus();
+      
+      // Check if we have any changes at all
+      const totalChanges = statusResult.staged.length + statusResult.unstaged.length + statusResult.untracked.length;
+      if (totalChanges === 0) {
+        console.log(colors.infoMessage('✨ Working directory clean - no changes to commit.'));
+        return { success: false, message: 'No changes to commit' };
+      }
+
+      // Step 2: Handle staging based on options
+      let stagedFiles = [];
+      
+      if (options.stageAll) {
+        // Auto-stage all changes
+        console.log(colors.processingMessage('📦 Staging all changes...'));
+        await this.stagingService.stageAllChanges();
+        stagedFiles = [...statusResult.unstaged, ...statusResult.untracked];
+      } else if (options.interactive && (statusResult.unstaged.length > 0 || statusResult.untracked.length > 0)) {
+        // Interactive staging
+        console.log(colors.infoMessage('\n🎯 Interactive staging mode'));
+        stagedFiles = await this.stagingService.selectFilesToStage();
+        
+        if (stagedFiles.length === 0 && statusResult.staged.length === 0) {
+          console.log(colors.warningMessage('No files staged for commit.'));
+          return { success: false, message: 'No files staged' };
+        }
+      }
+
+      // Step 3: Verify we have staged changes
+      if (!this.stagingService.hasStagedChanges()) {
+        console.log(colors.warningMessage('No staged changes found for commit.'));
+        
+        if (statusResult.unstaged.length > 0 || statusResult.untracked.length > 0) {
+          console.log(colors.infoMessage('💡 Use --all flag to stage all changes, or run interactively to select files.'));
+        }
+        
+        return { success: false, message: 'No staged changes' };
+      }
+
+      // Step 4: Get final staged changes for analysis
+      const finalStatus = this.stagingService.getDetailedStatus();
+      console.log(colors.successMessage(`\n✅ Ready to commit ${finalStatus.staged.length} staged file(s)`));
+
+      // Step 5: Branch Intelligence Analysis
+      const { analyzeBranchIntelligence, getSuggestedCommitType, generateCommitContextFromBranch } = await import('../../shared/utils/utils.js');
+      
+      const branchAnalysis = analyzeBranchIntelligence();
+      const suggestedType = getSuggestedCommitType(branchAnalysis, finalStatus.staged);
+      const branchContext = generateCommitContextFromBranch(branchAnalysis, finalStatus.staged);
+
+      // Display branch intelligence findings
+      if (branchAnalysis.confidence > 20) {
+        console.log(colors.infoMessage('\n🧠 Branch Intelligence:'));
+        console.log(colors.secondary(`  Branch: ${branchAnalysis.branch}`));
+        
+        if (branchAnalysis.type) {
+          console.log(colors.success(`  🏷️  Detected type: ${branchAnalysis.type} (${branchAnalysis.confidence}% confidence)`));
+        }
+        
+        if (branchAnalysis.ticket) {
+          console.log(colors.highlight(`  🎫 Related ticket: ${branchAnalysis.ticket}`));
+        }
+        
+        if (branchAnalysis.description) {
+          console.log(colors.dim(`  📝 Description: ${branchAnalysis.description}`));
+        }
+        
+        console.log(colors.dim(`  🔍 Patterns: ${branchAnalysis.patterns.join(', ')}`));
+      }
+
+      // Display suggested commit type
+      console.log(colors.infoMessage(`\n💡 Suggested commit type: ${colors.highlight(suggestedType.type)} (from ${suggestedType.source}, ${suggestedType.confidence}% confidence)`));
+
+      // Step 6: Generate enhanced commit message
+      let commitMessage;
+      
+      if (options.customMessage) {
+        commitMessage = options.customMessage;
+      } else {
+        // Generate AI-enhanced commit message with branch context
+        commitMessage = this.generateBranchAwareCommitMessage(branchAnalysis, suggestedType, finalStatus.staged);
+      }
+
+      // Step 7: Validate commit message
+      console.log(colors.processingMessage('\n🔍 Validating commit message...'));
+      
+      const validationContext = {
+        branchAnalysis,
+        stagedFiles: finalStatus.staged,
+        suggestedType
+      };
+      
+      const validationResult = await this.validationService.validateCommitMessage(commitMessage, validationContext);
+      
+      // Display validation results
+      const isValid = this.validationService.displayValidationResults(validationResult);
+      
+      // Step 8: Interactive improvement if needed
+      if (!isValid || validationResult.warnings.length > 0) {
+        const { confirm } = await import('@clack/prompts');
+        
+        const shouldImprove = await confirm({
+          message: 'Would you like to improve the commit message?',
+          initialValue: !isValid
+        });
+        
+        if (shouldImprove) {
+          commitMessage = await this.handleCommitMessageImprovement(commitMessage, validationResult, validationContext);
+        }
+      }
+
+      if (options.dryRun) {
+        console.log(colors.infoMessage('\n📋 Dry-run mode - showing what would be committed:'));
+        console.log(colors.highlight(`Commit message:\n${commitMessage}`));
+        return {
+          success: true,
+          commitMessage,
+          stagedFiles: finalStatus.staged.length,
+          dryRun: true
+        };
+      }
+
+      // Step 6: Development phase notice
+      console.log(colors.warningMessage('\n⚠️  Commit execution is in development phase.'));
+      console.log(colors.infoMessage('Current capabilities:'));
+      console.log(colors.success('  • Git status analysis ✅'));
+      console.log(colors.success('  • Interactive staging ✅'));  
+      console.log(colors.dim('  • AI commit message generation (coming soon) ⏳'));
+      console.log(colors.dim('  • Git commit execution (coming soon) ⏳'));
+
+      console.log(colors.infoMessage('\n💡 Files are staged and ready for commit!'));
+      console.log(colors.infoMessage('💡 Use "git commit" manually or wait for the next phase.'));
+
+      return {
+        success: true,
+        commitMessage,
+        stagedFiles: finalStatus.staged.length,
+        phase: 'staging-complete'
+      };
+
+    } catch (error) {
+      console.error(colors.errorMessage(`Commit workflow error: ${error.message}`));
+      throw error;
+    }
+  }
+
+  /**
+   * Generate branch-aware commit message using AI and branch intelligence
+   */
+  generateBranchAwareCommitMessage(branchAnalysis, suggestedType, stagedFiles) {
+    const type = suggestedType.type;
+    
+    // Build description based on branch intelligence
+    let description = 'implement changes';
+    
+    if (branchAnalysis.description && branchAnalysis.confidence > 40) {
+      description = branchAnalysis.description;
+    } else {
+      // Generate description from file changes
+      const fileTypes = new Set();
+      stagedFiles.forEach(file => {
+        const path = file.path;
+        if (path.includes('service')) fileTypes.add('services');
+        if (path.includes('component')) fileTypes.add('components');
+        if (path.includes('utils')) fileTypes.add('utilities');
+        if (path.includes('config')) fileTypes.add('configuration');
+        if (path.includes('test')) fileTypes.add('tests');
+        if (path.includes('doc')) fileTypes.add('documentation');
+      });
+      
+      if (fileTypes.size > 0) {
+        description = `update ${Array.from(fileTypes).join(', ')}`;
+      }
+    }
+
+    // Build commit message
+    let commitMessage = `${type}: ${description}`;
+    
+    // Add body with details
+    const bodyLines = [];
+    
+    if (branchAnalysis.ticket) {
+      bodyLines.push(`Related to: ${branchAnalysis.ticket}`);
+    }
+    
+    // Add file summary
+    const addedFiles = stagedFiles.filter(f => f.status === 'A').length;
+    const modifiedFiles = stagedFiles.filter(f => f.status === 'M').length;
+    const deletedFiles = stagedFiles.filter(f => f.status === 'D').length;
+    
+    const changes = [];
+    if (addedFiles > 0) changes.push(`${addedFiles} added`);
+    if (modifiedFiles > 0) changes.push(`${modifiedFiles} modified`);
+    if (deletedFiles > 0) changes.push(`${deletedFiles} deleted`);
+    
+    if (changes.length > 0) {
+      bodyLines.push(`Files: ${changes.join(', ')}`);
+    }
+    
+    // Add branch context
+    if (branchAnalysis.confidence > 60) {
+      bodyLines.push(`Branch: ${branchAnalysis.branch} (${branchAnalysis.confidence}% confidence)`);
+    }
+
+    if (bodyLines.length > 0) {
+      commitMessage += '\n\n' + bodyLines.join('\n');
+    }
+
+    return commitMessage;
+  }
+
+  /**
+   * Handle interactive commit message improvement
+   */
+  async handleCommitMessageImprovement(originalMessage, validationResult, context) {
+    const { select, text, confirm } = await import('@clack/prompts');
+
+    console.log(colors.infoMessage('\n🔧 Commit Message Improvement'));
+
+    // Try automatic improvement first
+    const improvementResult = await this.validationService.improveCommitMessage(originalMessage, context);
+    
+    const options = [
+      {
+        value: 'auto',
+        label: '🤖 Use automatically improved version',
+        hint: improvementResult.improved ? 'AI-suggested improvements applied' : 'Minor fixes applied'
+      },
+      {
+        value: 'manual',
+        label: '✏️  Edit manually',
+        hint: 'Customize the commit message yourself'
+      }
+    ];
+
+    // Add AI suggestions if available
+    if (this.aiAnalysisService.hasAI) {
+      options.unshift({
+        value: 'ai',
+        label: '🧠 Generate AI suggestions',
+        hint: 'Get AI-powered commit message alternatives'
+      });
+    }
+
+    const choice = await select({
+      message: 'How would you like to improve the commit message?',
+      options
+    });
+
+    switch (choice) {
+      case 'ai':
+        return await this.generateAICommitSuggestions(originalMessage, context, validationResult);
+      
+      case 'auto':
+        console.log(colors.successMessage(`\n✅ Using improved message:`));
+        console.log(colors.highlight(improvementResult.message));
+        return improvementResult.message;
+      
+      case 'manual':
+        return await this.handleManualCommitEdit(originalMessage, validationResult);
+      
+      default:
+        return originalMessage;
+    }
+  }
+
+  /**
+   * Generate AI-powered commit message suggestions
+   */
+  async generateAICommitSuggestions(originalMessage, context, validationResult) {
+    const { select } = await import('@clack/prompts');
+
+    console.log(colors.processingMessage('🤖 Generating AI suggestions...'));
+
+    try {
+      // Build comprehensive context for AI
+      const branchInfo = context.branchAnalysis?.confidence > 30 
+        ? `Branch: ${context.branchAnalysis.branch} (${context.branchAnalysis.type || 'unknown'} type)`
+        : '';
+      
+      const fileChanges = context.stagedFiles.map(f => `${f.status} ${f.path}`).join('\n');
+      
+      const validationIssues = [
+        ...validationResult.errors,
+        ...validationResult.warnings
+      ].join('\n');
+
+      const prompt = `Improve this commit message based on the validation feedback and context:
+
+Original message: "${originalMessage}"
+
+Validation issues:
+${validationIssues}
+
+File changes:
+${fileChanges}
+
+${branchInfo}
+
+Requirements:
+- Follow conventional commit format
+- Address all validation issues
+- Keep subject under 72 characters
+- Use imperative mood
+- Be specific and descriptive
+
+Provide 3 improved alternatives.`;
+
+      const response = await this.aiAnalysisService.aiProvider.generateCompletion([{
+        role: 'user',
+        content: prompt
+      }], { max_tokens: 300 });
+
+      const suggestions = this.parseAICommitSuggestions(response.content);
+      
+      if (suggestions.length === 0) {
+        console.log(colors.warningMessage('No AI suggestions generated, falling back to manual edit.'));
+        return await this.handleManualCommitEdit(originalMessage, validationResult);
+      }
+
+      // Present suggestions to user
+      const choices = suggestions.map((suggestion, index) => ({
+        value: suggestion,
+        label: `${index + 1}. ${suggestion.split('\n')[0]}`, // First line only
+        hint: suggestion.includes('\n') ? 'Has body content' : 'Subject only'
+      }));
+
+      choices.push({
+        value: 'MANUAL',
+        label: '✏️  Edit manually instead',
+        hint: 'Write your own commit message'
+      });
+
+      const selectedMessage = await select({
+        message: 'Choose an AI-generated commit message:',
+        options: choices
+      });
+
+      if (selectedMessage === 'MANUAL') {
+        return await this.handleManualCommitEdit(originalMessage, validationResult);
+      }
+
+      console.log(colors.successMessage('\n✅ Selected AI suggestion:'));
+      console.log(colors.highlight(selectedMessage));
+      return selectedMessage;
+
+    } catch (error) {
+      console.error(colors.errorMessage(`AI suggestion failed: ${error.message}`));
+      return await this.handleManualCommitEdit(originalMessage, validationResult);
+    }
+  }
+
+  /**
+   * Handle manual commit message editing
+   */
+  async handleManualCommitEdit(originalMessage, validationResult) {
+    const { text, confirm } = await import('@clack/prompts');
+
+    console.log(colors.infoMessage('\n✏️  Manual Edit Mode'));
+    console.log(colors.dim('Validation issues to address:'));
+    
+    validationResult.errors.forEach(error => {
+      console.log(colors.error(`  • ${error}`));
+    });
+    
+    validationResult.warnings.forEach(warning => {
+      console.log(colors.warning(`  • ${warning}`));
+    });
+
+    if (validationResult.suggestions.length > 0) {
+      console.log(colors.dim('\nSuggestions:'));
+      validationResult.suggestions.forEach(suggestion => {
+        console.log(colors.dim(`  • ${suggestion}`));
+      });
+    }
+
+    let improvedMessage;
+    let isValid = false;
+    let attempts = 0;
+    const maxAttempts = 3;
+
+    while (!isValid && attempts < maxAttempts) {
+      improvedMessage = await text({
+        message: 'Enter improved commit message:',
+        placeholder: originalMessage,
+        defaultValue: attempts === 0 ? originalMessage : undefined,
+        validate: (input) => {
+          if (!input || input.trim().length === 0) {
+            return 'Commit message cannot be empty';
+          }
+        }
+      });
+
+      // Validate the improved message
+      const newValidation = await this.validationService.validateCommitMessage(improvedMessage, {
+        branchAnalysis: validationResult.parsed?.branchAnalysis
+      });
+
+      if (newValidation.valid) {
+        isValid = true;
+        console.log(colors.successMessage('✅ Validation passed!'));
+      } else {
+        attempts++;
+        console.log(colors.warningMessage(`\n⚠️  Validation failed (attempt ${attempts}/${maxAttempts}):`));
+        this.validationService.displayValidationResults(newValidation);
+
+        if (attempts < maxAttempts) {
+          const tryAgain = await confirm({
+            message: 'Try again with improvements?',
+            initialValue: true
+          });
+
+          if (!tryAgain) {
+            break;
+          }
+        }
+      }
+    }
+
+    return improvedMessage || originalMessage;
+  }
+
+  /**
+   * Parse AI-generated commit suggestions
+   */
+  parseAICommitSuggestions(content) {
+    const suggestions = [];
+    const lines = content.split('\n').filter(line => line.trim());
+
+    let currentSuggestion = '';
+    for (const line of lines) {
+      const trimmed = line.trim();
+      
+      // Check if it's a new suggestion (starts with number, bullet, or looks like commit format)
+      if (trimmed.match(/^(\d+[\.\)]|\*|-|•)|^(feat|fix|docs|style|refactor|test|chore|perf|ci|build|revert)(\(.*?\))?:/)) {
+        if (currentSuggestion) {
+          suggestions.push(currentSuggestion.trim());
+        }
+        // Clean up the line (remove numbering/bullets)
+        currentSuggestion = trimmed.replace(/^(\d+[\.\)]|\*|-|•)\s*/, '');
+      } else if (currentSuggestion && trimmed.length > 0) {
+        // Add to current suggestion (body content)
+        currentSuggestion += '\n' + trimmed;
+      }
+    }
+
+    // Add the last suggestion
+    if (currentSuggestion) {
+      suggestions.push(currentSuggestion.trim());
+    }
+
+    // Filter valid suggestions
+    return suggestions
+      .filter(s => s.length > 10 && s.includes(':'))
+      .slice(0, 3); // Limit to 3 suggestions
+  }
 }