Clean up namespaces

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

Author: stephentoub

samples/AspNetCoreSseServer/Program.cs

@@ -1,7 +1,7 @@
-using TestServerWithHosting.Tools;
+using OpenTelemetry;
 using OpenTelemetry.Metrics;
 using OpenTelemetry.Trace;
-using OpenTelemetry;
+using TestServerWithHosting.Tools;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddMcpServer()

samples/ChatWithTools/Program.cs

@@ -1,13 +1,11 @@
-using ModelContextProtocol.Client;
-using ModelContextProtocol.Protocol.Transport;
-using Microsoft.Extensions.AI;
+using Microsoft.Extensions.AI;
+using Microsoft.Extensions.Logging;
+using ModelContextProtocol.Client;
 using OpenAI;
-
 using OpenTelemetry;
-using OpenTelemetry.Trace;
-using Microsoft.Extensions.Logging;
 using OpenTelemetry.Logs;
 using OpenTelemetry.Metrics;
+using OpenTelemetry.Trace;
 
 using var tracerProvider = Sdk.CreateTracerProviderBuilder()
     .AddHttpClientInstrumentation()

samples/EverythingServer/LoggingUpdateMessageSender.cs

@@ -1,6 +1,6 @@
 using Microsoft.Extensions.Hosting;
 using ModelContextProtocol;
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
 
 namespace EverythingServer;

samples/EverythingServer/Program.cs

@@ -7,7 +7,7 @@
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using ModelContextProtocol;
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
 using OpenTelemetry;
 using OpenTelemetry.Logs;

samples/EverythingServer/ResourceGenerator.cs

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

samples/EverythingServer/Resources/SimpleResourceType.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
 using System.ComponentModel;
 

samples/EverythingServer/Tools/AnnotatedMessageTool.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
 using System.ComponentModel;
 

samples/EverythingServer/Tools/LongRunningTool.cs

@@ -1,5 +1,5 @@
 using ModelContextProtocol;
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
 using System.ComponentModel;
 

samples/EverythingServer/Tools/SampleLlmTool.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
 using System.ComponentModel;
 

samples/QuickstartClient/Program.cs

@@ -3,7 +3,6 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Hosting;
 using ModelContextProtocol.Client;
-using ModelContextProtocol.Protocol.Transport;
 
 var builder = Host.CreateApplicationBuilder(args);
 

samples/TestServerWithHosting/Tools/SampleLlmTool.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Protocol.Types;
+using ModelContextProtocol.Protocol;
 using ModelContextProtocol.Server;
 using System.ComponentModel;
 

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.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.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/Protocol/Transport/IClientTransport.cs renamed to src/ModelContextProtocol/Client/IClientTransport.cs

@@ -1,6 +1,6 @@
-using ModelContextProtocol.Client;
+using ModelContextProtocol.Protocol;
 
-namespace ModelContextProtocol.Protocol.Transport;
+namespace ModelContextProtocol.Client;
 
 /// <summary>
 /// Represents a transport mechanism for Model Context Protocol (MCP) client-to-server communication.

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;

src/ModelContextProtocol/Client/McpClientResource.cs

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

src/ModelContextProtocol/Client/McpClientResourceTemplate.cs

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

src/ModelContextProtocol/Client/McpClientTool.cs

@@ -1,7 +1,5 @@
 using Microsoft.Extensions.AI;
-using ModelContextProtocol.Protocol.Types;
-using ModelContextProtocol.Utils;
-using ModelContextProtocol.Utils.Json;
+using ModelContextProtocol.Protocol;
 using System.Collections.ObjectModel;
 using System.Text.Json;
 

src/ModelContextProtocol/Protocol/Transport/SseClientSessionTransport.cs renamed to src/ModelContextProtocol/Client/SseClientSessionTransport.cs

@@ -1,15 +1,13 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Utils;
-using ModelContextProtocol.Utils.Json;
+using ModelContextProtocol.Protocol;
 using System.Diagnostics;
 using System.Net.Http.Headers;
 using System.Net.ServerSentEvents;
 using System.Text;
 using System.Text.Json;
 
-namespace ModelContextProtocol.Protocol.Transport;
+namespace ModelContextProtocol.Client;
 
 /// <summary>
 /// The ServerSideEvents client transport implementation

src/ModelContextProtocol/Protocol/Transport/SseClientTransport.cs renamed to src/ModelContextProtocol/Client/SseClientTransport.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
-using ModelContextProtocol.Utils;
+using ModelContextProtocol.Protocol;
 
-namespace ModelContextProtocol.Protocol.Transport;
+namespace ModelContextProtocol.Client;
 
 /// <summary>
 /// Provides an <see cref="IClientTransport"/> over HTTP using the Server-Sent Events (SSE) protocol.

src/ModelContextProtocol/Protocol/Transport/SseClientTransportOptions.cs renamed to src/ModelContextProtocol/Client/SseClientTransportOptions.cs

@@ -1,4 +1,4 @@
-namespace ModelContextProtocol.Protocol.Transport;
+namespace ModelContextProtocol.Client;
 
 /// <summary>
 /// Provides options for configuring <see cref="SseClientTransport"/> instances.

src/ModelContextProtocol/Protocol/Transport/StdioClientSessionTransport.cs renamed to src/ModelContextProtocol/Client/StdioClientSessionTransport.cs

@@ -1,8 +1,8 @@
 using Microsoft.Extensions.Logging;
-using ModelContextProtocol.Protocol.Messages;
+using ModelContextProtocol.Protocol;
 using System.Diagnostics;
 
-namespace ModelContextProtocol.Protocol.Transport;
+namespace ModelContextProtocol.Client;
 
 /// <summary>Provides the client side of a stdio-based session transport.</summary>
 internal sealed class StdioClientSessionTransport : StreamClientSessionTransport

src/ModelContextProtocol/Protocol/Transport/StdioClientTransport.cs renamed to src/ModelContextProtocol/Client/StdioClientTransport.cs

@@ -1,14 +1,14 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
-using ModelContextProtocol.Utils;
+using ModelContextProtocol.Protocol;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 
 #pragma warning disable CS1998 // Async method lacks 'await' operators and will run synchronously
 
-namespace ModelContextProtocol.Protocol.Transport;
+namespace ModelContextProtocol.Client;
 
 /// <summary>
 /// Provides a <see cref="IClientTransport"/> implemented via "stdio" (standard input/output).

src/ModelContextProtocol/Protocol/Transport/StdioClientTransportOptions.cs renamed to src/ModelContextProtocol/Client/StdioClientTransportOptions.cs

@@ -1,4 +1,4 @@
-namespace ModelContextProtocol.Protocol.Transport;
+namespace ModelContextProtocol.Client;
 
 /// <summary>
 /// Provides options for configuring <see cref="StdioClientTransport"/> instances.

src/ModelContextProtocol/Protocol/Transport/StreamClientSessionTransport.cs renamed to src/ModelContextProtocol/Client/StreamClientSessionTransport.cs

@@ -1,10 +1,8 @@
 using Microsoft.Extensions.Logging;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Utils;
-using ModelContextProtocol.Utils.Json;
+using ModelContextProtocol.Protocol;
 using System.Text.Json;
 
-namespace ModelContextProtocol.Protocol.Transport;
+namespace ModelContextProtocol.Client;
 
 /// <summary>Provides the client side of a stream-based session transport.</summary>
 internal class StreamClientSessionTransport : TransportBase

src/ModelContextProtocol/Protocol/Transport/StreamClientTransport.cs renamed to src/ModelContextProtocol/Client/StreamClientTransport.cs

@@ -1,7 +1,7 @@
 using Microsoft.Extensions.Logging;
-using ModelContextProtocol.Utils;
+using ModelContextProtocol.Client;
 
-namespace ModelContextProtocol.Protocol.Transport;
+namespace ModelContextProtocol.Protocol;
 
 /// <summary>
 /// Provides an <see cref="IClientTransport"/> implemented around a pair of input/output streams.

src/ModelContextProtocol/Protocol/Transport/StreamableHttpClientSessionTransport.cs renamed to src/ModelContextProtocol/Client/StreamableHttpClientSessionTransport.cs

@@ -1,19 +1,16 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
-using ModelContextProtocol.Protocol.Messages;
-using ModelContextProtocol.Utils;
-using ModelContextProtocol.Utils.Json;
 using System.Net.Http.Headers;
 using System.Net.ServerSentEvents;
 using System.Text.Json;
-
+using ModelContextProtocol.Protocol;
 #if NET
 using System.Net.Http.Json;
 #else
 using System.Text;
 #endif
 
-namespace ModelContextProtocol.Protocol.Transport;
+namespace ModelContextProtocol.Client;
 
 /// <summary>
 /// The Streamable HTTP client transport implementation

src/ModelContextProtocol/Configuration/DefaultMcpServerBuilder.cs

@@ -1,4 +1,4 @@
-using ModelContextProtocol.Utils;
+using ModelContextProtocol;
 
 namespace Microsoft.Extensions.DependencyInjection;