ace-git-worktree 0.21.8 → 0.22.0

data/lib/ace/git/worktree/organisms/task_worktree_orchestrator.rb

@@ -28,7 +28,7 @@ module Ace
             @config = config || load_configuration
             @task_fetcher = Molecules::TaskFetcher.new
             @task_status_updater = Molecules::TaskStatusUpdater.new
-            @task_committer = Molecules::TaskCommitter.new
+            @task_committer = Molecules::TaskCommitter.new(project_root: project_root)
             @task_pusher = Molecules::TaskPusher.new
             @worktree_creator = Molecules::WorktreeCreator.new
             @pr_creator = Molecules::PrCreator.new
@@ -80,6 +80,20 @@ module Ace
                 ))
               end
 
+              # Snapshot pre-existing dirty state & resolve owned task paths
+              dirty_snapshot = snapshot_dirty_state
+              workflow_result[:preexisting_dirty] = dirty_snapshot
+              owned_paths = resolve_owned_task_paths(task_data)
+              workflow_result[:owned_task_paths] = owned_paths
+
+              # Check for pre-existing target conflicts on owned paths
+              all_dirty_files = dirty_snapshot[:staged] + dirty_snapshot[:unstaged] + dirty_snapshot[:untracked]
+              conflicting_paths = all_dirty_files & owned_paths
+              unless conflicting_paths.empty?
+                workflow_result[:recovery] = "Clean pre-existing edits on target task paths before creating worktree: #{conflicting_paths.join(', ')}"
+                return error_workflow_result("Pre-existing edits on target task paths: #{conflicting_paths.join(', ')}", workflow_result)
+              end
+
               # Step 3: Update task status if configured (and not overridden)
               should_update_status = options[:no_status_update] ? false : @config.auto_mark_in_progress?
               if should_update_status && task_data[:status] != "in-progress"
@@ -116,10 +130,21 @@ module Ace
               has_changes_to_commit = should_update_status || metadata_was_added
               if should_commit && has_changes_to_commit
                 commit_message = options[:commit_message] || "in-progress"
-                if commit_task_changes(task_data, commit_message)
-                  workflow_result[:steps_completed] << "task_committed"
+                commit_res = commit_task_changes(task_data, commit_message, owned_paths: owned_paths, explicit_message: options[:commit_message])
+                if commit_res[:success]
+                  workflow_result[:bookkeeping_commit] = commit_res[:commit_sha]
+                  workflow_result[:committed_paths] = commit_res[:committed_paths]
+
+                  unowned_in_commit = commit_res[:committed_paths] - owned_paths
+                  if unowned_in_commit.empty?
+                    workflow_result[:path_set_verified] = true
+                    workflow_result[:steps_completed] << "task_committed"
+                  else
+                    workflow_result[:path_set_verified] = false
+                    workflow_result[:recovery] = "Bookkeeping commit #{commit_res[:commit_sha]} captured unowned paths: #{unowned_in_commit.join(', ')}"
+                    return error_workflow_result("Bookkeeping commit captured unowned paths: #{unowned_in_commit.join(', ')}", workflow_result)
+                  end
                 else
-                  # Continue even if commit fails, but note it
                   workflow_result[:warnings] << "Failed to commit task changes"
                 end
               end
@@ -127,12 +152,18 @@ module Ace
               # Step 7: Push task changes if configured (so PR shows updates)
               should_push = options[:no_push] ? false : @config.auto_push_task?
               if should_push && should_commit && workflow_result[:steps_completed].include?("task_committed")
+                unless workflow_result[:path_set_verified]
+                  workflow_result[:publication] = "not_attempted"
+                  return error_workflow_result("Refusing to push unverified bookkeeping commit", workflow_result)
+                end
+
                 push_remote = options[:push_remote] || @config.push_remote
                 if push_task_changes(push_remote)
                   workflow_result[:steps_completed] << "task_pushed"
                   workflow_result[:pushed_to] = push_remote
+                  workflow_result[:publication] = "pushed"
                 else
-                  # Continue even if push fails, but note it
+                  workflow_result[:publication] = "not_attempted"
                   workflow_result[:warnings] << "Failed to push task changes"
                 end
               end
@@ -247,6 +278,45 @@ module Ace
                 end
               end
 
+              # Step 13: Execute toolchain trust and bootstrap preparation phases
+              require_relative "../molecules/toolchain_truster"
+              require_relative "../molecules/bootstrap_executor"
+
+              wt_path = worktree_result[:worktree_path]
+              
+              if options[:no_mise_trust]
+                trust_res = {success: true, status: "not_applicable"}
+              else
+                policy = @config.mise_trust_auto? ? "required" : "advisory"
+                truster = Molecules::ToolchainTruster.new(project_root: wt_path, policy: policy)
+                trust_res = truster.verify_and_trust
+              end
+
+              executor = Molecules::BootstrapExecutor.new(
+                project_root: @project_root,
+                worktree_path: wt_path,
+                bootstrap_config: @config.bootstrap,
+                no_bootstrap: options[:no_bootstrap] || false
+              )
+              bootstrap_res = executor.run
+
+              workflow_result[:phases] = [trust_res, bootstrap_res]
+
+              req_failed = workflow_result[:phases].any? { |p| p[:status] == "required_failed" }
+              adv_failed = workflow_result[:phases].any? { |p| p[:status] == "advisory_failed" }
+
+              if req_failed
+                workflow_result[:readiness] = "not_ready"
+                workflow_result[:retry_command] = "ace-git-worktree bootstrap #{task_data[:id]}"
+                workflow_result[:success] = false
+                workflow_result[:error] = "Required preparation phase failed for #{wt_path}"
+                return workflow_result
+              elsif adv_failed
+                workflow_result[:readiness] = "ready_with_warning"
+              else
+                workflow_result[:readiness] = "ready"
+              end
+
               # Success!
               success_workflow_result("Task worktree created successfully", workflow_result)
             rescue => e
@@ -498,6 +568,14 @@ module Ace
               worktree_path: nil,
               branch: nil,
               directory_name: nil,
+              preexisting_dirty: {staged: [], unstaged: [], untracked: []},
+              owned_task_paths: [],
+              bookkeeping_commit: nil,
+              committed_paths: [],
+              index_preserved: true,
+              path_set_verified: false,
+              publication: "not_attempted",
+              recovery: nil,
               steps_completed: [],
               steps_planned: [],
               warnings: [],
@@ -506,6 +584,70 @@ module Ace
             }
           end
 
+          # Snapshot working tree and index dirty state
+          #
+          # @return [Hash] Hash with :staged, :unstaged, :untracked path arrays
+          def snapshot_dirty_state
+            staged = []
+            unstaged = []
+            untracked = []
+
+            result = Atoms::GitCommand.execute("status", "--porcelain=v1", timeout: 10)
+            if result[:success] && result[:output]
+              result[:output].each_line do |line|
+                line = line.chomp
+                next if line.empty?
+                x = line[0]
+                y = line[1]
+                file = line[3..-1].to_s.strip
+                file = file.split(" -> ").last if file.include?(" -> ")
+
+                if x == "?" && y == "?"
+                  untracked << file
+                else
+                  staged << file if x != " " && x != "?"
+                  unstaged << file if y != " " && y != "?"
+                end
+              end
+            end
+
+            {staged: staged.uniq, unstaged: unstaged.uniq, untracked: untracked.uniq}
+          end
+
+          # Resolve relative task paths owned by ACE for this operation
+          #
+          # @param task_data [Hash] Task data hash
+          # @return [Array<String>] Array of relative file paths
+          def resolve_owned_task_paths(task_data)
+            paths = []
+            if task_data
+              raw_path = task_data[:path] || task_data["path"]
+              if raw_path
+                rel_path = relative_task_path(raw_path)
+                paths << rel_path if rel_path
+              end
+            end
+            paths.compact.uniq
+          end
+
+          # Make a task file path relative to project root
+          #
+          # @param path [String] Absolute or relative file path
+          # @return [String] Relative file path
+          def relative_task_path(path)
+            return nil unless path
+            require "pathname"
+            pn = Pathname.new(path)
+            root = Pathname.new(@project_root)
+            if pn.absolute?
+              pn.relative_path_from(root).to_s
+            else
+              path
+            end
+          rescue
+            path
+          end
+
           # Load configuration
           #
           # @return [WorktreeConfig] Loaded configuration
@@ -574,12 +716,19 @@ module Ace
           #
           # @param task_data [Hash] Task data hash from ace-task
           # @param status [String] Task status
-          # @return [Boolean] true if successful
-          def commit_task_changes(task_data, status)
-            # Find the task file (this would need implementation)
-            # For now, commit all changes
+          # @param owned_paths [Array<String>, nil] Target paths to commit
+          # @return [Hash] Result hash with :success, :commit_sha, :committed_paths
+          def commit_task_changes(task_data, status, owned_paths: nil, explicit_message: nil)
             task_id = extract_task_id(task_data)
-            @task_committer.commit_all_changes(status, task_id)
+            paths = owned_paths || resolve_owned_task_paths(task_data)
+            return {success: false, commit_sha: nil, committed_paths: [], error: "No task paths"} if paths.empty?
+
+            message = explicit_message || begin
+              @config.format_commit_message(task_data)
+            rescue
+              "chore(task-#{task_id}): mark as #{status}"
+            end
+            @task_committer.commit_scoped(paths, message)
           end
 
           # Push task changes to remote

data/lib/ace/git/worktree/organisms/worktree_manager.rb

@@ -278,12 +278,14 @@ module Ace
             end
 
             # Apply filters
-            if !options[:task_associated].nil? || !options[:usable].nil? || options[:search]
+            if !options[:task_associated].nil? || !options[:usable].nil? || options[:search] || options[:task_id] || options[:pr_number]
               worktrees = @worktree_lister.filter(
                 worktrees,
                 task_associated: options[:task_associated],
                 usable: options[:usable],
-                branch_pattern: options[:search]
+                branch_pattern: options[:search],
+                task_id: options[:task_id],
+                pr_number: options[:pr_number]
               )
             end
 

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

@@ -3,7 +3,7 @@
 module Ace
   module Git
     module Worktree
-      VERSION = "0.21.8"
+      VERSION = "0.22.0"
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ace-git-worktree
 version: !ruby/object:Gem::Version
-  version: 0.21.8
+  version: 0.22.0
 platform: ruby
 authors:
 - Michal Czyz
 bindir: exe
 cert_chain: []
-date: 2026-08-12 00:00:00.000000000 Z
+date: 2026-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ace-support-cli
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: ace-git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.23'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.22'
+        version: '0.23'
 - !ruby/object:Gem::Dependency
   name: ace-task
   requirement: !ruby/object:Gem::Requirement
@@ -148,9 +148,11 @@ files:
 - docs/usage.md
 - exe/ace-git-worktree
 - handbook/agents/worktree.ag.md
+- handbook/skills/as-git-worktree-cleanup/SKILL.md
 - handbook/skills/as-git-worktree-create/SKILL.md
 - handbook/skills/as-git-worktree-manage/SKILL.md
 - handbook/skills/as-git-worktree/SKILL.md
+- handbook/workflow-instructions/git/worktree-cleanup.wf.md
 - handbook/workflow-instructions/git/worktree-create.wf.md
 - handbook/workflow-instructions/git/worktree-manage.wf.md
 - handbook/workflow-instructions/git/worktree.wf.md
@@ -160,6 +162,8 @@ files:
 - lib/ace/git/worktree/atoms/slug_generator.rb
 - lib/ace/git/worktree/atoms/task_id_extractor.rb
 - lib/ace/git/worktree/cli.rb
+- lib/ace/git/worktree/cli/commands/bootstrap.rb
+- lib/ace/git/worktree/cli/commands/cleanup.rb
 - lib/ace/git/worktree/cli/commands/config.rb
 - lib/ace/git/worktree/cli/commands/create.rb
 - lib/ace/git/worktree/cli/commands/list.rb
@@ -167,6 +171,8 @@ files:
 - lib/ace/git/worktree/cli/commands/remove.rb
 - lib/ace/git/worktree/cli/commands/shared_helpers.rb
 - lib/ace/git/worktree/cli/commands/switch.rb
+- lib/ace/git/worktree/commands/bootstrap_command.rb
+- lib/ace/git/worktree/commands/cleanup_command.rb
 - lib/ace/git/worktree/commands/config_command.rb
 - lib/ace/git/worktree/commands/create_command.rb
 - lib/ace/git/worktree/commands/list_command.rb
@@ -177,6 +183,10 @@ files:
 - lib/ace/git/worktree/models/worktree_config.rb
 - lib/ace/git/worktree/models/worktree_info.rb
 - lib/ace/git/worktree/models/worktree_metadata.rb
+- lib/ace/git/worktree/molecules/bootstrap_executor.rb
+- lib/ace/git/worktree/molecules/cleanup_applier.rb
+- lib/ace/git/worktree/molecules/cleanup_pr_resolver.rb
+- lib/ace/git/worktree/molecules/cleanup_reporter.rb
 - lib/ace/git/worktree/molecules/config_loader.rb
 - lib/ace/git/worktree/molecules/current_task_linker.rb
 - lib/ace/git/worktree/molecules/hook_executor.rb
@@ -186,6 +196,7 @@ files:
 - lib/ace/git/worktree/molecules/task_fetcher.rb
 - lib/ace/git/worktree/molecules/task_pusher.rb
 - lib/ace/git/worktree/molecules/task_status_updater.rb
+- lib/ace/git/worktree/molecules/toolchain_truster.rb
 - lib/ace/git/worktree/molecules/worktree_creator.rb
 - lib/ace/git/worktree/molecules/worktree_lister.rb
 - lib/ace/git/worktree/molecules/worktree_remover.rb