Merge pull request #1961 from Kilo-Org/morph

Morph FastApply updates

Author: chrarnoldus

.changeset/cruel-eggs-bet.md

@@ -0,0 +1,10 @@
+---
+"kilo-code": minor
+---
+
+Updates to the experimental Morph FastApply support
+
+- A visual indication is now included in the task view whenever Morph is used.
+- The traditional file editing tools are now disabled to ensure Morph is used to edit files.
+- Morph is now automatically disabled when the API provider does not support it and no Morph API key is configured.
+- The Morph API key is no longer lost when switching provider profiles.

packages/types/src/global-settings.ts

@@ -133,6 +133,8 @@ export const globalSettingsSchema = z.object({
 	fuzzyMatchThreshold: z.number().optional(),
 	experiments: experimentsSchema.optional(),
 
+	morphApiKey: z.string().optional(), // kilocode_change: Morph fast apply
+
 	codebaseIndexModels: codebaseIndexModelsSchema.optional(),
 	codebaseIndexConfig: codebaseIndexConfigSchema.optional(),
 

packages/types/src/provider-settings.ts

@@ -95,8 +95,6 @@ const baseProviderSettingsSchema = z.object({
 	modelMaxTokens: z.number().optional(),
 	modelMaxThinkingTokens: z.number().optional(),
 
-	morphApiKey: z.string().optional(), // kilocode_change: Morph fast apply
-
 	// Model verbosity.
 	verbosity: verbosityLevelsSchema.optional(),
 })

src/core/config/ProviderSettingsManager.ts

@@ -13,6 +13,7 @@ import {
 import { TelemetryService } from "@roo-code/telemetry"
 
 import { Mode, modes } from "../../shared/modes"
+import { migrateMorphApiKey } from "./kilocode/migrateMorphApiKey"
 
 export interface SyncCloudProfilesResult {
 	hasChanges: boolean
@@ -32,6 +33,7 @@ export const providerProfilesSchema = z.object({
 			openAiHeadersMigrated: z.boolean().optional(),
 			consecutiveMistakeLimitMigrated: z.boolean().optional(),
 			todoListEnabledMigrated: z.boolean().optional(),
+			morphApiKeyMigrated: z.boolean().optional(), // kilocode_change: Morph API key migration
 		})
 		.optional(),
 })
@@ -123,6 +125,7 @@ export class ProviderSettingsManager {
 						openAiHeadersMigrated: false,
 						consecutiveMistakeLimitMigrated: false,
 						todoListEnabledMigrated: false,
+						morphApiKeyMigrated: false, // kilocode_change: Morph API key migration
 					} // Initialize with default values
 					isDirty = true
 				}
@@ -157,6 +160,14 @@ export class ProviderSettingsManager {
 					isDirty = true
 				}
 
+				// kilocode_change start
+				if (!providerProfiles.migrations.morphApiKeyMigrated) {
+					const result = await migrateMorphApiKey(this.context, providerProfiles)
+					providerProfiles.migrations.morphApiKeyMigrated = true
+					isDirty ||= result
+				}
+				// kilocode_change end
+
 				if (isDirty) {
 					await this.store(providerProfiles)
 				}

src/core/config/kilocode/migrateMorphApiKey.ts

@@ -0,0 +1,35 @@
+import { ExtensionContext } from "vscode"
+import { ProviderProfiles } from "../ProviderSettingsManager"
+
+export async function migrateMorphApiKey(context: ExtensionContext, providerProfiles: ProviderProfiles) {
+	let isDirty = false
+	try {
+		// Find any provider profile with morphApiKey set
+		let morphApiKeyToMigrate: string | undefined
+
+		for (const [_name, apiConfig] of Object.entries(providerProfiles.apiConfigs)) {
+			// Check if this config has morphApiKey (using type assertion since it's no longer in the schema)
+			const configAny = apiConfig as any
+			if (configAny.morphApiKey) {
+				morphApiKeyToMigrate = configAny.morphApiKey
+				// Clear it from the provider config
+				delete configAny.morphApiKey
+				break // Use the first one found
+			}
+		}
+
+		// If we found a morphApiKey, migrate it to global settings
+		if (morphApiKeyToMigrate) {
+			try {
+				await context.globalState.update("morphApiKey", morphApiKeyToMigrate)
+				isDirty = true
+				console.log("[MigrateMorphApiKey] Successfully migrated morphApiKey to global settings")
+			} catch (error) {
+				console.error("[MigrateMorphApiKey] Error setting global morphApiKey:", error)
+			}
+		}
+	} catch (error) {
+		console.error(`[MigrateMorphApiKey] Failed to migrate morphApiKey:`, error)
+	}
+	return isDirty
+}