commitgpt 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b47c936f4c64c0d4cb2fb5214d1bf28b188b1c14525d5984be2fb2a0f84fb287
-  data.tar.gz: 540d6f74110a1d86e1a34a366456224f56b78888ddbafc070fb5ef0594697e59
+  metadata.gz: a1e1fcc474c778dff2c10f370b5a291483793d0ded5c8d43beaab1b7e377b4ff
+  data.tar.gz: 17ec9d1daaf3ad085adbd8566173411db284995188b4c97d5eaf4d69a634763d
 SHA512:
-  metadata.gz: 60c0ea07f58567bee161b6037fe6db60d92344b1098c88e33c9e4d4908ca08b36b66f722d29cc743308c1bc1f4d4c16f70fb5a7e2a65db1d8c3c0a8adafd5ef2
-  data.tar.gz: 664fa8dc1665d983485c97d064e440e434b2645ff578954d2b762ceec4a741649bb20af3c32dbd180560cd67838e6a4eee1662ef75c56b53c790216d9738f2af
+  metadata.gz: 91ab99f89df2861a5731a3692e88d989b733a5e88edbd55ccdb654e109778b778f02dfc2af547ee6d12dcb8da8858ade012fd3150df381a6a771eecc036b04f1
+  data.tar.gz: aee42f5617f25c523aa9ed3c134eaae5b92c3e9d1e7d19cb9e7de089d79c010d792c4eb12c836db138160076f787dbe30e4219c104476e0c806f2de8135085bb

data/README.md

@@ -216,6 +216,7 @@ $ gem update commitgpt
 We support any OpenAI-compatible API. Presets available for:
 - **Cerebras** (Fast & Recommended)
 - **OpenAI** (Official)
+- **Apple** (Local via apple-to-openai)
 - **Ollama** (Local)
 - **Groq**
 - **DeepSeek**
@@ -246,6 +247,10 @@ llama-3.3-70b-versatile
 llama-3.1-8b-instant
 ```
 
+**Apple Local Models** (via [apple-to-openai](https://github.com/ZPVIP/apple-to-openai))
+
+> **Note**: Due to the context window limits of Apple's local models, it is highly recommended to set your max diff length (`diff_len`) to `10000` during setup. When prompted for large diffs, select the **Smart chunked mode** to avoid errors.
+
 ## How It Works
 This CLI tool runs a `git diff` command to grab all staged changes, sends this to OpenAI's GPT API (or compatible endpoint), and returns an AI-generated commit message. The tool uses the `/v1/chat/completions` endpoint with optimized prompts/system instructions for generating conventional commit messages.
 

data/lib/commitgpt/commit_ai.rb

@@ -139,7 +139,7 @@ module CommitGpt
       exit(1) unless welcome
       diff = git_diff || exit(1)
       if verbose
-        puts "▲ Git diff (#{diff.length} chars):".cyan
+        puts "→ Git diff (#{diff.length} chars):".cyan
         puts diff
         puts "\n"
       end
@@ -151,7 +151,7 @@ module CommitGpt
         case action
         when :commit
           commit_command = "git commit -m \"#{ai_commit_message}\""
-          puts "\n▲ Executing: #{commit_command}".yellow
+          puts "\n→ Executing: #{commit_command}".yellow
           system(commit_command)
           puts "\n\n"
           puts `git log -1`
@@ -168,11 +168,11 @@ module CommitGpt
              puts "\n"
              puts `git log -1`
           else
-             puts '▲ Commit aborted (empty message).'.red
+             puts '✖ Commit aborted (empty message).'.red
           end
           break
         when :exit
-          puts '▲ Exit without commit.'.yellow
+          puts '⚠ Exit without commit.'.yellow
           break
         end
       end
@@ -190,7 +190,7 @@ module CommitGpt
         models = response['data'] || []
         models.each { |m| puts m['id'] }
       rescue StandardError => e
-        puts "▲ Failed to list models: #{e.message}".red
+        puts "✖ Failed to list models: #{e.message}".red
       end
     end
 
@@ -206,7 +206,7 @@ module CommitGpt
         models = response['data'] || []
         models.each { |m| puts m['id'] }
       rescue StandardError => e
-        puts "▲ Failed to list models: #{e.message}".red
+        puts "✖ Failed to list models: #{e.message}".red
       end
     end
 
@@ -228,42 +228,56 @@ module CommitGpt
     end
 
     def message(diff = nil)
-      generate_commit(diff)
+      return generate_commit(diff) unless @chunked_mode
+
+      # Reserve space for system prompt overhead (~20% of diff_len)
+      chunk_size = [(@diff_len * 0.8).to_i, 4000].max
+      chunks = split_diff_by_length(diff, chunk_size)
+      segment_messages = []
+
+      puts "→ Splitting into #{chunks.length} segments (#{chunk_size} chars each)...".cyan
+
+      chunks.each_with_index do |chunk, idx|
+        puts "\n◆ Generating message for segment #{idx + 1}/#{chunks.length}...".magenta
+        msg = generate_commit(chunk, chunk_label: "Segment #{idx + 1}/#{chunks.length}")
+        return nil if msg.nil?
+
+        segment_messages << msg
+        puts ''
+      end
+
+      puts "\n→ Synthesizing final commit message from #{segment_messages.length} segments...".cyan
+      synthesize_commit(segment_messages)
     end
 
     def welcome
-      puts "\n▲ Welcome to AI Commits!".green
+      puts "\n✦ Welcome to AI Commits!".green
 
       # Check if config exists
       unless ConfigManager.config_exists?
-        puts '▲ Configuration not found. Generating default config...'.yellow
+        puts '⚠ Configuration not found. Generating default config...'.yellow
         ConfigManager.generate_default_configs
-        puts "▲ Please run 'aicm setup' to configure your provider.".red
+        puts "✖ Please run 'aicm setup' to configure your provider.".red
         return false
       end
 
       # Check if active provider is configured
-      if @api_key.nil? || @api_key.empty?
-        puts "▲ No active provider configured. Please run 'aicm setup'.".red
-        return false
-      end
-
       if @model.nil? || @model.empty?
-        puts "▲ No model selected. Please run 'aicm setup'.".red
+        puts "✖ No model selected. Please run 'aicm setup'.".red
         return false
       end
 
       begin
         `git rev-parse --is-inside-work-tree`
       rescue StandardError
-        puts '▲ This is not a git repository'.red
+        puts '✖ This is not a git repository'.red
         return false
       end
       true
     end
 
-    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-    def generate_commit(diff = '')
+    # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/BlockLength
+    def generate_commit(diff = '', chunk_label: nil)
       # Build format-specific prompt
       base_prompt = 'Generate a concise git commit message title in present tense that precisely describes the key changes in the following code diff. Focus on what was changed, not just file names. Provide only the title, no description or body.'
 
@@ -323,7 +337,9 @@ module CommitGpt
       end
 
       # Initial UI feedback (only on first try)
-      puts '....... Generating your AI commit message ......'.gray unless defined?(@is_retrying) && @is_retrying
+      total_chars = system_content.length + diff.to_s.length
+      puts "  ....... System prompt: #{system_content.length} chars, Diff chunk: #{diff.to_s.length} chars, Total: #{total_chars} chars".gray
+      puts '  ....... Generating your AI commit message'.gray unless defined?(@is_retrying) && @is_retrying
 
       full_content = ''
       full_reasoning = ''
@@ -364,12 +380,12 @@ module CommitGpt
             end
 
             if can_disable_reasoning && (error_msg =~ /parameter|reasoning|unsupported/i || response.code == '400')
-               puts "▲ Provider does not support 'disable_reasoning'. Updating config and retrying...".yellow
+               puts "⚠ Provider does not support 'disable_reasoning'. Updating config and retrying...".yellow
                ConfigManager.update_provider(provider_config['name'], { 'can_disable_reasoning' => false })
                @is_retrying = true
                return generate_commit(diff)
             else
-               puts "▲ API Error: #{error_msg}".red
+               puts "✖ API Error: #{error_msg}".red
                return nil
             end
           end
@@ -411,7 +427,11 @@ module CommitGpt
                   end
 
                   unless printed_content_prefix
-                    print "\n▲ Commit message: git commit -am \"".green
+                    if chunk_label
+                      print "◆ #{chunk_label}: ".magenta
+                    else
+                      print '✦ Commit message: git commit -am "'.green
+                    end
                     printed_content_prefix = true
                   end
 
@@ -421,7 +441,7 @@ module CommitGpt
                     break
                   end
 
-                  print content_chunk.green
+                  print chunk_label ? content_chunk.magenta : content_chunk.green
                   full_content += content_chunk
                   $stdout.flush
                 end
@@ -435,22 +455,22 @@ module CommitGpt
           end
         end
       rescue StandardError => e
-        puts "▲ Error: #{e.message}".red
+        puts "✖ Error: #{e.message}".red
         return nil
       end
 
       # Close the quote
-      puts '"'.green if printed_content_prefix
+      puts(chunk_label ? '' : '"'.green) if printed_content_prefix
 
       # Post-processing Logic (Retry if empty content)
       if (full_content.nil? || full_content.strip.empty?) && (full_reasoning && !full_reasoning.strip.empty?)
           if can_disable_reasoning
-              puts "\n▲ Model returned reasoning despite 'disable_reasoning: true'. Updating config and retrying...".yellow
+              puts "\n⚠ Model returned reasoning despite 'disable_reasoning: true'. Updating config and retrying...".yellow
               ConfigManager.update_provider(provider_config['name'], { 'can_disable_reasoning' => false })
               @is_retrying = true
               return generate_commit(diff)
           else
-              puts "\n▲ Model output truncated (Reasoning consumed all #{configured_max_tokens} tokens).".red
+              puts "\n✖ Model output truncated (Reasoning consumed all #{configured_max_tokens} tokens).".red
               prompt = TTY::Prompt.new
               choice = prompt.select('Choose an action:') do |menu|
                 menu.choice "Double max_tokens to #{configured_max_tokens * 2}", :double
@@ -468,7 +488,7 @@ module CommitGpt
                         end
 
               if new_max
-                 puts "▲ Updating max_tokens to #{new_max} and retrying...".yellow
+                 puts "→ Updating max_tokens to #{new_max} and retrying...".yellow
                  ConfigManager.update_provider(provider_config['name'], { 'max_tokens' => new_max })
                  @is_retrying = true
                  return generate_commit(diff)
@@ -478,13 +498,13 @@ module CommitGpt
       end
 
       if full_content.empty? && full_reasoning.empty?
-        puts '▲ No response from AI.'.red
+        puts '✖ No response from AI.'.red
         return nil
       end
 
       # Print usage info if available (saved from stream or approximated)
       if defined?(@last_usage) && @last_usage
-        puts "\n...... Tokens: #{@last_usage['total_tokens']} (Prompt: #{@last_usage['prompt_tokens']}, Completion: #{@last_usage['completion_tokens']})\n\n".gray
+        puts "  ....... Tokens: #{@last_usage['total_tokens']} (Prompt: #{@last_usage['prompt_tokens']}, Completion: #{@last_usage['completion_tokens']})".gray
         @last_usage = nil
       end
 
@@ -495,6 +515,130 @@ module CommitGpt
       first_line = full_content.split("\n").map(&:strip).reject(&:empty?).first
       first_line&.gsub(/\A["']|["']\z/, '') || ''
     end
-    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+    # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity, Metrics/BlockLength
+
+    # Synthesize a final commit message from multiple segment messages
+    def synthesize_commit(segment_messages)
+      numbered = segment_messages.each_with_index.map { |msg, i| "#{i + 1}. #{msg}" }.join("\n")
+
+      format_instruction = case @commit_format
+                           when 'conventional'
+                             "The output must follow Conventional Commits format:\n#{COMMIT_FORMATS['conventional']}"
+                           when 'gitmoji'
+                             "The output must use Gitmoji format:\n#{COMMIT_FORMATS['gitmoji']}"
+                           else
+                             ''
+                           end
+
+      system_content = [
+        'You are given multiple commit messages generated from different segments of a single large git diff.',
+        'Synthesize them into ONE concise, unified git commit message that captures the overall change.',
+        'Rules:',
+        '- Maximum 100 characters.',
+        '- Present tense.',
+        '- Be specific: include concrete details rather than generic statements.',
+        '- Return ONLY the commit message, nothing else. No quotes, no explanations.',
+        format_instruction
+      ].reject(&:empty?).join("\n")
+
+      messages = [
+        { role: 'system', content: system_content },
+        { role: 'user', content: "Synthesize these segment commit messages into one:\n\n#{numbered}" }
+      ]
+
+      provider_config = ConfigManager.get_active_provider_config
+      can_disable_reasoning = provider_config.key?('can_disable_reasoning') ? provider_config['can_disable_reasoning'] : true
+
+      payload = {
+        model: @model,
+        messages: messages,
+        temperature: 0.5,
+        stream: true
+      }
+
+      if can_disable_reasoning
+        payload[:disable_reasoning] = true
+        payload[:max_tokens] = 300
+      else
+        payload[:max_tokens] = provider_config['max_tokens'] || 2000
+      end
+
+      full_content = ''
+      printed_content_prefix = false
+      stop_stream = false
+
+      uri = URI("#{@base_url}/chat/completions")
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = (uri.scheme == 'https')
+      http.read_timeout = 120
+
+      request = Net::HTTP::Post.new(uri)
+      request['Content-Type'] = 'application/json'
+      request['Authorization'] = "Bearer #{@api_key}" if @api_key
+      request.body = payload.to_json
+
+      begin
+        http.request(request) do |response|
+          if response.code != '200'
+            error_body = response.read_body
+            puts "✖ API Error: #{error_body}".red
+            return nil
+          end
+
+          buffer = ''
+          response.read_body do |chunk|
+            break if stop_stream
+
+            buffer += chunk
+            while (line_end = buffer.index("\n"))
+              line = buffer.slice!(0, line_end + 1).strip
+              next if line.empty?
+              next unless line.start_with?('data: ')
+
+              data_str = line[6..]
+              next if data_str == '[DONE]'
+
+              begin
+                data = JSON.parse(data_str)
+                delta = data.dig('choices', 0, 'delta')
+                next unless delta
+
+                content_chunk = delta['content']
+                if content_chunk && !content_chunk.empty?
+                  unless printed_content_prefix
+                    print "\n✦ Commit message: git commit -am \"".green
+                    printed_content_prefix = true
+                  end
+
+                  if full_content.length + content_chunk.length > 300
+                    stop_stream = true
+                    break
+                  end
+
+                  print content_chunk.green
+                  full_content += content_chunk
+                  $stdout.flush
+                end
+              rescue JSON::ParserError
+                # Partial JSON, wait for more data
+              end
+            end
+          end
+        end
+      rescue StandardError => e
+        puts "✖ Error: #{e.message}".red
+        return nil
+      end
+
+      puts '"'.green if printed_content_prefix
+
+      if full_content.strip.empty?
+        puts '✖ No response from AI during synthesis.'.red
+        return nil
+      end
+
+      first_line = full_content.split("\n").map(&:strip).reject(&:empty?).first
+      first_line&.gsub(/\A["']|["']\z/, '') || ''
+    end
   end
 end

data/lib/commitgpt/config_manager.rb

@@ -102,8 +102,8 @@ module CommitGpt
         save_local_config(local_config)
 
         # Remind user to add config.local.yml to .gitignore
-        puts '▲ Generated default configuration files.'.green
-        puts '▲ Remember to add ~/.config/commitgpt/config.local.yml to your .gitignore'.yellow
+        puts '✔ Generated default configuration files.'.green
+        puts '⚠ Remember to add ~/.config/commitgpt/config.local.yml to your .gitignore'.yellow
       end
 
       # Get list of configured providers (with API keys)

data/lib/commitgpt/diff_helpers.rb

@@ -21,11 +21,11 @@ module CommitGpt
           choice = prompt_no_staged_changes
           case choice
           when :add_all
-            puts '▲ Running git add .'.yellow
+            puts '→ Running git add .'.yellow
             system('git add .')
             diff_cached = `git diff --cached . #{exclusions}`.chomp
             if diff_cached.empty?
-              puts '▲ Still no changes to commit.'.red
+              puts '✖ Still no changes to commit.'.red
               return nil
             end
           when :exit
@@ -33,7 +33,7 @@ module CommitGpt
           end
         else
           # Scenario: Mixed state (some staged, some not)
-          puts '▲ You have both staged and unstaged changes:'.yellow
+          puts '⚠ You have both staged and unstaged changes:'.yellow
 
           staged_files = `git diff --cached --name-status . #{exclusions}`.chomp
           unstaged_files = `git diff --name-status . #{exclusions}`.chomp
@@ -54,7 +54,7 @@ module CommitGpt
 
           case choice
           when :add_all
-            puts '▲ Running git add .'.yellow
+            puts '→ Running git add .'.yellow
             system('git add .')
             diff_cached = `git diff --cached . #{exclusions}`.chomp
           when :exit
@@ -67,7 +67,7 @@ module CommitGpt
         # git status --porcelain includes untracked files
         git_status = `git status --porcelain`.chomp
         if git_status.empty?
-          puts '▲ No changes to commit. Working tree clean.'.yellow
+          puts '⚠ No changes to commit. Working tree clean.'.yellow
           return nil
         else
           # Only untracked files? Or ignored files?
@@ -76,7 +76,7 @@ module CommitGpt
           choice = prompt_no_staged_changes
           case choice
           when :add_all
-            puts '▲ Running git add .'.yellow
+            puts '→ Running git add .'.yellow
             system('git add .')
             diff_cached = `git diff --cached . #{exclusions}`.chomp
           when :exit
@@ -93,11 +93,14 @@ module CommitGpt
       if diff.length > diff_len
         choice = prompt_diff_handling(diff.length, diff_len)
         case choice
+        when :chunked
+          @chunked_mode = true
+          puts "→ Smart chunked mode: splitting #{diff.length} chars into ~#{(diff.length.to_f / diff_len).ceil} segments...".yellow
         when :truncate
-          puts "▲ Truncating diff to #{diff_len} chars...".yellow
+          puts "→ Truncating diff to #{diff_len} chars...".yellow
           diff = diff[0...diff_len]
         when :unlimited
-          puts "▲ Using full diff (#{diff.length} chars)...".yellow
+          puts "→ Using full diff (#{diff.length} chars)...".yellow
         when :exit
           return nil
         end
@@ -107,7 +110,7 @@ module CommitGpt
     end
 
     def prompt_no_staged_changes
-      puts '▲ No staged changes found (but unstaged/untracked files exist).'.yellow
+      puts '⚠ No staged changes found (but unstaged/untracked files exist).'.yellow
       prompt = TTY::Prompt.new
       begin
         prompt.select('Choose an option:') do |menu|
@@ -120,10 +123,11 @@ module CommitGpt
     end
 
     def prompt_diff_handling(current_len, max_len)
-      puts "▲ The diff is too large (#{current_len} chars, max #{max_len}).".yellow
+      puts "⚠ The diff is too large (#{current_len} chars, max #{max_len}).".yellow
       prompt = TTY::Prompt.new
       begin
         prompt.select('Choose an option:') do |menu|
+          menu.choice 'Smart chunked: split into segments and synthesize (recommended)', :chunked
           menu.choice "Use first #{max_len} characters to generate commit message", :truncate
           menu.choice 'Use unlimited characters (may fail or be slow)', :unlimited
           menu.choice 'Exit', :exit
@@ -133,6 +137,21 @@ module CommitGpt
       end
     end
 
+    def split_diff_by_length(diff, max_len)
+      chunks = []
+      current_chunk = ''
+
+      diff.each_line do |line|
+        if current_chunk.length + line.length > max_len && !current_chunk.empty?
+          chunks << current_chunk
+          current_chunk = ''
+        end
+        current_chunk += line
+      end
+      chunks << current_chunk unless current_chunk.empty?
+      chunks
+    end
+
     def detect_lock_file_changes
       # Check both staged and unstaged changes for lock files
       staged_files = `git diff --cached --name-only`.chomp.split("\n")

data/lib/commitgpt/setup_wizard.rb

@@ -28,7 +28,7 @@ module CommitGpt
       configured = ConfigManager.configured_providers
 
       if configured.empty?
-        puts "▲ No providers configured. Please run 'aicm setup' first.".red
+        puts "✖ No providers configured. Please run 'aicm setup' first.".red
         return
       end
 
@@ -69,7 +69,7 @@ module CommitGpt
       provider_config = ConfigManager.get_active_provider_config
 
       if provider_config.nil? || provider_config['api_key'].nil? || provider_config['api_key'].empty?
-        puts "▲ No active provider configured. Please run 'aicm setup'.".red
+        puts "✖ No active provider configured. Please run 'aicm setup'.".red
         return
       end
 
@@ -90,7 +90,7 @@ module CommitGpt
     def choose_format
       prompt = TTY::Prompt.new
 
-      puts "\n▲ Choose git commit message format:\n".green
+      puts "\n→ Choose git commit message format:\n".green
 
       format = prompt.select('Select format:') do |menu|
         menu.choice 'Simple - Concise commit message', 'simple'
@@ -99,7 +99,7 @@ module CommitGpt
       end
 
       ConfigManager.set_commit_format(format)
-      puts "\n▲ Commit format set to: #{format}".green
+      puts "\n✔ Commit format set to: #{format}".green
     end
 
     private
@@ -264,20 +264,20 @@ module CommitGpt
             models = response['data'] || []
             models = models.map { |m| m['id'] }.compact.sort
           else
-            puts "▲ Failed to fetch models: HTTP #{response.code}".red
+            puts "✖ Failed to fetch models: HTTP #{response.code}".red
             return nil
           end
         end
       rescue Timeout::Error
-        puts '▲ Connection timeout (5s). Please check your network, base_url, and api_key.'.red
+        puts '✖ Connection timeout (5s). Please check your network, base_url, and api_key.'.red
         exit(0)
       rescue StandardError => e
-        puts "▲ Error fetching models: #{e.message}".red
+        puts "✖ Error fetching models: #{e.message}".red
         exit(0)
       end
 
       if models.nil? || models.empty?
-        puts '▲ No models found. Please check your configuration.'.red
+        puts '✖ No models found. Please check your configuration.'.red
         exit(0)
       end
 

data/lib/commitgpt/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CommitGpt
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commitgpt
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Peng Zhang