test: add tests for SearchAnchors new fields and enhanced MCP search

- Model tests: interventions/eligibility_keywords serialization,
default empty lists, JSON roundtrip with new fields
- MCP tests: query.cond/query.intr params, eligibility keywords,
backward compatibility, multi-variant intervention variants

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

trialpath/tests/test_mcp.py

@@ -137,6 +137,116 @@ class TestMCPClient:
             assert args["conditions"] == ["NSCLC"]
 
 
+class TestSearchDirectEnhanced:
+    """Test enhanced search_direct with intervention and eligibility dimensions."""
+
+    @pytest.fixture
+    def client(self):
+        return ClinicalTrialsMCPClient(mcp_url="http://localhost:3000")
+
+    @pytest.mark.asyncio
+    async def test_search_direct_uses_query_cond_and_intr(self, client):
+        """search_direct should use query.cond for condition and query.intr for intervention."""
+        anchors = SearchAnchors(
+            condition="Non-Small Cell Lung Cancer",
+            subtype="adenocarcinoma",
+            interventions=["osimertinib", "erlotinib"],
+        )
+
+        with patch("trialpath.services.mcp_client.requests") as mock_requests:
+            mock_resp = MagicMock()
+            mock_resp.json.return_value = {"studies": []}
+            mock_resp.raise_for_status = MagicMock()
+            mock_requests.get.return_value = mock_resp
+
+            await client.search_direct(anchors)
+
+            call_args = mock_requests.get.call_args
+            params = call_args.kwargs.get("params", call_args[1].get("params", {}))
+            assert params["query.cond"] == "Non-Small Cell Lung Cancer adenocarcinoma"
+            assert params["query.intr"] == "osimertinib"
+
+    @pytest.mark.asyncio
+    async def test_search_direct_uses_eligibility_keywords(self, client):
+        """search_direct should use query.term for eligibility keywords."""
+        anchors = SearchAnchors(
+            condition="NSCLC",
+            eligibility_keywords=["ECOG 0-1", "stage IV"],
+        )
+
+        with patch("trialpath.services.mcp_client.requests") as mock_requests:
+            mock_resp = MagicMock()
+            mock_resp.json.return_value = {"studies": []}
+            mock_resp.raise_for_status = MagicMock()
+            mock_requests.get.return_value = mock_resp
+
+            await client.search_direct(anchors)
+
+            call_args = mock_requests.get.call_args
+            params = call_args.kwargs.get("params", call_args[1].get("params", {}))
+            assert params["query.term"] == "ECOG 0-1 stage IV"
+
+    @pytest.mark.asyncio
+    async def test_search_direct_without_interventions_backwards_compatible(self, client):
+        """search_direct without new fields should still work (backward compatible)."""
+        anchors = SearchAnchors(
+            condition="NSCLC",
+            biomarkers=["EGFR exon 19 deletion"],
+        )
+
+        with patch("trialpath.services.mcp_client.requests") as mock_requests:
+            mock_resp = MagicMock()
+            mock_resp.json.return_value = {"studies": []}
+            mock_resp.raise_for_status = MagicMock()
+            mock_requests.get.return_value = mock_resp
+
+            await client.search_direct(anchors)
+
+            call_args = mock_requests.get.call_args
+            params = call_args.kwargs.get("params", call_args[1].get("params", {}))
+            assert params["query.cond"] == "NSCLC"
+            assert "query.intr" not in params
+            assert params["query.term"] == "EGFR"
+
+    @pytest.mark.asyncio
+    async def test_search_multi_variant_includes_intervention_variant(self, client):
+        """search_multi_variant should fire intervention-specific search variants."""
+        anchors = SearchAnchors(
+            condition="NSCLC",
+            interventions=["osimertinib", "erlotinib"],
+            eligibility_keywords=["ECOG 0-1"],
+        )
+
+        call_count = 0
+
+        async def mock_search_direct(a):
+            nonlocal call_count
+            call_count += 1
+            return [
+                {
+                    "protocolSection": {
+                        "identificationModule": {
+                            "nctId": f"NCT0000000{call_count}",
+                            "briefTitle": f"Trial {call_count}",
+                        },
+                        "statusModule": {},
+                        "designModule": {},
+                        "conditionsModule": {},
+                        "eligibilityModule": {},
+                        "contactsLocationsModule": {},
+                    }
+                }
+            ]
+
+        with patch.object(client, "search_direct", side_effect=mock_search_direct):
+            results = await client.search_multi_variant(anchors)
+
+        # Variants: full(1) + broad(1) + interventions(2) + eligibility(1) = 5
+        assert call_count == 5
+        # All unique NCT IDs
+        assert len(results) == 5
+
+
 class TestNormalizeTrial:
     """Test normalize_trial conversion."""
 

trialpath/tests/test_models.py

@@ -273,6 +273,39 @@ class TestSearchAnchors:
         assert anchors.geography.country == "DE"
         assert anchors.geography.max_distance_km == 200
 
+    def test_search_anchors_with_interventions(self):
+        """interventions field should serialize correctly."""
+        from trialpath.models.search_anchors import SearchAnchors
+
+        anchors = SearchAnchors(
+            condition="NSCLC",
+            biomarkers=["EGFR exon 19 deletion"],
+            interventions=["osimertinib", "erlotinib"],
+        )
+        assert anchors.interventions == ["osimertinib", "erlotinib"]
+        data = anchors.model_dump()
+        assert data["interventions"] == ["osimertinib", "erlotinib"]
+
+    def test_search_anchors_with_eligibility_keywords(self):
+        """eligibility_keywords field should serialize correctly."""
+        from trialpath.models.search_anchors import SearchAnchors
+
+        anchors = SearchAnchors(
+            condition="NSCLC",
+            eligibility_keywords=["ECOG 0-1", "stage IV", "EGFR mutation"],
+        )
+        assert anchors.eligibility_keywords == ["ECOG 0-1", "stage IV", "EGFR mutation"]
+        data = anchors.model_dump()
+        assert data["eligibility_keywords"] == ["ECOG 0-1", "stage IV", "EGFR mutation"]
+
+    def test_search_anchors_defaults_empty_lists(self):
+        """New fields should default to empty lists for backward compatibility."""
+        from trialpath.models.search_anchors import SearchAnchors
+
+        anchors = SearchAnchors(condition="NSCLC")
+        assert anchors.interventions == []
+        assert anchors.eligibility_keywords == []
+
     def test_json_roundtrip(self):
         from trialpath.models.search_anchors import SearchAnchors
 
@@ -285,6 +318,20 @@ class TestSearchAnchors:
         restored = SearchAnchors.model_validate_json(json_str)
         assert restored == anchors
 
+    def test_json_roundtrip_with_new_fields(self):
+        """JSON roundtrip should preserve interventions and eligibility_keywords."""
+        from trialpath.models.search_anchors import SearchAnchors
+
+        anchors = SearchAnchors(
+            condition="NSCLC",
+            interventions=["osimertinib"],
+            eligibility_keywords=["ECOG 0-1", "stage IV"],
+        )
+        json_str = anchors.model_dump_json()
+        restored = SearchAnchors.model_validate_json(json_str)
+        assert restored.interventions == ["osimertinib"]
+        assert restored.eligibility_keywords == ["ECOG 0-1", "stage IV"]
+
 
 class TestTrialCandidate:
     """TrialCandidate v1 tests."""