refactor(mcp): remove server namespace injection (#749)

Author: morluto

src/jacobian/adapters/mcp/server.py

@@ -35,7 +35,11 @@
     operating_guide,
     server_instructions,
 )
-from jacobian.adapters.mcp.remote import TenantRuntimeRouter
+from jacobian.adapters.mcp.remote import (
+    DEFAULT_MAX_TENANT_RUNTIMES,
+    DEFAULT_TENANT_IDLE_TIMEOUT_SECONDS,
+    TenantRuntimeRouter,
+)
 from jacobian.adapters.mcp.resources import (
     _register_reasoning_resource,
     _register_resources_and_prompts,
@@ -402,24 +406,6 @@ def create_server(
     if tenant_isolation and capability_exclusions:
         raise ValueError("capability exclusions are supported only by local evaluation")
 
-    # Keep ``--help`` and ``--version`` independent of the MCP runtime's
-    # heavier imports and shutdown hooks.
-    from mcp.server.mcpserver import Context
-
-    from jacobian.adapters.mcp.remote import (
-        DEFAULT_MAX_TENANT_RUNTIMES,
-        DEFAULT_TENANT_IDLE_TIMEOUT_SECONDS,
-        TenantRuntimeRouter,
-    )
-    from jacobian.runtime.model import JacobianRuntime
-
-    globals().update(
-        {
-            "Context": Context,
-            "JacobianRuntime": JacobianRuntime,
-        }
-    )
-
     selected_authority = _selected_checker_authority(checker_authority)
     configured_root = _configured_root(state_dir)
     runtime = (

tests/boundary/mcp/test_mcp_sdk_2_conformance.py

@@ -10,6 +10,7 @@
 import pytest
 from mcp.server.extension import Extension, ResourceBinding, ToolBinding
 
+import jacobian.adapters.mcp.server as server_module
 from jacobian.adapters.mcp.constants import ReasoningLogMode
 from jacobian.adapters.mcp.server import JacobianCoreExtension, create_server
 from jacobian.contracts.capabilities import CapabilityResult
@@ -38,12 +39,17 @@ def test_mcp_sdk_is_exactly_pinned_and_v2_bindings_are_used() -> None:
 
 def test_mcp_v2_static_validation_context_errors_and_structured_resources(
     tmp_path: Path,
+    monkeypatch: pytest.MonkeyPatch,
 ) -> None:
+    monkeypatch.delattr(server_module, "Context", raising=False)
+
     async def scenario() -> None:
         from mcp import Client
         from mcp.shared.exceptions import MCPError
 
-        async with Client(create_server(tmp_path), raise_exceptions=True) as client:
+        server = create_server(tmp_path)
+        assert not hasattr(server_module, "Context")
+        async with Client(server, raise_exceptions=True) as client:
             listed = await client.list_tools()
             assert all(
                 tool.input_schema.get("additionalProperties") is False