Merge pull request #755 from rumpl/tool-rendering

Create a component for each builtin tool that we support

Author: rumpl

pkg/tools/builtin/cmd_unix.go

@@ -17,10 +17,10 @@ func platformSpecificSysProcAttr() *syscall.SysProcAttr {
 	}
 }
 
-func createProcessGroup(proc *os.Process) (*processGroup, error) {
+func createProcessGroup(_ *os.Process) (*processGroup, error) {
 	return &processGroup{}, nil
 }
 
-func kill(proc *os.Process, pg *processGroup) error {
+func kill(proc *os.Process, _ *processGroup) error {
 	return syscall.Kill(-proc.Pid, syscall.SIGTERM)
 }

pkg/tui/components/message/message.go

@@ -78,11 +78,7 @@ func (mv *messageModel) Render(width int) string {
 	case types.MessageTypeSpinner:
 		return mv.spinner.View()
 	case types.MessageTypeUser:
-		if rendered, err := markdown.NewRenderer(width - len(styles.UserMessageBorderStyle.Render(""))).Render(msg.Content); err == nil {
-			return styles.UserMessageBorderStyle.Render(strings.TrimRight(rendered, "\n\r\t "))
-		}
-
-		return msg.Content
+		return styles.UserMessageBorderStyle.Width(width - 1).Render(msg.Content)
 	case types.MessageTypeAssistant:
 		if msg.Content == "" {
 			return mv.spinner.View()
@@ -113,8 +109,6 @@ func (mv *messageModel) Render(width int) string {
 			return strings.TrimRight(rendered, "\n\r\t ")
 		}
 		return msg.Content
-	case types.MessageTypeSeparator:
-		return styles.MutedStyle.Render("•" + strings.Repeat("─", mv.width-3) + "•")
 	case types.MessageTypeCancelled:
 		return styles.WarningStyle.Render("⚠ stream cancelled ⚠")
 	case types.MessageTypeWelcome:

pkg/tui/components/messages/messages.go

@@ -19,8 +19,10 @@ import (
 	"github.com/docker/cagent/pkg/tui/components/message"
 	"github.com/docker/cagent/pkg/tui/components/notification"
 	"github.com/docker/cagent/pkg/tui/components/tool"
+	"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/service"
 	"github.com/docker/cagent/pkg/tui/styles"
 	"github.com/docker/cagent/pkg/tui/types"
 )
@@ -46,7 +48,6 @@ type Model interface {
 	AddUserMessage(content string) tea.Cmd
 	AddErrorMessage(content string) tea.Cmd
 	AddAssistantMessage() tea.Cmd
-	AddSeparatorMessage() tea.Cmd
 	AddCancelledMessage() tea.Cmd
 	AddWelcomeMessage(content string) tea.Cmd
 	AddOrUpdateToolCall(agentName string, toolCall tools.ToolCall, toolDef tools.Tool, status types.ToolStatus) tea.Cmd
@@ -55,7 +56,6 @@ type Model interface {
 	AddShellOutputMessage(content string) tea.Cmd
 
 	ScrollToBottom() tea.Cmd
-	IsAtBottom() bool
 }
 
 // renderedItem represents a cached rendered message with position information
@@ -112,19 +112,30 @@ type model struct {
 
 	selection selectionState
 
-	splitDiffView bool
+	sessionState *service.SessionState
 
 	xPos, yPos int
 }
 
 // New creates a new message list component
-func New(a *app.App) Model {
+func New(a *app.App, sessionState *service.SessionState) Model {
 	return &model{
 		width:         120,
 		height:        24,
 		app:           a,
 		renderedItems: make(map[int]renderedItem),
-		splitDiffView: true,
+		sessionState:  sessionState,
+	}
+}
+
+// NewScrollableView creates a simple scrollable view for displaying messages in dialogs
+// This is a lightweight version that doesn't require app or session state management
+func NewScrollableView(width, height int, sessionState *service.SessionState) Model {
+	return &model{
+		width:         width,
+		height:        height,
+		renderedItems: make(map[int]renderedItem),
+		sessionState:  sessionState,
 	}
 }
 
@@ -220,19 +231,11 @@ func (m *model) Update(msg tea.Msg) (layout.Model, tea.Cmd) {
 		}
 		return m, nil
 
-	case tool.ToggleDiffViewMsg:
-		m.splitDiffView = !m.splitDiffView
-
-		var cmds []tea.Cmd
-		for i, view := range m.views {
-			updatedView, cmd := view.Update(tool.ToggleDiffViewMsg{})
-			m.views[i] = updatedView
-			cmds = append(cmds, cmd)
-		}
+	case editfile.ToggleDiffViewMsg:
+		m.sessionState.ToggleSplitDiffView()
 
 		m.invalidateAllItems()
-
-		return m, tea.Batch(cmds...)
+		return m, nil
 
 	case tea.KeyPressMsg:
 		switch msg.String() {
@@ -403,14 +406,16 @@ func (m *model) shouldCacheMessage(index int) bool {
 
 	switch msg.Type {
 	case types.MessageTypeToolCall:
-		return msg.ToolStatus == types.ToolStatusCompleted || msg.ToolStatus == types.ToolStatusError
+		return msg.ToolStatus == types.ToolStatusCompleted ||
+			msg.ToolStatus == types.ToolStatusError ||
+			msg.ToolStatus == types.ToolStatusConfirmation
 	case types.MessageTypeToolResult:
 		return true
 	case types.MessageTypeAssistant, types.MessageTypeAssistantReasoning:
 		// Only cache assistant messages that have content (completed streaming)
 		// Empty assistant messages have spinners and need constant re-rendering
 		return strings.Trim(msg.Content, "\r\n\t ") != ""
-	case types.MessageTypeUser, types.MessageTypeSeparator:
+	case types.MessageTypeUser:
 		// Always cache static content
 		return true
 	default:
@@ -493,8 +498,8 @@ func (m *model) invalidateAllItems() {
 	m.totalHeight = 0
 }
 
-// IsAtBottom returns true if the viewport is at the bottom
-func (m *model) IsAtBottom() bool {
+// isAtBottom returns true if the viewport is at the bottom
+func (m *model) isAtBottom() bool {
 	if len(m.messages) == 0 {
 		return true
 	}
@@ -504,11 +509,6 @@ func (m *model) IsAtBottom() bool {
 	return m.scrollOffset >= maxScrollOffset
 }
 
-// isAtBottom is kept as a private method for internal use
-func (m *model) isAtBottom() bool {
-	return m.IsAtBottom()
-}
-
 // AddUserMessage adds a user message to the chat
 func (m *model) AddUserMessage(content string) tea.Cmd {
 	return m.addMessage(&types.Message{
@@ -563,20 +563,6 @@ func (m *model) addMessage(msg *types.Message) tea.Cmd {
 	return tea.Batch(cmds...)
 }
 
-// AddSeparatorMessage adds a separator message to the chat
-func (m *model) AddSeparatorMessage() tea.Cmd {
-	m.removeSpinner()
-	msg := types.Message{
-		Type: types.MessageTypeSeparator,
-	}
-	m.messages = append(m.messages, msg)
-
-	view := m.createMessageView(&msg)
-	m.views = append(m.views, view)
-
-	return view.Init()
-}
-
 // AddCancelledMessage adds a cancellation indicator to the chat
 func (m *model) AddCancelledMessage() tea.Cmd {
 	msg := types.Message{
@@ -707,7 +693,7 @@ func (m *model) ScrollToBottom() tea.Cmd {
 }
 
 func (m *model) createToolCallView(msg *types.Message) layout.Model {
-	view := tool.New(msg, m.app, markdown.NewRenderer(m.width), m.splitDiffView)
+	view := tool.New(msg, markdown.NewRenderer(m.width), m.sessionState)
 	view.SetSize(m.width, 0)
 	return view
 }

pkg/tui/components/sidebar/sidebar.go

@@ -11,8 +11,9 @@ import (
 
 	"github.com/docker/cagent/pkg/runtime"
 	"github.com/docker/cagent/pkg/tools"
-	"github.com/docker/cagent/pkg/tui/components/todo"
+	"github.com/docker/cagent/pkg/tui/components/tool/todotool"
 	"github.com/docker/cagent/pkg/tui/core/layout"
+	"github.com/docker/cagent/pkg/tui/service"
 	"github.com/docker/cagent/pkg/tui/styles"
 )
 
@@ -40,20 +41,20 @@ type model struct {
 	width        int
 	height       int
 	usage        *runtime.Usage
-	todoComp     *todo.Component
+	todoComp     *todotool.SidebarComponent
 	working      bool
 	mcpInit      bool
 	spinner      spinner.Model
 	mode         Mode
 	sessionTitle string
 }
 
-func New() Model {
+func New(manager *service.TodoManager) Model {
 	return &model{
 		width:        20,
 		height:       24,
 		usage:        &runtime.Usage{},
-		todoComp:     todo.NewComponent(),
+		todoComp:     todotool.NewSidebarComponent(manager),
 		spinner:      spinner.New(spinner.WithSpinner(spinner.Dot)),
 		sessionTitle: "New session",
 	}
@@ -142,13 +143,17 @@ func (m *model) View() string {
 
 func (m *model) horizontalView() string {
 	pwd := getCurrentWorkingDirectory()
+
+	wi := m.workingIndicator()
+	titleGapWidth := m.width - lipgloss.Width(m.sessionTitle) - lipgloss.Width(wi) - 2
+	title := fmt.Sprintf("%s%*s%s", m.sessionTitle, titleGapWidth, "", m.workingIndicator())
+
 	gapWidth := m.width - lipgloss.Width(pwd) - lipgloss.Width(m.tokenUsage()) - 2
-	title := m.sessionTitle + " " + m.workingIndicator()
 	return lipgloss.JoinVertical(lipgloss.Top, title, fmt.Sprintf("%s%*s%s", styles.MutedStyle.Render(pwd), gapWidth, "", m.tokenUsage()))
 }
 
 func (m *model) verticalView() string {
-	topContent := m.sessionTitle
+	topContent := m.sessionTitle + "\n"
 
 	if pwd := getCurrentWorkingDirectory(); pwd != "" {
 		topContent += styles.MutedStyle.Render(pwd) + "\n\n"