Skip to content

Commit d13408d

Browse files
cliffhallclaude
andcommitted
Serve only the legacy era from the Python servers
SDK v2's Server.run() drives a dual-era loop, so the port also answered server/discover and 2026-07-28 per-request envelopes. That changes the wire, and adopting 2026-07-28 is #4853, not #4851. Each server now runs the SDK's handshake-only serve_loop (what run() uses minus era routing) inside the server lifespan, so an enveloped request gets "Method not found" as it did on SDK v1. Each suite gains a protocol test pinning that refusal; git's raise_exceptions test (#4658) now patches serve_loop instead of Server.run. Co-Authored-By: Claude Opus 5.5 <[email protected]> Signed-off-by: cliffhall <[email protected]>
1 parent 15c8b0c commit d13408d

7 files changed

Lines changed: 220 additions & 7 deletions

File tree

‎src/fetch/src/mcp_server_fetch/server.py‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import readabilipy.simple_json
1313
from mcp.shared.exceptions import MCPError
1414
from mcp.server import Server, ServerRequestContext
15+
from mcp.server.runner import serve_loop
1516
from mcp.server.stdio import stdio_server
1617
from mcp.types import (
1718
CallToolRequestParams,
@@ -536,4 +537,15 @@ async def get_prompt(
536537

537538
options = server.create_initialization_options()
538539
async with stdio_server() as (read_stream, write_stream):
539-
await server.run(read_stream, write_stream, options, raise_exceptions=False)
540+
# Legacy era only. Server.run() would also serve 2026-07-28 (its
541+
# dual-era loop answers server/discover and per-request envelopes);
542+
# adopting that era is #4853, so this port (#4851) serves the
543+
# handshake loop alone and keeps the wire unchanged.
544+
async with server.lifespan(server) as lifespan_state:
545+
await serve_loop(
546+
server,
547+
read_stream,
548+
write_stream,
549+
lifespan_state=lifespan_state,
550+
init_options=options,
551+
)

‎src/fetch/tests/test_protocol.py‎

Lines changed: 60 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,25 @@
1616
from __future__ import annotations
1717

1818
import os
19+
from collections.abc import AsyncIterator
20+
from contextlib import asynccontextmanager
1921
from importlib.metadata import version
2022
from typing import Any
23+
from unittest.mock import patch
2124

25+
import anyio
2226
import httpx
2327
import pytest
2428
from mcp import ClientSession
2529
from mcp.shared.exceptions import MCPError
26-
from mcp.types import INVALID_PARAMS, CallToolResult
30+
from mcp.shared.memory import create_client_server_memory_streams
31+
from mcp.shared.message import SessionMessage
32+
from mcp.types import INVALID_PARAMS, METHOD_NOT_FOUND, CallToolResult, JSONRPCRequest
2733

2834
from mcp_server_fetch.server import (
2935
DEFAULT_USER_AGENT_AUTONOMOUS,
3036
DEFAULT_USER_AGENT_MANUAL,
37+
serve,
3138
)
3239

3340
from .harness import FakeWeb, connect
@@ -998,3 +1005,55 @@ async def test_get_prompt_does_not_validate_the_url(
9981005
assert data["messages"][0]["content"]["text"].startswith(
9991006
"Failed to fetch not a url: UnsupportedProtocol("
10001007
)
1008+
1009+
1010+
# ---------------------------------------------------------------------------
1011+
# Protocol era
1012+
# ---------------------------------------------------------------------------
1013+
1014+
1015+
async def test_modern_era_is_not_served() -> None:
1016+
# #4851: the SDK v2 port serves the 2025-11-25 handshake era only.
1017+
# Server.run() would also open a 2026-07-28 connection for a request that
1018+
# carries the per-request `_meta` envelope; adopting that era is #4853.
1019+
# Until then such a request is refused as it was on SDK v1.
1020+
discover = JSONRPCRequest(
1021+
jsonrpc="2.0",
1022+
id=1,
1023+
method="server/discover",
1024+
params={
1025+
"_meta": {
1026+
"io.modelcontextprotocol/protocolVersion": "2026-07-28",
1027+
"io.modelcontextprotocol/clientInfo": {"name": "test", "version": "0"},
1028+
"io.modelcontextprotocol/clientCapabilities": {},
1029+
}
1030+
},
1031+
)
1032+
response: SessionMessage | Exception | None = None
1033+
async with create_client_server_memory_streams() as (
1034+
(client_read, client_write),
1035+
server_streams,
1036+
):
1037+
1038+
@asynccontextmanager
1039+
async def fake_stdio_server() -> AsyncIterator[Any]:
1040+
yield server_streams
1041+
1042+
with patch("mcp_server_fetch.server.stdio_server", fake_stdio_server):
1043+
async with anyio.create_task_group() as tg:
1044+
tg.start_soon(serve)
1045+
await client_write.send(SessionMessage(discover))
1046+
with anyio.fail_after(5):
1047+
response = await client_read.receive()
1048+
tg.cancel_scope.cancel()
1049+
1050+
assert isinstance(response, SessionMessage)
1051+
assert response.message.model_dump(by_alias=True, exclude_none=True) == {
1052+
"jsonrpc": "2.0",
1053+
"id": 1,
1054+
"error": {
1055+
"code": METHOD_NOT_FOUND,
1056+
"message": "Method not found",
1057+
"data": "server/discover",
1058+
},
1059+
}

‎src/git/src/mcp_server_git/server.py‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from typing import Any, Optional
55
import jsonschema
66
from mcp.server import Server, ServerRequestContext
7+
from mcp.server.runner import serve_loop
78
from mcp.server.stdio import stdio_server
89
from mcp.types import (
910
CallToolRequestParams,
@@ -760,4 +761,15 @@ async def call_tool(
760761
)
761762
options = server.create_initialization_options()
762763
async with stdio_server() as (read_stream, write_stream):
763-
await server.run(read_stream, write_stream, options)
764+
# Legacy era only. Server.run() would also serve 2026-07-28 (its
765+
# dual-era loop answers server/discover and per-request envelopes);
766+
# adopting that era is #4853, so this port (#4851) serves the
767+
# handshake loop alone and keeps the wire unchanged.
768+
async with server.lifespan(server) as lifespan_state:
769+
await serve_loop(
770+
server,
771+
read_stream,
772+
write_stream,
773+
lifespan_state=lifespan_state,
774+
init_options=options,
775+
)

‎src/git/tests/test_protocol.py‎

Lines changed: 61 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,25 @@
1010

1111
import json
1212
import re
13+
from collections.abc import AsyncIterator
14+
from contextlib import asynccontextmanager
1315
from importlib.metadata import version
1416
from pathlib import Path
1517
from typing import Any
1618
from unittest import mock
19+
from unittest.mock import patch
1720

21+
import anyio
1822
import git
1923
import pytest
2024
from mcp.client.session import ClientRequestContext
21-
from mcp.types import ListRootsResult, Root
25+
from mcp.shared.memory import create_client_server_memory_streams
26+
from mcp.shared.message import SessionMessage
27+
from mcp.types import METHOD_NOT_FOUND, JSONRPCRequest, ListRootsResult, Root
2228
from pydantic import FileUrl
2329

30+
from mcp_server_git.server import serve
31+
2432
from conftest import connect, make_repo, text_result, wire
2533

2634
SNAPSHOTS = Path(__file__).parent / "snapshots"
@@ -1146,3 +1154,55 @@ async def test_server_without_client_roots_behaves_the_same(repo: git.Repo):
11461154
await session.call_tool("git_status", {"repo_path": str(root_of(repo))})
11471155
)
11481156
assert result["isError"] is False
1157+
1158+
1159+
# ---------------------------------------------------------------------------
1160+
# Protocol era
1161+
# ---------------------------------------------------------------------------
1162+
1163+
1164+
async def test_modern_era_is_not_served() -> None:
1165+
# #4851: the SDK v2 port serves the 2025-11-25 handshake era only.
1166+
# Server.run() would also open a 2026-07-28 connection for a request that
1167+
# carries the per-request `_meta` envelope; adopting that era is #4853.
1168+
# Until then such a request is refused as it was on SDK v1.
1169+
discover = JSONRPCRequest(
1170+
jsonrpc="2.0",
1171+
id=1,
1172+
method="server/discover",
1173+
params={
1174+
"_meta": {
1175+
"io.modelcontextprotocol/protocolVersion": "2026-07-28",
1176+
"io.modelcontextprotocol/clientInfo": {"name": "test", "version": "0"},
1177+
"io.modelcontextprotocol/clientCapabilities": {},
1178+
}
1179+
},
1180+
)
1181+
response: SessionMessage | Exception | None = None
1182+
async with create_client_server_memory_streams() as (
1183+
(client_read, client_write),
1184+
server_streams,
1185+
):
1186+
1187+
@asynccontextmanager
1188+
async def fake_stdio_server() -> AsyncIterator[Any]:
1189+
yield server_streams
1190+
1191+
with patch("mcp_server_git.server.stdio_server", fake_stdio_server):
1192+
async with anyio.create_task_group() as tg:
1193+
tg.start_soon(serve, None)
1194+
await client_write.send(SessionMessage(discover))
1195+
with anyio.fail_after(5):
1196+
response = await client_read.receive()
1197+
tg.cancel_scope.cancel()
1198+
1199+
assert isinstance(response, SessionMessage)
1200+
assert response.message.model_dump(by_alias=True, exclude_none=True) == {
1201+
"jsonrpc": "2.0",
1202+
"id": 1,
1203+
"error": {
1204+
"code": METHOD_NOT_FOUND,
1205+
"message": "Method not found",
1206+
"data": "server/discover",
1207+
},
1208+
}

‎src/git/tests/test_server.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,11 @@ def test_git_log_date_filtering(test_repository):
853853

854854

855855
async def test_serve_run_does_not_raise_exceptions(tmp_path: Path):
856-
"""Verify that serve() runs server.run without raise_exceptions=True."""
856+
"""Verify that serve() runs the server loop without raise_exceptions=True.
857+
858+
serve() drives SDK v2's legacy-only serve_loop rather than Server.run
859+
(#4851), so that is what is patched.
860+
"""
857861
repo_path = tmp_path / "serve_test_repo"
858862
git.Repo.init(repo_path).close()
859863

@@ -864,7 +868,7 @@ async def test_serve_run_does_not_raise_exceptions(tmp_path: Path):
864868
mock_stdio.return_value.__aexit__.return_value = None
865869

866870
with mock.patch(
867-
"mcp_server_git.server.Server.run", new_callable=mock.AsyncMock
871+
"mcp_server_git.server.serve_loop", new_callable=mock.AsyncMock
868872
) as mock_run:
869873
await serve(repo_path)
870874
mock_run.assert_awaited_once()

‎src/time/src/mcp_server_time/server.py‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
import jsonschema
1212
from mcp.server import Server, ServerRequestContext
13+
from mcp.server.runner import serve_loop
1314
from mcp.server.stdio import stdio_server
1415
from mcp.types import (
1516
CallToolRequestParams,
@@ -292,4 +293,15 @@ async def call_tool(
292293
)
293294
options = server.create_initialization_options()
294295
async with stdio_server() as (read_stream, write_stream):
295-
await server.run(read_stream, write_stream, options)
296+
# Legacy era only. Server.run() would also serve 2026-07-28 (its
297+
# dual-era loop answers server/discover and per-request envelopes);
298+
# adopting that era is #4853, so this port (#4851) serves the
299+
# handshake loop alone and keeps the wire unchanged.
300+
async with server.lifespan(server) as lifespan_state:
301+
await serve_loop(
302+
server,
303+
read_stream,
304+
write_stream,
305+
lifespan_state=lifespan_state,
306+
init_options=options,
307+
)

‎src/time/tests/test_protocol.py‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
import pytest
3434
from mcp import ClientSession
3535
from mcp.shared.memory import create_client_server_memory_streams
36+
from mcp.shared.message import SessionMessage
37+
from mcp.types import METHOD_NOT_FOUND, JSONRPCRequest
3638
from pydantic import BaseModel
3739

3840
from mcp_server_time.server import serve
@@ -920,3 +922,55 @@ async def test_session_survives_errors() -> None:
920922
await call(session, "get_current_time", {"timezone": "Bad/Zone"})
921923
result = await call(session, "get_current_time", {"timezone": "UTC"})
922924
assert result["isError"] is False
925+
926+
927+
# ---------------------------------------------------------------------------
928+
# Protocol era
929+
# ---------------------------------------------------------------------------
930+
931+
932+
async def test_modern_era_is_not_served() -> None:
933+
# #4851: the SDK v2 port serves the 2025-11-25 handshake era only.
934+
# Server.run() would also open a 2026-07-28 connection for a request that
935+
# carries the per-request `_meta` envelope; adopting that era is #4853.
936+
# Until then such a request is refused as it was on SDK v1.
937+
discover = JSONRPCRequest(
938+
jsonrpc="2.0",
939+
id=1,
940+
method="server/discover",
941+
params={
942+
"_meta": {
943+
"io.modelcontextprotocol/protocolVersion": "2026-07-28",
944+
"io.modelcontextprotocol/clientInfo": {"name": "test", "version": "0"},
945+
"io.modelcontextprotocol/clientCapabilities": {},
946+
}
947+
},
948+
)
949+
response: SessionMessage | Exception | None = None
950+
async with create_client_server_memory_streams() as (
951+
(client_read, client_write),
952+
server_streams,
953+
):
954+
955+
@asynccontextmanager
956+
async def fake_stdio_server() -> AsyncIterator[Any]:
957+
yield server_streams
958+
959+
with patch("mcp_server_time.server.stdio_server", fake_stdio_server):
960+
async with anyio.create_task_group() as tg:
961+
tg.start_soon(serve, "UTC")
962+
await client_write.send(SessionMessage(discover))
963+
with anyio.fail_after(5):
964+
response = await client_read.receive()
965+
tg.cancel_scope.cancel()
966+
967+
assert isinstance(response, SessionMessage)
968+
assert response.message.model_dump(by_alias=True, exclude_none=True) == {
969+
"jsonrpc": "2.0",
970+
"id": 1,
971+
"error": {
972+
"code": METHOD_NOT_FOUND,
973+
"message": "Method not found",
974+
"data": "server/discover",
975+
},
976+
}

0 commit comments

Comments
 (0)