git.iko.soy/crush
on main help sign in
fix: fix broken tools on `crush run` (#1333)
commitae70537ec536ed026614f17e88ebffed7d1b11ff authorAndrey Nering <andreynering@users.noreply.github.com> dateThu 30 Oct 2025, 11:00 (1 year ago) parentb61473d
2 files changed+23−15
compare with main
unifiedsplit
go.mod+11−11 internal/agent/coordinator.go+12−4
go.mod+11−11
@@ -15,27 +15,35 @@ require (
1515 github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250820203609-601216f68ee2
1616 github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.5
1717 github.com/charmbracelet/catwalk v0.8.1
18+ github.com/charmbracelet/colorprofile v0.3.2
1819 github.com/charmbracelet/fang v0.4.3
1920 github.com/charmbracelet/glamour/v2 v2.0.0-20250811143442-a27abb32f018
2021 github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250917201909-41ff0bf215ea
2122 github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706
23+ github.com/charmbracelet/ultraviolet v0.0.0-20251017140847-d4ace4d6e731
2224 github.com/charmbracelet/x/ansi v0.10.2
2325 github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3
2426 github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a
2527 github.com/charmbracelet/x/exp/ordered v0.1.0
28+ github.com/charmbracelet/x/exp/slice v0.0.0-20250904123553-b4e2667e5ad5
2629 github.com/charmbracelet/x/powernap v0.0.0-20251015113943-25f979b54ad4
2730 github.com/charmbracelet/x/term v0.2.1
31+ github.com/denisbrodbeck/machineid v1.0.1
2832 github.com/disintegration/imageorient v0.0.0-20180920195336-8147d86e83ec
2933 github.com/google/uuid v1.6.0
3034 github.com/invopop/jsonschema v0.13.0
3135 github.com/joho/godotenv v1.5.1
36+ github.com/lucasb-eyer/go-colorful v1.3.0
3237 github.com/modelcontextprotocol/go-sdk v1.0.0
3338 github.com/muesli/termenv v0.16.0
3439 github.com/ncruces/go-sqlite3 v0.29.1
3540 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
3641 github.com/nxadm/tail v1.4.11
42+ github.com/openai/openai-go/v2 v2.7.1
43+ github.com/posthog/posthog-go v1.6.12
3744 github.com/pressly/goose/v3 v3.25.0
3845 github.com/qjebbs/go-jsons v1.0.0-alpha.4
46+ github.com/rivo/uniseg v0.4.7
3947 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06
4048 github.com/sahilm/fuzzy v0.1.1
4149 github.com/spf13/cobra v1.10.1
@@ -45,8 +53,11 @@ require (
4553 github.com/tidwall/sjson v1.2.5
4654 github.com/zeebo/xxh3 v1.0.2
4755 go.yaml.in/yaml/v4 v4.0.0-rc.2
56+ golang.org/x/sync v0.17.0
57+ golang.org/x/text v0.30.0
4858 gopkg.in/dnaeon/go-vcr.v4 v4.0.6-0.20250923044825-7b4892dd3117
4959 gopkg.in/natefinch/lumberjack.v2 v2.2.1
60+ mvdan.cc/sh/moreinterp v0.0.0-20250902163504-3cf4fd5717a5
5061 mvdan.cc/sh/v3 v3.12.1-0.20250902163504-3cf4fd5717a5
5162)
5263
@@ -77,16 +88,12 @@ require (
7788 github.com/bahlo/generic-list-go v0.2.0 // indirect
7889 github.com/buger/jsonparser v1.1.1 // indirect
7990 github.com/charmbracelet/anthropic-sdk-go v0.0.0-20251024181547-21d6f3d9a904 // indirect
80− github.com/charmbracelet/colorprofile v0.3.2
8191 github.com/charmbracelet/go-genai v0.0.0-20251021165952-9befde14ce97 // indirect
82− github.com/charmbracelet/ultraviolet v0.0.0-20251017140847-d4ace4d6e731
8392 github.com/charmbracelet/x/cellbuf v0.0.14-0.20250811133356-e0c5dbe5ea4a // indirect
84− github.com/charmbracelet/x/exp/slice v0.0.0-20250904123553-b4e2667e5ad5
8593 github.com/charmbracelet/x/json v0.2.0 // indirect
8694 github.com/charmbracelet/x/termios v0.1.1 // indirect
8795 github.com/charmbracelet/x/windows v0.2.2 // indirect
8896 github.com/davecgh/go-spew v1.1.1 // indirect
89− github.com/denisbrodbeck/machineid v1.0.1
9097 github.com/disintegration/gift v1.1.2 // indirect
9198 github.com/dlclark/regexp2 v1.11.5 // indirect
9299 github.com/dustin/go-humanize v1.0.1 // indirect
@@ -108,7 +115,6 @@ require (
108115 github.com/klauspost/compress v1.18.0 // indirect
109116 github.com/klauspost/cpuid/v2 v2.0.9 // indirect
110117 github.com/klauspost/pgzip v1.2.6 // indirect
111− github.com/lucasb-eyer/go-colorful v1.3.0
112118 github.com/mailru/easyjson v0.7.7 // indirect
113119 github.com/mattn/go-isatty v0.0.20 // indirect
114120 github.com/mattn/go-runewidth v0.0.17 // indirect
@@ -121,11 +127,8 @@ require (
121127 github.com/muesli/mango-pflag v0.1.0 // indirect
122128 github.com/muesli/roff v0.1.0 // indirect
123129 github.com/ncruces/julianday v1.0.0 // indirect
124− github.com/openai/openai-go/v2 v2.7.1
125130 github.com/pierrec/lz4/v4 v4.1.22 // indirect
126131 github.com/pmezard/go-difflib v1.0.0 // indirect
127− github.com/posthog/posthog-go v1.6.12
128− github.com/rivo/uniseg v0.4.7
129132 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect
130133 github.com/sethvargo/go-retry v0.3.0 // indirect
131134 github.com/sourcegraph/jsonrpc2 v0.2.1 // indirect
@@ -153,10 +156,8 @@ require (
153156 golang.org/x/image v0.27.0 // indirect
154157 golang.org/x/net v0.44.0 // indirect
155158 golang.org/x/oauth2 v0.32.0 // indirect
156− golang.org/x/sync v0.17.0 // indirect
157159 golang.org/x/sys v0.37.0 // indirect
158160 golang.org/x/term v0.35.0 // indirect
159− golang.org/x/text v0.30.0
160161 golang.org/x/time v0.12.0 // indirect
161162 google.golang.org/api v0.239.0 // indirect
162163 google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
@@ -164,5 +165,4 @@ require (
164165 google.golang.org/protobuf v1.36.10 // indirect
165166 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
166167 gopkg.in/yaml.v3 v3.0.1 // indirect
167− mvdan.cc/sh/moreinterp v0.0.0-20250902163504-3cf4fd5717a5
168168)
internal/agent/coordinator.go+12−4
@@ -26,6 +26,7 @@ import (
2626 "github.com/charmbracelet/crush/internal/message"
2727 "github.com/charmbracelet/crush/internal/permission"
2828 "github.com/charmbracelet/crush/internal/session"
29+ "golang.org/x/sync/errgroup"
2930
3031 "charm.land/fantasy/providers/anthropic"
3132 "charm.land/fantasy/providers/azure"
@@ -63,6 +64,8 @@ type coordinator struct {
6364
6465 currentAgent SessionAgent
6566 agents map[string]SessionAgent
67+
68+ readyWg errgroup.Group
6669}
6770
6871func NewCoordinator(
@@ -106,6 +109,10 @@ func NewCoordinator(
106109
107110// Run implements Coordinator.
108111func (c *coordinator) Run(ctx context.Context, sessionID string, prompt string, attachments ...message.Attachment) (*fantasy.AgentResult, error) {
112+ if err := c.readyWg.Wait(); err != nil {
113+ return nil, err
114+ }
115+
109116 model := c.currentAgent.Model()
110117 maxTokens := model.CatwalkCfg.DefaultMaxTokens
111118 if model.ModelCfg.MaxTokens != 0 {
@@ -300,14 +307,15 @@ func (c *coordinator) buildAgent(ctx context.Context, prompt *prompt.Prompt, age
300307 c.messages,
301308 nil,
302309 })
303− go func() {
310+ c.readyWg.Go(func() error {
304311 tools, err := c.buildTools(ctx, agent)
305312 if err != nil {
306− slog.Error("could not init agent tools", "err", err)
307− return
313+ return err
308314 }
309315 result.SetTools(tools)
310− }()
316+ return nil
317+ })
318+
311319 return result, nil
312320}
313321