fix(chat): Parse EDITOR env var to support arguments (#1209)

The /editor command now properly parses the EDITOR environment variable
to handle cases where it contains arguments (like 'code -w'). This fixes
issue #1208 where the command would fail when EDITOR contained spaces.

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

Author: carlesso

Cargo.lock

@@ -55,7 +55,6 @@ semver.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 shell-color.workspace = true
-shell-words = "1.1"
 shellexpand = "3.1.0"
 shlex.workspace = true
 sysinfo.workspace = true

crates/figterm/Cargo.toml

@@ -221,7 +221,7 @@ impl CommandBuilder {
                 .ok_or_else(|| anyhow::anyhow!("argument cannot be represented as utf8"))?;
             strs.push(s);
         }
-        Ok(shell_words::join(strs))
+        shlex::try_join(strs).map_err(|e| anyhow::anyhow!("Failed to join command arguments: {}", e))
     }
 }
 

crates/figterm/src/pty/cmdbuilder.rs

@@ -493,15 +493,31 @@ where
         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());
+        let editor_cmd = env::var("EDITOR").unwrap_or_else(|_| "vi".to_string());
+
+        // Parse the editor command to handle arguments
+        let mut parts =
+            shlex::split(&editor_cmd).ok_or_else(|| ChatError::Custom("Failed to parse EDITOR command".into()))?;
+
+        if parts.is_empty() {
+            return Err(ChatError::Custom("EDITOR environment variable is empty".into()));
+        }
+
+        let editor_bin = parts.remove(0);
 
         // 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)
+        // Open the editor with the parsed command and arguments
+        let mut cmd = ProcessCommand::new(editor_bin);
+        // Add any arguments that were part of the EDITOR variable
+        for arg in parts {
+            cmd.arg(arg);
+        }
+        // Add the file path as the last argument
+        let status = cmd
             .arg(&temp_file_path)
             .status()
             .map_err(|e| ChatError::Custom(format!("Failed to open editor: {}", e).into()))?;