[DRAFT] 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 `McpClientFactory.CreateAsync` method is used to instantiate and connect an `McpClientSession`
+to a server. Once you have an `McpClientSession`, you can interact with it, such as to enumerate all available tools and invoke tools.
 
 ```csharp
 var clientTransport = new StdioClientTransport(new StdioClientTransportOptions

samples/InMemoryTransport/Program.cs

@@ -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 McpClientSession client = await McpClientFactory.CreateAsync(
     new StreamClientTransport(clientToServerPipe.Writer.AsStream(), serverToClientPipe.Reader.AsStream()));
 
 // List all tools.

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="McpClientSession"/>, <see cref="McpClientFactory"/> is typically used, and is
 /// provided with the <see cref="IClientTransport"/> based on expected server configuration.
 /// </para>
 /// </remarks>
@@ -35,7 +35,7 @@ public interface IClientTransport
     /// </para>
     /// <para>
     /// The lifetime of the returned <see cref="ITransport"/> instance is typically managed by the 
-    /// <see cref="McpClient"/> that uses this transport. When the client is disposed, it will dispose
+    /// <see cref="McpClientSession"/> that uses this transport. When the client is disposed, it will dispose
     /// the transport session as well.
     /// </para>
     /// <para>