Add server tool timeouts (default & per-tool) and honor JSON-RPC $/cancelRequest (#922) #951
Conversation
…lation This introduces support for parsing and honoring JSON-RPC \$/cancelRequest\ notifications, making cancellation semantics compliant with MCP protocol expectations. Includes a new \JsonRpcCancelRequest\ constant in \NotificationMethods\ and integrates proper cancellation token linkage inside the server message loop. Additionally: - Added SlowTool test fixture to simulate long-running tools - Implemented full timeout vs external cancellation tests - Normalized English summaries / comments in related areas Fixes modelcontextprotocol#922
I'm not understanding the purpose of this. Cancellation is already supported with |
bkarakaya01
changed the title
I see how my original wording made this look like a cancellation feature PR. The actual primary goal here is server-side tool timeout support. The I’ve updated the PR title/description to reflect the real scope (tool timeout) much clearer. Thanks for pointing it out! |
2 participants
This PR introduces server-side tool timeout support and ensures proper JSON-RPC
$/cancelRequesthandling.Summary of Changes
DefaultToolTimeouttoMcpServerOptionsIMcpToolWithTimeoutinterface for per-tool overrideNotificationMethods.JsonRpcCancelRequestconstantSlowToolfixture for timeout scenarios$/cancelRequestcancellation pathFixes #922
Motivation and Context
Timeout control at the server/tool level is required for predictable behavior when dealing with long-running tool executions.
$/cancelRequesthandling complements this by ensuring JSON-RPC cancellation semantics correctly surface to the caller.How Has This Been Tested?
All new behavior is covered via unit tests under
McpServerToolTimeoutTestsusingTestServerTransport.Breaking Changes
No breaking changes. Existing server implementations continue to work without modification.
Types of Changes
Checklist
Additional Context
N/A