Merge pull request #1124 from rumpl/fix-copy

Fix copying utf8

Author: rumpl

pkg/tui/components/messages/messages.go

@@ -841,11 +841,14 @@ func (m *model) copySelectionToClipboard() tea.Cmd {
 		return nil
 	}
 
-	if err := clipboard.WriteAll(selectedText); err != nil {
-		return core.CmdHandler(notification.ShowMsg{Text: "Failed to copy: " + err.Error(), Type: notification.TypeError})
-	}
-
-	return core.CmdHandler(notification.ShowMsg{Text: "Text copied to clipboard"})
+	return tea.Sequence(
+		tea.SetClipboard(selectedText),
+		func() tea.Msg {
+			_ = clipboard.WriteAll(selectedText)
+			return nil
+		},
+		notification.SuccessCmd("Text copied to clipboard."),
+	)
 }
 
 func (m *model) clearSelection() {

pkg/tui/components/notification/notification.go

@@ -8,6 +8,7 @@ import (
 	tea "charm.land/bubbletea/v2"
 	"charm.land/lipgloss/v2"
 
+	"github.com/docker/cagent/pkg/tui/core"
 	"github.com/docker/cagent/pkg/tui/styles"
 )
 
@@ -38,6 +39,27 @@ type HideMsg struct {
 	ID uint64 // If 0, hides all notifications (backward compatibility)
 }
 
+func SuccessCmd(text string) tea.Cmd {
+	return core.CmdHandler(ShowMsg{
+		Text: text,
+		Type: TypeSuccess,
+	})
+}
+
+func WarningCmd(text string) tea.Cmd {
+	return core.CmdHandler(ShowMsg{
+		Text: text,
+		Type: TypeWarning,
+	})
+}
+
+func ErrorCmd(text string) tea.Cmd {
+	return core.CmdHandler(ShowMsg{
+		Text: text,
+		Type: TypeError,
+	})
+}
+
 // notificationItem represents a single notification
 type notificationItem struct {
 	ID       uint64

pkg/tui/page/chat/chat.go

@@ -305,8 +305,7 @@ func (p *chatPage) Update(msg tea.Msg) (layout.Model, tea.Cmd) {
 		cmd := p.messages.AddShellOutputMessage(msg.Output)
 		return p, cmd
 	case *runtime.WarningEvent:
-		cmd := core.CmdHandler(notification.ShowMsg{Text: msg.Message, Type: notification.TypeWarning})
-		return p, cmd
+		return p, notification.WarningCmd(msg.Message)
 	case *runtime.RAGIndexingStartedEvent, *runtime.RAGIndexingProgressEvent, *runtime.RAGIndexingCompletedEvent:
 		// Forward RAG events to sidebar
 		slog.Debug("Chat page forwarding RAG event to sidebar", "event_type", fmt.Sprintf("%T", msg))

pkg/tui/page/chat/editor.go

@@ -10,7 +10,6 @@ import (
 	tea "charm.land/bubbletea/v2"
 
 	"github.com/docker/cagent/pkg/tui/components/notification"
-	"github.com/docker/cagent/pkg/tui/core"
 )
 
 // editorDoneMsg is sent when the external editor finishes to trigger a TUI refresh.
@@ -24,20 +23,14 @@ func (p *chatPage) openExternalEditor() tea.Cmd {
 	// 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,
-		})
+		return notification.ErrorCmd(fmt.Sprintf("Failed to create temp file: %v", err))
 	}
 	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,
-		})
+		return notification.ErrorCmd(fmt.Sprintf("Failed to write temp file: %v", err))
 	}
 	tmpFile.Close()
 
@@ -63,20 +56,14 @@ func (p *chatPage) openExternalEditor() tea.Cmd {
 	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),
-			})
+			return notification.ErrorCmd(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,
-			})
+			return notification.ErrorCmd(fmt.Sprintf("Failed to read edited file: %v", readErr))
 		}
 
 		// Trim trailing newline that editors often add

pkg/tui/tui.go

@@ -210,22 +210,25 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 
 	case messages.EvalSessionMsg:
 		evalFile, _ := evaluation.Save(a.application.Session(), msg.Filename)
-		return a, core.CmdHandler(notification.ShowMsg{Text: fmt.Sprintf("Eval saved to file %s", evalFile)})
+		return a, notification.SuccessCmd(fmt.Sprintf("Eval saved to file %s", evalFile))
 
 	case messages.CompactSessionMsg:
 		return a, a.chatPage.CompactSession()
 
 	case messages.CopySessionToClipboardMsg:
 		transcript := a.application.PlainTextTranscript()
 		if transcript == "" {
-			return a, core.CmdHandler(notification.ShowMsg{Text: "Conversation is empty; nothing copied."})
+			return a, notification.SuccessCmd("Conversation is empty; nothing copied.")
 		}
 
-		if err := clipboard.WriteAll(transcript); err != nil {
-			return a, core.CmdHandler(notification.ShowMsg{Text: "Failed to copy conversation: " + err.Error(), Type: notification.TypeError})
-		}
-
-		return a, core.CmdHandler(notification.ShowMsg{Text: "Conversation copied to clipboard."})
+		return a, tea.Sequence(
+			tea.SetClipboard(transcript),
+			func() tea.Msg {
+				_ = clipboard.WriteAll(transcript)
+				return nil
+			},
+			notification.SuccessCmd("Conversation copied to clipboard."),
+		)
 
 	case messages.ToggleYoloMsg:
 		sess := a.application.Session()
@@ -236,7 +239,7 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		} else {
 			statusText = "Yolo mode disabled: tools will require confirmation"
 		}
-		return a, core.CmdHandler(notification.ShowMsg{Text: statusText})
+		return a, notification.SuccessCmd(statusText)
 
 	case messages.AgentCommandMsg:
 		resolvedCommand := a.application.ResolveCommand(context.Background(), msg.Command)
@@ -246,7 +249,7 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		// Convert the interface{} back to mcptools.PromptInfo
 		promptInfo, ok := msg.PromptInfo.(mcptools.PromptInfo)
 		if !ok {
-			return a, core.CmdHandler(notification.ShowMsg{Text: "Invalid prompt info"})
+			return a, notification.ErrorCmd("Invalid prompt info")
 		}
 		// Show the MCP prompt input dialog
 		return a, core.CmdHandler(dialog.OpenDialogMsg{
@@ -258,7 +261,7 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		promptContent, err := a.application.ExecuteMCPPrompt(context.Background(), msg.PromptName, msg.Arguments)
 		if err != nil {
 			errorMsg := fmt.Sprintf("Error executing MCP prompt '%s': %v", msg.PromptName, err)
-			return a, core.CmdHandler(notification.ShowMsg{Text: errorMsg})
+			return a, notification.ErrorCmd(errorMsg)
 		}
 		return a, core.CmdHandler(editor.SendMsg{Content: promptContent})