Merge pull request #3501 from Kilo-Org/feature/experimental-new-autocomplete

feat: Add experimental Continue.dev-based autocomplete as alternative to classic autocomplete

Author: markijbema

packages/types/src/kilocode/kilocode.ts

@@ -13,6 +13,7 @@ export const ghostServiceSettingsSchema = z
 		enableQuickInlineTaskKeybinding: z.boolean().optional(),
 		enableSmartInlineTaskKeybinding: z.boolean().optional(),
 		showGutterAnimation: z.boolean().optional(),
+		useNewAutocomplete: z.boolean().optional(),
 		provider: z.string().optional(),
 		model: z.string().optional(),
 	})

src/extension.ts

@@ -45,7 +45,6 @@ import { initializeI18n } from "./i18n"
 import { registerGhostProvider } from "./services/ghost" // kilocode_change
 import { registerMainThreadForwardingLogger } from "./utils/fowardingLogger" // kilocode_change
 import { getKiloCodeWrapperProperties } from "./core/kilocode/wrapper" // kilocode_change
-import { registerAutocompleteProvider } from "./services/autocomplete" // kilocode_change
 
 /**
  * Built using https://github.com/microsoft/vscode-webview-ui-toolkit
@@ -322,8 +321,6 @@ export async function activate(context: vscode.ExtensionContext) {
 	if (!kiloCodeWrapped) {
 		// Only use autocomplete in VS Code
 		registerGhostProvider(context, provider)
-		// Experimental
-		// registerAutocompleteProvider(context, provider)
 	} else {
 		// Only foward logs in Jetbrains
 		registerMainThreadForwardingLogger(context)

src/services/autocomplete/index.ts

@@ -6,6 +6,7 @@ import { GhostModel } from "./GhostModel"
 import { GhostStatusBar } from "./GhostStatusBar"
 import { GhostCodeActionProvider } from "./GhostCodeActionProvider"
 import { GhostInlineCompletionProvider } from "./classic-auto-complete/GhostInlineCompletionProvider"
+import { NewAutocompleteProvider } from "./new-auto-complete/NewAutocompleteProvider"
 import { GhostServiceSettings, TelemetryEventName } from "@roo-code/types"
 import { ContextProxy } from "../../core/config/ContextProxy"
 import { ProviderSettingsManager } from "../../core/config/ProviderSettingsManager"
@@ -37,6 +38,7 @@ export class GhostServiceManager {
 	// VSCode Providers
 	public codeActionProvider: GhostCodeActionProvider
 	public inlineCompletionProvider: GhostInlineCompletionProvider
+	private newAutocompleteProvider: NewAutocompleteProvider | null = null
 	private inlineCompletionProviderDisposable: vscode.Disposable | null = null
 
 	private ignoreController?: Promise<RooIgnoreController>
@@ -123,19 +125,37 @@ export class GhostServiceManager {
 
 	private async updateInlineCompletionProviderRegistration() {
 		const shouldBeRegistered = this.settings?.enableAutoTrigger ?? false
+		const useNewAutocomplete = this.settings?.useNewAutocomplete ?? false
 
-		if (shouldBeRegistered && !this.inlineCompletionProviderDisposable) {
-			// Register the provider
-			this.inlineCompletionProviderDisposable = vscode.languages.registerInlineCompletionItemProvider(
-				"*",
-				this.inlineCompletionProvider,
-			)
-			this.context.subscriptions.push(this.inlineCompletionProviderDisposable)
-		} else if (!shouldBeRegistered && this.inlineCompletionProviderDisposable) {
-			// Deregister the provider
+		// First, dispose any existing registration
+		if (this.inlineCompletionProviderDisposable) {
 			this.inlineCompletionProviderDisposable.dispose()
 			this.inlineCompletionProviderDisposable = null
 		}
+
+		// Dispose new autocomplete provider if switching away from it
+		if (!useNewAutocomplete && this.newAutocompleteProvider) {
+			this.newAutocompleteProvider.dispose()
+			this.newAutocompleteProvider = null
+		}
+
+		if (shouldBeRegistered) {
+			if (useNewAutocomplete) {
+				// Initialize new autocomplete provider if not already created
+				if (!this.newAutocompleteProvider) {
+					this.newAutocompleteProvider = new NewAutocompleteProvider(this.context, this.cline)
+					await this.newAutocompleteProvider.load()
+				}
+				// New autocomplete provider registers itself internally
+			} else {
+				// Register classic provider
+				this.inlineCompletionProviderDisposable = vscode.languages.registerInlineCompletionItemProvider(
+					"*",
+					this.inlineCompletionProvider,
+				)
+				this.context.subscriptions.push(this.inlineCompletionProviderDisposable)
+			}
+		}
 	}
 
 	public async disable() {
@@ -272,6 +292,15 @@ export class GhostServiceManager {
 			return
 		}
 
+		// Check if using new autocomplete
+		const useNewAutocomplete = this.settings?.useNewAutocomplete ?? false
+
+		if (useNewAutocomplete) {
+			// New autocomplete doesn't support manual code suggestion yet
+			// Just return for now
+			return
+		}
+
 		// Ensure model is loaded
 		if (!this.model.loaded) {
 			await this.load()
@@ -416,7 +445,13 @@ export class GhostServiceManager {
 
 	public cancelRequest() {
 		this.stopProcessing()
-		this.inlineCompletionProvider.cancelRequest()
+		// Check which provider is active and cancel appropriately
+		const useNewAutocomplete = this.settings?.useNewAutocomplete ?? false
+		if (useNewAutocomplete) {
+			// New autocomplete doesn't have a cancel method yet
+		} else {
+			this.inlineCompletionProvider.cancelRequest()
+		}
 	}
 
 	/**
@@ -434,6 +469,12 @@ export class GhostServiceManager {
 			this.inlineCompletionProviderDisposable = null
 		}
 
+		// Dispose new autocomplete provider if it exists
+		if (this.newAutocompleteProvider) {
+			this.newAutocompleteProvider.dispose()
+			this.newAutocompleteProvider = null
+		}
+
 		this.disposeIgnoreController()
 
 		GhostServiceManager.instance = null // Reset singleton

src/services/ghost/GhostServiceManager.ts

@@ -6,15 +6,15 @@ import {
 	ProviderSettings,
 	ProviderSettingsEntry,
 } from "@roo-code/types"
-import { ApiHandler, buildApiHandler } from "../../api"
-import { ProviderSettingsManager } from "../../core/config/ProviderSettingsManager"
-import { OpenRouterHandler } from "../../api/providers"
-import { ApiStreamChunk } from "../../api/transform/stream"
-import { ILLM, LLMOptions } from "../continuedev/core/index.js"
-import { DEFAULT_AUTOCOMPLETE_OPTS } from "../continuedev/core/util/parameters.js"
-import Mistral from "../continuedev/core/llm/llms/Mistral"
-import OpenRouter from "../continuedev/core/llm/llms/OpenRouter"
-import KiloCode from "../continuedev/core/llm/llms/KiloCode"
+import { ApiHandler, buildApiHandler } from "../../../api"
+import { ProviderSettingsManager } from "../../../core/config/ProviderSettingsManager"
+import { OpenRouterHandler } from "../../../api/providers"
+import { ApiStreamChunk } from "../../../api/transform/stream"
+import { ILLM, LLMOptions } from "../../continuedev/core/index.js"
+import { DEFAULT_AUTOCOMPLETE_OPTS } from "../../continuedev/core/util/parameters.js"
+import Mistral from "../../continuedev/core/llm/llms/Mistral"
+import OpenRouter from "../../continuedev/core/llm/llms/OpenRouter"
+import KiloCode from "../../continuedev/core/llm/llms/KiloCode"
 
 export const AUTOCOMPLETE_PROVIDER_MODELS = {
 	mistral: "codestral-2501",
@@ -23,7 +23,7 @@ export const AUTOCOMPLETE_PROVIDER_MODELS = {
 	bedrock: "mistral.codestral-2501-v1:0",
 } as const
 
-export class AutocompleteModel {
+export class NewAutocompleteModel {
 	private apiHandler: ApiHandler | null = null
 	private profile: ProviderSettings | null = null
 	public loaded = false
@@ -95,7 +95,7 @@ export class AutocompleteModel {
 	 */
 	public getILLM(): ILLM | null {
 		if (!this.profile?.apiProvider) {
-			console.warn("[AutocompleteModel] No profile loaded")
+			console.warn("[NewAutocompleteModel] No profile loaded")
 			return null
 		}
 
@@ -105,7 +105,7 @@ export class AutocompleteModel {
 			// Extract provider-specific configuration
 			const config = this.extractProviderConfig()
 			if (!config) {
-				console.warn(`[AutocompleteModel] Failed to extract config for provider: ${provider}`)
+				console.warn(`[NewAutocompleteModel] Failed to extract config for provider: ${provider}`)
 				return null
 			}
 
@@ -140,7 +140,7 @@ export class AutocompleteModel {
 			// Create appropriate LLM instance based on provider
 			return this.createLLMInstance(provider, llmOptions)
 		} catch (error) {
-			console.error(`[AutocompleteModel] Error creating ILLM for provider ${provider}:`, error)
+			console.error(`[NewAutocompleteModel] Error creating ILLM for provider ${provider}:`, error)
 			return null
 		}
 	}
@@ -164,7 +164,7 @@ export class AutocompleteModel {
 		switch (provider) {
 			case "mistral":
 				if (!this.profile.mistralApiKey) {
-					console.warn("[AutocompleteModel] Missing Mistral API key")
+					console.warn("[NewAutocompleteModel] Missing Mistral API key")
 					return null
 				}
 				return {
@@ -175,7 +175,7 @@ export class AutocompleteModel {
 
 			case "kilocode":
 				if (!this.profile.kilocodeToken) {
-					console.warn("[AutocompleteModel] Missing Kilocode token")
+					console.warn("[NewAutocompleteModel] Missing Kilocode token")
 					return null
 				}
 				return {
@@ -187,7 +187,7 @@ export class AutocompleteModel {
 
 			case "openrouter":
 				if (!this.profile.openRouterApiKey) {
-					console.warn("[AutocompleteModel] Missing OpenRouter API key")
+					console.warn("[NewAutocompleteModel] Missing OpenRouter API key")
 					return null
 				}
 				return {
@@ -199,11 +199,11 @@ export class AutocompleteModel {
 			case "bedrock":
 				// Bedrock uses AWS credentials, not a simple API key
 				// For now, return null as it requires more complex setup
-				console.warn("[AutocompleteModel] Bedrock provider not yet supported for autocomplete")
+				console.warn("[NewAutocompleteModel] Bedrock provider not yet supported for autocomplete")
 				return null
 
 			default:
-				console.warn(`[AutocompleteModel] Unsupported provider: ${provider}`)
+				console.warn(`[NewAutocompleteModel] Unsupported provider: ${provider}`)
 				return null
 		}
 	}

src/services/autocomplete/AutocompleteModel.ts renamed to src/services/ghost/new-auto-complete/NewAutocompleteModel.ts

@@ -1,47 +1,30 @@
 import * as vscode from "vscode"
-import { AutocompleteModel } from "./AutocompleteModel"
-import {
-	AUTOCOMPLETE_PROVIDER_MODELS,
-	AutocompleteProviderKey,
-	GhostServiceSettings,
-	modelIdKeysByProvider,
-	ProviderSettingsEntry,
-} from "@roo-code/types"
-import { ContextProxy } from "../../core/config/ContextProxy"
-import { ProviderSettingsManager } from "../../core/config/ProviderSettingsManager"
-import { ClineProvider } from "../../core/webview/ClineProvider"
-import { MinimalConfigProvider } from "../continuedev/core/autocomplete/MinimalConfig"
-import { VsCodeIde } from "../continuedev/core/vscode-test-harness/src/VSCodeIde"
-import { ContinueCompletionProvider } from "../continuedev/core/vscode-test-harness/src/autocomplete/completionProvider"
-import OpenRouter from "../continuedev/core/llm/llms/OpenRouter"
-
-export class AutocompleteProvider {
+import { NewAutocompleteModel } from "./NewAutocompleteModel"
+import { GhostServiceSettings } from "@roo-code/types"
+import { ContextProxy } from "../../../core/config/ContextProxy"
+import { ProviderSettingsManager } from "../../../core/config/ProviderSettingsManager"
+import { ClineProvider } from "../../../core/webview/ClineProvider"
+import { MinimalConfigProvider } from "../../continuedev/core/autocomplete/MinimalConfig"
+import { VsCodeIde } from "../../continuedev/core/vscode-test-harness/src/VSCodeIde"
+import { ContinueCompletionProvider } from "../../continuedev/core/vscode-test-harness/src/autocomplete/completionProvider"
+
+export class NewAutocompleteProvider {
 	private completionProviderDisposable: vscode.Disposable | null = null
-	private model: AutocompleteModel
+	private model: NewAutocompleteModel
 	private providerSettingsManager: ProviderSettingsManager
 	private settings: GhostServiceSettings | null = null
 
-	private enabled: boolean = true
-	private taskId: string | null = null
-	private isProcessing: boolean = false
-	private isRequestCancelled: boolean = false
-
-	// VSCode Providers
-	public inlineCompletionProvider: any
-
 	constructor(
 		private context: vscode.ExtensionContext,
 		private cline: ClineProvider,
 	) {
 		// Register Internal Components
 		this.providerSettingsManager = new ProviderSettingsManager(context)
-		this.model = new AutocompleteModel()
+		this.model = new NewAutocompleteModel()
 
 		void this.load()
 	}
 
-	// Instance is created and managed by the registration function
-
 	// Settings Management
 	private loadSettings() {
 		const state = ContextProxy.instance.getValues()
@@ -74,7 +57,7 @@ export class AutocompleteProvider {
 			// The model.reload() has already loaded the profile, so we can get the ILLM
 			const llm = this.model.getILLM()
 			if (!llm) {
-				console.warn("[AutocompleteProvider] No valid autocomplete provider found")
+				console.warn("[NewAutocompleteProvider] No valid autocomplete provider found")
 				return
 			}
 
@@ -94,9 +77,9 @@ export class AutocompleteProvider {
 			)
 			this.context.subscriptions.push(this.completionProviderDisposable)
 
-			console.log("[AutocompleteProvider] Successfully registered autocomplete")
+			console.log("[NewAutocompleteProvider] Successfully registered autocomplete")
 		} catch (error) {
-			console.error("[AutocompleteProvider] Error loading code completion:", error)
+			console.error("[NewAutocompleteProvider] Error loading code completion:", error)
 		}
 	}
 
@@ -146,7 +129,7 @@ export class AutocompleteProvider {
 	}
 
 	/**
-	 * Dispose of all resources used by the AutocompleteProvider
+	 * Dispose of all resources used by the NewAutocompleteProvider
 	 */
 	public dispose(): void {
 		if (this.completionProviderDisposable) {

src/services/autocomplete/AutocompleteProvider.ts renamed to src/services/ghost/new-auto-complete/NewAutocompleteProvider.ts

@@ -1,18 +1,18 @@
 import { describe, it, expect, beforeEach, vi } from "vitest"
-import { AutocompleteModel } from "../AutocompleteModel"
+import { NewAutocompleteModel } from "../NewAutocompleteModel"
 import { ProviderSettings } from "@roo-code/types"
-import Mistral from "../../continuedev/core/llm/llms/Mistral"
-import { OpenAI } from "../../continuedev/core/llm/llms/OpenAI"
+import Mistral from "../../../continuedev/core/llm/llms/Mistral"
+import { OpenAI } from "../../../continuedev/core/llm/llms/OpenAI"
 
 // Mock the LLM classes
-vi.mock("../../continuedev/core/llm/llms/Mistral")
-vi.mock("../../continuedev/core/llm/llms/OpenAI")
+vi.mock("../../../continuedev/core/llm/llms/Mistral")
+vi.mock("../../../continuedev/core/llm/llms/OpenAI")
 
-describe("AutocompleteModel", () => {
-	let model: AutocompleteModel
+describe("NewAutocompleteModel", () => {
+	let model: NewAutocompleteModel
 
 	beforeEach(() => {
-		model = new AutocompleteModel()
+		model = new NewAutocompleteModel()
 		vi.clearAllMocks()
 	})
 

src/services/autocomplete/__tests__/AutocompleteModel.spec.ts renamed to src/services/ghost/new-auto-complete/__tests__/NewAutocompleteModel.spec.ts

@@ -0,0 +1,2 @@
+export { NewAutocompleteProvider } from "./NewAutocompleteProvider"
+export { NewAutocompleteModel } from "./NewAutocompleteModel"