Fix merge blockers after rebase

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: Copilot

go/internal/e2e/permissions_e2e_test.go

@@ -228,7 +228,7 @@ func TestPermissionsE2E(t *testing.T) {
 		}
 	})
 
-	t.Run("should accept explicit deny handler when joining an active session", func(t *testing.T) {
+	t.Run("should accept user-not-available handler when joining an active session", func(t *testing.T) {
 		ctx.ConfigureForTest(t)
 
 		session1, err := client.CreateSession(t.Context(), &copilot.SessionConfig{

go/session.go

@@ -82,7 +82,8 @@ type Session struct {
 	// eventCh serializes user event handler dispatch. dispatchEvent enqueues;
 	// a single goroutine (processEvents) dequeues and invokes handlers in FIFO order.
 	eventCh   chan SessionEvent
-	closeOnce sync.Once // guards eventCh close so Disconnect is safe to call more than once
+	eventMu   sync.RWMutex // coordinates sends with closing eventCh
+	closeOnce sync.Once    // guards eventCh close so Disconnect is safe to call more than once
 	stateMu   sync.Mutex
 	closed    bool
 	closing   chan struct{}
@@ -948,14 +949,17 @@ func fromRPCContent(value rpc.UIElicitationFieldValue) any {
 func (s *Session) dispatchEvent(event SessionEvent) {
 	go s.handleBroadcastEvent(event)
 
-	// Send to the event channel in a closure with a recover guard.
-	// Disconnect closes eventCh, and in Go sending on a closed channel
-	// panics — there is no non-panicking send primitive. We only want
-	// to suppress that specific panic; other panics are not expected here.
-	func() {
-		defer func() { recover() }()
-		s.eventCh <- event
-	}()
+	s.eventMu.RLock()
+	defer s.eventMu.RUnlock()
+
+	s.stateMu.Lock()
+	closed := s.closed
+	s.stateMu.Unlock()
+	if closed {
+		return
+	}
+
+	s.eventCh <- event
 }
 
 // processEvents is the single consumer goroutine for the event channel.
@@ -1273,7 +1277,9 @@ func (s *Session) markDisconnected() {
 	s.closed = true
 	s.stateMu.Unlock()
 
+	s.eventMu.Lock()
 	s.closeOnce.Do(func() { close(s.eventCh) })
+	s.eventMu.Unlock()
 
 	s.handlerMutex.Lock()
 	s.handlers = nil

nodejs/src/generated/rpc.ts

@@ -502,8 +502,14 @@ export class CopilotSession {
             } else {
                 result = JSON.stringify(rawResult);
             }
+            if (this.disconnected) {
+                return;
+            }
             await this.rpc.tools.handlePendingToolCall({ requestId, result });
         } catch (error) {
+            if (this.disconnected) {
+                return;
+            }
             const message = error instanceof Error ? error.message : String(error);
             try {
                 await this.rpc.tools.handlePendingToolCall({ requestId, error: message });
@@ -531,8 +537,14 @@ export class CopilotSession {
             if (result.kind === "no-result") {
                 return;
             }
+            if (this.disconnected) {
+                return;
+            }
             await this.rpc.permissions.handlePendingPermissionRequest({ requestId, result });
         } catch (_error) {
+            if (this.disconnected) {
+                return;
+            }
             try {
                 await this.rpc.permissions.handlePendingPermissionRequest({
                     requestId,
@@ -576,8 +588,14 @@ export class CopilotSession {
 
         try {
             await handler({ sessionId: this.sessionId, command, commandName, args });
+            if (this.disconnected) {
+                return;
+            }
             await this.rpc.commands.handlePendingCommand({ requestId });
         } catch (error) {
+            if (this.disconnected) {
+                return;
+            }
             const message = error instanceof Error ? error.message : String(error);
             try {
                 await this.rpc.commands.handlePendingCommand({ requestId, error: message });

nodejs/src/session.ts

@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { describe, expect, it, onTestFinished, vi } from "vitest";
 import { approveAll, CopilotClient, type ModelInfo } from "../src/index.js";
+import { createServerRpc } from "../src/generated/rpc.js";
 import { CopilotSession } from "../src/session.js";
 import { defaultJoinSessionPermissionHandler } from "../src/types.js";
 
@@ -174,6 +175,21 @@ describe("CopilotClient", () => {
         expect(connection.sendRequest).not.toHaveBeenCalled();
     });
 
+    it("allows generated RPC params with only optional fields to be omitted", async () => {
+        const connection = {
+            sendRequest: vi.fn(async (method: string) =>
+                method === "models.list" ? { models: [] } : { tools: [] }
+            ),
+        } as any;
+        const rpc = createServerRpc(connection);
+
+        await rpc.models.list();
+        await rpc.tools.list();
+
+        expect(connection.sendRequest).toHaveBeenCalledWith("models.list", {});
+        expect(connection.sendRequest).toHaveBeenCalledWith("tools.list", {});
+    });
+
     it("forwards clientName in session.resume request", async () => {
         const client = new CopilotClient();
         await client.start();

nodejs/test/client.test.ts

@@ -83,6 +83,7 @@ describe("Commands", async () => {
     it("session with commands resumes successfully", async () => {
         const session1 = await client1.createSession({ onPermissionRequest: approveAll });
         const sessionId = session1.sessionId;
+        await session1.disconnect();
 
         const session2 = await client1.resumeSession(sessionId, {
             onPermissionRequest: approveAll,

nodejs/test/e2e/commands.e2e.test.ts

@@ -49,6 +49,7 @@ describe("MCP Servers and Custom Agents", async () => {
             const session1 = await client.createSession({ onPermissionRequest: approveAll });
             const sessionId = session1.sessionId;
             await session1.sendAndWait({ prompt: "What is 1+1?" });
+            await session1.disconnect();
 
             // Resume with MCP servers
             const mcpServers: Record<string, MCPServerConfig> = {
@@ -160,6 +161,7 @@ describe("MCP Servers and Custom Agents", async () => {
             const session1 = await client.createSession({ onPermissionRequest: approveAll });
             const sessionId = session1.sessionId;
             await session1.sendAndWait({ prompt: "What is 1+1?" });
+            await session1.disconnect();
 
             // Resume with custom agents
             const customAgents: CustomAgentConfig[] = [
@@ -338,6 +340,7 @@ describe("MCP Servers and Custom Agents", async () => {
             const session1 = await client.createSession({ onPermissionRequest: approveAll });
             const sessionId = session1.sessionId;
             await session1.sendAndWait({ prompt: "What is 3+3?" });
+            await session1.disconnect();
 
             const secretTool = defineTool("secret_tool", {
                 description: "A secret tool hidden from the default agent",

nodejs/test/e2e/mcp_and_agents.e2e.test.ts

@@ -118,6 +118,7 @@ describe("Permission callbacks", async () => {
         const session1 = await client.createSession({ onPermissionRequest: approveAll });
         const sessionId = session1.sessionId;
         await session1.sendAndWait({ prompt: "What is 1+1?" });
+        await session1.disconnect();
 
         const session2 = await client.resumeSession(sessionId, {
             onPermissionRequest: () => ({
@@ -182,6 +183,7 @@ describe("Permission callbacks", async () => {
         const session1 = await client.createSession({ onPermissionRequest: approveAll });
         const sessionId = session1.sessionId;
         await session1.sendAndWait({ prompt: "What is 1+1?" });
+        await session1.disconnect();
 
         // Resume with permission handler
         const session2 = await client.resumeSession(sessionId, {

nodejs/test/e2e/permissions.e2e.test.ts

@@ -31,7 +31,7 @@ describe("Sessions", async () => {
         ]);
 
         await session.disconnect();
-        await expect(() => session.getMessages()).rejects.toThrow(/Session not found/);
+        await expect(() => session.getMessages()).rejects.toThrow(/Session has been disconnected/);
     });
 
     // TODO: Re-enable once test harness CAPI proxy supports this test's session lifecycle
@@ -253,7 +253,7 @@ describe("Sessions", async () => {
         // All can be disconnected
         await Promise.all([s1.disconnect(), s2.disconnect(), s3.disconnect()]);
         for (const s of [s1, s2, s3]) {
-            await expect(() => s.getMessages()).rejects.toThrow(/Session not found/);
+            await expect(() => s.getMessages()).rejects.toThrow(/Session has been disconnected/);
         }
     });
 
@@ -263,6 +263,7 @@ describe("Sessions", async () => {
         const sessionId = session1.sessionId;
         const answer = await session1.sendAndWait({ prompt: "What is 1+1?" });
         expect(answer?.data.content).toContain("2");
+        await session1.disconnect();
 
         // Resume using the same client
         const session2 = await client.resumeSession(sessionId, { onPermissionRequest: approveAll });
@@ -353,6 +354,7 @@ describe("Sessions", async () => {
     it("should resume session with a custom provider", async () => {
         const session = await client.createSession({ onPermissionRequest: approveAll });
         const sessionId = session.sessionId;
+        await session.disconnect();
 
         // Resume the session with a provider
         const session2 = await client.resumeSession(sessionId, {