backport: phase-1.5 mechanical types sweep (snake→camel kwargs, type= discriminators)

Author: maxisbey

tests/interaction/auth/test_authorize_token.py

@@ -51,7 +51,7 @@
 
 
 async def list_tools(ctx: ServerRequestContext, params: types.PaginatedRequestParams | None) -> ListToolsResult:
-    return ListToolsResult(tools=[Tool(name="echo", input_schema={"type": "object"})])
+    return ListToolsResult(tools=[Tool(name="echo", inputSchema={"type": "object"})])
 
 
 def authorize_params(authorize_url: str) -> dict[str, str]:

tests/interaction/auth/test_discovery.py

@@ -43,7 +43,7 @@
 
 
 async def list_tools(ctx: ServerRequestContext, params: types.PaginatedRequestParams | None) -> ListToolsResult:
-    return ListToolsResult(tools=[Tool(name="probe", input_schema={"type": "object"})])
+    return ListToolsResult(tools=[Tool(name="probe", inputSchema={"type": "object"})])
 
 
 def discovery_gets(recorded: list[RecordedRequest]) -> list[str]:

tests/interaction/auth/test_flow.py

@@ -40,7 +40,7 @@
 
 
 async def list_tools(ctx: ServerRequestContext, params: types.PaginatedRequestParams | None) -> ListToolsResult:
-    return ListToolsResult(tools=[Tool(name="whoami", input_schema={"type": "object"})])
+    return ListToolsResult(tools=[Tool(name="whoami", inputSchema={"type": "object"})])
 
 
 @requirement("flow:oauth:authorization-code-roundtrip")
@@ -76,7 +76,7 @@ async def test_an_unauthenticated_request_is_challenged_then_the_full_oauth_flow
         ):
             result = await client.list_tools()
 
-    assert result == snapshot(ListToolsResult(tools=[Tool(name="whoami", input_schema={"type": "object"})]))
+    assert result == snapshot(ListToolsResult(tools=[Tool(name="whoami", inputSchema={"type": "object"})]))
     assert headless.authorize_url is not None
 
     paths = [(r.method, r.url.path) for r in requests]
@@ -126,7 +126,7 @@ async def call_tool(ctx: ServerRequestContext, params: types.CallToolRequestPara
         assert params.name == "whoami"
         token = get_access_token()
         assert token is not None
-        return CallToolResult(content=[TextContent(text=" ".join(token.scopes))])
+        return CallToolResult(content=[TextContent(type="text", text=" ".join(token.scopes))])
 
     server = Server("guarded", on_list_tools=list_tools, on_call_tool=call_tool)
     provider = InMemoryAuthorizationServerProvider()
@@ -135,7 +135,7 @@ async def call_tool(ctx: ServerRequestContext, params: types.CallToolRequestPara
         async with connect_with_oauth(server, provider=provider) as (client, _):
             result = await client.call_tool("whoami", {})
 
-    assert result == snapshot(CallToolResult(content=[TextContent(text="mcp")]))
+    assert result == snapshot(CallToolResult(content=[TextContent(type="text", text="mcp")]))
 
 
 @requirement("client-auth:pre-registration")

tests/interaction/auth/test_lifecycle.py

@@ -44,7 +44,7 @@
 
 
 async def list_tools(ctx: ServerRequestContext, params: types.PaginatedRequestParams | None) -> ListToolsResult:
-    return ListToolsResult(tools=[Tool(name="echo", input_schema={"type": "object"})])
+    return ListToolsResult(tools=[Tool(name="echo", inputSchema={"type": "object"})])
 
 
 def form_body(request: RecordedRequest) -> dict[str, str]:

tests/interaction/lowlevel/test_cancellation.py

@@ -76,7 +76,7 @@ async def call_and_capture_error() -> None:
                 await started.wait()
                 await client.session.send_notification(
                     types.CancelledNotification(
-                        params=types.CancelledNotificationParams(request_id=request_ids[0], reason="user aborted")
+                        params=types.CancelledNotificationParams(requestId=request_ids[0], reason="user aborted")
                     )
                 )
 
@@ -96,14 +96,14 @@ async def list_tools(
     ) -> types.ListToolsResult:
         return types.ListToolsResult(
             tools=[
-                types.Tool(name="block", input_schema={"type": "object"}),
-                types.Tool(name="echo", input_schema={"type": "object"}),
+                types.Tool(name="block", inputSchema={"type": "object"}),
+                types.Tool(name="echo", inputSchema={"type": "object"}),
             ]
         )
 
     async def call_tool(ctx: ServerRequestContext, params: types.CallToolRequestParams) -> CallToolResult:
         if params.name == "echo":
-            return CallToolResult(content=[TextContent(text="still alive")])
+            return CallToolResult(content=[TextContent(type="text", text="still alive")])
         assert ctx.request_id is not None
         request_ids.append(ctx.request_id)
         started.set()
@@ -123,12 +123,12 @@ async def call_and_swallow_cancellation_error() -> None:
                 task_group.start_soon(call_and_swallow_cancellation_error)
                 await started.wait()
                 await client.session.send_notification(
-                    types.CancelledNotification(params=types.CancelledNotificationParams(request_id=request_ids[0]))
+                    types.CancelledNotification(params=types.CancelledNotificationParams(requestId=request_ids[0]))
                 )
 
             result = await client.call_tool("echo", {})
 
-    assert result == snapshot(CallToolResult(content=[TextContent(text="still alive")]))
+    assert result == snapshot(CallToolResult(content=[TextContent(type="text", text="still alive")]))
 
 
 @requirement("protocol:cancel:unknown-id-ignored")
@@ -138,21 +138,21 @@ async def test_cancellation_for_unknown_request_is_ignored(connect: Connect) ->
     async def list_tools(
         ctx: ServerRequestContext, params: types.PaginatedRequestParams | None
     ) -> types.ListToolsResult:
-        return types.ListToolsResult(tools=[types.Tool(name="echo", input_schema={"type": "object"})])
+        return types.ListToolsResult(tools=[types.Tool(name="echo", inputSchema={"type": "object"})])
 
     async def call_tool(ctx: ServerRequestContext, params: types.CallToolRequestParams) -> CallToolResult:
         assert params.name == "echo"
-        return CallToolResult(content=[TextContent(text="unbothered")])
+        return CallToolResult(content=[TextContent(type="text", text="unbothered")])
 
     server = Server("calm", on_list_tools=list_tools, on_call_tool=call_tool)
 
     async with connect(server) as client:
         await client.session.send_notification(
-            types.CancelledNotification(params=types.CancelledNotificationParams(request_id=9999))
+            types.CancelledNotification(params=types.CancelledNotificationParams(requestId=9999))
         )
         result = await client.call_tool("echo", {})
 
-    assert result == snapshot(CallToolResult(content=[TextContent(text="unbothered")]))
+    assert result == snapshot(CallToolResult(content=[TextContent(type="text", text="unbothered")]))
 
 
 @requirement("protocol:cancel:late-response-ignored")
@@ -192,9 +192,9 @@ def respond(request_id: types.RequestId, result: types.Result) -> SessionMessage
             respond(
                 init.message.id,
                 InitializeResult(
-                    protocol_version="2025-11-25",
+                    protocolVersion="2025-11-25",
                     capabilities=ServerCapabilities(),
-                    server_info=Implementation(name="scripted", version="0.0.1"),
+                    serverInfo=Implementation(name="scripted", version="0.0.1"),
                 ),
             )
         )

tests/interaction/lowlevel/test_completion.py

@@ -34,17 +34,17 @@ async def completion(ctx: ServerRequestContext, params: types.CompleteRequestPar
         assert params.argument.name == "language"
         candidates = ["python", "pytorch", "ruby"]
         matches = [candidate for candidate in candidates if candidate.startswith(params.argument.value)]
-        return CompleteResult(completion=Completion(values=matches, total=len(matches), has_more=False))
+        return CompleteResult(completion=Completion(values=matches, total=len(matches), hasMore=False))
 
     server = Server("completer", on_completion=completion)
 
     async with connect(server) as client:
         result = await client.complete(
-            PromptReference(name="code_review"), argument={"name": "language", "value": "py"}
+            PromptReference(type="ref/prompt", name="code_review"), argument={"name": "language", "value": "py"}
         )
 
     assert result == snapshot(
-        CompleteResult(completion=Completion(values=["python", "pytorch"], total=2, has_more=False))
+        CompleteResult(completion=Completion(values=["python", "pytorch"], total=2, hasMore=False))
     )
 
 
@@ -62,7 +62,7 @@ async def completion(ctx: ServerRequestContext, params: types.CompleteRequestPar
 
     async with connect(server) as client:
         result = await client.complete(
-            ResourceTemplateReference(uri="github://repos/{owner}/{repo}"),
+            ResourceTemplateReference(type="ref/resource", uri="github://repos/{owner}/{repo}"),
             argument={"name": "owner", "value": "model"},
         )
 
@@ -86,7 +86,7 @@ async def completion(ctx: ServerRequestContext, params: types.CompleteRequestPar
 
     async with connect(server) as client:
         result = await client.complete(
-            ResourceTemplateReference(uri="github://repos/{owner}/{repo}"),
+            ResourceTemplateReference(type="ref/resource", uri="github://repos/{owner}/{repo}"),
             argument={"name": "repo", "value": ""},
             context_arguments={"owner": "modelcontextprotocol"},
         )
@@ -111,7 +111,7 @@ async def completion(ctx: ServerRequestContext, params: types.CompleteRequestPar
 
     async with connect(server) as client:
         with pytest.raises(MCPError) as exc_info:
-            await client.complete(PromptReference(name="ghost"), argument={"name": "x", "value": ""})
+            await client.complete(PromptReference(type="ref/prompt", name="ghost"), argument={"name": "x", "value": ""})
 
     assert exc_info.value.error.code == INVALID_PARAMS
 
@@ -126,6 +126,8 @@ async def test_complete_without_handler_is_method_not_found(connect: Connect) ->
         assert client.initialize_result.capabilities.completions is None
 
         with pytest.raises(MCPError) as exc_info:
-            await client.complete(PromptReference(name="anything"), argument={"name": "topic", "value": ""})
+            await client.complete(
+                PromptReference(type="ref/prompt", name="anything"), argument={"name": "topic", "value": ""}
+            )
 
     assert exc_info.value.error == snapshot(ErrorData(code=METHOD_NOT_FOUND, message="Method not found"))