@@ -82,15 +82,34 @@ function deriveDefaultProviderName(config: AppConfig) {
8282 String ( config . default_model ?. provider || "" )
8383 ) ;
8484
85- if ( defaultProvider && defaultProvider !== "custom" ) {
86- const matchedProvider = providers . find (
87- ( item ) => normalizeProviderName ( item . provider ) === defaultProvider
88- ) ;
89- if ( matchedProvider ) {
90- return normalizeProviderName ( matchedProvider . provider ) ;
91- }
85+ console . log ( '[deriveDefaultProviderName] Input:' , {
86+ defaultProviderFromConfig : config . default_model ?. provider ,
87+ normalizedDefaultProvider : defaultProvider ,
88+ providersCount : providers . length ,
89+ providers : providers . map ( p => ( {
90+ provider : p . provider ,
91+ normalized : normalizeProviderName ( p . provider )
92+ } ) )
93+ } ) ;
94+
95+ // 直接匹配provider名称
96+ const matchedProvider = providers . find (
97+ ( item ) => normalizeProviderName ( item . provider ) === defaultProvider
98+ ) ;
99+
100+ if ( matchedProvider ) {
101+ const result = normalizeProviderName ( matchedProvider . provider ) ;
102+ console . log ( '[deriveDefaultProviderName] Found matched provider:' , result ) ;
103+ return result ;
104+ }
105+
106+ // 如果providers列表为空,直接返回defaultProvider
107+ if ( providers . length === 0 && defaultProvider ) {
108+ console . log ( '[deriveDefaultProviderName] No providers, returning defaultProvider:' , defaultProvider ) ;
109+ return defaultProvider ;
92110 }
93111
112+ // 尝试通过base_url匹配
94113 const defaultBaseUrl = config . default_model ?. base_url || "" ;
95114 if ( defaultBaseUrl ) {
96115 const matchedByBaseUrl = providers . find (
@@ -99,17 +118,31 @@ function deriveDefaultProviderName(config: AppConfig) {
99118 normalizeProviderName ( defaultBaseUrl )
100119 ) ;
101120 if ( matchedByBaseUrl ) {
102- return normalizeProviderName ( matchedByBaseUrl . provider ) ;
121+ const result = normalizeProviderName ( matchedByBaseUrl . provider ) ;
122+ console . log ( '[deriveDefaultProviderName] Found by base_url:' , result ) ;
123+ return result ;
103124 }
104125 }
105126
106- return defaultProvider || normalizeProviderName ( providers [ 0 ] ?. provider ) || "openai" ;
127+ const result = defaultProvider || normalizeProviderName ( providers [ 0 ] ?. provider ) || "openai" ;
128+ console . log ( '[deriveDefaultProviderName] Fallback result:' , result ) ;
129+ return result ;
107130}
108131
109132function buildInitialFormValues ( config : AppConfig ) {
133+ const defaultProviderName = deriveDefaultProviderName ( config ) ;
110134 const defaultModelId = config . default_model ?. model_id || "" ;
135+
136+ console . log ( '[buildInitialFormValues] Config:' , {
137+ default_model_provider : config . default_model ?. provider ,
138+ default_model_model_id : config . default_model ?. model_id ,
139+ derived_provider_name : defaultProviderName ,
140+ derived_model_id : defaultModelId ,
141+ agent_llm_providers_count : config . agent_llm ?. providers ?. length || 0
142+ } ) ;
143+
111144 return {
112- default_provider_name : deriveDefaultProviderName ( config ) ,
145+ default_provider_name : defaultProviderName ,
113146 default_model : {
114147 model_id : defaultModelId ,
115148 } ,
0 commit comments