hunkify 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 374b11ac3893bb113123d303f53df7cb2a613ec21e3aa89919e908d6b1e33225
-  data.tar.gz: cbc1210aee6014e214044a026997b679f519fd03ae58ad3f06fba3b37de98fd4
+  metadata.gz: 488c3d31406ccddec198dfa1f48e26ae6fe88ac4830e4dc3152ed8378a718a07
+  data.tar.gz: ea034c42d3dac0e85ef205243ed9da7875f280b3c756e42bfa37afb8dbe99fd8
 SHA512:
-  metadata.gz: 9ca7b307b7494da84e3279d56a32c7111098890dfe48b6c052811f4dd4d096c133bbe2fe7669211c6ce2d4d62b074b87f3f84f97ec8505eecddcc39ada2ed11c
-  data.tar.gz: 66921d70a096260089119bf16f4bdc847bfba0cf67b23cf97e802455886f5fa875c9ad15158fc2c952708f462656bce63754383ceb4ec1585fcf0bb06004c07b
+  metadata.gz: 44222ddc4ec5685814d177030618a964555fd4562b77cd58bc1c3ea06fd5a989de48fb5fc31fc3b529c1357c28763a57d68908c07556612bbe830b6d9ff2475d
+  data.tar.gz: 26a34a3f74cacdaca9b4a2f0a75bbd201266bce7b05ab7bf27c77c615122cab30db0e3f90480738318638fc96aa5a034d72dcba2903c7f995bb16fa53b0dbeba

data/README.md

@@ -1,13 +1,13 @@
 # hunkify
 
-Split your staged changes into atomic, well-scoped commits — powered by Claude.
+Split your staged changes into atomic, well-scoped commits — powered by GitHub Copilot through OpenCode.
 
-Instead of cramming everything into a single `git commit -m "wip"`, `hunkify` parses your staged diff hunk by hunk, asks Claude to group them by intent, and produces conventional commits (with gitmojis) ready to apply.
+Instead of cramming everything into a single `git commit -m "wip"`, `hunkify` parses your staged diff hunk by hunk, asks OpenCode to group them by intent using GitHub Copilot, and produces conventional commits (with gitmojis) ready to apply.
 
 ## Features
 
 - **Hunk-level analysis** — each change block is treated independently, so one file can span multiple commits if needed.
-- **AI-powered grouping** via Claude Haiku 4.5 — fast, cheap, accurate.
+- **AI-powered grouping** via GitHub Copilot and OpenCode.
 - **Gitmoji + conventional commits** — `:sparkles: feat(scope): …`, `:bug: fix(scope): …`, etc.
 - **Interactive review** — confirm, edit, or skip each proposed commit before it's created.
 - **Free-form context argument** — pass a ticket ID, feature name, or any directive to steer the output.
@@ -16,7 +16,7 @@ Instead of cramming everything into a single `git commit -m "wip"`, `hunkify` pa
 ## Requirements
 
 - Ruby ≥ 2.7
-- An [Anthropic API key](https://console.anthropic.com/)
+- [OpenCode](https://opencode.ai/) authenticated with GitHub Copilot
 
 ## Installation
 
@@ -32,10 +32,10 @@ gem "hunkify"
 
 ## Setup
 
-Export your Anthropic API key (add to your `~/.zshrc` or `~/.bashrc`):
+Authenticate OpenCode with GitHub Copilot:
 
 ```bash
-export ANTHROPIC_API_KEY=sk-ant-...
+opencode providers login
 ```
 
 ## Usage
@@ -56,7 +56,7 @@ hunkify "focus on refactoring"
 ### Workflow
 
 1. `hunkify` parses your staged diff into hunks.
-2. Claude proposes a grouping into logical commits.
+2. OpenCode asks GitHub Copilot to propose a grouping into logical commits.
 3. For each proposed commit, you can **confirm**, **edit the message**, **skip**, or **quit**.
 4. After a final confirmation, the plan is applied — each commit is created via `git apply --cached`.
 

data/lib/hunkify/cli.rb

@@ -3,7 +3,7 @@
 require_relative "color"
 require_relative "diff_parser"
 require_relative "git"
-require_relative "anthropic_api"
+require_relative "opencode"
 require_relative "ui"
 
 module Hunkify
@@ -43,11 +43,11 @@ module Hunkify
 
       hunks_by_id = hunks.each_with_object({}) { |h, acc| acc[h.id] = h }
 
-      puts Color.dim("  Analyzing and grouping via Claude #{AnthropicAPI::MODEL}...")
+      puts Color.dim("  Analyzing and grouping via OpenCode #{OpenCode::MODEL}...")
       puts
 
       begin
-        result = AnthropicAPI.group_hunks(hunks, context: context)
+        result = OpenCode.group_hunks(hunks, context: context)
       rescue JSON::ParserError
         puts Color.red("  ✗ Invalid AI response (malformed JSON). Try again.")
         exit 1

data/lib/hunkify/{anthropic_api.rb → opencode.rb}

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-require "net/http"
 require "json"
-require "uri"
+require "open3"
 
 module Hunkify
-  module AnthropicAPI
-    API_URL = "https://api.anthropic.com/v1/messages"
-    MODEL = "claude-haiku-4-5-20251001"
+  module OpenCode
+    MODEL = "github-copilot/gpt-5.6-terra"
 
     SYSTEM_PROMPT = <<~PROMPT
       You are a Git expert. You are given a list of hunks (blocks of modifications)
@@ -17,7 +15,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):
       {
@@ -26,11 +37,6 @@ module Hunkify
             "message": ":sparkles: feat(scope): description in English",
             "hunk_ids": [1, 3, 5],
             "reasoning": "brief explanation of the grouping"
-          },
-          {
-            "message": ":bug: fix(scope): description in English",
-            "hunk_ids": [2, 4],
-            "reasoning": "brief explanation"
           }
         ]
       }
@@ -52,53 +58,6 @@ module Hunkify
       RESPOND ONLY WITH THE JSON. No markdown, no explanation.
     PROMPT
 
-    def self.group_hunks(hunks, context: nil)
-      api_key = ENV["ANTHROPIC_API_KEY"]
-      raise "ANTHROPIC_API_KEY missing! Add it to your ~/.zshrc or ~/.bashrc" if api_key.nil? || api_key.empty?
-
-      user_ctx = context && !context.empty? ? "\nUser context: #{context}" : ""
-      hunks_summary = hunks.map(&:to_summary).join("\n\n---\n\n")
-      user_message = "#{user_ctx}\n\nHere are the hunks to group:\n\n#{hunks_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: 1024,
-        system: 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"
-
-      raw = body.dig("content", 0, "text")&.strip
-
-      if ENV["HUNKIFY_DEBUG"]
-        warn "\n--- RAW AI RESPONSE ---\n#{raw}\n-----------------------\n"
-      end
-
-      cleaned = raw
-        .gsub(/\A```(?:json)?\s*/i, "")
-        .gsub(/\s*```\z/, "")
-        .strip
-
-      if (match = cleaned.match(/(\{.+\})/m))
-        cleaned = match[1]
-      end
-
-      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
@@ -119,35 +78,36 @@ module Hunkify
       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?
+    def self.group_hunks(hunks, context: nil)
+      user_ctx = context && !context.empty? ? "\nUser context: #{context}" : ""
+      summary = hunks.map(&:to_summary).join("\n\n---\n\n")
+      raw = ask(SYSTEM_PROMPT, "#{user_ctx}\n\nHere are the hunks to group:\n\n#{summary}")
+      cleaned = raw.gsub(/\A```(?:json)?\s*/i, "").gsub(/\s*```\z/, "").strip
+      cleaned = Regexp.last_match(1) if cleaned.match(/(\{.+\})/m)
+      JSON.parse(cleaned)
+    end
 
+    def self.suggest_message(hunks, context: nil)
       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
+      ask(SUGGEST_SYSTEM_PROMPT, "#{user_ctx}\n\nHunks to bundle into a single commit:\n\n#{summary}").lines.first.to_s.strip
+    end
+
+    def self.ask(system_prompt, user_message)
+      output, status = Open3.capture2e("opencode", "run", "--model", MODEL, "--format", "json", "#{system_prompt}\n\n#{user_message}")
+      raise "OpenCode failed: #{output.strip}" unless status.success?
+
+      raw = output.lines.filter_map do |line|
+        event = JSON.parse(line)
+        event.dig("part", "text") if event["type"] == "text"
+      rescue JSON::ParserError
+        nil
+      end.join.strip
+
+      raise "OpenCode returned no text response" if raw.empty?
+
+      warn "\n--- RAW AI RESPONSE ---\n#{raw}\n-----------------------\n" if ENV["HUNKIFY_DEBUG"]
+      raw
     end
   end
 end

data/lib/hunkify/ui.rb

@@ -12,7 +12,7 @@ module Hunkify
       puts
       puts "  #{Color.magenta("▲")} #{Color.bold("hunkify")} #{Color.dim("v#{version}")}"
       puts "  #{Color.dim("─" * 40)}"
-      puts "  #{Color.dim("Atomic commits, grouped by Claude.")}"
+      puts "  #{Color.dim("Atomic commits, grouped by GitHub Copilot.")}"
       puts
     end
 
@@ -65,9 +65,9 @@ module Hunkify
 
     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... ")
+      print Color.dim("  Asking OpenCode for a suggestion... ")
       begin
-        suggestion = AnthropicAPI.suggest_message(hunks, context: context)
+        suggestion = OpenCode.suggest_message(hunks, context: context)
       rescue => e
         puts Color.red("failed (#{e.message})")
         suggestion = nil

data/lib/hunkify/version.rb

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

data/lib/hunkify.rb

@@ -5,7 +5,7 @@ require_relative "hunkify/color"
 require_relative "hunkify/hunk"
 require_relative "hunkify/diff_parser"
 require_relative "hunkify/git"
-require_relative "hunkify/anthropic_api"
+require_relative "hunkify/opencode"
 require_relative "hunkify/ui"
 require_relative "hunkify/cli"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hunkify
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tom SCHIAVI
@@ -9,8 +9,8 @@ bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
-description: hunkify analyzes staged hunks, asks Claude to group them into logical
-  commits, and applies them via git apply --cached.
+description: hunkify analyzes staged hunks, asks OpenCode with GitHub Copilot to group
+  them into logical commits, and applies them via git apply --cached.
 executables:
 - hunkify
 extensions: []
@@ -20,12 +20,12 @@ files:
 - README.md
 - bin/hunkify
 - lib/hunkify.rb
-- lib/hunkify/anthropic_api.rb
 - lib/hunkify/cli.rb
 - lib/hunkify/color.rb
 - lib/hunkify/diff_parser.rb
 - lib/hunkify/git.rb
 - lib/hunkify/hunk.rb
+- lib/hunkify/opencode.rb
 - lib/hunkify/ui.rb
 - lib/hunkify/version.rb
 homepage: https://github.com/tomschiavi/smartcommit
@@ -51,5 +51,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 4.0.8
 specification_version: 4
-summary: Split staged changes into atomic commits using Claude.
+summary: Split staged changes into atomic commits using GitHub Copilot.
 test_files: []