Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.
Unify copy actions for agent panel and markdown (#63884)
Kirill Bulatov6f72bdb7b241
diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.jsonindex 553b9a2a6bd..37ad4da6395 100644--- a/assets/keymaps/default-linux.json+++ b/assets/keymaps/default-linux.json@@ -226,14 +226,6 @@"ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }],},},- {- "context": "AgentPanel > Markdown",- "bindings": {- "copy": "markdown::CopyAsMarkdown",- "ctrl-insert": "markdown::CopyAsMarkdown",- "ctrl-c": "markdown::CopyAsMarkdown",- },- },{"context": "AgentFeedbackMessageEditor > Editor","bindings": {diff --git a/assets/keymaps/default-macos.json b/assets/keymaps/default-macos.jsonindex 4b5dd97951e..75776e09558 100644--- a/assets/keymaps/default-macos.json+++ b/assets/keymaps/default-macos.json@@ -264,13 +264,6 @@"ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }],},},- {- "context": "AgentPanel > Markdown",- "use_key_equivalents": true,- "bindings": {- "cmd-c": "markdown::CopyAsMarkdown",- },- },{"context": "AgentFeedbackMessageEditor > Editor","use_key_equivalents": true,diff --git a/assets/keymaps/default-windows.json b/assets/keymaps/default-windows.jsonindex 3752597005b..c7747268ef9 100644--- a/assets/keymaps/default-windows.json+++ b/assets/keymaps/default-windows.json@@ -228,13 +228,6 @@"ctrl-shift-tab": ["agents_sidebar::ToggleThreadSwitcher", { "select_last": true }],},},- {- "context": "AgentPanel > Markdown",- "use_key_equivalents": true,- "bindings": {- "ctrl-c": "markdown::CopyAsMarkdown",- },- },{"context": "AgentFeedbackMessageEditor > Editor","use_key_equivalents": true,diff --git a/crates/agent_ui/src/conversation_view/thread_view.rs b/crates/agent_ui/src/conversation_view/thread_view.rsindex 0bd96811ca0..26187c7045c 100644--- a/crates/agent_ui/src/conversation_view/thread_view.rs+++ b/crates/agent_ui/src/conversation_view/thread_view.rs@@ -7566,29 +7566,36 @@ impl ThreadView {},);- let has_selection = chunks- .map(|chunks| {- chunks.iter().any(|chunk| {- let md = match chunk {- AssistantMessageChunk::Message { block, .. } => {- block.markdown()- }- AssistantMessageChunk::Thought { block, .. } => {- block.markdown()- }- };- md.map_or(false, |m| m.read(cx).has_selection())+ let context_menu_link = chunks.and_then(|chunks| {+ chunks.iter().find_map(|chunk| {+ let markdown = match chunk {+ AssistantMessageChunk::Message { block, .. } => block.markdown(),+ AssistantMessageChunk::Thought { block, .. } => block.markdown(),+ };+ markdown+ .and_then(|markdown| markdown.read(cx).context_menu_link().cloned())+ })+ });+ let selected_text = chunks.and_then(|chunks| {+ chunks.iter().find_map(|chunk| {+ let markdown = match chunk {+ AssistantMessageChunk::Message { block, .. } => block.markdown(),+ AssistantMessageChunk::Thought { block, .. } => block.markdown(),+ };+ markdown.and_then(|markdown| {+ markdown.read(cx).context_menu_selected_text().cloned()})})- .unwrap_or(false);-- let context_menu_link = chunks.and_then(|chunks| {+ });+ let selected_markdown = chunks.and_then(|chunks| {chunks.iter().find_map(|chunk| {- let md = match chunk {+ let markdown = match chunk {AssistantMessageChunk::Message { block, .. } => block.markdown(),AssistantMessageChunk::Thought { block, .. } => block.markdown(),};- md.and_then(|m| m.read(cx).context_menu_link().cloned())+ markdown.and_then(|markdown| {+ markdown.read(cx).context_menu_selected_markdown().cloned()+ })})});@@ -7649,11 +7656,24 @@ impl ThreadView {}).separator()})- .action_disabled_when(- !has_selection,- "Copy Selection",- Box::new(markdown::CopyAsMarkdown),- )+ .when_some(selected_text, |menu, selected_text| {+ menu.entry("Copy", Some(Box::new(markdown::Copy)), move |_, cx| {+ cx.write_to_clipboard(ClipboardItem::new_string(+ selected_text.to_string(),+ ));+ })+ })+ .when_some(selected_markdown, |menu, selected_markdown| {+ menu.entry(+ "Copy as Markdown",+ Some(Box::new(markdown::CopyAsMarkdown)),+ move |_, cx| {+ cx.write_to_clipboard(ClipboardItem::new_string(+ selected_markdown.to_string(),+ ));+ },+ )+ }).item(copy_this_agent_response).separator().item(scroll_item)diff --git a/docs/src/ai/agent-panel.md b/docs/src/ai/agent-panel.mdindex a26189de217..d659523f59a 100644--- a/docs/src/ai/agent-panel.md+++ b/docs/src/ai/agent-panel.md@@ -79,7 +79,8 @@ The checkpoint button appears even if you interrupt the thread midway through anRight-click on any agent response in the thread view to access a context menu with the following actions:-- **Copy Selection**: Copies the currently selected text as Markdown (available when text is selected).+- **Copy**: Copies the currently selected text as plain text (available when text is selected).+- **Copy as Markdown**: Copies the currently selected text as Markdown (available when text is selected).- **Copy This Agent Response**: Copies the full text of the agent response you right-clicked on.- **Scroll to Top / Scroll to Bottom**: Scrolls to the beginning or end of the thread, depending on your current position.- **Open Thread as Markdown**: Opens the entire thread as a Markdown file in a new tab.