feat(chat): Add /ed command to compose prompts in text editor (#1035)

* feat(chat): Add /ed command to compose prompts in text editor

Implement the /ed command that opens the user's preferred editor to
compose a prompt. The content is automatically submitted when the
editor closes, improving the user experience for longer prompts.

Fixes #1029

🤖 Assisted by [Amazon Q Developer](https://aws.amazon.com/q/developer)

* refactor(chat): Remove /ed command from masthead text

Keep the /ed command in the help text but remove it from the masthead
to avoid overloading users with too many commands when they are getting
started.

🤖 Assisted by [Amazon Q Developer](https://aws.amazon.com/q/developer)

* refactor(chat): Improve editor command naming and help text

Rename command from /ed to /editor and improve the help text to clarify
that vi is used as the default editor when nvim is not set. Keep the
function name as open_editor for better code readability.

🤖 Assisted by [Amazon Q Developer](https://aws.amazon.com/q/developer)

* refactor(chat): Change /ed command to /editor for clarity

This change renames the /ed command to /editor in the command list to make
its purpose more clear to users. The longer name is more descriptive and
easier to understand for new users.

🤖 Assisted by [Amazon Q Developer](https://aws.amazon.com/q/developer)

* refactor(q_cli): Convert open_editor to associated function

Remove unused self parameter from open_editor method and update call site
to use Self::open_editor() instead of self.open_editor().

🤖 Assisted by [Amazon Q Developer](https://aws.amazon.com/q/developer)

* feat(chat): Enhance editor command to accept initial text

Allow users to provide initial text with the /editor command that will
be pre-populated in the editor. Also remove the default template text
to provide a cleaner editing experience.

This commit also fixes compilation errors by adding the missing
pending_tool_index field to ChatState initializers in the editor
command handling code.

🤖 Assisted by [Amazon Q Developer](https://aws.amazon.com/q/developer)

* style: Fix code formatting for editor command

Update the formatting of the PromptEditor struct initialization to match
Rust style guidelines. This fixes the cargo +nightly fmt check.

🤖 Assisted by [Amazon Q Developer](https://aws.amazon.com/q/developer)

---------

Co-authored-by: Enrico Carlesso <[email protected]>

Author: carlesso

crates/q_cli/src/cli/chat/command.rs

@@ -17,6 +17,7 @@ pub enum Command {
     Quit,
     Profile { subcommand: ProfileSubcommand },
     Context { subcommand: ContextSubcommand },
+    PromptEditor { initial_text: Option<String> },
     Tools { subcommand: Option<ToolsSubcommand> },
 }
 
@@ -232,6 +233,15 @@ impl Command {
                         subcommand: Some(ToolsSubcommand::TrustAll),
                     }
                 },
+                "editor" => {
+                    if parts.len() > 1 {
+                        Self::PromptEditor {
+                            initial_text: Some(parts[1..].join(" ")),
+                        }
+                    } else {
+                        Self::PromptEditor { initial_text: None }
+                    }
+                },
                 "issue" => {
                     if parts.len() > 1 {
                         Self::Issue {

crates/q_cli/src/cli/chat/input_source.rs

@@ -53,6 +53,15 @@ impl InputSource {
             },
         }
     }
+
+    // We're keeping this method for potential future use
+    #[allow(dead_code)]
+    pub fn set_buffer(&mut self, content: &str) {
+        if let inner::Inner::Readline(rl) = &mut self.0 {
+            // Add to history so user can access it with up arrow
+            let _ = rl.add_history_entry(content);
+        }
+    }
 }
 
 #[cfg(test)]

crates/q_cli/src/cli/chat/mod.rs

@@ -16,9 +16,16 @@ use std::io::{
     Read,
     Write,
 };
-use std::process::ExitCode;
+use std::process::{
+    Command as ProcessCommand,
+    ExitCode,
+};
 use std::sync::Arc;
 use std::time::Duration;
+use std::{
+    env,
+    fs,
+};
 
 use command::{
     Command,
@@ -85,6 +92,7 @@ use tracing::{
     trace,
     warn,
 };
+use uuid::Uuid;
 use winnow::Partial;
 use winnow::stream::Offset;
 
@@ -122,6 +130,7 @@ const HELP_TEXT: &str = color_print::cstr! {"
 <cyan,em>Commands:</cyan,em>
 <em>/clear</em>        <black!>Clear the conversation history</black!>
 <em>/issue</em>        <black!>Report an issue or make a feature request</black!>
+<em>/editor</em>       <black!>Open $EDITOR (defaults to vi) to compose a prompt</black!>
 <em>/help</em>         <black!>Show this help dialogue</black!>
 <em>/quit</em>         <black!>Quit the application</black!>
 <em>/tools</em>        <black!>View and manage tools and permissions</black!>
@@ -418,6 +427,41 @@ impl<W> ChatContext<W>
 where
     W: Write,
 {
+    /// Opens the user's preferred editor to compose a prompt
+    fn open_editor(initial_text: Option<String>) -> Result<String, ChatError> {
+        // Create a temporary file with a unique name
+        let temp_dir = std::env::temp_dir();
+        let file_name = format!("q_prompt_{}.md", Uuid::new_v4());
+        let temp_file_path = temp_dir.join(file_name);
+
+        // Get the editor from environment variable or use a default
+        let editor = env::var("EDITOR").unwrap_or_else(|_| "vi".to_string());
+
+        // Write initial content to the file if provided
+        let initial_content = initial_text.unwrap_or_default();
+        fs::write(&temp_file_path, &initial_content)
+            .map_err(|e| ChatError::Custom(format!("Failed to create temporary file: {}", e).into()))?;
+
+        // Open the editor
+        let status = ProcessCommand::new(editor)
+            .arg(&temp_file_path)
+            .status()
+            .map_err(|e| ChatError::Custom(format!("Failed to open editor: {}", e).into()))?;
+
+        if !status.success() {
+            return Err(ChatError::Custom("Editor exited with non-zero status".into()));
+        }
+
+        // Read the content back
+        let content = fs::read_to_string(&temp_file_path)
+            .map_err(|e| ChatError::Custom(format!("Failed to read temporary file: {}", e).into()))?;
+
+        // Clean up the temporary file
+        let _ = fs::remove_file(&temp_file_path);
+
+        Ok(content.trim().to_string())
+    }
+
     async fn try_chat(&mut self) -> Result<()> {
         if self.interactive && self.settings.get_bool_or("chat.greeting.enabled", true) {
             execute!(self.output, style::Print(WELCOME_TEXT))?;
@@ -780,6 +824,64 @@ where
                     pending_tool_index,
                 }
             },
+            Command::PromptEditor { initial_text } => {
+                match Self::open_editor(initial_text) {
+                    Ok(content) => {
+                        if content.trim().is_empty() {
+                            execute!(
+                                self.output,
+                                style::SetForegroundColor(Color::Yellow),
+                                style::Print("\nEmpty content from editor, not submitting.\n\n"),
+                                style::SetForegroundColor(Color::Reset)
+                            )?;
+
+                            ChatState::PromptUser {
+                                tool_uses: Some(tool_uses),
+                                pending_tool_index,
+                                skip_printing_tools: true,
+                            }
+                        } else {
+                            execute!(
+                                self.output,
+                                style::SetForegroundColor(Color::Green),
+                                style::Print("\nContent loaded from editor. Submitting prompt...\n\n"),
+                                style::SetForegroundColor(Color::Reset)
+                            )?;
+
+                            // Display the content as if the user typed it
+                            execute!(
+                                self.output,
+                                style::SetForegroundColor(Color::Magenta),
+                                style::Print("> "),
+                                style::SetAttribute(Attribute::Reset),
+                                style::Print(&content),
+                                style::Print("\n")
+                            )?;
+
+                            // Process the content as user input
+                            ChatState::HandleInput {
+                                input: content,
+                                tool_uses: Some(tool_uses),
+                                pending_tool_index,
+                            }
+                        }
+                    },
+                    Err(e) => {
+                        execute!(
+                            self.output,
+                            style::SetForegroundColor(Color::Red),
+                            style::Print(format!("\nError opening editor: {}\n\n", e)),
+                            style::SetForegroundColor(Color::Reset)
+                        )?;
+
+                        ChatState::PromptUser {
+                            tool_uses: Some(tool_uses),
+                            pending_tool_index,
+                            skip_printing_tools: true,
+                        }
+                    },
+                }
+            },
             Command::Quit => ChatState::Exit,
             Command::Profile { subcommand } => {
                 if let Some(context_manager) = &mut self.conversation_state.context_manager {
@@ -1886,4 +1988,19 @@ mod tests {
 
         assert_eq!(ctx.fs().read_to_string("/file.txt").await.unwrap(), "Hello, world!\n");
     }
+
+    #[test]
+    fn test_editor_content_processing() {
+        // Since we no longer have template replacement, this test is simplified
+        let cases = vec![
+            ("My content", "My content"),
+            ("My content with newline\n", "My content with newline"),
+            ("", ""),
+        ];
+
+        for (input, expected) in cases {
+            let processed = input.trim().to_string();
+            assert_eq!(processed, expected.trim().to_string(), "Failed for input: {}", input);
+        }
+    }
 }

crates/q_cli/src/cli/chat/prompt.rs

@@ -38,6 +38,7 @@ use winnow::stream::AsChar;
 const COMMANDS: &[&str] = &[
     "/clear",
     "/help",
+    "/editor",
     "/issue",
     // "/acceptall", /// Functional, but deprecated in favor of /tools trustall
     "/quit",