refactor(xai): simplify _xai_prefers_native_web_search to use registry

Drop the manual web.search_backend / web.backend config-reading block
that duplicated _read_config_key in web_search_registry.py. The function
now delegates directly to get_active_search_provider() (which reads the
same config keys via the registry's canonical resolver) and falls back
to _get_search_backend() only when the registry has no providers loaded.

Also updates the TestXaiWebSearchBackendPreference tests to monkeypatch
the registry instead of load_config_readonly, and adds two new tests for
the legacy fallback path (no provider registered -> _get_search_backend).

Author: kshitijk4poor

agent/transports/codex.py

@@ -39,26 +39,14 @@ def _bounded_prompt_cache_key(value: Any) -> Optional[str]:
 def _xai_prefers_native_web_search() -> bool:
     """True when xAI Responses should use Grok's native ``web_search`` built-in.
 
-    Honors explicit ``web.search_backend`` / ``web.backend`` first. Only falls
-    back to native when the resolved active provider is ``xai`` (or resolution
-    fails — preserve the incomplete-hang fix rather than risk reintroducing it).
+    Delegates to the web-search registry's provider resolution (which reads
+    ``web.search_backend`` / ``web.backend`` from config) and checks whether
+    the resolved provider is xAI. Falls back to the legacy ``_get_search_backend``
+    probe when the registry has no providers loaded. On any resolution failure,
+    returns True (fail-closed to native — preserves the #48108 incomplete-hang
+    fix rather than risk reintroducing it).
     """
     try:
-        from hermes_cli.config import load_config_readonly
-
-        cfg = load_config_readonly() or {}
-        web = cfg.get("web") if isinstance(cfg, dict) else None
-        if isinstance(web, dict):
-            explicit = (
-                str(web.get("search_backend") or "").strip().lower()
-                or str(web.get("backend") or "").strip().lower()
-            )
-            if explicit == "xai":
-                return True
-            if explicit:
-                # User asked for Firecrawl / Tavily / etc. — keep Hermes dispatch.
-                return False
-
         from agent.web_search_registry import get_active_search_provider
 
         provider = get_active_search_provider()
@@ -69,7 +57,7 @@ def _xai_prefers_native_web_search() -> bool:
 
         return (_get_search_backend() or "").strip().lower() == "xai"
     except Exception:
-        # Fail closed to native swap — same behavior as pre-fix main.
+        # Fail closed to native — same behavior as pre-fix main.
         return True
 
 

tests/agent/transports/test_codex_transport.py

@@ -438,30 +438,54 @@ def test_explicit_firecrawl_prefers_client(self, monkeypatch):
         import agent.transports.codex as codex_mod
 
         monkeypatch.setattr(
-            "hermes_cli.config.load_config_readonly",
-            lambda: {"web": {"backend": "firecrawl"}},
+            "agent.web_search_registry.get_active_search_provider",
+            lambda: SimpleNamespace(name="firecrawl"),
         )
         assert codex_mod._xai_prefers_native_web_search() is False
 
     def test_explicit_search_backend_xai_prefers_native(self, monkeypatch):
         import agent.transports.codex as codex_mod
 
         monkeypatch.setattr(
-            "hermes_cli.config.load_config_readonly",
-            lambda: {"web": {"search_backend": "xai"}},
+            "agent.web_search_registry.get_active_search_provider",
+            lambda: SimpleNamespace(name="xai"),
         )
         assert codex_mod._xai_prefers_native_web_search() is True
 
     def test_resolved_non_xai_provider_prefers_client(self, monkeypatch):
         import agent.transports.codex as codex_mod
 
         monkeypatch.setattr(
-            "hermes_cli.config.load_config_readonly",
-            lambda: {"web": {}},
+            "agent.web_search_registry.get_active_search_provider",
+            lambda: SimpleNamespace(name="firecrawl"),
         )
+        assert codex_mod._xai_prefers_native_web_search() is False
+
+    def test_no_provider_legacy_fallback_xai(self, monkeypatch):
+        """When no provider is registered, fall back to _get_search_backend."""
+        import agent.transports.codex as codex_mod
+
         monkeypatch.setattr(
             "agent.web_search_registry.get_active_search_provider",
-            lambda: SimpleNamespace(name="firecrawl"),
+            lambda: None,
+        )
+        monkeypatch.setattr(
+            "tools.web_tools._get_search_backend",
+            lambda: "xai",
+        )
+        assert codex_mod._xai_prefers_native_web_search() is True
+
+    def test_no_provider_legacy_fallback_non_xai(self, monkeypatch):
+        """When no provider is registered and backend isn't xai, keep client."""
+        import agent.transports.codex as codex_mod
+
+        monkeypatch.setattr(
+            "agent.web_search_registry.get_active_search_provider",
+            lambda: None,
+        )
+        monkeypatch.setattr(
+            "tools.web_tools._get_search_backend",
+            lambda: "firecrawl",
         )
         assert codex_mod._xai_prefers_native_web_search() is False