From b5433a9a54fa43758ea651e729d73ffd5c0fb139 Mon Sep 17 00:00:00 2001
From: Umesh Yadav <23421535+imumesh18@users.noreply.github.com>
Date: Wed, 23 Jul 2025 23:58:05 +0530
Subject: [PATCH] agent_ui: Show keybindings for NewThread and NewTextThread in
new thread button (#34967)
I believe in this PR: #34829 we moved to context menu entry from action
but the side effect of that was we also removed the Keybindings from
showing it in the new thread button dropdown. This PR fixes that. cc
@danilo-leal
| Before | After |
|--------|--------|
| 
| 
|
Release Notes:
- N/A
---
crates/agent_ui/src/agent_panel.rs | 167 +++++++++++++++--------------
1 file changed, 89 insertions(+), 78 deletions(-)
diff --git a/crates/agent_ui/src/agent_panel.rs b/crates/agent_ui/src/agent_panel.rs
index 95ce289608..6ae2f12b5e 100644
--- a/crates/agent_ui/src/agent_panel.rs
+++ b/crates/agent_ui/src/agent_panel.rs
@@ -1901,85 +1901,96 @@ impl AgentPanel {
)
.anchor(Corner::TopRight)
.with_handle(self.new_thread_menu_handle.clone())
- .menu(move |window, cx| {
- let active_thread = active_thread.clone();
- Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
- menu = menu
- .when(cx.has_flag::(), |this| {
- this.header("Zed Agent")
- })
- .item(
- ContextMenuEntry::new("New Thread")
- .icon(IconName::NewThread)
- .icon_color(Color::Muted)
- .handler(move |window, cx| {
- window.dispatch_action(NewThread::default().boxed_clone(), cx);
- }),
- )
- .item(
- ContextMenuEntry::new("New Text Thread")
- .icon(IconName::NewTextThread)
- .icon_color(Color::Muted)
- .handler(move |window, cx| {
- window.dispatch_action(NewTextThread.boxed_clone(), cx);
- }),
- )
- .when_some(active_thread, |this, active_thread| {
- let thread = active_thread.read(cx);
+ .menu({
+ let focus_handle = focus_handle.clone();
+ move |window, cx| {
+ let active_thread = active_thread.clone();
+ Some(ContextMenu::build(window, cx, |mut menu, _window, cx| {
+ menu = menu
+ .context(focus_handle.clone())
+ .when(cx.has_flag::(), |this| {
+ this.header("Zed Agent")
+ })
+ .item(
+ ContextMenuEntry::new("New Thread")
+ .icon(IconName::NewThread)
+ .icon_color(Color::Muted)
+ .action(NewThread::default().boxed_clone())
+ .handler(move |window, cx| {
+ window.dispatch_action(
+ NewThread::default().boxed_clone(),
+ cx,
+ );
+ }),
+ )
+ .item(
+ ContextMenuEntry::new("New Text Thread")
+ .icon(IconName::NewTextThread)
+ .icon_color(Color::Muted)
+ .action(NewTextThread.boxed_clone())
+ .handler(move |window, cx| {
+ window.dispatch_action(NewTextThread.boxed_clone(), cx);
+ }),
+ )
+ .when_some(active_thread, |this, active_thread| {
+ let thread = active_thread.read(cx);
- if !thread.is_empty() {
- let thread_id = thread.id().clone();
- this.item(
- ContextMenuEntry::new("New From Summary")
- .icon(IconName::NewFromSummary)
- .icon_color(Color::Muted)
- .handler(move |window, cx| {
- window.dispatch_action(
- Box::new(NewThread {
- from_thread_id: Some(thread_id.clone()),
- }),
- cx,
- );
- }),
- )
- } else {
- this
- }
- })
- .when(cx.has_flag::(), |this| {
- this.separator()
- .header("External Agents")
- .item(
- ContextMenuEntry::new("New Gemini Thread")
- .icon(IconName::AiGemini)
- .icon_color(Color::Muted)
- .handler(move |window, cx| {
- window.dispatch_action(
- NewExternalAgentThread {
- agent: Some(crate::ExternalAgent::Gemini),
- }
- .boxed_clone(),
- cx,
- );
- }),
- )
- .item(
- ContextMenuEntry::new("New Claude Code Thread")
- .icon(IconName::AiClaude)
- .icon_color(Color::Muted)
- .handler(move |window, cx| {
- window.dispatch_action(
- NewExternalAgentThread {
- agent: Some(crate::ExternalAgent::ClaudeCode),
- }
- .boxed_clone(),
- cx,
- );
- }),
- )
- });
- menu
- }))
+ if !thread.is_empty() {
+ let thread_id = thread.id().clone();
+ this.item(
+ ContextMenuEntry::new("New From Summary")
+ .icon(IconName::NewFromSummary)
+ .icon_color(Color::Muted)
+ .handler(move |window, cx| {
+ window.dispatch_action(
+ Box::new(NewThread {
+ from_thread_id: Some(thread_id.clone()),
+ }),
+ cx,
+ );
+ }),
+ )
+ } else {
+ this
+ }
+ })
+ .when(cx.has_flag::(), |this| {
+ this.separator()
+ .header("External Agents")
+ .item(
+ ContextMenuEntry::new("New Gemini Thread")
+ .icon(IconName::AiGemini)
+ .icon_color(Color::Muted)
+ .handler(move |window, cx| {
+ window.dispatch_action(
+ NewExternalAgentThread {
+ agent: Some(crate::ExternalAgent::Gemini),
+ }
+ .boxed_clone(),
+ cx,
+ );
+ }),
+ )
+ .item(
+ ContextMenuEntry::new("New Claude Code Thread")
+ .icon(IconName::AiClaude)
+ .icon_color(Color::Muted)
+ .handler(move |window, cx| {
+ window.dispatch_action(
+ NewExternalAgentThread {
+ agent: Some(
+ crate::ExternalAgent::ClaudeCode,
+ ),
+ }
+ .boxed_clone(),
+ cx,
+ );
+ }),
+ )
+ });
+ menu
+ }))
+ }
});
let agent_panel_menu = PopoverMenu::new("agent-options-menu")