fix(confirm,choose,file,input): timeout handling

choose/command.go

@@ -11,6 +11,7 @@ import (
 	"github.com/charmbracelet/x/ansi"
 	"github.com/charmbracelet/x/term"
 
+	"github.com/charmbracelet/gum/internal/exit"
 	"github.com/charmbracelet/gum/internal/stdin"
 )
 
@@ -76,8 +77,12 @@ func (o Options) Run() error {
 			WithWidth(width).
 			WithShowHelp(o.ShowHelp).
 			WithTheme(theme).
+			WithTimeout(o.Timeout).
 			Run()
-		if err != nil && !errors.Is(err, huh.ErrTimeout) {
+		if err != nil {
+			if errors.Is(err, huh.ErrTimeout) {
+				return exit.NewTimeout(o.Timeout)
+			}
 			return err
 		}
 		if len(choices) > 0 {
@@ -100,9 +105,13 @@ func (o Options) Run() error {
 	).
 		WithWidth(width).
 		WithTheme(theme).
+		WithTimeout(o.Timeout).
 		WithShowHelp(o.ShowHelp).
 		Run()
-	if err != nil && !errors.Is(err, huh.ErrTimeout) {
+	if err != nil {
+		if errors.Is(err, huh.ErrTimeout) {
+			return exit.NewTimeout(o.Timeout)
+		}
 		return err
 	}
 

confirm/command.go

@@ -2,9 +2,9 @@ package confirm
 
 import (
 	"errors"
-	"fmt"
 	"os"
 
+	"github.com/charmbracelet/gum/internal/exit"
 	"github.com/charmbracelet/huh"
 )
 
@@ -31,11 +31,11 @@ func (o Options) Run() error {
 		WithTheme(theme).
 		WithShowHelp(o.ShowHelp).
 		Run()
-
 	if err != nil {
-		if !o.errIsValidTimeout(err) {
-			return fmt.Errorf("unable to run confirm: %w", err)
+		if errors.Is(err, huh.ErrTimeout) {
+			return exit.NewTimeout(o.Timeout)
 		}
+		return err
 	}
 
 	if !choice {
@@ -44,11 +44,3 @@ func (o Options) Run() error {
 
 	return nil
 }
-
-// errIsValidTimeout returns false unless 1) the user has specified a nonzero timeout and 2) the error is a huh.ErrTimeout.
-func (o Options) errIsValidTimeout(err error) bool {
-	errWasTimeout := errors.Is(err, huh.ErrTimeout)
-	timeoutsExpected := o.Timeout > 0
-
-	return errWasTimeout && timeoutsExpected
-}

file/command.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"path/filepath"
 
+	"github.com/charmbracelet/gum/internal/exit"
 	"github.com/charmbracelet/huh"
 	"github.com/charmbracelet/lipgloss"
 )
@@ -49,12 +50,15 @@ func (o Options) Run() error {
 				Value(&path),
 		),
 	).
+		WithTimeout(o.Timeout).
 		WithShowHelp(o.ShowHelp).
 		WithKeyMap(keymap).
 		WithTheme(theme).
 		Run()
-
 	if err != nil {
+		if errors.Is(err, huh.ErrTimeout) {
+			return exit.NewTimeout(o.Timeout)
+		}
 		return err
 	}
 

input/command.go

@@ -1,6 +1,7 @@
 package input
 
 import (
+	"errors"
 	"fmt"
 	"os"
 
@@ -9,6 +10,7 @@ import (
 	"github.com/charmbracelet/huh"
 	"github.com/charmbracelet/lipgloss"
 
+	"github.com/charmbracelet/gum/internal/exit"
 	"github.com/charmbracelet/gum/internal/stdin"
 )
 
@@ -53,10 +55,14 @@ func (o Options) Run() error {
 		WithWidth(o.Width).
 		WithTheme(theme).
 		WithKeyMap(keymap).
+		WithTimeout(o.Timeout).
 		WithShowHelp(o.ShowHelp).
 		WithProgramOptions(tea.WithOutput(os.Stderr)).
 		Run()
 	if err != nil {
+		if errors.Is(err, huh.ErrTimeout) {
+			return exit.NewTimeout(o.Timeout)
+		}
 		return err
 	}
 

internal/exit/exit.go

@@ -1,9 +1,35 @@
 package exit
 
-import "fmt"
+import (
+	"fmt"
+	"time"
+
+	"github.com/charmbracelet/huh"
+)
+
+// StatusTimeout is the exit code for timed out commands.
+const StatusTimeout = 124
 
 // StatusAborted is the exit code for aborted commands.
 const StatusAborted = 130
 
-// ErrAborted is the error to return when a gum command is aborted by Ctrl + C.
+// ErrAborted is the error to return when a gum command is aborted by Ctrl+C.
 var ErrAborted = fmt.Errorf("aborted")
+
+// NewTimeout returns a new ErrTimeout.
+func NewTimeout(d time.Duration) ErrTimeout {
+	return ErrTimeout{d: d}
+}
+
+// ErrTimeout is a time out error.
+type ErrTimeout struct {
+	d time.Duration
+}
+
+func (e ErrTimeout) Error() string {
+	return "timed out after " + e.d.String()
+}
+
+func (e ErrTimeout) Unwrap() error {
+	return huh.ErrTimeout
+}

main.go

@@ -73,6 +73,10 @@ func main() {
 		},
 	)
 	if err := ctx.Run(); err != nil {
+		if errors.Is(err, huh.ErrTimeout) {
+			fmt.Println(err)
+			os.Exit(exit.StatusTimeout)
+		}
 		if errors.Is(err, exit.ErrAborted) || errors.Is(err, huh.ErrUserAborted) {
 			os.Exit(exit.StatusAborted)
 		}