diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json index 2f0f823cd399f95f8517e784e197af8d7f657f17..15a0d516b11e4132f4c641a023612a55438b987b 100644 --- a/assets/keymaps/default-linux.json +++ b/assets/keymaps/default-linux.json @@ -727,7 +727,8 @@ "enter": "menu::Confirm", "ctrl-f": "agents_sidebar::FocusSidebarFilter", "ctrl-g": "agents_sidebar::ToggleThreadHistory", - "shift-backspace": "agent::RemoveSelectedThread", + "shift-backspace": "agent::ArchiveSelectedThread", + "ctrl-backspace": "agent::RemoveSelectedThread", "ctrl-tab": "agents_sidebar::ToggleThreadSwitcher", "ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }], }, diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.json index ef31773bc11b3c6c5a4c0ce1d8afc16c552a5da9..f8575f30d620a8708977988d192e62599c4f7f87 100644 --- a/assets/keymaps/default-macos.json +++ b/assets/keymaps/default-macos.json @@ -783,7 +783,8 @@ "enter": "menu::Confirm", "cmd-f": "agents_sidebar::FocusSidebarFilter", "cmd-g": "agents_sidebar::ToggleThreadHistory", - "shift-backspace": "agent::RemoveSelectedThread", + "shift-backspace": "agent::ArchiveSelectedThread", + "cmd-shift-backspace": "agent::RemoveSelectedThread", "ctrl-tab": "agents_sidebar::ToggleThreadSwitcher", "ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }], }, diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.json index d576a6a5169affce5a335a22bdf9265f9a7490f3..a38b6625a6104d470405d6b7554c8f2ea204f808 100644 --- a/assets/keymaps/default-windows.json +++ b/assets/keymaps/default-windows.json @@ -728,7 +728,8 @@ "enter": "menu::Confirm", "ctrl-f": "agents_sidebar::FocusSidebarFilter", "ctrl-g": "agents_sidebar::ToggleThreadHistory", - "shift-backspace": "agent::RemoveSelectedThread", + "shift-backspace": "agent::ArchiveSelectedThread", + "ctrl-backspace": "agent::RemoveSelectedThread", "ctrl-tab": "agents_sidebar::ToggleThreadSwitcher", "ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }], }, diff --git a/crates/sidebar/src/sidebar.rs b/crates/sidebar/src/sidebar.rs index 0b690b5d21f09633168debde1b969741dec615d2..21d0c49cddc348071bcba04754cfb7e4edcf26be 100644 --- a/crates/sidebar/src/sidebar.rs +++ b/crates/sidebar/src/sidebar.rs @@ -12,8 +12,8 @@ use agent_ui::threads_archive_view::{ ThreadsArchiveView, ThreadsArchiveViewEvent, format_history_entry_timestamp, }; use agent_ui::{ - AcpThreadImportOnboarding, Agent, AgentPanel, AgentPanelEvent, CrossChannelImportOnboarding, - DEFAULT_THREAD_TITLE, NewThread, RemoveSelectedThread, ThreadId, ThreadImportModal, + AcpThreadImportOnboarding, Agent, AgentPanel, AgentPanelEvent, ArchiveSelectedThread, + CrossChannelImportOnboarding, DEFAULT_THREAD_TITLE, NewThread, ThreadId, ThreadImportModal, channels_with_threads, import_threads_from_other_channels, }; use chrono::{DateTime, Utc}; @@ -3543,9 +3543,9 @@ impl Sidebar { } } - fn remove_selected_thread( + fn archive_selected_thread( &mut self, - _: &RemoveSelectedThread, + _: &ArchiveSelectedThread, window: &mut Window, cx: &mut Context, ) { @@ -3934,7 +3934,7 @@ impl Sidebar { move |_window, cx| { Tooltip::for_action_in( "Archive Thread", - &RemoveSelectedThread, + &ArchiveSelectedThread, &focus_handle, cx, ) @@ -4918,7 +4918,7 @@ impl Render for Sidebar { .on_action(cx.listener(Self::fold_all)) .on_action(cx.listener(Self::unfold_all)) .on_action(cx.listener(Self::cancel)) - .on_action(cx.listener(Self::remove_selected_thread)) + .on_action(cx.listener(Self::archive_selected_thread)) .on_action(cx.listener(Self::new_thread_in_group)) .on_action(cx.listener(Self::toggle_archive)) .on_action(cx.listener(Self::focus_sidebar_filter))