addressing review comments

Author: sathiraumesh

cmd/cli/commands/run.go

@@ -132,7 +132,7 @@ func generateInteractiveWithReadline(cmd *cobra.Command, desktopClient *desktop.
 		fmt.Fprintln(os.Stderr, "  Ctrl + w            Delete the word before the cursor")
 		fmt.Fprintln(os.Stderr, "")
 		fmt.Fprintln(os.Stderr, "  Ctrl + l            Clear the screen")
-		fmt.Fprintln(os.Stderr, "  Ctrl + x            Open prompt in default system text editor")
+		fmt.Fprintln(os.Stderr, "  Ctrl + x            Open prompt in text editor ($EDITOR)")
 		fmt.Fprintln(os.Stderr, "  Ctrl + c            Stop the model from responding")
 		fmt.Fprintln(os.Stderr, "  Ctrl + d            Exit (/bye)")
 		fmt.Fprintln(os.Stderr, "")

cmd/cli/readline/editor.go

@@ -3,6 +3,7 @@ package readline
 import (
 	"os"
 	"os/exec"
+	"runtime"
 	"strings"
 )
 
@@ -19,18 +20,7 @@ func runEditor(content string, defaultEditor string) (string, error) {
 	}
 	tmpFile.Close()
 
-	editor := strings.TrimSpace(os.Getenv("EDITOR"))
-	if editor == "" {
-		editor = defaultEditor
-	}
-
-	// handle for env variables set with args
-	parts := strings.Fields(editor)
-	args := append(parts[1:], tmpFile.Name())
-	cmd := exec.Command(parts[0], args...)
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
+	cmd := buildEditorCmd(defaultEditor, tmpFile.Name())
 	if err := cmd.Run(); err != nil {
 		return content, err
 	}
@@ -42,3 +32,23 @@ func runEditor(content string, defaultEditor string) (string, error) {
 
 	return string(edited), nil
 }
+
+func buildEditorCmd(defaultEditor string, filePath string) *exec.Cmd {
+	editor := strings.TrimSpace(os.Getenv("EDITOR"))
+	if editor == "" {
+		editor = defaultEditor
+	}
+
+	var cmd *exec.Cmd
+	if runtime.GOOS == "windows" {
+		parts := strings.Fields(editor)
+		args := append(parts[1:], filePath)
+		cmd = exec.Command(parts[0], args...)
+	} else {
+		cmd = exec.Command("sh", "-c", editor+" \"$1\"", "--", filePath)
+	}
+	cmd.Stdin = os.Stdin
+	cmd.Stdout = os.Stdout
+	cmd.Stderr = os.Stderr
+	return cmd
+}

cmd/cli/readline/readline_unix.go

@@ -26,13 +26,15 @@ func openInEditor(fd uintptr, termios any, content string) (string, error) {
 	}
 
 	edited, err := runEditor(content, "vi")
-	if err != nil {
-		SetRawMode(fd)
-		return content, err
+
+	// Always restore raw mode using the original termios, whether the editor
+	// succeeded or failed, so the terminal returns to its previous configuration.
+	if _, restoreErr := SetRawMode(fd); restoreErr != nil {
+		return content, restoreErr
 	}
 
-	if _, err := SetRawMode(fd); err != nil {
-		return edited, err
+	if err != nil {
+		return content, err
 	}
 
 	return edited, nil

cmd/cli/readline/readline_windows.go

@@ -13,13 +13,15 @@ func openInEditor(fd uintptr, termios any, content string) (string, error) {
 	}
 
 	edited, err := runEditor(content, "notepad")
-	if err != nil {
-		SetRawMode(fd)
-		return content, err
+
+	// Always restore raw mode using the original state, whether the editor
+	// succeeded or failed, so the terminal returns to its previous configuration.
+	if _, restoreErr := SetRawMode(fd); restoreErr != nil {
+		return content, restoreErr
 	}
 
-	if _, err := SetRawMode(fd); err != nil {
-		return edited, err
+	if err != nil {
+		return content, err
 	}
 
 	return edited, nil