230e4de · crush · git.iko.soy

internal/config/config.go+8−7

compare with main

unifiedsplit

@@ -137,13 +137,14 @@ type Permissions struct {

137}

138

139type Options struct {

140− ContextPaths []string `json:"context_paths,omitempty" jsonschema:"description=Paths to files containing context information for the AI,example=.cursorrules,example=CRUSH.md"`

140+ ContextPaths []string `json:"context_paths,omitempty" jsonschema:"description=Paths to files containing context information for the AI,example=.cursorrules,example=CRUSH.md"`

141− TUI *TUIOptions `json:"tui,omitempty" jsonschema:"description=Terminal user interface options"`

141+ TUI *TUIOptions `json:"tui,omitempty" jsonschema:"description=Terminal user interface options"`

142− Debug bool `json:"debug,omitempty" jsonschema:"description=Enable debug logging,default=false"`

142+ Debug bool `json:"debug,omitempty" jsonschema:"description=Enable debug logging,default=false"`

143− DebugLSP bool `json:"debug_lsp,omitempty" jsonschema:"description=Enable debug logging for LSP servers,default=false"`

143+ DebugLSP bool `json:"debug_lsp,omitempty" jsonschema:"description=Enable debug logging for LSP servers,default=false"`

144− DisableAutoSummarize bool `json:"disable_auto_summarize,omitempty" jsonschema:"description=Disable automatic conversation summarization,default=false"`

144+ DisableAutoSummarize bool `json:"disable_auto_summarize,omitempty" jsonschema:"description=Disable automatic conversation summarization,default=false"`

145− DataDirectory string `json:"data_directory,omitempty" jsonschema:"description=Directory for storing application data (relative to working directory),default=.crush,example=.crush"` // Relative to the cwd

145+ DataDirectory string `json:"data_directory,omitempty" jsonschema:"description=Directory for storing application data (relative to working directory),default=.crush,example=.crush"` // Relative to the cwd

146− DisabledTools []string `json:"disabled_tools" jsonschema:"description=Tools to disable"`

146+ DisabledTools []string `json:"disabled_tools" jsonschema:"description=Tools to disable"`

147+ DisableProviderAutoUpdate bool `json:"disable_provider_auto_update,omitempty" jsonschema:"description=Disable providers auto-update,default=false"`

147}

148}

148

149

149type MCPs map[string]MCPConfig

150type MCPs map[string]MCPConfig

internal/config/load.go+10−5

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

10 "path/filepath"

11 "runtime"

12 "slices"

13+ "strconv"

13 "strings"

14 "strings"

14

15

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

16 "github.com/charmbracelet/catwalk/pkg/catwalk"

@@ -66,9 +67,9 @@ func Load(workingDir, dataDir string, debug bool) (*Config, error) {

66 )

67 )

67

68

68 // Load known providers, this loads the config from catwalk

69 // Load known providers, this loads the config from catwalk

69− providers, err := Providers()

70+ providers, err := Providers(cfg)

70− if err != nil || len(providers) == 0 {

71+ if err != nil {

71− return nil, fmt.Errorf("failed to load providers: %w", err)

72+ return nil, err

72 }

73 }

73 cfg.knownProviders = providers

74 cfg.knownProviders = providers

74

75

@@ -76,7 +77,7 @@ func Load(workingDir, dataDir string, debug bool) (*Config, error) {

76 // Configure providers

77 // Configure providers

77 valueResolver := NewShellVariableResolver(env)

78 valueResolver := NewShellVariableResolver(env)

78 cfg.resolver = valueResolver

79 cfg.resolver = valueResolver

79− if err := cfg.configureProviders(env, valueResolver, providers); err != nil {

80+ if err := cfg.configureProviders(env, valueResolver, cfg.knownProviders); err != nil {

80 return nil, fmt.Errorf("failed to configure providers: %w", err)

81 return nil, fmt.Errorf("failed to configure providers: %w", err)

81 }

82 }

82

83

@@ -85,7 +86,7 @@ func Load(workingDir, dataDir string, debug bool) (*Config, error) {

85 return cfg, nil

86 return cfg, nil

86 }

87 }

87

88

88− if err := cfg.configureSelectedModels(providers); err != nil {

89+ if err := cfg.configureSelectedModels(cfg.knownProviders); err != nil {

89 return nil, fmt.Errorf("failed to configure selected models: %w", err)

90 return nil, fmt.Errorf("failed to configure selected models: %w", err)

90 }

91 }

91 cfg.SetupAgents()

92 cfg.SetupAgents()

@@ -340,6 +341,10 @@ func (c *Config) setDefaults(workingDir, dataDir string) {

340 c.Options.ContextPaths = append(defaultContextPaths, c.Options.ContextPaths...)

341 c.Options.ContextPaths = append(defaultContextPaths, c.Options.ContextPaths...)

341 slices.Sort(c.Options.ContextPaths)

342 slices.Sort(c.Options.ContextPaths)

342 c.Options.ContextPaths = slices.Compact(c.Options.ContextPaths)

343 c.Options.ContextPaths = slices.Compact(c.Options.ContextPaths)

344+

345+ if str, ok := os.LookupEnv("CRUSH_DISABLE_PROVIDER_AUTO_UPDATE"); ok {

346+ c.Options.DisableProviderAutoUpdate, _ = strconv.ParseBool(str)

347+ }

343}

348}

344

349

345var defaultLSPFileTypes = map[string][]string{

350var defaultLSPFileTypes = map[string][]string{

internal/config/provider.go+80−40

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

12 "time"

13

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

15+ "github.com/charmbracelet/catwalk/pkg/embedded"

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

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

16)

17)

17

18

@@ -22,6 +23,7 @@ type ProviderClient interface {

22var (

23var (

23 providerOnce sync.Once

24 providerOnce sync.Once

24 providerList []catwalk.Provider

25 providerList []catwalk.Provider

26+ providerErr error

25)

27)

26

28

27// file to cache provider data

29// file to cache provider data

@@ -75,55 +77,93 @@ func loadProvidersFromCache(path string) ([]catwalk.Provider, error) {

75 return providers, nil

77 return providers, nil

76}

78}

77

79

78−func Providers() ([]catwalk.Provider, error) {

80+func Providers(cfg *Config) ([]catwalk.Provider, error) {

79− catwalkURL := cmp.Or(os.Getenv("CATWALK_URL"), defaultCatwalkURL)

80− client := catwalk.NewWithURL(catwalkURL)

81− path := providerCacheFileData()

82− return loadProvidersOnce(client, path)

83−}

84−

85−func loadProvidersOnce(client ProviderClient, path string) ([]catwalk.Provider, error) {

86− var err error

87 providerOnce.Do(func() {

81 providerOnce.Do(func() {

82+ catwalkURL := cmp.Or(os.Getenv("CATWALK_URL"), defaultCatwalkURL)

83+ client := catwalk.NewWithURL(catwalkURL)

84+ path := providerCacheFileData()

85+

86+ autoUpdateDisabled := cfg.Options.DisableProviderAutoUpdate

88− providerList, err = loadProviders(client, path)

87+ providerList, providerErr = loadProviders(autoUpdateDisabled, client, path)

89 })

88 })

90− if err != nil {

91− return nil, err

92− }

93− return providerList, nil

89+ return providerList, providerErr

94}

90}

95

91

96−func loadProviders(client ProviderClient, path string) (providerList []catwalk.Provider, err error) {

92+func loadProviders(autoUpdateDisabled bool, client ProviderClient, path string) ([]catwalk.Provider, error) {

97− // if cache is not stale, load from it

98− stale, exists := isCacheStale(path)

93+ cacheIsStale, cacheExists := isCacheStale(path)

99− if !stale {

94+

100− slog.Info("Using cached provider data", "path", path)

95+ catwalkGetAndSave := func() ([]catwalk.Provider, error) {

101− providerList, err = loadProvidersFromCache(path)

102− if len(providerList) > 0 && err == nil {

103− go func() {

104− slog.Info("Updating provider cache in background", "path", path)

105− updated, uerr := client.GetProviders()

96+ providers, err := client.GetProviders()

106− if len(updated) > 0 && uerr == nil {

97+ if err != nil {

98+ return nil, fmt.Errorf("failed to fetch providers from catwalk: %w", err)

99+ }

100+ if len(providers) == 0 {

101+ return nil, fmt.Errorf("empty providers list from catwalk")

102+ }

107− _ = saveProvidersInCache(path, updated)

103+ if err := saveProvidersInCache(path, providers); err != nil {

108− }

109− }()

110− return

104+ return nil, err

111 }

105 }

106+ return providers, nil

112 }

107 }

113

108

114− slog.Info("Getting live provider data", "path", path)

109+ backgroundCacheUpdate := func() {

110+ go func() {

111+ slog.Info("Updating providers cache in background", "path", path)

112+

115− providerList, err = client.GetProviders()

113+ providers, err := client.GetProviders()

116− if len(providerList) > 0 && err == nil {

114+ if err != nil {

115+ slog.Error("Failed to fetch providers in background from Catwalk", "error", err)

116+ return

117+ }

118+ if len(providers) == 0 {

119+ slog.Error("Empty providers list from Catwalk")

120+ return

121+ }

117− err = saveProvidersInCache(path, providerList)

122+ if err := saveProvidersInCache(path, providers); err != nil {

118− return

123+ slog.Error("Failed to update providers.json in background", "error", err)

124+ }

125+ }()

119 }

126 }

120− if !exists {

127+

121− err = fmt.Errorf("failed to load providers")

128+ switch {

129+ case autoUpdateDisabled:

130+ slog.Warn("Providers auto-update is disabled")

131+

132+ if cacheExists {

133+ slog.Warn("Using locally cached providers")

134+ return loadProvidersFromCache(path)

135+ }

136+

137+ slog.Warn("Saving embedded providers to cache")

138+ providers := embedded.GetAll()

139+ if err := saveProvidersInCache(path, providers); err != nil {

140+ return nil, err

141+ }

142+ return providers, nil

143+

144+ case cacheExists && !cacheIsStale:

145+ slog.Info("Recent providers cache is available.", "path", path)

146+

147+ providers, err := loadProvidersFromCache(path)

148+ if err != nil {

149+ return nil, err

150+ }

151+ if len(providers) == 0 {

152+ return catwalkGetAndSave()

153+ }

154+ backgroundCacheUpdate()

155+ return providers, nil

156+

157+ default:

158+ slog.Info("Cache is not available or is stale. Fetching providers from Catwalk.", "path", path)

159+

160+ providers, err := catwalkGetAndSave()

161+ if err != nil {

162+ catwalkUrl := fmt.Sprintf("%s/providers", cmp.Or(os.Getenv("CATWALK_URL"), defaultCatwalkURL))

163+ return nil, fmt.Errorf("crush was unable to fetch an updated list of providers from %s. Consider setting CRUSH_DISABLE_PROVIDER_AUTO_UPDATE=1 to use embedded version from the time of this Crush release. %w", catwalkUrl, err)

164+ }

122− return

165+ return providers, nil

123 }

166 }

124− slog.Info("Loading provider data from cache", "path", path)

125− providerList, err = loadProvidersFromCache(path)

126− return

127}

167}

128

168

129func isCacheStale(path string) (stale, exists bool) {

169func isCacheStale(path string) (stale, exists bool) {

internal/config/provider_empty_test.go+3−3

@@ -19,8 +19,8 @@ func TestProvider_loadProvidersEmptyResult(t *testing.T) {

19 client := &emptyProviderClient{}

20 tmpPath := t.TempDir() + "/providers.json"

21

22− providers, err := loadProviders(client, tmpPath)

22+ providers, err := loadProviders(false, client, tmpPath)

23− require.EqualError(t, err, "failed to load providers")

23+ require.Contains(t, err.Error(), "crush was unable to fetch an updated list of providers")

24 require.Empty(t, providers)

25 require.Len(t, providers, 0)

26

@@ -39,7 +39,7 @@ func TestProvider_loadProvidersEmptyCache(t *testing.T) {

39 require.NoError(t, os.WriteFile(tmpPath, data, 0o644))

40

41 // Should refresh and get real providers instead of using empty cache

42− providers, err := loadProviders(client, tmpPath)

42+ providers, err := loadProviders(false, client, tmpPath)

43 require.NoError(t, err)

44 require.NotNil(t, providers)

45 require.Len(t, providers, 1)

internal/config/provider_test.go+3−3

@@ -28,7 +28,7 @@ func (m *mockProviderClient) GetProviders() ([]catwalk.Provider, error) {

28func TestProvider_loadProvidersNoIssues(t *testing.T) {

29 client := &mockProviderClient{shouldFail: false}

30 tmpPath := t.TempDir() + "/providers.json"

31− providers, err := loadProviders(client, tmpPath)

31+ providers, err := loadProviders(false, client, tmpPath)

32 require.NoError(t, err)

33 require.NotNil(t, providers)

34 require.Len(t, providers, 1)

@@ -57,7 +57,7 @@ func TestProvider_loadProvidersWithIssues(t *testing.T) {

57 if err != nil {

58 t.Fatalf("Failed to write old providers to file: %v", err)

59 }

60− providers, err := loadProviders(client, tmpPath)

60+ providers, err := loadProviders(false, client, tmpPath)

61 require.NoError(t, err)

62 require.NotNil(t, providers)

63 require.Len(t, providers, 1)

@@ -67,7 +67,7 @@ func TestProvider_loadProvidersWithIssues(t *testing.T) {

67func TestProvider_loadProvidersWithIssuesAndNoCache(t *testing.T) {

68 client := &mockProviderClient{shouldFail: true}

69 tmpPath := t.TempDir() + "/providers.json"

70− providers, err := loadProviders(client, tmpPath)

70+ providers, err := loadProviders(false, client, tmpPath)

71 require.Error(t, err)

72 require.Nil(t, providers, "Expected nil providers when loading fails and no cache exists")

73}

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

@@ -397,7 +397,8 @@ func (s *splashCmp) setPreferredModel(selectedItem models.ModelOption) tea.Cmd {

397}

398

399func (s *splashCmp) getProvider(providerID catwalk.InferenceProvider) (*catwalk.Provider, error) {

400+ cfg := config.Get()

400− providers, err := config.Providers()

401+ providers, err := config.Providers(cfg)

401 if err != nil {

402 if err != nil {

402 return nil, err

403 return nil, err

403 }

404 }

internal/tui/components/dialogs/models/list.go+3−2

@@ -49,7 +49,8 @@ func NewModelListComponent(keyMap list.KeyMap, inputPlaceholder string, shouldRe

49func (m *ModelListComponent) Init() tea.Cmd {

50 var cmds []tea.Cmd

51 if len(m.providers) == 0 {

52+ cfg := config.Get()

52− providers, err := config.Providers()

53+ providers, err := config.Providers(cfg)

53 filteredProviders := []catwalk.Provider{}

54 filteredProviders := []catwalk.Provider{}

54 for _, p := range providers {

55 for _, p := range providers {

55 hasAPIKeyEnv := strings.HasPrefix(p.APIKey, "$")

56 hasAPIKeyEnv := strings.HasPrefix(p.APIKey, "$")

@@ -119,7 +120,7 @@ func (m *ModelListComponent) SetModelType(modelType int) tea.Cmd {

119

120

120 // First, add any configured providers that are not in the known providers list

121 // First, add any configured providers that are not in the known providers list

121 // These should appear at the top of the list

122 // These should appear at the top of the list

122− knownProviders, err := config.Providers()

123+ knownProviders, err := config.Providers(cfg)

123 if err != nil {

124 if err != nil {

124 return util.ReportError(err)

125 return util.ReportError(err)

125 }

126 }

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

@@ -352,7 +352,8 @@ func (m *modelDialogCmp) isProviderConfigured(providerID string) bool {

352}

353

354func (m *modelDialogCmp) getProvider(providerID catwalk.InferenceProvider) (*catwalk.Provider, error) {

355+ cfg := config.Get()

355− providers, err := config.Providers()

356+ providers, err := config.Providers(cfg)

356 if err != nil {

357 if err != nil {

357 return nil, err

358 return nil, err

358 }

359 }

schema.json+5

@@ -278,6 +278,11 @@

278 },

279 "type": "array",

280 "description": "Tools to disable"

281+ },

282+ "disable_provider_auto_update": {

283+ "type": "boolean",

284+ "description": "Disable providers auto-update",

285+ "default": false

281 }

286 }

282 },

287 },

283 "additionalProperties": false,

288 "additionalProperties": false,