[v1.x] Drop responses/notifications when write stream is already closed by bobbyo · Pull Request #2502 · modelcontextprotocol/python-sdk · GitHub

Audience / Scope / Status

If you are…	Read this section	Why
reviewing the runtime fix	Summary, Topology, Invariants, Changes	shows why the catch belongs in BaseSession, not only in outer server layers
reviewing the test/CI follow-up	Validation	explains the coverage and pyright failures on the first push
looking for broader transport redesign	Non-goals	this PR intentionally hardens closed-write semantics only

Last verified against: v1.x on 2026-04-24

Relevant upstream issues

_handle_stateless_request ClosedResourceError #1219: stateless request handling can still trip ClosedResourceError after client disconnect. Relevant because the failing write path here is also in the shared session layer.
ClosedResourceError During MCP Stateless Server Shutdown When Sending Log Messages #1967: closed-stream writes during shutdown/logging should be treated as expected drops. Same class of failure, different send site.
Specific ToolNotFoundError for easier handling than ToolError in multi-tenant environments #2422: request lifecycle races still exist around response timing. Relevant because this PR makes the final write idempotent with respect to disconnect.
Fastmcp server completely crashes When client times out PrefectHQ/fastmcp#823: downstream repro of the same symptom from a StreamableHTTP/FastMCP stack. Relevant because it demonstrates this is not just a local application bug.

Summary

This PR makes BaseSession.send_notification() and BaseSession._send_response() treat writes to an already-closed transport as expected no-ops rather than exceptions.

The goal is narrow: if the peer has already gone away, a late response or notification should be dropped cleanly at the session send boundary.

Failure topology

flowchart LR
  H["Request handler\n`mcp.server.lowlevel.server`"]:::server
  R["RequestResponder.respond()\n`src/mcp/shared/session.py:121`"]:::fyr
  S["BaseSession._send_response() / send_notification()\n`src/mcp/shared/session.py:318-357`"]:::fyr
  W["write_stream.send(SessionMessage)\nanyio memory/object stream"]:::transport
  C["Client transport\nstream already closed"]:::client

  H -- "handler result / late progress" --> R
  R -- "JSON-RPC response" --> S
  S -- "SessionMessage write" --> W
  W -. "peer disconnected earlier" .-> C

  classDef client fill:#bfdbfe,stroke:#1e3a8a,stroke-width:2px,color:#0f172a
  classDef transport fill:#e5e7eb,stroke:#6b7280,stroke-width:1px,color:#374151
  classDef server fill:#dcfce7,stroke:#166534,stroke-width:2px,color:#0f172a
  classDef fyr fill:#ddd6fe,stroke:#5b21b6,stroke-width:2px,color:#0f172a

Why the catch belongs here

Layer	Existing behavior	Gap
mcp.server.lowlevel.server	already has an outer closed-transport catch around await message.respond(response) at src/mcp/server/lowlevel/server.py:799-809	only covers the RequestResponder path that reaches this exact outer frame
BaseSession.send_notification()	previously wrote directly to _write_stream.send(...)	late notifications could still bubble ClosedResourceError / BrokenResourceError
BaseSession._send_response()	previously wrote directly to _write_stream.send(...)	any caller below the outer server frame still relied on higher layers to catch transport-close races

Invariants

INV-1: A closed peer transport is not a recoverable write target, but it is also not a server bug. Late writes should be dropped, not escalated.
INV-2: The session send boundary is the narrowest shared seam that sees both responses and notifications. If violated: one call site gets hardened while sibling send paths still leak the same failure.
INV-3: Higher-layer transport-close catches may remain for defense in depth. If violated: removing all outer guards in the same PR would expand scope from behavior hardening into control-flow refactoring.

Changes

Catch anyio.BrokenResourceError / anyio.ClosedResourceError in BaseSession.send_notification() at src/mcp/shared/session.py:318-339.
Catch anyio.BrokenResourceError / anyio.ClosedResourceError in BaseSession._send_response() at src/mcp/shared/session.py:343-357.
Add session-layer regression tests for closed and open write streams at tests/server/test_session.py:223-282.
Add a low-level regression test that exercises the existing outer server catch at tests/server/test_lowlevel_exception_handling.py:78-96 and src/mcp/server/lowlevel/server.py:799-809.

Validation

Functional

PYTHONPATH=src python3 -m pytest -o addopts='' \
  tests/server/test_session.py \
  tests/server/test_lowlevel_exception_handling.py -q

Local result after the CI-fix follow-up:

17 passed

CI follow-up

The first push exposed two CI-only problems, not a runtime regression:

Check	Initial failure	Follow-up in this PR
test matrix	coverage dropped because the new session-layer catch made the old outer catch in lowlevel/server.py unexercised	added test_handle_request_drops_response_when_transport_is_closed() to cover the existing outer branch
pre-commit	strict pyright rejected loosely typed fake session/write-stream helpers	tightened annotations and cast sites in tests/server/test_session.py

Targeted local follow-up verification:

/tmp/python-sdk-upstream/.venv-ci/bin/pyright \
  tests/server/test_session.py \
  tests/server/test_lowlevel_exception_handling.py

Local result:

0 errors, 0 warnings, 0 informations

Non-goals

This PR does not redesign cancellation or stateless request lifecycle.
This PR does not remove the outer guard in lowlevel/server.py; it keeps defense in depth.
This PR does not claim to solve every disconnect race in the stack. It narrows one shared failure seam so downstream servers stop surfacing expected closed-write conditions as crashes.

We hit this in production with mcp 1.28.1 / FastMCP on StreamableHTTP stateless mode:

18 occurrences across 4 workspaces over 2026-07-19–20, always the same stack:

ExceptionGroup(
  anyio.ClosedResourceError
)
  mcp/server/streamable_http_manager.py:180 run_stateless_server
    mcp/server/lowlevel/server.py:694 _handle_message
      await session.send_log_message(...)   # Exception-path arm — client already gone
        mcp/server/session.py:213 send_log_message → send_notification
          mcp/shared/session.py:335 send_notification
            await self._write_stream.send(session_message)
              anyio.ClosedResourceError

The trigger: an Exception arrives in the session's read stream (the client disconnected mid-request), _handle_message hits the case Exception() arm and tries to send_log_message back — but the write stream is already closed.

This PR (#2502) directly addresses it by hardening send_notification and _send_response at the BaseSession layer. As a stopgap we've applied a local monkey-patch in our downstream server, but we'd very much like to see this merged so we can pin to a clean upstream release.

Happy to help with review, testing, or rebasing if that would unblock this.

Friendly bump on this one 🙂

Wanted to share a quick status check in case it's helpful for review prioritization:

CI is fully green — all 21 checks pass (lint, pyright, full test matrix across Python 3.10–3.13 on Linux/Windows, client/server conformance).
Still applies cleanly to current v1.x. I just re-verified with git merge-tree against the latest v1.x tip — zero conflicts across all three changed files, and GitHub still reports it as mergeable. No rebase needed on your end.
The only thing standing between this and merging appears to be the required-review gate — there are no open review threads or unresolved comments to address.

Given the production impact we're seeing (18 crashes across 4 workspaces in 2 days on 1.28.1, per the report above), we'd really appreciate a maintainer look when you have a moment. Happy to help with anything — additional test coverage, a rebase, or answering questions — if that would help move it along. Thanks so much for the work on this fix! 🙏

Ubuntu added 2 commits April 23, 2026 23:42

fix(v1.x): drop responses on closed write streams

b243f81

test(v1.x): fix closed-stream regression CI

8176935

alex-feel mentioned this pull request Jul 21, 2026

[v1.x] Backport #2257 and cut a release: the stateless Streamable HTTP client-disconnect fix (#2064) ships only in 2.0.0 pre-releases; latest stable v1.28.1 still carries the crashing send_log_message call #3142

Closed

2 tasks

[v1.x] Drop responses/notifications when write stream is already closed by bobbyo · Pull Request #2502 · modelcontextprotocol/python-sdk · GitHub

Uh oh!

[v1.x] Drop responses/notifications when write stream is already closed - #2502

[v1.x] Drop responses/notifications when write stream is already closed#2502
bobbyo wants to merge 2 commits into
modelcontextprotocol:v1.xfrom
bobbyo:fix/closed-stream-send-drop-v1x

bobbyo commented Apr 24, 2026 •
edited
Loading

Uh oh!

Uh oh!

aminghadersohi commented Jul 21, 2026

Uh oh!

aminghadersohi commented Jul 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

[v1.x] Drop responses/notifications when write stream is already closed by bobbyo · Pull Request #2502 · modelcontextprotocol/python-sdk · GitHub

Uh oh!

[v1.x] Drop responses/notifications when write stream is already closed - #2502

[v1.x] Drop responses/notifications when write stream is already closed#2502bobbyo wants to merge 2 commits intomodelcontextprotocol:v1.xmodelcontextprotocol/python-sdk:v1.xfrom bobbyo:fix/closed-stream-send-drop-v1xbobbyo/python-sdk:fix/closed-stream-send-drop-v1xCopy head branch name to clipboard

Conversation

bobbyo commented Apr 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Audience / Scope / Status

Relevant upstream issues

Summary

Failure topology

Why the catch belongs here

Invariants

Changes

Validation

Functional

CI follow-up

Non-goals

Uh oh!

aminghadersohi commented Jul 21, 2026

Uh oh!

aminghadersohi commented Jul 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

[v1.x] Drop responses/notifications when write stream is already closed#2502
bobbyo wants to merge 2 commits into
modelcontextprotocol:v1.xfrom
bobbyo:fix/closed-stream-send-drop-v1x

bobbyo commented Apr 24, 2026 •
edited
Loading