test: align requirement IDs, add transport applicability, and enforce two-way test coverage

Author: maxisbey

tests/interaction/_requirements.py

@@ -19,7 +19,7 @@
 pytestmark = pytest.mark.anyio
 
 
-@requirement("cancellation:in-flight")
+@requirement("protocol:cancel:in-flight")
 async def test_cancellation_stops_in_flight_handler() -> None:
     """Cancelling an in-flight request interrupts its handler and fails the pending call.
 
@@ -68,7 +68,7 @@ async def call_and_capture_error() -> None:
     assert errors == snapshot([ErrorData(code=0, message="Request cancelled")])
 
 
-@requirement("cancellation:server-survives")
+@requirement("protocol:cancel:server-survives")
 async def test_session_serves_requests_after_cancellation() -> None:
     """A request cancelled mid-flight does not poison the session: the next request succeeds."""
     started = anyio.Event()
@@ -114,7 +114,7 @@ async def call_and_swallow_cancellation_error() -> None:
     assert result == snapshot(CallToolResult(content=[TextContent(text="still alive")]))
 
 
-@requirement("cancellation:unknown-request")
+@requirement("protocol:cancel:unknown-id-ignored")
 async def test_cancellation_for_unknown_request_is_ignored() -> None:
     """A cancellation referencing a request id that is not in flight is ignored without error."""
 

tests/interaction/lowlevel/test_cancellation.py

@@ -19,7 +19,7 @@
 pytestmark = pytest.mark.anyio
 
 
-@requirement("completion:complete:prompt-ref")
+@requirement("completion:prompt-arg")
 async def test_complete_prompt_argument() -> None:
     """Completing a prompt argument delivers the ref, argument name, and current value to the handler.
 
@@ -46,7 +46,7 @@ async def completion(ctx: ServerRequestContext, params: types.CompleteRequestPar
     )
 
 
-@requirement("completion:complete:resource-ref")
+@requirement("completion:resource-template-arg")
 async def test_complete_resource_template_variable() -> None:
     """Completing a URI template variable delivers the template URI and variable name to the handler."""
 
@@ -67,7 +67,7 @@ async def completion(ctx: ServerRequestContext, params: types.CompleteRequestPar
     assert result == snapshot(CompleteResult(completion=Completion(values=["modelcontextprotocol"])))
 
 
-@requirement("completion:complete:context")
+@requirement("completion:context-arguments")
 async def test_complete_receives_context_arguments() -> None:
     """Previously-resolved arguments passed as completion context reach the handler.
 
@@ -93,6 +93,7 @@ async def completion(ctx: ServerRequestContext, params: types.CompleteRequestPar
 
 
 @requirement("completion:complete:not-supported")
+@requirement("protocol:error:method-not-found")
 async def test_complete_without_handler_is_method_not_found() -> None:
     """A server with no completion handler advertises no completions capability and rejects the request."""
     server = Server("incomplete")

tests/interaction/lowlevel/test_completion.py

@@ -32,7 +32,9 @@
 }
 
 
-@requirement("elicitation:form:accept")
+@requirement("elicitation:form:action:accept")
+@requirement("elicitation:form:basic")
+@requirement("tools:call:elicitation-roundtrip")
 async def test_elicit_form_accepted_content_returns_to_handler() -> None:
     """An accepted form elicitation returns the user's content to the requesting handler.
 
@@ -86,7 +88,7 @@ async def answer_form(context: ClientRequestContext, params: types.ElicitRequest
     )
 
 
-@requirement("elicitation:form:decline")
+@requirement("elicitation:form:action:decline")
 async def test_elicit_form_decline_returns_no_content() -> None:
     """A declined form elicitation returns the decline action to the handler with no content."""
 
@@ -113,7 +115,7 @@ async def answer_form(context: ClientRequestContext, params: types.ElicitRequest
     assert result == snapshot(CallToolResult(content=[TextContent(text="decline content=None")]))
 
 
-@requirement("elicitation:form:cancel")
+@requirement("elicitation:form:action:cancel")
 async def test_elicit_form_cancel_returns_no_content() -> None:
     """A cancelled form elicitation returns the cancel action to the handler with no content."""
 
@@ -172,7 +174,8 @@ async def call_tool(ctx: ServerRequestContext, params: types.CallToolRequestPara
     assert result == snapshot(CallToolResult(content=[TextContent(text="-32600: Elicitation not supported")]))
 
 
-@requirement("elicitation:url:accept")
+@requirement("elicitation:url:action:accept-no-content")
+@requirement("elicitation:url:basic")
 async def test_elicit_url_delivers_url_and_returns_accept_without_content() -> None:
     """A URL elicitation delivers the message, URL, and elicitation id to the client; accepting it
     returns the action with no content.
@@ -276,7 +279,7 @@ async def answer_url(context: ClientRequestContext, params: types.ElicitRequestP
     assert result == snapshot(CallToolResult(content=[TextContent(text="cancel content=None")]))
 
 
-@requirement("elicitation:complete-notification")
+@requirement("elicitation:url:complete-notification")
 async def test_elicitation_complete_notification_carries_the_elicited_id_back_to_the_client() -> None:
     """After a URL elicitation finishes, the server announces it with a notification carrying the same id.
 

tests/interaction/lowlevel/test_elicitation.py

@@ -84,6 +84,10 @@ async def test_initialize_returns_instructions() -> None:
 
 
 @requirement("lifecycle:initialize:capabilities:from-handlers")
+@requirement("tools:capability:declared")
+@requirement("resources:capability:declared")
+@requirement("prompts:capability:declared")
+@requirement("completion:capability:declared")
 async def test_initialize_capabilities_reflect_registered_handlers() -> None:
     """Each feature area with a registered handler is advertised as a capability.
 
@@ -253,7 +257,8 @@ async def list_tools(ctx: ServerRequestContext, params: types.PaginatedRequestPa
     assert pong == snapshot(EmptyResult())
 
 
-@requirement("lifecycle:initialize:protocol-version")
+@requirement("lifecycle:version:match")
+@requirement("lifecycle:version:server-fallback-latest")
 async def test_initialize_negotiates_protocol_version() -> None:
     """The server echoes a supported requested version and answers an unsupported one with its latest.
 
@@ -284,7 +289,7 @@ def initialize_request(protocol_version: str) -> InitializeRequest:
     assert result.protocol_version == snapshot("2025-11-25")
 
 
-@requirement("lifecycle:initialize:protocol-version:client-rejects")
+@requirement("lifecycle:version:reject-unsupported")
 async def test_unsupported_server_protocol_version_fails_initialization() -> None:
     """An initialize response carrying a protocol version the client does not support fails initialization.
 

tests/interaction/lowlevel/test_initialize.py

@@ -25,7 +25,7 @@
 pytestmark = pytest.mark.anyio
 
 
-@requirement("notifications:tools:list-changed")
+@requirement("tools:list-changed")
 async def test_tool_list_changed_notification() -> None:
     """A tools/list_changed notification sent during a tool call reaches the client's message handler."""
     received: list[IncomingMessage] = []
@@ -51,7 +51,7 @@ async def call_tool(ctx: ServerRequestContext, params: types.CallToolRequestPara
     assert received == snapshot([ToolListChangedNotification()])
 
 
-@requirement("notifications:resources:list-changed")
+@requirement("resources:list-changed")
 async def test_resource_list_changed_notification() -> None:
     """A resources/list_changed notification sent during a tool call reaches the client's message handler."""
     received: list[IncomingMessage] = []
@@ -77,7 +77,7 @@ async def call_tool(ctx: ServerRequestContext, params: types.CallToolRequestPara
     assert received == snapshot([ResourceListChangedNotification()])
 
 
-@requirement("notifications:prompts:list-changed")
+@requirement("prompts:list-changed")
 async def test_prompt_list_changed_notification() -> None:
     """A prompts/list_changed notification sent during a tool call reaches the client's message handler."""
     received: list[IncomingMessage] = []

tests/interaction/lowlevel/test_list_changed.py

@@ -48,7 +48,8 @@ async def set_logging_level(ctx: ServerRequestContext, params: types.SetLevelReq
     assert result == snapshot(EmptyResult())
 
 
-@requirement("logging:message:notification")
+@requirement("logging:message:fields")
+@requirement("tools:call:logging-mid-execution")
 async def test_log_messages_reach_logging_callback_in_order() -> None:
     """Log messages sent during a tool call arrive at the logging callback, in order, before the call returns.
 

tests/interaction/lowlevel/test_logging.py

@@ -26,7 +26,7 @@
 pytestmark = pytest.mark.anyio
 
 
-@requirement("pagination:cursor-round-trip")
+@requirement("tools:list:pagination")
 async def test_next_cursor_round_trips_through_the_client() -> None:
     """The next_cursor a list handler returns reaches the client, and the cursor the client sends
     back on the following call reaches the handler verbatim.
@@ -57,6 +57,7 @@ async def list_tools(ctx: ServerRequestContext, params: types.PaginatedRequestPa
 
 
 @requirement("pagination:exhaustion")
+@requirement("tools:list:pagination")
 async def test_paginating_until_next_cursor_is_absent_yields_every_page() -> None:
     """Following next_cursor until it is absent visits every page exactly once, in order."""
     pages: dict[str | None, tuple[str, str | None]] = {
@@ -89,7 +90,7 @@ async def list_tools(ctx: ServerRequestContext, params: types.PaginatedRequestPa
     assert requests_made == len(pages)
 
 
-@requirement("pagination:resources")
+@requirement("resources:list:pagination")
 async def test_resources_list_supports_cursor_pagination() -> None:
     """resources/list round-trips the cursor like every other list operation."""
     seen_cursors: list[str | None] = []
@@ -116,7 +117,7 @@ async def list_resources(
     assert second_page.next_cursor is None
 
 
-@requirement("pagination:resource-templates")
+@requirement("resources:templates:pagination")
 async def test_resource_templates_list_supports_cursor_pagination() -> None:
     """resources/templates/list round-trips the cursor like every other list operation."""
     seen_cursors: list[str | None] = []
@@ -148,7 +149,7 @@ async def list_resource_templates(
     assert second_page.next_cursor is None
 
 
-@requirement("pagination:prompts")
+@requirement("prompts:list:pagination")
 async def test_prompts_list_supports_cursor_pagination() -> None:
     """prompts/list round-trips the cursor like every other list operation."""
     seen_cursors: list[str | None] = []

tests/interaction/lowlevel/test_pagination.py

@@ -20,7 +20,8 @@
 pytestmark = pytest.mark.anyio
 
 
-@requirement("progress:server-to-client")
+@requirement("protocol:progress:callback")
+@requirement("tools:call:progress")
 async def test_progress_during_tool_call_reaches_callback_in_order() -> None:
     """Progress notifications emitted by a tool handler reach the caller's progress callback in order."""
     received: list[tuple[float, float | None, str | None]] = []
@@ -52,7 +53,7 @@ async def call_tool(ctx: ServerRequestContext, params: types.CallToolRequestPara
     assert received == snapshot([(1.0, 3.0, "first chunk"), (2.0, 3.0, "second chunk"), (3.0, 3.0, "done")])
 
 
-@requirement("progress:token-propagation")
+@requirement("protocol:progress:token-injected")
 async def test_progress_token_visible_to_handler() -> None:
     """Supplying a progress callback attaches a progress token that the handler can read from the request meta."""
 
@@ -79,7 +80,7 @@ async def ignore(progress: float, total: float | None, message: str | None) -> N
     assert result == snapshot(CallToolResult(content=[TextContent(text="1")]))
 
 
-@requirement("progress:no-token")
+@requirement("protocol:progress:no-token")
 async def test_no_progress_callback_means_no_token() -> None:
     """Without a progress callback the request carries no progress token.
 
@@ -105,7 +106,7 @@ async def call_tool(ctx: ServerRequestContext, params: types.CallToolRequestPara
     assert result == snapshot(CallToolResult(content=[TextContent(text="None")]))
 
 
-@requirement("progress:client-to-server")
+@requirement("protocol:progress:client-to-server")
 async def test_client_progress_notification_reaches_server_handler() -> None:
     """A progress notification sent by the client is delivered to the server's progress handler."""
     received: list[ProgressNotificationParams] = []

tests/interaction/lowlevel/test_progress.py

@@ -65,7 +65,7 @@ async def list_prompts(ctx: ServerRequestContext, params: types.PaginatedRequest
     )
 
 
-@requirement("prompts:get:arguments")
+@requirement("prompts:get:with-args")
 async def test_get_prompt_substitutes_arguments() -> None:
     """Arguments supplied by the client reach the prompt handler; the templated message comes back."""