More fixes

Author: cte

src/core/config/ProviderSettingsManager.ts

@@ -258,12 +258,7 @@ export class ProviderSettingsManager {
 		}
 	}
 
-	/**
-	 * Activate a profile by name or ID.
-	 */
-	public async activateProfile(
-		params: { name: string } | { id: string },
-	): Promise<ProviderSettingsWithId & { name: string }> {
+	public async getProfile(params: { name: string } | { id: string }) {
 		try {
 			return await this.lock(async () => {
 				const providerProfiles = await this.load()
@@ -293,13 +288,30 @@ export class ProviderSettingsManager {
 					providerSettings = entry[1]
 				}
 
+				return { name, ...providerSettings }
+			})
+		} catch (error) {
+			throw new Error(`Failed to get profile profile: ${error}`)
+		}
+	}
+
+	/**
+	 * Activate a profile by name or ID.
+	 */
+	public async activateProfile(
+		params: { name: string } | { id: string },
+	): Promise<ProviderSettingsWithId & { name: string }> {
+		const { name, ...providerSettings } = await this.getProfile(params)
+
+		try {
+			return await this.lock(async () => {
+				const providerProfiles = await this.load()
 				providerProfiles.currentApiConfigName = name
 				await this.store(providerProfiles)
-
 				return { name, ...providerSettings }
 			})
 		} catch (error) {
-			throw new Error(`Failed to load config: ${error}`)
+			throw new Error(`Failed to activate profile profile: ${error}`)
 		}
 	}
 

src/core/webview/ClineProvider.ts

@@ -808,9 +808,9 @@ export class ClineProvider extends EventEmitter<ClineProviderEvents> implements
 		await Promise.all([
 			this.contextProxy.setValue("listApiConfigMeta", await this.providerSettingsManager.listConfig()),
 			this.contextProxy.setValue("currentApiConfigName", name),
-			this.updateApiConfiguration(providerSettings),
 		])
 
+		await this.updateApiConfiguration(providerSettings)
 		await this.postStateToWebview()
 	}
 

src/core/webview/webviewMessageHandler.ts

@@ -4,9 +4,9 @@ import pWaitFor from "p-wait-for"
 import * as vscode from "vscode"
 
 import { ClineProvider } from "./ClineProvider"
-import { Language, ApiConfigMeta } from "../../schemas"
+import { Language, ApiConfigMeta, ProviderSettings } from "../../schemas"
 import { changeLanguage, t } from "../../i18n"
-import { ApiConfiguration, RouterName, toRouterName } from "../../shared/api"
+import { RouterName, toRouterName } from "../../shared/api"
 import { supportPrompt } from "../../shared/support-prompt"
 
 import { checkoutDiffPayloadSchema, checkoutRestorePayloadSchema, WebviewMessage } from "../../shared/WebviewMessage"
@@ -933,19 +933,18 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 						await provider.getState()
 
 					// Try to get enhancement config first, fall back to current config.
-					let configToUse: ApiConfiguration = apiConfiguration
-
-					if (enhancementApiConfigId) {
-						const config = listApiConfigMeta?.find((c: ApiConfigMeta) => c.id === enhancementApiConfigId)
-
-						if (config?.name) {
-							const { name: _, ...loadedConfig } = await provider.providerSettingsManager.activateProfile(
-								{ name: config.name },
-							)
+					let configToUse: ProviderSettings = apiConfiguration
+
+					if (
+						enhancementApiConfigId &&
+						!!listApiConfigMeta.find((c: ApiConfigMeta) => c.id === enhancementApiConfigId)
+					) {
+						const { name: _, ...providerSettings } = await provider.providerSettingsManager.getProfile({
+							id: enhancementApiConfigId,
+						})
 
-							if (loadedConfig.apiProvider) {
-								configToUse = loadedConfig
-							}
+						if (providerSettings.apiProvider) {
+							configToUse = providerSettings
 						}
 					}
 
@@ -954,7 +953,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
 						supportPrompt.create("ENHANCE", { userInput: message.text }, customSupportPrompts),
 					)
 
-					// Capture telemetry for prompt enhancement
+					// Capture telemetry for prompt enhancement.
 					const currentCline = provider.getCurrentCline()
 					telemetryService.capturePromptEnhanced(currentCline?.taskId)