Merge remote-tracking branch 'origin/master' into agent/add-klingon-language

# Conflicts:
#	tests/src/unit/test_llm_api.py

Author: kingpanther13

custom_components/ha_mcp_tools/llm_api.py

@@ -230,7 +230,7 @@ def _import_mcp_sdk() -> None:
 
 
 async def async_probe_mcp_sdk(hass: HomeAssistant) -> bool:
-    """Return True when the mcp client SDK imports (first import off-loop)."""
+    """Return True when lazy LLM dependencies import (first import off-loop)."""
     try:
         await hass.async_add_executor_job(_import_mcp_sdk)
     except ImportError as err:

tests/src/unit/test_llm_api.py

@@ -302,6 +302,19 @@ def _import_module(name):
 
         assert llm_api.convert_to_voluptuous(schema) == {"probatio": schema}
 
+    def test_reraises_nested_module_not_found(self, monkeypatch):
+        def _import_module(name):
+            assert name == "voluptuous_openapi"
+            raise ModuleNotFoundError(
+                "No module named 'legacy_dependency'",
+                name="legacy_dependency",
+            )
+
+        monkeypatch.setattr(llm_api.importlib, "import_module", _import_module)
+
+        with pytest.raises(ModuleNotFoundError, match="legacy_dependency"):
+            llm_api.convert_to_voluptuous({"type": "object"})
+
     async def test_converter_import_is_warmed_once_off_event_loop(self, monkeypatch):
         main_thread = threading.get_ident()
         imports: list[tuple[str, int]] = []