fix(mcp): stop infra_stop false positive on decorative equals banners

Line-anchor conflict-marker detection in check_mid_merge and MCP startup so mcp_discoverability.py RELOAD_INSTRUCTIONS banners no longer block reviewer capability resolution. Share python_bytes_have_conflict_markers between mcp_server startup scan and role_session_router mid-merge checks. Co-Authored-By: Claude Opus 4.8 (1M context) <[email protected]>
2026-07-06 13:58:45 -04:00
parent 0716157fa5
commit a3fb079869
5 changed files with 78 additions and 31 deletions
@@ -204,5 +204,25 @@ class TestRoleSessionRouter(unittest.TestCase):
        self.assertTrue(complete["complete"])


+class TestCheckMidMerge(unittest.TestCase):
+    def test_decorative_equals_banner_is_not_mid_merge(self):
+        self.assertFalse(role_session_router.check_mid_merge())
+
+    def test_python_bytes_have_conflict_markers_rejects_decorative_equals(self):
+        banner = b"===========================================\n"
+        self.assertFalse(role_session_router.python_bytes_have_conflict_markers(banner))
+
+    def test_python_bytes_have_conflict_markers_detects_real_markers(self):
+        self.assertTrue(
+            role_session_router.python_bytes_have_conflict_markers(b"<<<<<<< HEAD\n")
+        )
+        self.assertTrue(
+            role_session_router.python_bytes_have_conflict_markers(b"=======\n")
+        )
+        self.assertTrue(
+            role_session_router.python_bytes_have_conflict_markers(b">>>>>>> topic\n")
+        )
+
+
 if __name__ == "__main__":
    unittest.main()