Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 20 additions & 3 deletions internal/tui/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ type model struct {
unpricedTokens int
transcript []transcriptRow
transcriptDetailed bool
transcriptBodyHeights *transcriptBodyHeightCache
input textinput.Model
composer composerState
composerActive bool
Expand Down Expand Up @@ -439,6 +440,7 @@ func newModel(ctx context.Context, options Options) model {
userAgent: options.UserAgent,
usageTracker: usageTracker,
transcript: initialTranscript(),
transcriptBodyHeights: newTranscriptBodyHeightCache(defaultTranscriptBodyHeightCacheMaxEntries),
prService: prService,
prState: prService.GetState(),
input: input,
Expand Down Expand Up @@ -1283,7 +1285,7 @@ func (m model) transcriptView() string {
if m.transcriptEmpty() && !m.pending && viewportOverlay != "" {
emptyOverlay = viewportOverlay
}
bodyLayout := m.transcriptBodyLayout(width, emptyOverlay)
bodyItems := m.transcriptBodyItems(width, emptyOverlay)

footer := m.footerView(width)

Expand All @@ -1293,9 +1295,10 @@ func (m model) transcriptView() string {
}

if m.altScreen && m.height > 0 {
return m.scrollableTranscriptLayoutView(m.pinnedTitleBar(width), bodyLayout, footer, width, overlayForViewport)
return m.scrollableTranscriptItemsView(m.pinnedTitleBar(width), bodyItems, footer, width, overlayForViewport)
}

bodyLayout := layoutTranscriptBodyItems(bodyItems)
body := bodyLayout.String()
if overlayForViewport != "" {
body += "\n" + overlayForViewport + "\n"
Expand Down Expand Up @@ -1456,6 +1459,19 @@ func (m model) scrollableTranscriptLayoutView(header string, body transcriptBody
window := transcriptViewportForLayout(body, frame, m.chatScrollOffset).window()

bodyWindow := body.visibleLines(window)
return m.renderScrollableTranscriptWindow(frame, bodyWindow, window, width, overlay)
}

func (m model) scrollableTranscriptItemsView(header string, items []transcriptBodyItem, footer string, width int, overlay string) string {
frame := m.scrollableTranscriptFrame(header, footer)
metrics := measureTranscriptBodyItems(items, m.transcriptBodyHeights)
window := transcriptViewportForLayout(metrics, frame, m.chatScrollOffset).window()
body := layoutVisibleTranscriptBodyItems(items, metrics, window)

return m.renderScrollableTranscriptWindow(frame, body.lines, window, width, overlay)
}

func (m model) renderScrollableTranscriptWindow(frame transcriptFrameLayout, bodyWindow []string, window transcriptViewportWindow, width int, overlay string) string {
for len(bodyWindow) < window.height {
bodyWindow = append(bodyWindow, "")
}
Expand Down Expand Up @@ -1597,7 +1613,8 @@ func (m model) chatTranscriptViewport() (transcriptViewport, bool) {
return transcriptViewport{}, false
}
width := chatWidth(m.width)
body := m.transcriptBodyLayout(width, "")
items := m.transcriptBodyItems(width, "")
body := measureTranscriptBodyItems(items, m.transcriptBodyHeights)
frame := m.scrollableTranscriptFrame(m.pinnedTitleBar(width), m.footerView(width))
return transcriptViewportForLayout(body, frame, m.chatScrollOffset), true
}
Expand Down
65 changes: 65 additions & 0 deletions internal/tui/transcript_body_cache.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
package tui

import (
"container/list"
"sync"
)

const defaultTranscriptBodyHeightCacheMaxEntries = 512

type transcriptBodyHeightCache struct {
mu sync.Mutex
maxEntries int
items map[string]*list.Element
lru *list.List
}

type transcriptBodyHeightCacheEntry struct {
key string
height int
}

func newTranscriptBodyHeightCache(maxEntries int) *transcriptBodyHeightCache {
return &transcriptBodyHeightCache{
maxEntries: maxEntries,
items: map[string]*list.Element{},
lru: list.New(),
}
}

func (c *transcriptBodyHeightCache) get(key string) (int, bool) {
if c == nil || key == "" {
return 0, false
}
c.mu.Lock()
defer c.mu.Unlock()
element, ok := c.items[key]
if !ok {
return 0, false
}
c.lru.MoveToFront(element)
return element.Value.(*transcriptBodyHeightCacheEntry).height, true
}

func (c *transcriptBodyHeightCache) set(key string, height int) {
if c == nil || key == "" || c.maxEntries <= 0 {
return
}
c.mu.Lock()
defer c.mu.Unlock()
if element, ok := c.items[key]; ok {
element.Value.(*transcriptBodyHeightCacheEntry).height = height
c.lru.MoveToFront(element)
return
}
c.items[key] = c.lru.PushFront(&transcriptBodyHeightCacheEntry{key: key, height: height})
for len(c.items) > c.maxEntries {
element := c.lru.Back()
if element == nil {
return
}
entry := element.Value.(*transcriptBodyHeightCacheEntry)
delete(c.items, entry.key)
c.lru.Remove(element)
}
}
119 changes: 119 additions & 0 deletions internal/tui/transcript_body_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -84,3 +84,122 @@ func TestTranscriptBodyLayoutVisibleLinesUsesViewportWindow(t *testing.T) {
t.Fatalf("visibleLines should return a copy, layout lines = %#v", layout.lines)
}
}

func TestMeasureTranscriptBodyItemsUsesHeightCache(t *testing.T) {
cache := newTranscriptBodyHeightCache(8)
renders := 0
item := transcriptBodyItem{
kind: transcriptBodyItemRow,
rowIndex: 7,
heightCacheKey: "stable-row",
heightCacheStable: true,
render: func(int) transcriptBodyRenderedItem {
renders++
return transcriptBodyRenderedItem{lines: []string{"one", "two"}}
},
}

first := measureTranscriptBodyItems([]transcriptBodyItem{item}, cache)
second := measureTranscriptBodyItems([]transcriptBodyItem{item}, cache)

if renders != 1 {
t.Fatalf("renders = %d, want first measure only", renders)
}
if first.totalLines() != 2 || second.totalLines() != 2 {
t.Fatalf("total lines = %d/%d, want cached height 2", first.totalLines(), second.totalLines())
}
}

func TestVisibleTranscriptBodyLayoutRendersOnlyIntersectingItems(t *testing.T) {
cache := newTranscriptBodyHeightCache(8)
renders := [3]int{}
items := []transcriptBodyItem{
countingTranscriptBodyItem("a", []string{"a0", "a1"}, &renders[0]),
countingTranscriptBodyItem("b", []string{"b0", "b1"}, &renders[1]),
countingTranscriptBodyItem("c", []string{"c0", "c1"}, &renders[2]),
}

metrics := measureTranscriptBodyItems(items, cache)
window := transcriptViewportWindow{start: 2, end: 4, height: 2}
layout := layoutVisibleTranscriptBodyItems(items, metrics, window)

if got, want := renders, [3]int{1, 2, 1}; got != want {
t.Fatalf("renders after first visible layout = %#v, want %#v", got, want)
}
if len(layout.lines) != 2 || layout.lines[0] != "b0" || layout.lines[1] != "b1" {
t.Fatalf("visible lines = %#v, want b item only", layout.lines)
}

metrics = measureTranscriptBodyItems(items, cache)
_ = layoutVisibleTranscriptBodyItems(items, metrics, window)

if got, want := renders, [3]int{1, 3, 1}; got != want {
t.Fatalf("renders after cached measure = %#v, want only visible item rerendered %#v", got, want)
}
}

func TestVisibleTranscriptBodyLayoutKeepsSelectableBodyYAbsolute(t *testing.T) {
items := []transcriptBodyItem{
transcriptBlankBodyItem(),
{
kind: transcriptBodyItemRow,
rowIndex: 3,
heightCacheKey: "selectable-row",
heightCacheStable: true,
render: func(startBodyY int) transcriptBodyRenderedItem {
return transcriptBodyRenderedItem{
lines: []string{"top", "hit", "bottom"},
selectable: []transcriptSelectableLine{{
bodyY: startBodyY + 1,
rowIndex: 3,
text: "hit",
}},
}
},
},
}
metrics := measureTranscriptBodyItems(items, newTranscriptBodyHeightCache(8))
window := transcriptViewportWindow{start: 2, end: 3, height: 1}

layout := layoutVisibleTranscriptBodyItems(items, metrics, window)

if len(layout.lines) != 1 || layout.lines[0] != "hit" {
t.Fatalf("visible lines = %#v, want selected item line", layout.lines)
}
if len(layout.selectable) != 1 || layout.selectable[0].bodyY != 2 {
t.Fatalf("selectable = %#v, want absolute bodyY 2", layout.selectable)
}
}

func TestScrollableTranscriptItemsViewMatchesFullLayout(t *testing.T) {
m := mouseTestModel()
m.height = 14
m.chatScrollOffset = 2
m.transcript = appendRow(m.transcript, rowUser, "please inspect this request")
m.transcript = appendRow(m.transcript, rowAssistant, "first response line\nsecond response line\nthird response line")
m.transcript = appendRow(m.transcript, rowUser, "follow up")
width := chatWidth(m.width)
header := m.pinnedTitleBar(width)
footer := m.footerView(width)
items := m.transcriptBodyItems(width, "")
full := layoutTranscriptBodyItems(items)

got := m.scrollableTranscriptItemsView(header, items, footer, width, "")
want := m.scrollableTranscriptLayoutView(header, full, footer, width, "")

if got != want {
t.Fatalf("visible item view changed output\nwant:\n%s\n\ngot:\n%s", want, got)
}
}

func countingTranscriptBodyItem(key string, lines []string, renders *int) transcriptBodyItem {
return transcriptBodyItem{
kind: transcriptBodyItemRow,
heightCacheKey: key,
heightCacheStable: true,
render: func(int) transcriptBodyRenderedItem {
(*renders)++
return transcriptBodyRenderedItem{lines: append([]string(nil), lines...)}
},
}
}
Loading
Loading