add independent fast-apply provider setup decoupled from the main provider

packages/types/src/global-settings.ts

@@ -144,6 +144,7 @@ export const globalSettingsSchema = z.object({
 	// kilocode_change start: Morph fast apply
 	morphApiKey: z.string().optional(),
 	fastApplyModel: fastApplyModelSchema.optional(),
+	fastApplyApiProvider: z.string().optional(),
 	// kilocode_change end
 
 	codebaseIndexModels: codebaseIndexModelsSchema.optional(),

src/core/tools/editFileTool.ts

@@ -342,9 +342,22 @@ function getFastApplyConfiguration(state: ClineProviderState): FastApplyConfigur
 	// Read the selected model from state
 	const selectedModel = state.fastApplyModel || "auto"
 
+	// Read fastApplyApiProvider from state when use current Api Configuration
+	let fastApplyApiProvider: string | undefined = state.apiConfiguration?.apiProvider
+
+	const useCurrentApiConfiguration = state.fastApplyApiProvider === "-"
+
+	if (!useCurrentApiConfiguration) {
+		// Read fastApplyApiProvider provider from fast apply setting
+		fastApplyApiProvider = state.fastApplyApiProvider
+	}
+
 	// Priority 1: Use direct Morph API key if available
 	// Allow human-relay for debugging
-	if (state.morphApiKey || state.apiConfiguration?.apiProvider === "human-relay") {
+	if (
+		(fastApplyApiProvider === "morph" && state.morphApiKey) ||
+		state.apiConfiguration?.apiProvider === "human-relay"
+	) {
 		const [org, model] = selectedModel.split("/")
 		return {
 			available: true,
@@ -355,8 +368,8 @@ function getFastApplyConfiguration(state: ClineProviderState): FastApplyConfigur
 	}
 
 	// Priority 2: Use KiloCode provider
-	if (state.apiConfiguration?.apiProvider === "kilocode") {
-		const token = state.apiConfiguration.kilocodeToken
+	if (fastApplyApiProvider === "kilocode") {
+		const token = useCurrentApiConfiguration ? state.apiConfiguration.kilocodeToken : state.morphApiKey
 		if (!token) {
 			return { available: false, error: "No KiloCode token available to use Fast Apply" }
 		}
@@ -370,15 +383,17 @@ function getFastApplyConfiguration(state: ClineProviderState): FastApplyConfigur
 	}
 
 	// Priority 3: Use OpenRouter provider
-	if (state.apiConfiguration?.apiProvider === "openrouter") {
-		const token = state.apiConfiguration.openRouterApiKey
+	if (fastApplyApiProvider === "openrouter") {
+		const token = useCurrentApiConfiguration ? state.apiConfiguration.openRouterApiKey : state.morphApiKey
 		if (!token) {
 			return { available: false, error: "No OpenRouter API token available to use Fast Apply" }
 		}
 		return {
 			available: true,
 			apiKey: token,
-			baseUrl: state.apiConfiguration.openRouterBaseUrl || "https://openrouter.ai/api/v1",
+			baseUrl: useCurrentApiConfiguration
+				? state.apiConfiguration.openRouterBaseUrl
+				: "https://openrouter.ai/api/v1",
 			model: selectedModel === "auto" ? "morph/morph-v3-large" : selectedModel, // Use selected model
 		}
 	}

src/core/webview/ClineProvider.ts

@@ -1906,6 +1906,7 @@ export class ClineProvider
 			dismissedNotificationIds, // kilocode_change
 			morphApiKey, // kilocode_change
 			fastApplyModel, // kilocode_change: Fast Apply model selection
+			fastApplyApiProvider, // kilocode_change: Fast Apply model api base url
 			alwaysAllowFollowupQuestions,
 			followupAutoApproveTimeoutMs,
 			includeDiagnosticMessages,
@@ -2084,6 +2085,7 @@ export class ClineProvider
 			dismissedNotificationIds: dismissedNotificationIds ?? [], // kilocode_change
 			morphApiKey, // kilocode_change
 			fastApplyModel: fastApplyModel ?? "auto", // kilocode_change: Fast Apply model selection
+			fastApplyApiProvider: fastApplyApiProvider ?? "-", // kilocode_change: Fast Apply model api base url
 			alwaysAllowFollowupQuestions: alwaysAllowFollowupQuestions ?? false,
 			followupAutoApproveTimeoutMs: followupAutoApproveTimeoutMs ?? 60000,
 			includeDiagnosticMessages: includeDiagnosticMessages ?? true,
@@ -2297,6 +2299,7 @@ export class ClineProvider
 			dismissedNotificationIds: stateValues.dismissedNotificationIds ?? [], // kilocode_change
 			morphApiKey: stateValues.morphApiKey, // kilocode_change
 			fastApplyModel: stateValues.fastApplyModel ?? "auto", // kilocode_change: Fast Apply model selection
+			fastApplyApiProvider: stateValues.fastApplyApiProvider ?? "-", // kilocode_change: Fast Apply model api config id
 			historyPreviewCollapsed: stateValues.historyPreviewCollapsed ?? false,
 			reasoningBlockCollapsed: stateValues.reasoningBlockCollapsed ?? true,
 			cloudUserInfo,
@@ -3003,6 +3006,7 @@ export class ClineProvider
 						morphFastApply: Boolean(experiments.morphFastApply),
 						morphApiKey: Boolean(this.contextProxy.getValue("morphApiKey")),
 						selectedModel: this.contextProxy.getValue("fastApplyModel") || "auto",
+						fastApplyApiProvider: this.contextProxy.getValue("fastApplyApiProvider") || "-",
 					},
 				}
 			} catch (error) {

src/core/webview/webviewMessageHandler.ts

@@ -1457,6 +1457,11 @@ export const webviewMessageHandler = async (
 			await provider.postStateToWebview()
 			break
 		}
+		case "fastApplyApiProvider": {
+			await updateGlobalState("fastApplyApiProvider", message.text ?? "-")
+			await provider.postStateToWebview()
+			break
+		}
 		// kilocode_change end
 		case "updateVSCodeSetting": {
 			const { setting, value } = message

src/shared/ExtensionMessage.ts

@@ -334,6 +334,7 @@ export type ExtensionState = Pick<
 	| "fuzzyMatchThreshold"
 	| "morphApiKey" // kilocode_change: Morph fast apply - global setting
 	| "fastApplyModel" // kilocode_change: Fast Apply model selection
+	| "fastApplyApiProvider" // kilocode_change: Fast Apply model api base url
 	// | "experiments" // Optional in GlobalSettings, required here.
 	| "language"
 	// | "telemetrySetting" // Optional in GlobalSettings, required here.

src/shared/WebviewMessage.ts

@@ -128,6 +128,7 @@ export interface WebviewMessage {
 		| "fuzzyMatchThreshold"
 		| "morphApiKey" // kilocode_change: Morph fast apply - global setting
 		| "fastApplyModel" // kilocode_change: Fast Apply model selection
+		| "fastApplyApiProvider" // kilocode_change: Fast Apply model api base url
 		| "writeDelayMs"
 		| "diagnosticsEnabled"
 		| "enhancePrompt"

webview-ui/src/components/settings/ExperimentalSettings.tsx

@@ -24,7 +24,8 @@ type ExperimentalSettingsProps = HTMLAttributes<HTMLDivElement> & {
 	// kilocode_change start
 	morphApiKey?: string
 	fastApplyModel?: string
-	setCachedStateField: SetCachedStateField<"morphApiKey" | "fastApplyModel">
+	fastApplyApiProvider?: string
+	setCachedStateField: SetCachedStateField<"morphApiKey" | "fastApplyModel" | "fastApplyApiProvider">
 	kiloCodeImageApiKey?: string
 	setKiloCodeImageApiKey?: (apiKey: string) => void
 	currentProfileKilocodeToken?: string
@@ -50,6 +51,7 @@ export const ExperimentalSettings = ({
 	// kilocode_change start
 	morphApiKey,
 	fastApplyModel, // kilocode_change: Fast Apply model selection
+	fastApplyApiProvider, // kilocode_change: Fast Apply model api base url
 	setCachedStateField,
 	setKiloCodeImageApiKey,
 	kiloCodeImageApiKey,
@@ -107,6 +109,7 @@ export const ExperimentalSettings = ({
 											setCachedStateField={setCachedStateField}
 											morphApiKey={morphApiKey}
 											fastApplyModel={fastApplyModel}
+											fastApplyApiProvider={fastApplyApiProvider}
 										/>
 									)}
 								</React.Fragment>

webview-ui/src/components/settings/FastApplySettings.tsx

@@ -6,15 +6,39 @@ import { SetCachedStateField } from "./types"
 export const FastApplySettings = ({
 	morphApiKey,
 	fastApplyModel,
+	fastApplyApiProvider,
 	setCachedStateField,
 }: {
 	morphApiKey?: string
 	fastApplyModel?: string
-	setCachedStateField: SetCachedStateField<"morphApiKey" | "fastApplyModel">
+	fastApplyApiProvider?: string
+	setCachedStateField: SetCachedStateField<"morphApiKey" | "fastApplyModel" | "fastApplyApiProvider">
 }) => {
 	const { t } = useAppTranslation()
 	return (
 		<div className="flex flex-col gap-2">
+			<div>
+				<label className="text-xs text-vscode-descriptionForeground mb-1 block">
+					{t("settings:experimental.MORPH_FAST_APPLY.apiProvider")}
+				</label>
+				<VSCodeDropdown
+					value={fastApplyApiProvider || "-"}
+					onChange={(e: any) => setCachedStateField("fastApplyApiProvider", (e.target as any)?.value || "-")}
+					className="w-full">
+					<VSCodeOption className="py-2 px-3" value="kilocode">
+						Kilo Code
+					</VSCodeOption>
+					<VSCodeOption className="py-2 px-3" value="openrouter">
+						OpenRouter
+					</VSCodeOption>
+					<VSCodeOption className="py-2 px-3" value="morph">
+						Morph
+					</VSCodeOption>
+					<VSCodeOption className="py-2 px-3" value="-">
+						Use Current Configuration
+					</VSCodeOption>
+				</VSCodeDropdown>
+			</div>
 			<div>
 				<label className="text-xs text-vscode-descriptionForeground mb-1 block">
 					{t("settings:experimental.MORPH_FAST_APPLY.modelLabel")}
@@ -39,14 +63,16 @@ export const FastApplySettings = ({
 				</p>
 			</div>
 
-			<VSCodeTextField
-				type="password"
-				value={morphApiKey || ""}
-				placeholder={t("settings:experimental.MORPH_FAST_APPLY.placeholder")}
-				onChange={(e) => setCachedStateField("morphApiKey", (e.target as any)?.value || "")}
-				className="w-full">
-				{t("settings:experimental.MORPH_FAST_APPLY.apiKey")}
-			</VSCodeTextField>
+			{fastApplyApiProvider !== "-" && (
+				<VSCodeTextField
+					type="password"
+					value={morphApiKey || ""}
+					placeholder={t("settings:experimental.MORPH_FAST_APPLY.placeholder")}
+					onChange={(e) => setCachedStateField("morphApiKey", (e.target as any)?.value || "")}
+					className="w-full">
+					{t("settings:experimental.MORPH_FAST_APPLY.apiKey")}
+				</VSCodeTextField>
+			)}
 		</div>
 	)
 }

webview-ui/src/components/settings/SettingsView.tsx

@@ -183,6 +183,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 		experiments,
 		morphApiKey, // kilocode_change
 		fastApplyModel, // kilocode_change: Fast Apply model selection
+		fastApplyApiProvider, // kilocode_change: Fast Apply model api base url
 		fuzzyMatchThreshold,
 		maxOpenTabsContext,
 		maxWorkspaceFiles,
@@ -474,6 +475,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 			vscode.postMessage({ type: "ghostServiceSettings", values: ghostServiceSettings }) // kilocode_change
 			vscode.postMessage({ type: "morphApiKey", text: morphApiKey }) // kilocode_change
 			vscode.postMessage({ type: "fastApplyModel", text: fastApplyModel }) // kilocode_change: Fast Apply model selection
+			vscode.postMessage({ type: "fastApplyApiProvider", text: fastApplyApiProvider }) // kilocode_change: Fast Apply model api base url
 			vscode.postMessage({ type: "openRouterImageApiKey", text: openRouterImageApiKey })
 			vscode.postMessage({ type: "kiloCodeImageApiKey", text: kiloCodeImageApiKey })
 			vscode.postMessage({
@@ -944,6 +946,7 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 							setCachedStateField={setCachedStateField}
 							morphApiKey={morphApiKey}
 							fastApplyModel={fastApplyModel}
+							fastApplyApiProvider={fastApplyApiProvider}
 							// kilocode_change end
 							apiConfiguration={apiConfiguration}
 							setApiConfigurationField={setApiConfigurationField}

webview-ui/src/i18n/locales/en/settings.json

@@ -794,8 +794,9 @@
 		"MORPH_FAST_APPLY": {
 			"name": "Enable Fast Apply",
 			"description": "When enabled, Kilo Code can edit files using Fast Apply with specialized models optimized for code modifications. Requires the Kilo Code API Provider, OpenRouter, or a Morph API key.",
-			"apiKey": "Morph API key (optional)",
-			"placeholder": "Enter your Morph API key (optional)",
+			"apiProvider": "Fast Apply Model API Provider",
+			"apiKey": "Fast Apply Model API key",
+			"placeholder": "Enter your Fast Apply Model API key",
 			"modelLabel": "Model Selection",
 			"modelDescription": "Choose which Fast Apply model to use for file edits",
 			"models": {