Apply Copilot suggestions

Author: LucaButBoring

src/mcp/server/fastmcp/server.py

@@ -354,12 +354,25 @@ def _get_invocation_mode(self, info: Tool, client_supports_async: bool) -> Liter
             return None  # Old clients don't see invocationMode field
 
         # New clients see the invocationMode field
-        if "async" in info.invocation_modes and len(info.invocation_modes) == 1:
+        modes = info.invocation_modes
+        if self._is_async_only(modes):
             return "async"  # Async-only
-        elif len(info.invocation_modes) > 1 or info.invocation_modes == ["sync"]:
+        if self._is_sync_only(modes) or self._is_hybrid(modes):
             return "sync"  # Hybrid or explicit sync
         return None
 
+    def _is_async_only(self, modes: list[InvocationMode]) -> bool:
+        """Return True if invocation_modes is async-only."""
+        return modes == ["async"]
+
+    def _is_sync_only(self, modes: list[InvocationMode]) -> bool:
+        """Return True if invocation_modes is sync-only."""
+        return modes == ["sync"]
+
+    def _is_hybrid(self, modes: list[InvocationMode]) -> bool:
+        """Return True if invocation_modes contains both sync and async."""
+        return "sync" in modes and "async" in modes and len(modes) > 1
+
     async def list_tools(self) -> list[MCPTool]:
         """List all available tools."""
         tools = self._tool_manager.list_tools()

src/mcp/server/lowlevel/server.py

@@ -535,7 +535,15 @@ async def handler(req: types.CallToolRequest):
                         )
                         logger.debug(f"Created async operation with token: {operation.token}")
 
-                        ctx = self.request_context
+                        # Add the operation token to the request context
+                        ctx = RequestContext(
+                            request_id=self.request_context.request_id,
+                            operation_token=self.request_context.operation_token,
+                            meta=self.request_context.meta,
+                            session=self.request_context.session,
+                            lifespan_context=self.request_context.lifespan_context,
+                            request=self.request_context.request,
+                        )
                         ctx.operation_token = operation.token
                         request_ctx.set(ctx)
 

src/mcp/server/streamable_http.py

@@ -325,7 +325,8 @@ def _is_async_operation_response(self, response_message: JSONRPCMessage) -> bool
                     return bool(operation["token"])  # type: ignore
 
             return False
-        except (TypeError, KeyError, AttributeError):
+        except (TypeError, KeyError, AttributeError) as exc:
+            logger.exception("Exception in _is_async_operation_response: %s", exc)
             return False
 
     async def _handle_sse_mode(