on main help sign in
Merge branch 'main' into ui
commit81ec622c38fdc48fca3d12668a3be001ffeb6c77 authorAyman Bagabas <ayman.bagabas@gmail.com> dateTue 2 Dec 2025, 11:48 (1 year ago) parentf48a3ed431d6fb
9 files changed+149−15
.goreleaser.yml+2−3 go.mod+3−2 go.sum+6 internal/cmd/login.go+108 internal/cmd/root.go+3−5 internal/config/config.go+1−1 internal/stringext/string.go+11 internal/tui/tui.go+15−3 schema.json−1
.goreleaser.yml+2−3
@@ -235,11 +235,10 @@ nfpms:
235235
236236signs:
237237 - cmd: cosign
238− certificate: "${artifact}.pem"
238+ signature: "${artifact}.sigstore.json"
239239 args:
240240 - sign-blob
241− - "--output-certificate=${certificate}"
242− - "--output-signature=${signature}"
241+ - "--bundle=${signature}"
243242 - "${artifact}"
244243 - "--yes"
245244 artifacts: checksum
go.mod+3−2
@@ -4,7 +4,7 @@ go 1.25.0
44
55require (
66 charm.land/bubbles/v2 v2.0.0-rc.1
7− charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251126220703-2a0096c500a7
7+ charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251202162339-5fa38b798f16
88 charm.land/fantasy v0.3.2
99 charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251119143523-0334bb4562ca
1010 charm.land/x/vcr v0.1.1
@@ -21,7 +21,7 @@ require (
2121 github.com/charmbracelet/fang v0.4.4
2222 github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930
2323 github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0
24− github.com/charmbracelet/ultraviolet v0.0.0-20251116181749-377898bcce38
24+ github.com/charmbracelet/ultraviolet v0.0.0-20251202162030-ecc8c1ae4b2b
2525 github.com/charmbracelet/x/ansi v0.11.2
2626 github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3
2727 github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f
@@ -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+6
@@ -2,6 +2,8 @@ charm.land/bubbles/v2 v2.0.0-rc.1 h1:EiIFVAc3Zi/yY86td+79mPhHR7AqZ1OxF+6ztpOCRaM
22charm.land/bubbles/v2 v2.0.0-rc.1/go.mod h1:5AbN6cEd/47gkEf8TgiQ2O3RZ5QxMS14l9W+7F9fPC4=
33charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251126220703-2a0096c500a7 h1:3qsObfEm0WuACFhe3MSTPX8QByjVcjWkZDO4o2VWFpc=
44charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251126220703-2a0096c500a7/go.mod h1:IXFmnCnMLTWw/KQ9rEatSYqbAPAYi8kA3Yqwa1SFnLk=
5+charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251202162339-5fa38b798f16 h1:9iVAss7WF8Ax5QBzmZE77aA08JbOMuDpbEhl/Uvc3Eo=
6+charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251202162339-5fa38b798f16/go.mod h1:Vsh7/MLC7LQ2Ab8H63SXm6yD/L6o4HDvhdD/IrIRXrU=
57charm.land/fantasy v0.3.2 h1:yHTsSZ25LcICMRw3xzdz3OkaZtDQch+B5ljJo17HxgU=
68charm.land/fantasy v0.3.2/go.mod h1:sV8Ns/JTJHOaYOHPgVRDugMheAyxsW/nmdpVGrycYEk=
79charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251119143523-0334bb4562ca h1:6bVc8OFotCS4sS7HKqxTudP7yn8Y0ODR6df2pdlY/+s=
@@ -100,6 +102,8 @@ github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0 h1:lxHzxsHd4P
100102github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0/go.mod h1:Q7oMtlboDPnnrYiJDXNwdWmJblOmuOnycPKczlVju6I=
101103github.com/charmbracelet/ultraviolet v0.0.0-20251116181749-377898bcce38 h1:7Rs87fbKJoIIxsQS8YKJYGYa0tlsDwwb0twQjV1KB+g=
102104github.com/charmbracelet/ultraviolet v0.0.0-20251116181749-377898bcce38/go.mod h1:6lfcr3MNP+kZR25sF1nQwJFuQnNYBlFy3PGX5rvslXc=
105+github.com/charmbracelet/ultraviolet v0.0.0-20251202162030-ecc8c1ae4b2b h1:jY1J0PcfetoB1uJ+w8rd86gUFSpKpJJI35gnfpKF5hg=
106+github.com/charmbracelet/ultraviolet v0.0.0-20251202162030-ecc8c1ae4b2b/go.mod h1:Y6kE2GzHfkyQQVCSL9r2hwokSrIlHGzZG+71+wDYSZI=
103107github.com/charmbracelet/x/ansi v0.11.2 h1:XAG3FSjiVtFvgEgGrNBkCNNYrsucAt8c6bfxHyROLLs=
104108github.com/charmbracelet/x/ansi v0.11.2/go.mod h1:9tY2bzX5SiJCU0iWyskjBeI2BRQfvPqI+J760Mjf+Rg=
105109github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3 h1:1xwHZg6eMZ9Wv5TE1UGub6ARubyOd1Lo5kPUI/6VL50=
@@ -378,6 +382,8 @@ golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
378382golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
379383golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
380384golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
385+golang.org/x/mod v0.30.0 h1:fDEXFVZ/fmCKProc/yAXXUijritrDzahmwwefnjoPFk=
386+golang.org/x/mod v0.30.0/go.mod h1:lAsf5O2EvJeSFMiBxXDki7sCgAxEUcZHXoXMKT4GJKc=
381387golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
382388golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
383389golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
internal/cmd/login.gonew file+108
@@ -0,0 +1,108 @@
1+package cmd
2+
3+import (
4+ "cmp"
5+ "context"
6+ "fmt"
7+ "os"
8+ "os/signal"
9+ "strings"
10+
11+ "charm.land/lipgloss/v2"
12+ "github.com/charmbracelet/crush/internal/config"
13+ "github.com/charmbracelet/crush/internal/oauth/claude"
14+ "github.com/spf13/cobra"
15+)
16+
17+var loginCmd = &cobra.Command{
18+ Aliases: []string{"auth"},
19+ Use: "login [platform]",
20+ Short: "Login Crush to a platform",
21+ Long: `Login Crush to a specified platform.
22+The platform should be provided as an argument.
23+Available platforms are: claude.`,
24+ Example: `
25+# Authenticate with Claude Code Max
26+crush login claude
27+ `,
28+ ValidArgs: []cobra.Completion{
29+ "claude",
30+ "anthropic",
31+ },
32+ Args: cobra.ExactArgs(1),
33+ RunE: func(cmd *cobra.Command, args []string) error {
34+ if len(args) > 1 {
35+ return fmt.Errorf("wrong number of arguments")
36+ }
37+ if len(args) == 0 || args[0] == "" {
38+ return cmd.Help()
39+ }
40+
41+ app, err := setupAppWithProgressBar(cmd)
42+ if err != nil {
43+ return err
44+ }
45+ defer app.Shutdown()
46+
47+ switch args[0] {
48+ case "anthropic", "claude":
49+ return loginClaude()
50+ default:
51+ return fmt.Errorf("unknown platform: %s", args[0])
52+ }
53+ },
54+}
55+
56+func loginClaude() error {
57+ ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, os.Kill)
58+ go func() {
59+ <-ctx.Done()
60+ cancel()
61+ os.Exit(1)
62+ }()
63+
64+ verifier, challenge, err := claude.GetChallenge()
65+ if err != nil {
66+ return err
67+ }
68+ url, err := claude.AuthorizeURL(verifier, challenge)
69+ if err != nil {
70+ return err
71+ }
72+ fmt.Println("Open the following URL and follow the instructions to authenticate with Claude Code Max:")
73+ fmt.Println()
74+ fmt.Println(lipgloss.NewStyle().Hyperlink(url, "id=claude").Render(url))
75+ fmt.Println()
76+ fmt.Println("Press enter to continue...")
77+ if _, err := fmt.Scanln(); err != nil {
78+ return err
79+ }
80+
81+ fmt.Println("Now paste and code from Anthropic and press enter...")
82+ fmt.Println()
83+ fmt.Print("> ")
84+ var code string
85+ for code == "" {
86+ _, _ = fmt.Scanln(&code)
87+ code = strings.TrimSpace(code)
88+ }
89+
90+ fmt.Println()
91+ fmt.Println("Exchanging authorization code...")
92+ token, err := claude.ExchangeToken(ctx, code, verifier)
93+ if err != nil {
94+ return err
95+ }
96+
97+ cfg := config.Get()
98+ if err := cmp.Or(
99+ cfg.SetConfigField("providers.anthropic.api_key", token.AccessToken),
100+ cfg.SetConfigField("providers.anthropic.oauth", token),
101+ ); err != nil {
102+ return err
103+ }
104+
105+ fmt.Println()
106+ fmt.Println("You're now authenticated with Claude Code Max!")
107+ return nil
108+}
internal/cmd/root.go+3−5
@@ -19,6 +19,7 @@ import (
1919 "github.com/charmbracelet/crush/internal/config"
2020 "github.com/charmbracelet/crush/internal/db"
2121 "github.com/charmbracelet/crush/internal/event"
22+ "github.com/charmbracelet/crush/internal/stringext"
2223 termutil "github.com/charmbracelet/crush/internal/term"
2324 "github.com/charmbracelet/crush/internal/tui"
2425 "github.com/charmbracelet/crush/internal/ui/common"
@@ -45,6 +46,7 @@ func init() {
4546 updateProvidersCmd,
4647 logsCmd,
4748 schemaCmd,
49+ loginCmd,
4850 )
4951}
5052
@@ -276,9 +278,5 @@ func shouldQueryTerminalVersion(env uv.Environ) bool {
276278 return (!okTermProg && !okSSHTTY) ||
277279 (!strings.Contains(termProg, "Apple") && !okSSHTTY) ||
278280 // Terminals that do support XTVERSION.
279− strings.Contains(termType, "ghostty") ||
280− strings.Contains(termType, "wezterm") ||
281− strings.Contains(termType, "alacritty") ||
282− strings.Contains(termType, "kitty") ||
283− strings.Contains(termType, "rio")
281+ stringext.ContainsAny(termType, "alacritty", "ghostty", "kitty", "rio", "wezterm")
284282}
internal/config/config.go+1−1
@@ -73,7 +73,7 @@ type SelectedModel struct {
7373 Think bool `json:"think,omitempty" jsonschema:"description=Enable thinking mode for Anthropic models that support reasoning"`
7474
7575 // Overrides the default model configuration.
76− MaxTokens int64 `json:"max_tokens,omitempty" jsonschema:"description=Maximum number of tokens for model responses,minimum=1,maximum=200000,example=4096"`
76+ MaxTokens int64 `json:"max_tokens,omitempty" jsonschema:"description=Maximum number of tokens for model responses,maximum=200000,example=4096"`
7777 Temperature *float64 `json:"temperature,omitempty" jsonschema:"description=Sampling temperature,minimum=0,maximum=1,example=0.7"`
7878 TopP *float64 `json:"top_p,omitempty" jsonschema:"description=Top-p (nucleus) sampling parameter,minimum=0,maximum=1,example=0.9"`
7979 TopK *int64 `json:"top_k,omitempty" jsonschema:"description=Top-k sampling parameter"`
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:
schema.json−1
@@ -555,7 +555,6 @@
555555 "max_tokens": {
556556 "type": "integer",
557557 "maximum": 200000,
558− "minimum": 1,
559558 "description": "Maximum number of tokens for model responses",
560559 "examples": [
561560 4096