chore: update catwalk and its import paths to `charm.land/catwalk`
commit1696e72e92298d205e74384de36f94143ecabc38
authorAndrey Nering <andreynering@users.noreply.github.com>
dateFri 30 Jan 2026, 12:55 (9 months ago)
parent87c2165
Taskfile.yaml+1−1
@@ -153,5 +153,5 @@ tasks:
153153 desc: Update Fantasy and Catwalk
154154 cmds:
155155 - go get charm.land/fantasy
156− - go get github.com/charmbracelet/catwalk
156+ - go get charm.land/catwalk
157157 - go mod tidy
go.mod+1−1
@@ -5,6 +5,7 @@ go 1.25.5
55require (
66 charm.land/bubbles/v2 v2.0.0-rc.1.0.20260109112849-ae99f46cec66
77 charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251216153312-819e2e89c62e
8+ charm.land/catwalk v0.16.0
89 charm.land/fantasy v0.6.1
910 charm.land/glamour/v2 v2.0.0-20260123212943-6014aa153a9b
1011 charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971
@@ -19,7 +20,6 @@ require (
1920 github.com/aymanbagabas/go-udiff v0.3.1
2021 github.com/bmatcuk/doublestar/v4 v4.10.0
2122 github.com/charlievieth/fastwalk v1.0.14
22− github.com/charmbracelet/catwalk v0.15.0
2323 github.com/charmbracelet/colorprofile v0.4.1
2424 github.com/charmbracelet/fang v0.4.4
2525 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
22charm.land/bubbles/v2 v2.0.0-rc.1.0.20260109112849-ae99f46cec66/go.mod h1:5AbN6cEd/47gkEf8TgiQ2O3RZ5QxMS14l9W+7F9fPC4=
33charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251216153312-819e2e89c62e h1:tXwTmgGpwZT7ParKF5xbEQBVjM2e1uKhKi/GpfU3mYQ=
44charm.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=
57charm.land/fantasy v0.6.1 h1:v3pavSHpZ5xTw98TpNYoj6DRq4ksCBWwJiZeiG/mVIc=
68charm.land/fantasy v0.6.1/go.mod h1:Ifj41bNnIXJ1aF6sLKcS9y3MzWbDnObmcHrCaaHfpZ0=
79charm.land/glamour/v2 v2.0.0-20260123212943-6014aa153a9b h1:A6IUUyChZDWP16RUdRJCfmYISAKWQGyIcfhZJUCViQ0=
@@ -96,8 +98,6 @@ github.com/charlievieth/fastwalk v1.0.14 h1:3Eh5uaFGwHZd8EGwTjJnSpBkfwfsak9h6ICg
9698github.com/charlievieth/fastwalk v1.0.14/go.mod h1:diVcUreiU1aQ4/Wu3NbxxH4/KYdKpLDojrQ1Bb2KgNY=
9799github.com/charmbracelet/anthropic-sdk-go v0.0.0-20251024181547-21d6f3d9a904 h1:rwLdEpG9wE6kL69KkEKDiWprO8pQOZHZXeod6+9K+mw=
98100github.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=
101101github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=
102102github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
103103github.com/charmbracelet/fang v0.4.4 h1:G4qKxF6or/eTPgmAolwPuRNyuci3hTUGGX1rj1YkHJY=
internal/agent/agent.go+1−1
@@ -22,6 +22,7 @@ import (
2222 "sync"
2323 "time"
2424
25+ "charm.land/catwalk/pkg/catwalk"
2526 "charm.land/fantasy"
2627 "charm.land/fantasy/providers/anthropic"
2728 "charm.land/fantasy/providers/bedrock"
@@ -29,7 +30,6 @@ import (
2930 "charm.land/fantasy/providers/openai"
3031 "charm.land/fantasy/providers/openrouter"
3132 "charm.land/lipgloss/v2"
32− "github.com/charmbracelet/catwalk/pkg/catwalk"
3333 "github.com/charmbracelet/crush/internal/agent/hyper"
3434 "github.com/charmbracelet/crush/internal/agent/tools"
3535 "github.com/charmbracelet/crush/internal/agent/tools/mcp"
internal/agent/common_test.go+1−1
@@ -8,13 +8,13 @@ import (
88 "testing"
99 "time"
1010
11+ "charm.land/catwalk/pkg/catwalk"
1112 "charm.land/fantasy"
1213 "charm.land/fantasy/providers/anthropic"
1314 "charm.land/fantasy/providers/openai"
1415 "charm.land/fantasy/providers/openaicompat"
1516 "charm.land/fantasy/providers/openrouter"
1617 "charm.land/x/vcr"
17− "github.com/charmbracelet/catwalk/pkg/catwalk"
1818 "github.com/charmbracelet/crush/internal/agent/prompt"
1919 "github.com/charmbracelet/crush/internal/agent/tools"
2020 "github.com/charmbracelet/crush/internal/config"
internal/agent/coordinator.go+1−1
@@ -15,8 +15,8 @@ import (
1515 "slices"
1616 "strings"
1717
18+ "charm.land/catwalk/pkg/catwalk"
1819 "charm.land/fantasy"
19− "github.com/charmbracelet/catwalk/pkg/catwalk"
2020 "github.com/charmbracelet/crush/internal/agent/hyper"
2121 "github.com/charmbracelet/crush/internal/agent/prompt"
2222 "github.com/charmbracelet/crush/internal/agent/tools"
internal/agent/hyper/provider.go+1−1
@@ -21,9 +21,9 @@ import (
2121 "sync"
2222 "time"
2323
24+ "charm.land/catwalk/pkg/catwalk"
2425 "charm.land/fantasy"
2526 "charm.land/fantasy/object"
26− "github.com/charmbracelet/catwalk/pkg/catwalk"
2727 "github.com/charmbracelet/crush/internal/event"
2828)
2929
internal/app/app.go+1−1
@@ -15,9 +15,9 @@ import (
1515 "time"
1616
1717 tea "charm.land/bubbletea/v2"
18+ "charm.land/catwalk/pkg/catwalk"
1819 "charm.land/fantasy"
1920 "charm.land/lipgloss/v2"
20− "github.com/charmbracelet/catwalk/pkg/catwalk"
2121 "github.com/charmbracelet/crush/internal/agent"
2222 "github.com/charmbracelet/crush/internal/agent/tools/mcp"
2323 "github.com/charmbracelet/crush/internal/config"
internal/app/provider_test.go+1−1
@@ -3,7 +3,7 @@ package app
33import (
44 "testing"
55
6− "github.com/charmbracelet/catwalk/pkg/catwalk"
6+ "charm.land/catwalk/pkg/catwalk"
77 "github.com/charmbracelet/crush/internal/config"
88 "github.com/stretchr/testify/require"
99)
internal/cmd/models.go+1−1
@@ -7,8 +7,8 @@ import (
77 "sort"
88 "strings"
99
10+ "charm.land/catwalk/pkg/catwalk"
1011 "charm.land/lipgloss/v2/tree"
11− "github.com/charmbracelet/catwalk/pkg/catwalk"
1212 "github.com/charmbracelet/crush/internal/config"
1313 "github.com/mattn/go-isatty"
1414 "github.com/spf13/cobra"
internal/config/catwalk.go+2−2
@@ -7,8 +7,8 @@ import (
77 "sync"
88 "sync/atomic"
99
10− "github.com/charmbracelet/catwalk/pkg/catwalk"
11− "github.com/charmbracelet/catwalk/pkg/embedded"
10+ "charm.land/catwalk/pkg/catwalk"
11+ "charm.land/catwalk/pkg/embedded"
1212)
1313
1414type catwalkClient interface {
internal/config/catwalk_test.go+1−1
@@ -7,7 +7,7 @@ import (
77 "os"
88 "testing"
99
10− "github.com/charmbracelet/catwalk/pkg/catwalk"
10+ "charm.land/catwalk/pkg/catwalk"
1111 "github.com/stretchr/testify/require"
1212)
1313
internal/config/config.go+1−1
@@ -14,7 +14,7 @@ import (
1414 "strings"
1515 "time"
1616
17− "github.com/charmbracelet/catwalk/pkg/catwalk"
17+ "charm.land/catwalk/pkg/catwalk"
1818 hyperp "github.com/charmbracelet/crush/internal/agent/hyper"
1919 "github.com/charmbracelet/crush/internal/csync"
2020 "github.com/charmbracelet/crush/internal/env"
internal/config/copilot.go+1−1
@@ -6,7 +6,7 @@ import (
66 "log/slog"
77 "testing"
88
9− "github.com/charmbracelet/catwalk/pkg/catwalk"
9+ "charm.land/catwalk/pkg/catwalk"
1010 "github.com/charmbracelet/crush/internal/oauth"
1111 "github.com/charmbracelet/crush/internal/oauth/copilot"
1212)
internal/config/hyper.go+1−1
@@ -11,7 +11,7 @@ import (
1111 "sync/atomic"
1212 "time"
1313
14− "github.com/charmbracelet/catwalk/pkg/catwalk"
14+ "charm.land/catwalk/pkg/catwalk"
1515 "github.com/charmbracelet/crush/internal/agent/hyper"
1616 xetag "github.com/charmbracelet/x/etag"
1717)
internal/config/hyper_test.go+1−1
@@ -7,7 +7,7 @@ import (
77 "os"
88 "testing"
99
10− "github.com/charmbracelet/catwalk/pkg/catwalk"
10+ "charm.land/catwalk/pkg/catwalk"
1111 "github.com/stretchr/testify/require"
1212)
1313
internal/config/load.go+1−1
@@ -16,7 +16,7 @@ import (
1616 "strings"
1717 "testing"
1818
19− "github.com/charmbracelet/catwalk/pkg/catwalk"
19+ "charm.land/catwalk/pkg/catwalk"
2020 "github.com/charmbracelet/crush/internal/agent/hyper"
2121 "github.com/charmbracelet/crush/internal/csync"
2222 "github.com/charmbracelet/crush/internal/env"
internal/config/load_test.go+1−1
@@ -7,7 +7,7 @@ import (
77 "path/filepath"
88 "testing"
99
10− "github.com/charmbracelet/catwalk/pkg/catwalk"
10+ "charm.land/catwalk/pkg/catwalk"
1111 "github.com/charmbracelet/crush/internal/csync"
1212 "github.com/charmbracelet/crush/internal/env"
1313 "github.com/stretchr/testify/assert"
internal/config/provider.go+2−2
@@ -15,8 +15,8 @@ import (
1515 "sync"
1616 "time"
1717
18− "github.com/charmbracelet/catwalk/pkg/catwalk"
19− "github.com/charmbracelet/catwalk/pkg/embedded"
18+ "charm.land/catwalk/pkg/catwalk"
19+ "charm.land/catwalk/pkg/embedded"
2020 "github.com/charmbracelet/crush/internal/agent/hyper"
2121 "github.com/charmbracelet/crush/internal/csync"
2222 "github.com/charmbracelet/crush/internal/home"
internal/config/provider_empty_test.go+1−1
@@ -5,7 +5,7 @@ import (
55 "os"
66 "testing"
77
8− "github.com/charmbracelet/catwalk/pkg/catwalk"
8+ "charm.land/catwalk/pkg/catwalk"
99 "github.com/stretchr/testify/require"
1010)
1111
internal/config/provider_test.go+1−1
@@ -7,7 +7,7 @@ import (
77 "sync"
88 "testing"
99
10− "github.com/charmbracelet/catwalk/pkg/catwalk"
10+ "charm.land/catwalk/pkg/catwalk"
1111 "github.com/stretchr/testify/require"
1212)
1313
internal/message/content.go+1−1
@@ -8,11 +8,11 @@ import (
88 "strings"
99 "time"
1010
11+ "charm.land/catwalk/pkg/catwalk"
1112 "charm.land/fantasy"
1213 "charm.land/fantasy/providers/anthropic"
1314 "charm.land/fantasy/providers/google"
1415 "charm.land/fantasy/providers/openai"
15− "github.com/charmbracelet/catwalk/pkg/catwalk"
1616)
1717
1818type MessageRole string
internal/tui/components/chat/messages/messages.go+1−1
@@ -9,8 +9,8 @@ import (
99 "charm.land/bubbles/v2/key"
1010 "charm.land/bubbles/v2/viewport"
1111 tea "charm.land/bubbletea/v2"
12+ "charm.land/catwalk/pkg/catwalk"
1213 "charm.land/lipgloss/v2"
13− "github.com/charmbracelet/catwalk/pkg/catwalk"
1414 "github.com/charmbracelet/x/ansi"
1515 "github.com/charmbracelet/x/exp/ordered"
1616 "github.com/google/uuid"
internal/tui/components/chat/splash/splash.go+1−1
@@ -8,8 +8,8 @@ import (
88 "charm.land/bubbles/v2/key"
99 "charm.land/bubbles/v2/spinner"
1010 tea "charm.land/bubbletea/v2"
11+ "charm.land/catwalk/pkg/catwalk"
1112 "charm.land/lipgloss/v2"
12− "github.com/charmbracelet/catwalk/pkg/catwalk"
1313 "github.com/charmbracelet/crush/internal/agent"
1414 hyperp "github.com/charmbracelet/crush/internal/agent/hyper"
1515 "github.com/charmbracelet/crush/internal/config"
internal/tui/components/dialogs/models/list.go+1−1
@@ -7,7 +7,7 @@ import (
77 "strings"
88
99 tea "charm.land/bubbletea/v2"
10− "github.com/charmbracelet/catwalk/pkg/catwalk"
10+ "charm.land/catwalk/pkg/catwalk"
1111 "github.com/charmbracelet/crush/internal/config"
1212 "github.com/charmbracelet/crush/internal/tui/exp/list"
1313 "github.com/charmbracelet/crush/internal/tui/styles"
internal/tui/components/dialogs/models/list_recent_test.go+1−1
@@ -9,7 +9,7 @@ import (
99 "testing"
1010
1111 tea "charm.land/bubbletea/v2"
12− "github.com/charmbracelet/catwalk/pkg/catwalk"
12+ "charm.land/catwalk/pkg/catwalk"
1313 "github.com/charmbracelet/crush/internal/config"
1414 "github.com/charmbracelet/crush/internal/log"
1515 "github.com/charmbracelet/crush/internal/tui/exp/list"
internal/tui/components/dialogs/models/models.go+1−1
@@ -9,8 +9,8 @@ import (
99 "charm.land/bubbles/v2/key"
1010 "charm.land/bubbles/v2/spinner"
1111 tea "charm.land/bubbletea/v2"
12+ "charm.land/catwalk/pkg/catwalk"
1213 "charm.land/lipgloss/v2"
13− "github.com/charmbracelet/catwalk/pkg/catwalk"
1414 hyperp "github.com/charmbracelet/crush/internal/agent/hyper"
1515 "github.com/charmbracelet/crush/internal/config"
1616 "github.com/charmbracelet/crush/internal/tui/components/core"
internal/ui/chat/messages.go+1−1
@@ -7,8 +7,8 @@ import (
77 "time"
88
99 tea "charm.land/bubbletea/v2"
10+ "charm.land/catwalk/pkg/catwalk"
1011 "charm.land/lipgloss/v2"
11− "github.com/charmbracelet/catwalk/pkg/catwalk"
1212 "github.com/charmbracelet/crush/internal/config"
1313 "github.com/charmbracelet/crush/internal/message"
1414 "github.com/charmbracelet/crush/internal/ui/anim"
internal/ui/dialog/actions.go+1−1
@@ -7,7 +7,7 @@ import (
77 "path/filepath"
88
99 tea "charm.land/bubbletea/v2"
10− "github.com/charmbracelet/catwalk/pkg/catwalk"
10+ "charm.land/catwalk/pkg/catwalk"
1111 "github.com/charmbracelet/crush/internal/commands"
1212 "github.com/charmbracelet/crush/internal/config"
1313 "github.com/charmbracelet/crush/internal/message"
internal/ui/dialog/api_key_input.go+1−1
@@ -10,7 +10,7 @@ import (
1010 "charm.land/bubbles/v2/spinner"
1111 "charm.land/bubbles/v2/textinput"
1212 tea "charm.land/bubbletea/v2"
13− "github.com/charmbracelet/catwalk/pkg/catwalk"
13+ "charm.land/catwalk/pkg/catwalk"
1414 "github.com/charmbracelet/crush/internal/config"
1515 "github.com/charmbracelet/crush/internal/ui/common"
1616 "github.com/charmbracelet/crush/internal/ui/styles"
internal/ui/dialog/models.go+1−1
@@ -10,7 +10,7 @@ import (
1010 "charm.land/bubbles/v2/key"
1111 "charm.land/bubbles/v2/textinput"
1212 tea "charm.land/bubbletea/v2"
13− "github.com/charmbracelet/catwalk/pkg/catwalk"
13+ "charm.land/catwalk/pkg/catwalk"
1414 "github.com/charmbracelet/crush/internal/config"
1515 "github.com/charmbracelet/crush/internal/ui/common"
1616 "github.com/charmbracelet/crush/internal/uiutil"
internal/ui/dialog/models_item.go+1−1
@@ -1,8 +1,8 @@
11package dialog
22
33import (
4+ "charm.land/catwalk/pkg/catwalk"
45 "charm.land/lipgloss/v2"
5− "github.com/charmbracelet/catwalk/pkg/catwalk"
66 "github.com/charmbracelet/crush/internal/config"
77 "github.com/charmbracelet/crush/internal/ui/common"
88 "github.com/charmbracelet/crush/internal/ui/styles"
internal/ui/dialog/oauth.go+1−1
@@ -9,8 +9,8 @@ import (
99 "charm.land/bubbles/v2/key"
1010 "charm.land/bubbles/v2/spinner"
1111 tea "charm.land/bubbletea/v2"
12+ "charm.land/catwalk/pkg/catwalk"
1213 "charm.land/lipgloss/v2"
13− "github.com/charmbracelet/catwalk/pkg/catwalk"
1414 "github.com/charmbracelet/crush/internal/config"
1515 "github.com/charmbracelet/crush/internal/oauth"
1616 "github.com/charmbracelet/crush/internal/ui/common"
internal/ui/dialog/oauth_copilot.go+1−1
@@ -6,7 +6,7 @@ import (
66 "time"
77
88 tea "charm.land/bubbletea/v2"
9− "github.com/charmbracelet/catwalk/pkg/catwalk"
9+ "charm.land/catwalk/pkg/catwalk"
1010 "github.com/charmbracelet/crush/internal/config"
1111 "github.com/charmbracelet/crush/internal/oauth/copilot"
1212 "github.com/charmbracelet/crush/internal/ui/common"
internal/ui/dialog/oauth_hyper.go+1−1
@@ -6,7 +6,7 @@ import (
66 "time"
77
88 tea "charm.land/bubbletea/v2"
9− "github.com/charmbracelet/catwalk/pkg/catwalk"
9+ "charm.land/catwalk/pkg/catwalk"
1010 "github.com/charmbracelet/crush/internal/config"
1111 "github.com/charmbracelet/crush/internal/oauth/hyper"
1212 "github.com/charmbracelet/crush/internal/ui/common"
internal/ui/model/ui.go+1−1
@@ -22,8 +22,8 @@ import (
2222 "charm.land/bubbles/v2/spinner"
2323 "charm.land/bubbles/v2/textarea"
2424 tea "charm.land/bubbletea/v2"
25+ "charm.land/catwalk/pkg/catwalk"
2526 "charm.land/lipgloss/v2"
26− "github.com/charmbracelet/catwalk/pkg/catwalk"
2727 "github.com/charmbracelet/crush/internal/agent/tools/mcp"
2828 "github.com/charmbracelet/crush/internal/app"
2929 "github.com/charmbracelet/crush/internal/commands"