Mackinnon feedback

Author: MRayermannMSFT

nodejs/src/session.ts

@@ -622,21 +622,19 @@ export class CopilotSession {
         }
         try {
             const result = await this.elicitationHandler(request, { sessionId: this.sessionId });
-            await this.connection.sendRequest("session.ui.handlePendingElicitation", {
-                sessionId: this.sessionId,
-                requestId,
-                result,
-            });
+            await this.rpc.ui.handlePendingElicitation({ requestId, result });
         } catch {
             // Handler failed — attempt to cancel so the request doesn't hang
             try {
-                await this.connection.sendRequest("session.ui.handlePendingElicitation", {
-                    sessionId: this.sessionId,
+                await this.rpc.ui.handlePendingElicitation({
                     requestId,
                     result: { action: "cancel" },
                 });
-            } catch {
-                // Best effort — another client may have already responded
+            } catch (rpcError) {
+                if (!(rpcError instanceof ConnectionError || rpcError instanceof ResponseError)) {
+                    throw rpcError;
+                }
+                // Connection lost or RPC error — nothing we can do
             }
         }
     }

nodejs/test/client.test.ts

@@ -945,5 +945,36 @@ describe("CopilotClient", () => {
             );
             rpcSpy.mockRestore();
         });
+
+        it("sends cancel when elicitation handler throws", async () => {
+            const client = new CopilotClient();
+            await client.start();
+            onTestFinished(() => client.forceStop());
+
+            const session = await client.createSession({
+                onPermissionRequest: approveAll,
+                onElicitationRequest: async () => {
+                    throw new Error("handler exploded");
+                },
+            });
+
+            const rpcSpy = vi.spyOn((client as any).connection!, "sendRequest");
+
+            await session._handleElicitationRequest({ message: "Pick a color" }, "req-123");
+
+            const cancelCall = rpcSpy.mock.calls.find(
+                (c) =>
+                    c[0] === "session.ui.handlePendingElicitation" &&
+                    (c[1] as any)?.result?.action === "cancel"
+            );
+            expect(cancelCall).toBeDefined();
+            expect(cancelCall![1]).toEqual(
+                expect.objectContaining({
+                    requestId: "req-123",
+                    result: { action: "cancel" },
+                })
+            );
+            rpcSpy.mockRestore();
+        });
     });
 });