ae70537 · crush · git.iko.soy

git.iko.soy/crush

on main help sign in

fix: fix broken tools on `crush run` (#1333)

ae70537Andrey Nering1 year ago

go.mod+11−11

compare with main

unifiedsplit

@@ -15,27 +15,35 @@ require (

15 github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250820203609-601216f68ee2

16 github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.5

17 github.com/charmbracelet/catwalk v0.8.1

18+ github.com/charmbracelet/colorprofile v0.3.2

18 github.com/charmbracelet/fang v0.4.3

19 github.com/charmbracelet/fang v0.4.3

19 github.com/charmbracelet/glamour/v2 v2.0.0-20250811143442-a27abb32f018

20 github.com/charmbracelet/glamour/v2 v2.0.0-20250811143442-a27abb32f018

20 github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250917201909-41ff0bf215ea

21 github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250917201909-41ff0bf215ea

21 github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706

22 github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706

23+ github.com/charmbracelet/ultraviolet v0.0.0-20251017140847-d4ace4d6e731

22 github.com/charmbracelet/x/ansi v0.10.2

24 github.com/charmbracelet/x/ansi v0.10.2

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

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

24 github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a

26 github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a

25 github.com/charmbracelet/x/exp/ordered v0.1.0

27 github.com/charmbracelet/x/exp/ordered v0.1.0

28+ github.com/charmbracelet/x/exp/slice v0.0.0-20250904123553-b4e2667e5ad5

26 github.com/charmbracelet/x/powernap v0.0.0-20251015113943-25f979b54ad4

29 github.com/charmbracelet/x/powernap v0.0.0-20251015113943-25f979b54ad4

27 github.com/charmbracelet/x/term v0.2.1

30 github.com/charmbracelet/x/term v0.2.1

31+ github.com/denisbrodbeck/machineid v1.0.1

28 github.com/disintegration/imageorient v0.0.0-20180920195336-8147d86e83ec

32 github.com/disintegration/imageorient v0.0.0-20180920195336-8147d86e83ec

29 github.com/google/uuid v1.6.0

33 github.com/google/uuid v1.6.0

30 github.com/invopop/jsonschema v0.13.0

34 github.com/invopop/jsonschema v0.13.0

31 github.com/joho/godotenv v1.5.1

35 github.com/joho/godotenv v1.5.1

36+ github.com/lucasb-eyer/go-colorful v1.3.0

32 github.com/modelcontextprotocol/go-sdk v1.0.0

37 github.com/modelcontextprotocol/go-sdk v1.0.0

33 github.com/muesli/termenv v0.16.0

38 github.com/muesli/termenv v0.16.0

34 github.com/ncruces/go-sqlite3 v0.29.1

39 github.com/ncruces/go-sqlite3 v0.29.1

35 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646

40 github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646

36 github.com/nxadm/tail v1.4.11

41 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

37 github.com/pressly/goose/v3 v3.25.0

44 github.com/pressly/goose/v3 v3.25.0

38 github.com/qjebbs/go-jsons v1.0.0-alpha.4

45 github.com/qjebbs/go-jsons v1.0.0-alpha.4

46+ github.com/rivo/uniseg v0.4.7

39 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06

47 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06

40 github.com/sahilm/fuzzy v0.1.1

48 github.com/sahilm/fuzzy v0.1.1

41 github.com/spf13/cobra v1.10.1

49 github.com/spf13/cobra v1.10.1

@@ -45,8 +53,11 @@ require (

45 github.com/tidwall/sjson v1.2.5

53 github.com/tidwall/sjson v1.2.5

46 github.com/zeebo/xxh3 v1.0.2

54 github.com/zeebo/xxh3 v1.0.2

47 go.yaml.in/yaml/v4 v4.0.0-rc.2

55 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

48 gopkg.in/dnaeon/go-vcr.v4 v4.0.6-0.20250923044825-7b4892dd3117

58 gopkg.in/dnaeon/go-vcr.v4 v4.0.6-0.20250923044825-7b4892dd3117

49 gopkg.in/natefinch/lumberjack.v2 v2.2.1

59 gopkg.in/natefinch/lumberjack.v2 v2.2.1

60+ mvdan.cc/sh/moreinterp v0.0.0-20250902163504-3cf4fd5717a5

50 mvdan.cc/sh/v3 v3.12.1-0.20250902163504-3cf4fd5717a5

61 mvdan.cc/sh/v3 v3.12.1-0.20250902163504-3cf4fd5717a5

51)

62)

@@ -77,16 +88,12 @@ require (

77 github.com/bahlo/generic-list-go v0.2.0 // indirect

88 github.com/bahlo/generic-list-go v0.2.0 // indirect

78 github.com/buger/jsonparser v1.1.1 // indirect

89 github.com/buger/jsonparser v1.1.1 // indirect

79 github.com/charmbracelet/anthropic-sdk-go v0.0.0-20251024181547-21d6f3d9a904 // indirect

90 github.com/charmbracelet/anthropic-sdk-go v0.0.0-20251024181547-21d6f3d9a904 // indirect

80− github.com/charmbracelet/colorprofile v0.3.2

81 github.com/charmbracelet/go-genai v0.0.0-20251021165952-9befde14ce97 // indirect

91 github.com/charmbracelet/go-genai v0.0.0-20251021165952-9befde14ce97 // indirect

82− github.com/charmbracelet/ultraviolet v0.0.0-20251017140847-d4ace4d6e731

83 github.com/charmbracelet/x/cellbuf v0.0.14-0.20250811133356-e0c5dbe5ea4a // indirect

92 github.com/charmbracelet/x/cellbuf v0.0.14-0.20250811133356-e0c5dbe5ea4a // indirect

84− github.com/charmbracelet/x/exp/slice v0.0.0-20250904123553-b4e2667e5ad5

85 github.com/charmbracelet/x/json v0.2.0 // indirect

93 github.com/charmbracelet/x/json v0.2.0 // indirect

86 github.com/charmbracelet/x/termios v0.1.1 // indirect

94 github.com/charmbracelet/x/termios v0.1.1 // indirect

87 github.com/charmbracelet/x/windows v0.2.2 // indirect

95 github.com/charmbracelet/x/windows v0.2.2 // indirect

88 github.com/davecgh/go-spew v1.1.1 // indirect

96 github.com/davecgh/go-spew v1.1.1 // indirect

89− github.com/denisbrodbeck/machineid v1.0.1

90 github.com/disintegration/gift v1.1.2 // indirect

97 github.com/disintegration/gift v1.1.2 // indirect

91 github.com/dlclark/regexp2 v1.11.5 // indirect

98 github.com/dlclark/regexp2 v1.11.5 // indirect

92 github.com/dustin/go-humanize v1.0.1 // indirect

99 github.com/dustin/go-humanize v1.0.1 // indirect

@@ -108,7 +115,6 @@ require (

108 github.com/klauspost/compress v1.18.0 // indirect

115 github.com/klauspost/compress v1.18.0 // indirect

109 github.com/klauspost/cpuid/v2 v2.0.9 // indirect

116 github.com/klauspost/cpuid/v2 v2.0.9 // indirect

110 github.com/klauspost/pgzip v1.2.6 // indirect

117 github.com/klauspost/pgzip v1.2.6 // indirect

111− github.com/lucasb-eyer/go-colorful v1.3.0

112 github.com/mailru/easyjson v0.7.7 // indirect

118 github.com/mailru/easyjson v0.7.7 // indirect

113 github.com/mattn/go-isatty v0.0.20 // indirect

119 github.com/mattn/go-isatty v0.0.20 // indirect

114 github.com/mattn/go-runewidth v0.0.17 // indirect

120 github.com/mattn/go-runewidth v0.0.17 // indirect

@@ -121,11 +127,8 @@ require (

121 github.com/muesli/mango-pflag v0.1.0 // indirect

127 github.com/muesli/mango-pflag v0.1.0 // indirect

122 github.com/muesli/roff v0.1.0 // indirect

128 github.com/muesli/roff v0.1.0 // indirect

123 github.com/ncruces/julianday v1.0.0 // indirect

129 github.com/ncruces/julianday v1.0.0 // indirect

124− github.com/openai/openai-go/v2 v2.7.1

125 github.com/pierrec/lz4/v4 v4.1.22 // indirect

130 github.com/pierrec/lz4/v4 v4.1.22 // indirect

126 github.com/pmezard/go-difflib v1.0.0 // indirect

131 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

129 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect

132 github.com/sergi/go-diff v1.3.2-0.20230802210424-5b0b94c5c0d3 // indirect

130 github.com/sethvargo/go-retry v0.3.0 // indirect

133 github.com/sethvargo/go-retry v0.3.0 // indirect

131 github.com/sourcegraph/jsonrpc2 v0.2.1 // indirect

134 github.com/sourcegraph/jsonrpc2 v0.2.1 // indirect

@@ -153,10 +156,8 @@ require (

153 golang.org/x/image v0.27.0 // indirect

156 golang.org/x/image v0.27.0 // indirect

154 golang.org/x/net v0.44.0 // indirect

157 golang.org/x/net v0.44.0 // indirect

155 golang.org/x/oauth2 v0.32.0 // indirect

158 golang.org/x/oauth2 v0.32.0 // indirect

156− golang.org/x/sync v0.17.0 // indirect

157 golang.org/x/sys v0.37.0 // indirect

159 golang.org/x/sys v0.37.0 // indirect

158 golang.org/x/term v0.35.0 // indirect

160 golang.org/x/term v0.35.0 // indirect

159− golang.org/x/text v0.30.0

160 golang.org/x/time v0.12.0 // indirect

161 golang.org/x/time v0.12.0 // indirect

161 google.golang.org/api v0.239.0 // indirect

162 google.golang.org/api v0.239.0 // indirect

162 google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect

163 google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect

@@ -164,5 +165,4 @@ require (

164 google.golang.org/protobuf v1.36.10 // indirect

165 google.golang.org/protobuf v1.36.10 // indirect

165 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect

166 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect

166 gopkg.in/yaml.v3 v3.0.1 // indirect

167 gopkg.in/yaml.v3 v3.0.1 // indirect

167− mvdan.cc/sh/moreinterp v0.0.0-20250902163504-3cf4fd5717a5

168)

internal/agent/coordinator.go+12−4

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

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

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

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

29+ "golang.org/x/sync/errgroup"

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

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

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

32 "charm.land/fantasy/providers/azure"

@@ -63,6 +64,8 @@ type coordinator struct {

64 currentAgent SessionAgent

65 currentAgent SessionAgent

65 agents map[string]SessionAgent

66 agents map[string]SessionAgent

67+

68+ readyWg errgroup.Group

66}

69}

68func NewCoordinator(

71func NewCoordinator(

@@ -106,6 +109,10 @@ func NewCoordinator(

106

109

107// Run implements Coordinator.

110// Run implements Coordinator.

108func (c *coordinator) Run(ctx context.Context, sessionID string, prompt string, attachments ...message.Attachment) (*fantasy.AgentResult, error) {

111func (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+

109 model := c.currentAgent.Model()

116 model := c.currentAgent.Model()

110 maxTokens := model.CatwalkCfg.DefaultMaxTokens

117 maxTokens := model.CatwalkCfg.DefaultMaxTokens

111 if model.ModelCfg.MaxTokens != 0 {

118 if model.ModelCfg.MaxTokens != 0 {

@@ -300,14 +307,15 @@ func (c *coordinator) buildAgent(ctx context.Context, prompt *prompt.Prompt, age

300 c.messages,

307 c.messages,

301 nil,

308 nil,

302 })

309 })

303− go func() {

310+ c.readyWg.Go(func() error {

304 tools, err := c.buildTools(ctx, agent)

311 tools, err := c.buildTools(ctx, agent)

305 if err != nil {

312 if err != nil {

306− slog.Error("could not init agent tools", "err", err)

307− return

313+ return err

308 }

314 }

309 result.SetTools(tools)

315 result.SetTools(tools)

316+ return nil

310− }()

317+ })

318+

311 return result, nil

319 return result, nil

312}

320}

313

321