Skip to content

Register ping handler in McpSessionHandler to support server-initiated pings #1391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stephentoub merged 4 commits into from
Feb 26, 2026
Merged

Register ping handler in McpSessionHandler to support server-initiated pings #1391

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4037bf
Initial plan
Copilot Feb 25, 2026
c1bd65f
Register ping handler in McpClientImpl so server-initiated pings succeed
Copilot Feb 25, 2026
115a907
Move ping handler into McpSessionHandler, removing it from McpServerI…
Copilot Feb 26, 2026
f8a9fac
Merge branch 'main' into copilot/fix-register-ping-handler
stephentoub Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/ModelContextProtocol.Core/Client/McpClientImpl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@ private void RegisterHandlers(McpClientOptions options, NotificationHandlers not
notificationHandlers.RegisterRange(notificationHandlersFromOptions);
}

requestHandlers.Set(
RequestMethods.Ping,
Comment thread
stephentoub marked this conversation as resolved.
Outdated
(request, _, cancellationToken) => new ValueTask<PingResult>(new PingResult()),
McpJsonUtilities.JsonContext.Default.JsonNode,
McpJsonUtilities.JsonContext.Default.PingResult);

if (taskStatusHandler is not null)
{
notificationHandlers.Register(
Expand Down
12 changes: 12 additions & 0 deletions tests/ModelContextProtocol.Tests/Client/McpClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,4 +782,16 @@ public async Task SetLoggingLevelAsync_WithRequestParams_NullThrows()
await Assert.ThrowsAsync<ArgumentNullException>("requestParams",
() => client.SetLoggingLevelAsync((SetLevelRequestParams)null!, TestContext.Current.CancellationToken));
}

[Fact]
public async Task ServerCanPingClient()
{
await using McpClient client = await CreateMcpClientForServer();

var pingRequest = new JsonRpcRequest { Method = RequestMethods.Ping };
var response = await Server.SendRequestAsync(pingRequest, TestContext.Current.CancellationToken);

Assert.NotNull(response);
Assert.NotNull(response.Result);
}
}