test: correct spec anchors and record further divergences in the requirements manifest

Fixes the spec deep links that pointed at non-existent anchors, records the
divergences for the client's default not-supported answers (the spec names
-32601 for roots and -32602 for an undeclared elicitation mode; the default
callbacks answer -32600), and adds a logging:capability requirement noting
that MCPServer emits log message notifications without declaring the
logging capability.

Also tightens behaviour sentences and docstrings to match what the tests
assert, and adds a test pinning that Context.report_progress is a silent
no-op when the caller supplied no progress token, removing the pragma on
that path.

Author: maxisbey

src/mcp/server/mcpserver/context.py

@@ -94,7 +94,7 @@ async def report_progress(self, progress: float, total: float | None = None, mes
         """
         progress_token = self.request_context.meta.get("progress_token") if self.request_context.meta else None
 
-        if progress_token is None:  # pragma: no cover
+        if progress_token is None:
             return
 
         await self.request_context.session.send_progress_notification(

tests/interaction/_requirements.py

@@ -240,11 +240,11 @@ class Requirement:
     # Request metadata
     # ═══════════════════════════════════════════════════════════════════════════
     "meta:request-to-handler": Requirement(
-        source=f"{SPEC_BASE_URL}/basic#meta",
+        source=f"{SPEC_BASE_URL}/basic#_meta",
         behavior="The _meta object the client attaches to a request is visible to the server handler.",
     ),
     "meta:result-to-client": Requirement(
-        source=f"{SPEC_BASE_URL}/basic#meta",
+        source=f"{SPEC_BASE_URL}/basic#_meta",
         behavior="The _meta object a handler attaches to its result is delivered to the client.",
     ),
     # ═══════════════════════════════════════════════════════════════════════════
@@ -337,7 +337,7 @@ class Requirement:
         behavior="completion/complete with a ref/resource returns suggested values for a URI template variable.",
     ),
     "completion:complete:context": Requirement(
-        source=f"{SPEC_BASE_URL}/server/utilities/completion#context",
+        source=f"{SPEC_BASE_URL}/server/utilities/completion#requesting-completions",
         behavior="Previously-resolved argument values supplied in context.arguments reach the completion handler.",
     ),
     "completion:complete:not-supported": Requirement(
@@ -351,7 +351,7 @@ class Requirement:
     # Logging
     # ═══════════════════════════════════════════════════════════════════════════
     "logging:set-level": Requirement(
-        source=f"{SPEC_BASE_URL}/server/utilities/logging#log-levels",
+        source=f"{SPEC_BASE_URL}/server/utilities/logging#setting-log-level",
         behavior="logging/setLevel delivers the requested level to the server's handler and returns an empty result.",
     ),
     "logging:message:notification": Requirement(
@@ -365,8 +365,22 @@ class Requirement:
         source=f"{SPEC_BASE_URL}/server/utilities/logging#log-levels",
         behavior="All eight RFC 5424 severity levels are deliverable as log message notifications.",
     ),
+    "logging:capability": Requirement(
+        source=f"{SPEC_BASE_URL}/server/utilities/logging#capabilities",
+        behavior=(
+            "MCPServer tools emit log message notifications through the Context helpers while the server's "
+            "advertised capabilities omit logging."
+        ),
+        divergence=Divergence(
+            note=(
+                "The spec says servers that emit log message notifications MUST declare the logging "
+                "capability; MCPServer registers no setLevel handler, so capability derivation leaves "
+                "logging unset even though the Context helpers send the notifications."
+            ),
+        ),
+    ),
     "logging:set-level:filtering": Requirement(
-        source=f"{SPEC_BASE_URL}/server/utilities/logging#log-levels",
+        source=f"{SPEC_BASE_URL}/server/utilities/logging#setting-log-level",
         behavior=(
             "MCPServer registers no logging/setLevel handler (the request is rejected with method-not-found) "
             "and log messages are delivered at every severity regardless of any requested level."
@@ -477,7 +491,7 @@ class Requirement:
         ),
     ),
     "sampling:create-message:image-content": Requirement(
-        source=f"{SPEC_BASE_URL}/client/sampling#message-content",
+        source=f"{SPEC_BASE_URL}/client/sampling#image-content",
         behavior="Sampling messages can carry image content: base64 data with a mimeType.",
     ),
     "sampling:create-message:tools:not-supported": Requirement(
@@ -506,18 +520,19 @@ class Requirement:
     "sampling:create-message:not-supported": Requirement(
         source=f"{SPEC_BASE_URL}/client/sampling#capabilities",
         behavior=(
-            "A sampling request to a client that did not declare the sampling capability fails with an "
-            "error rather than hanging or being silently dropped."
+            "A sampling request to a client that did not declare the sampling capability fails with the "
+            "client's default-callback error (-32600 Invalid request) rather than hanging or being "
+            "silently dropped; the spec names no error code for this case."
         ),
     ),
     # ═══════════════════════════════════════════════════════════════════════════
     # Elicitation (server → client)
     # ═══════════════════════════════════════════════════════════════════════════
     "elicitation:form:accept": Requirement(
-        source=f"{SPEC_BASE_URL}/client/elicitation#form-mode-elicitation",
+        source=f"{SPEC_BASE_URL}/client/elicitation#form-mode-elicitation-requests",
         behavior=(
             "A form-mode elicitation answered with action 'accept' returns the user's content to the "
-            "requesting handler, validated against the requested schema."
+            "requesting handler."
         ),
     ),
     "elicitation:form:decline": Requirement(
@@ -529,7 +544,7 @@ class Requirement:
         behavior="A form-mode elicitation answered with action 'cancel' returns no content to the handler.",
     ),
     "elicitation:url:accept": Requirement(
-        source=f"{SPEC_BASE_URL}/client/elicitation#url-mode-elicitation",
+        source=f"{SPEC_BASE_URL}/client/elicitation#url-mode-elicitation-requests",
         behavior=(
             "A URL-mode elicitation delivers the message, URL, and elicitationId to the client; an accept "
             "response carries no content (accept means the user agreed to visit the URL, not that the "
@@ -545,7 +560,7 @@ class Requirement:
         behavior="A URL-mode elicitation answered with cancel returns the action with no content.",
     ),
     "elicitation:complete-notification": Requirement(
-        source=f"{SPEC_BASE_URL}/client/elicitation#completion-notification",
+        source=f"{SPEC_BASE_URL}/client/elicitation#completion-notifications-for-url-mode-elicitation",
         behavior=(
             "An elicitation/complete notification sent by the server after an out-of-band elicitation "
             "finishes reaches the client carrying the elicitationId."
@@ -559,11 +574,18 @@ class Requirement:
         ),
     ),
     "elicitation:form:not-supported": Requirement(
-        source=f"{SPEC_BASE_URL}/client/elicitation#capabilities",
+        source=f"{SPEC_BASE_URL}/client/elicitation#error-handling",
         behavior=(
             "An elicitation request to a client that did not declare the elicitation capability fails with "
             "an error rather than hanging or being silently dropped."
         ),
+        divergence=Divergence(
+            note=(
+                "The spec says a request for an elicitation mode the client has not declared MUST be "
+                "answered with -32602 Invalid params; the client's default callback answers with -32600 "
+                "Invalid request."
+            ),
+        ),
     ),
     # ═══════════════════════════════════════════════════════════════════════════
     # Roots (server → client)
@@ -580,11 +602,17 @@ class Requirement:
         behavior="An empty roots list is a valid response and reaches the handler as such.",
     ),
     "roots:list:not-supported": Requirement(
-        source=f"{SPEC_BASE_URL}/client/roots#capabilities",
+        source=f"{SPEC_BASE_URL}/client/roots#error-handling",
         behavior=(
             "A roots/list request to a client that did not declare the roots capability fails with an "
             "error rather than hanging or being silently dropped."
         ),
+        divergence=Divergence(
+            note=(
+                "The spec says a client that does not support roots SHOULD answer with -32601 Method not "
+                "found; the client's default callback answers with -32600 Invalid request."
+            ),
+        ),
     ),
     "roots:list-changed": Requirement(
         source=f"{SPEC_BASE_URL}/client/roots#root-list-changes",

tests/interaction/lowlevel/test_elicitation.py

@@ -145,7 +145,8 @@ async def test_elicit_form_without_callback_is_error() -> None:
     """Eliciting from a client that configured no elicitation callback fails with an error.
 
     The client's default callback answers with an Invalid request error, which the server-side
-    elicit call raises as an MCPError; the tool reports the code and message it caught.
+    elicit call raises as an MCPError; the tool reports the code and message it caught. The spec
+    requires -32602 for an undeclared mode (see the divergence note on the requirement).
     """
 
     async def list_tools(

tests/interaction/lowlevel/test_roots.py

@@ -82,7 +82,8 @@ async def list_roots(context: ClientRequestContext) -> ListRootsResult:
 async def test_list_roots_without_callback_is_error() -> None:
     """A roots/list request to a client with no roots callback fails with an error the handler can observe.
 
-    The client's default callback answers with INVALID_REQUEST rather than leaving the server hanging.
+    The client's default callback answers with INVALID_REQUEST rather than leaving the server
+    hanging; the spec names -32601 for this case (see the divergence note on the requirement).
     """
 
     async def list_tools(

tests/interaction/lowlevel/test_wire.py

@@ -41,8 +41,7 @@ async def call_tool(ctx: ServerRequestContext, params: types.CallToolRequestPara
 async def test_request_ids_are_unique_and_never_null() -> None:
     """Every request the client sends carries a distinct, non-null id.
 
-    The id sequence is pinned: sequential integers from zero, in send order, including the
-    schema-cache refresh the client performs after the first successful tool call.
+    The id sequence is pinned: sequential integers from zero, in send order.
     """
     recording = RecordingTransport(InMemoryTransport(_echo_server()))
 

tests/interaction/mcpserver/test_context.py

@@ -16,20 +16,24 @@
     ElicitRequestParams,
     ElicitResult,
     ErrorData,
+    LoggingMessageNotification,
     LoggingMessageNotificationParams,
     TextContent,
 )
+from tests.interaction._helpers import IncomingMessage
 from tests.interaction._requirements import requirement
 
 pytestmark = pytest.mark.anyio
 
 
 @requirement("mcpserver:context:logging")
+@requirement("logging:capability")
 async def test_context_logging_helpers_send_log_notifications() -> None:
     """Each Context logging helper sends a log message notification at the matching severity.
 
     All four notifications reach the client's logging callback before the tool call returns; none
-    of them carry a logger name unless one is passed explicitly.
+    of them carry a logger name unless one is passed explicitly. The server emits these without
+    advertising the logging capability (see the divergence note on logging:capability).
     """
     received: list[LoggingMessageNotificationParams] = []
     mcp = MCPServer("chatty")
@@ -47,6 +51,7 @@ async def collect(params: LoggingMessageNotificationParams) -> None:
 
     async with Client(mcp, logging_callback=collect) as client:
         result = await client.call_tool("narrate", {})
+        advertised_logging = client.initialize_result.capabilities.logging
 
     assert result == snapshot(CallToolResult(content=[TextContent(text="done")], structured_content={"result": "done"}))
     assert received == snapshot(
@@ -57,6 +62,8 @@ async def collect(params: LoggingMessageNotificationParams) -> None:
             LoggingMessageNotificationParams(level="error", data="e"),
         ]
     )
+    # The spec requires servers that emit log notifications to declare the logging capability.
+    assert advertised_logging is None
 
 
 @requirement("mcpserver:context:progress")
@@ -86,6 +93,37 @@ async def on_progress(progress: float, total: float | None, message: str | None)
     assert received == snapshot([(1.0, 3.0, None), (2.0, 3.0, "halfway there")])
 
 
+@requirement("progress:no-token")
+async def test_report_progress_without_a_progress_token_sends_nothing() -> None:
+    """When the caller supplied no progress callback, Context.report_progress is a silent no-op.
+
+    The tool also emits one log message as a sentinel: the message handler receives only that,
+    proving the notification pipeline works and no progress notification was sent for the
+    token-less request.
+    """
+    received: list[IncomingMessage] = []
+    mcp = MCPServer("quiet")
+
+    @mcp.tool()
+    async def mill(ctx: Context) -> str:
+        await ctx.report_progress(1, 3)
+        await ctx.info("milling done")
+        return "milled"
+
+    async def collect(message: IncomingMessage) -> None:
+        received.append(message)
+
+    async with Client(mcp, message_handler=collect) as client:
+        result = await client.call_tool("mill", {})
+
+    assert result == snapshot(
+        CallToolResult(content=[TextContent(text="milled")], structured_content={"result": "milled"})
+    )
+    assert received == snapshot(
+        [LoggingMessageNotification(params=LoggingMessageNotificationParams(level="info", data="milling done"))]
+    )
+
+
 @requirement("mcpserver:context:elicit")
 async def test_context_elicit_returns_typed_result() -> None:
     """Context.elicit sends a form elicitation built from a pydantic schema and returns a typed result.