Taskfile.yaml 🔗
@@ -153,5 +153,5 @@ tasks:
desc: Update Fantasy and Catwalk
cmds:
- go get charm.land/fantasy
- - go get github.com/charmbracelet/catwalk
+ - go get charm.land/catwalk
- go mod tidy
chore: update catwalk and its import paths to `charm.land/catwalk`
Andrey Nering created
Change summary
Taskfile.yaml | 2 +-
go.mod | 2 +-
go.sum | 4 ++--
internal/agent/agent.go | 2 +-
internal/agent/common_test.go | 2 +-
internal/agent/coordinator.go | 2 +-
internal/agent/hyper/provider.go | 2 +-
internal/app/app.go | 2 +-
internal/app/provider_test.go | 2 +-
internal/cmd/models.go | 2 +-
internal/config/catwalk.go | 4 ++--
internal/config/catwalk_test.go | 2 +-
internal/config/config.go | 2 +-
internal/config/copilot.go | 2 +-
internal/config/hyper.go | 2 +-
internal/config/hyper_test.go | 2 +-
internal/config/load.go | 2 +-
internal/config/load_test.go | 2 +-
internal/config/provider.go | 4 ++--
internal/config/provider_empty_test.go | 2 +-
internal/config/provider_test.go | 2 +-
internal/message/content.go | 2 +-
internal/tui/components/chat/messages/messages.go | 2 +-
internal/tui/components/chat/splash/splash.go | 2 +-
internal/tui/components/dialogs/models/list.go | 2 +-
internal/tui/components/dialogs/models/list_recent_test.go | 2 +-
internal/tui/components/dialogs/models/models.go | 2 +-
internal/ui/chat/messages.go | 2 +-
internal/ui/dialog/actions.go | 2 +-
internal/ui/dialog/api_key_input.go | 2 +-
internal/ui/dialog/models.go | 2 +-
internal/ui/dialog/models_item.go | 2 +-
internal/ui/dialog/oauth.go | 2 +-
internal/ui/dialog/oauth_copilot.go | 2 +-
internal/ui/dialog/oauth_hyper.go | 2 +-
internal/ui/model/ui.go | 2 +-
36 files changed, 39 insertions(+), 39 deletions(-)
Detailed changes
go.mod 🔗
@@ -5,6 +5,7 @@ go 1.25.5
require (
charm.land/bubbles/v2 v2.0.0-rc.1.0.20260109112849-ae99f46cec66
charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251216153312-819e2e89c62e
+ charm.land/catwalk v0.16.0
charm.land/fantasy v0.6.1
charm.land/glamour/v2 v2.0.0-20260123212943-6014aa153a9b
charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971
@@ -19,7 +20,6 @@ require (
github.com/aymanbagabas/go-udiff v0.3.1
github.com/bmatcuk/doublestar/v4 v4.10.0
github.com/charlievieth/fastwalk v1.0.14
- github.com/charmbracelet/catwalk v0.15.0
github.com/charmbracelet/colorprofile v0.4.1
github.com/charmbracelet/fang v0.4.4
github.com/charmbracelet/ultraviolet v0.0.0-20251212194010-b927aa605560
go.sum 🔗
@@ -2,6 +2,8 @@ charm.land/bubbles/v2 v2.0.0-rc.1.0.20260109112849-ae99f46cec66 h1:2BdJynsAW+8rv
charm.land/bubbles/v2 v2.0.0-rc.1.0.20260109112849-ae99f46cec66/go.mod h1:5AbN6cEd/47gkEf8TgiQ2O3RZ5QxMS14l9W+7F9fPC4=
charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251216153312-819e2e89c62e h1:tXwTmgGpwZT7ParKF5xbEQBVjM2e1uKhKi/GpfU3mYQ=
charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251216153312-819e2e89c62e/go.mod h1:pDM18flq3Z4njKZPA3zCvyVSSIJbMcoqlE82BdGUtL8=
+charm.land/catwalk v0.16.0 h1:NP6lPz086OAsFdyYTRE6x1CyAosX6MpqdY303ntwsX0=
+charm.land/catwalk v0.16.0/go.mod h1:kAdk/GjAJbl1AjRjmfU5c9lZfs7PeC3Uy9TgaVtlN64=
charm.land/fantasy v0.6.1 h1:v3pavSHpZ5xTw98TpNYoj6DRq4ksCBWwJiZeiG/mVIc=
charm.land/fantasy v0.6.1/go.mod h1:Ifj41bNnIXJ1aF6sLKcS9y3MzWbDnObmcHrCaaHfpZ0=
charm.land/glamour/v2 v2.0.0-20260123212943-6014aa153a9b h1:A6IUUyChZDWP16RUdRJCfmYISAKWQGyIcfhZJUCViQ0=
@@ -96,8 +98,6 @@ github.com/charlievieth/fastwalk v1.0.14 h1:3Eh5uaFGwHZd8EGwTjJnSpBkfwfsak9h6ICg
github.com/charlievieth/fastwalk v1.0.14/go.mod h1:diVcUreiU1aQ4/Wu3NbxxH4/KYdKpLDojrQ1Bb2KgNY=
github.com/charmbracelet/anthropic-sdk-go v0.0.0-20251024181547-21d6f3d9a904 h1:rwLdEpG9wE6kL69KkEKDiWprO8pQOZHZXeod6+9K+mw=
github.com/charmbracelet/anthropic-sdk-go v0.0.0-20251024181547-21d6f3d9a904/go.mod h1:8TIYxZxsuCqqeJ0lga/b91tBwrbjoHDC66Sq5t8N2R4=
-github.com/charmbracelet/catwalk v0.15.0 h1:5oWJdvchTPfF7855A0n40+XbZQz4+vouZ/NhQ661JKI=
-github.com/charmbracelet/catwalk v0.15.0/go.mod h1:qg+Yl9oaZTkTvRscqbxfttzOFQ4v0pOT5XwC7b5O0NQ=
github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=
github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
github.com/charmbracelet/fang v0.4.4 h1:G4qKxF6or/eTPgmAolwPuRNyuci3hTUGGX1rj1YkHJY=
internal/agent/agent.go 🔗
@@ -22,6 +22,7 @@ import (
"sync"
"time"
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/fantasy"
"charm.land/fantasy/providers/anthropic"
"charm.land/fantasy/providers/bedrock"
@@ -29,7 +30,6 @@ import (
"charm.land/fantasy/providers/openai"
"charm.land/fantasy/providers/openrouter"
"charm.land/lipgloss/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/agent/hyper"
"github.com/charmbracelet/crush/internal/agent/tools"
"github.com/charmbracelet/crush/internal/agent/tools/mcp"
internal/agent/common_test.go 🔗
@@ -8,13 +8,13 @@ import (
"testing"
"time"
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/fantasy"
"charm.land/fantasy/providers/anthropic"
"charm.land/fantasy/providers/openai"
"charm.land/fantasy/providers/openaicompat"
"charm.land/fantasy/providers/openrouter"
"charm.land/x/vcr"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/agent/prompt"
"github.com/charmbracelet/crush/internal/agent/tools"
"github.com/charmbracelet/crush/internal/config"
internal/agent/coordinator.go 🔗
@@ -15,8 +15,8 @@ import (
"slices"
"strings"
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/fantasy"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/agent/hyper"
"github.com/charmbracelet/crush/internal/agent/prompt"
"github.com/charmbracelet/crush/internal/agent/tools"
internal/agent/hyper/provider.go 🔗
@@ -21,9 +21,9 @@ import (
"sync"
"time"
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/fantasy"
"charm.land/fantasy/object"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/event"
)
internal/app/app.go 🔗
@@ -15,9 +15,9 @@ import (
"time"
tea "charm.land/bubbletea/v2"
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/fantasy"
"charm.land/lipgloss/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/agent"
"github.com/charmbracelet/crush/internal/agent/tools/mcp"
"github.com/charmbracelet/crush/internal/config"
internal/app/provider_test.go 🔗
@@ -3,7 +3,7 @@ package app
import (
"testing"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/config"
"github.com/stretchr/testify/require"
)
internal/cmd/models.go 🔗
@@ -7,8 +7,8 @@ import (
"sort"
"strings"
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/lipgloss/v2/tree"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/config"
"github.com/mattn/go-isatty"
"github.com/spf13/cobra"
internal/config/catwalk.go 🔗
@@ -7,8 +7,8 @@ import (
"sync"
"sync/atomic"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
- "github.com/charmbracelet/catwalk/pkg/embedded"
+ "charm.land/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/embedded"
)
type catwalkClient interface {
internal/config/catwalk_test.go 🔗
@@ -7,7 +7,7 @@ import (
"os"
"testing"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/stretchr/testify/require"
)
internal/config/config.go 🔗
@@ -14,7 +14,7 @@ import (
"strings"
"time"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
hyperp "github.com/charmbracelet/crush/internal/agent/hyper"
"github.com/charmbracelet/crush/internal/csync"
"github.com/charmbracelet/crush/internal/env"
internal/config/copilot.go 🔗
@@ -6,7 +6,7 @@ import (
"log/slog"
"testing"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/oauth"
"github.com/charmbracelet/crush/internal/oauth/copilot"
)
internal/config/hyper.go 🔗
@@ -11,7 +11,7 @@ import (
"sync/atomic"
"time"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/agent/hyper"
xetag "github.com/charmbracelet/x/etag"
)
internal/config/hyper_test.go 🔗
@@ -7,7 +7,7 @@ import (
"os"
"testing"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/stretchr/testify/require"
)
internal/config/load.go 🔗
@@ -16,7 +16,7 @@ import (
"strings"
"testing"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/agent/hyper"
"github.com/charmbracelet/crush/internal/csync"
"github.com/charmbracelet/crush/internal/env"
internal/config/load_test.go 🔗
@@ -7,7 +7,7 @@ import (
"path/filepath"
"testing"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/csync"
"github.com/charmbracelet/crush/internal/env"
"github.com/stretchr/testify/assert"
internal/config/provider.go 🔗
@@ -15,8 +15,8 @@ import (
"sync"
"time"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
- "github.com/charmbracelet/catwalk/pkg/embedded"
+ "charm.land/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/embedded"
"github.com/charmbracelet/crush/internal/agent/hyper"
"github.com/charmbracelet/crush/internal/csync"
"github.com/charmbracelet/crush/internal/home"
internal/config/provider_empty_test.go 🔗
@@ -5,7 +5,7 @@ import (
"os"
"testing"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/stretchr/testify/require"
)
internal/config/provider_test.go 🔗
@@ -7,7 +7,7 @@ import (
"sync"
"testing"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/stretchr/testify/require"
)
internal/message/content.go 🔗
@@ -8,11 +8,11 @@ import (
"strings"
"time"
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/fantasy"
"charm.land/fantasy/providers/anthropic"
"charm.land/fantasy/providers/google"
"charm.land/fantasy/providers/openai"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
)
type MessageRole string
internal/tui/components/chat/messages/messages.go 🔗
@@ -9,8 +9,8 @@ import (
"charm.land/bubbles/v2/key"
"charm.land/bubbles/v2/viewport"
tea "charm.land/bubbletea/v2"
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/lipgloss/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
"github.com/charmbracelet/x/ansi"
"github.com/charmbracelet/x/exp/ordered"
"github.com/google/uuid"
internal/tui/components/chat/splash/splash.go 🔗
@@ -8,8 +8,8 @@ import (
"charm.land/bubbles/v2/key"
"charm.land/bubbles/v2/spinner"
tea "charm.land/bubbletea/v2"
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/lipgloss/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/agent"
hyperp "github.com/charmbracelet/crush/internal/agent/hyper"
"github.com/charmbracelet/crush/internal/config"
internal/tui/components/dialogs/models/list.go 🔗
@@ -7,7 +7,7 @@ import (
"strings"
tea "charm.land/bubbletea/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/config"
"github.com/charmbracelet/crush/internal/tui/exp/list"
"github.com/charmbracelet/crush/internal/tui/styles"
internal/tui/components/dialogs/models/list_recent_test.go 🔗
@@ -9,7 +9,7 @@ import (
"testing"
tea "charm.land/bubbletea/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/config"
"github.com/charmbracelet/crush/internal/log"
"github.com/charmbracelet/crush/internal/tui/exp/list"
internal/tui/components/dialogs/models/models.go 🔗
@@ -9,8 +9,8 @@ import (
"charm.land/bubbles/v2/key"
"charm.land/bubbles/v2/spinner"
tea "charm.land/bubbletea/v2"
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/lipgloss/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
hyperp "github.com/charmbracelet/crush/internal/agent/hyper"
"github.com/charmbracelet/crush/internal/config"
"github.com/charmbracelet/crush/internal/tui/components/core"
internal/ui/chat/messages.go 🔗
@@ -7,8 +7,8 @@ import (
"time"
tea "charm.land/bubbletea/v2"
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/lipgloss/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/config"
"github.com/charmbracelet/crush/internal/message"
"github.com/charmbracelet/crush/internal/ui/anim"
internal/ui/dialog/actions.go 🔗
@@ -7,7 +7,7 @@ import (
"path/filepath"
tea "charm.land/bubbletea/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/commands"
"github.com/charmbracelet/crush/internal/config"
"github.com/charmbracelet/crush/internal/message"
internal/ui/dialog/api_key_input.go 🔗
@@ -10,7 +10,7 @@ import (
"charm.land/bubbles/v2/spinner"
"charm.land/bubbles/v2/textinput"
tea "charm.land/bubbletea/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/config"
"github.com/charmbracelet/crush/internal/ui/common"
"github.com/charmbracelet/crush/internal/ui/styles"
internal/ui/dialog/models.go 🔗
@@ -10,7 +10,7 @@ import (
"charm.land/bubbles/v2/key"
"charm.land/bubbles/v2/textinput"
tea "charm.land/bubbletea/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/config"
"github.com/charmbracelet/crush/internal/ui/common"
"github.com/charmbracelet/crush/internal/uiutil"
internal/ui/dialog/models_item.go 🔗
@@ -1,8 +1,8 @@
package dialog
import (
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/lipgloss/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/config"
"github.com/charmbracelet/crush/internal/ui/common"
"github.com/charmbracelet/crush/internal/ui/styles"
internal/ui/dialog/oauth.go 🔗
@@ -9,8 +9,8 @@ import (
"charm.land/bubbles/v2/key"
"charm.land/bubbles/v2/spinner"
tea "charm.land/bubbletea/v2"
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/lipgloss/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/config"
"github.com/charmbracelet/crush/internal/oauth"
"github.com/charmbracelet/crush/internal/ui/common"
internal/ui/dialog/oauth_copilot.go 🔗
@@ -6,7 +6,7 @@ import (
"time"
tea "charm.land/bubbletea/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/config"
"github.com/charmbracelet/crush/internal/oauth/copilot"
"github.com/charmbracelet/crush/internal/ui/common"
internal/ui/dialog/oauth_hyper.go 🔗
@@ -6,7 +6,7 @@ import (
"time"
tea "charm.land/bubbletea/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
+ "charm.land/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/config"
"github.com/charmbracelet/crush/internal/oauth/hyper"
"github.com/charmbracelet/crush/internal/ui/common"
internal/ui/model/ui.go 🔗
@@ -22,8 +22,8 @@ import (
"charm.land/bubbles/v2/spinner"
"charm.land/bubbles/v2/textarea"
tea "charm.land/bubbletea/v2"
+ "charm.land/catwalk/pkg/catwalk"
"charm.land/lipgloss/v2"
- "github.com/charmbracelet/catwalk/pkg/catwalk"
"github.com/charmbracelet/crush/internal/agent/tools/mcp"
"github.com/charmbracelet/crush/internal/app"
"github.com/charmbracelet/crush/internal/commands"