ace-git-worktree 0.24.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 440da5b336b58817b1e6bbc1b8d57de396e78848b9e9c289d1492ca85fc7065a
-  data.tar.gz: 432c570346044a2351c72355b729501cef4723507fb64f0298307f7790edf289
+  metadata.gz: 9cc5a752911b79c40cf895ba0431dbde985c56c96fe628af54d7cb675a65933a
+  data.tar.gz: e0cd68c94bc6b67e400df61262538edee3c9dfd045cbff28e783b4f9a454b67b
 SHA512:
-  metadata.gz: c4c1f7d225354653e5d6d4c3ff8e88c0c8b4cee1142707e5d51181569b961b58e81fd1f64bca355a78a6675205429654420ed9776481470204342f70e7bfc9a5
-  data.tar.gz: 46e6f7112657db3d867a69db98dacbe429883672beb37b83fa35bda5b059d071a8a318fe5d26adc90835da05a3b4f74d105b096244be92beb61a904007652358
+  metadata.gz: 377f121307f98729bc20a0f62be300ad1a9fe62ecc7434edbb976b49fec7a0c2d29853e525a70054514b0cb3524e5fa67242674d3ab649e26f636f361439e4df
+  data.tar.gz: 11783401d8ff7fa04a37b00611cd438e25bfcb936bc30064f6091b19c84a5e2a0257c90c12a7af64ae63dd41b818ece145a992234bef4a282a04c006260551f4

data/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.24.1] - 2026-09-29
+
+### Fixed
+- Cleanup merge proof requires PR evidence provenance (server, repository,
+  branch, base) to agree with the resolved selection; incomplete or
+  conflicting provenance retains the candidate, so identical branch/PR
+  numbers in different repositories can never cross-prove removal.
+- Cleanup targets resolve to the PR base branch across ref forms:
+  bare ("main"), remote-prefixed ("origin/main"), and fully qualified
+  ("refs/heads/main", "refs/remotes/origin/main").
+
 ## [0.24.0] - 2026-09-28
 
 ### Added

data/lib/ace/git/worktree/molecules/cleanup_pr_resolver.rb

@@ -14,8 +14,11 @@ module Ace
         # Only confirmed remote merge evidence (:merged) can prove removal;
         # object states (:no_pr, :open, :closed_unmerged) and transport
         # failures (:offline, :authentication_error, :malformed) always
-        # retain the candidate. Local ancestry proof is handled by the
-        # reporter before this resolver is consulted.
+        # retain the candidate. Merge proof additionally requires the
+        # evidence's provenance (server, repository, branch, base) to agree
+        # with the resolved selection; incomplete or conflicting provenance
+        # retains. Local ancestry proof is handled by the reporter before
+        # this resolver is consulted.
         class CleanupPrResolver
           # @param target [String] base ref the PR must have targeted
           # @param target_sha [String] commit SHA of the target
@@ -57,7 +60,10 @@ module Ace
             return unproven_result(:no_pr) unless evidence
             return unproven_result(:open) if evidence.state == :open
             return unproven_result(:closed_unmerged) if evidence.state == :closed
-            return unproven_result(:no_pr, "state_unavailable") unless evidence.state == :merged
+            return unproven_result(:merged, "state_unavailable") unless evidence.state == :merged
+
+            problem = provenance_problem(evidence, branch)
+            return unproven_result(:merged, problem) if problem
             return unproven_result(:merged, "merge_commit_unavailable") unless evidence.merge_commit_sha
             return unproven_result(:merged, "merge_commit_unreachable") unless ancestor?(evidence.merge_commit_sha, @target_sha)
 
@@ -118,6 +124,53 @@ module Ace
             end
           end
 
+          # Merge proof may only remove a candidate whose evidence provably
+          # belongs to the resolved server and the candidate's branch/base.
+          # PR and branch identities are not globally unique: incomplete
+          # provenance cannot be verified and conflicting provenance means
+          # the evidence was routed from another repository — both retain.
+          # @return [String, nil] retention reason, or nil when provenance agrees
+          def provenance_problem(evidence, branch)
+            server = resolved_server
+            unless server && evidence.server_name && evidence.base_repository_url &&
+                evidence.head_ref && evidence.base_ref
+              return "provenance_incomplete"
+            end
+
+            return "provenance_conflict" unless evidence.server_name == server.name
+            return "provenance_conflict" unless Ace::Git::Atoms::ServerUrl.match?(evidence.base_repository_url, server.url)
+            return "provenance_conflict" unless evidence.head_ref == branch
+            return "provenance_conflict" unless evidence.base_ref == target_branch
+
+            nil
+          end
+
+          # The branch the PR must have targeted. Targets arrive as bare
+          # branch names, remote-tracking refs ("origin/main",
+          # "refs/remotes/origin/main"), or local refs ("refs/heads/main");
+          # all of those forms name the same branch the PR base reports. A
+          # path segment only counts as a remote prefix when it names a
+          # configured git remote, so slashed branch names stay strict.
+          def target_branch
+            ref = @target.to_s
+            ref = ref.sub(%r{\Arefs/remotes/([^/]+)/}) do
+              git_remotes.include?(Regexp.last_match(1)) ? "" : Regexp.last_match(0)
+            end
+            ref = ref.sub(%r{\Arefs/heads/}, "")
+            if ref.include?("/")
+              prefix, rest = ref.split("/", 2)
+              ref = rest if git_remotes.include?(prefix)
+            end
+            ref
+          end
+
+          def git_remotes
+            out, _status = Open3.capture2("git", "remote")
+            out.to_s.lines.map(&:strip).reject(&:empty?)
+          rescue StandardError
+            []
+          end
+
           def proof_result(evidence, proof, candidate_sha, pr_head_sha, merge_commit_sha)
             {
               status: :merged,

data/lib/ace/git/worktree/version.rb

@@ -3,7 +3,7 @@
 module Ace
   module Git
     module Worktree
-      VERSION = "0.24.0"
+      VERSION = "0.24.1"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ace-git-worktree
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.24.1
 platform: ruby
 authors:
 - Michal Czyz
 bindir: exe
 cert_chain: []
-date: 2026-09-29 00:00:00.000000000 Z
+date: 2026-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-support-cli