Fix session.shutdown event delivery by delaying handler cleanup

dotnet/src/Session.cs

@@ -580,6 +580,11 @@ await InvokeRpcAsync<object>(
             // Connection is broken or closed
         }
 
+        // Wait briefly for any final notifications (e.g., session.shutdown)
+        // to arrive before clearing handlers. The CLI may send these after
+        // the RPC response.
+        await Task.Delay(100);
+
         _eventHandlers.Clear();
         _toolHandlers.Clear();
 

go/session.go

@@ -531,6 +531,11 @@ func (s *Session) Destroy() error {
 		return fmt.Errorf("failed to destroy session: %w", err)
 	}
 
+	// Wait briefly for any final notifications (e.g., session.shutdown)
+	// to arrive before clearing handlers. The CLI may send these after
+	// the RPC response.
+	time.Sleep(100 * time.Millisecond)
+
 	// Clear handlers
 	s.handlerMutex.Lock()
 	s.handlers = nil

nodejs/examples/test-shutdown-event.ts

@@ -0,0 +1,42 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *--------------------------------------------------------------------------------------------*/
+
+import { CopilotClient } from "../src/index.js";
+
+console.log("🚀 Testing session.shutdown event\n");
+
+// Create client
+const client = new CopilotClient({ logLevel: "info" });
+const session = await client.createSession();
+console.log(`✅ Session created: ${session.sessionId}\n`);
+
+// Track if we receive the shutdown event
+let shutdownEventReceived = false;
+
+// Listen to all events
+session.on((event) => {
+    console.log(`📢 Event [${event.type}]`);
+    if (event.type === "session.shutdown") {
+        shutdownEventReceived = true;
+        console.log("✅ SHUTDOWN EVENT RECEIVED!");
+        console.log("   Data:", JSON.stringify(event.data, null, 2));
+    }
+});
+
+// Send a simple message
+console.log("💬 Sending message...");
+const result = await session.sendAndWait({ prompt: "What is 2+2?" });
+console.log("📝 Response:", result?.data.content);
+
+// Clean up
+console.log("\n🔄 Destroying session...");
+await session.destroy();
+
+// Give a bit more time for any delayed events
+await new Promise(resolve => setTimeout(resolve, 200));
+
+console.log("\n" + (shutdownEventReceived ? "✅ SUCCESS: session.shutdown event was received!" : "❌ FAILURE: session.shutdown event was NOT received!"));
+
+await client.stop();
+console.log("\n✅ Done!");

nodejs/src/session.ts

@@ -518,6 +518,12 @@ export class CopilotSession {
         await this.connection.sendRequest("session.destroy", {
             sessionId: this.sessionId,
         });
+
+        // Wait briefly for any final notifications (e.g., session.shutdown)
+        // to arrive before clearing handlers. The CLI may send these after
+        // the RPC response.
+        await new Promise((resolve) => setTimeout(resolve, 100));
+
         this.eventHandlers.clear();
         this.typedEventHandlers.clear();
         this.toolHandlers.clear();

python/copilot/session.py

@@ -487,6 +487,12 @@ async def destroy(self) -> None:
             >>> await session.destroy()
         """
         await self._client.request("session.destroy", {"sessionId": self.session_id})
+
+        # Wait briefly for any final notifications (e.g., session.shutdown)
+        # to arrive before clearing handlers. The CLI may send these after
+        # the RPC response.
+        await asyncio.sleep(0.1)
+
         with self._event_handlers_lock:
             self._event_handlers.clear()
         with self._tool_handlers_lock: