feat: move thinking indicator into message list

Author: binarylogic

internal/tui/app/chat/messages/model.go

@@ -3,10 +3,10 @@ package messages
 import (
 	"strings"
 
-	"github.com/usetero/cli/internal/log"
-
 	tea "charm.land/bubbletea/v2"
+	"github.com/usetero/cli/internal/log"
 	"github.com/usetero/cli/internal/styles"
+	"github.com/usetero/cli/internal/tui/components/thinking"
 )
 
 // Model is a scrollable, focusable list of message items.
@@ -41,6 +41,10 @@ type Model struct {
 	mouseDragIdx int  // Current item index during drag
 	mouseDragX   int  // Current column during drag
 	mouseDragY   int  // Current line within item during drag
+
+	// Thinking indicator
+	thinking     thinking.Model
+	showThinking bool
 }
 
 // New creates a new message list model.
@@ -60,17 +64,26 @@ func (m Model) Init() tea.Cmd {
 
 // Update handles messages.
 func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
+	var cmds []tea.Cmd
+
+	// Forward to thinking indicator if active
+	if m.showThinking {
+		var cmd tea.Cmd
+		m.thinking, cmd = m.thinking.Update(msg)
+		cmds = append(cmds, cmd)
+	}
+
 	switch msg := msg.(type) {
 	case tea.MouseClickMsg:
 		m, _ = m.handleMouseDown(msg.X, msg.Y)
-		return m, nil
 
 	case tea.MouseMotionMsg:
 		m = m.handleMouseDrag(msg.X, msg.Y)
-		return m, nil
 
 	case tea.MouseReleaseMsg:
-		return m.handleMouseUp(msg.X, msg.Y)
+		var cmd tea.Cmd
+		m, cmd = m.handleMouseUp(msg.X, msg.Y)
+		cmds = append(cmds, cmd)
 
 	case tea.MouseWheelMsg:
 		switch msg.Button {
@@ -79,11 +92,10 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 		case tea.MouseWheelDown:
 			m = m.scrollDown(3)
 		}
-		return m, nil
 
 	case tea.KeyPressMsg:
 		if !m.focused {
-			return m, nil
+			return m, tea.Batch(cmds...)
 		}
 
 		switch msg.String() {
@@ -115,35 +127,41 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
 			if m.HasHighlight() {
 				content := m.HighlightContent()
 				m = m.ClearHighlight()
-				return m, tea.SetClipboard(content)
+				cmds = append(cmds, tea.SetClipboard(content))
+				return m, tea.Batch(cmds...)
 			}
 			if m.selectedIdx >= 0 && m.selectedIdx < len(m.items) {
 				if cp, ok := m.items[m.selectedIdx].(Copyable); ok {
-					return m, tea.SetClipboard(cp.CopyableContent())
+					cmds = append(cmds, tea.SetClipboard(cp.CopyableContent()))
+					return m, tea.Batch(cmds...)
 				}
 			}
 		case "esc":
 			// Clear highlight on escape
 			if m.HasHighlight() {
 				m = m.ClearHighlight()
-				return m, nil
 			}
 		}
 
 		// Forward to selected item
 		if m.selectedIdx >= 0 && m.selectedIdx < len(m.items) {
 			var cmd tea.Cmd
 			m.items[m.selectedIdx], cmd = m.items[m.selectedIdx].Update(msg)
-			return m, cmd
+			cmds = append(cmds, cmd)
 		}
 	}
 
-	return m, nil
+	return m, tea.Batch(cmds...)
 }
 
 // View renders the visible portion of the message list.
 func (m Model) View() string {
-	if m.width == 0 || m.height == 0 || len(m.items) == 0 {
+	if m.width == 0 || m.height == 0 {
+		return ""
+	}
+
+	// Nothing to show
+	if len(m.items) == 0 && !m.showThinking {
 		return ""
 	}
 
@@ -188,6 +206,27 @@ func (m Model) View() string {
 		currentIdx++
 	}
 
+	// Render thinking indicator after items
+	if m.showThinking && remainingHeight > 0 {
+		// Add gap before thinking if we have items
+		if len(m.items) > 0 && m.gap > 0 {
+			for i := 0; i < m.gap && remainingHeight > 0; i++ {
+				lines = append(lines, "")
+				remainingHeight--
+			}
+		}
+
+		thinkingView := m.renderThinking()
+		thinkingLines := strings.Split(thinkingView, "\n")
+		for _, line := range thinkingLines {
+			if remainingHeight <= 0 {
+				break
+			}
+			lines = append(lines, line)
+			remainingHeight--
+		}
+	}
+
 	// Pad to fill height
 	for len(lines) < m.height {
 		lines = append(lines, "")

internal/tui/app/chat/messages/thinking.go

@@ -0,0 +1,37 @@
+package messages
+
+import (
+	tea "charm.land/bubbletea/v2"
+	"charm.land/lipgloss/v2"
+	"github.com/usetero/cli/internal/tui/components/thinking"
+)
+
+// StartThinking shows the thinking indicator.
+func (m Model) StartThinking() (Model, tea.Cmd) {
+	m.thinking = thinking.New(m.theme, "Thinking")
+	m.showThinking = true
+	return m, m.thinking.Init()
+}
+
+// StopThinking hides the thinking indicator.
+func (m Model) StopThinking() Model {
+	m.showThinking = false
+	return m
+}
+
+// IsThinking returns true if the thinking indicator is shown.
+func (m Model) IsThinking() bool {
+	return m.showThinking
+}
+
+// renderThinking renders the thinking indicator with label.
+func (m Model) renderThinking() string {
+	colors := m.theme.Colors
+	label := lipgloss.NewStyle().
+		Foreground(colors.Brand.GradientEnd).
+		Bold(true).
+		PaddingLeft(1).
+		Render("Tero")
+	content := lipgloss.NewStyle().PaddingLeft(1).Render(m.thinking.View())
+	return lipgloss.JoinVertical(lipgloss.Left, label, content)
+}

internal/tui/app/chat/model.go

@@ -259,15 +259,20 @@ func (m Model) handleSubmit(text string) (Model, tea.Cmd) {
 		m = m.updateLayout()
 	}
 
-	// Start streaming - Turn owns the thinking indicator
+	// Start streaming with thinking indicator
 	m.state = StateStreaming
+	var thinkingCmd tea.Cmd
+	m.list, thinkingCmd = m.list.StartThinking()
 	m.logger.Info("message sent")
 
-	return m, m.turn.Send(ctx, convID.String(), m.rawMessages, m.tools.Definitions())
+	return m, tea.Batch(thinkingCmd, m.turn.Send(ctx, convID.String(), m.rawMessages, m.tools.Definitions()))
 }
 
 // handleStreamDone processes when streaming completes.
 func (m Model) handleStreamDone(msg turn.StreamDoneMsg) (Model, tea.Cmd) {
+	// Stop thinking indicator
+	m.list = m.list.StopThinking()
+
 	if msg.Err != nil {
 		m.logger.Error("stream error", "error", msg.Err)
 		m.state = StateIdle
@@ -378,13 +383,15 @@ func (m Model) continueAfterTools() (Model, tea.Cmd) {
 	}
 	m.rawMessages = append(m.rawMessages, toolResultMsg)
 
-	// Continue streaming - Turn owns the thinking indicator
+	// Continue streaming with thinking indicator
 	m.state = StateStreaming
 	m.currentAssistant = nil
+	var thinkingCmd tea.Cmd
+	m.list, thinkingCmd = m.list.StartThinking()
 
 	m.logger.Info("continuing with tool results", "count", len(toolResults))
 
-	return m, m.turn.Send(m.ctx, m.conversationID.String(), m.rawMessages, m.tools.Definitions())
+	return m, tea.Batch(thinkingCmd, m.turn.Send(m.ctx, m.conversationID.String(), m.rawMessages, m.tools.Definitions()))
 }
 
 // rebuildList rebuilds the message list from raw messages.
@@ -453,35 +460,15 @@ func (m Model) View() string {
 	}
 
 	// Has messages
-	var messagesView string
-	if m.turn.IsActive() {
-		// Show Turn's view (thinking indicator) while streaming
-		listView := m.list.View()
-		turnView := m.renderTurnView()
-		messagesView = lipgloss.JoinVertical(lipgloss.Left, listView, turnView)
-	} else {
-		messagesView = m.list.View()
-	}
-
 	commandBarView := m.commandBar.View()
-	mainContent := lipgloss.JoinVertical(lipgloss.Left, messagesView, commandBarView)
+	mainContent := lipgloss.JoinVertical(lipgloss.Left, m.list.View(), commandBarView)
 
 	sidebarView := m.sidebar.View()
 	composedContent := lipgloss.JoinHorizontal(lipgloss.Top, mainContent, " ", sidebarView)
 
 	return m.baseLayout.Render(composedContent)
 }
 
-// renderTurnView renders the Turn's view with label.
-func (m Model) renderTurnView() string {
-	colors := m.theme.Colors
-	label := lipgloss.NewStyle().
-		Foreground(colors.Brand.GradientEnd).
-		Bold(true).
-		Render("Tero")
-	return lipgloss.JoinVertical(lipgloss.Left, label, m.turn.View())
-}
-
 // SetSize returns a new Model with the given dimensions.
 func (m Model) SetSize(width, height int) Model {
 	m.width = width