fix: resolve conflicts for PR #384

Merge prgs/master; keep read-only reconciliation tools (#301) alongside master's gitea_reconcile_already_landed_pr close path (#310). Unify task routing: reconcile_landed_pr stays author/read-only; reconcile-landed-pr and reconcile_already_landed_pr stay reconciler.
2026-07-07 10:33:42 -04:00
parent 4cf75bcbc9 7fbb1bf34a
commit 5513bdf2aa
16 changed files with 1015 additions and 3 deletions
@@ -112,6 +112,10 @@ TASK_CAPABILITY_MAP: dict[str, dict[str, str]] = {
        "permission": "gitea.read",
        "role": "author",
    },
+    "reconcile_already_landed_pr": {
+        "permission": "gitea.pr.close",
+        "role": "reconciler",
+    },
    # #309: dedicated reconciler path for already-landed open PRs. Exact
    # close capabilities only — never review/approve/request_changes/merge.
    "reconcile_close_landed_pr": {