ace-git-worktree 0.24.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 440da5b336b58817b1e6bbc1b8d57de396e78848b9e9c289d1492ca85fc7065a
-  data.tar.gz: 432c570346044a2351c72355b729501cef4723507fb64f0298307f7790edf289
+  metadata.gz: bead5eaf827aaa36f2c9cfcc51917d4462ddeef9d5df0320514d8392660bc118
+  data.tar.gz: 00fe7a68a1bb85d93d9a88d8d5ac5d89832d6a962b657e2e529f57d8ec375abe
 SHA512:
-  metadata.gz: c4c1f7d225354653e5d6d4c3ff8e88c0c8b4cee1142707e5d51181569b961b58e81fd1f64bca355a78a6675205429654420ed9776481470204342f70e7bfc9a5
-  data.tar.gz: 46e6f7112657db3d867a69db98dacbe429883672beb37b83fa35bda5b059d071a8a318fe5d26adc90835da05a3b4f74d105b096244be92beb61a904007652358
+  metadata.gz: 225bfd489abc65b33e94232f77f5d78f33403b87cc4a3980aa63481a875787ed169e5ce55d91c7ef4d886e29bd09aaf094204e4c655f903f36820a2a5777a020
+  data.tar.gz: a7e9e80a0668e0d959606e8a1e4f7bef334863bdc5a4f325272f29e2a42eb36256744dbe44ee7e6bbde61851dd478e528e24577ea1c384911407faa912fdb3d5

data/.ace-defaults/git/worktree.yml

@@ -28,11 +28,12 @@ git:
     # If true, provides enhanced navigation experience after worktree creation
     auto_navigate: true
 
-    # Launch tmux session after worktree creation
-    # Requires ace-tmux to be installed. When enabled, replaces "cd ..." hint
-    # with automatic tmux session launch rooted at the new worktree.
+    # Open a terminal window/tab after worktree creation
+    # Uses the configured terminal runtime (ace-runtime selection: explicit
+    # > ACE_RUNTIME > ace-runtime config > detection) and roots it at the
+    # new worktree. When enabled but no runtime is live, shows the cd hint.
     # Values: true | false
-    tmux: false
+    terminal: false
 
     # Task-based naming and behavior configuration
     task:

data/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.25.0] - 2026-10-04
+
+### Added
+- Post-create terminal opening goes through the `ace-runtime` contract: inside a live runtime a window/tab rooted at the worktree opens via `ensure_window`; with tmux explicitly selected outside any runtime, `ace-tmux start` bootstraps the session; explicit herdr never launches tmux; without a live runtime the cd hint is shown. Config key `tmux` renamed to `terminal` (no legacy alias, ADR-024).
+- New dependencies: `ace-runtime` (~> 0.1) and `ace-tmux` (~> 0.18, tmux adapter).
+
+## [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/docs/getting-started.md

@@ -93,7 +93,7 @@ git:
       on_delete: true
 ```
 
-Add hooks, auto-push, tmux launch, or PR automation only after the basic create/switch/remove loop feels right.
+Add hooks, auto-push, terminal launch, or PR automation only after the basic create/switch/remove loop feels right.
 
 ## Common Commands
 

data/docs/usage.md

@@ -392,7 +392,15 @@ git:
   worktree:
     root_path: ".ace-wt"
     auto_navigate: true
-    tmux: false
+    terminal: false
+    # terminal: true opens a window/tab rooted at the new worktree through
+    # the ace-runtime contract (renamed from `tmux`; boolean, no alias).
+    # Runtime selection follows ACE_RUNTIME > .ace/runtime/config.yml >
+    # detection (tmux first). Inside a live runtime the window/tab opens
+    # via the contract; with tmux explicitly selected but no live runtime,
+    # `ace-tmux start` bootstraps a session; anything else without a live
+    # runtime (including explicit herdr outside herdr) prints the cd hint
+    # instead — tmux is never launched unless tmux is the selection.
     task:
       directory_format: "task.{task_id}"
       branch_format: "{id}-{slug}"

data/lib/ace/git/worktree/commands/config_command.rb

@@ -459,7 +459,7 @@ module Ace
             provenance = {
               "root_path" => provenance_for.call("root_path"),
               "auto_navigate" => provenance_for.call("auto_navigate"),
-              "tmux" => provenance_for.call("tmux"),
+              "terminal" => provenance_for.call("terminal"),
               "mise_trust_auto" => provenance_for.call("mise_trust_auto")
             }
 

data/lib/ace/git/worktree/commands/create_command.rb

@@ -678,10 +678,10 @@ module Ace
 
             display_warnings(result[:warnings]) if result[:warnings]
 
-            # Display cd command or launch tmux
+            # Display cd command or open a terminal
             unless dry_run
               puts ""
-              launch_tmux_or_display_cd(result[:worktree_path])
+              open_terminal_or_display_cd(result[:worktree_path])
             end
           end
 
@@ -722,9 +722,9 @@ module Ace
 
             display_warnings(result[:warnings]) if result[:warnings]
 
-            # Display cd command or launch tmux
+            # Display cd command or open a terminal
             unless dry_run
-              launch_tmux_or_display_cd(result[:worktree_path])
+              open_terminal_or_display_cd(result[:worktree_path])
             end
           end
 
@@ -770,9 +770,9 @@ module Ace
 
             display_warnings(result[:warnings]) if result[:warnings]
 
-            # Display cd command or launch tmux
+            # Display cd command or open a terminal
             unless dry_run
-              launch_tmux_or_display_cd(result[:worktree_path])
+              open_terminal_or_display_cd(result[:worktree_path])
             end
           end
 
@@ -795,7 +795,7 @@ module Ace
 
               display_warnings(result[:warnings]) if result[:warnings]
               puts ""
-              launch_tmux_or_display_cd(result[:worktree_path])
+              open_terminal_or_display_cd(result[:worktree_path])
             end
           end
 
@@ -830,41 +830,74 @@ module Ace
             end
           end
 
-          # Launch tmux session or display cd hint for navigation
+          # Open a terminal for the new worktree or display cd hint
           #
-          # When tmux config is enabled and ace-tmux is available, launches a tmux
-          # session rooted at the worktree path (replaces current process).
-          # Uses `start` outside tmux and `window` inside tmux.
-          # Otherwise falls back to displaying the cd command.
+          # When terminal config is enabled, opens a window/tab rooted at the
+          # worktree through the runtime contract inside a live runtime, and
+          # falls back to the tmux-native `ace-tmux start` when tmux is the
+          # explicit selection outside any live runtime (the contract has no
+          # session-create intent). An explicit herdr selection never
+          # launches tmux. Otherwise falls back to displaying the cd command.
           #
           # @param worktree_path [String] Path to the worktree
-          def launch_tmux_or_display_cd(worktree_path)
+          def open_terminal_or_display_cd(worktree_path)
             return unless worktree_path
 
-            if tmux_enabled?
-              if ace_tmux_available?
-                command = ENV["TMUX"].to_s.strip.empty? ? "start" : "window"
-                Kernel.exec("ace-tmux", command, "--root", worktree_path)
-              else
-                puts "Warning: tmux is enabled in config but ace-tmux is not installed."
-                puts "Install ace-tmux or disable tmux in .ace/git/worktree.yml"
+            unless terminal_enabled?
+              puts "cd #{worktree_path}"
+              return
+            end
+
+            detected = Ace::Runtime.detect
+            runtime_name = explicit_runtime_name || detected&.to_s
+
+            if runtime_name.nil?
+              puts "Warning: terminal is enabled but no terminal runtime is detected."
+              puts "Run inside tmux/herdr, set ACE_RUNTIME, or configure runtime under the ace-runtime config namespace."
+              puts "cd #{worktree_path}"
+              return
+            end
+
+            if detected && detected.to_s == runtime_name
+              name = Ace::Runtime.sanitize_name(File.basename(worktree_path))
+              Ace::Runtime.resolve(runtime_name).ensure_window(name: name, root: File.expand_path(worktree_path))
+            elsif runtime_name == "tmux"
+              unless ace_tmux_available?
+                puts "Warning: tmux terminal is enabled but ace-tmux is not installed."
+                puts "Install ace-tmux or disable terminal in .ace/git/worktree.yml"
                 puts "cd #{worktree_path}"
+                return
               end
+              Kernel.exec("ace-tmux", "start", "--root", worktree_path)
             else
+              puts "Warning: the '#{runtime_name}' runtime is not live; cannot open a terminal at #{worktree_path}."
               puts "cd #{worktree_path}"
             end
+          rescue Ace::Runtime::Error => e
+            puts "Warning: failed to open a terminal window at #{worktree_path}: #{e.message}"
+            puts "cd #{worktree_path}"
+          end
+
+          # Explicit runtime selection: ACE_RUNTIME env, then the
+          # ace-runtime config namespace — the same precedence every
+          # consumer uses (k86.3). The value `auto` means "detect", never
+          # a runtime name, so it normalizes to unset.
+          def explicit_runtime_name
+            explicit = ENV["ACE_RUNTIME"].to_s.strip
+            explicit = Ace::Runtime.config["runtime"].to_s.strip if explicit.empty?
+            explicit.empty? || explicit == "auto" ? nil : explicit
           end
 
-          # Check if tmux integration is enabled in config
+          # Check if terminal integration is enabled in config
           #
-          # @return [Boolean] true if tmux is enabled
-          def tmux_enabled?
+          # @return [Boolean] true if terminal launch is enabled
+          def terminal_enabled?
             require_relative "../molecules/config_loader"
             config_loader = Ace::Git::Worktree::Molecules::ConfigLoader.new
             config = config_loader.load
             return false unless config
 
-            config.tmux?
+            config.terminal?
           rescue
             false
           end

data/lib/ace/git/worktree/models/worktree_config.rb

@@ -29,7 +29,7 @@ module Ace
           DEFAULT_CONFIG = {
             "root_path" => ".ace-wt",
             "auto_navigate" => true,
-            "tmux" => false,
+            "terminal" => false,
             "mise_trust_auto" => true,
             "task" => {
               "directory_format" => "t.{task_id}",
@@ -76,7 +76,7 @@ module Ace
           # Configuration namespace paths
           CONFIG_NAMESPACE = ["git", "worktree"].freeze
 
-          attr_reader :root_path, :auto_navigate, :tmux, :mise_trust_auto, :task_config, :pr_config, :branch_config, :cleanup_config, :bootstrap_config, :hooks_config
+          attr_reader :root_path, :auto_navigate, :terminal, :mise_trust_auto, :task_config, :pr_config, :branch_config, :cleanup_config, :bootstrap_config, :hooks_config
 
           # Initialize a new WorktreeConfig
           #
@@ -111,11 +111,11 @@ module Ace
             @auto_navigate
           end
 
-          # Check if tmux session should be launched after worktree creation
+          # Check if a terminal window should be opened after worktree creation
           #
-          # @return [Boolean] true if tmux launch is enabled
-          def tmux?
-            @tmux
+          # @return [Boolean] true if terminal launch is enabled
+          def terminal?
+            @terminal
           end
 
           # Check if mise should automatically trust worktree directories
@@ -458,7 +458,7 @@ module Ace
           def initialize_attributes
             @root_path = @merged_config["root_path"]
             @auto_navigate = @merged_config["auto_navigate"]
-            @tmux = @merged_config["tmux"]
+            @terminal = @merged_config["terminal"]
             @mise_trust_auto = @merged_config["mise_trust_auto"]
             @task_config = @merged_config["task"] || {}
             @pr_config = @merged_config["pr"] || {}

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.25.0"
     end
   end
 end

data/lib/ace/git/worktree.rb

@@ -12,6 +12,7 @@ end
 # Core ace-git dependency for Git operations
 require "ace/git"
 require "ace/support/config"
+require "ace/runtime"
 
 require_relative "worktree/version"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ace-git-worktree
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Michal Czyz
 bindir: exe
 cert_chain: []
-date: 2026-09-29 00:00:00.000000000 Z
+date: 2026-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-support-cli
@@ -79,6 +79,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.37'
+- !ruby/object:Gem::Dependency
+  name: ace-runtime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: ace-tmux
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement