Skip to content

Simpler code #1408

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgageot merged 2 commits into from
Jan 18, 2026
Merged

Simpler code #1408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a228ce0
Simpler code
rumpl Jan 18, 2026
b6422f7
Remove unused app from messages
rumpl Jan 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 32 additions & 44 deletions pkg/tui/components/messages/messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"charm.land/lipgloss/v2"
"github.com/charmbracelet/x/ansi"

"github.com/docker/cagent/pkg/app"
"github.com/docker/cagent/pkg/chat"
"github.com/docker/cagent/pkg/runtime"
"github.com/docker/cagent/pkg/session"
Expand Down Expand Up @@ -71,7 +70,6 @@ type model struct {
views []layout.Model
width int // Full width including scrollbar space
height int
app *app.App

// Height tracking system fields
scrollOffset int // Current scroll position in lines
Expand All @@ -98,22 +96,17 @@ type model struct {
}

// New creates a new message list component
func New(a *app.App, sessionState *service.SessionState) Model {
return &model{
width: 120,
height: 24,
app: a,
renderedItems: make(map[int]renderedItem),
sessionState: sessionState,
scrollbar: scrollbar.New(),
selectedMessageIndex: -1,
debugLayout: os.Getenv("CAGENT_EXPERIMENTAL_DEBUG_LAYOUT") == "1",
}
func New(sessionState *service.SessionState) Model {
return newModel(120, 24, 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 newModel(width, height, sessionState)
}

func newModel(width, height int, sessionState *service.SessionState) *model {
return &model{
width: width,
height: height,
Expand Down Expand Up @@ -260,9 +253,7 @@ func (m *model) handleMouseRelease(msg tea.MouseReleaseMsg) (layout.Model, tea.C

func (m *model) handleMouseWheel(msg tea.MouseWheelMsg) (layout.Model, tea.Cmd) {
const mouseScrollAmount = 2
buttonStr := msg.Button.String()

switch buttonStr {
switch msg.Button.String() {
case "wheelup":
if m.scrollOffset > 0 {
m.userHasScrolled = true
Expand Down Expand Up @@ -649,8 +640,8 @@ func (m *model) renderItem(index int, view layout.Model) renderedItem {
msgView.SetSelected(isSelected)
}

// Don't cache selected items since selection state can change
if !isSelected && m.shouldCacheMessage(index) {
shouldCache := !isSelected && m.shouldCacheMessage(index)
if shouldCache {
if cached, exists := m.renderedItems[index]; exists {
return cached
}
Expand All @@ -664,7 +655,7 @@ func (m *model) renderItem(index int, view layout.Model) renderedItem {

item := renderedItem{view: rendered, height: height}

if !isSelected && m.shouldCacheMessage(index) {
if shouldCache {
m.renderedItems[index] = item
}

Expand Down Expand Up @@ -794,7 +785,6 @@ func (m *model) addMessage(msg *types.Message) tea.Cmd {
if initCmd := view.Init(); initCmd != nil {
cmds = append(cmds, initCmd)
}

if shouldAutoScroll {
cmds = append(cmds, func() tea.Msg {
m.scrollToBottom()
Expand All @@ -806,6 +796,12 @@ func (m *model) addMessage(msg *types.Message) tea.Cmd {
}

func (m *model) LoadFromSession(sess *session.Session) tea.Cmd {
appendSessionMessage := func(msg *types.Message, view layout.Model) {
m.messages = append(m.messages, msg)
m.views = append(m.views, view)
m.sessionState.PreviousMessage = msg
}

m.messages = nil
m.views = nil
m.renderedItems = make(map[int]renderedItem)
Expand All @@ -829,32 +825,24 @@ func (m *model) LoadFromSession(sess *session.Session) tea.Cmd {
switch smsg.Message.Role {
case chat.MessageRoleUser:
msg := types.User(smsg.Message.Content)
m.messages = append(m.messages, msg)
m.views = append(m.views, m.createMessageView(msg))
m.sessionState.PreviousMessage = msg
appendSessionMessage(msg, m.createMessageView(msg))
case chat.MessageRoleAssistant:
// Reasoning content comes first (matches live stream order)
if smsg.Message.ReasoningContent != "" {
msg := types.Agent(types.MessageTypeAssistantReasoning, smsg.AgentName, smsg.Message.ReasoningContent)
m.messages = append(m.messages, msg)
m.views = append(m.views, m.createMessageView(msg))
m.sessionState.PreviousMessage = msg
appendSessionMessage(msg, m.createMessageView(msg))
}
for i, tc := range smsg.Message.ToolCalls {
var toolDef tools.Tool
if i < len(smsg.Message.ToolDefinitions) {
toolDef = smsg.Message.ToolDefinitions[i]
}
msg := types.ToolCallMessage(smsg.AgentName, tc, toolDef, types.ToolStatusCompleted)
m.messages = append(m.messages, msg)
m.views = append(m.views, m.createToolCallView(msg))
m.sessionState.PreviousMessage = msg
appendSessionMessage(msg, m.createToolCallView(msg))
}
if smsg.Message.Content != "" {
msg := types.Agent(types.MessageTypeAssistant, smsg.AgentName, smsg.Message.Content)
m.messages = append(m.messages, msg)
m.views = append(m.views, m.createMessageView(msg))
m.sessionState.PreviousMessage = msg
appendSessionMessage(msg, m.createMessageView(msg))
}
case chat.MessageRoleTool:
continue
Expand Down Expand Up @@ -974,24 +962,24 @@ func (m *model) removeSpinner() {
}

func (m *model) removePendingToolCallMessages() {
var newMessages []*types.Message
var newViews []layout.Model
messages := make([]*types.Message, 0, len(m.messages))
views := make([]layout.Model, 0, len(m.views))

for i, msg := range m.messages {
shouldRemove := msg.Type == types.MessageTypeToolCall &&
(msg.ToolStatus == types.ToolStatusPending || msg.ToolStatus == types.ToolStatusRunning)
if msg.Type == types.MessageTypeToolCall &&
(msg.ToolStatus == types.ToolStatusPending || msg.ToolStatus == types.ToolStatusRunning) {
continue
}

if !shouldRemove {
newMessages = append(newMessages, msg)
if i < len(m.views) {
newViews = append(newViews, m.views[i])
}
messages = append(messages, msg)
if i < len(m.views) {
views = append(views, m.views[i])
}
}

if len(newMessages) != len(m.messages) {
m.messages = newMessages
m.views = newViews
if len(messages) != len(m.messages) {
m.messages = messages
m.views = views
m.invalidateAllItems()
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/tui/page/chat/chat.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ func New(a *app.App, sessionState *service.SessionState) Page {

p := &chatPage{
sidebar: sidebar.New(sessionState),
messages: messages.New(a, sessionState),
messages: messages.New(sessionState),
editor: editor.New(a, historyStore),
spinner: spinner.New(spinner.ModeSpinnerOnly, styles.SpinnerDotsHighlightStyle),
focusedPanel: PanelEditor,
Expand Down