From 9eccb9c9a1a1fa5c06a9b7bb93d6e15be3715cb1 Mon Sep 17 00:00:00 2001
From: zhiyongli <zhiyongli@microsoft.com>
Date: Thu, 15 Jan 2026 15:53:43 +0800
Subject: [PATCH 1/2] Fix the event sub

---
 dotnet/src/Client.cs        | 11 ++++++-----
 dotnet/test/SessionTests.cs | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/dotnet/src/Client.cs b/dotnet/src/Client.cs
index 68d48f86..ab278fd6 100644
--- a/dotnet/src/Client.cs
+++ b/dotnet/src/Client.cs
@@ -759,12 +759,13 @@ public async ValueTask DisposeAsync()
     private class RpcHandler(CopilotClient client)
     {
         [JsonRpcMethod("session.event")]
-        public void OnSessionEvent(SessionEventNotification notification)
+        public void OnSessionEvent(string sessionId,
+            JsonElement? @event)
         {
-            var session = client.GetSession(notification.SessionId);
-            if (session != null && notification.Event != null)
+            var session = client.GetSession(sessionId);
+            if (session != null && @event != null)
             {
-                var evt = SessionEvent.FromJson(notification.Event.ToString());
+                var evt = SessionEvent.FromJson(@event.ToString()!);
                 session.DispatchEvent(evt);
             }
         }
@@ -959,7 +960,7 @@ private record ListSessionsResponse(
 
     private record SessionEventNotification(
         string SessionId,
-        JToken? Event);
+        JsonElement? Event);
 
     private record ToolCallResponse(
         ToolResultObject? Result);
diff --git a/dotnet/test/SessionTests.cs b/dotnet/test/SessionTests.cs
index 4b87fc38..f3425c69 100644
--- a/dotnet/test/SessionTests.cs
+++ b/dotnet/test/SessionTests.cs
@@ -285,4 +285,36 @@ public async Task Should_Pass_Streaming_Option_To_Session_Creation()
         Assert.NotNull(assistantMessage);
         Assert.Contains("2", assistantMessage!.Data.Content);
     }
+
+    [Fact]
+    public async Task Should_SessionEvt_Subscribed()
+    {
+        var session = await Client.CreateSessionAsync();
+        var receivedEvents = new List<SessionEvent>();
+        var idleReceived = new TaskCompletionSource<bool>();
+
+        session.On(evt =>
+        {
+            receivedEvents.Add(evt);
+            if (evt is SessionIdleEvent)
+            {
+                idleReceived.TrySetResult(true);
+            }
+        });
+
+        // Send a message to trigger events
+        await session.SendAsync(new MessageOptions { Prompt = "Hello!" });
+
+        // Wait for session to become idle (indicating message processing is complete)
+        var completed = await Task.WhenAny(idleReceived.Task, Task.Delay(TimeSpan.FromSeconds(60)));
+        Assert.Equal(idleReceived.Task, completed);
+
+        // Should have received multiple events (user message, assistant message, idle, etc.)
+        Assert.NotEmpty(receivedEvents);
+        Assert.Contains(receivedEvents, evt => evt is UserMessageEvent);
+        Assert.Contains(receivedEvents, evt => evt is AssistantMessageEvent);
+        Assert.Contains(receivedEvents, evt => evt is SessionIdleEvent);
+
+        await session.DisposeAsync();
+    }
 }

From e4c70f8f30635e6e14ff3d11a094fa0d11b11d42 Mon Sep 17 00:00:00 2001
From: zhiyongli <zhiyongli@microsoft.com>
Date: Thu, 15 Jan 2026 16:11:13 +0800
Subject: [PATCH 2/2] Fix the copilot suggestion

---
 dotnet/src/Client.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/dotnet/src/Client.cs b/dotnet/src/Client.cs
index ab278fd6..8c61c73b 100644
--- a/dotnet/src/Client.cs
+++ b/dotnet/src/Client.cs
@@ -765,7 +765,7 @@ public void OnSessionEvent(string sessionId,
             var session = client.GetSession(sessionId);
             if (session != null && @event != null)
             {
-                var evt = SessionEvent.FromJson(@event.ToString()!);
+                var evt = SessionEvent.FromJson(@event.Value.GetRawText());
                 session.DispatchEvent(evt);
             }
         }
@@ -958,10 +958,6 @@ private record DeleteSessionResponse(
     private record ListSessionsResponse(
         List<SessionMetadata> Sessions);
 
-    private record SessionEventNotification(
-        string SessionId,
-        JsonElement? Event);
-
     private record ToolCallResponse(
         ToolResultObject? Result);