fix: resolve conflicts for PR #511

Merge prgs/master into PR branch to restore mergeability.

Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>

tests/test_mcp_server.py

@@ -127,6 +127,7 @@ def _install_owned_reviewer_lease(
     session_id=_DEFAULT_LEASE_SESSION,
     head_sha="abc123",
 ):
+    import merger_lease_adoption as mla
     import reviewer_pr_lease
 
     reviewer_pr_lease.clear_session_lease()
@@ -135,7 +136,11 @@ def _install_owned_reviewer_lease(
         "session_id": session_id,
         "candidate_head": head_sha,
         "target_branch": "master",
-    })
+        "comment_id": 9001,
+    }, lease_provenance=mla.build_lease_provenance(
+        source=mla.SOURCE_ACQUIRE,
+        comment_id=9001,
+    ))
     return patch(
         "mcp_server._fetch_pr_comments",
         return_value=[
@@ -1057,7 +1062,8 @@ class TestMergePR(unittest.TestCase):
                "GITEA_ALLOWED_OPERATIONS": "read,merge"}
         with patch.dict(os.environ, env, clear=True):
             r = gitea_merge_pr(
-                pr_number=8, confirmation=self._confirm(8), remote="prgs")
+                pr_number=8, confirmation=self._confirm(8), remote="prgs",
+                expected_head_sha=new_sha)
         self.assertFalse(r["performed"])
         self.assertTrue(r.get("approval_visible"))
         self.assertFalse(r.get("approval_at_current_head"))
@@ -3973,3 +3979,167 @@ class TestPreflightVerification(unittest.TestCase):
         self.assertIn("worktree_path argument", msg)
         self.assertIn("task_file.py", msg)
         self.assertIn("author namespace", msg)
+
+
+class TestIssue546Deadlock(unittest.TestCase):
+    def setUp(self):
+        import reviewer_pr_lease
+        import review_workflow_load
+        import mcp_server
+        reviewer_pr_lease.clear_session_lease()
+        review_workflow_load.clear_review_workflow_load()
+        mcp_server._preflight_capability_called = False
+        mcp_server._preflight_resolved_role = None
+        mcp_server._REVIEW_DECISION_LOCK = None
+
+        self.auth_user_patch = patch("mcp_server._authenticated_username", return_value="reviewer-bot")
+        self.auth_user_patch.start()
+        self.addCleanup(self.auth_user_patch.stop)
+
+        self.verify_purity_patch = patch("mcp_server.verify_preflight_purity", return_value=None)
+        self.verify_purity_patch.start()
+        self.addCleanup(self.verify_purity_patch.stop)
+
+        self.verify_workspace_patch = patch("mcp_server._verify_role_mutation_workspace", return_value="/workspace")
+        self.verify_workspace_patch.start()
+        self.addCleanup(self.verify_workspace_patch.stop)
+
+        self.get_profile_patch = patch("mcp_server.get_profile", return_value={
+            "profile_name": "prgs-reviewer",
+            "allowed_operations": ["gitea.read", "gitea.pr.comment", "gitea.pr.review", "gitea.pr.approve"],
+            "forbidden_operations": [],
+        })
+        self.get_profile_patch.start()
+        self.addCleanup(self.get_profile_patch.stop)
+
+        self.pr_work_lease_patch = patch(
+            "mcp_server._pr_work_lease_reviewer_block",
+            return_value=dict(_NO_PR_WORK_LEASE_BLOCK),
+        )
+        self.pr_work_lease_patch.start()
+        self.addCleanup(self.pr_work_lease_patch.stop)
+
+        self.auth_header_patch = patch("mcp_server.get_auth_header", return_value="token test")
+        self.auth_header_patch.start()
+        self.addCleanup(self.auth_header_patch.stop)
+
+    def test_workflow_no_deadlock(self):
+        import mcp_server
+        import reviewer_pr_lease
+
+        # 1. Resolve capability
+        res = mcp_server.gitea_resolve_task_capability(task="review_pr", remote="prgs")
+        self.assertTrue(res["allowed_in_current_session"])
+
+        # 2. Load review workflow
+        res = mcp_server.gitea_load_review_workflow()
+        self.assertTrue(res["success"])
+
+        # Mock API requests for lease comments and PR retrieval
+        comments = []
+        def mock_api_side(method, url, auth, data=None):
+            if "/api/v1/user" in url:
+                return {"login": "reviewer-bot"}
+            if "/pulls/" in url:
+                if "/reviews" in url:
+                    if method == "POST":
+                        return {"id": 2001, "state": "APPROVED"}
+                    return [{"id": 2001, "user": {"login": "reviewer-bot"}, "state": "APPROVED", "commit_id": "abc123"}]
+                return {"user": {"login": "author-user"}, "state": "open", "head": {"sha": "abc123"}, "mergeable": True}
+            if "/comments" in url:
+                if method == "POST":
+                    comments.append({"id": 1001, "body": data["body"], "user": {"login": "reviewer-bot"}})
+                    return {"id": 1001}
+                return comments
+            return {}
+
+        with patch("mcp_server.api_request", side_effect=mock_api_side):
+            # 3. Acquire reviewer lease
+            res = mcp_server.gitea_acquire_reviewer_pr_lease(
+                pr_number=550,
+                worktree="/workspace",
+                candidate_head="abc123",
+                remote="prgs",
+            )
+            self.assertTrue(res["success"])
+            self.assertEqual(res["comment_id"], 1001)
+
+            # verify lease is recorded in session
+            session_lease = reviewer_pr_lease.get_session_lease()
+            self.assertIsNotNone(session_lease)
+            self.assertEqual(session_lease["pr_number"], 550)
+
+            # 4. Resolve capability again (simulating subsequent tool call preflight check/token refresh)
+            # This should NOT clear the session lease or decision lock!
+            mcp_server._preflight_capability_called = False  # simulate clearance from prior mutation
+            res = mcp_server.gitea_resolve_task_capability(task="review_pr", remote="prgs")
+            self.assertTrue(res["allowed_in_current_session"])
+            self.assertIsNotNone(reviewer_pr_lease.get_session_lease()) # Preserved!
+
+            # 5. Mark final review decision APPROVED
+            res = mcp_server.gitea_mark_final_review_decision(
+                pr_number=550,
+                action="approve",
+                expected_head_sha="abc123",
+                remote="prgs",
+            )
+            self.assertTrue(res["marked_ready"])
+
+            # 6. Submit review (should succeed without deadlock)
+            res = mcp_server.gitea_submit_pr_review(
+                pr_number=550,
+                action="approve",
+                body="APPROVED",
+                expected_head_sha="abc123",
+                final_review_decision_ready=True,
+                remote="prgs",
+                worktree_path="/workspace",
+            )
+            self.assertTrue(res["performed"])
+
+    def test_release_reviewer_pr_lease(self):
+        import mcp_server
+        import reviewer_pr_lease
+
+        # Resolve capability and load workflow
+        mcp_server.gitea_resolve_task_capability(task="review_pr", remote="prgs")
+        mcp_server.gitea_load_review_workflow()
+
+        comments = [_reviewer_lease_comment(550, session_id=_DEFAULT_LEASE_SESSION, head_sha="abc123")]
+        posted_comments = []
+
+        def mock_api_side(method, url, auth, data=None):
+            if "/api/v1/user" in url:
+                return {"login": "reviewer-bot"}
+            if "/pulls/" in url:
+                return {"user": {"login": "author-user"}, "state": "open", "head": {"sha": "abc123"}, "mergeable": True}
+            if "/comments" in url:
+                if method == "POST":
+                    new_c = {"id": 1002, "body": data["body"], "user": {"login": "reviewer-bot"}}
+                    comments.append(new_c)
+                    posted_comments.append(new_c)
+                    return {"id": 1002}
+                return comments
+            return {}
+
+        # Set session lease in memory
+        import merger_lease_adoption as mla
+        reviewer_pr_lease.record_session_lease({
+            "pr_number": 550,
+            "session_id": _DEFAULT_LEASE_SESSION,
+            "candidate_head": "abc123",
+            "target_branch": "master",
+            "comment_id": 9001,
+        }, lease_provenance=mla.build_lease_provenance(source=mla.SOURCE_ACQUIRE, comment_id=9001))
+
+        with patch("mcp_server.api_request", side_effect=mock_api_side):
+            # Release lease
+            res = mcp_server.gitea_release_reviewer_pr_lease(pr_number=550, remote="prgs")
+            self.assertTrue(res["success"])
+            self.assertTrue(res["released"])
+            self.assertEqual(res["comment_id"], 1002)
+
+            # verify lease is cleared in session
+            self.assertIsNone(reviewer_pr_lease.get_session_lease())
+            # verify comment phase is released
+            self.assertIn("phase: released", posted_comments[0]["body"])