Merge pull request #2146 from dgageot/better-tmux

Better rendering in tmux and ghostty

Author: dgageot

cmd/root/new.go

@@ -108,15 +108,7 @@ func runTUI(ctx context.Context, rt runtime.Runtime, sess *session.Session, spaw
 	wd, _ := os.Getwd()
 	model := tui.New(ctx, spawner, a, wd, cleanup)
 
-	programOpts := []tea.ProgramOption{tea.WithContext(ctx), tea.WithFilter(filter)}
-
-	// Terminal multiplexers can drop frames at the default 60 FPS, making
-	// spinners appear static. Cap the renderer at 30 FPS when detected.
-	if inMultiplexer() {
-		programOpts = append(programOpts, tea.WithFPS(30))
-	}
-
-	p := tea.NewProgram(model, programOpts...)
+	p := tea.NewProgram(model, tea.WithContext(ctx), tea.WithFilter(filter))
 	coalescer.SetSender(p.Send)
 
 	if m, ok := model.(interface{ SetProgram(p *tea.Program) }); ok {
@@ -126,16 +118,3 @@ func runTUI(ctx context.Context, rt runtime.Runtime, sess *session.Session, spaw
 	_, err := p.Run()
 	return err
 }
-
-// inMultiplexer reports whether the process is running inside a terminal
-// multiplexer (tmux, screen).
-func inMultiplexer() bool {
-	if os.Getenv("TMUX") != "" {
-		return true
-	}
-	if os.Getenv("STY") != "" {
-		return true
-	}
-	term := os.Getenv("TERM")
-	return strings.HasPrefix(term, "tmux") || strings.HasPrefix(term, "screen")
-}

pkg/tui/components/scrollbar/scrollbar.go

@@ -35,7 +35,7 @@ func New() *Model {
 	return &Model{
 		width:     Width,
 		trackChar: "⎪",
-		thumbChar: "┃",
+		thumbChar: "⎪",
 	}
 }
 

pkg/tui/components/spinner/spinner.go

@@ -2,7 +2,6 @@ package spinner
 
 import (
 	"math/rand/v2"
-	"os"
 	"strings"
 
 	tea "charm.land/bubbletea/v2"
@@ -138,37 +137,7 @@ func (s *spinner) Stop() {
 }
 
 // spinnerFrames holds the animation frames for the current terminal.
-// Braille characters are used by default; inside tmux they don't render
-// correctly, so we fall back to ASCII.
-var spinnerFrames = selectFrames(inMultiplexer())
-
-// inMultiplexer reports whether the process is running inside a terminal
-// multiplexer (tmux, screen). Detection checks multiple env vars because
-// some of them may be stripped in containers or sudo sessions.
-func inMultiplexer() bool {
-	if os.Getenv("TMUX") != "" {
-		return true
-	}
-	if os.Getenv("STY") != "" { // GNU screen
-		return true
-	}
-	term := os.Getenv("TERM")
-	return strings.HasPrefix(term, "tmux") || strings.HasPrefix(term, "screen")
-}
-
-var (
-	brailleFrames = []string{"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"}
-	asciiFrames   = []string{"|", "/", "-", "\\"}
-)
-
-// selectFrames returns ASCII spinner frames when inTmux is true,
-// braille frames otherwise.
-func selectFrames(inTmux bool) []string {
-	if inTmux {
-		return asciiFrames
-	}
-	return brailleFrames
-}
+var spinnerFrames = []string{"⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"}
 
 // Frame returns the spinner character for the given animation frame.
 func Frame(index int) string {

pkg/tui/components/spinner/spinner_test.go

@@ -28,38 +28,6 @@ func TestFrameWrapsAround(t *testing.T) {
 	require.Equal(t, spinnerFrames[0], Frame(n), "Frame should wrap around")
 }
 
-func TestSelectFrames(t *testing.T) {
-	require.Equal(t, brailleFrames, selectFrames(false))
-	require.Equal(t, asciiFrames, selectFrames(true))
-}
-
-func TestInMultiplexer(t *testing.T) {
-	tests := []struct {
-		name string
-		env  map[string]string
-		want bool
-	}{
-		{"plain terminal", map[string]string{"TERM": "xterm-256color"}, false},
-		{"TMUX set", map[string]string{"TMUX": "/tmp/tmux-1000/default,123,0"}, true},
-		{"STY set", map[string]string{"STY": "12345.pts-0"}, true},
-		{"TERM=tmux-256color", map[string]string{"TERM": "tmux-256color"}, true},
-		{"TERM=screen-256color", map[string]string{"TERM": "screen-256color"}, true},
-		{"TERM=screen", map[string]string{"TERM": "screen"}, true},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			// Clear all multiplexer env vars
-			t.Setenv("TMUX", "")
-			t.Setenv("STY", "")
-			t.Setenv("TERM", "")
-			for k, v := range tt.env {
-				t.Setenv(k, v)
-			}
-			require.Equal(t, tt.want, inMultiplexer())
-		})
-	}
-}
-
 func BenchmarkSpinner_ModeSpinnerOnly(b *testing.B) {
 	s := New(ModeSpinnerOnly, lipgloss.NewStyle())
 	for b.Loop() {