From f42e7290919c0f88bab47b125e983e3d9171f122 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Tue, 17 Jun 2025 12:42:10 -0400
Subject: [PATCH 1/2] Add a callback for receiving stderr output

---
 .../Client/StdioClientTransport.cs              |  2 ++
 .../Client/StdioClientTransportOptions.cs       |  5 +++++
 .../Transport/StdioClientTransportTests.cs      | 17 +++++++++++++++++
 3 files changed, 24 insertions(+)

diff --git a/src/ModelContextProtocol.Core/Client/StdioClientTransport.cs b/src/ModelContextProtocol.Core/Client/StdioClientTransport.cs
index 5a5d10ffb..e00ddbabe 100644
--- a/src/ModelContextProtocol.Core/Client/StdioClientTransport.cs
+++ b/src/ModelContextProtocol.Core/Client/StdioClientTransport.cs
@@ -146,6 +146,8 @@ public async Task<ITransport> ConnectAsync(CancellationToken cancellationToken =
                         stderrRollingLog.Enqueue(data);
                     }
 
+                    _options.StandardErrorLines?.Invoke(data);
+
                     LogReadStderr(logger, endpointName, data);
                 }
             };
diff --git a/src/ModelContextProtocol.Core/Client/StdioClientTransportOptions.cs b/src/ModelContextProtocol.Core/Client/StdioClientTransportOptions.cs
index 650602246..5930e9d2a 100644
--- a/src/ModelContextProtocol.Core/Client/StdioClientTransportOptions.cs
+++ b/src/ModelContextProtocol.Core/Client/StdioClientTransportOptions.cs
@@ -69,4 +69,9 @@ public required string Command
     /// </para>
     /// </remarks>
     public TimeSpan ShutdownTimeout { get; set; } = TimeSpan.FromSeconds(5);
+
+    /// <summary>
+    /// Gets or sets a callback that is invoked for each line of stderr received from the server process.
+    /// </summary>
+    public Action<string>? StandardErrorLines { get; set; }
 }
diff --git a/tests/ModelContextProtocol.Tests/Transport/StdioClientTransportTests.cs b/tests/ModelContextProtocol.Tests/Transport/StdioClientTransportTests.cs
index b8d8d714b..6ddf615e1 100644
--- a/tests/ModelContextProtocol.Tests/Transport/StdioClientTransportTests.cs
+++ b/tests/ModelContextProtocol.Tests/Transport/StdioClientTransportTests.cs
@@ -18,4 +18,21 @@ public async Task CreateAsync_ValidProcessInvalidServer_Throws()
         IOException e = await Assert.ThrowsAsync<IOException>(() => McpClientFactory.CreateAsync(transport, loggerFactory: LoggerFactory, cancellationToken: TestContext.Current.CancellationToken));
         Assert.Contains(id, e.ToString());
     }
+
+    [Fact]
+    public async Task CreateAsync_ValidProcessInvalidServer_StdErrCallbackInvoked()
+    {
+        string id = Guid.NewGuid().ToString("N");
+
+        int count = 0;
+        Action<string> stdErrCallback = line => Interlocked.Increment(ref count);
+
+        StdioClientTransport transport = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
+            new(new() { Command = "cmd", Arguments = ["/C", $"echo \"{id}\" >&2"], StandardErrorLines = stdErrCallback }, LoggerFactory) :
+            new(new() { Command = "ls", Arguments = [id], StandardErrorLines = stdErrCallback }, LoggerFactory);
+
+        await Assert.ThrowsAsync<IOException>(() => McpClientFactory.CreateAsync(transport, loggerFactory: LoggerFactory, cancellationToken: TestContext.Current.CancellationToken));
+
+        Assert.InRange(count, 1, int.MaxValue);
+    }
 }

From f9d5ea49e5b0a5d2c01638bdcf5645b6257f7147 Mon Sep 17 00:00:00 2001
From: Stephen Toub <stoub@microsoft.com>
Date: Tue, 17 Jun 2025 13:49:36 -0400
Subject: [PATCH 2/2] Add asserts to test

---
 .../Transport/StdioClientTransportTests.cs          | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/tests/ModelContextProtocol.Tests/Transport/StdioClientTransportTests.cs b/tests/ModelContextProtocol.Tests/Transport/StdioClientTransportTests.cs
index 6ddf615e1..40602a9ed 100644
--- a/tests/ModelContextProtocol.Tests/Transport/StdioClientTransportTests.cs
+++ b/tests/ModelContextProtocol.Tests/Transport/StdioClientTransportTests.cs
@@ -1,6 +1,7 @@
 using ModelContextProtocol.Client;
 using ModelContextProtocol.Tests.Utils;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace ModelContextProtocol.Tests.Transport;
 
@@ -25,7 +26,16 @@ public async Task CreateAsync_ValidProcessInvalidServer_StdErrCallbackInvoked()
         string id = Guid.NewGuid().ToString("N");
 
         int count = 0;
-        Action<string> stdErrCallback = line => Interlocked.Increment(ref count);
+        StringBuilder sb = new();
+        Action<string> stdErrCallback = line =>
+        {
+            Assert.NotNull(line);
+            lock (sb)
+            {
+                sb.AppendLine(line);
+                count++;
+            }
+        };
 
         StdioClientTransport transport = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ?
             new(new() { Command = "cmd", Arguments = ["/C", $"echo \"{id}\" >&2"], StandardErrorLines = stdErrCallback }, LoggerFactory) :
@@ -34,5 +44,6 @@ public async Task CreateAsync_ValidProcessInvalidServer_StdErrCallbackInvoked()
         await Assert.ThrowsAsync<IOException>(() => McpClientFactory.CreateAsync(transport, loggerFactory: LoggerFactory, cancellationToken: TestContext.Current.CancellationToken));
 
         Assert.InRange(count, 1, int.MaxValue);
+        Assert.Contains(id, sb.ToString());
     }
 }