Merge branch 'main' into eamon/morecleanups

Author: EamonNerbonne

jetbrains/host/pnpm-lock.yaml

@@ -61,7 +61,7 @@
 		"prettier": "^3.4.2",
 		"rimraf": "^6.0.1",
 		"tsx": "^4.19.3",
-		"turbo": "^2.5.6",
+		"turbo": "^2.6.0",
 		"typescript": "^5.4.5"
 	},
 	"lint-staged": {

package.json

@@ -47,7 +47,7 @@ export class GhostServiceManager {
 
 		// Register Internal Components
 		this.documentStore = new GhostDocumentStore()
-		this.providerSettingsManager = new ProviderSettingsManager(context)
+		this.providerSettingsManager = cline.providerSettingsManager
 		this.model = new GhostModel()
 		this.ghostContext = new GhostContext(this.documentStore)
 

pnpm-lock.yaml

@@ -1,10 +1,4 @@
 import { AutocompleteInput } from "../types"
-import type { TextDocument, Range } from "vscode"
-
-/**
- * Special marker used to indicate where completions should occur in the document
- */
-export const CURSOR_MARKER = "<<<AUTOCOMPLETE_HERE>>>"
 
 export interface FillInAtCursorSuggestion {
 	text: string
@@ -103,17 +97,6 @@ function hypothenuse(a, b) {
 `
 }
 
-export function addCursorMarker(document: TextDocument, range?: Range): string {
-	if (!range) return document.getText()
-
-	const fullText = document.getText()
-	const cursorOffset = document.offsetAt(range.start)
-	const beforeCursor = fullText.substring(0, cursorOffset)
-	const afterCursor = fullText.substring(cursorOffset)
-
-	return `${beforeCursor}${CURSOR_MARKER}${afterCursor}`
-}
-
 /**
  * Parse the response - only handles responses with <COMPLETION> tags
  * Returns a FillInAtCursorSuggestion with the extracted text, or an empty string if nothing found

src/services/ghost/GhostServiceManager.ts

@@ -1,9 +1,10 @@
 import { LLMClient } from "./llm-client.js"
-import { HoleFiller, CURSOR_MARKER, parseGhostResponse } from "../services/ghost/classic-auto-complete/HoleFiller.js"
+import { HoleFiller, parseGhostResponse } from "../services/ghost/classic-auto-complete/HoleFiller.js"
 import { GhostSuggestionContext, AutocompleteInput } from "../services/ghost/types.js"
 import { MockTextDocument } from "../services/mocking/MockTextDocument.js"
 import * as vscode from "vscode"
 import crypto from "crypto"
+import { CURSOR_MARKER } from "./test-cases.js"
 
 export class StrategyTester {
 	private llmClient: LLMClient

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

@@ -1,7 +1,8 @@
 import fs from "fs"
 import path from "path"
 import { fileURLToPath } from "url"
-import { CURSOR_MARKER } from "../services/ghost/classic-auto-complete/HoleFiller.js"
+
+export const CURSOR_MARKER = "<<<AUTOCOMPLETE_HERE>>>"
 
 const __filename = fileURLToPath(import.meta.url)
 const __dirname = path.dirname(__filename)

src/test-llm-autocompletion/strategy-tester.ts

@@ -16,7 +16,6 @@ type DisplaySettingsProps = HTMLAttributes<HTMLDivElement> & {
 	showTaskTimeline?: boolean
 	sendMessageOnEnter?: boolean // kilocode_change
 	showTimestamps?: boolean
-	ghostServiceSettings?: any
 	reasoningBlockCollapsed: boolean
 	setCachedStateField: SetCachedStateField<
 		| "showTaskTimeline"
@@ -33,7 +32,6 @@ export const DisplaySettings = ({
 	showTaskTimeline,
 	showTimestamps,
 	sendMessageOnEnter,
-	ghostServiceSettings,
 	setCachedStateField,
 	reasoningBlockCollapsed,
 	hideCostBelowThreshold,

src/test-llm-autocompletion/test-cases.ts

@@ -915,7 +915,6 @@ const SettingsView = forwardRef<SettingsViewRef, SettingsViewProps>(({ onDone, t
 							showTaskTimeline={showTaskTimeline}
 							sendMessageOnEnter={sendMessageOnEnter}
 							showTimestamps={cachedState.showTimestamps} // kilocode_change
-							ghostServiceSettings={ghostServiceSettings}
 							hideCostBelowThreshold={hideCostBelowThreshold}
 							setCachedStateField={setCachedStateField}
 						/>