Fixed review comments and changed the usage doc

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 text editor ($EDITOR)")
+		fmt.Fprintln(os.Stderr, "  Ctrl + x            Open prompt in your default text 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

@@ -57,8 +57,7 @@ func buildEditorCmd(filePath string) *exec.Cmd {
 
 	if shell {
 		// The editor string is the last element — append the file path to it
-		// so the shell interprets the full command.
-		args[len(args)-1] = fmt.Sprintf("%s %s", args[len(args)-1], filePath)
+		args[len(args)-1] = fmt.Sprintf("%s '%s'", args[len(args)-1], filePath)
 	} else {
 		args = append(args, filePath)
 	}

cmd/cli/readline/readline_unix.go

@@ -3,6 +3,7 @@
 package readline
 
 import (
+	"errors"
 	"syscall"
 )
 
@@ -28,7 +29,7 @@ func openInEditor(fd uintptr, termios any, content string) (string, error) {
 	edited, err := runEditor(content)
 
 	if _, restoreErr := SetRawMode(fd); restoreErr != nil {
-		return content, restoreErr
+		return content, errors.Join(err, restoreErr)
 	}
 
 	if err != nil {

cmd/cli/readline/readline_windows.go

@@ -1,5 +1,7 @@
 package readline
 
+import "errors"
+
 func handleCharCtrlZ(fd uintptr, state any) (string, error) {
 	// not supported
 	return "", nil
@@ -15,7 +17,7 @@ func openInEditor(fd uintptr, termios any, content string) (string, error) {
 	edited, err := runEditor(content)
 
 	if _, restoreErr := SetRawMode(fd); restoreErr != nil {
-		return content, restoreErr
+		return content, errors.Join(err, restoreErr)
 	}
 
 	if err != nil {