git.iko.soy/crush
on main help sign in
feat: show progress bar on iterm2 and rio
2c97eb8Andrey Nering
go.mod+1
compare with main
unifiedsplit
@@ -54,6 +54,7 @@ require (
54 github.com/stretchr/testify v1.11.1
54 github.com/stretchr/testify v1.11.1
55 github.com/tidwall/sjson v1.2.5
55 github.com/tidwall/sjson v1.2.5
56 github.com/zeebo/xxh3 v1.0.2
56 github.com/zeebo/xxh3 v1.0.2
57+ golang.org/x/mod v0.30.0
57 golang.org/x/sync v0.18.0
58 golang.org/x/sync v0.18.0
58 golang.org/x/text v0.31.0
59 golang.org/x/text v0.31.0
59 gopkg.in/natefinch/lumberjack.v2 v2.2.1
60 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=
378golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
378golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
379golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
379golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
380golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
380golang.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=
381golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
383golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
382golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
384golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
383golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
385golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
internal/stringext/string.go+11
@@ -1,6 +1,8 @@
1package stringext
1package stringext
2
2
3import (
3import (
4+ "strings"
5+
4 "golang.org/x/text/cases"
6 "golang.org/x/text/cases"
5 "golang.org/x/text/language"
7 "golang.org/x/text/language"
6)
8)
@@ -8,3 +10,12 @@ import (
8func Capitalize(text string) string {
10func Capitalize(text string) string {
9 return cases.Title(language.English, cases.Compact).String(text)
11 return cases.Title(language.English, cases.Compact).String(text)
10}
12}
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 (
4 "context"
4 "context"
5 "fmt"
5 "fmt"
6 "math/rand"
6 "math/rand"
7+ "regexp"
7 "slices"
8 "slices"
8 "strings"
9 "strings"
9 "time"
10 "time"
@@ -17,6 +18,7 @@ import (
17 "github.com/charmbracelet/crush/internal/event"
18 "github.com/charmbracelet/crush/internal/event"
18 "github.com/charmbracelet/crush/internal/permission"
19 "github.com/charmbracelet/crush/internal/permission"
19 "github.com/charmbracelet/crush/internal/pubsub"
20 "github.com/charmbracelet/crush/internal/pubsub"
21+ "github.com/charmbracelet/crush/internal/stringext"
20 cmpChat "github.com/charmbracelet/crush/internal/tui/components/chat"
22 cmpChat "github.com/charmbracelet/crush/internal/tui/components/chat"
21 "github.com/charmbracelet/crush/internal/tui/components/chat/splash"
23 "github.com/charmbracelet/crush/internal/tui/components/chat/splash"
22 "github.com/charmbracelet/crush/internal/tui/components/completions"
24 "github.com/charmbracelet/crush/internal/tui/components/completions"
@@ -34,6 +36,7 @@ import (
34 "github.com/charmbracelet/crush/internal/tui/page/chat"
36 "github.com/charmbracelet/crush/internal/tui/page/chat"
35 "github.com/charmbracelet/crush/internal/tui/styles"
37 "github.com/charmbracelet/crush/internal/tui/styles"
36 "github.com/charmbracelet/crush/internal/tui/util"
38 "github.com/charmbracelet/crush/internal/tui/util"
39+ "golang.org/x/mod/semver"
37 "golang.org/x/text/cases"
40 "golang.org/x/text/cases"
38 "golang.org/x/text/language"
41 "golang.org/x/text/language"
39)
42)
@@ -120,10 +123,19 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
120 a.sendProgressBar = slices.Contains(msg, "WT_SESSION")
123 a.sendProgressBar = slices.Contains(msg, "WT_SESSION")
121 }
124 }
122 case tea.TerminalVersionMsg:
125 case tea.TerminalVersionMsg:
126+ if a.sendProgressBar {
127+ return a, nil
128+ }
123 termVersion := strings.ToLower(msg.Name)
129 termVersion := strings.ToLower(msg.Name)
124− // Only enable progress bar for the following terminals.
130+ switch {
125− if !a.sendProgressBar {
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 {
126− a.sendProgressBar = strings.Contains(termVersion, "ghostty")
137+ a.sendProgressBar = true
138+ }
127 }
139 }
128 return a, nil
140 return a, nil
129 case tea.KeyboardEnhancementsMsg:
141 case tea.KeyboardEnhancementsMsg: