Merge pull request #369 from rumpl/fix-tui-scroll

Fix TUI scrolling

Author: rumpl

pkg/tui/components/messages/messages.go

@@ -40,6 +40,7 @@ type Model interface {
 	AddShellOutputMessage(content string) tea.Cmd
 	AddSystemMessage(content string) tea.Cmd
 	PlainTextTranscript() string
+	IsAtBottom() bool
 }
 
 // renderedItem represents a cached rendered message with position information
@@ -426,8 +427,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
 	}
@@ -437,6 +438,11 @@ 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{
@@ -568,49 +574,32 @@ func (m *model) AppendToLastMessage(agentName string, messageType types.MessageT
 	if len(m.messages) == 0 {
 		return nil
 	}
+
 	lastIdx := len(m.messages) - 1
 	lastMsg := &m.messages[lastIdx]
 
 	if lastMsg.Type == messageType {
-		wasAtBottom := m.isAtBottom()
 		lastMsg.Content += content
-		lastMsg.Sender = agentName
-		// Update the corresponding view
 		m.views[lastIdx].(message.Model).SetMessage(lastMsg)
 		m.invalidateItem(lastIdx)
-
-		var cmds []tea.Cmd
-		if wasAtBottom {
-			cmds = append(cmds, func() tea.Msg {
-				m.scrollToBottom()
-				return nil
-			})
-		}
-		return tea.Batch(cmds...)
+		return nil
 	} else {
 		// Create new assistant message
 		msg := types.Message{
 			Type:    messageType,
 			Content: content,
 			Sender:  agentName,
 		}
-		wasAtBottom := m.isAtBottom()
 		m.messages = append(m.messages, msg)
 
 		view := m.createMessageView(&msg)
 		m.views = append(m.views, view)
 
-		var cmds []tea.Cmd
+		var cmd tea.Cmd
 		if initCmd := view.Init(); initCmd != nil {
-			cmds = append(cmds, initCmd)
-		}
-		if wasAtBottom {
-			cmds = append(cmds, func() tea.Msg {
-				m.scrollToBottom()
-				return nil
-			})
+			cmd = initCmd
 		}
-		return tea.Batch(cmds...)
+		return cmd
 	}
 }
 

pkg/tui/page/chat/chat.go

@@ -203,10 +203,16 @@ func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		return p, tea.Batch(cmd, p.messages.ScrollToBottom(), spinnerCmd)
 	case *runtime.AgentChoiceEvent:
 		cmd := p.messages.AppendToLastMessage(msg.AgentName, types.MessageTypeAssistant, msg.Content)
-		return p, tea.Batch(cmd, p.messages.ScrollToBottom())
+		if p.messages.IsAtBottom() {
+			return p, tea.Batch(cmd, p.messages.ScrollToBottom())
+		}
+		return p, cmd
 	case *runtime.AgentChoiceReasoningEvent:
 		cmd := p.messages.AppendToLastMessage(msg.AgentName, types.MessageTypeAssistantReasoning, msg.Content)
-		return p, tea.Batch(cmd, p.messages.ScrollToBottom())
+		if p.messages.IsAtBottom() {
+			return p, tea.Batch(cmd, p.messages.ScrollToBottom())
+		}
+		return p, cmd
 	case *runtime.SessionTitleEvent:
 		p.sessionTitle = msg.Title
 	case *runtime.TokenUsageEvent: