Fix: use correct permission denial kind and send errors back via RPC (ported from #185)

Copilot · Copilot · commit e592e478bfc1 · 2026-03-11T08:46:52.000Z
diff --git a/src/main/java/com/github/copilot/sdk/CopilotSession.java b/src/main/java/com/github/copilot/sdk/CopilotSession.java
@@ -40,6 +40,7 @@
 import com.github.copilot.sdk.json.PermissionInvocation;
 import com.github.copilot.sdk.json.PermissionRequest;
 import com.github.copilot.sdk.json.PermissionRequestResult;
+import com.github.copilot.sdk.json.PermissionRequestResultKind;
 import com.github.copilot.sdk.json.PostToolUseHookInput;
 import com.github.copilot.sdk.json.PreToolUseHookInput;
 import com.github.copilot.sdk.json.SendMessageRequest;
@@ -684,6 +685,14 @@ private void executeToolAndRespondAsync(String requestId, String toolName, Strin
                 });
             } catch (Exception e) {
                 LOG.log(Level.WARNING, "Error executing tool for requestId=" + requestId, e);
+                try {
+                    rpc.invoke(
+                            "session.tools.handlePendingToolCall", Map.of("sessionId", sessionId, "requestId",
+                                    requestId, "error", e.getMessage() != null ? e.getMessage() : e.toString()),
+                            Object.class);
+                } catch (Exception sendEx) {
+                    LOG.log(Level.WARNING, "Error sending tool error for requestId=" + requestId, sendEx);
+                }
             }
         });
     }
@@ -708,7 +717,7 @@ private void executePermissionAndRespondAsync(String requestId, PermissionReques
                 }).exceptionally(ex -> {
                     try {
                         PermissionRequestResult denied = new PermissionRequestResult();
-                        denied.setKind("denied-could-not-request-from-user");
+                        denied.setKind(PermissionRequestResultKind.DENIED_COULD_NOT_REQUEST_FROM_USER);
                         rpc.invoke("session.permissions.handlePendingPermissionRequest",
                                 Map.of("sessionId", sessionId, "requestId", requestId, "result", denied), Object.class);
                     } catch (Exception e) {
@@ -718,6 +727,14 @@ private void executePermissionAndRespondAsync(String requestId, PermissionReques
                 });
             } catch (Exception e) {
                 LOG.log(Level.WARNING, "Error executing permission handler for requestId=" + requestId, e);
+                try {
+                    PermissionRequestResult denied = new PermissionRequestResult();
+                    denied.setKind(PermissionRequestResultKind.DENIED_COULD_NOT_REQUEST_FROM_USER);
+                    rpc.invoke("session.permissions.handlePendingPermissionRequest",
+                            Map.of("sessionId", sessionId, "requestId", requestId, "result", denied), Object.class);
+                } catch (Exception sendEx) {
+                    LOG.log(Level.WARNING, "Error sending permission denied for requestId=" + requestId, sendEx);
+                }
             }
         });
     }
