smart-commit 0.1.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc1d59ff49319c54e1f73ced0cbf81c80546300a72c2fbdcc167fb0fbbbf8424
-  data.tar.gz: 72c46e4dbc7a18fa36c786416b39fa7ef54e664d551f0569f137c2ece8ddce2a
+  metadata.gz: dad9d6b1f2eb509d7db0ebdfec326224fbba0d93d03a58ef499c19c5cc09edce
+  data.tar.gz: 330abdd45bc9b6b2203d7095a006dd8e28ee5e6a5ab70b46e4eb508024a25970
 SHA512:
-  metadata.gz: 9e3f8c6187d3162752779729cb2e2c57736e5fa7df6ee949569b36c15f3452df1e06cf819e2459de97b82f5a4071572c29d961ce6fcc39b85e598e257ce09b5a
-  data.tar.gz: 112fdd778c200dbf88a0f91cf4ac643e891aa5d98cf925e30f953f9ceb39d1d4a510b1d3922e8962957ec5d25fe3dfdb5c21067bf98055f915cf3e8f93c3963e
+  metadata.gz: a6cf9f1cf6f8ebed20bd9cd5d30d2e749ee225b2d30f7ed42030f711e72fd03d9f3394414c8606e8716e6ac814fde14c8141b8e0218b2421a7bb36a449a4f1d8
+  data.tar.gz: ba82f0de0a01dca041914cca4e714f8f4a142b1d606e66461426252b3633697094c51d472252c2a25f410c95b43484a0dc90e220bc10dd51821058b15c3a25b9

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
 
+## [0.3.0] - 2025-01-27
+
+### Added
+- Regenerate functionality for commit messages with user feedback
+- Users can now provide specific feedback to improve AI-generated commit messages
+- Recursive regeneration - users can regenerate multiple times with different feedback
+- Enhanced prompt that incorporates user feedback for better message generation
+
+## [0.2.0] - 2025-01-27
+
+### Added
+- Edit functionality for commit messages in the `commit` command
+- Users can now modify AI-generated commit messages before committing
+- Support for custom editor via `$EDITOR` or `$VISUAL` environment variables
+- Fallback to `nano` editor if no default editor is configured
+
 ## [0.1.0] - 2025-08-25
 
 - Initial release

data/lib/ai/commit/claude_client.rb

@@ -20,6 +20,13 @@ module Ai
         extract_message(response)
       end
       
+      def generate_commit_message_with_feedback(prev_message, diff, feedback)
+        prompt = build_prompt_with_feedback(prev_message, diff, feedback)
+        
+        response = make_request(prompt)
+        extract_message(response)
+      end
+      
       private
       
       def build_prompt(diff)
@@ -54,6 +61,44 @@ module Ai
         PROMPT
       end
       
+      def build_prompt_with_feedback(prev_message, diff, feedback)
+        custom_prompts = Config.custom_prompts
+        custom_prompt_text = custom_prompts.empty? ? '' : "\n\nAdditional context and preferences:\n#{custom_prompts.join("\n")}"
+        
+        <<~PROMPT
+          You are a helpful assistant that generates conventional commit messages.
+          
+          Based on the following git diff,
+          1. Use conventional commit format: type(scope): description
+          2. Keep subject line under 50 characters
+          3. Use imperative mood ("add" not "added")
+          4. Separate subject from body with blank line
+          5. Wrap body at 72 characters
+          6. Use 'feat' for new features, 'fix' for bug fixes, 'docs' for documentation, 'style' for formatting, 'refactor' for code refactoring, 'test' for tests, 'chore' for build/tooling
+          7. Be clear and specific about what changed, not just "update"
+          8. Explain the impact/benefit when relevant
+          9. Include scope based on file structure (e.g., auth, bank, api, components)
+          10. Reference any related components or services affected
+          11. For breaking changes, start with 'BREAKING CHANGE:'
+          12. Use bullet points in body for multiple changes
+          13. Reference ticket numbers when applicable
+          14. Match existing project commit style
+
+          #{custom_prompt_text}
+          
+          You suggested a commit message of:
+          #{prev_message}
+
+          IMPORTANT: The user has provided feedback on a previous attempt. Please address their feedback:
+          "#{feedback}"
+          
+          Git diff:
+          #{diff}
+          
+          Change the commit message to address the feedback. and respond with the updated commit message.
+        PROMPT
+      end
+      
       def make_request(prompt)
         uri = URI(API_URL)
         http = Net::HTTP.new(uri.host, uri.port)

data/lib/ai/commit/cli.rb

@@ -94,21 +94,37 @@ module Ai
           puts message
           puts "=" * 50
           
-          print "\nCommit with this message? (y/N): "
+          print "\nCommit with this message? (y/N/e to edit/r to regenerate): "
           response = STDIN.gets.chomp.downcase
           
           if response == 'y' || response == 'yes'
             puts "\n🚀 Committing..."
-            result = `git commit -m "#{message}"`
+            result = system("git", "commit", "-m", message)
             
-            if $?.exitstatus == 0
+            if result
               puts "✅ Successfully committed!"
-              puts result
             else
-              puts "❌ Failed to commit:"
-              puts result
+              puts "❌ Failed to commit"
               exit 1
             end
+          elsif response == 'e' || response == 'edit'
+            edited_message = edit_message(message)
+            if edited_message && !edited_message.strip.empty?
+              puts "\n🚀 Committing with edited message..."
+              result = system("git", "commit", "-m", edited_message)
+              
+              if result
+                puts "✅ Successfully committed!"
+              else
+                puts "❌ Failed to commit"
+                exit 1
+              end
+            else
+              puts "❌ Commit cancelled."
+              exit 0
+            end
+          elsif response == 'r' || response == 'regenerate'
+            regenerate_with_feedback(message, diff, client)
           else
             puts "❌ Commit cancelled."
             exit 0
@@ -172,6 +188,98 @@ module Ai
         puts "✅ Created #{prompts_file} with sample content"
         puts "📝 Edit the file to add your custom prompts"
       end
+      
+      private
+      
+      def edit_message(original_message)
+        puts "\n📝 Opening editor to modify commit message..."
+        puts "Original message will be loaded in your default editor."
+        puts "Save and close the editor to commit, or close without saving to cancel."
+        
+        # Create a temporary file with the original message
+        require 'tempfile'
+        temp_file = Tempfile.new(['commit_message', '.txt'])
+        temp_file.write(original_message)
+        temp_file.close
+        
+        # Get the default editor
+        editor = ENV['EDITOR'] || ENV['VISUAL'] || 'nano'
+        
+        # Open the file in the editor
+        system("#{editor} #{temp_file.path}")
+        
+        # Read the edited content
+        edited_content = File.read(temp_file.path)
+        temp_file.unlink
+        
+        edited_content
+      end
+      
+      def regenerate_with_feedback(prev_message, diff, client)
+        puts "\n💬 What would you like to change about the commit message?"
+        puts "Examples: 'make it more concise', 'add more detail about the bug fix', 'change the type to feat'"
+        print "Feedback: "
+        feedback = STDIN.gets.chomp.strip
+        
+        if feedback.empty?
+          puts "❌ No feedback provided. Cancelling regeneration."
+          return
+        end
+        
+        puts "\n🤖 Regenerating commit message with your feedback..."
+        
+        begin
+          new_message = client.generate_commit_message_with_feedback(prev_message, diff, feedback)
+          
+          puts "\n✨ New commit message:"
+          puts "=" * 50
+          puts new_message
+          puts "=" * 50
+          
+          print "\nCommit with this message? (y/N/e to edit/r to regenerate again): "
+          response = STDIN.gets.chomp.downcase
+          
+          if response == 'y' || response == 'yes'
+            puts "\n🚀 Committing..."
+            result = system("git", "commit", "-m", new_message)
+            
+            if result
+              puts "✅ Successfully committed!"
+            else
+              puts "❌ Failed to commit"
+              exit 1
+            end
+          elsif response == 'e' || response == 'edit'
+            edited_message = edit_message(new_message)
+            if edited_message && !edited_message.strip.empty?
+              puts "\n🚀 Committing with edited message..."
+              result = system("git", "commit", "-m", edited_message)
+              
+              if result
+                puts "✅ Successfully committed!"
+              else
+                puts "❌ Failed to commit"
+                exit 1
+              end
+            else
+              puts "❌ Commit cancelled."
+              exit 0
+            end
+          elsif response == 'r' || response == 'regenerate'
+            regenerate_with_feedback(new_message, diff, client)
+          else
+            puts "❌ Commit cancelled."
+            exit 0
+          end
+          
+        rescue Error => e
+          puts "❌ Error regenerating message: #{e.message}"
+          exit 1
+        rescue => e
+          puts "❌ Unexpected error: #{e.message}"
+          exit 1
+        end
+      end
     end
   end
 end

data/lib/ai/commit/version.rb

@@ -2,6 +2,6 @@
 
 module Ai
   module Commit
-    VERSION = "0.1.0"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: smart-commit
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Behrang Mirzamani
 bindir: exe
 cert_chain: []
-date: 2025-08-27 00:00:00.000000000 Z
+date: 2025-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor