Merge pull request #2847 from Kilo-Org/mark/remove-relevant-context

Simpler structure for prompt creation in strategies

Author: markijbema

src/services/ghost/strategies/AutoTriggerStrategy.ts

@@ -21,36 +21,23 @@ export class AutoTriggerStrategy extends BasePromptStrategy {
 		return !!context.document
 	}
 
-	/**
-	 * Minimal context for auto-trigger
-	 * Focus on immediate context only
-	 */
-	getRelevantContext(context: GhostSuggestionContext): Partial<GhostSuggestionContext> {
-		return {
-			document: context.document,
-			range: context.range,
-			recentOperations: context.recentOperations?.slice(0, 3), // Only last 3 operations
-			// Exclude:
-			// - userInput (no explicit request)
-			// - diagnostics (not fixing errors)
-			// - openFiles (reduces tokens)
-		}
-	}
-
 	/**
 	 * System instructions for auto-trigger
 	 */
-	protected getSpecificSystemInstructions(): string {
-		return `Task: Subtle Auto-Completion
+	getSystemInstructions(): string {
+		return (
+			this.getBaseSystemInstructions() +
+			`Task: Subtle Auto-Completion
 Provide non-intrusive completions after a typing pause. Be conservative and helpful.
 
 `
+		)
 	}
 
 	/**
 	 * Build minimal prompt for auto-trigger
 	 */
-	protected buildUserPrompt(context: Partial<GhostSuggestionContext>): string {
+	getUserPrompt(context: GhostSuggestionContext): string {
 		let prompt = ""
 
 		// Start with recent typing context

src/services/ghost/strategies/BasePromptStrategy.ts

@@ -24,23 +24,6 @@ export abstract class BasePromptStrategy implements PromptStrategy {
 	 */
 	abstract canHandle(context: GhostSuggestionContext): boolean
 
-	/**
-	 * Filters the context to only include relevant fields for this strategy
-	 */
-	abstract getRelevantContext(context: GhostSuggestionContext): Partial<GhostSuggestionContext>
-
-	/**
-	 * Generates system instructions for the AI model
-	 */
-	getSystemInstructions(customInstructions?: string): string {
-		const baseInstructions = this.getBaseSystemInstructions()
-		const specificInstructions = this.getSpecificSystemInstructions()
-
-		return `${baseInstructions}\n\n---\n\n${specificInstructions}${
-			customInstructions ? `\n\n---\n\n${customInstructions}` : ""
-		}`
-	}
-
 	/**
 	 * Gets the base system instructions that apply to all strategies
 	 */
@@ -78,28 +61,23 @@ EXAMPLE:
 	 // old code
 }]]></search><replace><![CDATA[function example() {
 	 // new code
-}]]></replace></change>`
+}]]></replace></change>
+
+--
+
+`
 	}
 
 	/**
 	 * Gets strategy-specific system instructions
 	 * Must be implemented by each strategy
 	 */
-	protected abstract getSpecificSystemInstructions(): string
+	abstract getSystemInstructions(): string
 
 	/**
 	 * Generates the user prompt with context
 	 */
-	getUserPrompt(context: GhostSuggestionContext): string {
-		const relevantContext = this.getRelevantContext(context)
-		return this.buildUserPrompt(relevantContext)
-	}
-
-	/**
-	 * Builds the user prompt from the relevant context
-	 * Must be implemented by each strategy
-	 */
-	protected abstract buildUserPrompt(context: Partial<GhostSuggestionContext>): string
+	abstract getUserPrompt(context: GhostSuggestionContext): string
 
 	/**
 	 * Adds the cursor marker to the document text at the specified position

src/services/ghost/strategies/CommentDrivenStrategy.ts

@@ -30,16 +30,10 @@ export class CommentDrivenStrategy extends BasePromptStrategy {
 		return isComment && !context.userInput // User input takes precedence
 	}
 
-	getRelevantContext(context: GhostSuggestionContext): Partial<GhostSuggestionContext> {
-		return {
-			document: context.document,
-			range: context.range,
-			recentOperations: context.recentOperations,
-		}
-	}
-
-	protected getSpecificSystemInstructions(): string {
-		return `You are an expert code generation assistant that implements code based on comments.
+	getSystemInstructions(): string {
+		return (
+			this.getBaseSystemInstructions() +
+			`You are an expert code generation assistant that implements code based on comments.
 
 ## Core Responsibilities:
 1. Read and understand the comment's intent
@@ -71,9 +65,10 @@ export class CommentDrivenStrategy extends BasePromptStrategy {
 - 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`
+		)
 	}
 
-	protected buildUserPrompt(context: Partial<GhostSuggestionContext>): string {
+	getUserPrompt(context: GhostSuggestionContext): string {
 		if (!context.document || !context.range) {
 			return "No context available for comment-driven generation."
 		}

src/services/ghost/strategies/InlineCompletionStrategy.ts

@@ -25,15 +25,10 @@ export class InlineCompletionStrategy extends BasePromptStrategy {
 		return hasContentBefore && !context.userInput && !context.range.isEmpty === false && isNotAtEnd
 	}
 
-	getRelevantContext(context: GhostSuggestionContext): Partial<GhostSuggestionContext> {
-		return {
-			document: context.document,
-			range: context.range,
-		}
-	}
-
-	protected getSpecificSystemInstructions(): string {
-		return `You are an expert code completion assistant specializing in inline completions.
+	getSystemInstructions(): string {
+		return (
+			this.getBaseSystemInstructions() +
+			`You are an expert code completion assistant specializing in inline completions.
 
 ## Core Responsibilities:
 1. Complete partial statements and expressions
@@ -70,9 +65,10 @@ export class InlineCompletionStrategy extends BasePromptStrategy {
 - Complete just enough to finish the current expression
 - Ensure syntactic correctness
 - Match the existing code style`
+		)
 	}
 
-	protected buildUserPrompt(context: Partial<GhostSuggestionContext>): string {
+	getUserPrompt(context: GhostSuggestionContext): string {
 		if (!context.document || !context.range) {
 			return "No context available for inline completion."
 		}

src/services/ghost/strategies/NewLineCompletionStrategy.ts

@@ -22,27 +22,13 @@ export class NewLineCompletionStrategy extends BasePromptStrategy {
 		return line.trim() === ""
 	}
 
-	/**
-	 * Focus on surrounding code and recent actions
-	 * Exclude diagnostics and user input
-	 */
-	getRelevantContext(context: GhostSuggestionContext): Partial<GhostSuggestionContext> {
-		return {
-			document: context.document,
-			range: context.range,
-			recentOperations: context.recentOperations,
-			// Exclude:
-			// - userInput (no explicit request)
-			// - diagnostics (not relevant for new line)
-			// - openFiles (reduces tokens)
-		}
-	}
-
 	/**
 	 * System instructions for new line completion
 	 */
-	protected getSpecificSystemInstructions(): string {
-		return `Task: Proactive Code Completion for New Lines
+	getSystemInstructions(): string {
+		return (
+			this.getBaseSystemInstructions() +
+			`Task: Proactive Code Completion for New Lines
 The user has created a new line. Suggest the most logical next code based on context.
 
 Completion Guidelines:
@@ -75,12 +61,13 @@ Important:
 - Respect existing code patterns and comments
 - Maintain consistent style
 - Consider the most likely next step`
+		)
 	}
 
 	/**
 	 * Build prompt focused on surrounding context
 	 */
-	protected buildUserPrompt(context: Partial<GhostSuggestionContext>): string {
+	getUserPrompt(context: GhostSuggestionContext): string {
 		let prompt = ""
 
 		// Start with cursor context

src/services/ghost/strategies/SelectionRefactorStrategy.ts

@@ -17,16 +17,10 @@ export class SelectionRefactorStrategy extends BasePromptStrategy {
 		return !!(context.range && !context.range.isEmpty && !context.userInput)
 	}
 
-	getRelevantContext(context: GhostSuggestionContext): Partial<GhostSuggestionContext> {
-		return {
-			document: context.document,
-			range: context.range,
-			diagnostics: context.diagnostics,
-		}
-	}
-
-	protected getSpecificSystemInstructions(): string {
-		return `You are an expert code refactoring assistant. Your task is to improve selected code while maintaining its functionality.
+	getSystemInstructions(): string {
+		return (
+			this.getBaseSystemInstructions() +
+			`You are an expert code refactoring assistant. Your task is to improve selected code while maintaining its functionality.
 
 ## Core Responsibilities:
 1. Analyze the selected code for improvement opportunities
@@ -52,9 +46,10 @@ export class SelectionRefactorStrategy extends BasePromptStrategy {
 - Do not include explanations outside the code
 
 Remember: The goal is to improve the code quality while keeping the exact same behavior.`
+		)
 	}
 
-	protected buildUserPrompt(context: Partial<GhostSuggestionContext>): string {
+	getUserPrompt(context: GhostSuggestionContext): string {
 		if (!context.document || !context.range) {
 			return "No selection available for refactoring."
 		}

src/services/ghost/strategies/UserRequestStrategy.ts

@@ -19,27 +19,13 @@ export class UserRequestStrategy extends BasePromptStrategy {
 		return !!context.userInput && context.userInput.trim().length > 0
 	}
 
-	/**
-	 * Include user input, document, selection, and diagnostics
-	 * Exclude recent operations and open files as they're less relevant
-	 */
-	getRelevantContext(context: GhostSuggestionContext): Partial<GhostSuggestionContext> {
-		return {
-			document: context.document,
-			userInput: context.userInput,
-			range: context.range,
-			diagnostics: context.diagnostics,
-			// Explicitly exclude:
-			// - recentOperations (not needed for explicit requests)
-			// - openFiles (reduces token usage)
-		}
-	}
-
 	/**
 	 * System instructions specific to user requests
 	 */
-	protected getSpecificSystemInstructions(): string {
-		return `Task: Execute User's Explicit Request
+	getSystemInstructions(): string {
+		return (
+			this.getBaseSystemInstructions() +
+			`Task: Execute User's Explicit Request
 You are responding to a direct user instruction. Your primary goal is to fulfill their specific request accurately.
 
 Priority Order:
@@ -64,12 +50,13 @@ Common Request Patterns:
 - "add comments" → add JSDoc or inline comments
 - "extract function" → move selected code to a new function
 - "fix" → resolve errors, warnings, or obvious issues`
+		)
 	}
 
 	/**
 	 * Build the user prompt with all relevant context
 	 */
-	protected buildUserPrompt(context: Partial<GhostSuggestionContext>): string {
+	getUserPrompt(context: GhostSuggestionContext): string {
 		let prompt = ""
 
 		// User request is the most important part
@@ -139,23 +126,6 @@ Common Request Patterns:
 		return prompt
 	}
 
-	/**
-	 * Override to provide more context for certain types of requests
-	 */
-	override getUserPrompt(context: GhostSuggestionContext): string {
-		// For certain requests, we might want to include more context
-		const request = context.userInput?.toLowerCase() || ""
-
-		// If the request mentions other files or imports, include more context
-		if (request.includes("import") || request.includes("from")) {
-			// Could potentially include information about available modules
-			// For now, we'll use the standard approach
-		}
-
-		// Use the standard prompt building
-		return super.getUserPrompt(context)
-	}
-
 	/**
 	 * Gets the file path from the document
 	 */

src/services/ghost/types/PromptStrategy.ts

@@ -34,13 +34,6 @@ export interface PromptStrategy {
 	 */
 	canHandle(context: GhostSuggestionContext): boolean
 
-	/**
-	 * Filters the context to only include relevant fields for this strategy
-	 * @param context The full suggestion context
-	 * @returns Partial context with only relevant fields
-	 */
-	getRelevantContext(context: GhostSuggestionContext): Partial<GhostSuggestionContext>
-
 	/**
 	 * Generates system instructions for the AI model
 	 * @param customInstructions Optional custom instructions to append