git.iko.soy/crush
on main help sign in
feat: show progress bar on iterm2 and rio
commit2c97eb8a5ba3a25d4ebc703cb2ed154b8c7afd42 authorAndrey Nering <andreynering@users.noreply.github.com> dateWed 26 Nov 2025, 16:40 (1 year ago) parent7272a90
4 files changed+29−3
compare with main
unifiedsplit
go.mod+1 go.sum+2 internal/stringext/string.go+11 internal/tui/tui.go+15−3
go.mod+1
@@ -54,6 +54,7 @@ require (
5454 github.com/stretchr/testify v1.11.1
5555 github.com/tidwall/sjson v1.2.5
5656 github.com/zeebo/xxh3 v1.0.2
57+ golang.org/x/mod v0.30.0
5758 golang.org/x/sync v0.18.0
5859 golang.org/x/text v0.31.0
5960 gopkg.in/natefinch/lumberjack.v2 v2.2.1
go.sum+2
@@ -378,6 +378,8 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
378378golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
379379golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
380380golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
381+golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
382+golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
381383golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
382384golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
383385golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
internal/stringext/string.go+11
@@ -1,6 +1,8 @@
11package stringext
22
33import (
4+ "strings"
5+
46 "golang.org/x/text/cases"
57 "golang.org/x/text/language"
68)
@@ -8,3 +10,12 @@ import (
810func Capitalize(text string) string {
911 return cases.Title(language.English, cases.Compact).String(text)
1012}
13+
14+func ContainsAny(str string, args ...string) bool {
15+ for _, arg := range args {
16+ if strings.Contains(str, arg) {
17+ return true
18+ }
19+ }
20+ return false
21+}
internal/tui/tui.go+15−3
@@ -4,6 +4,7 @@ import (
44 "context"
55 "fmt"
66 "math/rand"
7+ "regexp"
78 "slices"
89 "strings"
910 "time"
@@ -17,6 +18,7 @@ import (
1718 "github.com/charmbracelet/crush/internal/event"
1819 "github.com/charmbracelet/crush/internal/permission"
1920 "github.com/charmbracelet/crush/internal/pubsub"
21+ "github.com/charmbracelet/crush/internal/stringext"
2022 cmpChat "github.com/charmbracelet/crush/internal/tui/components/chat"
2123 "github.com/charmbracelet/crush/internal/tui/components/chat/splash"
2224 "github.com/charmbracelet/crush/internal/tui/components/completions"
@@ -34,6 +36,7 @@ import (
3436 "github.com/charmbracelet/crush/internal/tui/page/chat"
3537 "github.com/charmbracelet/crush/internal/tui/styles"
3638 "github.com/charmbracelet/crush/internal/tui/util"
39+ "golang.org/x/mod/semver"
3740 "golang.org/x/text/cases"
3841 "golang.org/x/text/language"
3942)
@@ -120,10 +123,19 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
120123 a.sendProgressBar = slices.Contains(msg, "WT_SESSION")
121124 }
122125 case tea.TerminalVersionMsg:
126+ if a.sendProgressBar {
127+ return a, nil
128+ }
123129 termVersion := strings.ToLower(msg.Name)
124− // Only enable progress bar for the following terminals.
125− if !a.sendProgressBar {
126− a.sendProgressBar = strings.Contains(termVersion, "ghostty")
130+ switch {
131+ case stringext.ContainsAny(termVersion, "ghostty", "rio"):
132+ a.sendProgressBar = true
133+ case strings.Contains(termVersion, "iterm2"):
134+ // iTerm2 supports progress bars from version v3.6.6
135+ matches := regexp.MustCompile(`^iterm2 (\d+\.\d+\.\d+)$`).FindStringSubmatch(termVersion)
136+ if len(matches) == 2 && semver.Compare("v"+matches[1], "v3.6.6") >= 0 {
137+ a.sendProgressBar = true
138+ }
127139 }
128140 return a, nil
129141 case tea.KeyboardEnhancementsMsg: