Skip to content

Commit 0de6e40

Browse files
committed
Revert "fix(session): harden propagate handler with try/except, better error msg"
This reverts commit ed5721c.
1 parent ed5721c commit 0de6e40

1 file changed

Lines changed: 2 additions & 13 deletions

File tree

src/mcp/shared/session.py

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -387,24 +387,13 @@ async def _handle_session_message(message: SessionMessage) -> None:
387387
error_response = JSONRPCError(
388388
jsonrpc="2.0",
389389
id=message.message.id,
390-
error=ErrorData(
391-
code=INTERNAL_ERROR,
392-
message=f"Client callback raised: {type(e).__name__}: {e}",
393-
data="",
394-
),
390+
error=ErrorData(code=INTERNAL_ERROR, message="Handler raised", data=""),
395391
)
396392
await self._write_stream.send(SessionMessage(message=error_response))
397393
self._in_flight.pop(message.message.id, None)
398394
for in_flight_id, stream in list(self._response_streams.items()):
399395
self._propagate_errors[in_flight_id] = e
400-
try:
401-
await stream.aclose()
402-
except Exception:
403-
# Stream might already be closed
404-
pass
405-
# Exit the receive loop: closing all response
406-
# streams above wakes each send_request waiter,
407-
# which will re-raise the propagated exception.
396+
await stream.aclose()
408397
return
409398

410399
# For request validation errors, send a proper JSON-RPC error

0 commit comments

Comments
 (0)