Merge pull request #1116 from dgageot/tui

Redesigned TUI

Author: rumpl

pkg/runtime/title_generator.go

@@ -63,7 +63,7 @@ func (t *titleGenerator) generate(ctx context.Context, sess *session.Session, ev
 
 	titleSession := session.New(
 		session.WithUserMessage(userPrompt),
-		session.WithTitle("Generating title..."),
+		session.WithTitle("Generating title…"),
 	)
 
 	titleRuntime, err := New(newTeam, WithSessionCompaction(false))

pkg/tools/builtin/api.go

@@ -148,7 +148,7 @@ func (t *APITool) Tools(context.Context) ([]tools.Tool, error) {
 			Handler:      t.handler.CallTool,
 			Annotations: tools.ToolAnnotations{
 				ReadOnlyHint: true,
-				Title:        "API URLs",
+				Title:        defaultsTo(t.config.Name, "Query API"),
 			},
 		},
 	}, nil
@@ -161,3 +161,10 @@ func (t *APITool) Start(context.Context) error {
 func (t *APITool) Stop(context.Context) error {
 	return nil
 }
+
+func defaultsTo(value, defaultValue string) string {
+	if value != "" {
+		return value
+	}
+	return defaultValue
+}

pkg/tools/builtin/filesystem.go

@@ -217,7 +217,7 @@ func (t *FilesystemTool) Tools(context.Context) ([]tools.Tool, error) {
 			OutputSchema: tools.MustSchemaFor[string](),
 			Handler:      NewHandler(t.handleEditFile),
 			Annotations: tools.ToolAnnotations{
-				Title: "Edit File",
+				Title: "Edit",
 			},
 		},
 		{
@@ -263,7 +263,7 @@ func (t *FilesystemTool) Tools(context.Context) ([]tools.Tool, error) {
 			Handler:      NewHandler(t.handleReadFile),
 			Annotations: tools.ToolAnnotations{
 				ReadOnlyHint: true,
-				Title:        "Read File",
+				Title:        "Read",
 			},
 		},
 		{
@@ -311,7 +311,7 @@ func (t *FilesystemTool) Tools(context.Context) ([]tools.Tool, error) {
 			OutputSchema: tools.MustSchemaFor[string](),
 			Handler:      NewHandler(t.handleWriteFile),
 			Annotations: tools.ToolAnnotations{
-				Title: "Write File",
+				Title: "Write",
 			},
 		},
 	}, nil

pkg/tools/builtin/shell.go

@@ -581,7 +581,7 @@ func (t *ShellTool) Tools(context.Context) ([]tools.Tool, error) {
 			OutputSchema: tools.MustSchemaFor[string](),
 			Handler:      NewHandler(t.handler.RunShell),
 			Annotations: tools.ToolAnnotations{
-				Title: "Run Shell Command",
+				Title: "Shell",
 			},
 		},
 		{
@@ -592,7 +592,7 @@ func (t *ShellTool) Tools(context.Context) ([]tools.Tool, error) {
 			OutputSchema: tools.MustSchemaFor[string](),
 			Handler:      NewHandler(t.handler.RunShellBackground),
 			Annotations: tools.ToolAnnotations{
-				Title: "Run Shell Command in Background",
+				Title: "Background Job",
 			},
 		},
 		{

pkg/tui/commands/commands.go

@@ -138,7 +138,7 @@ func BuildCommandCategories(ctx context.Context, application *app.App) []Categor
 			// Truncate long descriptions to fit on one line
 			description := prompt
 			if len(description) > 60 {
-				description = description[:57] + "..."
+				description = description[:59] + "…"
 			}
 
 			commands = append(commands, Item{
@@ -187,7 +187,7 @@ func BuildCommandCategories(ctx context.Context, application *app.App) []Categor
 
 			// Truncate long descriptions to fit on one line
 			if len(description) > 55 {
-				description = description[:52] + "..."
+				description = description[:54] + "…"
 			}
 
 			// Create closure variables to capture current iteration values

pkg/tui/components/editor/editor.go

@@ -112,8 +112,8 @@ type editor struct {
 func New(a *app.App, hist *history.History) Editor {
 	ta := textarea.New()
 	ta.SetStyles(styles.InputStyle)
-	ta.Placeholder = "Type your message here..."
-	ta.Prompt = "│ "
+	ta.Placeholder = "Type your message here…"
+	ta.Prompt = ""
 	ta.CharLimit = -1
 	ta.SetWidth(50)
 	ta.SetHeight(3) // Set minimum 3 lines for multi-line input
@@ -557,7 +557,7 @@ func (e *editor) View() string {
 		view = lipgloss.JoinVertical(lipgloss.Left, bannerView, view)
 	}
 
-	return styles.EditorStyle.Render(view)
+	return styles.RenderComposite(styles.TabPrimaryStyle.Padding(0, 1).MarginBottom(1).Width(e.width), styles.EditorStyle.Render(view))
 }
 
 // SetSize sets the dimensions of the component

pkg/tui/components/message/message.go

@@ -23,21 +23,24 @@ type Model interface {
 
 // messageModel implements Model
 type messageModel struct {
-	message *types.Message
+	message  *types.Message
+	previous *types.Message
+
 	width   int
 	height  int
 	focused bool
 	spinner spinner.Spinner
 }
 
 // New creates a new message view
-func New(msg *types.Message) *messageModel {
+func New(msg, previous *types.Message) *messageModel {
 	return &messageModel{
-		message: msg,
-		width:   80, // Default width
-		height:  1,  // Will be calculated
-		focused: false,
-		spinner: spinner.New(spinner.ModeBoth),
+		message:  msg,
+		previous: previous,
+		width:    80, // Default width
+		height:   1,  // Will be calculated
+		focused:  false,
+		spinner:  spinner.New(spinner.ModeBoth),
 	}
 }
 
@@ -77,31 +80,39 @@ func (mv *messageModel) Render(width int) string {
 	case types.MessageTypeSpinner:
 		return mv.spinner.View()
 	case types.MessageTypeUser:
-		return styles.UserMessageBorderStyle.Width(width - 1).Render(msg.Content)
+		return styles.UserMessageStyle.Width(width - 1).Render(msg.Content)
 	case types.MessageTypeAssistant:
 		if msg.Content == "" {
 			return mv.spinner.View()
 		}
 
-		rendered, err := markdown.NewRenderer(width).Render(msg.Content)
+		rendered, err := markdown.NewRenderer(width - styles.AssistantMessageStyle.GetPaddingLeft()).Render(msg.Content)
 		if err != nil {
-			return senderPrefix(msg.Sender) + msg.Content
+			rendered = msg.Content
+		} else {
+			rendered = strings.TrimRight(rendered, "\n\r\t ")
+		}
+
+		if mv.previous != nil && mv.previous.Type == msg.Type && mv.previous.Sender == msg.Sender {
+			return styles.AssistantMessageStyle.Render(rendered)
 		}
 
-		return senderPrefix(msg.Sender) + strings.TrimRight(rendered, "\n\r\t ")
+		return mv.senderPrefix(msg.Sender) + styles.AssistantMessageStyle.Render(rendered)
 	case types.MessageTypeAssistantReasoning:
 		if msg.Content == "" {
 			return mv.spinner.View()
 		}
-		// Render through the markdown renderer to ensure proper wrapping to width
+
 		rendered, err := markdown.NewRenderer(width).Render(msg.Content)
 		if err != nil {
-			text := "Thinking: " + senderPrefix(msg.Sender) + msg.Content
+			text := "Thinking: " + mv.senderPrefix(msg.Sender) + msg.Content
 			return styles.MutedStyle.Italic(true).Render(text)
 		}
+
 		// Strip ANSI from inner rendering so muted style fully applies
 		clean := stripANSI(strings.TrimRight(rendered, "\n\r\t "))
-		thinkingText := "Thinking: " + senderPrefix(msg.Sender) + clean
+		thinkingText := "Thinking: " + mv.senderPrefix(msg.Sender) + clean
+
 		return styles.MutedStyle.Italic(true).Render(thinkingText)
 	case types.MessageTypeShellOutput:
 		if rendered, err := markdown.NewRenderer(width).Render(fmt.Sprintf("```console\n%s\n```", msg.Content)); err == nil {
@@ -111,19 +122,19 @@ func (mv *messageModel) Render(width int) string {
 	case types.MessageTypeCancelled:
 		return styles.WarningStyle.Render("⚠ stream cancelled ⚠")
 	case types.MessageTypeWelcome:
-		return styles.WelcomeMessageBorderStyle.Width(width - 1).Render(strings.TrimRight(msg.Content, "\n\r\t "))
+		return styles.WelcomeMessageStyle.Width(width - 1).Render(strings.TrimRight(msg.Content, "\n\r\t "))
 	case types.MessageTypeError:
 		return styles.ErrorMessageStyle.Width(width - 1).Render(msg.Content)
 	default:
 		return msg.Content
 	}
 }
 
-func senderPrefix(sender string) string {
+func (mv *messageModel) senderPrefix(sender string) string {
 	if sender == "" {
 		return ""
 	}
-	return styles.AgentBadgeStyle.Render("["+sender+"]") + "\n\n"
+	return styles.AgentBadgeStyle.Render(sender+" ▶") + "\n\n"
 }
 
 // Height calculates the height needed for this message view

pkg/tui/components/message/message_test.go

@@ -18,7 +18,7 @@ func TestErrorMessageWrapping(t *testing.T) {
 		"It contains enough text to exceed typical terminal widths and demonstrate the wrapping behavior."
 
 	msg := types.Error(longError)
-	mv := New(msg)
+	mv := New(msg, nil)
 
 	// Set a narrow width to force wrapping
 	width := 50
@@ -48,7 +48,7 @@ func TestErrorMessageWithShortContent(t *testing.T) {
 
 	shortError := "Short error"
 	msg := types.Error(shortError)
-	mv := New(msg)
+	mv := New(msg, nil)
 
 	width := 80
 	mv.SetSize(width, 0)
@@ -68,7 +68,7 @@ func TestErrorMessagePreservesContent(t *testing.T) {
 
 	errorContent := "Error: Failed to connect to database\nConnection timeout after 30 seconds"
 	msg := types.Error(errorContent)
-	mv := New(msg)
+	mv := New(msg, nil)
 
 	width := 80
 	mv.SetSize(width, 0)

pkg/tui/components/messages/messages.go

@@ -515,15 +515,17 @@ func (m *model) ensureAllItemsRendered() {
 
 	for i, view := range m.views {
 		item := m.renderItem(i, view)
+		if item.view == "" {
+			continue
+		}
 
 		// Add content to complete rendered string
-		if item.view != "" {
-			lines := strings.Split(item.view, "\n")
-			allLines = append(allLines, lines...)
-		}
+		view := strings.TrimSuffix(item.view, "\n")
+		lines := strings.Split(view, "\n")
+		allLines = append(allLines, lines...)
 
 		// Add separator between messages (but not after last message)
-		if i < len(m.views)-1 && item.view != "" {
+		if i < len(m.views)-1 {
 			allLines = append(allLines, "")
 		}
 	}
@@ -586,6 +588,7 @@ func (m *model) addMessage(msg *types.Message) tea.Cmd {
 	m.messages = append(m.messages, msg)
 
 	view := m.createMessageView(msg)
+	m.sessionState.PreviousMessage = msg
 	m.views = append(m.views, view)
 
 	var cmds []tea.Cmd
@@ -715,7 +718,7 @@ func (m *model) createToolCallView(msg *types.Message) layout.Model {
 }
 
 func (m *model) createMessageView(msg *types.Message) layout.Model {
-	view := message.New(msg)
+	view := message.New(msg, m.sessionState.PreviousMessage)
 	view.SetSize(m.width, 0)
 	return view
 }