Merge pull request #3400 from Kilo-Org/beatlevic/fim-prompt

FIM prompt without XML parsing

Author: beatlevic

src/services/ghost/__tests__/GhostRecentOperations.spec.ts

@@ -124,8 +124,8 @@ describe("GhostRecentOperations", () => {
 		const { userPrompt } = autoTriggerStrategy.getPrompts(autocompleteInput, prefix, suffix, languageId)
 
 		// Verify that the prompt includes the recent operations section
-		// The new strategy system uses "## Recent Typing" format
-		expect(userPrompt).toContain("## Recent Typing")
+		// The strategy system uses "<RECENT_EDITS>" XML format
+		expect(userPrompt).toContain("<RECENT_EDITS>")
 	})
 
 	it("should not include recent operations in the prompt when not available", async () => {

src/services/ghost/__tests__/GhostServiceManager.spec.ts

@@ -111,15 +111,14 @@ describe("GhostServiceManager", () => {
 			expect(result.suggestions.hasSuggestions()).toBe(false)
 		})
 
-		it("should handle invalid XML format", async () => {
+		it("should handle invalid COMPLETION format", async () => {
 			const initialContent = `console.log('test');`
 			const { context } = await setupTestDocument("invalid.js", initialContent)
 
-			// Test invalid XML format
-			const invalidXML = "This is not a valid XML format"
+			const invalidCOMPLETION = "This is not a valid COMPLETION format"
 			const position = context.range?.start ?? context.document.positionAt(0)
 			const { prefix, suffix } = extractPrefixSuffix(context.document, position)
-			const result = parseGhostResponse(invalidXML, prefix, suffix)
+			const result = parseGhostResponse(invalidCOMPLETION, prefix, suffix)
 			expect(result.suggestions.hasSuggestions()).toBe(false)
 		})
 
@@ -133,14 +132,12 @@ describe("GhostServiceManager", () => {
 				openFiles: [],
 			}
 
-			// Use XML format
-			const xmlResponse = `<change><search><![CDATA[console.log('test');]]></search><replace><![CDATA[// Added comment
-console.log('test');]]></replace></change>`
+			const completionResponse = `<COMPLETION>// Added comment
+console.log('test');</COMPLETION>`
 
 			const position = context.range?.start ?? context.document.positionAt(0)
 			const { prefix, suffix } = extractPrefixSuffix(context.document, position)
-			const result = parseGhostResponse(xmlResponse, prefix, suffix)
-			// Should work with the XML format
+			const result = parseGhostResponse(completionResponse, prefix, suffix)
 			expect(result.suggestions.hasSuggestions()).toBe(true)
 		})
 	})

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

@@ -1,45 +1,94 @@
 import { AutocompleteInput } from "../types"
 import { CURSOR_MARKER } from "./ghostConstants"
-import { isCommentLine, cleanComment } from "./CommentHelpers"
 import type { TextDocument, Range } from "vscode"
 
 export function getBaseSystemInstructions(): string {
-	return `CRITICAL OUTPUT FORMAT:
-You must respond with XML-formatted changes ONLY. No explanations or text outside XML tags.
-
-Format: <change><search><![CDATA[exact_code]]></search><replace><![CDATA[new_code]]></replace></change>
-
-MANDATORY XML STRUCTURE RULES:
-- Every <change> tag MUST have a closing </change> tag
-- Every <search> tag MUST have a closing </search> tag
-- Every <replace> tag MUST have a closing </replace> tag
-- Every <![CDATA[ MUST have a closing ]]>
-- XML tags should be properly formatted and nested
-- Multiple <change> blocks allowed for different modifications
-
-CHANGE ORDERING PRIORITY:
-- CRITICAL: Order all <change> blocks by proximity to the cursor marker (<<<AUTOCOMPLETE_HERE>>>)
-- Put changes closest to the cursor marker FIRST in your response
-- This allows immediate display of the most relevant suggestions to the user
-- Changes further from the cursor should come later in the response
-- Measure proximity by line distance from the cursor marker position
-
-CONTENT MATCHING RULES:
-- Search content must match EXACTLY (including whitespace, indentation, and line breaks)
-- Use CDATA wrappers for all code content
-- Preserve all line breaks and formatting within CDATA sections
-- Never generate overlapping changes
-- The <search> block must contain exact text that exists in the code
-- If you can't find exact match, don't generate that change
-
-EXAMPLE:
-<change><search><![CDATA[function example() {
-	 // old code
-}]]></search><replace><![CDATA[function example() {
-	 // new code
-}]]></replace></change>
-
---
+	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}}
+
+## EXAMPLE QUERY:
+
+<QUERY>
+function sum_evens(lim) {
+  var sum = 0;
+  for (var i = 0; i < lim; ++i) {
+    {{FILL_HERE}}
+  }
+  return sum;
+}
+</QUERY>
+
+TASK: Fill the {{FILL_HERE}} hole.
+
+## CORRECT COMPLETION
+
+<COMPLETION>if (i % 2 === 0) {
+      sum += i;
+    }</COMPLETION>
+
+## EXAMPLE QUERY:
+
+<QUERY>
+def sum_list(lst):
+  total = 0
+  for x in lst:
+  {{FILL_HERE}}
+  return total
+
+print sum_list([1, 2, 3])
+</QUERY>
+
+## CORRECT COMPLETION:
+
+<COMPLETION>  total += x</COMPLETION>
+
+## EXAMPLE QUERY:
+
+<QUERY>
+// data Tree a = Node (Tree a) (Tree a) | Leaf a
+
+// sum :: Tree Int -> Int
+// sum (Node lft rgt) = sum lft + sum rgt
+// sum (Leaf val)     = val
+
+// convert to TypeScript:
+{{FILL_HERE}}
+</QUERY>
+
+## CORRECT COMPLETION:
+
+<COMPLETION>type Tree<T>
+  = {$:"Node", lft: Tree<T>, rgt: Tree<T>}
+  | {$:"Leaf", val: T};
+
+function sum(tree: Tree<number>): number {
+  switch (tree.$) {
+    case "Node":
+      return sum(tree.lft) + sum(tree.rgt);
+    case "Leaf":
+      return tree.val;
+  }
+}</COMPLETION>
+
+## EXAMPLE QUERY:
+
+The 5th {{FILL_HERE}} is Jupiter.
+
+## CORRECT COMPLETION:
+
+<COMPLETION>planet from the Sun</COMPLETION>
+
+## EXAMPLE QUERY:
+
+function hypothenuse(a, b) {
+  return Math.sqrt({{FILL_HERE}}b ** 2);
+}
+
+## CORRECT COMPLETION:
+
+<COMPLETION>a ** 2 + </COMPLETION>
 
 `
 }
@@ -56,20 +105,6 @@ export function addCursorMarker(document: TextDocument, range?: Range): string {
 }
 
 export class AutoTriggerStrategy {
-	shouldTreatAsComment(prefix: string, languageId: string): boolean {
-		const lines = prefix.split("\n")
-		const currentLine = lines[lines.length - 1].trim() || ""
-		const previousLine = lines.length > 1 ? lines[lines.length - 2].trim() : ""
-
-		if (isCommentLine(currentLine, languageId)) {
-			return true
-		} else if (currentLine === "" && previousLine) {
-			return isCommentLine(previousLine, languageId)
-		} else {
-			return false
-		}
-	}
-
 	getPrompts(
 		autocompleteInput: AutocompleteInput,
 		prefix: string,
@@ -79,24 +114,17 @@ export class AutoTriggerStrategy {
 		systemPrompt: string
 		userPrompt: string
 	} {
-		if (this.shouldTreatAsComment(prefix, languageId)) {
-			return {
-				systemPrompt: this.getCommentsSystemInstructions(),
-				userPrompt: this.getCommentsUserPrompt(prefix, suffix, languageId),
-			}
-		} else {
-			return {
-				systemPrompt: this.getSystemInstructions(),
-				userPrompt: this.getUserPrompt(autocompleteInput, prefix, suffix, languageId),
-			}
+		return {
+			systemPrompt: this.getSystemInstructions(),
+			userPrompt: this.getUserPrompt(autocompleteInput, prefix, suffix, languageId),
 		}
 	}
 
 	getSystemInstructions(): string {
 		return (
 			getBaseSystemInstructions() +
-			`Task: Subtle Auto-Completion
-Provide non-intrusive completions after a typing pause. Be conservative and helpful.
+			`Task: Auto-Completion
+Provide a subtle, non-intrusive completion after a typing pause.
 
 `
 		)
@@ -106,108 +134,24 @@ Provide non-intrusive completions after a typing pause. Be conservative and help
 	 * Build minimal prompt for auto-trigger
 	 */
 	getUserPrompt(autocompleteInput: AutocompleteInput, prefix: string, suffix: string, languageId: string): string {
-		let prompt = ""
+		let prompt = `<LANGUAGE>${languageId}</LANGUAGE>\n\n`
 
-		// Start with recent typing context from autocompleteInput
 		if (autocompleteInput.recentlyEditedRanges && autocompleteInput.recentlyEditedRanges.length > 0) {
-			prompt += "## Recent Typing\n"
+			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 += "\n"
+			prompt += "</RECENT_EDITS>\n\n"
 		}
 
-		// Add current position from autocompleteInput
-		const line = autocompleteInput.pos.line + 1
-		const char = autocompleteInput.pos.character + 1
-		prompt += `## Current Position\n`
-		prompt += `Line ${line}, Character ${char}\n\n`
-
-		// Add the full document with cursor marker
-		const codeWithCursor = `${prefix}${CURSOR_MARKER}${suffix}`
-		prompt += "## Full Code\n"
-		prompt += `\`\`\`${languageId}\n${codeWithCursor}\n\`\`\`\n\n`
-
-		// Add specific instructions
-		prompt += "## Instructions\n"
-		prompt += `Provide a minimal, obvious completion at the cursor position (${CURSOR_MARKER}).\n`
-		prompt += `IMPORTANT: Your <search> block must include the cursor marker ${CURSOR_MARKER} to target the exact location.\n`
-		prompt += `Include surrounding text with the cursor marker to avoid conflicts with similar code elsewhere.\n`
-		prompt += "Complete only what the user appears to be typing.\n"
-		prompt += "Single line preferred, no new features.\n"
-		prompt += "If nothing obvious to complete, provide NO suggestion.\n"
+		prompt += `<QUERY>
+${prefix}{{FILL_HERE}}${suffix}
+</QUERY>
 
-		return prompt
-	}
+TASK: Fill the {{FILL_HERE}} hole. Answer only with the CORRECT completion, and NOTHING ELSE. Do it now.
+Return the COMPLETION tags`
 
-	getCommentsSystemInstructions(): string {
-		return (
-			getBaseSystemInstructions() +
-			`You are an expert code generation assistant that implements code based on comments.
-
-## Core Responsibilities:
-1. Read and understand the comment's intent
-2. Generate complete, working code that fulfills the comment's requirements
-3. Follow the existing code style and patterns
-4. Add appropriate error handling
-5. Include necessary imports or dependencies
-
-## Code Generation Guidelines:
-- Generate only the code that directly implements the comment
-- Match the indentation level of the comment
-- Use descriptive variable and function names
-- Follow language-specific best practices
-- Add type annotations where appropriate
-- Consider edge cases mentioned in the comment
-- If the comment describes multiple steps, implement them all
-
-## Comment Types to Handle:
-- TODO comments: Implement the described task
-- FIXME comments: Fix the described issue
-- Implementation comments: Generate the described functionality
-- Algorithm descriptions: Implement the described algorithm
-- API/Interface descriptions: Implement the described interface
-
-## Output Requirements:
-- Generate ONLY executable code that implements the comment
-- PRESERVE all existing code and comments in the provided context
-- Do not repeat the comment you are implementing in your output
-- Do not add explanatory comments unless necessary for complex logic
-- Ensure the code is production-ready
-- When using search/replace format, include ALL existing code to preserve it`
-		)
-	}
-
-	getCommentsUserPrompt(prefix: string, suffix: string, languageId: string): string {
-		// Extract the comment from the prefix
-		const lines = prefix.split("\n")
-		const lastLine = lines[lines.length - 1]
-		const previousLine = lines.length > 1 ? lines[lines.length - 2] : ""
-
-		// Determine which line contains the comment
-		const commentLine = isCommentLine(lastLine, languageId) ? lastLine : previousLine
-		const comment = cleanComment(commentLine, languageId)
-
-		const codeWithCursor = `${prefix}${CURSOR_MARKER}${suffix}`
-
-		let prompt = `## Comment-Driven Development
-- Language: ${languageId}
-- Comment to Implement:
-\`\`\`
-${comment}
-\`\`\`
-
-## Full Code
-\`\`\`${languageId}
-${codeWithCursor}
-\`\`\`
-
-## Instructions
-Generate code that implements the functionality described in the comment.
-The code should be placed at the cursor position (${CURSOR_MARKER}).
-Focus on implementing exactly what the comment describes.
-`
 		return prompt
 	}
 }