a5c597b · crush · git.iko.soy

git.iko.soy/crush

feat(ui): copy chat highlighted content to clipboard

This commit adds functionality to the chat UI that allows users to copy highlighted text to the clipboard.

commita5c597bdc26d27025046daaa19b8eecb1d558fc6 authorAyman Bagabas <ayman.bagabas@gmail.com> dateWed 21 Jan 2026, 15:15 (9 months ago) parentdd9e8ca

7 files changed+144−42

compare with main

unifiedsplit

internal/ui/chat/assistant.go+13−8 internal/ui/chat/messages.go+10−8 internal/ui/chat/tools.go+17−12 internal/ui/chat/user.go+13−9 internal/ui/list/item.go+8 internal/ui/model/chat.go+45−3 internal/ui/model/ui.go+38−2

internal/ui/chat/assistant.go+13−8

@@ -77,13 +77,9 @@ func (a *AssistantMessageItem) ID() string {

7777 return a.message.ID

7878}

7979

80−// Render implements MessageItem.

81−func (a *AssistantMessageItem) Render(width int) string {

80+// RawRender implements [MessageItem].

81+func (a *AssistantMessageItem) RawRender(width int) string {

8282 cappedWidth := cappedMessageWidth(width)

83− style := a.sty.Chat.Message.AssistantBlurred

84− if a.focused {

85− style = a.sty.Chat.Message.AssistantFocused

86− }

8783

8884 var spinner string

8985 if a.isSpinning() {

@@ -103,10 +99,19 @@ func (a *AssistantMessageItem) Render(width int) string {

10399 if highlightedContent != "" {

104100 highlightedContent += "\n\n"

105101 }

106− return style.Render(highlightedContent + spinner)

102+ return highlightedContent + spinner

107103 }

108104

109− return style.Render(highlightedContent)

105+ return highlightedContent

106+}

107+

108+// Render implements MessageItem.

109+func (a *AssistantMessageItem) Render(width int) string {

110+ style := a.sty.Chat.Message.AssistantBlurred

111+ if a.focused {

112+ style = a.sty.Chat.Message.AssistantFocused

113+ }

114+ return style.Render(a.RawRender(width))

110115}

111116

112117// renderMessageContent renders the message content including thinking, main content, and finish reason.

internal/ui/chat/messages.go+10−8

@@ -1,6 +1,3 @@

1−// Package chat provides UI components for displaying and managing chat messages.

2−// It defines message item types that can be rendered in a list view, including

3−// support for highlighting, focusing, and caching rendered content.

41package chat

63import (

@@ -48,6 +45,7 @@ type Expandable interface {

4845// UI and be part of a [list.List] identifiable by a unique ID.

4946type MessageItem interface {

5047 list.Item

48+ list.RawRenderable

5149 Identifiable

5250}

5351

@@ -93,7 +91,7 @@ func (h *highlightableMessageItem) renderHighlighted(content string, width, heig

9391 return list.Highlight(content, area, h.startLine, h.startCol, h.endLine, h.endCol, h.highlighter)

9492}

9593

96−// SetHighlight implements [MessageItem].

94+// SetHighlight implements list.Highlightable.

9795func (h *highlightableMessageItem) SetHighlight(startLine int, startCol int, endLine int, endCol int) {

9896 // Adjust columns for the style's left inset (border + padding) since we

9997 // highlight the content only.

@@ -108,7 +106,7 @@ func (h *highlightableMessageItem) SetHighlight(startLine int, startCol int, end

108106 }

109107}

110108

111−// Highlight implements [MessageItem].

109+// Highlight implements list.Highlightable.

112110func (h *highlightableMessageItem) Highlight() (startLine int, startCol int, endLine int, endCol int) {

113111 return h.startLine, h.startCol, h.endLine, h.endCol

114112}

@@ -200,8 +198,8 @@ func (a *AssistantInfoItem) ID() string {

200198 return a.id

201199}

202200

203−// Render implements MessageItem.

204−func (a *AssistantInfoItem) Render(width int) string {

201+// RawRender implements MessageItem.

202+func (a *AssistantInfoItem) RawRender(width int) string {

205203 innerWidth := max(0, width-messageLeftPaddingTotal)

206204 content, _, ok := a.getCachedRender(innerWidth)

207205 if !ok {

@@ -209,8 +207,12 @@ func (a *AssistantInfoItem) Render(width int) string {

209207 height := lipgloss.Height(content)

210208 a.setCachedRender(content, innerWidth, height)

211209 }

210+ return content

211+}

212212

213− return a.sty.Chat.Message.SectionHeader.Render(content)

213+// Render implements MessageItem.

214+func (a *AssistantInfoItem) Render(width int) string {

215+ return a.sty.Chat.Message.SectionHeader.Render(a.RawRender(width))

214216}

215217

216218func (a *AssistantInfoItem) renderContent(width int) string {

internal/ui/chat/tools.go+17−12

@@ -287,20 +287,12 @@ func (t *baseToolMessageItem) Animate(msg anim.StepMsg) tea.Cmd {

287287 return t.anim.Animate(msg)

288288}

289289

290−// Render renders the tool message item at the given width.

291−func (t *baseToolMessageItem) Render(width int) string {

290+// RawRender implements [MessageItem].

291+func (t *baseToolMessageItem) RawRender(width int) string {

292292 toolItemWidth := width - messageLeftPaddingTotal

293293 if t.hasCappedWidth {

294294 toolItemWidth = cappedMessageWidth(width)

295295 }

296− style := t.sty.Chat.Message.ToolCallBlurred

297− if t.focused {

298− style = t.sty.Chat.Message.ToolCallFocused

299− }

300−

301− if t.isCompact {

302− style = t.sty.Chat.Message.ToolCallCompact

303− }

304296

305297 content, height, ok := t.getCachedRender(toolItemWidth)

306298 // if we are spinning or there is no cache rerender

@@ -319,8 +311,21 @@ func (t *baseToolMessageItem) Render(width int) string {

319311 t.setCachedRender(content, toolItemWidth, height)

320312 }

321313

322− highlightedContent := t.renderHighlighted(content, toolItemWidth, height)

323− return style.Render(highlightedContent)

314+ return t.renderHighlighted(content, toolItemWidth, height)

315+}

316+

317+// Render renders the tool message item at the given width.

318+func (t *baseToolMessageItem) Render(width int) string {

319+ style := t.sty.Chat.Message.ToolCallBlurred

320+ if t.focused {

321+ style = t.sty.Chat.Message.ToolCallFocused

322+ }

323+

324+ if t.isCompact {

325+ style = t.sty.Chat.Message.ToolCallCompact

326+ }

327+

328+ return style.Render(t.RawRender(width))

324329}

325330

326331// ToolCall returns the tool call associated with this message item.

internal/ui/chat/user.go+13−9

@@ -33,19 +33,14 @@ func NewUserMessageItem(sty *styles.Styles, message *message.Message, attachment

3333 }

3434}

3535

36−// Render implements MessageItem.

37−func (m *UserMessageItem) Render(width int) string {

36+// RawRender implements [MessageItem].

37+func (m *UserMessageItem) RawRender(width int) string {

3838 cappedWidth := cappedMessageWidth(width)

3939

40− style := m.sty.Chat.Message.UserBlurred

41− if m.focused {

42− style = m.sty.Chat.Message.UserFocused

43− }

44−

4540 content, height, ok := m.getCachedRender(cappedWidth)

4641 // cache hit

4742 if ok {

48− return style.Render(m.renderHighlighted(content, cappedWidth, height))

43+ return m.renderHighlighted(content, cappedWidth, height)

4944 }

5045

5146 renderer := common.MarkdownRenderer(m.sty, cappedWidth)

@@ -69,7 +64,16 @@ func (m *UserMessageItem) Render(width int) string {

6964

7065 height = lipgloss.Height(content)

7166 m.setCachedRender(content, cappedWidth, height)

72− return style.Render(m.renderHighlighted(content, cappedWidth, height))

67+ return m.renderHighlighted(content, cappedWidth, height)

68+}

69+

70+// Render implements MessageItem.

71+func (m *UserMessageItem) Render(width int) string {

72+ style := m.sty.Chat.Message.UserBlurred

73+ if m.focused {

74+ style = m.sty.Chat.Message.UserFocused

75+ }

76+ return style.Render(m.RawRender(width))

7377}

7478

7579// ID implements MessageItem.

internal/ui/list/item.go+8

@@ -13,6 +13,14 @@ type Item interface {

1313 Render(width int) string

1414}

1515

16+// RawRenderable represents an item that can provide a raw rendering

17+// without additional styling.

18+type RawRenderable interface {

19+ // RawRender returns the raw rendered string without any additional

20+ // styling.

21+ RawRender(width int) string

22+}

23+

1624// Focusable represents an item that can be aware of focus state changes.

1725type Focusable interface {

1826 // SetFocused sets the focus state of the item.

internal/ui/model/chat.go+45−3

@@ -1,7 +1,10 @@

11package model

33import (

4+ "strings"

46 tea "charm.land/bubbletea/v2"

7+ "charm.land/lipgloss/v2"

58 "github.com/charmbracelet/crush/internal/ui/anim"

69 "github.com/charmbracelet/crush/internal/ui/chat"

710 "github.com/charmbracelet/crush/internal/ui/common"

@@ -43,6 +46,7 @@ func NewChat(com *common.Common) *Chat {

4346 l := list.NewList()

4447 l.SetGap(1)

4548 l.RegisterRenderCallback(c.applyHighlightRange)

49+ l.RegisterRenderCallback(list.FocusedRenderCallback(l))

4650 c.list = l

4751 c.mouseDownItem = -1

4852 c.mouseDragItem = -1

@@ -445,9 +449,6 @@ func (m *Chat) HandleMouseUp(x, y int) bool {

445449 return false

446450 }

447451

448− // TODO: Handle the behavior when mouse is released after a drag selection

449− // (e.g., copy selected text to clipboard)

450−

451452 m.mouseDown = false

452453 return true

453454}

@@ -474,6 +475,47 @@ func (m *Chat) HandleMouseDrag(x, y int) bool {

474475 return true

475476}

476477

478+// HasHighlight returns whether there is currently highlighted content.

479+func (m *Chat) HasHighlight() bool {

480+ startItemIdx, startLine, startCol, endItemIdx, endLine, endCol := m.getHighlightRange()

481+ return startItemIdx >= 0 && endItemIdx >= 0 && (startLine != endLine || startCol != endCol)

482+}

483+

484+// HighlighContent returns the currently highlighted content based on the mouse

485+// selection. It returns an empty string if no content is highlighted.

486+func (m *Chat) HighlighContent() string {

487+ startItemIdx, startLine, startCol, endItemIdx, endLine, endCol := m.getHighlightRange()

488+ if startItemIdx < 0 || endItemIdx < 0 || startLine == endLine && startCol == endCol {

489+ return ""

490+ }

491+

492+ var sb strings.Builder

493+ for i := startItemIdx; i <= endItemIdx; i++ {

494+ item := m.list.ItemAt(i)

495+ if hi, ok := item.(list.Highlightable); ok {

496+ startLine, startCol, endLine, endCol := hi.Highlight()

497+ listWidth := m.list.Width()

498+ var rendered string

499+ if rr, ok := item.(list.RawRenderable); ok {

500+ rendered = rr.RawRender(listWidth)

501+ } else {

502+ rendered = item.Render(listWidth)

503+ }

504+ sb.WriteString(list.HighlightContent(

505+ rendered,

506+ uv.Rect(0, 0, listWidth, lipgloss.Height(rendered)),

507+ startLine,

508+ startCol,

509+ endLine,

510+ endCol,

511+ ))

512+ sb.WriteString(strings.Repeat("\n", m.list.Gap()))

513+ }

514+ }

515+

516+ return strings.TrimSpace(sb.String())

517+}

518+

477519// ClearMouse clears the current mouse interaction state.

478520func (m *Chat) ClearMouse() {

479521 m.mouseDown = false

internal/ui/model/ui.go+38−2

@@ -23,6 +23,7 @@ import (

2323 "charm.land/bubbles/v2/textarea"

2424 tea "charm.land/bubbletea/v2"

2525 "charm.land/lipgloss/v2"

26+ "github.com/atotto/clipboard"

2627 "github.com/charmbracelet/catwalk/pkg/catwalk"

2728 "github.com/charmbracelet/crush/internal/agent/tools/mcp"

2829 "github.com/charmbracelet/crush/internal/app"

@@ -103,6 +104,9 @@ type (

103104

104105 // closeDialogMsg is sent to close the current dialog.

105106 closeDialogMsg struct{}

107+

108+ // copyChatHighlightMsg is sent to copy the current chat highlight to clipboard.

109+ copyChatHighlightMsg struct{}

106110)

107111

108112// UI represents the main user interface model.

@@ -200,6 +204,9 @@ type UI struct {

200204 // Todo spinner

201205 todoSpinner spinner.Model

202206 todoIsSpinning bool

207+

208+ // mouse highlighting related state

209+ lastClickTime time.Time

203210}

204211

205212// New creates a new instance of the [UI] model.

@@ -481,6 +488,8 @@ func (m *UI) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

481488 m.keyMap.Models.SetHelp("ctrl+m", "models")

482489 m.keyMap.Editor.Newline.SetHelp("shift+enter", "newline")

483490 }

491+ case copyChatHighlightMsg:

492+ cmds = append(cmds, m.copyChatHighlight())

484493 case tea.MouseClickMsg:

485494 switch m.state {

486495 case uiChat:

@@ -488,7 +497,9 @@ func (m *UI) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

488497 // Adjust for chat area position

489498 x -= m.layout.main.Min.X

490499 y -= m.layout.main.Min.Y

491− m.chat.HandleMouseDown(x, y)

500+ if m.chat.HandleMouseDown(x, y) {

501+ m.lastClickTime = time.Now()

502+ }

492503 }

493504

494505 case tea.MouseMotionMsg:

@@ -524,13 +535,22 @@ func (m *UI) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

524535 }

525536

526537 case tea.MouseReleaseMsg:

538+ const doubleClickThreshold = 500 * time.Millisecond

539+

527540 switch m.state {

528541 case uiChat:

529542 x, y := msg.X, msg.Y

530543 // Adjust for chat area position

531544 x -= m.layout.main.Min.X

532545 y -= m.layout.main.Min.Y

533− m.chat.HandleMouseUp(x, y)

546+ if m.chat.HandleMouseUp(x, y) {

547+ cmds = append(cmds, tea.Tick(doubleClickThreshold, func(t time.Time) tea.Msg {

548+ if time.Since(m.lastClickTime) >= doubleClickThreshold {

549+ return copyChatHighlightMsg{}

550+ }

551+ return nil

552+ }))

553+ }

534554 }

535555 case tea.MouseWheelMsg:

536556 // Pass mouse events to dialogs first if any are open.

@@ -2842,6 +2862,22 @@ func (m *UI) runMCPPrompt(clientID, promptID string, arguments map[string]string

28422862 return tea.Sequence(cmds...)

28432863}

28442864

2865+func (m *UI) copyChatHighlight() tea.Cmd {

2866+ text := m.chat.HighlighContent()

2867+ return tea.Sequence(

2868+ tea.SetClipboard(text),

2869+ func() tea.Msg {

2870+ _ = clipboard.WriteAll(text)

2871+ return nil

2872+ },

2873+ func() tea.Msg {

2874+ m.chat.ClearMouse()

2875+ return nil

2876+ },

2877+ uiutil.ReportInfo("Selected text copied to clipboard"),

2878+ )

2879+}

2880+

28452881// renderLogo renders the Crush logo with the given styles and dimensions.

28462882func renderLogo(t *styles.Styles, compact bool, width int) string {

28472883 return logo.Render(version.Version, compact, logo.Opts{