From ff35da22fbe67a65632a8009827f114262c76e4d Mon Sep 17 00:00:00 2001
From: Danilo Leal <67129314+danilo-leal@users.noreply.github.com>
Date: Tue, 20 Jan 2026 20:54:13 -0300
Subject: [PATCH] agent_ui: Fix keybinding conflict with action to clean up the
 queue (#47254)

This PR frees up `shift-backspace` to work as it did before. Now, the
action to remove the first queued message is now assigned to the
`cmd-shfit-backspace` keybinding, whereas the action to clear the entire
message queue is assigned to `cmd-alt-backspace`.

Release Notes:

- N/A
---
 assets/keymaps/default-linux.json   | 4 ++--
 assets/keymaps/default-macos.json   | 4 ++--
 assets/keymaps/default-windows.json | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 58ff48186cc8b85f0c9e14e8be0f7d38467c115d..91243e4679e0ea1f3085561115a75fcfaf74db2b 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -309,9 +309,9 @@
       "ctrl-enter": "agent::ChatWithFollow",
       "ctrl-shift-enter": "agent::SendImmediately",
       "ctrl-shift-alt-enter": "agent::SendNextQueuedMessage",
-      "shift-backspace": "agent::RemoveFirstQueuedMessage",
+      "ctrl-shift-backspace": "agent::RemoveFirstQueuedMessage",
       "shift-e": "agent::EditFirstQueuedMessage",
-      "ctrl-shift-backspace": "agent::ClearMessageQueue",
+      "ctrl-alt-backspace": "agent::ClearMessageQueue",
       "ctrl-shift-v": "agent::PasteRaw",
       "ctrl-i": "agent::ToggleProfileSelector",
       "shift-tab": "agent::CycleModeSelector",
diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json
index 10e7b10aec50b11500407c454c9ee0bd6ff414c7..00f54517ee9a2d3936c67565f2e01edd10d30367 100644
--- a/assets/keymaps/default-macos.json
+++ b/assets/keymaps/default-macos.json
@@ -357,9 +357,9 @@
       "cmd-enter": "agent::ChatWithFollow",
       "cmd-shift-enter": "agent::SendImmediately",
       "cmd-shift-alt-enter": "agent::SendNextQueuedMessage",
-      "shift-backspace": "agent::RemoveFirstQueuedMessage",
+      "cmd-shift-backspace": "agent::RemoveFirstQueuedMessage",
       "shift-e": "agent::EditFirstQueuedMessage",
-      "cmd-shift-backspace": "agent::ClearMessageQueue",
+      "cmd-alt-backspace": "agent::ClearMessageQueue",
       "cmd-shift-v": "agent::PasteRaw",
       "cmd-i": "agent::ToggleProfileSelector",
       "shift-tab": "agent::CycleModeSelector",
diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json
index e8fc502a2c1ae9491c2ba6f08c37ac104e7aa50d..b54c175fc2d0c7a0dc9f43accf71475aec77a047 100644
--- a/assets/keymaps/default-windows.json
+++ b/assets/keymaps/default-windows.json
@@ -311,9 +311,9 @@
       "ctrl-enter": "agent::ChatWithFollow",
       "ctrl-shift-enter": "agent::SendImmediately",
       "ctrl-shift-alt-enter": "agent::SendNextQueuedMessage",
-      "shift-backspace": "agent::RemoveFirstQueuedMessage",
+      "ctrl-shift-backspace": "agent::RemoveFirstQueuedMessage",
       "shift-e": "agent::EditFirstQueuedMessage",
-      "ctrl-shift-backspace": "agent::ClearMessageQueue",
+      "ctrl-alt-backspace": "agent::ClearMessageQueue",
       "ctrl-shift-v": "agent::PasteRaw",
       "ctrl-i": "agent::ToggleProfileSelector",
       "shift-tab": "agent::CycleModeSelector",