1696e72 · crush · git.iko.soy

Taskfile.yaml+1−1

compare with main

unifiedsplit

@@ -153,5 +153,5 @@ tasks:

153 desc: Update Fantasy and Catwalk

154 cmds:

155 - go get charm.land/fantasy

156− - go get github.com/charmbracelet/catwalk

156+ - go get charm.land/catwalk

157 - go mod tidy

go.mod+1−1

@@ -5,6 +5,7 @@ go 1.25.5

5require (

6 charm.land/bubbles/v2 v2.0.0-rc.1.0.20260109112849-ae99f46cec66

7 charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251216153312-819e2e89c62e

8+ charm.land/catwalk v0.16.0

8 charm.land/fantasy v0.6.1

9 charm.land/fantasy v0.6.1

9 charm.land/glamour/v2 v2.0.0-20260123212943-6014aa153a9b

10 charm.land/glamour/v2 v2.0.0-20260123212943-6014aa153a9b

10 charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971

11 charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971

@@ -19,7 +20,6 @@ require (

19 github.com/aymanbagabas/go-udiff v0.3.1

20 github.com/aymanbagabas/go-udiff v0.3.1

20 github.com/bmatcuk/doublestar/v4 v4.10.0

21 github.com/bmatcuk/doublestar/v4 v4.10.0

21 github.com/charlievieth/fastwalk v1.0.14

22 github.com/charlievieth/fastwalk v1.0.14

22− github.com/charmbracelet/catwalk v0.15.0

23 github.com/charmbracelet/colorprofile v0.4.1

24 github.com/charmbracelet/fang v0.4.4

25 github.com/charmbracelet/ultraviolet v0.0.0-20251212194010-b927aa605560

go.sum+2−2

@@ -2,6 +2,8 @@ charm.land/bubbles/v2 v2.0.0-rc.1.0.20260109112849-ae99f46cec66 h1:2BdJynsAW+8rv

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

3charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251216153312-819e2e89c62e h1:tXwTmgGpwZT7ParKF5xbEQBVjM2e1uKhKi/GpfU3mYQ=

4charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251216153312-819e2e89c62e/go.mod h1:pDM18flq3Z4njKZPA3zCvyVSSIJbMcoqlE82BdGUtL8=

5+charm.land/catwalk v0.16.0 h1:NP6lPz086OAsFdyYTRE6x1CyAosX6MpqdY303ntwsX0=

6+charm.land/catwalk v0.16.0/go.mod h1:kAdk/GjAJbl1AjRjmfU5c9lZfs7PeC3Uy9TgaVtlN64=

5charm.land/fantasy v0.6.1 h1:v3pavSHpZ5xTw98TpNYoj6DRq4ksCBWwJiZeiG/mVIc=

7charm.land/fantasy v0.6.1 h1:v3pavSHpZ5xTw98TpNYoj6DRq4ksCBWwJiZeiG/mVIc=

6charm.land/fantasy v0.6.1/go.mod h1:Ifj41bNnIXJ1aF6sLKcS9y3MzWbDnObmcHrCaaHfpZ0=

8charm.land/fantasy v0.6.1/go.mod h1:Ifj41bNnIXJ1aF6sLKcS9y3MzWbDnObmcHrCaaHfpZ0=

7charm.land/glamour/v2 v2.0.0-20260123212943-6014aa153a9b h1:A6IUUyChZDWP16RUdRJCfmYISAKWQGyIcfhZJUCViQ0=

9charm.land/glamour/v2 v2.0.0-20260123212943-6014aa153a9b h1:A6IUUyChZDWP16RUdRJCfmYISAKWQGyIcfhZJUCViQ0=

@@ -96,8 +98,6 @@ github.com/charlievieth/fastwalk v1.0.14 h1:3Eh5uaFGwHZd8EGwTjJnSpBkfwfsak9h6ICg

96github.com/charlievieth/fastwalk v1.0.14/go.mod h1:diVcUreiU1aQ4/Wu3NbxxH4/KYdKpLDojrQ1Bb2KgNY=

98github.com/charlievieth/fastwalk v1.0.14/go.mod h1:diVcUreiU1aQ4/Wu3NbxxH4/KYdKpLDojrQ1Bb2KgNY=

97github.com/charmbracelet/anthropic-sdk-go v0.0.0-20251024181547-21d6f3d9a904 h1:rwLdEpG9wE6kL69KkEKDiWprO8pQOZHZXeod6+9K+mw=

99github.com/charmbracelet/anthropic-sdk-go v0.0.0-20251024181547-21d6f3d9a904 h1:rwLdEpG9wE6kL69KkEKDiWprO8pQOZHZXeod6+9K+mw=

98github.com/charmbracelet/anthropic-sdk-go v0.0.0-20251024181547-21d6f3d9a904/go.mod h1:8TIYxZxsuCqqeJ0lga/b91tBwrbjoHDC66Sq5t8N2R4=

100github.com/charmbracelet/anthropic-sdk-go v0.0.0-20251024181547-21d6f3d9a904/go.mod h1:8TIYxZxsuCqqeJ0lga/b91tBwrbjoHDC66Sq5t8N2R4=

99−github.com/charmbracelet/catwalk v0.15.0 h1:5oWJdvchTPfF7855A0n40+XbZQz4+vouZ/NhQ661JKI=

100−github.com/charmbracelet/catwalk v0.15.0/go.mod h1:qg+Yl9oaZTkTvRscqbxfttzOFQ4v0pOT5XwC7b5O0NQ=

101github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=

102github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=

103github.com/charmbracelet/fang v0.4.4 h1:G4qKxF6or/eTPgmAolwPuRNyuci3hTUGGX1rj1YkHJY=

internal/agent/agent.go+1−1

@@ -22,6 +22,7 @@ import (

22 "sync"

23 "time"

24

25+ "charm.land/catwalk/pkg/catwalk"

25 "charm.land/fantasy"

26 "charm.land/fantasy"

26 "charm.land/fantasy/providers/anthropic"

27 "charm.land/fantasy/providers/anthropic"

27 "charm.land/fantasy/providers/bedrock"

28 "charm.land/fantasy/providers/bedrock"

@@ -29,7 +30,6 @@ import (

29 "charm.land/fantasy/providers/openai"

30 "charm.land/fantasy/providers/openai"

30 "charm.land/fantasy/providers/openrouter"

31 "charm.land/fantasy/providers/openrouter"

31 "charm.land/lipgloss/v2"

32 "charm.land/lipgloss/v2"

32− "github.com/charmbracelet/catwalk/pkg/catwalk"

33 "github.com/charmbracelet/crush/internal/agent/hyper"

34 "github.com/charmbracelet/crush/internal/agent/tools"

35 "github.com/charmbracelet/crush/internal/agent/tools/mcp"

internal/agent/common_test.go+1−1

@@ -8,13 +8,13 @@ import (

8 "testing"

9 "time"

10

11+ "charm.land/catwalk/pkg/catwalk"

11 "charm.land/fantasy"

12 "charm.land/fantasy"

12 "charm.land/fantasy/providers/anthropic"

13 "charm.land/fantasy/providers/anthropic"

13 "charm.land/fantasy/providers/openai"

14 "charm.land/fantasy/providers/openai"

14 "charm.land/fantasy/providers/openaicompat"

15 "charm.land/fantasy/providers/openaicompat"

15 "charm.land/fantasy/providers/openrouter"

16 "charm.land/fantasy/providers/openrouter"

16 "charm.land/x/vcr"

17 "charm.land/x/vcr"

17− "github.com/charmbracelet/catwalk/pkg/catwalk"

18 "github.com/charmbracelet/crush/internal/agent/prompt"

19 "github.com/charmbracelet/crush/internal/agent/tools"

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

internal/agent/coordinator.go+1−1

@@ -15,8 +15,8 @@ import (

15 "slices"

16 "strings"

17

18+ "charm.land/catwalk/pkg/catwalk"

18 "charm.land/fantasy"

19 "charm.land/fantasy"

19− "github.com/charmbracelet/catwalk/pkg/catwalk"

20 "github.com/charmbracelet/crush/internal/agent/hyper"

21 "github.com/charmbracelet/crush/internal/agent/prompt"

22 "github.com/charmbracelet/crush/internal/agent/tools"

internal/agent/hyper/provider.go+1−1

@@ -21,9 +21,9 @@ import (

21 "sync"

22 "time"

23

24+ "charm.land/catwalk/pkg/catwalk"

24 "charm.land/fantasy"

25 "charm.land/fantasy"

25 "charm.land/fantasy/object"

26 "charm.land/fantasy/object"

26− "github.com/charmbracelet/catwalk/pkg/catwalk"

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

28)

29

internal/app/app.go+1−1

@@ -15,9 +15,9 @@ import (

15 "time"

16

17 tea "charm.land/bubbletea/v2"

18+ "charm.land/catwalk/pkg/catwalk"

18 "charm.land/fantasy"

19 "charm.land/fantasy"

19 "charm.land/lipgloss/v2"

20 "charm.land/lipgloss/v2"

20− "github.com/charmbracelet/catwalk/pkg/catwalk"

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

22 "github.com/charmbracelet/crush/internal/agent/tools/mcp"

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

internal/app/provider_test.go+1−1

@@ -3,7 +3,7 @@ package app

3import (

4 "testing"

5

6− "github.com/charmbracelet/catwalk/pkg/catwalk"

6+ "charm.land/catwalk/pkg/catwalk"

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

8 "github.com/stretchr/testify/require"

9)

internal/cmd/models.go+1−1

@@ -7,8 +7,8 @@ import (

7 "sort"

8 "strings"

9

10+ "charm.land/catwalk/pkg/catwalk"

10 "charm.land/lipgloss/v2/tree"

11 "charm.land/lipgloss/v2/tree"

11− "github.com/charmbracelet/catwalk/pkg/catwalk"

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

13 "github.com/mattn/go-isatty"

14 "github.com/spf13/cobra"

internal/config/catwalk.go+2−2

@@ -7,8 +7,8 @@ import (

7 "sync"

8 "sync/atomic"

9

10− "github.com/charmbracelet/catwalk/pkg/catwalk"

10+ "charm.land/catwalk/pkg/catwalk"

11− "github.com/charmbracelet/catwalk/pkg/embedded"

11+ "charm.land/catwalk/pkg/embedded"

12)

13

14type catwalkClient interface {

internal/config/catwalk_test.go+1−1

@@ -7,7 +7,7 @@ import (

7 "os"

8 "testing"

9

10− "github.com/charmbracelet/catwalk/pkg/catwalk"

10+ "charm.land/catwalk/pkg/catwalk"

11 "github.com/stretchr/testify/require"

12)

13

internal/config/config.go+1−1

@@ -14,7 +14,7 @@ import (

14 "strings"

15 "time"

16

17− "github.com/charmbracelet/catwalk/pkg/catwalk"

17+ "charm.land/catwalk/pkg/catwalk"

18 hyperp "github.com/charmbracelet/crush/internal/agent/hyper"

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

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

internal/config/copilot.go+1−1

@@ -6,7 +6,7 @@ import (

6 "log/slog"

7 "testing"

8

9− "github.com/charmbracelet/catwalk/pkg/catwalk"

9+ "charm.land/catwalk/pkg/catwalk"

10 "github.com/charmbracelet/crush/internal/oauth"

11 "github.com/charmbracelet/crush/internal/oauth/copilot"

12)

internal/config/hyper.go+1−1

@@ -11,7 +11,7 @@ import (

11 "sync/atomic"

12 "time"

13

14− "github.com/charmbracelet/catwalk/pkg/catwalk"

14+ "charm.land/catwalk/pkg/catwalk"

15 "github.com/charmbracelet/crush/internal/agent/hyper"

16 xetag "github.com/charmbracelet/x/etag"

17)

internal/config/hyper_test.go+1−1

@@ -7,7 +7,7 @@ import (

7 "os"

8 "testing"

9

10− "github.com/charmbracelet/catwalk/pkg/catwalk"

10+ "charm.land/catwalk/pkg/catwalk"

11 "github.com/stretchr/testify/require"

12)

13

internal/config/load.go+1−1

@@ -16,7 +16,7 @@ import (

16 "strings"

17 "testing"

18

19− "github.com/charmbracelet/catwalk/pkg/catwalk"

19+ "charm.land/catwalk/pkg/catwalk"

20 "github.com/charmbracelet/crush/internal/agent/hyper"

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

22 "github.com/charmbracelet/crush/internal/env"

internal/config/load_test.go+1−1

@@ -7,7 +7,7 @@ import (

7 "path/filepath"

8 "testing"

9

10− "github.com/charmbracelet/catwalk/pkg/catwalk"

10+ "charm.land/catwalk/pkg/catwalk"

11 "github.com/charmbracelet/crush/internal/csync"

12 "github.com/charmbracelet/crush/internal/env"

13 "github.com/stretchr/testify/assert"

internal/config/provider.go+2−2

@@ -15,8 +15,8 @@ import (

15 "sync"

16 "time"

17

18− "github.com/charmbracelet/catwalk/pkg/catwalk"

18+ "charm.land/catwalk/pkg/catwalk"

19− "github.com/charmbracelet/catwalk/pkg/embedded"

19+ "charm.land/catwalk/pkg/embedded"

20 "github.com/charmbracelet/crush/internal/agent/hyper"

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

22 "github.com/charmbracelet/crush/internal/home"

internal/config/provider_empty_test.go+1−1

@@ -5,7 +5,7 @@ import (

5 "os"

6 "testing"

7

8− "github.com/charmbracelet/catwalk/pkg/catwalk"

8+ "charm.land/catwalk/pkg/catwalk"

9 "github.com/stretchr/testify/require"

10)

11

internal/config/provider_test.go+1−1

@@ -7,7 +7,7 @@ import (

7 "sync"

8 "testing"

9

10− "github.com/charmbracelet/catwalk/pkg/catwalk"

10+ "charm.land/catwalk/pkg/catwalk"

11 "github.com/stretchr/testify/require"

12)

13

internal/message/content.go+1−1

@@ -8,11 +8,11 @@ import (

8 "strings"

9 "time"

10

11+ "charm.land/catwalk/pkg/catwalk"

11 "charm.land/fantasy"

12 "charm.land/fantasy"

12 "charm.land/fantasy/providers/anthropic"

13 "charm.land/fantasy/providers/anthropic"

13 "charm.land/fantasy/providers/google"

14 "charm.land/fantasy/providers/google"

14 "charm.land/fantasy/providers/openai"

15 "charm.land/fantasy/providers/openai"

15− "github.com/charmbracelet/catwalk/pkg/catwalk"

16)

17

18type MessageRole string

internal/tui/components/chat/messages/messages.go+1−1

@@ -9,8 +9,8 @@ import (

9 "charm.land/bubbles/v2/key"

10 "charm.land/bubbles/v2/viewport"

11 tea "charm.land/bubbletea/v2"

12+ "charm.land/catwalk/pkg/catwalk"

12 "charm.land/lipgloss/v2"

13 "charm.land/lipgloss/v2"

13− "github.com/charmbracelet/catwalk/pkg/catwalk"

14 "github.com/charmbracelet/x/ansi"

15 "github.com/charmbracelet/x/exp/ordered"

16 "github.com/google/uuid"

internal/tui/components/chat/splash/splash.go+1−1

@@ -8,8 +8,8 @@ import (

8 "charm.land/bubbles/v2/key"

9 "charm.land/bubbles/v2/spinner"

10 tea "charm.land/bubbletea/v2"

11+ "charm.land/catwalk/pkg/catwalk"

11 "charm.land/lipgloss/v2"

12 "charm.land/lipgloss/v2"

12− "github.com/charmbracelet/catwalk/pkg/catwalk"

13 "github.com/charmbracelet/crush/internal/agent"

14 hyperp "github.com/charmbracelet/crush/internal/agent/hyper"

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

internal/tui/components/dialogs/models/list.go+1−1

@@ -7,7 +7,7 @@ import (

7 "strings"

8

9 tea "charm.land/bubbletea/v2"

10− "github.com/charmbracelet/catwalk/pkg/catwalk"

10+ "charm.land/catwalk/pkg/catwalk"

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

12 "github.com/charmbracelet/crush/internal/tui/exp/list"

13 "github.com/charmbracelet/crush/internal/tui/styles"

internal/tui/components/dialogs/models/list_recent_test.go+1−1

@@ -9,7 +9,7 @@ import (

9 "testing"

10

11 tea "charm.land/bubbletea/v2"

12− "github.com/charmbracelet/catwalk/pkg/catwalk"

12+ "charm.land/catwalk/pkg/catwalk"

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

14 "github.com/charmbracelet/crush/internal/log"

15 "github.com/charmbracelet/crush/internal/tui/exp/list"

internal/tui/components/dialogs/models/models.go+1−1

@@ -9,8 +9,8 @@ import (

9 "charm.land/bubbles/v2/key"

10 "charm.land/bubbles/v2/spinner"

11 tea "charm.land/bubbletea/v2"

12+ "charm.land/catwalk/pkg/catwalk"

12 "charm.land/lipgloss/v2"

13 "charm.land/lipgloss/v2"

13− "github.com/charmbracelet/catwalk/pkg/catwalk"

14 hyperp "github.com/charmbracelet/crush/internal/agent/hyper"

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

16 "github.com/charmbracelet/crush/internal/tui/components/core"

internal/ui/chat/messages.go+1−1

@@ -7,8 +7,8 @@ import (

7 "time"

8

9 tea "charm.land/bubbletea/v2"

10+ "charm.land/catwalk/pkg/catwalk"

10 "charm.land/lipgloss/v2"

11 "charm.land/lipgloss/v2"

11− "github.com/charmbracelet/catwalk/pkg/catwalk"

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

13 "github.com/charmbracelet/crush/internal/message"

14 "github.com/charmbracelet/crush/internal/ui/anim"

internal/ui/dialog/actions.go+1−1

@@ -7,7 +7,7 @@ import (

7 "path/filepath"

8

9 tea "charm.land/bubbletea/v2"

10− "github.com/charmbracelet/catwalk/pkg/catwalk"

10+ "charm.land/catwalk/pkg/catwalk"

11 "github.com/charmbracelet/crush/internal/commands"

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

13 "github.com/charmbracelet/crush/internal/message"

internal/ui/dialog/api_key_input.go+1−1

@@ -10,7 +10,7 @@ import (

10 "charm.land/bubbles/v2/spinner"

11 "charm.land/bubbles/v2/textinput"

12 tea "charm.land/bubbletea/v2"

13− "github.com/charmbracelet/catwalk/pkg/catwalk"

13+ "charm.land/catwalk/pkg/catwalk"

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

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

16 "github.com/charmbracelet/crush/internal/ui/styles"

internal/ui/dialog/models.go+1−1

@@ -10,7 +10,7 @@ import (

10 "charm.land/bubbles/v2/key"

11 "charm.land/bubbles/v2/textinput"

12 tea "charm.land/bubbletea/v2"

13− "github.com/charmbracelet/catwalk/pkg/catwalk"

13+ "charm.land/catwalk/pkg/catwalk"

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

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

16 "github.com/charmbracelet/crush/internal/uiutil"

internal/ui/dialog/models_item.go+1−1

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

1package dialog

2

3import (

4+ "charm.land/catwalk/pkg/catwalk"

4 "charm.land/lipgloss/v2"

5 "charm.land/lipgloss/v2"

5− "github.com/charmbracelet/catwalk/pkg/catwalk"

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

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

8 "github.com/charmbracelet/crush/internal/ui/styles"

internal/ui/dialog/oauth.go+1−1

@@ -9,8 +9,8 @@ import (

9 "charm.land/bubbles/v2/key"

10 "charm.land/bubbles/v2/spinner"

11 tea "charm.land/bubbletea/v2"

12+ "charm.land/catwalk/pkg/catwalk"

12 "charm.land/lipgloss/v2"

13 "charm.land/lipgloss/v2"

13− "github.com/charmbracelet/catwalk/pkg/catwalk"

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

15 "github.com/charmbracelet/crush/internal/oauth"

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

internal/ui/dialog/oauth_copilot.go+1−1

@@ -6,7 +6,7 @@ import (

6 "time"

7

8 tea "charm.land/bubbletea/v2"

9− "github.com/charmbracelet/catwalk/pkg/catwalk"

9+ "charm.land/catwalk/pkg/catwalk"

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

11 "github.com/charmbracelet/crush/internal/oauth/copilot"

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

internal/ui/dialog/oauth_hyper.go+1−1

@@ -6,7 +6,7 @@ import (

6 "time"

7

8 tea "charm.land/bubbletea/v2"

9− "github.com/charmbracelet/catwalk/pkg/catwalk"

9+ "charm.land/catwalk/pkg/catwalk"

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

11 "github.com/charmbracelet/crush/internal/oauth/hyper"

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

internal/ui/model/ui.go+1−1

@@ -22,8 +22,8 @@ import (

22 "charm.land/bubbles/v2/spinner"

23 "charm.land/bubbles/v2/textarea"

24 tea "charm.land/bubbletea/v2"

25+ "charm.land/catwalk/pkg/catwalk"

25 "charm.land/lipgloss/v2"

26 "charm.land/lipgloss/v2"

26− "github.com/charmbracelet/catwalk/pkg/catwalk"

27 "github.com/charmbracelet/crush/internal/agent/tools/mcp"

28 "github.com/charmbracelet/crush/internal/app"

29 "github.com/charmbracelet/crush/internal/commands"