@@ -36,6 +36,11 @@ func TestConfig_LoadFromBytes(t *testing.T) {
36 require.Equal(t, "https://api.openai.com/v2", pc.BaseURL)
36 require.Equal(t, "https://api.openai.com/v2", pc.BaseURL)
39+// testStore wraps a Config in a minimal ConfigStore for testing.
40+func testStore(cfg *Config) *ConfigStore {
41+ return &ConfigStore{config: cfg}
39func TestConfig_setDefaults(t *testing.T) {
44func TestConfig_setDefaults(t *testing.T) {
40 cfg := &Config{}
45 cfg := &Config{}
@@ -53,7 +58,6 @@ func TestConfig_setDefaults(t *testing.T) {
53 for _, path := range defaultContextPaths {
58 for _, path := range defaultContextPaths {
54 require.Contains(t, cfg.Options.ContextPaths, path)
59 require.Contains(t, cfg.Options.ContextPaths, path)
56− require.Equal(t, "/tmp", cfg.workingDir)
59func TestConfig_configureProviders(t *testing.T) {
63func TestConfig_configureProviders(t *testing.T) {
@@ -74,7 +78,7 @@ func TestConfig_configureProviders(t *testing.T) {
74 "OPENAI_API_KEY": "test-key",
78 "OPENAI_API_KEY": "test-key",
76 resolver := NewEnvironmentVariableResolver(env)
80 resolver := NewEnvironmentVariableResolver(env)
77− err := cfg.configureProviders(env, resolver, knownProviders)
81+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
78 require.NoError(t, err)
82 require.NoError(t, err)
79 require.Equal(t, 1, cfg.Providers.Len())
83 require.Equal(t, 1, cfg.Providers.Len())
@@ -117,7 +121,7 @@ func TestConfig_configureProvidersWithOverride(t *testing.T) {
117 "OPENAI_API_KEY": "test-key",
121 "OPENAI_API_KEY": "test-key",
119 resolver := NewEnvironmentVariableResolver(env)
123 resolver := NewEnvironmentVariableResolver(env)
120− err := cfg.configureProviders(env, resolver, knownProviders)
124+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
121 require.NoError(t, err)
125 require.NoError(t, err)
122 require.Equal(t, 1, cfg.Providers.Len())
126 require.Equal(t, 1, cfg.Providers.Len())
@@ -159,7 +163,7 @@ func TestConfig_configureProvidersWithNewProvider(t *testing.T) {
159 "OPENAI_API_KEY": "test-key",
163 "OPENAI_API_KEY": "test-key",
161 resolver := NewEnvironmentVariableResolver(env)
165 resolver := NewEnvironmentVariableResolver(env)
162− err := cfg.configureProviders(env, resolver, knownProviders)
166+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
163 require.NoError(t, err)
167 require.NoError(t, err)
164 // Should be to because of the env variable
168 // Should be to because of the env variable
165 require.Equal(t, cfg.Providers.Len(), 2)
169 require.Equal(t, cfg.Providers.Len(), 2)
@@ -195,7 +199,7 @@ func TestConfig_configureProvidersBedrockWithCredentials(t *testing.T) {
195 "AWS_SECRET_ACCESS_KEY": "test-secret-key",
199 "AWS_SECRET_ACCESS_KEY": "test-secret-key",
197 resolver := NewEnvironmentVariableResolver(env)
201 resolver := NewEnvironmentVariableResolver(env)
198− err := cfg.configureProviders(env, resolver, knownProviders)
202+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
199 require.NoError(t, err)
203 require.NoError(t, err)
200 require.Equal(t, cfg.Providers.Len(), 1)
204 require.Equal(t, cfg.Providers.Len(), 1)
@@ -221,7 +225,7 @@ func TestConfig_configureProvidersBedrockWithoutCredentials(t *testing.T) {
221 cfg.setDefaults("/tmp", "")
225 cfg.setDefaults("/tmp", "")
222 env := env.NewFromMap(map[string]string{})
226 env := env.NewFromMap(map[string]string{})
223 resolver := NewEnvironmentVariableResolver(env)
227 resolver := NewEnvironmentVariableResolver(env)
224− err := cfg.configureProviders(env, resolver, knownProviders)
228+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
225 require.NoError(t, err)
229 require.NoError(t, err)
226 // Provider should not be configured without credentials
230 // Provider should not be configured without credentials
227 require.Equal(t, cfg.Providers.Len(), 0)
231 require.Equal(t, cfg.Providers.Len(), 0)
@@ -246,7 +250,7 @@ func TestConfig_configureProvidersBedrockWithoutUnsupportedModel(t *testing.T) {
246 "AWS_SECRET_ACCESS_KEY": "test-secret-key",
250 "AWS_SECRET_ACCESS_KEY": "test-secret-key",
248 resolver := NewEnvironmentVariableResolver(env)
252 resolver := NewEnvironmentVariableResolver(env)
249− err := cfg.configureProviders(env, resolver, knownProviders)
253+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
250 require.Error(t, err)
254 require.Error(t, err)
@@ -269,7 +273,7 @@ func TestConfig_configureProvidersVertexAIWithCredentials(t *testing.T) {
269 "VERTEXAI_LOCATION": "us-central1",
273 "VERTEXAI_LOCATION": "us-central1",
271 resolver := NewEnvironmentVariableResolver(env)
275 resolver := NewEnvironmentVariableResolver(env)
272− err := cfg.configureProviders(env, resolver, knownProviders)
276+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
273 require.NoError(t, err)
277 require.NoError(t, err)
274 require.Equal(t, cfg.Providers.Len(), 1)
278 require.Equal(t, cfg.Providers.Len(), 1)
@@ -301,7 +305,7 @@ func TestConfig_configureProvidersVertexAIWithoutCredentials(t *testing.T) {
301 "GOOGLE_CLOUD_LOCATION": "us-central1",
305 "GOOGLE_CLOUD_LOCATION": "us-central1",
303 resolver := NewEnvironmentVariableResolver(env)
307 resolver := NewEnvironmentVariableResolver(env)
304− err := cfg.configureProviders(env, resolver, knownProviders)
308+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
305 require.NoError(t, err)
309 require.NoError(t, err)
306 // Provider should not be configured without proper credentials
310 // Provider should not be configured without proper credentials
307 require.Equal(t, cfg.Providers.Len(), 0)
311 require.Equal(t, cfg.Providers.Len(), 0)
@@ -326,7 +330,7 @@ func TestConfig_configureProvidersVertexAIMissingProject(t *testing.T) {
326 "GOOGLE_CLOUD_LOCATION": "us-central1",
330 "GOOGLE_CLOUD_LOCATION": "us-central1",
328 resolver := NewEnvironmentVariableResolver(env)
332 resolver := NewEnvironmentVariableResolver(env)
329− err := cfg.configureProviders(env, resolver, knownProviders)
333+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
330 require.NoError(t, err)
334 require.NoError(t, err)
331 // Provider should not be configured without project
335 // Provider should not be configured without project
332 require.Equal(t, cfg.Providers.Len(), 0)
336 require.Equal(t, cfg.Providers.Len(), 0)
@@ -350,7 +354,7 @@ func TestConfig_configureProvidersSetProviderID(t *testing.T) {
350 "OPENAI_API_KEY": "test-key",
354 "OPENAI_API_KEY": "test-key",
352 resolver := NewEnvironmentVariableResolver(env)
356 resolver := NewEnvironmentVariableResolver(env)
353− err := cfg.configureProviders(env, resolver, knownProviders)
357+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
354 require.NoError(t, err)
358 require.NoError(t, err)
355 require.Equal(t, cfg.Providers.Len(), 1)
359 require.Equal(t, cfg.Providers.Len(), 1)
@@ -541,7 +545,7 @@ func TestConfig_configureProvidersWithDisabledProvider(t *testing.T) {
541 "OPENAI_API_KEY": "test-key",
545 "OPENAI_API_KEY": "test-key",
543 resolver := NewEnvironmentVariableResolver(env)
547 resolver := NewEnvironmentVariableResolver(env)
544− err := cfg.configureProviders(env, resolver, knownProviders)
548+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
545 require.NoError(t, err)
549 require.NoError(t, err)
547 require.Equal(t, cfg.Providers.Len(), 1)
551 require.Equal(t, cfg.Providers.Len(), 1)
@@ -569,7 +573,7 @@ func TestConfig_configureProvidersCustomProviderValidation(t *testing.T) {
570 env := env.NewFromMap(map[string]string{})
574 env := env.NewFromMap(map[string]string{})
571 resolver := NewEnvironmentVariableResolver(env)
575 resolver := NewEnvironmentVariableResolver(env)
572− err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
576+ err := cfg.configureProviders(testStore(cfg), env, resolver, []catwalk.Provider{})
573 require.NoError(t, err)
577 require.NoError(t, err)
575 require.Equal(t, cfg.Providers.Len(), 1)
579 require.Equal(t, cfg.Providers.Len(), 1)
@@ -592,7 +596,7 @@ func TestConfig_configureProvidersCustomProviderValidation(t *testing.T) {
593 env := env.NewFromMap(map[string]string{})
597 env := env.NewFromMap(map[string]string{})
594 resolver := NewEnvironmentVariableResolver(env)
598 resolver := NewEnvironmentVariableResolver(env)
595− err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
599+ err := cfg.configureProviders(testStore(cfg), env, resolver, []catwalk.Provider{})
596 require.NoError(t, err)
600 require.NoError(t, err)
598 require.Equal(t, cfg.Providers.Len(), 0)
602 require.Equal(t, cfg.Providers.Len(), 0)
@@ -614,7 +618,7 @@ func TestConfig_configureProvidersCustomProviderValidation(t *testing.T) {
615 env := env.NewFromMap(map[string]string{})
619 env := env.NewFromMap(map[string]string{})
616 resolver := NewEnvironmentVariableResolver(env)
620 resolver := NewEnvironmentVariableResolver(env)
617− err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
621+ err := cfg.configureProviders(testStore(cfg), env, resolver, []catwalk.Provider{})
618 require.NoError(t, err)
622 require.NoError(t, err)
620 require.Equal(t, cfg.Providers.Len(), 0)
624 require.Equal(t, cfg.Providers.Len(), 0)
@@ -639,7 +643,7 @@ func TestConfig_configureProvidersCustomProviderValidation(t *testing.T) {
640 env := env.NewFromMap(map[string]string{})
644 env := env.NewFromMap(map[string]string{})
641 resolver := NewEnvironmentVariableResolver(env)
645 resolver := NewEnvironmentVariableResolver(env)
642− err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
646+ err := cfg.configureProviders(testStore(cfg), env, resolver, []catwalk.Provider{})
643 require.NoError(t, err)
647 require.NoError(t, err)
645 require.Equal(t, cfg.Providers.Len(), 0)
649 require.Equal(t, cfg.Providers.Len(), 0)
@@ -664,7 +668,7 @@ func TestConfig_configureProvidersCustomProviderValidation(t *testing.T) {
665 env := env.NewFromMap(map[string]string{})
669 env := env.NewFromMap(map[string]string{})
666 resolver := NewEnvironmentVariableResolver(env)
670 resolver := NewEnvironmentVariableResolver(env)
667− err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
671+ err := cfg.configureProviders(testStore(cfg), env, resolver, []catwalk.Provider{})
668 require.NoError(t, err)
672 require.NoError(t, err)
670 require.Equal(t, cfg.Providers.Len(), 1)
674 require.Equal(t, cfg.Providers.Len(), 1)
@@ -692,7 +696,7 @@ func TestConfig_configureProvidersCustomProviderValidation(t *testing.T) {
693 env := env.NewFromMap(map[string]string{})
697 env := env.NewFromMap(map[string]string{})
694 resolver := NewEnvironmentVariableResolver(env)
698 resolver := NewEnvironmentVariableResolver(env)
695− err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
699+ err := cfg.configureProviders(testStore(cfg), env, resolver, []catwalk.Provider{})
696 require.NoError(t, err)
700 require.NoError(t, err)
698 require.Equal(t, cfg.Providers.Len(), 1)
702 require.Equal(t, cfg.Providers.Len(), 1)
@@ -722,7 +726,7 @@ func TestConfig_configureProvidersCustomProviderValidation(t *testing.T) {
723 env := env.NewFromMap(map[string]string{})
727 env := env.NewFromMap(map[string]string{})
724 resolver := NewEnvironmentVariableResolver(env)
728 resolver := NewEnvironmentVariableResolver(env)
725− err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
729+ err := cfg.configureProviders(testStore(cfg), env, resolver, []catwalk.Provider{})
726 require.NoError(t, err)
730 require.NoError(t, err)
728 require.Equal(t, cfg.Providers.Len(), 0)
732 require.Equal(t, cfg.Providers.Len(), 0)
@@ -757,7 +761,7 @@ func TestConfig_configureProvidersEnhancedCredentialValidation(t *testing.T) {
757 "GOOGLE_GENAI_USE_VERTEXAI": "false",
761 "GOOGLE_GENAI_USE_VERTEXAI": "false",
759 resolver := NewEnvironmentVariableResolver(env)
763 resolver := NewEnvironmentVariableResolver(env)
760− err := cfg.configureProviders(env, resolver, knownProviders)
764+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
761 require.NoError(t, err)
765 require.NoError(t, err)
763 require.Equal(t, cfg.Providers.Len(), 0)
767 require.Equal(t, cfg.Providers.Len(), 0)
@@ -788,7 +792,7 @@ func TestConfig_configureProvidersEnhancedCredentialValidation(t *testing.T) {
789 env := env.NewFromMap(map[string]string{})
793 env := env.NewFromMap(map[string]string{})
790 resolver := NewEnvironmentVariableResolver(env)
794 resolver := NewEnvironmentVariableResolver(env)
791− err := cfg.configureProviders(env, resolver, knownProviders)
795+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
792 require.NoError(t, err)
796 require.NoError(t, err)
794 require.Equal(t, cfg.Providers.Len(), 0)
798 require.Equal(t, cfg.Providers.Len(), 0)
@@ -819,7 +823,7 @@ func TestConfig_configureProvidersEnhancedCredentialValidation(t *testing.T) {
820 env := env.NewFromMap(map[string]string{})
824 env := env.NewFromMap(map[string]string{})
821 resolver := NewEnvironmentVariableResolver(env)
825 resolver := NewEnvironmentVariableResolver(env)
822− err := cfg.configureProviders(env, resolver, knownProviders)
826+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
823 require.NoError(t, err)
827 require.NoError(t, err)
825 require.Equal(t, cfg.Providers.Len(), 0)
829 require.Equal(t, cfg.Providers.Len(), 0)
@@ -852,7 +856,7 @@ func TestConfig_configureProvidersEnhancedCredentialValidation(t *testing.T) {
852 "OPENAI_API_KEY": "test-key",
856 "OPENAI_API_KEY": "test-key",
854 resolver := NewEnvironmentVariableResolver(env)
858 resolver := NewEnvironmentVariableResolver(env)
855− err := cfg.configureProviders(env, resolver, knownProviders)
859+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
856 require.NoError(t, err)
860 require.NoError(t, err)
858 require.Equal(t, cfg.Providers.Len(), 1)
862 require.Equal(t, cfg.Providers.Len(), 1)
@@ -886,7 +890,7 @@ func TestConfig_defaultModelSelection(t *testing.T) {
886 cfg.setDefaults("/tmp", "")
890 cfg.setDefaults("/tmp", "")
887 env := env.NewFromMap(map[string]string{})
891 env := env.NewFromMap(map[string]string{})
888 resolver := NewEnvironmentVariableResolver(env)
892 resolver := NewEnvironmentVariableResolver(env)
889− err := cfg.configureProviders(env, resolver, knownProviders)
893+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
890 require.NoError(t, err)
894 require.NoError(t, err)
892 large, small, err := cfg.defaultModelSelection(knownProviders)
896 large, small, err := cfg.defaultModelSelection(knownProviders)
@@ -922,7 +926,7 @@ func TestConfig_defaultModelSelection(t *testing.T) {
922 cfg.setDefaults("/tmp", "")
926 cfg.setDefaults("/tmp", "")
923 env := env.NewFromMap(map[string]string{})
927 env := env.NewFromMap(map[string]string{})
924 resolver := NewEnvironmentVariableResolver(env)
928 resolver := NewEnvironmentVariableResolver(env)
925− err := cfg.configureProviders(env, resolver, knownProviders)
929+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
926 require.NoError(t, err)
930 require.NoError(t, err)
928 _, _, err = cfg.defaultModelSelection(knownProviders)
932 _, _, err = cfg.defaultModelSelection(knownProviders)
@@ -952,7 +956,7 @@ func TestConfig_defaultModelSelection(t *testing.T) {
952 cfg.setDefaults("/tmp", "")
956 cfg.setDefaults("/tmp", "")
953 env := env.NewFromMap(map[string]string{})
957 env := env.NewFromMap(map[string]string{})
954 resolver := NewEnvironmentVariableResolver(env)
958 resolver := NewEnvironmentVariableResolver(env)
955− err := cfg.configureProviders(env, resolver, knownProviders)
959+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
956 require.NoError(t, err)
960 require.NoError(t, err)
957 _, _, err = cfg.defaultModelSelection(knownProviders)
961 _, _, err = cfg.defaultModelSelection(knownProviders)
958 require.Error(t, err)
962 require.Error(t, err)
@@ -995,7 +999,7 @@ func TestConfig_defaultModelSelection(t *testing.T) {
995 cfg.setDefaults("/tmp", "")
999 cfg.setDefaults("/tmp", "")
996 env := env.NewFromMap(map[string]string{})
1000 env := env.NewFromMap(map[string]string{})
997 resolver := NewEnvironmentVariableResolver(env)
1001 resolver := NewEnvironmentVariableResolver(env)
998− err := cfg.configureProviders(env, resolver, knownProviders)
1002+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
999 require.NoError(t, err)
1003 require.NoError(t, err)
1000 large, small, err := cfg.defaultModelSelection(knownProviders)
1004 large, small, err := cfg.defaultModelSelection(knownProviders)
1001 require.NoError(t, err)
1005 require.NoError(t, err)
@@ -1039,7 +1043,7 @@ func TestConfig_defaultModelSelection(t *testing.T) {
1039 cfg.setDefaults("/tmp", "")
1043 cfg.setDefaults("/tmp", "")
1040 env := env.NewFromMap(map[string]string{})
1044 env := env.NewFromMap(map[string]string{})
1041 resolver := NewEnvironmentVariableResolver(env)
1045 resolver := NewEnvironmentVariableResolver(env)
1042− err := cfg.configureProviders(env, resolver, knownProviders)
1046+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
1043 require.NoError(t, err)
1047 require.NoError(t, err)
1044 _, _, err = cfg.defaultModelSelection(knownProviders)
1048 _, _, err = cfg.defaultModelSelection(knownProviders)
1045 require.Error(t, err)
1049 require.Error(t, err)
@@ -1081,7 +1085,7 @@ func TestConfig_defaultModelSelection(t *testing.T) {
1081 cfg.setDefaults("/tmp", "")
1085 cfg.setDefaults("/tmp", "")
1082 env := env.NewFromMap(map[string]string{})
1086 env := env.NewFromMap(map[string]string{})
1083 resolver := NewEnvironmentVariableResolver(env)
1087 resolver := NewEnvironmentVariableResolver(env)
1084− err := cfg.configureProviders(env, resolver, knownProviders)
1088+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
1085 require.NoError(t, err)
1089 require.NoError(t, err)
1086 large, small, err := cfg.defaultModelSelection(knownProviders)
1090 large, small, err := cfg.defaultModelSelection(knownProviders)
1087 require.NoError(t, err)
1091 require.NoError(t, err)
@@ -1126,7 +1130,7 @@ func TestConfig_configureProvidersDisableDefaultProviders(t *testing.T) {
1126 "OPENAI_API_KEY": "test-key",
1130 "OPENAI_API_KEY": "test-key",
1128 resolver := NewEnvironmentVariableResolver(env)
1132 resolver := NewEnvironmentVariableResolver(env)
1129− err := cfg.configureProviders(env, resolver, knownProviders)
1133+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
1130 require.ErrorContains(t, err, "no custom providers")
1134 require.ErrorContains(t, err, "no custom providers")
1132 // openai should NOT be present because it lacks base_url and models.
1136 // openai should NOT be present because it lacks base_url and models.
@@ -1169,7 +1173,7 @@ func TestConfig_configureProvidersDisableDefaultProviders(t *testing.T) {
1169 "OPENAI_API_KEY": "test-key",
1173 "OPENAI_API_KEY": "test-key",
1171 resolver := NewEnvironmentVariableResolver(env)
1175 resolver := NewEnvironmentVariableResolver(env)
1172− err := cfg.configureProviders(env, resolver, knownProviders)
1176+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
1173 require.NoError(t, err)
1177 require.NoError(t, err)
1175 // Only fully specified provider should be present.
1179 // Only fully specified provider should be present.
@@ -1223,7 +1227,7 @@ func TestConfig_configureProvidersDisableDefaultProviders(t *testing.T) {
1223 "ANTHROPIC_API_KEY": "test-key",
1227 "ANTHROPIC_API_KEY": "test-key",
1225 resolver := NewEnvironmentVariableResolver(env)
1229 resolver := NewEnvironmentVariableResolver(env)
1226− err := cfg.configureProviders(env, resolver, knownProviders)
1230+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
1227 require.NoError(t, err)
1231 require.NoError(t, err)
1229 // Both providers should be present.
1233 // Both providers should be present.
@@ -1251,7 +1255,7 @@ func TestConfig_configureProvidersDisableDefaultProviders(t *testing.T) {
1252 env := env.NewFromMap(map[string]string{})
1256 env := env.NewFromMap(map[string]string{})
1253 resolver := NewEnvironmentVariableResolver(env)
1257 resolver := NewEnvironmentVariableResolver(env)
1254− err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
1258+ err := cfg.configureProviders(testStore(cfg), env, resolver, []catwalk.Provider{})
1255 require.ErrorContains(t, err, "no custom providers")
1259 require.ErrorContains(t, err, "no custom providers")
1257 // Provider should be rejected for missing models.
1261 // Provider should be rejected for missing models.
@@ -1275,7 +1279,7 @@ func TestConfig_configureProvidersDisableDefaultProviders(t *testing.T) {
1276 env := env.NewFromMap(map[string]string{})
1280 env := env.NewFromMap(map[string]string{})
1277 resolver := NewEnvironmentVariableResolver(env)
1281 resolver := NewEnvironmentVariableResolver(env)
1278− err := cfg.configureProviders(env, resolver, []catwalk.Provider{})
1282+ err := cfg.configureProviders(testStore(cfg), env, resolver, []catwalk.Provider{})
1279 require.ErrorContains(t, err, "no custom providers")
1283 require.ErrorContains(t, err, "no custom providers")
1281 // Provider should be rejected for missing base_url.
1285 // Provider should be rejected for missing base_url.
@@ -1340,10 +1344,10 @@ func TestConfig_configureSelectedModels(t *testing.T) {
1340 cfg.setDefaults("/tmp", "")
1344 cfg.setDefaults("/tmp", "")
1341 env := env.NewFromMap(map[string]string{})
1345 env := env.NewFromMap(map[string]string{})
1342 resolver := NewEnvironmentVariableResolver(env)
1346 resolver := NewEnvironmentVariableResolver(env)
1343− err := cfg.configureProviders(env, resolver, knownProviders)
1347+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
1344 require.NoError(t, err)
1348 require.NoError(t, err)
1346− err = cfg.configureSelectedModels(knownProviders)
1350+ err = configureSelectedModels(testStore(cfg), knownProviders)
1347 require.NoError(t, err)
1351 require.NoError(t, err)
1348 large := cfg.Models[SelectedModelTypeLarge]
1352 large := cfg.Models[SelectedModelTypeLarge]
1349 small := cfg.Models[SelectedModelTypeSmall]
1353 small := cfg.Models[SelectedModelTypeSmall]
@@ -1402,10 +1406,10 @@ func TestConfig_configureSelectedModels(t *testing.T) {
1402 cfg.setDefaults("/tmp", "")
1406 cfg.setDefaults("/tmp", "")
1403 env := env.NewFromMap(map[string]string{})
1407 env := env.NewFromMap(map[string]string{})
1404 resolver := NewEnvironmentVariableResolver(env)
1408 resolver := NewEnvironmentVariableResolver(env)
1405− err := cfg.configureProviders(env, resolver, knownProviders)
1409+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
1406 require.NoError(t, err)
1410 require.NoError(t, err)
1408− err = cfg.configureSelectedModels(knownProviders)
1412+ err = configureSelectedModels(testStore(cfg), knownProviders)
1409 require.NoError(t, err)
1413 require.NoError(t, err)
1410 large := cfg.Models[SelectedModelTypeLarge]
1414 large := cfg.Models[SelectedModelTypeLarge]
1411 small := cfg.Models[SelectedModelTypeSmall]
1415 small := cfg.Models[SelectedModelTypeSmall]
@@ -1447,10 +1451,10 @@ func TestConfig_configureSelectedModels(t *testing.T) {
1447 cfg.setDefaults("/tmp", "")
1451 cfg.setDefaults("/tmp", "")
1448 env := env.NewFromMap(map[string]string{})
1452 env := env.NewFromMap(map[string]string{})
1449 resolver := NewEnvironmentVariableResolver(env)
1453 resolver := NewEnvironmentVariableResolver(env)
1450− err := cfg.configureProviders(env, resolver, knownProviders)
1454+ err := cfg.configureProviders(testStore(cfg), env, resolver, knownProviders)
1451 require.NoError(t, err)
1455 require.NoError(t, err)
1453− err = cfg.configureSelectedModels(knownProviders)
1457+ err = configureSelectedModels(testStore(cfg), knownProviders)
1454 require.NoError(t, err)
1458 require.NoError(t, err)
1455 large := cfg.Models[SelectedModelTypeLarge]
1459 large := cfg.Models[SelectedModelTypeLarge]
1456 require.Equal(t, "large-model", large.Model)
1460 require.Equal(t, "large-model", large.Model)