Align interaction-manifest ids with the cross-SDK vocabulary

Rename 14 requirement ids to the names shared with the typescript-sdk e2e
suite (sampling:create:*, elicitation:url:action:*, protocol:meta:*, the
client-auth stepup/iss/scope/dcr family, the mcpserver context helpers),
updating every @requirement decorator to match.

The resources:read:unknown-uri name previously sat on an entry whose test
proves lowlevel handler-error passthrough, not the unknown-resource rule;
that entry is re-described honestly as protocol:error:handler-error-
passthrough (source 'sdk'), and the real unknown-resource entry (-32602 with
the URI in error.data, SEP-2164) takes the vacated name with its source
repointed to the 2026 page that mandates it.

The protocol:meta:request-to-handler 2026 arm exclusion now carries the
accurate reason (legacy-only-vocabulary) and a note explaining the envelope-
key merge that breaks the equality assertion, so the re-admission checklist
finds it. Three test docstrings quoting pre-rename spec anchors updated.
Cell generation unchanged (830 before and after).

Author: maxisbey

tests/interaction/_requirements.py

@@ -572,6 +572,13 @@ def __post_init__(self) -> None:
         source="sdk",
         behavior="Closing the transport fails all in-flight requests with a connection-closed error.",
     ),
+    "protocol:error:handler-error-passthrough": Requirement(
+        source="sdk",
+        behavior=(
+            "An MCPError raised by a request handler is returned to the caller as a JSON-RPC error "
+            "carrying the handler-chosen code and message verbatim."
+        ),
+    ),
     "protocol:error:internal-error": Requirement(
         source=f"{SPEC_BASE_URL}/basic#responses",
         behavior=(
@@ -635,12 +642,23 @@ def __post_init__(self) -> None:
             "extension."
         ),
     ),
-    "meta:request-to-handler": Requirement(
+    "protocol:meta:request-to-handler": Requirement(
         source=f"{SPEC_BASE_URL}/basic#_meta",
         behavior="The _meta object the client attaches to a request is visible to the server handler.",
-        arm_exclusions=(ArmExclusion(reason="asserts-legacy-handshake", spec_version="2026-07-28"),),
+        arm_exclusions=(
+            ArmExclusion(
+                reason="legacy-only-vocabulary",
+                spec_version="2026-07-28",
+                note=(
+                    "The pass-through itself holds at 2026, but the modern envelope merges the reserved "
+                    "io.modelcontextprotocol/* keys into every request's _meta, so the test's "
+                    "nothing-else-injected equality assertion only holds on the legacy wire; needs an "
+                    "era-aware assertion before re-admission."
+                ),
+            ),
+        ),
     ),
-    "meta:result-to-client": Requirement(
+    "protocol:meta:result-to-client": Requirement(
         source=f"{SPEC_BASE_URL}/basic#_meta",
         behavior="The _meta object a handler attaches to its result is delivered to the client.",
     ),
@@ -1037,7 +1055,7 @@ def __post_init__(self) -> None:
     # ═══════════════════════════════════════════════════════════════════════════
     # MCPServer: Context helpers (SDK)
     # ═══════════════════════════════════════════════════════════════════════════
-    "mcpserver:context:logging": Requirement(
+    "mcpserver:context:log-from-handler": Requirement(
         source="sdk",
         behavior=(
             "The Context logging helpers (debug/info/warning/error) send log message notifications at the "
@@ -1050,7 +1068,7 @@ def __post_init__(self) -> None:
             "Context.report_progress sends a progress notification against the requesting client's progress token."
         ),
     ),
-    "mcpserver:context:elicit": Requirement(
+    "mcpserver:context:elicit-from-handler": Requirement(
         source="sdk",
         behavior=(
             "Context.elicit sends a form elicitation built from a typed schema and returns a typed "
@@ -1121,8 +1139,11 @@ def __post_init__(self) -> None:
         behavior="resources/read returns text contents carrying uri, mimeType, and the text.",
     ),
     "resources:read:unknown-uri": Requirement(
-        source=f"{SPEC_BASE_URL}/server/resources#error-handling",
-        behavior="resources/read for an unknown URI returns JSON-RPC error -32002 (resource not found).",
+        source=f"{SPEC_2026_BASE_URL}/server/resources#error-handling",
+        behavior=(
+            "resources/read for a URI matching no registered resource returns JSON-RPC error -32602 "
+            "(invalid params) with the requested URI in error.data, per SEP-2164."
+        ),
     ),
     "resources:subscribe": Requirement(
         source=f"{SPEC_BASE_URL}/server/resources#subscriptions",
@@ -1228,13 +1249,6 @@ def __post_init__(self) -> None:
             "by resources/read, receiving the parameters extracted from the requested URI."
         ),
     ),
-    "mcpserver:resource:unknown-uri": Requirement(
-        source=f"{SPEC_BASE_URL}/server/resources#error-handling",
-        behavior=(
-            "resources/read for a URI matching no registered resource returns JSON-RPC error -32602 "
-            "(invalid params) with the requested URI in error.data, per SEP-2164."
-        ),
-    ),
     # ═══════════════════════════════════════════════════════════════════════════
     # Prompts
     # ═══════════════════════════════════════════════════════════════════════════
@@ -1528,23 +1542,23 @@ def __post_init__(self) -> None:
             "rejects every tool-enabled request before it is sent."
         ),
     ),
-    "sampling:create-message:audio-content": Requirement(
+    "sampling:create:audio-content": Requirement(
         source=f"{SPEC_BASE_URL}/client/sampling#audio-content",
         behavior="Sampling messages can carry audio content: base64 data with a mimeType.",
         arm_exclusions=(
             ArmExclusion(reason="server-initiated-request", transport="streamable-http-stateless"),
             ArmExclusion(reason="server-initiated-request", spec_version="2026-07-28"),
         ),
     ),
-    "sampling:create-message:image-content": Requirement(
+    "sampling:create:image-content": Requirement(
         source=f"{SPEC_BASE_URL}/client/sampling#image-content",
         behavior="Sampling messages can carry image content: base64 data with a mimeType.",
         arm_exclusions=(
             ArmExclusion(reason="server-initiated-request", transport="streamable-http-stateless"),
             ArmExclusion(reason="server-initiated-request", spec_version="2026-07-28"),
         ),
     ),
-    "sampling:create-message:not-supported": Requirement(
+    "sampling:create: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 "
@@ -1832,20 +1846,28 @@ def __post_init__(self) -> None:
             ArmExclusion(reason="server-initiated-request", spec_version="2026-07-28"),
         ),
     ),
-    "elicitation:url:basic": Requirement(
-        source=f"{SPEC_BASE_URL}/client/elicitation#url-mode-elicitation-requests",
-        behavior=(
-            "A url-mode elicitation delivers the elicitation id and URL to the client callback exactly as "
-            "the server sent them."
-        ),
+    "elicitation:url:action:cancel": Requirement(
+        source=f"{SPEC_BASE_URL}/client/elicitation#response-actions",
+        behavior="A URL-mode elicitation answered with cancel returns the action with no content.",
         arm_exclusions=(
             ArmExclusion(reason="server-initiated-request", transport="streamable-http-stateless"),
             ArmExclusion(reason="server-initiated-request", spec_version="2026-07-28"),
         ),
     ),
-    "elicitation:url:cancel": Requirement(
+    "elicitation:url:action:decline": Requirement(
         source=f"{SPEC_BASE_URL}/client/elicitation#response-actions",
-        behavior="A URL-mode elicitation answered with cancel returns the action with no content.",
+        behavior="A URL-mode elicitation answered with decline returns the action with no content.",
+        arm_exclusions=(
+            ArmExclusion(reason="server-initiated-request", transport="streamable-http-stateless"),
+            ArmExclusion(reason="server-initiated-request", spec_version="2026-07-28"),
+        ),
+    ),
+    "elicitation:url:basic": Requirement(
+        source=f"{SPEC_BASE_URL}/client/elicitation#url-mode-elicitation-requests",
+        behavior=(
+            "A url-mode elicitation delivers the elicitation id and URL to the client callback exactly as "
+            "the server sent them."
+        ),
         arm_exclusions=(
             ArmExclusion(reason="server-initiated-request", transport="streamable-http-stateless"),
             ArmExclusion(reason="server-initiated-request", spec_version="2026-07-28"),
@@ -1873,14 +1895,6 @@ def __post_init__(self) -> None:
         removed_in="2026-07-28",
         note="removed in 2026-07-28 (spec PR #2891); notifications/elicitation/complete removed, no replacement.",
     ),
-    "elicitation:url:decline": Requirement(
-        source=f"{SPEC_BASE_URL}/client/elicitation#response-actions",
-        behavior="A URL-mode elicitation answered with decline returns the action with no content.",
-        arm_exclusions=(
-            ArmExclusion(reason="server-initiated-request", transport="streamable-http-stateless"),
-            ArmExclusion(reason="server-initiated-request", spec_version="2026-07-28"),
-        ),
-    ),
     "elicitation:url:not-supported": Requirement(
         source=f"{SPEC_BASE_URL}/client/elicitation#error-handling",
         behavior=(
@@ -3453,7 +3467,7 @@ def __post_init__(self) -> None:
         transports=("streamable-http",),
         note="OAuth is HTTP-only.",
     ),
-    "client-auth:403-scope-union": Requirement(
+    "client-auth:stepup:scope-union": Requirement(
         source=f"{SPEC_BASE_URL}/basic/authorization#step-up-authorization-flow",
         behavior=(
             "On a 403 insufficient_scope step-up, the re-authorization request carries the union of the "
@@ -3496,7 +3510,7 @@ def __post_init__(self) -> None:
             ),
         ),
     ),
-    "client-auth:authorize:offline-access-consent": Requirement(
+    "client-auth:scope:offline-access-gate": Requirement(
         source="sdk",
         behavior=(
             "When the authorization server's metadata advertises offline_access in scopes_supported and "
@@ -3530,7 +3544,7 @@ def __post_init__(self) -> None:
         transports=("streamable-http",),
         note="OAuth is HTTP-only.",
     ),
-    "client-auth:dcr:registration-error-surfaces": Requirement(
+    "client-auth:dcr:registration-rejected-error": Requirement(
         source="sdk",
         behavior=(
             "A 400 from the registration endpoint surfaces to the caller as an OAuthRegistrationError "
@@ -3692,7 +3706,7 @@ def __post_init__(self) -> None:
         transports=("streamable-http",),
         note="OAuth is HTTP-only.",
     ),
-    "client-auth:authorization-response:iss-verify": Requirement(
+    "client-auth:iss:mismatch-reject": Requirement(
         source=f"{SPEC_2026_BASE_URL}/basic/authorization#authorization-response-validation",
         behavior=(
             "The client validates the RFC 9207 iss authorization-response parameter against the "

tests/interaction/auth/test_authorize_token.py

@@ -113,7 +113,7 @@ async def recorded_oauth_flow() -> AsyncIterator[RecordedFlow]:
 
 @requirement("client-auth:pkce:s256")
 @requirement("client-auth:resource-parameter")
-@requirement("client-auth:authorize:offline-access-consent")
+@requirement("client-auth:scope:offline-access-gate")
 async def test_the_authorize_url_carries_s256_pkce_and_the_resource_indicator(
     recorded_oauth_flow: RecordedFlow,
 ) -> None:
@@ -187,7 +187,7 @@ async def test_a_mismatched_state_on_the_callback_aborts_the_flow() -> None:
             await connect_with_oauth(server, provider=provider, headless=headless).__aenter__()
 
 
-@requirement("client-auth:authorization-response:iss-verify")
+@requirement("client-auth:iss:mismatch-reject")
 async def test_a_mismatched_iss_on_the_callback_aborts_the_flow() -> None:
     """A callback whose RFC 9207 iss does not match the authorization server issuer aborts the flow.
 

tests/interaction/auth/test_discovery.py

@@ -150,7 +150,7 @@ async def test_when_every_prm_probe_fails_the_client_discovers_as_metadata_at_th
     assert result.tools[0].name == "probe"
 
 
-@requirement("client-auth:dcr:registration-error-surfaces")
+@requirement("client-auth:dcr:registration-rejected-error")
 async def test_a_400_from_the_registration_endpoint_surfaces_as_a_registration_error() -> None:
     """A 400 from `/register` surfaces as `OAuthRegistrationError` carrying the server's body.
 

tests/interaction/auth/test_lifecycle.py

@@ -179,7 +179,7 @@ async def test_a_403_insufficient_scope_triggers_one_reauthorize_with_the_challe
     assert counts[("POST", "/token")] == 2
 
 
-@requirement("client-auth:403-scope-union")
+@requirement("client-auth:stepup:scope-union")
 async def test_a_403_step_up_re_authorizes_with_the_union_of_prior_and_challenged_scopes() -> None:
     """The step-up re-authorize requests the union of the previously requested and challenged scopes.
 

tests/interaction/lowlevel/test_client_connect.py

@@ -154,7 +154,7 @@ async def test_prior_discover_populates_state_with_zero_connect_time_traffic() -
 async def test_auto_mode_probes_server_discover_and_adopts_the_result() -> None:
     """`Client(..., mode='auto')` sends `server/discover` first and adopts the returned version and server_info.
 
-    Requirement `lifecycle:discover:basic` (spec basic/lifecycle#discover): the probe is a
+    Requirement `lifecycle:discover:basic` (spec server/discover): the probe is a
     single `server/discover` request whose result carries supported versions, capabilities,
     server_info and the cache-hint fields, after which the session is modern-negotiated.
     """
@@ -179,7 +179,7 @@ async def test_auto_mode_probes_server_discover_and_adopts_the_result() -> None:
 async def test_auto_mode_retries_discover_once_on_unsupported_protocol_version() -> None:
     """A -32022 from `server/discover` triggers exactly one retry at the highest mutual modern version.
 
-    Requirement `lifecycle:discover:retry-on-32022` (spec basic/lifecycle#version-errors): the
+    Requirement `lifecycle:discover:retry-on-32022` (spec basic/versioning#protocol-version-negotiation): the
     client intersects `error.data.supported` with its own modern versions and re-probes once;
     the second success is adopted. The server's `server/discover` handler is overridden to fail
     the first call and succeed on the second.
@@ -349,7 +349,7 @@ async def list_tools(
 async def test_http_protocol_version_header_matches_meta_protocol_version_on_every_post() -> None:
     """On streamable-HTTP, the `MCP-Protocol-Version` header on each POST equals `_meta.protocolVersion` in its body.
 
-    Requirement `lifecycle:envelope:header-matches-meta` (spec streamable-http#headers): the
+    Requirement `lifecycle:envelope:header-matches-meta` (spec streamable-http#protocol-version-header): the
     body-derived header and the envelope's protocol version are kept in lockstep so the server's
     header-based routing and body-based validation never disagree.
     """

tests/interaction/lowlevel/test_elicitation.py

@@ -240,7 +240,7 @@ async def answer_url(context: ClientRequestContext, params: types.ElicitRequestP
     assert result == snapshot(CallToolResult(content=[TextContent(text="accept content=None")]))
 
 
-@requirement("elicitation:url:decline")
+@requirement("elicitation:url:action:decline")
 async def test_elicit_url_decline_returns_no_content(connect: Connect) -> None:
     """A declined URL elicitation returns the decline action to the handler with no content."""
 
@@ -269,7 +269,7 @@ async def answer_url(context: ClientRequestContext, params: types.ElicitRequestP
     assert result == snapshot(CallToolResult(content=[TextContent(text="decline content=None")]))
 
 
-@requirement("elicitation:url:cancel")
+@requirement("elicitation:url:action:cancel")
 async def test_elicit_url_cancel_returns_no_content(connect: Connect) -> None:
     """A cancelled URL elicitation returns the cancel action to the handler with no content."""
 

tests/interaction/lowlevel/test_meta.py

@@ -16,7 +16,7 @@
 pytestmark = pytest.mark.anyio
 
 
-@requirement("meta:request-to-handler")
+@requirement("protocol:meta:request-to-handler")
 async def test_request_meta_reaches_handler(connect: Connect) -> None:
     """The _meta object the client attaches to a request arrives at the tool handler unchanged."""
     request_meta: RequestParamsMeta = {"example.com/trace": "abc-123"}
@@ -41,7 +41,7 @@ async def call_tool(ctx: ServerRequestContext, params: types.CallToolRequestPara
     assert observed_metas == [dict(request_meta)]
 
 
-@requirement("meta:result-to-client")
+@requirement("protocol:meta:result-to-client")
 async def test_result_meta_reaches_client(connect: Connect) -> None:
     """The _meta object a handler attaches to its result is delivered to the client unchanged."""
     result_meta = {"example.com/cost": 3}

tests/interaction/lowlevel/test_resources.py

@@ -140,7 +140,7 @@ async def read_resource(ctx: ServerRequestContext, params: types.ReadResourceReq
     )
 
 
-@requirement("resources:read:unknown-uri")
+@requirement("protocol:error:handler-error-passthrough")
 async def test_read_resource_unknown_uri_is_protocol_error(connect: Connect) -> None:
     """A handler that rejects an unrecognised URI with MCPError produces a JSON-RPC error.
 

tests/interaction/lowlevel/test_sampling.py

@@ -155,7 +155,7 @@ async def sampling_callback(
     )
 
 
-@requirement("sampling:create-message:image-content")
+@requirement("sampling:create:image-content")
 async def test_create_message_request_with_image_content_reaches_callback(connect: Connect) -> None:
     """A sampling request message carrying image content arrives at the client callback intact.
 
@@ -207,7 +207,7 @@ async def sampling_callback(
     )
 
 
-@requirement("sampling:create-message:image-content")
+@requirement("sampling:create:image-content")
 async def test_create_message_result_with_image_content_returns_to_handler(connect: Connect) -> None:
     """A sampling result whose content is an image is returned to the requesting handler intact.
 
@@ -281,7 +281,7 @@ async def sampling_callback(context: ClientRequestContext, params: CreateMessage
     assert result == snapshot(CallToolResult(content=[TextContent(text="-1: User rejected sampling request")]))
 
 
-@requirement("sampling:create-message:not-supported")
+@requirement("sampling:create:not-supported")
 async def test_create_message_without_callback_is_error(connect: Connect) -> None:
     """A sampling request to a client with no sampling callback fails with the SDK's default error."""
 
@@ -437,7 +437,7 @@ async def sampling_callback(
     assert captured == snapshot([SamplingCapability()])
 
 
-@requirement("sampling:create-message:audio-content")
+@requirement("sampling:create:audio-content")
 async def test_create_message_request_with_audio_content_reaches_callback(connect: Connect) -> None:
     """A sampling request message carrying audio content arrives at the client callback intact.
 
@@ -489,7 +489,7 @@ async def sampling_callback(
     )
 
 
-@requirement("sampling:create-message:audio-content")
+@requirement("sampling:create:audio-content")
 async def test_create_message_result_with_audio_content_returns_to_handler(connect: Connect) -> None:
     """A sampling result whose content is audio is returned to the requesting handler intact.
 

tests/interaction/mcpserver/test_context.py

@@ -27,7 +27,7 @@
 pytestmark = pytest.mark.anyio
 
 
-@requirement("mcpserver:context:logging")
+@requirement("mcpserver:context:log-from-handler")
 @requirement("logging:capability:declared")
 async def test_context_logging_helpers_send_log_notifications(connect: Connect) -> None:
     """Each Context logging helper sends a log message notification at the matching severity.
@@ -121,7 +121,7 @@ async def whoami(ctx: Context) -> str:
     assert request_id
 
 
-@requirement("mcpserver:context:logging")
+@requirement("mcpserver:context:log-from-handler")
 @requirement("protocol:progress:no-token")
 async def test_report_progress_without_a_progress_token_sends_nothing(connect: Connect) -> None:
     """When the caller supplied no progress callback, Context.report_progress is a silent no-op.
@@ -153,7 +153,7 @@ async def collect(message: IncomingMessage) -> None:
     )
 
 
-@requirement("mcpserver:context:elicit")
+@requirement("mcpserver:context:elicit-from-handler")
 @requirement("tools:call:elicitation-roundtrip")
 async def test_context_elicit_returns_typed_result(connect: Connect) -> None:
     """Context.elicit sends a form elicitation built from a pydantic schema and returns a typed result.