Restructure IMcpEndpoint, IMcpClient, and IMcpServer

README.md

@@ -37,8 +37,8 @@ dotnet add package ModelContextProtocol --prerelease
 
 ## Getting Started (Client)
 
-To get started writing a client, the `McpClientFactory.CreateAsync` method is used to instantiate and connect an `IMcpClient`
-to a server. Once you have an `IMcpClient`, you can interact with it, such as to enumerate all available tools and invoke tools.
+To get started writing a client, the `McpClient.CreateAsync` method is used to instantiate and connect an `McpClient`
+to a server. Once you have an `McpClient`, you can interact with it, such as to enumerate all available tools and invoke tools.
 
 ```csharp
 var clientTransport = new StdioClientTransport(new StdioClientTransportOptions
@@ -48,7 +48,7 @@ var clientTransport = new StdioClientTransport(new StdioClientTransportOptions
     Arguments = ["-y", "@modelcontextprotocol/server-everything"],
 });
 
-var client = await McpClientFactory.CreateAsync(clientTransport);
+var client = await McpClient.CreateAsync(clientTransport);
 
 // Print the list of tools available from the server.
 foreach (var tool in await client.ListToolsAsync())
@@ -224,7 +224,7 @@ McpServerOptions options = new()
     },
 };
 
-await using IMcpServer server = McpServerFactory.Create(new StdioServerTransport("MyServer"), options);
+await using IMcpServer server = McpServer.Create(new StdioServerTransport("MyServer"), options);
 await server.RunAsync();
 ```
 

samples/AspNetCoreMcpServer/Tools/SampleLlmTool.cs

@@ -12,7 +12,7 @@ public sealed class SampleLlmTool
 {
     [McpServerTool(Name = "sampleLLM"), Description("Samples from an LLM using MCP's sampling feature")]
     public static async Task<string> SampleLLM(
-        IMcpServer thisServer,
+        McpServer thisServer,
         [Description("The prompt to send to the LLM")] string prompt,
         [Description("Maximum number of tokens to generate")] int maxTokens,
         CancellationToken cancellationToken)

samples/ChatWithTools/Program.cs

@@ -32,7 +32,7 @@
     .UseOpenTelemetry(loggerFactory: loggerFactory, configure: o => o.EnableSensitiveData = true)
     .Build();
 
-var mcpClient = await McpClientFactory.CreateAsync(
+var mcpClient = await McpClient.CreateAsync(
     new StdioClientTransport(new()
     {
         Command = "npx",

samples/EverythingServer/LoggingUpdateMessageSender.cs

@@ -5,7 +5,7 @@
 
 namespace EverythingServer;
 
-public class LoggingUpdateMessageSender(IMcpServer server, Func<LoggingLevel> getMinLevel) : BackgroundService
+public class LoggingUpdateMessageSender(McpServer server, Func<LoggingLevel> getMinLevel) : BackgroundService
 {
     readonly Dictionary<LoggingLevel, string> _loggingLevelMap = new()
     {

samples/EverythingServer/SubscriptionMessageSender.cs

@@ -2,7 +2,7 @@
 using ModelContextProtocol;
 using ModelContextProtocol.Server;
 
-internal class SubscriptionMessageSender(IMcpServer server, HashSet<string> subscriptions) : BackgroundService
+internal class SubscriptionMessageSender(McpServer server, HashSet<string> subscriptions) : BackgroundService
 {
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {

samples/EverythingServer/Tools/LongRunningTool.cs

@@ -10,7 +10,7 @@ public class LongRunningTool
 {
     [McpServerTool(Name = "longRunningOperation"), Description("Demonstrates a long running operation with progress updates")]
     public static async Task<string> LongRunningOperation(
-        IMcpServer server,
+        McpServer server,
         RequestContext<CallToolRequestParams> context,
         int duration = 10,
         int steps = 5)

samples/EverythingServer/Tools/SampleLlmTool.cs

@@ -9,7 +9,7 @@ public class SampleLlmTool
 {
     [McpServerTool(Name = "sampleLLM"), Description("Samples from an LLM using MCP's sampling feature")]
     public static async Task<string> SampleLLM(
-        IMcpServer server,
+        McpServer server,
         [Description("The prompt to send to the LLM")] string prompt,
         [Description("Maximum number of tokens to generate")] int maxTokens,
         CancellationToken cancellationToken)

samples/InMemoryTransport/Program.cs

@@ -6,7 +6,7 @@
 Pipe clientToServerPipe = new(), serverToClientPipe = new();
 
 // Create a server using a stream-based transport over an in-memory pipe.
-await using IMcpServer server = McpServerFactory.Create(
+await using McpServer server = McpServer.Create(
     new StreamServerTransport(clientToServerPipe.Reader.AsStream(), serverToClientPipe.Writer.AsStream()),
     new McpServerOptions()
     {
@@ -21,7 +21,7 @@
 _ = server.RunAsync();
 
 // Connect a client using a stream-based transport over the same in-memory pipe.
-await using IMcpClient client = await McpClientFactory.CreateAsync(
+await using McpClient client = await McpClient.CreateAsync(
     new StreamClientTransport(clientToServerPipe.Writer.AsStream(), serverToClientPipe.Reader.AsStream()));
 
 // List all tools.

samples/ProtectedMcpClient/Program.cs

@@ -40,7 +40,7 @@
     }
 }, httpClient, consoleLoggerFactory);
 
-var client = await McpClientFactory.CreateAsync(transport, loggerFactory: consoleLoggerFactory);
+var client = await McpClient.CreateAsync(transport, loggerFactory: consoleLoggerFactory);
 
 var tools = await client.ListToolsAsync();
 if (tools.Count == 0)

samples/QuickstartClient/Program.cs

@@ -33,7 +33,7 @@
         Arguments = arguments,
     });
 }
-await using var mcpClient = await McpClientFactory.CreateAsync(clientTransport!);
+await using var mcpClient = await McpClient.CreateAsync(clientTransport!);
 
 var tools = await mcpClient.ListToolsAsync();
 foreach (var tool in tools)
@@ -62,7 +62,7 @@
 var sb = new StringBuilder();
 
 PromptForInput();
-while(Console.ReadLine() is string query && !"exit".Equals(query, StringComparison.OrdinalIgnoreCase))
+while (Console.ReadLine() is string query && !"exit".Equals(query, StringComparison.OrdinalIgnoreCase))
 {
     if (string.IsNullOrWhiteSpace(query))
     {

samples/TestServerWithHosting/Tools/SampleLlmTool.cs

@@ -12,7 +12,7 @@ public sealed class SampleLlmTool
 {
     [McpServerTool(Name = "sampleLLM"), Description("Samples from an LLM using MCP's sampling feature")]
     public static async Task<string> SampleLLM(
-        IMcpServer thisServer,
+        McpServer thisServer,
         [Description("The prompt to send to the LLM")] string prompt,
         [Description("Maximum number of tokens to generate")] int maxTokens,
         CancellationToken cancellationToken)

src/ModelContextProtocol.AspNetCore/HttpServerTransportOptions.cs

@@ -20,7 +20,7 @@ public class HttpServerTransportOptions
     /// Gets or sets an optional asynchronous callback for running new MCP sessions manually.
     /// This is useful for running logic before a sessions starts and after it completes.
     /// </summary>
-    public Func<HttpContext, IMcpServer, CancellationToken, Task>? RunSessionHandler { get; set; }
+    public Func<HttpContext, McpServer, CancellationToken, Task>? RunSessionHandler { get; set; }
 
     /// <summary>
     /// Gets or sets whether the server should run in a stateless mode that does not require all requests for a given session

src/ModelContextProtocol.AspNetCore/SseHandler.cs

@@ -54,7 +54,7 @@ public async Task HandleSseRequestAsync(HttpContext context)
 
             try
             {
-                await using var mcpServer = McpServerFactory.Create(transport, mcpServerOptions, loggerFactory, context.RequestServices);
+                await using var mcpServer = McpServer.Create(transport, mcpServerOptions, loggerFactory, context.RequestServices);
                 context.Features.Set(mcpServer);
 
                 var runSessionAsync = httpMcpServerOptions.Value.RunSessionHandler ?? StreamableHttpHandler.RunSessionAsync;

src/ModelContextProtocol.AspNetCore/StreamableHttpHandler.cs

@@ -222,7 +222,7 @@ private async ValueTask<StreamableHttpSession> CreateSessionAsync(
             }
         }
 
-        var server = McpServerFactory.Create(transport, mcpServerOptions, loggerFactory, mcpServerServices);
+        var server = McpServer.Create(transport, mcpServerOptions, loggerFactory, mcpServerServices);
         context.Features.Set(server);
 
         var userIdClaim = statelessId?.UserIdClaim ?? GetUserIdClaim(context.User);
@@ -281,7 +281,7 @@ private void ScheduleStatelessSessionIdWrite(HttpContext context, StreamableHttp
         };
     }
 
-    internal static Task RunSessionAsync(HttpContext httpContext, IMcpServer session, CancellationToken requestAborted)
+    internal static Task RunSessionAsync(HttpContext httpContext, McpServer session, CancellationToken requestAborted)
         => session.RunAsync(requestAborted);
 
     // SignalR only checks for ClaimTypes.NameIdentifier in HttpConnectionDispatcher, but AspNetCore.Antiforgery checks that plus the sub and UPN claims.

src/ModelContextProtocol.AspNetCore/StreamableHttpSession.cs

@@ -7,7 +7,7 @@ namespace ModelContextProtocol.AspNetCore;
 internal sealed class StreamableHttpSession(
     string sessionId,
     StreamableHttpServerTransport transport,
-    IMcpServer server,
+    McpServer server,
     UserIdClaim? userId,
     StatefulSessionManager sessionManager) : IAsyncDisposable
 {
@@ -20,7 +20,7 @@ internal sealed class StreamableHttpSession(
 
     public string Id => sessionId;
     public StreamableHttpServerTransport Transport => transport;
-    public IMcpServer Server => server;
+    public McpServer Server => server;
     private StatefulSessionManager SessionManager => sessionManager;
 
     public CancellationToken SessionClosed => _disposeCts.Token;

src/ModelContextProtocol.Core/AssemblyNameHelper.cs

@@ -0,0 +1,9 @@
+using System.Reflection;
+
+namespace ModelContextProtocol;
+
+internal static class AssemblyNameHelper
+{
+    /// <summary>Cached naming information used for MCP session name/version when none is specified.</summary>
+    public static AssemblyName DefaultAssemblyName { get; } = (Assembly.GetEntryAssembly() ?? Assembly.GetExecutingAssembly()).GetName();
+}

src/ModelContextProtocol.Core/Client/IClientTransport.cs

@@ -11,7 +11,7 @@ namespace ModelContextProtocol.Client;
 /// and servers, allowing different transport protocols to be used interchangeably.
 /// </para>
 /// <para>
-/// When creating an <see cref="IMcpClient"/>, <see cref="McpClientFactory"/> is typically used, and is
+/// When creating an <see cref="McpClient"/>, <see cref="McpClient"/> is typically used, and is
 /// provided with the <see cref="IClientTransport"/> based on expected server configuration.
 /// </para>
 /// </remarks>
@@ -39,7 +39,7 @@ public interface IClientTransport
     /// the transport session as well.
     /// </para>
     /// <para>
-    /// This method is used by <see cref="McpClientFactory"/> to initialize the connection.
+    /// This method is used by <see cref="McpClient"/> to initialize the connection.
     /// </para>
     /// </remarks>
     /// <exception cref="InvalidOperationException">The transport connection could not be established.</exception>

src/ModelContextProtocol.Core/Client/IMcpClient.cs

@@ -1,10 +1,11 @@
-using ModelContextProtocol.Protocol;
+using ModelContextProtocol.Protocol;
 
 namespace ModelContextProtocol.Client;
 
 /// <summary>
 /// Represents an instance of a Model Context Protocol (MCP) client that connects to and communicates with an MCP server.
 /// </summary>
+[Obsolete($"Use {nameof(McpClient)} instead.")]
 public interface IMcpClient : IMcpEndpoint
 {
     /// <summary>
@@ -44,4 +45,4 @@ public interface IMcpClient : IMcpEndpoint
     /// </para>
     /// </remarks>
     string? ServerInstructions { get; }
-}
+}