fix: resolves #42

Author: diazgdev

CHANGELOG.md

@@ -1,16 +1,38 @@
-## [0.2.0] - 2024-12-15
+# Changelog
 
-### Added
-- New "Minimal" commit message style option for more concise commits
-- Display of AI model used in commit message generation for better transparency
+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).
+
+## [0.2.1] - 2024-12-19
 
 ### Fixed
-- Improved Git staged changes detection for more reliable operation
-- Improved commit message validation for both minimal and conventional formats
+- Improve Claude AI response handling for conventional commit messages
+- Make system prompts more explicit to ensure consistent output format
+- Fixed error when displaying repository status with no staged files
+- Improved error handling in repository status display
+
+### Changed
+- Update system prompts to be more strict and specific
+- Enhance commit message validation for Claude responses
+
+## [0.2.0] - 2024-12-15
+
+### Added
+- Support for multiple AI providers (OpenAI and Anthropic)
+- New commit message styles (minimal, conventional, simple)
+- Commit history analysis
+- Pattern detection for commit types and scopes
+- Secure API key storage with encryption
 
 ### Changed
-- Updated AI service integration to support minimal commit style across OpenAI and Claude
-- Improved error handling and user feedback during Git operations
+- Improved error messages and validation
+- Enhanced diff formatting and preview
+- Better handling of commit message generation
+
+### Fixed
+- Various bug fixes and performance improvements
 
 ## [0.1.1] - 2024-12-13
 

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    git_auto (0.1.1)
+    git_auto (0.2.1)
       clipboard (~> 1.3)
       colorize (~> 1.1)
       http (~> 5.1)

git_auto-0.2.1.gem

@@ -51,8 +51,7 @@ def validate_repository(status)
         return if status[:has_staged_changes]
 
         puts "ℹ️  Status:".blue
-        puts "  Branch: #{status[:branch]}"
-        puts "  Staged files: #{status[:staged_files].join(", ")}"
+        puts "  No changes staged for commit"
         puts "\n❌ No changes staged for commit. Use 'git add' to stage changes.".red
         exit 1
       end

lib/git_auto/commands/commit_message_command.rb

@@ -156,19 +156,19 @@ def configure_commit_style
                                  "Simple (description only)" => "simple"
                                })
 
-        @settings.set(:commit_style, style)
+        @settings.save(commit_style: style)
         puts "✓ Commit style updated to #{style}".green
       end
 
       def configure_preferences
         show_diff = @prompt.yes?("Show diff before committing?")
-        @settings.set(:show_diff, show_diff)
+        @settings.save(show_diff: show_diff)
         puts "✓ Show diff preference updated".green
       end
 
       def configure_history_settings
         save_history = @prompt.yes?("Save commit history for analysis?")
-        @settings.set(:save_history, save_history)
+        @settings.save(save_history: save_history)
         puts "✓ History settings updated".green
       end
     end

lib/git_auto/commands/config_command.rb

@@ -216,16 +216,17 @@ def generate_openai_commit_message(diff, style, scope = nil, retry_attempt = nil
                            "6. Be descriptive but concise\n" \
                            "7. Do not include a period at the end"
                          when "conventional"
-                           "You are a commit message generator that MUST follow the conventional commit format: <type>(<scope>): <description>\n" \
-                           "Valid types are: #{commit_types}\n" \
-                           "Rules:\n" \
-                           "1. ALWAYS start with a type from the list above\n" \
-                           "2. ALWAYS use the exact format <type>(<scope>): <description>\n" \
-                           "3. Keep the message under 72 characters\n" \
-                           "4. Use lowercase\n" \
-                           "5. Use present tense\n" \
-                           "6. Be descriptive but concise\n" \
-                           "7. Do not include a period at the end"
+                           "You are a commit message generator that MUST follow these rules EXACTLY:\n" \
+                           "1. ONLY output a single line containing the commit message\n" \
+                           "2. Use format: <type>(<scope>): <description>\n" \
+                           "3. Valid types are: #{commit_types}\n" \
+                           "4. Keep under 72 characters\n" \
+                           "5. Use lowercase\n" \
+                           "6. Use present tense\n" \
+                           "7. Be descriptive but concise\n" \
+                           "8. No period at the end\n" \
+                           "9. NO explanations or additional text\n" \
+                           "10. NO markdown formatting"
                          else
                            "You are an expert in writing clear and concise git commit messages..."
                          end
@@ -277,16 +278,17 @@ def generate_claude_commit_message(diff, style, scope = nil, retry_attempt = nil
                            "6. Be descriptive but concise\n" \
                            "7. Do not include a period at the end"
                          when "conventional"
-                           "You are a commit message generator that MUST follow the conventional commit format: <type>(<scope>): <description>\n" \
-                           "Valid types are: #{commit_types}\n" \
-                           "Rules:\n" \
-                           "1. ALWAYS start with a type from the list above\n" \
-                           "2. ALWAYS use the exact format <type>(<scope>): <description>\n" \
-                           "3. Keep the message under 72 characters\n" \
-                           "4. Use lowercase\n" \
-                           "5. Use present tense\n" \
-                           "6. Be descriptive but concise\n" \
-                           "7. Do not include a period at the end"
+                           "You are a commit message generator that MUST follow these rules EXACTLY:\n" \
+                           "1. ONLY output a single line containing the commit message\n" \
+                           "2. Use format: <type>(<scope>): <description>\n" \
+                           "3. Valid types are: #{commit_types}\n" \
+                           "4. Keep under 72 characters\n" \
+                           "5. Use lowercase\n" \
+                           "6. Use present tense\n" \
+                           "7. Be descriptive but concise\n" \
+                           "8. No period at the end\n" \
+                           "9. NO explanations or additional text\n" \
+                           "10. NO markdown formatting"
                          else
                            "You are an expert in writing clear and concise git commit messages..."
                          end
@@ -353,7 +355,8 @@ def handle_response(response)
         case response.code
         when 200
           json = JSON.parse(response.body.to_s)
-          # puts "Debug - API Response: #{json.inspect}"
+          puts "\nDebug - API Response: #{json.inspect}"
+
           case @settings.get(:ai_provider)
           when "openai"
             message = json.dig("choices", 0, "message", "content")
@@ -362,7 +365,9 @@ def handle_response(response)
               raise Error, "No message content in response"
             end
 
+            # puts "Debug - OpenAI message: #{message}"
             message.split("\n").first.strip
+
           when "claude"
             content = json.dig("content", 0, "text")
             # puts "Debug - Claude content: #{content.inspect}"
@@ -372,14 +377,16 @@ def handle_response(response)
               raise Error, "No message content in response"
             end
 
-            lines = content.split("\n").map(&:strip).reject(&:empty?)
-            # puts "Debug - Lines: #{lines.inspect}"
+            # Extract the first actual commit message from the response
+            commit_message = content.scan(/(?:feat|fix|docs|style|refactor|test|chore|perf|ci|build|revert)(?:\([^)]+\))?:.*/)&.first
 
-            message = lines.first
-
-            raise Error, "No valid commit message found in response" if message.nil? || !message.match?(/^[a-z]+:/)
+            if commit_message.nil?
+              # puts "Debug - No valid commit message pattern found in content"
+              raise Error, "No valid commit message found in response"
+            end
 
-            message
+            # puts "Debug - Extracted commit message: #{commit_message}"
+            commit_message.strip
           end
         when 401
           raise APIKeyError, "Invalid API key" unless ENV["RACK_ENV"] == "test"

lib/git_auto/services/ai_service.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GitAuto
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end