jeeves-git-commit 2.1.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 527ce9c1bf1bbb7a3d32de28211fd81a2c07dbeb1405457f026e438cbbf50a5f
-  data.tar.gz: 368cac10056082021363258f35d5cf49aafbfee5a803d2bb6cdea310efc06012
+  metadata.gz: 6f9cafa5a9ee72892de5d30d61a265d6aafe57a992c2be8ca86619a9db35a9ee
+  data.tar.gz: 6cc58003d2999ee7c5346782fab3ffd2d74857da5752f99a72653876b83c27a5
 SHA512:
-  metadata.gz: 5cec4382871ef998ea7c0344b3156dd775ab5453031e1950ed986cfd4e27540c7e53d56fa70004ee857b079fbfbf3acf578e07fa39b23eeaeee8e1bd35a374d6
-  data.tar.gz: 06f70672dfd85ec2a93c1f5cdfbfc0df89c4769504c66700bafad5e3f5a6c0d8d96a7d74d43f62b2356c8e4d6080076bf83a88707cfc2b025422821d33b89adb
+  metadata.gz: feb83d49fee7a876c25260eb8f9d34538f9022266b5f866f3edcd625f6c3cf10453284b4e059b405377bf860baba5d6ef7fe0590b0e3e40314c0c256b253aff5
+  data.tar.gz: bd432c77c41aa452ab0699e87444fa310c34ffbcf5663f78332933218706ad2f79fc388dd6e973c69204129d0c34e7a1ac1cd129babfceb606d92297ba928a06

data/README.md

@@ -9,14 +9,13 @@ Jeeves is a command-line tool that creates AI-powered Git commit messages that m
 ## Features
 
 - Generate intelligent [conventional commit](https://www.conventionalcommits.org/en/v1.0.0/) messages with [gitmoji](https://gitmoji.dev) based on your staged changes that point out what an idiot you are.
-- Option to automatically stage all changes before committing
-- Option to push changes after committing
-- Customizable AI prompts for tailored commit message generation
-- Choose any AI model (chat-gpt 4.1-mini by default)
+- Option to automatically stage all changes before committing.
+- Option to push changes after committing.
+- Customizable AI prompts for tailored commit message generation.
+- Choose any AI model (chat-gpt 5-mini by default).
 
 ## Example Commit message
 
-```
 ✨ refactor(HTMLText): rewrite HTML parsing and rendering from scratch because why not torture future maintainers
 Completely scrap the previously sane approach of leveraging NSAttributedString's native HTML importer—because parsing HTML by hand in SwiftUI is obviously a great idea—and replace it with a painfully verbose custom parser that handles only a handful of tags (`<b>`, `<i>`, `<u>`, `<strong>`, `<em>`) by rudimentary string manipulation and manual state tracking.
 
@@ -27,7 +26,6 @@ Replace cached AttributedString with a freshly built one on each render, ignorin
 Throw in a sprawling debug preview showcasing trivial formatting examples like `"Bold text"`, `"<b>Bold <i>nested</i></b>"`, and some paragraph-handling tests to prove the gross oversimplification, all stacked in a monstrously long VStack with no regard for code readability or separation of concerns.
 
 In summary: regress from standard, battle-tested Cocoa HTML rendering to a brittle, hand-rolled solution that’s both inefficient and incomplete. Future developers, good luck deciphering this spaghetti; you’ll need it.
-```
 
 ## Installation
 
@@ -120,7 +118,7 @@ Optionally, you can specify a different model by setting:
 export GIT_COMMIT_MODEL="openai/gpt-4o"
 ```
 
-The default model is `openai/gpt-4.1-mini` if not specified.
+The default model is `openai/gpt-4o-mini` if not specified.
 
 ### Prompt Configuration
 

data/config/prompt

@@ -1,19 +1,20 @@
-Generate a git commit message based on the following diff.
+You are a git commit message generator. Your job is to write a commit message for the following git diff.
 
-The commit message should:
-- Start with an appropriate gitmoji based on the nature of the changes
-- Follow the Conventional Commits format (https://www.conventionalcommits.org/en/v1.0.0/)
-- Explain WHAT changed and WHY it changed
-- Use present tense ("add" not "added")
-- Be extremely critical and mercilessly roast the author of the change
-- Assume the audience is educated software engineers
+OUTPUT ONLY THE COMMIT MESSAGE - NO EXPLANATIONS, NO REASONING, NO COMMENTARY.
 
-Example format:
-:emoji: type(scope): concise description
+Rules for the commit message:
+- Start with a gitmoji emoji
+- Follow conventional commit format: type(scope): description
+- Be brutally honest and roast the code author
+- Use present tense verbs
+- Include a detailed body explaining the changes
 
-Detailed explanation of the changes, why they were necessary, and their impact.
+Example:
+✨ feat(api): add error handling because apparently nobody thought about what happens when things go wrong
 
-Additional context or technical details when relevant.
+Implement basic error handling for the authentication endpoint because someone decided to ship code that crashes spectacularly when the database is unreachable. Add try-catch blocks, proper error responses, and logging so we can at least pretend to be professional developers.
 
 DIFF:
 {{DIFF}}
+
+COMMIT MESSAGE:

data/lib/jeeves/version.rb

@@ -1,3 +1,3 @@
 module Jeeves
-  VERSION = '2.1.0'
+  VERSION = '2.3.0'
 end

data/lib/jeeves.rb

@@ -120,9 +120,11 @@ module Jeeves
         exit 1
       end
 
-      model = ENV['GIT_COMMIT_MODEL'] || 'openai/gpt-4.1-mini'
+      model = ENV['GIT_COMMIT_MODEL'] || 'openai/gpt-4o-mini'
       
-      prompt = File.read(get_prompt_file_path).gsub('{{DIFF}}', diff)
+      prompt_file_path = get_prompt_file_path
+      puts "Using prompt file: #{prompt_file_path}"
+      prompt = File.read(prompt_file_path).gsub('{{DIFF}}', diff)
       
       uri = URI.parse('https://openrouter.ai/api/v1/chat/completions')
       http = Net::HTTP.new(uri.host, uri.port)
@@ -133,25 +135,59 @@ module Jeeves
       request['Authorization'] = "Bearer #{api_key}"
       request['HTTP-Referer'] = 'https://github.com/jeeves-git-commit'
       
-      request.body = {
-        model: model,
-        messages: [
+      # For reasoning models, use system message to enforce output format
+      messages = if model.include?('gpt-5') || model.include?('o1')
+        [
+          { role: 'system', content: 'You are a git commit message generator. Respond ONLY with the final commit message. Do not show your thinking or reasoning process.' },
+          { role: 'user', content: prompt }
+        ]
+      else
+        [
           { role: 'user', content: prompt }
-        ],
-        max_tokens: 500
-      }.to_json
+        ]
+      end
+      
+      request_body = {
+        model: model,
+        messages: messages,
+        max_tokens: 1000,
+        stop: ["END_COMMIT"]
+      }
+      
+      # Remove any reasoning parameters that cause API errors
+      # GPT-5 mini will put reasoning in the reasoning field regardless
+      
+      request.body = request_body.to_json
       
       begin
         response = http.request(request)
         
         if response.code == '200'
           result = JSON.parse(response.body)
-          commit_message = result['choices'][0]['message']['content'].strip
-          puts "Generated commit message:"
-          puts "------------------------"
-          puts commit_message
-          puts "------------------------"
-          return commit_message
+          
+          # Better error handling for API response structure
+          if result['choices'] && result['choices'][0] && result['choices'][0]['message']
+            message = result['choices'][0]['message']
+            commit_message = message['content']
+            
+            if commit_message && !commit_message.strip.empty?
+              commit_message = commit_message.strip
+              puts "Generated commit message:"
+              puts "------------------------"
+              puts commit_message
+              puts "------------------------"
+              return commit_message
+            else
+              puts "Error: API returned empty commit message"
+              puts "This model (#{model}) may not be compatible with direct output."
+              puts "Try using a different model with: export GIT_COMMIT_MODEL=\"openai/gpt-4o-mini\""
+              exit 1
+            end
+          else
+            puts "Error: Unexpected API response structure"
+            puts "Full API response: #{response.body}"
+            exit 1
+          end
         else
           puts "API Error (#{response.code}): #{response.body}"
           exit 1

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: jeeves-git-commit
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Justin Bishop
 bindir: bin
 cert_chain: []
-date: 2025-05-31 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.6
+rubygems_version: 3.6.9
 specification_version: 4
 summary: AI-powered Git commit message generator
 test_files: []