fix: resolve conflicts for PR #422

Merge prgs/master into feat/issue-403-workflow-load-boundaries.
Preserve workflow-load boundary rules (#403) alongside master's
audit reconciliation boundary and workspace verification gates.
This commit is contained in:
2026-07-08 11:08:08 -04:00
24 changed files with 2654 additions and 55 deletions
+5
View File
@@ -39,6 +39,7 @@ def _seed(mutations=None, correction=False):
import review_workflow_load
review_workflow_load.record_review_workflow_load(mcp_server.PROJECT_ROOT)
mcp_server._save_review_decision_lock(_lock(mutations, correction))
mcp_server.gitea_load_review_workflow()
@@ -51,6 +52,7 @@ RC_A = {"pr_number": 5, "action": "request_changes", "review_id": 2,
class TestTerminalHardStopReasons(unittest.TestCase):
def tearDown(self):
mcp_server._save_review_decision_lock(None)
mcp_server.review_workflow_load.clear_review_workflow_load()
def test_no_lock_no_reasons(self):
mcp_server._save_review_decision_lock(None)
@@ -98,6 +100,7 @@ class TestMergeHardStopWiring(unittest.TestCase):
import review_workflow_load
review_workflow_load.clear_review_workflow_load()
mcp_server._save_review_decision_lock(None)
mcp_server.review_workflow_load.clear_review_workflow_load()
def test_merge_blocked_after_request_changes(self):
_seed([RC_A])
@@ -121,6 +124,7 @@ class TestMarkFinalHardStopWiring(unittest.TestCase):
import review_workflow_load
review_workflow_load.clear_review_workflow_load()
mcp_server._save_review_decision_lock(None)
mcp_server.review_workflow_load.clear_review_workflow_load()
def test_mark_ready_blocked_after_terminal_mutation(self):
_seed([RC_A])
@@ -155,6 +159,7 @@ class TestDuplicateRequestChangesSuppression(unittest.TestCase):
import review_workflow_load
review_workflow_load.clear_review_workflow_load()
mcp_server._save_review_decision_lock(None)
mcp_server.review_workflow_load.clear_review_workflow_load()
def test_duplicate_request_changes_blocked_at_same_head(self):
_seed()