Clean up namespaces (#410)

No meaningful code changes, just lots of namespace shuffling to have fewer namespaces and to put things in better namespaces.

src/Common/Polyfills/System/Collections/Generic/CollectionExtensions.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Utils;
+using ModelContextProtocol;
 
 namespace System.Collections.Generic;
 

src/Common/Polyfills/System/IO/StreamExtensions.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Utils;
+using ModelContextProtocol;
 using System.Buffers;
 using System.Runtime.InteropServices;
 

src/Common/Polyfills/System/Net/Http/HttpClientExtensions.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Utils;
+using ModelContextProtocol;
 
 namespace System.Net.Http;
 

src/Common/Polyfills/System/Threading/CancellationTokenSourceExtensions.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Utils;
+using ModelContextProtocol;
 
 namespace System.Threading.Tasks;
 

src/Common/Polyfills/System/Threading/Tasks/TaskExtensions.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Utils;
+using ModelContextProtocol;
 
 namespace System.Threading.Tasks;
 

src/Common/Throw.cs

@@ -1,7 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.CompilerServices;
 
-namespace ModelContextProtocol.Utils;
+namespace ModelContextProtocol;
 
 /// <summary>Provides helper methods for throwing exceptions.</summary>
 internal static class Throw

src/ModelContextProtocol.AspNetCore/HttpMcpSession.cs

@@ -1,5 +1,5 @@
 using ModelContextProtocol.AspNetCore.Stateless;
-using ModelContextProtocol.Protocol.Transport;
+using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
 using System.Security.Claims;
 

src/ModelContextProtocol.AspNetCore/IdleTrackingBackgroundService.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using ModelContextProtocol.Protocol.Transport;
+using ModelContextProtocol.Server;
 
 namespace ModelContextProtocol.AspNetCore;
 

src/ModelContextProtocol.AspNetCore/McpEndpointRouteBuilderExtensions.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Http.Metadata;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using ModelContextProtocol.AspNetCore;
-using ModelContextProtocol.Protocol.Messages;
+using ModelContextProtocol.Protocol;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Microsoft.AspNetCore.Builder;

src/ModelContextProtocol.AspNetCore/SseHandler.cs

@@ -2,10 +2,8 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Protocol.Transport;
+using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
-using ModelContextProtocol.Utils.Json;
 using System.Collections.Concurrent;
 using System.Diagnostics;
 

src/ModelContextProtocol.AspNetCore/Stateless/StatelessSessionId.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using System.Text.Json.Serialization;
 
 namespace ModelContextProtocol.AspNetCore.Stateless;

src/ModelContextProtocol.AspNetCore/StreamableHttpHandler.cs

@@ -6,11 +6,8 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.Net.Http.Headers;
 using ModelContextProtocol.AspNetCore.Stateless;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Protocol.Transport;
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
-using ModelContextProtocol.Utils.Json;
 using System.Collections.Concurrent;
 using System.Diagnostics;
 using System.IO.Pipelines;

src/ModelContextProtocol/AIContentExtensions.cs

@@ -1,8 +1,8 @@
 using Microsoft.Extensions.AI;
-using ModelContextProtocol.Protocol.Types;
-using ModelContextProtocol.Utils;
-using ModelContextProtocol.Utils.Json;
+using ModelContextProtocol.Protocol;
+#if !NET
 using System.Runtime.InteropServices;
+#endif
 using System.Text.Json;
 
 namespace ModelContextProtocol;

src/ModelContextProtocol/Client/IClientTransport.cs

@@ -0,0 +1,47 @@
+using ModelContextProtocol.Protocol;
+
+namespace ModelContextProtocol.Client;
+
+/// <summary>
+/// Represents a transport mechanism for Model Context Protocol (MCP) client-to-server communication.
+/// </summary>
+/// <remarks>
+/// <para>
+/// The <see cref="IClientTransport"/> interface abstracts the communication layer between MCP clients
+/// 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
+/// provided with the <see cref="IClientTransport"/> based on expected server configuration.
+/// </para>
+/// </remarks>
+public interface IClientTransport
+{
+    /// <summary>
+    /// Gets a transport identifier, used for logging purposes.
+    /// </summary>
+    string Name { get; }
+
+    /// <summary>
+    /// Asynchronously establishes a transport session with an MCP server and returns a transport for the duplex message stream.
+    /// </summary>
+    /// <param name="cancellationToken">The <see cref="CancellationToken"/> to monitor for cancellation requests. The default is <see cref="CancellationToken.None"/>.</param>
+    /// <returns>Returns an interface for the duplex message stream.</returns>
+    /// <remarks>
+    /// <para>
+    /// This method is responsible for initializing the connection to the server using the specific transport 
+    /// mechanism implemented by the derived class. The returned <see cref="ITransport"/> interface 
+    /// provides methods to send and receive messages over the established connection.
+    /// </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
+    /// the transport session as well.
+    /// </para>
+    /// <para>
+    /// This method is used by <see cref="McpClientFactory"/> to initialize the connection.
+    /// </para>
+    /// </remarks>
+    /// <exception cref="InvalidOperationException">The transport connection could not be established.</exception>
+    Task<ITransport> ConnectAsync(CancellationToken cancellationToken = default);
+}

src/ModelContextProtocol/Client/IMcpClient.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 
 namespace ModelContextProtocol.Client;
 

src/ModelContextProtocol/Client/McpClient.cs

@@ -1,9 +1,5 @@
 using Microsoft.Extensions.Logging;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Protocol.Transport;
-using ModelContextProtocol.Protocol.Types;
-using ModelContextProtocol.Shared;
-using ModelContextProtocol.Utils.Json;
+using ModelContextProtocol.Protocol;
 using System.Text.Json;
 
 namespace ModelContextProtocol.Client;

src/ModelContextProtocol/Client/McpClientExtensions.cs

@@ -1,10 +1,7 @@
 using Microsoft.Extensions.AI;
 using Microsoft.Extensions.Logging;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
-using ModelContextProtocol.Utils;
-using ModelContextProtocol.Utils.Json;
 using System.Runtime.CompilerServices;
 using System.Text.Json;
 

src/ModelContextProtocol/Client/McpClientFactory.cs

@@ -1,5 +1,3 @@
-using ModelContextProtocol.Protocol.Transport;
-using ModelContextProtocol.Utils;
 using Microsoft.Extensions.Logging;
 
 namespace ModelContextProtocol.Client;

src/ModelContextProtocol/Client/McpClientOptions.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 
 namespace ModelContextProtocol.Client;
 

src/ModelContextProtocol/Client/McpClientPrompt.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using System.Text.Json;
 
 namespace ModelContextProtocol.Client;