Merge pull request #1427 from dgageot/more-tui-cleanup

More tui cleanup

Author: rumpl

pkg/app/app.go

@@ -13,12 +13,15 @@ import (
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 
 	"github.com/docker/cagent/pkg/app/export"
+	"github.com/docker/cagent/pkg/app/transcript"
 	"github.com/docker/cagent/pkg/chat"
+	"github.com/docker/cagent/pkg/cli"
 	"github.com/docker/cagent/pkg/config/types"
 	"github.com/docker/cagent/pkg/runtime"
 	"github.com/docker/cagent/pkg/session"
 	"github.com/docker/cagent/pkg/tools"
 	mcptools "github.com/docker/cagent/pkg/tools/mcp"
+	"github.com/docker/cagent/pkg/tui/messages"
 )
 
 type App struct {
@@ -87,18 +90,26 @@ func New(ctx context.Context, rt runtime.Runtime, sess *session.Session, opts ..
 	return app
 }
 
-func (a *App) FirstMessage() *string {
-	return a.firstMessage
-}
+func (a *App) SendFirstMessage() tea.Cmd {
+	if a.firstMessage == nil {
+		return nil
+	}
 
-// FirstMessageAttachment returns the attachment path for the first message.
-func (a *App) FirstMessageAttachment() string {
-	return a.firstMessageAttach
-}
+	return func() tea.Msg {
+		// Use the shared PrepareUserMessage function for consistent attachment handling
+		userMsg := cli.PrepareUserMessage(context.Background(), a.runtime, *a.firstMessage, a.firstMessageAttach)
 
-// Runtime returns the runtime for this app.
-func (a *App) Runtime() runtime.Runtime {
-	return a.runtime
+		// If the message has multi-content (attachments), we need to handle it specially
+		if len(userMsg.Message.MultiContent) > 0 {
+			return messages.SendAttachmentMsg{
+				Content: userMsg,
+			}
+		}
+
+		return messages.SendMsg{
+			Content: userMsg.Message.Content,
+		}
+	}
 }
 
 // CurrentAgentCommands returns the commands for the active agent
@@ -475,7 +486,7 @@ func (a *App) CompactSession(additionalPrompt string) {
 }
 
 func (a *App) PlainTextTranscript() string {
-	return transcript(a.session)
+	return transcript.PlainText(a.session)
 }
 
 // SessionStore returns the session store for browsing/loading sessions.

pkg/app/testdata/assistant_message.golden …script/testdata/assistant_message.goldenpkg/app/testdata/assistant_message.golden renamed to pkg/app/transcript/testdata/assistant_message.golden pkg/app/testdata/assistant_message.golden renamed to pkg/app/transcript/testdata/assistant_message.golden

@@ -1,4 +1,4 @@
-package app
+package transcript
 
 import (
 	"encoding/json"
@@ -9,7 +9,7 @@ import (
 	"github.com/docker/cagent/pkg/session"
 )
 
-func transcript(sess *session.Session) string {
+func PlainText(sess *session.Session) string {
 	var builder strings.Builder
 
 	messages := sess.GetAllMessages()

…/assistant_message_with_reasoning.golden …/assistant_message_with_reasoning.goldenpkg/app/testdata/assistant_message_with_reasoning.golden renamed to pkg/app/transcript/testdata/assistant_message_with_reasoning.golden pkg/app/testdata/assistant_message_with_reasoning.golden renamed to pkg/app/transcript/testdata/assistant_message_with_reasoning.golden

@@ -1,4 +1,4 @@
-package app
+package transcript
 
 import (
 	"testing"
@@ -12,7 +12,7 @@ import (
 
 func TestSimple(t *testing.T) {
 	sess := session.New(session.WithUserMessage("Hello"))
-	content := transcript(sess)
+	content := PlainText(sess)
 	golden.Assert(t, content, "simple.golden")
 }
 
@@ -27,7 +27,7 @@ func TestAssistantMessage(t *testing.T) {
 			Content: "Hello to you too",
 		},
 	})
-	content := transcript(sess)
+	content := PlainText(sess)
 	golden.Assert(t, content, "assistant_message.golden")
 }
 
@@ -43,7 +43,7 @@ func TestAssistantMessageWithReasoning(t *testing.T) {
 			ReasoningContent: "Hm....",
 		},
 	})
-	content := transcript(sess)
+	content := PlainText(sess)
 	golden.Assert(t, content, "assistant_message_with_reasoning.golden")
 }
 
@@ -71,7 +71,7 @@ func TestToolCalls(t *testing.T) {
 			Content: ".\n..",
 		},
 	})
-	content := transcript(sess)
+	content := PlainText(sess)
 
 	golden.Assert(t, content, "tool_calls.golden")
 }

pkg/app/testdata/simple.golden pkg/app/transcript/testdata/simple.goldenpkg/app/testdata/simple.golden renamed to pkg/app/transcript/testdata/simple.golden

@@ -25,6 +25,7 @@ import (
 	"github.com/docker/cagent/pkg/tui/components/editor/completions"
 	"github.com/docker/cagent/pkg/tui/core"
 	"github.com/docker/cagent/pkg/tui/core/layout"
+	"github.com/docker/cagent/pkg/tui/messages"
 	"github.com/docker/cagent/pkg/tui/styles"
 )
 
@@ -55,12 +56,6 @@ type AttachmentPreview struct {
 	Content string
 }
 
-// SendMsg represents a message to send
-type SendMsg struct {
-	Content     string            // Full content sent to the agent (with file contents expanded)
-	Attachments map[string]string // Map of filename to content for attachments
-}
-
 // Editor represents an input editor component
 type Editor interface {
 	layout.Model
@@ -509,7 +504,7 @@ func (e *editor) resetAndSend(content string) tea.Cmd {
 	e.textarea.Reset()
 	e.userTyped = false
 	e.clearSuggestion()
-	return core.CmdHandler(SendMsg{Content: content, Attachments: attachments})
+	return core.CmdHandler(messages.SendMsg{Content: content, Attachments: attachments})
 }
 
 // configureNewlineKeybinding sets up the appropriate newline keybinding

pkg/app/testdata/tool_calls.golden …pp/transcript/testdata/tool_calls.goldenpkg/app/testdata/tool_calls.golden renamed to pkg/app/transcript/testdata/tool_calls.golden pkg/app/testdata/tool_calls.golden renamed to pkg/app/transcript/testdata/tool_calls.golden

@@ -24,16 +24,12 @@ import (
 	"github.com/docker/cagent/pkg/tui/components/tool/editfile"
 	"github.com/docker/cagent/pkg/tui/core"
 	"github.com/docker/cagent/pkg/tui/core/layout"
+	"github.com/docker/cagent/pkg/tui/messages"
 	"github.com/docker/cagent/pkg/tui/service"
 	"github.com/docker/cagent/pkg/tui/styles"
 	"github.com/docker/cagent/pkg/tui/types"
 )
 
-// StreamCancelledMsg notifies components that the stream has been cancelled
-type StreamCancelledMsg struct {
-	ShowMessage bool // Whether to show a cancellation message after cleanup
-}
-
 // ToggleHideToolResultsMsg triggers hiding/showing tool results
 type ToggleHideToolResultsMsg struct{}
 
@@ -146,7 +142,7 @@ func (m *model) Update(msg tea.Msg) (layout.Model, tea.Cmd) {
 	var cmds []tea.Cmd
 
 	switch msg := msg.(type) {
-	case StreamCancelledMsg:
+	case messages.StreamCancelledMsg:
 		m.removeSpinner()
 		m.removePendingToolCallMessages()
 		return m, nil
@@ -1185,7 +1181,7 @@ func (m *model) removeSpinner() {
 }
 
 func (m *model) removePendingToolCallMessages() {
-	messages := make([]*types.Message, 0, len(m.messages))
+	toolCallMessages := make([]*types.Message, 0, len(m.messages))
 	views := make([]layout.Model, 0, len(m.views))
 
 	for i, msg := range m.messages {
@@ -1194,14 +1190,14 @@ func (m *model) removePendingToolCallMessages() {
 			continue
 		}
 
-		messages = append(messages, msg)
+		toolCallMessages = append(toolCallMessages, msg)
 		if i < len(m.views) {
 			views = append(views, m.views[i])
 		}
 	}
 
-	if len(messages) != len(m.messages) {
-		m.messages = messages
+	if len(toolCallMessages) != len(m.messages) {
+		m.messages = toolCallMessages
 		m.views = views
 		m.invalidateAllItems()
 	}

pkg/app/transcript.go pkg/app/transcript/transcript.gopkg/app/transcript.go renamed to pkg/app/transcript/transcript.go

@@ -16,7 +16,7 @@ func TestQueueSection_SingleMessage(t *testing.T) {
 	sessionState := &service.SessionState{}
 	m := New(sessionState).(*model)
 
-	m.SetQueuedMessages([]string{"Hello world"})
+	m.SetQueuedMessages("Hello world")
 
 	result := m.queueSection(40)
 
@@ -39,7 +39,7 @@ func TestQueueSection_MultipleMessages(t *testing.T) {
 	sessionState := &service.SessionState{}
 	m := New(sessionState).(*model)
 
-	m.SetQueuedMessages([]string{"First", "Second", "Third"})
+	m.SetQueuedMessages("First", "Second", "Third")
 
 	result := m.queueSection(40)
 
@@ -67,7 +67,7 @@ func TestQueueSection_LongMessageTruncation(t *testing.T) {
 
 	// Create a very long message
 	longMessage := strings.Repeat("x", 100)
-	m.SetQueuedMessages([]string{longMessage})
+	m.SetQueuedMessages(longMessage)
 
 	result := m.queueSection(30) // Narrow width to force truncation
 
@@ -91,7 +91,7 @@ func TestQueueSection_InRenderSections(t *testing.T) {
 	assert.NotContains(t, outputWithoutQueue, "Queue")
 
 	// With queued messages, queue section should appear
-	m.SetQueuedMessages([]string{"Pending task"})
+	m.SetQueuedMessages("Pending task")
 	linesWithQueue := m.renderSections(35)
 	outputWithQueue := strings.Join(linesWithQueue, "\n")
 	assert.Contains(t, outputWithQueue, "Queue (1)")