Merge remote-tracking branch 'origin/main' into sse-message

# Conflicts:
#	src/ModelContextProtocol/Shared/McpSession.cs

Author: halter73

Directory.Packages.props

@@ -33,6 +33,8 @@
     <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsVersion)" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="Moq" Version="4.20.72" />
+    <PackageVersion Include="OpenTelemetry" Version="1.11.2" />
+    <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.11.2" />
     <PackageVersion Include="Serilog.Extensions.Hosting" Version="9.0.0" />
     <PackageVersion Include="Serilog.Extensions.Logging" Version="9.0.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />

src/ModelContextProtocol/Client/McpClient.cs

@@ -40,12 +40,14 @@ public McpClient(IClientTransport clientTransport, McpClientOptions options, Mcp
                 throw new InvalidOperationException($"Sampling capability was set but it did not provide a handler.");
             }
 
-            SetRequestHandler<CreateMessageRequestParams, CreateMessageResult>(
+            SetRequestHandler(
                 RequestMethods.SamplingCreateMessage,
                 (request, cancellationToken) => samplingHandler(
                     request,
                     request?.Meta?.ProgressToken is { } token ? new TokenProgress(this, token) : NullProgress.Instance,
-                    cancellationToken));
+                    cancellationToken),
+                McpJsonUtilities.JsonContext.Default.CreateMessageRequestParams,
+                McpJsonUtilities.JsonContext.Default.CreateMessageResult);
         }
 
         if (options.Capabilities?.Roots is { } rootsCapability)
@@ -55,9 +57,11 @@ public McpClient(IClientTransport clientTransport, McpClientOptions options, Mcp
                 throw new InvalidOperationException($"Roots capability was set but it did not provide a handler.");
             }
 
-            SetRequestHandler<ListRootsRequestParams, ListRootsResult>(
+            SetRequestHandler(
                 RequestMethods.RootsList,
-                (request, cancellationToken) => rootsHandler(request, cancellationToken));
+                rootsHandler,
+                McpJsonUtilities.JsonContext.Default.ListRootsRequestParams,
+                McpJsonUtilities.JsonContext.Default.ListRootsResult);
         }
     }
 
@@ -88,21 +92,20 @@ public async Task ConnectAsync(CancellationToken cancellationToken = default)
             using var initializationCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
             initializationCts.CancelAfter(_options.InitializationTimeout);
 
-            try
-            {
-                // Send initialize request
-                var initializeResponse = await SendRequestAsync<InitializeResult>(
-                    new JsonRpcRequest
-                    {
-                        Method = RequestMethods.Initialize,
-                        Params = new InitializeRequestParams()
-                        {
-                            ProtocolVersion = _options.ProtocolVersion,
-                            Capabilities = _options.Capabilities ?? new ClientCapabilities(),
-                            ClientInfo = _options.ClientInfo
-                        }
-                    },
-                    initializationCts.Token).ConfigureAwait(false);
+        try
+        {
+            // Send initialize request
+            var initializeResponse = await this.SendRequestAsync(
+                RequestMethods.Initialize,
+                new InitializeRequestParams
+                {
+                    ProtocolVersion = _options.ProtocolVersion,
+                    Capabilities = _options.Capabilities ?? new ClientCapabilities(),
+                    ClientInfo = _options.ClientInfo
+                },
+                McpJsonUtilities.JsonContext.Default.InitializeRequestParams,
+                McpJsonUtilities.JsonContext.Default.InitializeResult,
+                cancellationToken: initializationCts.Token).ConfigureAwait(false);
 
                 // Store server information
                 _logger.ServerCapabilitiesReceived(EndpointName,