hunkify 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 462d60419d0723593916ed35414e3f70ba61df1284f13aeaf640d7d45e0aaed3
-  data.tar.gz: 720035e85d1c6f7b8770a361e0e2a6cde7a98b6e9eeb3e1fffbe95054bfda91f
+  metadata.gz: 0ba6dab53be5bab36d05e9535bc0590a858638840987a0a3c9ee37253279c1fa
+  data.tar.gz: 30d6ac6b5f76e1ec04d04d2815f733c9bd514393d9cbe5823b0670107a0bf875
 SHA512:
-  metadata.gz: 7a51c9e785a105b186221212c7eb5a5111a2da5a58462cb7359bedd8a3312ebb9f34f4f73dfd1ee0e244ffe01f7f772d4501b1439daf772443a0e0b8df445e5e
-  data.tar.gz: 6f0fafc113ff3398179b232a198372e0fcd4249bac99981e5dedf704a638adb3472d58b43f02c7825cfbd95e6d0ba3f33f07dcbe76c042cf8a6a3d47ff769e03
+  metadata.gz: ea9993ade4e70d1fa2a2d88a3ce3cc0769209685bc54102a286601768c15f31e8706dccc5e1f61fa919b4bf886421df2ba7940e7a8277a494e9d2e2a93d65f29
+  data.tar.gz: 07c1b7fdff6146ff9425921b46cc0ba8ae004dd4faa94a54688dd0b16169be61d574aea71b4ef7b0c5d749684e721612eaf6f003530e571895022ef1d0233967

data/lib/hunkify/anthropic_api.rb

@@ -17,7 +17,20 @@ module Hunkify
       - One commit = one unique intent (feat, fix, refactor, style, etc.)
       - Hunks in different files CAN belong to the same commit if they serve the same intent
       - Hunks in the SAME file can belong to DIFFERENT commits if they are semantically distinct
-      - Prefer atomic and independent commits
+      - STRONGLY prefer fine-grained, atomic commits over large bundled ones.
+        When in doubt, SPLIT rather than merge.
+      - Heuristics to split:
+        * Different modules/components/features → different commits
+        * Core logic vs. tests → different commits (one feat commit + one test commit)
+        * Core logic vs. docs → different commits
+        * Core logic vs. config/build files → different commits
+        * Unrelated fixes bundled with a feature → separate them
+        * Each file introducing a new, independent capability usually deserves
+          its own commit
+      - Only bundle hunks together when they genuinely cannot be reviewed or
+        reverted independently.
+      - Err on the side of MORE commits. A PR with 8 small focused commits is
+        better than one with 3 large ones.
 
       RESPONSE FORMAT (strict JSON, no surrounding text):
       {
@@ -98,5 +111,56 @@ module Hunkify
 
       JSON.parse(cleaned)
     end
+
+    SUGGEST_SYSTEM_PROMPT = <<~PROMPT
+      You are a Git expert. You are given one or more hunks that the user wants
+      to bundle into a single commit. Produce ONE conventional commit message
+      following these rules:
+
+      - Gitmoji + type + scope: ":sparkles: feat(scope): short description"
+      - Types: feat, fix, refactor, style, test, docs, config, build, perf, security
+      - In English, imperative, no leading capital, no trailing period
+      - Max 72 characters
+      - If a user context is provided, use it to steer scope/wording. If it looks
+        like a ticket ID, use it as the scope.
+
+      AVAILABLE GITMOJIS:
+      :sparkles: feat | :bug: fix | :recycle: refactor | :lipstick: style
+      :white_check_mark: test | :memo: docs | :wrench: config | :package: build
+      :zap: perf | :lock: security
+
+      RESPOND ONLY WITH THE MESSAGE. No markdown, no quotes, no explanation.
+    PROMPT
+
+    def self.suggest_message(hunks, context: nil)
+      api_key = ENV["ANTHROPIC_API_KEY"]
+      raise "ANTHROPIC_API_KEY missing!" if api_key.nil? || api_key.empty?
+
+      user_ctx = context && !context.empty? ? "\nUser context: #{context}" : ""
+      summary = hunks.map(&:to_summary).join("\n\n---\n\n")
+      user_message = "#{user_ctx}\n\nHunks to bundle into a single commit:\n\n#{summary}"
+
+      uri = URI(API_URL)
+      http = Net::HTTP.new(uri.host, uri.port)
+      http.use_ssl = true
+      http.read_timeout = 30
+
+      request = Net::HTTP::Post.new(uri.path)
+      request["Content-Type"] = "application/json"
+      request["x-api-key"] = api_key
+      request["anthropic-version"] = "2023-06-01"
+      request.body = JSON.generate({
+        model: MODEL,
+        max_tokens: 128,
+        system: SUGGEST_SYSTEM_PROMPT,
+        messages: [{role: "user", content: user_message}]
+      })
+
+      response = http.request(request)
+      body = JSON.parse(response.body)
+      raise "API Error #{response.code}: #{body["error"]&.dig("message")}" unless response.code == "200"
+
+      body.dig("content", 0, "text").to_s.strip.lines.first.to_s.strip
+    end
   end
 end

data/lib/hunkify/cli.rb

@@ -70,6 +70,8 @@ module Hunkify
 
       UI.print_grouping(commits_data, hunks_by_id)
 
+      UI.reassign_loop(commits_data, hunks_by_id, context: context)
+
       plan = []
       commits_data.each_with_index do |c, i|
         puts Color.bold("  Commit #{i + 1}/#{commits_data.size}:")

data/lib/hunkify/ui.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "color"
+require "readline"
 
 module Hunkify
   module UI
@@ -41,6 +42,170 @@ module Hunkify
       end
     end
 
+    def reassign_loop(commits_data, hunks_by_id, context: nil)
+      loop do
+        print "  #{Color.yellow("[m]")} Move hunk  #{Color.yellow("[n]")} New commit  #{Color.yellow("[Enter]")} Continue  #{Color.yellow("[q]")} Quit: "
+        input = $stdin.gets.chomp.downcase
+
+        case input
+        when ""
+          return
+        when "q"
+          puts Color.red("\n  Cancelled.")
+          exit 0
+        when "m"
+          move_hunk(commits_data, hunks_by_id, context: context)
+        when "n"
+          new_commit(commits_data, hunks_by_id, context: context)
+        else
+          puts Color.dim("  (unknown command)")
+        end
+      end
+    end
+
+    def prompt_new_message(hunk_ids, hunks_by_id, context:)
+      hunks = hunk_ids.map { |id| hunks_by_id[id] }.compact
+      print Color.dim("  Asking Claude for a suggestion... ")
+      begin
+        suggestion = AnthropicAPI.suggest_message(hunks, context: context)
+      rescue => e
+        puts Color.red("failed (#{e.message})")
+        suggestion = nil
+      end
+      puts
+
+      if suggestion && !suggestion.empty?
+        puts "  #{Color.dim("suggested:")} #{Color.green(suggestion)}"
+        print "  #{Color.yellow("[Enter]")} Accept  #{Color.yellow("[type]")} Override: "
+      else
+        print "  Commit message: "
+      end
+
+      input = $stdin.gets.chomp
+      input.empty? ? suggestion : input
+    end
+
+    def print_hunk(hunk, max_lines: 25)
+      added = hunk.lines.count { |l| l.start_with?("+") }
+      removed = hunk.lines.count { |l| l.start_with?("-") }
+
+      title = "Hunk [#{hunk.id}] · #{hunk.file_path}  #{Color.green("+#{added}")} #{Color.red("-#{removed}")}"
+      # visible width: strip ANSI to compute padding
+      visible = title.gsub(/\e\[[0-9;]*m/, "")
+      inner_w = [visible.length + 4, 60].max
+
+      puts
+      puts Color.dim("  ╭─ ") + title + " " + Color.dim("─" * [inner_w - visible.length - 4, 1].max) + Color.dim("╮")
+      puts Color.dim("  │ ") + Color.dim(hunk.hunk_header)
+
+      lines = hunk.lines
+      truncated = lines.size > max_lines
+      shown = truncated ? lines.first(max_lines) : lines
+
+      shown.each do |line|
+        colored =
+          if line.start_with?("+")
+            Color.green(line)
+          elsif line.start_with?("-")
+            Color.red(line)
+          else
+            line
+          end
+        puts Color.dim("  │ ") + colored
+      end
+
+      if truncated
+        puts Color.dim("  │ … #{lines.size - max_lines} more line(s)")
+      end
+
+      puts Color.dim("  ╰" + "─" * (inner_w + 2) + "╯")
+      puts
+    end
+
+    def move_hunk(commits_data, hunks_by_id, context: nil)
+      print "  Hunk id? "
+      hunk_id = $stdin.gets.chomp.to_i
+      unless hunks_by_id.key?(hunk_id)
+        puts Color.red("  ✗ Unknown hunk id.")
+        return
+      end
+
+      print_hunk(hunks_by_id[hunk_id])
+
+      print "  Target commit (1-#{commits_data.size}, 'new', or 'c' to cancel): "
+      target = $stdin.gets.chomp.downcase
+
+      if target.empty? || target == "c" || target == "cancel"
+        puts Color.dim("  Cancelled.")
+        return
+      end
+
+      commits_data.each { |c| c["hunk_ids"].delete(hunk_id) }
+
+      if target == "new"
+        msg = prompt_new_message([hunk_id], hunks_by_id, context: context)
+        if msg.nil? || msg.empty?
+          puts Color.red("  ✗ Empty message, reassignment cancelled.")
+          reinsert_hunk(commits_data, hunk_id)
+          return
+        end
+        commits_data << {"message" => msg, "hunk_ids" => [hunk_id], "reasoning" => "manual"}
+      else
+        idx = target.to_i - 1
+        unless (0...commits_data.size).cover?(idx)
+          puts Color.red("  ✗ Invalid target.")
+          reinsert_hunk(commits_data, hunk_id)
+          return
+        end
+        commits_data[idx]["hunk_ids"] << hunk_id
+      end
+
+      commits_data.reject! { |c| c["hunk_ids"].empty? }
+      puts
+      print_grouping(commits_data, hunks_by_id)
+    end
+
+    def new_commit(commits_data, hunks_by_id, context: nil)
+      print "  Hunk ids (space-separated): "
+      ids = $stdin.gets.chomp.split.map(&:to_i)
+      ids = ids.select { |id| hunks_by_id.key?(id) }
+      if ids.empty?
+        puts Color.red("  ✗ No valid hunk ids.")
+        return
+      end
+
+      msg = prompt_new_message(ids, hunks_by_id, context: context)
+      if msg.nil? || msg.empty?
+        puts Color.red("  ✗ Empty message, cancelled.")
+        return
+      end
+
+      commits_data.each { |c| c["hunk_ids"] -= ids }
+      commits_data << {"message" => msg, "hunk_ids" => ids, "reasoning" => "manual"}
+      commits_data.reject! { |c| c["hunk_ids"].empty? }
+      puts
+      print_grouping(commits_data, hunks_by_id)
+    end
+
+    def prefill_readline(prompt, default)
+      Readline.pre_input_hook = lambda do
+        Readline.insert_text(" #{default}")
+        Readline.redisplay
+        Readline.pre_input_hook = nil
+      end
+      result = Readline.readline(prompt, false)
+      result&.sub(/\A /, "")
+    end
+
+    def reinsert_hunk(commits_data, hunk_id)
+      # Hunk was removed in advance; put it back somewhere safe.
+      if commits_data.any?
+        commits_data.first["hunk_ids"] << hunk_id
+      else
+        commits_data << {"message" => "unassigned", "hunk_ids" => [hunk_id], "reasoning" => "manual"}
+      end
+    end
+
     def prompt_edit_commit(commit_data, _index, _total)
       print "  #{Color.yellow("[Enter]")} Confirm  #{Color.yellow("[e]")} Edit message  #{Color.yellow("[s]")} Skip  #{Color.yellow("[q]")} Quit: "
       input = $stdin.gets.chomp.downcase
@@ -49,9 +214,8 @@ module Hunkify
       when ""
         commit_data["message"]
       when "e"
-        print "  ✏️  New message: "
-        new_msg = $stdin.gets.chomp
-        new_msg.empty? ? commit_data["message"] : new_msg
+        new_msg = prefill_readline("  ✏️  New message: ", commit_data["message"])
+        new_msg.to_s.empty? ? commit_data["message"] : new_msg
       when "s"
         nil
       when "q"

data/lib/hunkify/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hunkify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tom SCHIAVI