ace-git-commit 0.26.6 → 0.26.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47e694b77027588d1a8b4d12754efebcf2cd6aa994abb41110938694aba45e8c
-  data.tar.gz: 8154e8506beddee72c3fc209eb8af93bdfe31e0640c60df3dcb9b13fa28831f8
+  metadata.gz: b923bd1c9c55112988b6d4660cb438272ae14fec40032e2133a1c1f9d756262b
+  data.tar.gz: ab305eeca970773a27973b5bef25e57fc45b9c9eea9037967f5e8769b708e4ee
 SHA512:
-  metadata.gz: 969cab507472223f8fd543ccb2c6656347b36ed275290847145d6430c0d0f492aeb521b4de1ce805c101987a16d3936e5fad8566cd55f3d6d6d86be8c960f6fe
-  data.tar.gz: 19b9c0f1355f3c48e222aa5a3a4f5bd828f6aa6b01772719b0c4fbc324f768f7e28262469ccae5972d4fc71dc159998ccf0678a55ca0ca7d0c4f2fa9bbb72e77
+  metadata.gz: c627282622edcad7f63fe2d44380fa806069e30d98e781bd3036b1901c3bbbd029a12a473a4a8fea19d5b9fdf0b22f7f46597893759de04a5de0e496e357dd9f
+  data.tar.gz: 9e8faa8297cd6cec30a1b21b7f90c11d2ea313eda446386ddd16572959b18eb94c304db5c050905bbb17ef99c0fa3623c61b4df998bd2c14a00ab3386c36b491

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.26.7] - 2026-10-06
+
+### Fixed
+
+- Refuse commit preparation during active native Git operations before changing the index, including scoped, staged-only, split and dry-run modes; preserve operation state and report native continuation guidance.
+
 
 ## [0.26.6] - 2026-09-02
 

data/lib/ace/git_commit/molecules/git_operation_detector.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Ace
+  module GitCommit
+    module Molecules
+      # Read-only inspection of the current worktree's native Git operation state.
+      class GitOperationDetector
+        MARKERS = {
+          "rebase-merge" => ["rebase", "git rebase --continue"],
+          "rebase-apply" => ["rebase", "git rebase --continue"],
+          "MERGE_HEAD" => ["merge", "git commit"],
+          "CHERRY_PICK_HEAD" => ["cherry-pick", "git cherry-pick --continue"],
+          "REVERT_HEAD" => ["revert", "git revert --continue"],
+          "sequencer" => ["sequencer", "git status and follow its native continuation guidance"]
+        }.freeze
+
+        def initialize(git_executor)
+          @git = git_executor
+        end
+
+        def detect
+          MARKERS.each do |marker, operation|
+            path = @git.execute("rev-parse", "--git-path", marker).delete_suffix("\n")
+            raise GitError, "Git returned an empty metadata path for #{marker}" if path.empty?
+            next unless present?(path)
+
+            return ["git-am", "git am --continue"] if marker == "rebase-apply" && present?(File.join(path, "applying"))
+
+            return operation
+          rescue GitError, SystemCallError => e
+            raise GitError, "Cannot inspect Git operation state (#{marker}): #{e.message}. " \
+              "Check metadata access and run git status before retrying."
+          end
+          nil
+        end
+
+        private
+
+        def present?(path)
+          File.stat(path)
+          true
+        rescue Errno::ENOENT
+          false
+        end
+      end
+    end
+  end
+end

data/lib/ace/git_commit/organisms/commit_orchestrator.rb

@@ -28,6 +28,10 @@ module Ace
         # @return [Boolean] True if successful
         def execute(options)
           validate_repository!
+          operation = Molecules::GitOperationDetector.new(@git).detect
+          if operation
+            raise GitError, "Cannot commit during active #{operation.first}. Finish with #{operation.last}."
+          end
 
           if options.debug
             puts "Debug: Commit options:"

data/lib/ace/git_commit/version.rb

@@ -2,6 +2,6 @@
 
 module Ace
   module GitCommit
-    VERSION = "0.26.6"
+    VERSION = "0.26.7"
   end
 end

data/lib/ace/git_commit.rb

@@ -9,6 +9,7 @@ require "ace/llm"
 # Require all components
 require_relative "git_commit/atoms/git_executor"
 require_relative "git_commit/atoms/gitignore_checker"
+require_relative "git_commit/molecules/git_operation_detector"
 require_relative "git_commit/molecules/diff_analyzer"
 require_relative "git_commit/molecules/message_generator"
 require_relative "git_commit/molecules/file_stager"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ace-git-commit
 version: !ruby/object:Gem::Version
-  version: 0.26.6
+  version: 0.26.7
 platform: ruby
 authors:
 - Michal Czyz
 bindir: exe
 cert_chain: []
-date: 2026-09-05 00:00:00.000000000 Z
+date: 2026-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-support-cli
@@ -118,6 +118,7 @@ files:
 - lib/ace/git_commit/molecules/commit_summarizer.rb
 - lib/ace/git_commit/molecules/diff_analyzer.rb
 - lib/ace/git_commit/molecules/file_stager.rb
+- lib/ace/git_commit/molecules/git_operation_detector.rb
 - lib/ace/git_commit/molecules/message_generator.rb
 - lib/ace/git_commit/molecules/path_resolver.rb
 - lib/ace/git_commit/molecules/split_commit_executor.rb