Merge pull request 'feat: discover merged cleanup worktree aliases (Closes #532)' (#571) from feat/issue-532-merged-cleanup-worktree-aliases into master

2026-07-09 08:05:33 -05:00
parent 8e7a69800a a2e8bf17ec
commit 9340dc7009
3 changed files with 394 additions and 59 deletions
@@ -5004,6 +5004,7 @@ def gitea_reconcile_merged_cleanups(
        remote_branch_exists=remote_branch_exists,
        head_on_master=head_on_master,
        delete_capability_allowed=delete_capability_allowed,
+        target_ref=master_ref,
        active_reviewer_leases=active_reviewer_leases,
        pr_states=pr_states,
    )
@@ -5045,7 +5046,9 @@ def gitea_reconcile_merged_cleanups(

        if local_assessment.get("safe_to_remove_worktree"):
            result = merged_cleanup_reconcile.remove_local_worktree(
-                PROJECT_ROOT, head_branch
+                PROJECT_ROOT,
+                head_branch,
+                worktree_path=local_assessment.get("worktree_path"),
            )
            actions.append({"action": "remove_local_worktree", **result})