chore(server): address review nits on resource error handling

- Document Raises: on ResourceManager.get_resource() (AGENTS.md docstring rule)
- Log template-handler crashes via logger.exception() and chain from e, so
  operators get a server-side traceback (matches the resource.read() path)
- Move the two new SEP-2164 regression tests to top-level functions per
  AGENTS.md (no Test* classes for new tests)

Author: pja-ant

src/mcp/server/mcpserver/resources/resource_manager.py

@@ -80,7 +80,12 @@ def add_template(
         return template
 
     async def get_resource(self, uri: AnyUrl | str, context: Context[LifespanContextT, RequestT]) -> Resource:
-        """Get resource by URI, checking concrete resources first, then templates."""
+        """Get resource by URI, checking concrete resources first, then templates.
+
+        Raises:
+            ResourceNotFoundError: If no resource or template matches the URI.
+            ResourceError: If a matching template fails to create the resource.
+        """
         uri_str = str(uri)
         logger.debug("Getting resource", extra={"uri": uri_str})
 

src/mcp/server/mcpserver/resources/templates.py

@@ -15,9 +15,12 @@
 from mcp.server.mcpserver.resources.types import FunctionResource, Resource
 from mcp.server.mcpserver.utilities.context_injection import find_context_parameter, inject_context
 from mcp.server.mcpserver.utilities.func_metadata import func_metadata
+from mcp.server.mcpserver.utilities.logging import get_logger
 from mcp.shared._callable_inspection import is_async_callable
 from mcp.types import Annotations, Icon
 
+logger = get_logger(__name__)
+
 if TYPE_CHECKING:
     from mcp.server.context import LifespanContextT, RequestT
     from mcp.server.mcpserver.context import Context
@@ -133,4 +136,5 @@ async def create_resource(
         except ResourceError:
             raise
         except Exception as e:
-            raise ResourceError(f"Error creating resource from template: {e}")
+            logger.exception("Error creating resource from template")
+            raise ResourceError(f"Error creating resource from template: {e}") from e

tests/server/mcpserver/test_server.py

@@ -751,36 +751,6 @@ def failing_resource():
             with pytest.raises(MCPError, match="Error reading resource resource://failing"):
                 await client.read_resource("resource://failing")
 
-    async def test_read_resource_template_error(self):
-        """Template-creation failure must surface as INTERNAL_ERROR, not INVALID_PARAMS (not-found)."""
-        mcp = MCPServer()
-
-        @mcp.resource("resource://item/{item_id}")
-        def get_item(item_id: str) -> str:
-            raise RuntimeError("backend unavailable")
-
-        async with Client(mcp) as client:
-            with pytest.raises(MCPError, match="Error creating resource from template") as exc_info:
-                await client.read_resource("resource://item/42")
-
-            assert exc_info.value.error.code == INTERNAL_ERROR
-            assert exc_info.value.error.code != INVALID_PARAMS
-
-    async def test_read_resource_template_not_found(self):
-        """A template handler raising ResourceNotFoundError must surface as INVALID_PARAMS per SEP-2164."""
-        mcp = MCPServer()
-
-        @mcp.resource("resource://users/{user_id}")
-        def get_user(user_id: str) -> str:
-            raise ResourceNotFoundError(f"no user {user_id}")
-
-        async with Client(mcp) as client:
-            with pytest.raises(MCPError, match="no user 999") as exc_info:
-                await client.read_resource("resource://users/999")
-
-            assert exc_info.value.error.code == INVALID_PARAMS
-            assert exc_info.value.error.data == {"uri": "resource://users/999"}
-
     async def test_binary_resource(self):
         mcp = MCPServer()
 
@@ -1551,3 +1521,35 @@ async def test_report_progress_passes_related_request_id():
         message="halfway",
         related_request_id="req-abc-123",
     )
+
+
+async def test_read_resource_template_error():
+    """Template-creation failure must surface as INTERNAL_ERROR, not INVALID_PARAMS (not-found)."""
+    mcp = MCPServer()
+
+    @mcp.resource("resource://item/{item_id}")
+    def get_item(item_id: str) -> str:
+        raise RuntimeError("backend unavailable")
+
+    async with Client(mcp) as client:
+        with pytest.raises(MCPError, match="Error creating resource from template") as exc_info:
+            await client.read_resource("resource://item/42")
+
+        assert exc_info.value.error.code == INTERNAL_ERROR
+        assert exc_info.value.error.code != INVALID_PARAMS
+
+
+async def test_read_resource_template_not_found():
+    """A template handler raising ResourceNotFoundError must surface as INVALID_PARAMS per SEP-2164."""
+    mcp = MCPServer()
+
+    @mcp.resource("resource://users/{user_id}")
+    def get_user(user_id: str) -> str:
+        raise ResourceNotFoundError(f"no user {user_id}")
+
+    async with Client(mcp) as client:
+        with pytest.raises(MCPError, match="no user 999") as exc_info:
+            await client.read_resource("resource://users/999")
+
+        assert exc_info.value.error.code == INVALID_PARAMS
+        assert exc_info.value.error.data == {"uri": "resource://users/999"}