Merge branch 'main' into stvansolano/add-more-tests

Author: stvansolano

samples/AspNetCoreSseServer/Program.cs

@@ -1,5 +1,3 @@
-using ModelContextProtocol.AspNetCore;
-
 var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddMcpServer().WithToolsFromAssembly();
 var app = builder.Build();

src/Directory.Build.props

@@ -6,7 +6,7 @@
     <RepositoryUrl>https://github.com/modelcontextprotocol/csharp-sdk</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <VersionPrefix>0.1.0</VersionPrefix>
-    <VersionSuffix>preview.4</VersionSuffix>
+    <VersionSuffix>preview.5</VersionSuffix>
     <Authors>ModelContextProtocolOfficial</Authors>
     <Copyright>© Anthropic and Contributors.</Copyright>
     <PackageTags>ModelContextProtocol;mcp;ai;llm</PackageTags>

src/ModelContextProtocol.AspNetCore/McpEndpointRouteBuilderExtensions.cs

@@ -1,5 +1,4 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -12,7 +11,7 @@
 using System.Collections.Concurrent;
 using System.Security.Cryptography;
 
-namespace ModelContextProtocol.AspNetCore;
+namespace Microsoft.AspNetCore.Builder;
 
 /// <summary>
 /// Extension methods for <see cref="IEndpointRouteBuilder"/> to add MCP endpoints.
@@ -40,7 +39,7 @@ public static IEndpointConventionBuilder MapMcp(this IEndpointRouteBuilder endpo
             var requestAborted = context.RequestAborted;
 
             response.Headers.ContentType = "text/event-stream";
-            response.Headers.CacheControl = "no-cache";
+            response.Headers.CacheControl = "no-store";
 
             var sessionId = MakeNewSessionId();
             await using var transport = new SseResponseStreamTransport(response.Body, $"/message?sessionId={sessionId}");
@@ -53,10 +52,10 @@ public static IEndpointConventionBuilder MapMcp(this IEndpointRouteBuilder endpo
             try
             {
                 var transportTask = transport.RunAsync(cancellationToken: requestAborted);
-                runSession ??= RunSession;
 
                 try
                 {
+                    runSession ??= RunSession;
                     await runSession(context, server, requestAborted);
                 }
                 finally

src/ModelContextProtocol.AspNetCore/README.md

@@ -23,15 +23,15 @@ To get started, install the package from NuGet
 
 ```
 dotnet new web
-dotnet add package ModelContextProtocol.AspNetcore --prerelease
+dotnet add package ModelContextProtocol.AspNetCore --prerelease
 ```
 
 ## Getting Started
 
 ```csharp
 // Program.cs
-using ModelContextProtocol;
-using ModelContextProtocol.AspNetCore;
+using ModelContextProtocol.Server;
+using System.ComponentModel;
 
 var builder = WebApplication.CreateBuilder(args);
 builder.WebHost.ConfigureKestrel(options =>

src/ModelContextProtocol/Configuration/McpServerBuilderExtensions.cs

@@ -176,7 +176,7 @@ public static IMcpServerBuilder WithPrompts(this IMcpServerBuilder builder, para
     }
 
     /// <summary>
-    /// Adds types marked with the <see cref="McpServerToolTypeAttribute"/> attribute from the given assembly as prompts to the server.
+    /// Adds types marked with the <see cref="McpServerPromptTypeAttribute"/> attribute from the given assembly as prompts to the server.
     /// </summary>
     /// <param name="builder">The builder instance.</param>
     /// <param name="promptAssembly">The assembly to load the types from. Null to get the current assembly</param>
@@ -190,7 +190,7 @@ public static IMcpServerBuilder WithPromptsFromAssembly(this IMcpServerBuilder b
 
         return builder.WithPrompts(
             from t in promptAssembly.GetTypes()
-            where t.GetCustomAttribute<McpServerToolTypeAttribute>() is not null
+            where t.GetCustomAttribute<McpServerPromptTypeAttribute>() is not null
             select t);
     }
     #endregion

src/ModelContextProtocol/Protocol/Transport/StdioClientSessionTransport.cs

@@ -0,0 +1,40 @@
+using Microsoft.Extensions.Logging;
+using ModelContextProtocol.Logging;
+using ModelContextProtocol.Protocol.Messages;
+using System.Diagnostics;
+
+namespace ModelContextProtocol.Protocol.Transport;
+
+/// <summary>Provides the client side of a stdio-based session transport.</summary>
+internal sealed class StdioClientSessionTransport : StreamClientSessionTransport
+{
+    private readonly StdioClientTransportOptions _options;
+    private readonly Process _process;
+
+    public StdioClientSessionTransport(StdioClientTransportOptions options, Process process, string endpointName, ILoggerFactory? loggerFactory)
+        : base(process.StandardInput, process.StandardOutput, endpointName, loggerFactory)
+    {
+        _process = process;
+        _options = options;
+    }
+
+    /// <inheritdoc/>
+    public override async Task SendMessageAsync(IJsonRpcMessage message, CancellationToken cancellationToken = default)
+    {
+        if (_process.HasExited)
+        {
+            Logger.TransportNotConnected(EndpointName);
+            throw new McpTransportException("Transport is not connected");
+        }
+
+        await base.SendMessageAsync(message, cancellationToken).ConfigureAwait(false);
+    }
+
+    /// <inheritdoc/>
+    protected override ValueTask CleanupAsync(CancellationToken cancellationToken)
+    {
+        StdioClientTransport.DisposeProcess(_process, processStarted: true, Logger, _options.ShutdownTimeout, EndpointName);
+
+        return base.CleanupAsync(cancellationToken);
+    }
+}