Merge pull request #1057 from dgageot/editor

Implement ctrl-G to open prompt in editor

Author: rumpl

pkg/tui/components/editor/editor.go

@@ -38,6 +38,10 @@ type Editor interface {
 	layout.Focusable
 	SetWorking(working bool) tea.Cmd
 	AcceptSuggestion() bool
+	// Value returns the current editor content
+	Value() string
+	// SetValue updates the editor content
+	SetValue(content string)
 }
 
 // editor implements [Editor]
@@ -497,6 +501,19 @@ func (e *editor) SetWorking(working bool) tea.Cmd {
 	return nil
 }
 
+// Value returns the current editor content
+func (e *editor) Value() string {
+	return e.textarea.Value()
+}
+
+// SetValue updates the editor content and moves cursor to end
+func (e *editor) SetValue(content string) {
+	e.textarea.SetValue(content)
+	e.textarea.MoveToEnd()
+	e.userTyped = content != ""
+	e.refreshSuggestion()
+}
+
 // tryAddFileRef checks if word is a valid @filepath and adds it to fileRefs.
 // Called when cursor leaves a word to detect manually-typed file references.
 func (e *editor) tryAddFileRef(word string) {

pkg/tui/page/chat/chat.go

@@ -88,10 +88,11 @@ type chatPage struct {
 
 // KeyMap defines key bindings for the chat page
 type KeyMap struct {
-	Tab          key.Binding
-	Cancel       key.Binding
-	ShiftNewline key.Binding
-	CtrlJ        key.Binding
+	Tab            key.Binding
+	Cancel         key.Binding
+	ShiftNewline   key.Binding
+	CtrlJ          key.Binding
+	ExternalEditor key.Binding
 }
 
 // defaultKeyMap returns the default key bindings
@@ -110,6 +111,10 @@ func defaultKeyMap() KeyMap {
 			key.WithKeys("shift+enter", "ctrl+j"),
 			key.WithHelp("shift+enter / ctrl+j", "newline"),
 		),
+		ExternalEditor: key.NewBinding(
+			key.WithKeys("ctrl+g"),
+			key.WithHelp("ctrl+g", "edit in $EDITOR"),
+		),
 	}
 }
 
@@ -215,6 +220,10 @@ func (p *chatPage) Update(msg tea.Msg) (layout.Model, tea.Cmd) {
 			// Cancel current message processing if active
 			cmd := p.cancelStream(true)
 			return p, cmd
+		case key.Matches(msg, p.keyMap.ExternalEditor):
+			// Open external editor with current editor content
+			cmd := p.openExternalEditor()
+			return p, cmd
 		}
 
 		// Route other keys to focused component
@@ -263,6 +272,7 @@ func (p *chatPage) Update(msg tea.Msg) (layout.Model, tea.Cmd) {
 		slog.Debug(msg.Content)
 		cmd := p.processMessage(msg)
 		return p, cmd
+
 	case messages.StreamCancelledMsg:
 		model, cmd := p.messages.Update(msg)
 		p.messages = model.(messages.Model)
@@ -536,6 +546,7 @@ func (p *chatPage) Bindings() []key.Binding {
 		p.keyMap.Cancel,
 		// show newline hints in the global footer
 		p.keyMap.ShiftNewline,
+		p.keyMap.ExternalEditor,
 	}
 
 	if p.focusedPanel == PanelChat {

pkg/tui/page/chat/editor.go

@@ -0,0 +1,92 @@
+package chat
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+	"runtime"
+	"strings"
+
+	tea "charm.land/bubbletea/v2"
+
+	"github.com/docker/cagent/pkg/tui/components/notification"
+	"github.com/docker/cagent/pkg/tui/core"
+)
+
+// openExternalEditor opens the current editor content in an external editor.
+// It suspends the TUI, runs the editor, and returns the result.
+func (p *chatPage) openExternalEditor() tea.Cmd {
+	content := p.editor.Value()
+
+	// Create a temporary file with the current content
+	tmpFile, err := os.CreateTemp("", "cagent-*.md")
+	if err != nil {
+		return core.CmdHandler(notification.ShowMsg{
+			Text: fmt.Sprintf("Failed to create temp file: %v", err),
+			Type: notification.TypeError,
+		})
+	}
+	tmpPath := tmpFile.Name()
+
+	if _, err := tmpFile.WriteString(content); err != nil {
+		tmpFile.Close()
+		os.Remove(tmpPath)
+		return core.CmdHandler(notification.ShowMsg{
+			Text: fmt.Sprintf("Failed to write temp file: %v", err),
+			Type: notification.TypeError,
+		})
+	}
+	tmpFile.Close()
+
+	// Get the editor command (VISUAL, EDITOR, or platform default)
+	editorCmd := os.Getenv("VISUAL")
+	if editorCmd == "" {
+		editorCmd = os.Getenv("EDITOR")
+	}
+	if editorCmd == "" {
+		if runtime.GOOS == "windows" {
+			editorCmd = "notepad"
+		} else {
+			editorCmd = "vim"
+		}
+	}
+
+	// Parse editor command (may include arguments like "code --wait")
+	parts := strings.Fields(editorCmd)
+	args := append(parts[1:], tmpPath)
+	cmd := exec.Command(parts[0], args...)
+
+	// Use tea.ExecProcess to properly suspend the TUI and run the editor
+	return tea.ExecProcess(cmd, func(err error) tea.Msg {
+		if err != nil {
+			os.Remove(tmpPath)
+			return core.CmdHandler(notification.ShowMsg{
+				Type: notification.TypeError,
+				Text: fmt.Sprintf("Editor error: %v", err),
+			})
+		}
+
+		updatedContent, readErr := os.ReadFile(tmpPath)
+		os.Remove(tmpPath)
+
+		if readErr != nil {
+			return core.CmdHandler(notification.ShowMsg{
+				Text: fmt.Sprintf("Failed to read edited file: %v", readErr),
+				Type: notification.TypeError,
+			})
+		}
+
+		// Trim trailing newline that editors often add
+		content := strings.TrimSuffix(string(updatedContent), "\n")
+
+		// If content is empty, just clear the editor
+		if strings.TrimSpace(content) == "" {
+			p.editor.SetValue("")
+			return nil
+		}
+
+		// Clear the editor and automatically submit the content
+		p.editor.SetValue(content)
+		return nil
+	})
+}