Fix cancellation CI validation

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

Author: stephentoub

java/sdk/src/main/java/com/github/copilot/CopilotClient.java

@@ -553,8 +553,7 @@ private Connection startCoreBody() {
             JsonRpcClient connectedRpc = rpc;
             Connection connection = new Connection(connectedRpc, process, new ServerRpc(connectedRpc::invoke),
                     inProcessTransport == null ? null : inProcessTransport.host());
-            connectedRpc.setCloseHandler(
-                    () -> sessions.values().forEach(CopilotSession::cancelPendingExternalTools));
+            connectedRpc.setCloseHandler(() -> sessions.values().forEach(CopilotSession::cancelPendingExternalTools));
 
             // Register handlers for server-to-client calls
             RpcHandlerDispatcher dispatcher = new RpcHandlerDispatcher(sessions, lifecycleManager::dispatch, executor,

java/sdk/src/main/java/com/github/copilot/CopilotSession.java

@@ -1009,8 +1009,7 @@ private void executeToolAndRespondAsync(String requestId, String toolName, Strin
             ToolDefinition tool) {
         var pending = new PendingExternalTool();
         synchronized (this) {
-            if (isTerminated || externalToolsClosed
-                    || pendingExternalTools.putIfAbsent(requestId, pending) != null) {
+            if (isTerminated || externalToolsClosed || pendingExternalTools.putIfAbsent(requestId, pending) != null) {
                 return;
             }
         }

java/sdk/src/test/java/com/github/copilot/CopilotClientTest.java

@@ -156,7 +156,8 @@ void testForceStopCancelsPendingExternalTools() throws Exception {
 
         var lateRequest = new ExternalToolRequestedEvent();
         lateRequest.setData(new ExternalToolRequestedEvent.ExternalToolRequestedEventData("request-after-force-stop",
-                session.getSessionId(), "tool-call-after-force-stop", "blocked_tool", null, Map.of(), null, null, null));
+                session.getSessionId(), "tool-call-after-force-stop", "blocked_tool", null, Map.of(), null, null,
+                null));
         session.dispatchEvent(lateRequest);
         assertFalse(lateStarted.await(100, TimeUnit.MILLISECONDS));
     }

java/sdk/src/test/java/com/github/copilot/SessionEventHandlingTest.java

@@ -94,8 +94,8 @@ void testExternalToolCompletedCancelsBlockedHandler() throws Exception {
         })));
 
         var requested = new ExternalToolRequestedEvent();
-        requested.setData(new ExternalToolRequestedEvent.ExternalToolRequestedEventData("request-1",
-                "test-session-id", "tool-call-1", "blocked_tool", null, Map.of(), null, null, null));
+        requested.setData(new ExternalToolRequestedEvent.ExternalToolRequestedEventData("request-1", "test-session-id",
+                "tool-call-1", "blocked_tool", null, Map.of(), null, null, null));
         dispatchEvent(requested);
         assertTrue(started.await(1, TimeUnit.SECONDS));
 
@@ -130,8 +130,8 @@ void testCloseCancelsBlockedExternalTool() throws Exception {
     void testExternalToolCompletedDoesNotBlockOnSynchronousHandler() throws Exception {
         var started = new CountDownLatch(1);
         var release = new CountDownLatch(1);
-        session.registerTools(List.of(ToolDefinition.create("blocked_tool", "Blocks synchronously", Map.of(),
-                invocation -> {
+        session.registerTools(
+                List.of(ToolDefinition.create("blocked_tool", "Blocks synchronously", Map.of(), invocation -> {
                     started.countDown();
                     try {
                         release.await();

python/test_session.py

@@ -86,7 +86,7 @@ async def blocked_tool(_invocation):
             await asyncio.Future()
         except asyncio.CancelledError:
             cancelled.set()
-            return ToolResult(text_result_for_llm="late result")
+        return ToolResult(text_result_for_llm="late result")
 
     session._register_tools([Tool("blocked_tool", "Blocks", blocked_tool)])
     session._dispatch_event(

rust/src/session.rs

@@ -1145,11 +1145,11 @@ impl Client {
             "Client::create_session local setup complete"
         );
         *capabilities.write() = create_result.capabilities.unwrap_or_default();
-        if has_mcp_auth_handler {
-            if let Err(error) = register_mcp_auth_interest(self, &session_id).await {
-                registration.cleanup(event_loop).await;
-                return Err(error);
-            }
+        if has_mcp_auth_handler
+            && let Err(error) = register_mcp_auth_interest(self, &session_id).await
+        {
+            registration.cleanup(event_loop).await;
+            return Err(error);
         }
 
         tracing::debug!(
@@ -1395,11 +1395,11 @@ impl Client {
             })
             .into());
         }
-        if has_mcp_auth_handler {
-            if let Err(error) = register_mcp_auth_interest(self, &session_id).await {
-                registration.cleanup(event_loop).await;
-                return Err(error);
-            }
+        if has_mcp_auth_handler
+            && let Err(error) = register_mcp_auth_interest(self, &session_id).await
+        {
+            registration.cleanup(event_loop).await;
+            return Err(error);
         }
 
         // Reload skills after resume (best-effort).