fix: open prompt editor from terminal input right-click

app/src/terminal/input/classic.rs

@@ -12,6 +12,7 @@ use crate::{
                 add_command_xray_overlay, add_input_suggestions_overlays, add_vim_status_to_stack,
                 add_voltron_overlay, add_workflow_info_overlay,
                 should_show_terminal_input_message_bar,
+                wrap_input_with_prompt_context_menu_handler,
                 wrap_input_with_terminal_padding_and_focus_handler,
             },
             get_input_box_top_border_width, InputDropTargetData,
@@ -276,6 +277,7 @@ impl Input {
             InputDropTargetData::new(self.weak_view_handle.clone()),
         )
         .finish();
+        let drop_target = wrap_input_with_prompt_context_menu_handler(self.view_id, drop_target);
 
         let input = SavePosition::new(
             Hoverable::new(self.hoverable_handle.clone(), |_| drop_target)

app/src/terminal/input/cli_agent.rs

@@ -1,5 +1,8 @@
 use super::{
-    common::{add_input_suggestions_overlays, wrap_input_with_terminal_padding_and_focus_handler},
+    common::{
+        add_input_suggestions_overlays, wrap_input_with_prompt_context_menu_handler,
+        wrap_input_with_terminal_padding_and_focus_handler,
+    },
     Input, InputAction, InputDropTargetData, CLI_AGENT_RICH_INPUT_EDITOR_BOTTOM_PADDING,
     CLI_AGENT_RICH_INPUT_EDITOR_MAX_HEIGHT, CLI_AGENT_RICH_INPUT_EDITOR_TOP_PADDING,
     TERMINAL_VIEW_PADDING_LEFT,
@@ -115,6 +118,7 @@ impl Input {
             InputDropTargetData::new(self.weak_view_handle.clone()),
         )
         .finish();
+        let drop_target = wrap_input_with_prompt_context_menu_handler(self.view_id, drop_target);
 
         let input = SavePosition::new(
             Hoverable::new(self.hoverable_handle.clone(), |_| drop_target)

app/src/terminal/input/common.rs

@@ -16,7 +16,7 @@ use crate::{
     ui_components::icons::Icon,
     workspaces::user_workspaces::UserWorkspaces,
 };
-use pathfinder_geometry::vector::vec2f;
+use pathfinder_geometry::vector::{vec2f, Vector2F};
 use vim::vim::{VimMode, VimState};
 use warp_completer::completer::Description;
 use warp_core::features::FeatureFlag;
@@ -30,7 +30,7 @@ use warpui::{
     fonts::Weight,
     presenter::ChildView,
     ui_components::components::{UiComponent, UiComponentStyles},
-    AppContext, EntityId, SingletonEntity, ViewHandle,
+    AppContext, EntityId, EventContext, SingletonEntity, ViewHandle,
 };
 
 /// Whether the terminal input message bar should be shown.
@@ -161,6 +161,33 @@ pub(super) fn wrap_input_with_terminal_padding_and_focus_handler(
     }
 }
 
+pub(super) fn wrap_input_with_prompt_context_menu_handler(
+    view_id: EntityId,
+    child: Box<dyn Element>,
+) -> Box<dyn Element> {
+    EventHandler::new(child)
+        .on_right_mouse_down(move |ctx, _, position| {
+            open_prompt_context_menu_from_input_surface(view_id, position, ctx)
+        })
+        .finish()
+}
+
+fn open_prompt_context_menu_from_input_surface(
+    view_id: EntityId,
+    position: Vector2F,
+    ctx: &mut EventContext,
+) -> DispatchEventResult {
+    let position_id = format!("prompt_area_{view_id}");
+    let Some(prompt_rect) = ctx.element_position_by_id(&position_id) else {
+        return DispatchEventResult::PropagateToParent;
+    };
+
+    ctx.dispatch_typed_action(TerminalAction::PromptContextMenu {
+        position_offset_from_prompt: position - prompt_rect.origin(),
+    });
+    DispatchEventResult::StopPropagation
+}
+
 /// Renders the selected workflow info overlay over the input.
 pub(super) fn add_workflow_info_overlay(
     stack: &mut Stack,

app/src/terminal/input/terminal.rs

@@ -2,6 +2,7 @@ use super::{
     common::{
         add_command_xray_overlay, add_input_suggestions_overlays, add_voltron_overlay,
         add_workflow_info_overlay, should_show_terminal_input_message_bar,
+        wrap_input_with_prompt_context_menu_handler,
         wrap_input_with_terminal_padding_and_focus_handler,
     },
     Input, InputAction, InputDropTargetData,
@@ -146,6 +147,7 @@ impl Input {
             InputDropTargetData::new(self.weak_view_handle.clone()),
         )
         .finish();
+        let drop_target = wrap_input_with_prompt_context_menu_handler(self.view_id, drop_target);
 
         let hoverable_input = Hoverable::new(self.hoverable_handle.clone(), |_| drop_target)
             .on_hover(|is_hovered, ctx, _app, _position| {

app/src/terminal/input/universal.rs

@@ -25,6 +25,7 @@ use super::{
     common::{
         add_command_xray_overlay, add_input_suggestions_overlays, add_vim_status_to_stack,
         add_voltron_overlay, add_workflow_info_overlay, maybe_add_buy_credits_banner,
+        wrap_input_with_prompt_context_menu_handler,
         wrap_input_with_terminal_padding_and_focus_handler,
     },
     Input,
@@ -201,6 +202,7 @@ impl Input {
             InputDropTargetData::new(self.weak_view_handle.clone()),
         )
         .finish();
+        let drop_target = wrap_input_with_prompt_context_menu_handler(self.view_id, drop_target);
 
         let input = Hoverable::new(self.hoverable_handle.clone(), |_| drop_target)
             .on_hover(|is_hovered, ctx, _app, _position| {

app/src/terminal/view.rs

@@ -1464,6 +1464,7 @@ pub enum InputContextMenuAction {
     AskWarpAI,
     SaveAsWorkflow,
     ToggleInputHintText,
+    EditPrompt,
 }
 
 /// Where a user's question for AI originated. Handled by blocklist AI if the feature flag is
@@ -1549,6 +1550,7 @@ impl fmt::Debug for InputContextMenuAction {
             AskWarpAI => f.write_str("AskWarpAI"),
             SaveAsWorkflow => f.write_str("SaveAsWorkflow"),
             ToggleInputHintText => f.write_str("ToggleInputHintText"),
+            EditPrompt => f.write_str("EditPrompt"),
         }
     }
 }
@@ -15917,15 +15919,15 @@ impl TerminalView {
             ]);
         }
 
-        // Section 4: input hint text toggle
+        // Section 4: input customization
+        items.push(MenuItem::Separator);
         if !is_editor_disabled {
             let input_settings = InputSettings::as_ref(ctx);
             let inverse_action = if *input_settings.show_hint_text {
                 "Hide"
             } else {
                 "Show"
             };
-            items.push(MenuItem::Separator);
             items.push(
                 MenuItemFields::new(format!("{inverse_action} input hint text"))
                     .with_on_select_action(TerminalAction::InputContextMenuItem(
@@ -15934,6 +15936,14 @@ impl TerminalView {
                     .into_item(),
             );
         }
+        items.push(
+            MenuItemFields::new("Edit prompt")
+                .with_on_select_action(TerminalAction::InputContextMenuItem(
+                    InputContextMenuAction::EditPrompt,
+                ))
+                .with_disabled(is_editor_disabled)
+                .into_item(),
+        );
         // Section 5: All Pane related
         let current_shell = model.shell_launch_state().available_shell();
         let pane_context_menu_items = self.pane_context_menu_items(current_shell, ctx);
@@ -23149,6 +23159,7 @@ impl TerminalView {
             ShowAICommandSearch => self.ai_command_search_from_input(ctx),
             SaveAsWorkflow => self.save_as_workflow_from_input(ctx),
             ToggleInputHintText => self.toggle_input_hint_text(ctx),
+            EditPrompt => self.edit_prompt(ctx),
         }
         self.close_context_menu(ctx, false);
     }

app/src/terminal/view_test.rs

@@ -2971,6 +2971,24 @@ fn test_prompt_context_menu_items_for_no_context_chips() {
     })
 }
 
+#[test]
+fn test_input_context_menu_items_include_edit_prompt() {
+    App::test((), |mut app| async move {
+        initialize_app_for_terminal_view(&mut app);
+        let terminal = add_window_with_terminal(&mut app, None);
+
+        terminal.update(&mut app, |view, ctx| {
+            let labels = view
+                .input_context_menu_items(ctx)
+                .into_iter()
+                .filter_map(|item| item.fields().map(|fields| fields.label().to_owned()))
+                .collect::<Vec<_>>();
+
+            assert!(labels.contains(&"Edit prompt".to_owned()));
+        });
+    })
+}
+
 #[test]
 fn test_prompt_context_menu_items_for_agent_toolbelt_flag() {
     let _agent_view_guard = FeatureFlag::AgentView.override_enabled(true);