Merge pull request #3003 from Kilo-Org/mark/remove-ghost-strategy

Remove ghost strategy

Author: markijbema

src/services/ghost/GhostProvider.ts

@@ -2,7 +2,8 @@ import crypto from "crypto"
 import * as vscode from "vscode"
 import { t } from "../../i18n"
 import { GhostDocumentStore } from "./GhostDocumentStore"
-import { GhostStrategy } from "./GhostStrategy"
+import { GhostStreamingParser } from "./GhostStreamingParser"
+import { PromptStrategyManager } from "./PromptStrategyManager"
 import { GhostModel } from "./GhostModel"
 import { GhostWorkspaceEdit } from "./GhostWorkspaceEdit"
 import { GhostDecorations } from "./GhostDecorations"
@@ -27,7 +28,8 @@ export class GhostProvider {
 	private decorations: GhostDecorations
 	private documentStore: GhostDocumentStore
 	private model: GhostModel
-	private strategy: GhostStrategy
+	private streamingParser: GhostStreamingParser
+	private strategyManager: PromptStrategyManager
 	private workspaceEdit: GhostWorkspaceEdit
 	private suggestions: GhostSuggestionsState = new GhostSuggestionsState()
 	private cline: ClineProvider
@@ -63,7 +65,8 @@ export class GhostProvider {
 		// Register Internal Components
 		this.decorations = new GhostDecorations()
 		this.documentStore = new GhostDocumentStore()
-		this.strategy = new GhostStrategy({ debug: true })
+		this.streamingParser = new GhostStreamingParser()
+		this.strategyManager = new PromptStrategyManager({ debug: true })
 		this.workspaceEdit = new GhostWorkspaceEdit()
 		this.providerSettingsManager = new ProviderSettingsManager(context)
 		this.model = new GhostModel()
@@ -289,7 +292,7 @@ export class GhostProvider {
 		this.isRequestCancelled = false
 
 		const context = await this.ghostContext.generate(initialContext)
-		const { systemPrompt, userPrompt } = this.strategy.getPrompts(context)
+		const { systemPrompt, userPrompt } = this.strategyManager.buildPrompt(context)
 		if (this.isRequestCancelled) {
 			return
 		}
@@ -303,7 +306,7 @@ export class GhostProvider {
 		console.log("userprompt", userPrompt)
 
 		// Initialize the streaming parser
-		this.strategy.initializeStreamingParser(context)
+		this.streamingParser.initialize(context)
 
 		let hasShownFirstSuggestion = false
 		let cost = 0
@@ -323,7 +326,7 @@ export class GhostProvider {
 				response += chunk.text
 
 				// Process the text chunk through our streaming parser
-				const parseResult = this.strategy.processStreamingChunk(chunk.text)
+				const parseResult = this.streamingParser.processChunk(chunk.text)
 
 				if (parseResult.hasNewSuggestions) {
 					// Update our suggestions with the new parsed results
@@ -383,7 +386,7 @@ export class GhostProvider {
 			}
 
 			// Finish the streaming parser to apply sanitization if needed
-			const finalParseResult = this.strategy.finishStreamingParser()
+			const finalParseResult = this.streamingParser.finishStream()
 			if (finalParseResult.hasNewSuggestions && !hasShownFirstSuggestion) {
 				// Handle case where sanitization produced suggestions
 				this.suggestions = finalParseResult.suggestions
@@ -685,7 +688,7 @@ export class GhostProvider {
 			this.clearAutoTriggerTimer()
 		}
 		// Reset streaming parser when cancelling
-		this.strategy.resetStreamingParser()
+		this.streamingParser.reset()
 	}
 
 	/**

src/services/ghost/GhostStrategy.ts

@@ -1,6 +1,6 @@
 import * as vscode from "vscode"
 import { describe, it, expect } from "vitest"
-import { GhostStrategy } from "../GhostStrategy"
+import { PromptStrategyManager } from "../PromptStrategyManager"
 import { MockWorkspace } from "./MockWorkspace"
 import { ApiHandler, buildApiHandler } from "../../../api"
 import { GhostModel } from "../GhostModel"
@@ -14,7 +14,7 @@ const KEYS = {
 
 describe("GhostModelPerformance", () => {
 	const generatePrompt = (userInput: string) => {
-		const strategy = new GhostStrategy()
+		const strategyManager = new PromptStrategyManager()
 		const mockWorkspace = new MockWorkspace()
 
 		const testUri = vscode.Uri.parse("file:///example.ts")
@@ -25,7 +25,7 @@ describe("GhostModelPerformance", () => {
 			document: document,
 		}
 
-		const { systemPrompt, userPrompt } = strategy.getPrompts(context)
+		const { systemPrompt, userPrompt } = strategyManager.buildPrompt(context)
 
 		return { systemPrompt, suggestionPrompt: userPrompt }
 	}

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

@@ -3,7 +3,7 @@ import * as fs from "node:fs"
 import * as path from "node:path"
 import { MockWorkspace } from "./MockWorkspace"
 import * as vscode from "vscode"
-import { GhostStrategy } from "../GhostStrategy"
+import { GhostStreamingParser } from "../GhostStreamingParser"
 import { GhostWorkspaceEdit } from "../GhostWorkspaceEdit"
 import { GhostSuggestionContext } from "../types"
 
@@ -68,12 +68,12 @@ vi.mock("vscode", () => ({
 
 describe("GhostProvider", () => {
 	let mockWorkspace: MockWorkspace
-	let strategy: GhostStrategy
+	let streamingParser: GhostStreamingParser
 	let workspaceEdit: GhostWorkspaceEdit
 
 	beforeEach(() => {
 		vi.clearAllMocks()
-		strategy = new GhostStrategy()
+		streamingParser = new GhostStreamingParser()
 		mockWorkspace = new MockWorkspace()
 		workspaceEdit = new GhostWorkspaceEdit()
 
@@ -128,10 +128,10 @@ describe("GhostProvider", () => {
 
 	async function parseAndApplySuggestions(response: string, context: GhostSuggestionContext) {
 		// Initialize streaming parser
-		strategy.initializeStreamingParser(context)
+		streamingParser.initialize(context)
 
 		// Process the response as a single chunk (simulating complete response)
-		const result = strategy.processStreamingChunk(response)
+		const result = streamingParser.processChunk(response)
 
 		// Apply the suggestions
 		await workspaceEdit.applySuggestions(result.suggestions)
@@ -231,8 +231,8 @@ describe("GhostProvider", () => {
 			const { context } = await setupTestDocument("empty.js", initialContent)
 
 			// Test empty response
-			strategy.initializeStreamingParser(context)
-			const result = strategy.processStreamingChunk("")
+			streamingParser.initialize(context)
+			const result = streamingParser.processChunk("")
 			expect(result.suggestions.hasSuggestions()).toBe(false)
 		})
 
@@ -242,8 +242,8 @@ describe("GhostProvider", () => {
 
 			// Test invalid diff format
 			const invalidDiff = "This is not a valid diff format"
-			strategy.initializeStreamingParser(context)
-			const result = strategy.processStreamingChunk(invalidDiff)
+			streamingParser.initialize(context)
+			const result = streamingParser.processChunk(invalidDiff)
 			expect(result.suggestions.hasSuggestions()).toBe(false)
 		})
 
@@ -261,8 +261,8 @@ describe("GhostProvider", () => {
 			const xmlResponse = `<change><search><![CDATA[console.log('test');]]></search><replace><![CDATA[// Added comment
 console.log('test');]]></replace></change>`
 
-			strategy.initializeStreamingParser(context)
-			const result = strategy.processStreamingChunk(xmlResponse)
+			streamingParser.initialize(context)
+			const result = streamingParser.processChunk(xmlResponse)
 			// Should work with the XML format
 			expect(result.suggestions.hasSuggestions()).toBe(true)
 		})

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

@@ -2,7 +2,7 @@ import { describe, it, expect, beforeEach, vi, afterEach } from "vitest"
 import * as vscode from "vscode"
 import { GhostContext } from "../GhostContext"
 import { GhostDocumentStore } from "../GhostDocumentStore"
-import { GhostStrategy } from "../GhostStrategy"
+import { PromptStrategyManager } from "../PromptStrategyManager"
 import { GhostSuggestionContext } from "../types"
 import { MockTextDocument } from "../../mocking/MockTextDocument"
 
@@ -78,13 +78,13 @@ vi.mock("diff", async (importOriginal) => {
 describe("GhostRecentOperations", () => {
 	let documentStore: GhostDocumentStore
 	let context: GhostContext
-	let strategy: GhostStrategy
+	let strategyManager: PromptStrategyManager
 	let mockDocument: MockTextDocument
 
 	beforeEach(() => {
 		documentStore = new GhostDocumentStore()
 		context = new GhostContext(documentStore)
-		strategy = new GhostStrategy()
+		strategyManager = new PromptStrategyManager()
 
 		// Create a mock document
 		const uri = vscode.Uri.parse("file:///test-file.ts")
@@ -116,7 +116,7 @@ describe("GhostRecentOperations", () => {
 		expect(enrichedContext.recentOperations?.length).toBeGreaterThan(0)
 
 		// Generate prompt
-		const { userPrompt } = strategy.getPrompts(enrichedContext)
+		const { userPrompt } = strategyManager.buildPrompt(enrichedContext)
 
 		// Verify that the prompt includes the recent operations section
 		// The new strategy system uses "## Recent Typing" format
@@ -133,7 +133,7 @@ describe("GhostRecentOperations", () => {
 		const enrichedContext = await context.generate(suggestionContext)
 
 		// Generate prompt
-		const { userPrompt } = strategy.getPrompts(enrichedContext)
+		const { userPrompt } = strategyManager.buildPrompt(enrichedContext)
 
 		// Verify that the prompt does not include recent operations section
 		// The current document content will still be in the prompt, so we should only check