Open source AI coding agent. Designed for large projects and real world tasks.
Go aiai-agentsai-developer-toolsai-toolsclicommand-linedeveloper-toolsgitgolanggpt-4llmopenaipolyglot-programmingterminalterminal-basedterminal-ui
fix screen flickering issue caused by multiple bubbletea spinners
Dane Schneider5ff50f01e81c
diff --git a/app/cli/stream/stream.go b/app/cli/stream/stream.goindex 98046e7e..e65ff693 100644--- a/app/cli/stream/stream.go+++ b/app/cli/stream/stream.go@@ -5,6 +5,7 @@ import (streamtui "plandex/stream_tui""plandex/types"+ "github.com/davecgh/go-spew/spew""github.com/plandex/plandex/shared")@@ -19,8 +20,8 @@ var OnStreamPlan types.OnStreamPlan = func(params types.OnStreamPlanParams) {return}- // log.Println("Stream message:")- // log.Println(spew.Sdump(*params.Msg))+ log.Println("Stream message:")+ log.Println(spew.Sdump(*params.Msg))streamtui.Send(*params.Msg)}diff --git a/app/cli/stream_tui/model.go b/app/cli/stream_tui/model.goindex 07829eb6..96e76b0e 100644--- a/app/cli/stream_tui/model.go+++ b/app/cli/stream_tui/model.go@@ -1,6 +1,9 @@package streamtuiimport (+ "log"+ "time"+bubbleKey "github.com/charmbracelet/bubbles/key""github.com/charmbracelet/bubbles/spinner""github.com/charmbracelet/bubbles/viewport"@@ -40,6 +43,7 @@ type streamUIModel struct {starting boolspinner spinner.ModelbuildSpinner spinner.Model+ sharedTicker *time.Tickerbuilding booltokensByPath map[string]int@@ -87,10 +91,12 @@ func (m streamUIModel) Init() tea.Cmd {m.mainViewport.MouseWheelEnabled = true// start spinner- return m.spinner.Tick+ return m.Tick()}func initialModel(prestartReply, prompt string, buildOnly bool) *streamUIModel {+ sharedTicker := time.NewTicker(100 * time.Millisecond)+s := spinner.New()s.Spinner = spinner.Pointss.Style = lipgloss.NewStyle().Foreground(lipgloss.Color("205"))@@ -163,9 +169,22 @@ func initialModel(prestartReply, prompt string, buildOnly bool) *streamUIModel {finishedByPath: make(map[string]bool),spinner: s,buildSpinner: buildSpinner,+ sharedTicker: sharedTicker,atScrollBottom: true,starting: true,}return &initialState}++func (m streamUIModel) Tick() tea.Cmd {+ return func() tea.Msg {+ <-m.sharedTicker.C+ return spinner.TickMsg{}+ }+}++func (m *streamUIModel) cleanup() {+ log.Println("Cleaning up stream UI model")+ m.sharedTicker.Stop()+}diff --git a/app/cli/stream_tui/update.go b/app/cli/stream_tui/update.goindex dbea9313..81356d57 100644--- a/app/cli/stream_tui/update.go+++ b/app/cli/stream_tui/update.go@@ -25,18 +25,15 @@ func (m streamUIModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {switch msg := msg.(type) {case spinner.TickMsg:- var cmds []tea.Cmdif m.processing || m.starting {- spinnerModel, cmd := m.spinner.Update(msg)+ spinnerModel, _ := m.spinner.Update(msg)m.spinner = spinnerModel- cmds = append(cmds, cmd)}if m.building {- buildSpinnerModel, cmd := m.buildSpinner.Update(msg)+ buildSpinnerModel, _ := m.buildSpinner.Update(msg)m.buildSpinner = buildSpinnerModel- cmds = append(cmds, cmd)}- return m, tea.Batch(cmds...)+ return m, m.Tick()case tea.WindowSizeMsg:m.windowResized(msg.Width, msg.Height)@@ -330,23 +327,13 @@ func (m *streamUIModel) streamUpdate(msg *shared.StreamMessage, deferUIUpdate bom.updateViewportDimensions()}- cmds := []tea.Cmd{m.buildSpinner.Tick}- if m.processing && !m.finished {- cmds = append(cmds, m.spinner.Tick)- }- return m, tea.Batch(cmds...)+ return m, m.Tick()case shared.StreamMessageDescribing:log.Println("Message describing, setting processing to true")m.processing = true- cmds := []tea.Cmd{m.spinner.Tick}-- if m.building {- cmds = append(cmds, m.buildSpinner.Tick)- }-- return m, tea.Batch(cmds...)+ return m, m.Tick()case shared.StreamMessageLoadContext:log.Println("Stream message auto-load context")@@ -360,11 +347,7 @@ func (m *streamUIModel) streamUpdate(msg *shared.StreamMessage, deferUIUpdate bom.reply += "\n\n" + msg + "\n\n"m.updateReplyDisplay()- cmds := []tea.Cmd{m.spinner.Tick}- if m.building {- cmds = append(cmds, m.buildSpinner.Tick)- }- return m, tea.Batch(cmds...)+ return m, m.Tick()case shared.StreamMessageError:m.apiErr = msg.Error@@ -384,7 +367,7 @@ func (m *streamUIModel) streamUpdate(msg *shared.StreamMessage, deferUIUpdate bom.processing = falseif m.building {- return m, m.buildSpinner.Tick+ return m, m.Tick()}}@@ -484,7 +467,10 @@ func (m *streamUIModel) selectedMissingFileOpt() (tea.Model, tea.Cmd) {m.promptedMissingFile = truem.processing = true- return m, m.spinner.Tick+ return m, func() tea.Msg {+ <-m.sharedTicker.C+ return spinner.TickMsg{}+ }}func (m *streamUIModel) checkMissingFile(msg *shared.StreamMessage) (tea.Model, tea.Cmd) {@@ -494,7 +480,10 @@ func (m *streamUIModel) checkMissingFile(msg *shared.StreamMessage) (tea.Model,m.autoLoadedMissingFile = truereturn m, tea.Batch(- m.spinner.Tick,+ func() tea.Msg {+ <-m.sharedTicker.C+ return spinner.TickMsg{}+ },func() tea.Msg {bytes, err := os.ReadFile(msg.MissingFilePath)if err != nil {