From b32e455d23af1552331dcf4a67f0a7de5b97b16e Mon Sep 17 00:00:00 2001
From: David Soria Parra <davidsp@anthropic.com>
Date: Tue, 4 Feb 2025 19:29:12 +0000
Subject: [PATCH] fix: enforce context manager usage for RequestResponder

---
 src/mcp/shared/session.py | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/src/mcp/shared/session.py b/src/mcp/shared/session.py
index e21bcbc..2ae5658 100644
--- a/src/mcp/shared/session.py
+++ b/src/mcp/shared/session.py
@@ -40,6 +40,21 @@
 
 
 class RequestResponder(Generic[ReceiveRequestT, SendResultT]):
+    """Handles responding to MCP requests and manages request lifecycle.
+
+    This class MUST be used as a context manager to ensure proper cleanup and
+    cancellation handling:
+
+    Example:
+        with request_responder as resp:
+            await resp.respond(result)
+
+    The context manager ensures:
+    1. Proper cancellation scope setup and cleanup
+    2. Request completion tracking
+    3. Cleanup of in-flight requests
+    """
+
     def __init__(
         self,
         request_id: RequestId,
@@ -55,19 +70,33 @@ def __init__(
         self._completed = False
         self._cancel_scope = anyio.CancelScope()
         self._on_complete = on_complete
+        self._entered = False  # Track if we're in a context manager
 
     def __enter__(self) -> "RequestResponder[ReceiveRequestT, SendResultT]":
+        """Enter the context manager, enabling request cancellation tracking."""
+        self._entered = True
         self._cancel_scope.__enter__()
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb) -> None:
+        """Exit the context manager, performing cleanup and notifying completion."""
         try:
             if self._completed:
                 self._on_complete(self)
         finally:
+            self._entered = False
             self._cancel_scope.__exit__(exc_type, exc_val, exc_tb)
 
     async def respond(self, response: SendResultT | ErrorData) -> None:
+        """Send a response for this request.
+
+        Must be called within a context manager block.
+        Raises:
+            RuntimeError: If not used within a context manager
+            AssertionError: If request was already responded to
+        """
+        if not self._entered:
+            raise RuntimeError("RequestResponder must be used as a context manager")
         assert not self._completed, "Request already responded to"
 
         if not self.cancelled: