Ghost context provider

src/services/ghost/classic-auto-complete/AutoTriggerStrategy.ts

@@ -1,12 +1,15 @@
 import { AutocompleteInput } from "../types"
 import { CURSOR_MARKER } from "./ghostConstants"
 import type { TextDocument, Range } from "vscode"
+import { GhostContextProvider } from "./GhostContextProvider"
 
 export function getBaseSystemInstructions(): string {
 	return `You are a HOLE FILLER. You are provided with a file containing holes, formatted as '{{FILL_HERE}}'. Your TASK is to complete with a string to replace this hole with, inside a <COMPLETION/> XML tag, including context-aware indentation, if needed. All completions MUST be truthful, accurate, well-written and correct.
 
-## Context Tags
-<LANGUAGE>: file language | <RECENT_EDITS>: recent changes | <QUERY>: code with {{FILL_HERE}}
+## Context Format
+<LANGUAGE>: file language
+<QUERY>: contains commented reference code (// Path: file.ts) followed by code with {{FILL_HERE}}
+Comments provide context from related files, recent edits, imports, etc.
 
 ## EXAMPLE QUERY:
 
@@ -105,18 +108,21 @@ export function addCursorMarker(document: TextDocument, range?: Range): string {
 }
 
 export class AutoTriggerStrategy {
-	getPrompts(
+	constructor(private contextProvider?: GhostContextProvider) {}
+
+	async getPrompts(
 		autocompleteInput: AutocompleteInput,
 		prefix: string,
 		suffix: string,
 		languageId: string,
-	): {
+	): Promise<{
 		systemPrompt: string
 		userPrompt: string
-	} {
+	}> {
+		const userPrompt = await this.getUserPrompt(autocompleteInput, prefix, suffix, languageId)
 		return {
 			systemPrompt: this.getSystemInstructions(),
-			userPrompt: this.getUserPrompt(autocompleteInput, prefix, suffix, languageId),
+			userPrompt,
 		}
 	}
 
@@ -131,22 +137,32 @@ Provide a subtle, non-intrusive completion after a typing pause.
 	}
 
 	/**
-	 * Build minimal prompt for auto-trigger
+	 * Build minimal prompt for auto-trigger with optional context
 	 */
-	getUserPrompt(autocompleteInput: AutocompleteInput, prefix: string, suffix: string, languageId: string): string {
+	async getUserPrompt(
+		autocompleteInput: AutocompleteInput,
+		prefix: string,
+		suffix: string,
+		languageId: string,
+	): Promise<string> {
 		let prompt = `<LANGUAGE>${languageId}</LANGUAGE>\n\n`
 
-		if (autocompleteInput.recentlyEditedRanges && autocompleteInput.recentlyEditedRanges.length > 0) {
-			prompt += "<RECENT_EDITS>\n"
-			autocompleteInput.recentlyEditedRanges.forEach((range, index) => {
-				const description = `Edited ${range.filepath} at line ${range.range.start.line}`
-				prompt += `${index + 1}. ${description}\n`
-			})
-			prompt += "</RECENT_EDITS>\n\n"
+		// Get comment-wrapped context (includes all context types with token-based filtering)
+		let formattedContext = ""
+		if (this.contextProvider && autocompleteInput.filepath) {
+			try {
+				formattedContext = await this.contextProvider.getFormattedContext(
+					autocompleteInput,
+					autocompleteInput.filepath,
+				)
+			} catch (error) {
+				console.warn("Failed to get formatted context:", error)
+			}
 		}
 
+		// Context and code go together in QUERY (comments provide context for the code)
 		prompt += `<QUERY>
-${prefix}{{FILL_HERE}}${suffix}
+${formattedContext}${prefix}{{FILL_HERE}}${suffix}
 </QUERY>
 
 TASK: Fill the {{FILL_HERE}} hole. Answer only with the CORRECT completion, and NOTHING ELSE. Do it now.

src/services/ghost/classic-auto-complete/GhostContextProvider.ts

@@ -0,0 +1,66 @@
+import * as vscode from "vscode"
+import { ContextRetrievalService } from "../../continuedev/core/autocomplete/context/ContextRetrievalService"
+import { VsCodeIde } from "../../continuedev/core/vscode-test-harness/src/VSCodeIde"
+import { AutocompleteInput } from "../types"
+import { AutocompleteSnippetType } from "../../continuedev/core/autocomplete/snippets/types"
+import { HelperVars } from "../../continuedev/core/autocomplete/util/HelperVars"
+import { getAllSnippetsWithoutRace } from "../../continuedev/core/autocomplete/snippets/getAllSnippets"
+import { getDefinitionsFromLsp } from "../../continuedev/core/vscode-test-harness/src/autocomplete/lsp"
+import { DEFAULT_AUTOCOMPLETE_OPTS } from "../../continuedev/core/util/parameters"
+import { getSnippets } from "../../continuedev/core/autocomplete/templating/filtering"
+import { formatSnippets } from "../../continuedev/core/autocomplete/templating/formatting"
+
+function convertToContinuedevInput(autocompleteInput: AutocompleteInput) {
+	return {
+		...autocompleteInput,
+		recentlyVisitedRanges: autocompleteInput.recentlyVisitedRanges.map((range) => ({
+			...range,
+			type: AutocompleteSnippetType.Code,
+		})),
+	}
+}
+
+export class GhostContextProvider {
+	private contextService: ContextRetrievalService
+	private ide: VsCodeIde
+
+	constructor(context: vscode.ExtensionContext) {
+		this.ide = new VsCodeIde(context)
+		this.contextService = new ContextRetrievalService(this.ide)
+	}
+
+	/**
+	 * Get context snippets for the current autocomplete request
+	 * Returns comment-based formatted context that can be added to prompts
+	 */
+	async getFormattedContext(autocompleteInput: AutocompleteInput, filepath: string): Promise<string> {
+		try {
+			// Initialize import definitions cache
+			await this.contextService.initializeForFile(filepath)
+
+			const continuedevInput = convertToContinuedevInput(autocompleteInput)
+			const helper = await HelperVars.create(
+				continuedevInput as any,
+				DEFAULT_AUTOCOMPLETE_OPTS,
+				"codestral",
+				this.ide,
+			)
+
+			const snippetPayload = await getAllSnippetsWithoutRace({
+				helper,
+				ide: this.ide,
+				getDefinitionsFromLsp,
+				contextRetrievalService: this.contextService,
+			})
+
+			const filteredSnippets = getSnippets(helper, snippetPayload)
+			const workspaceDirs = await this.ide.getWorkspaceDirs()
+			const formattedContext = formatSnippets(helper, filteredSnippets, workspaceDirs)
+
+			return formattedContext
+		} catch (error) {
+			console.warn("Failed to get formatted context:", error)
+			return ""
+		}
+	}
+}

src/services/ghost/classic-auto-complete/GhostInlineCompletionProvider.ts

@@ -145,7 +145,7 @@ export class GhostInlineCompletionProvider implements vscode.InlineCompletionIte
 			}
 		}
 
-		const { systemPrompt, userPrompt } = this.autoTriggerStrategy.getPrompts(
+		const { systemPrompt, userPrompt } = await this.autoTriggerStrategy.getPrompts(
 			autocompleteInput,
 			prefix,
 			suffix,