DRY things up even more

Author: cte

src/core/webview/ClineProvider.ts

@@ -779,22 +779,15 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 		// Update listApiConfigMeta first to ensure UI has latest data
 		await this.updateGlobalState("listApiConfigMeta", listApiConfig)
 
-		// If this mode has a saved config, use it
+		// If this mode has a saved config, use it.
 		if (savedConfigId) {
-			const config = listApiConfig?.find((c) => c.id === savedConfigId)
+			const hasConfig = !!listApiConfig.find(({ id }) => id === savedConfigId)
 
-			if (config?.name) {
-				const { name: _, ...apiConfig } = await this.providerSettingsManager.activateProfile({
-					name: config.name,
-				})
-
-				await Promise.all([
-					this.updateGlobalState("currentApiConfigName", config.name),
-					this.updateApiConfiguration(apiConfig),
-				])
+			if (hasConfig) {
+				await this.activateProviderProfile({ id: savedConfigId })
 			}
 		} else {
-			// If no saved config for this mode, save current config as default
+			// If no saved config for this mode, save current config as default.
 			const currentApiConfigName = this.getGlobalState("currentApiConfigName")
 
 			if (currentApiConfigName) {

src/core/webview/webviewMessageHandler.ts

@@ -88,25 +88,13 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 					const currentConfigName = getGlobalState("currentApiConfigName")
 
 					if (currentConfigName) {
-						const manager = provider.providerSettingsManager
-						const hasConfig = await manager.hasConfig(currentConfigName)
-
-						if (!hasConfig) {
+						if (!(await provider.providerSettingsManager.hasConfig(currentConfigName))) {
 							// Current config name not valid, get first config in list.
-							await updateGlobalState("currentApiConfigName", listApiConfig?.[0]?.name)
-
-							if (listApiConfig?.[0]?.name) {
-								const { name: _, ...providerSettings } = await manager.activateProfile({
-									name: listApiConfig?.[0]?.name,
-								})
-
-								await Promise.all([
-									updateGlobalState("listApiConfigMeta", listApiConfig),
-									provider.postMessageToWebview({ type: "listApiConfig", listApiConfig }),
-									provider.updateApiConfiguration(providerSettings),
-								])
+							const name = listApiConfig[0]?.name
+							await updateGlobalState("currentApiConfigName", name)
 
-								await provider.postStateToWebview()
+							if (name) {
+								await provider.activateProviderProfile({ name })
 								return
 							}
 						}