81ec622 · crush · git.iko.soy

.goreleaser.yml+2−3

compare with main

unifiedsplit

@@ -235,11 +235,10 @@ nfpms:

235

236signs:

237 - cmd: cosign

238− certificate: "${artifact}.pem"

238+ signature: "${artifact}.sigstore.json"

239 args:

240 - sign-blob

241− - "--output-certificate=${certificate}"

242− - "--output-signature=${signature}"

241+ - "--bundle=${signature}"

243 - "${artifact}"

242 - "${artifact}"

244 - "--yes"

243 - "--yes"

245 artifacts: checksum

244 artifacts: checksum

go.mod+3−2

@@ -4,7 +4,7 @@ go 1.25.0

4

5require (

6 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

8 charm.land/fantasy v0.3.2

9 charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251119143523-0334bb4562ca

10 charm.land/x/vcr v0.1.1

@@ -21,7 +21,7 @@ require (

21 github.com/charmbracelet/fang v0.4.4

22 github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930

23 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

25 github.com/charmbracelet/x/ansi v0.11.2

26 github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3

27 github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f

@@ -54,6 +54,7 @@ require (

54 github.com/stretchr/testify v1.11.1

55 github.com/tidwall/sjson v1.2.5

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+6

@@ -2,6 +2,8 @@ charm.land/bubbles/v2 v2.0.0-rc.1 h1:EiIFVAc3Zi/yY86td+79mPhHR7AqZ1OxF+6ztpOCRaM

2charm.land/bubbles/v2 v2.0.0-rc.1/go.mod h1:5AbN6cEd/47gkEf8TgiQ2O3RZ5QxMS14l9W+7F9fPC4=

3charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251126220703-2a0096c500a7 h1:3qsObfEm0WuACFhe3MSTPX8QByjVcjWkZDO4o2VWFpc=

4charm.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=

5charm.land/fantasy v0.3.2 h1:yHTsSZ25LcICMRw3xzdz3OkaZtDQch+B5ljJo17HxgU=

7charm.land/fantasy v0.3.2 h1:yHTsSZ25LcICMRw3xzdz3OkaZtDQch+B5ljJo17HxgU=

6charm.land/fantasy v0.3.2/go.mod h1:sV8Ns/JTJHOaYOHPgVRDugMheAyxsW/nmdpVGrycYEk=

8charm.land/fantasy v0.3.2/go.mod h1:sV8Ns/JTJHOaYOHPgVRDugMheAyxsW/nmdpVGrycYEk=

7charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251119143523-0334bb4562ca h1:6bVc8OFotCS4sS7HKqxTudP7yn8Y0ODR6df2pdlY/+s=

9charm.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

100github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0/go.mod h1:Q7oMtlboDPnnrYiJDXNwdWmJblOmuOnycPKczlVju6I=

102github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0/go.mod h1:Q7oMtlboDPnnrYiJDXNwdWmJblOmuOnycPKczlVju6I=

101github.com/charmbracelet/ultraviolet v0.0.0-20251116181749-377898bcce38 h1:7Rs87fbKJoIIxsQS8YKJYGYa0tlsDwwb0twQjV1KB+g=

103github.com/charmbracelet/ultraviolet v0.0.0-20251116181749-377898bcce38 h1:7Rs87fbKJoIIxsQS8YKJYGYa0tlsDwwb0twQjV1KB+g=

102github.com/charmbracelet/ultraviolet v0.0.0-20251116181749-377898bcce38/go.mod h1:6lfcr3MNP+kZR25sF1nQwJFuQnNYBlFy3PGX5rvslXc=

104github.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=

103github.com/charmbracelet/x/ansi v0.11.2 h1:XAG3FSjiVtFvgEgGrNBkCNNYrsucAt8c6bfxHyROLLs=

107github.com/charmbracelet/x/ansi v0.11.2 h1:XAG3FSjiVtFvgEgGrNBkCNNYrsucAt8c6bfxHyROLLs=

104github.com/charmbracelet/x/ansi v0.11.2/go.mod h1:9tY2bzX5SiJCU0iWyskjBeI2BRQfvPqI+J760Mjf+Rg=

108github.com/charmbracelet/x/ansi v0.11.2/go.mod h1:9tY2bzX5SiJCU0iWyskjBeI2BRQfvPqI+J760Mjf+Rg=

105github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3 h1:1xwHZg6eMZ9Wv5TE1UGub6ARubyOd1Lo5kPUI/6VL50=

109github.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=

378golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=

382golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=

379golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=

383golang.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=

384golang.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=

381golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=

387golang.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=

388golang.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=

389golang.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 (

19 "github.com/charmbracelet/crush/internal/config"

20 "github.com/charmbracelet/crush/internal/db"

21 "github.com/charmbracelet/crush/internal/event"

22+ "github.com/charmbracelet/crush/internal/stringext"

22 termutil "github.com/charmbracelet/crush/internal/term"

23 termutil "github.com/charmbracelet/crush/internal/term"

23 "github.com/charmbracelet/crush/internal/tui"

24 "github.com/charmbracelet/crush/internal/tui"

24 "github.com/charmbracelet/crush/internal/ui/common"

25 "github.com/charmbracelet/crush/internal/ui/common"

@@ -45,6 +46,7 @@ func init() {

45 updateProvidersCmd,

46 updateProvidersCmd,

46 logsCmd,

47 logsCmd,

47 schemaCmd,

48 schemaCmd,

49+ loginCmd,

48 )

50 )

49}

51}

50

52

@@ -276,9 +278,5 @@ func shouldQueryTerminalVersion(env uv.Environ) bool {

276 return (!okTermProg && !okSSHTTY) ||

278 return (!okTermProg && !okSSHTTY) ||

277 (!strings.Contains(termProg, "Apple") && !okSSHTTY) ||

279 (!strings.Contains(termProg, "Apple") && !okSSHTTY) ||

278 // Terminals that do support XTVERSION.

280 // Terminals that do support XTVERSION.

279− strings.Contains(termType, "ghostty") ||

281+ stringext.ContainsAny(termType, "alacritty", "ghostty", "kitty", "rio", "wezterm")

280− strings.Contains(termType, "wezterm") ||

281− strings.Contains(termType, "alacritty") ||

282− strings.Contains(termType, "kitty") ||

283− strings.Contains(termType, "rio")

284}

282}

internal/config/config.go+1−1

@@ -73,7 +73,7 @@ type SelectedModel struct {

73 Think bool `json:"think,omitempty" jsonschema:"description=Enable thinking mode for Anthropic models that support reasoning"`

74

75 // 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"`

77 Temperature *float64 `json:"temperature,omitempty" jsonschema:"description=Sampling temperature,minimum=0,maximum=1,example=0.7"`

78 TopP *float64 `json:"top_p,omitempty" jsonschema:"description=Top-p (nucleus) sampling parameter,minimum=0,maximum=1,example=0.9"`

79 TopK *int64 `json:"top_k,omitempty" jsonschema:"description=Top-k sampling parameter"`

internal/stringext/string.go+11

@@ -1,6 +1,8 @@

1package stringext

2

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"

5 "fmt"

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:

schema.json−1

@@ -555,7 +555,6 @@

555 "max_tokens": {

556 "type": "integer",

557 "maximum": 200000,

558− "minimum": 1,

559 "description": "Maximum number of tokens for model responses",

558 "description": "Maximum number of tokens for model responses",

560 "examples": [

559 "examples": [

561 4096

560 4096