🐞 Release terminal without races, and accept stdin

pkg/output/tui/bubbletea964.go

@@ -28,8 +28,8 @@ import (
 //
 // TODO: Remove this function once the issue is resolved.
 func safeguardBubbletea964(in io.Reader) io.Reader {
-	if in == nil {
-		return nil
+	if in == nil || in == os.Stdin {
+		return in
 	}
 	if f, ok := in.(*os.File); ok {
 		if st, err := f.Stat(); err != nil {

pkg/output/tui/bubbletea964_test.go

@@ -45,6 +45,10 @@ func TestSafeguardBubbletea964(t *testing.T) {
 		name: "dev null",
 		in:   openFile(t, os.DevNull),
 		want: nil,
+	}, {
+		name: "stdin",
+		in:   os.Stdin,
+		want: os.Stdin,
 	}}
 	for _, tc := range tcs {
 		tc := tc

pkg/output/tui/progress.go

@@ -241,10 +241,9 @@ func (b *BubbleProgress) tickSpeed() tea.Cmd {
 
 func (b *BubbleProgress) start() {
 	b.prog = progress.New(progress.WithDefaultGradient())
-	out := b.OutOrStdout()
 	b.tea = tea.NewProgram(b,
 		tea.WithInput(safeguardBubbletea964(b.InOrStdin())),
-		tea.WithOutput(out),
+		tea.WithOutput(b.OutOrStdout()),
 	)
 	b.quitChan = make(chan struct{})
 	go func() {
@@ -253,11 +252,6 @@ func (b *BubbleProgress) start() {
 			b.teaErr = err
 		}
 		close(b.quitChan)
-		if term.IsWriterTerminal(out) {
-			if err := t.ReleaseTerminal(); err != nil {
-				panic(err)
-			}
-		}
 	}()
 }
 
@@ -269,6 +263,10 @@ func (b *BubbleProgress) stop() {
 	b.tea.Send(b.quitSignal())
 	<-b.quitChan
 
+	if term.IsWriterTerminal(b.OutOrStdout()) && b.teaErr == nil {
+		b.teaErr = b.tea.ReleaseTerminal()
+	}
+
 	b.tea = nil
 	b.quitChan = nil
 }

pkg/output/tui/spinner.go

@@ -78,10 +78,9 @@ func (b *BubbleSpinner) start() {
 		spinner.WithSpinner(spinner.Meter),
 		spinner.WithStyle(spinnerStyle()),
 	)
-	out := b.OutOrStdout()
 	b.tea = tea.NewProgram(b,
 		tea.WithInput(safeguardBubbletea964(b.InOrStdin())),
-		tea.WithOutput(out),
+		tea.WithOutput(b.OutOrStdout()),
 	)
 	b.quitChan = make(chan struct{})
 	go func() {
@@ -90,9 +89,6 @@ func (b *BubbleSpinner) start() {
 			b.teaErr = err
 		}
 		close(b.quitChan)
-		if term.IsWriterTerminal(out) {
-			_ = t.ReleaseTerminal()
-		}
 	}()
 }
 
@@ -104,6 +100,10 @@ func (b *BubbleSpinner) stop() {
 	b.tea.Quit()
 	<-b.quitChan
 
+	if term.IsWriterTerminal(b.OutOrStdout()) && b.teaErr == nil {
+		b.teaErr = b.tea.ReleaseTerminal()
+	}
+
 	b.tea = nil
 	b.quitChan = nil
 	endMsg := fmt.Sprintf("%s %s\n",