From bffee3f25983539d6faf0f481088cd3145820368 Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 13 Jan 2026 14:59:02 -0300
Subject: [PATCH] agent_ui: Fix reject all and keep all keybinding conflict
 (#46725)

This PR changes the keybinding for the `agent::RejectAll` and
`agent::KeepAll` actions. My initial goal was to free up `cmd-shift-n`
to open a new fresh window again, but that was being used for the reject
all action. Given I had to change the reject all, I figured I had to
change the keep all action, too, to keep them consistent.

Release Notes:

- Agent: Removed keybinding conflict (`cmd-shift-n`) between rejecting
all changes in the agent panel vs. opening a new fresh window.
---
 assets/keymaps/default-linux.json   | 12 ++++++------
 assets/keymaps/default-macos.json   | 12 ++++++------
 assets/keymaps/default-windows.json | 12 ++++++------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 1cbcdb03b480ffce43e34b382aab918a09c77eee..9e9647f2e88e57e44f6d8c78d09bc80e3a8e3f91 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -205,8 +205,8 @@
     "bindings": {
       "ctrl-alt-y": "agent::Keep",
       "ctrl-alt-z": "agent::Reject",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
+      "shift-alt-y": "agent::KeepAll",
+      "shift-alt-z": "agent::RejectAll",
       "shift-ctrl-r": "agent::OpenAgentDiff",
     },
   },
@@ -215,8 +215,8 @@
     "bindings": {
       "ctrl-alt-y": "agent::Keep",
       "ctrl-alt-z": "agent::Reject",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
+      "shift-alt-y": "agent::KeepAll",
+      "shift-alt-z": "agent::RejectAll",
     },
   },
   {
@@ -305,8 +305,8 @@
     "use_key_equivalents": true,
     "bindings": {
       "ctrl-shift-r": "agent::OpenAgentDiff",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
+      "shift-alt-y": "agent::KeepAll",
+      "shift-alt-z": "agent::RejectAll",
       "ctrl-enter": "agent::ChatWithFollow",
       "ctrl-shift-enter": "agent::QueueMessage",
       "ctrl-shift-alt-enter": "agent::SendNextQueuedMessage",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 9fb2c57c641a9bca9f11403cc67924feecba1b3d..f8414539f389eda85987385152b20e4b3b197f50 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -243,8 +243,8 @@
     "bindings": {
       "cmd-alt-y": "agent::Keep",
       "cmd-alt-z": "agent::Reject",
-      "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll",
+      "shift-alt-y": "agent::KeepAll",
+      "shift-alt-z": "agent::RejectAll",
     },
   },
   {
@@ -253,8 +253,8 @@
     "bindings": {
       "cmd-alt-y": "agent::Keep",
       "cmd-alt-z": "agent::Reject",
-      "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll",
+      "shift-alt-y": "agent::KeepAll",
+      "shift-alt-z": "agent::RejectAll",
       "shift-ctrl-r": "agent::OpenAgentDiff",
     },
   },
@@ -353,8 +353,8 @@
     "use_key_equivalents": true,
     "bindings": {
       "shift-ctrl-r": "agent::OpenAgentDiff",
-      "cmd-shift-y": "agent::KeepAll",
-      "cmd-shift-n": "agent::RejectAll",
+      "shift-alt-y": "agent::KeepAll",
+      "shift-alt-z": "agent::RejectAll",
       "cmd-enter": "agent::ChatWithFollow",
       "cmd-shift-enter": "agent::QueueMessage",
       "cmd-shift-alt-enter": "agent::SendNextQueuedMessage",
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index d13dcfdd6d6c5e75e96424a596e7be5e89dc0c46..34e9d9c631864e9e6737823e5f1aa7e0895fc24c 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -204,8 +204,8 @@
     "bindings": {
       "ctrl-alt-y": "agent::Keep",
       "ctrl-alt-z": "agent::Reject",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
+      "shift-alt-y": "agent::KeepAll",
+      "shift-alt-z": "agent::RejectAll",
       "ctrl-shift-r": "agent::OpenAgentDiff",
     },
   },
@@ -215,8 +215,8 @@
     "bindings": {
       "ctrl-alt-y": "agent::Keep",
       "ctrl-alt-z": "agent::Reject",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
+      "shift-alt-y": "agent::KeepAll",
+      "shift-alt-z": "agent::RejectAll",
     },
   },
   {
@@ -307,8 +307,8 @@
     "use_key_equivalents": true,
     "bindings": {
       "ctrl-shift-r": "agent::OpenAgentDiff",
-      "ctrl-shift-y": "agent::KeepAll",
-      "ctrl-shift-n": "agent::RejectAll",
+      "shift-alt-y": "agent::KeepAll",
+      "shift-alt-z": "agent::RejectAll",
       "ctrl-enter": "agent::ChatWithFollow",
       "ctrl-shift-enter": "agent::QueueMessage",
       "ctrl-shift-alt-enter": "agent::SendNextQueuedMessage",