backfill; remove old object-based map; rename to old name

Author: EamonNerbonne

src/services/ghost/GhostModel.ts

@@ -3,7 +3,7 @@ import { ApiHandler, buildApiHandler } from "../../api"
 import { ProviderSettingsManager } from "../../core/config/ProviderSettingsManager"
 import { OpenRouterHandler } from "../../api/providers"
 import { ApiStreamChunk } from "../../api/transform/stream"
-import { AUTOCOMPLETE_PROVIDER_MAP, AUTOCOMPLETE_PROVIDER_MODELS, checkKilocodeBalance } from "./utils/kilocode-utils"
+import { AUTOCOMPLETE_PROVIDER_MODELS, checkKilocodeBalance } from "./utils/kilocode-utils"
 
 export class GhostModel {
 	private apiHandler: ApiHandler | null = null
@@ -26,7 +26,7 @@ export class GhostModel {
 		this.cleanup()
 
 		// Check providers in order, but skip unusable ones (e.g., kilocode with zero balance)
-		for (const [provider, model] of AUTOCOMPLETE_PROVIDER_MAP) {
+		for (const [provider, model] of AUTOCOMPLETE_PROVIDER_MODELS) {
 			const selectedProfile = profiles.find((x) => x?.apiProvider === provider)
 			if (!selectedProfile) continue
 			const profile = await providerSettingsManager.getProfile({ id: selectedProfile.id })

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

@@ -15,7 +15,7 @@ describe("GhostModel", () => {
 
 	describe("reload", () => {
 		it("sorts profiles by supportedProviders index order", async () => {
-			const supportedProviders = Object.keys(AUTOCOMPLETE_PROVIDER_MODELS)
+			const supportedProviders = [...AUTOCOMPLETE_PROVIDER_MODELS.keys()]
 			const profiles = [
 				{ id: "3", name: "profile3", apiProvider: supportedProviders[2] },
 				{ id: "1", name: "profile1", apiProvider: supportedProviders[0] },
@@ -37,7 +37,7 @@ describe("GhostModel", () => {
 		})
 
 		it("filters out profiles without apiProvider", async () => {
-			const supportedProviders = Object.keys(AUTOCOMPLETE_PROVIDER_MODELS)
+			const supportedProviders = [...AUTOCOMPLETE_PROVIDER_MODELS.keys()]
 			const profiles = [
 				{ id: "1", name: "profile1", apiProvider: undefined },
 				{ id: "2", name: "profile2", apiProvider: supportedProviders[0] },
@@ -58,7 +58,7 @@ describe("GhostModel", () => {
 		})
 
 		it("filters out profiles with unsupported apiProvider", async () => {
-			const supportedProviders = Object.keys(AUTOCOMPLETE_PROVIDER_MODELS)
+			const supportedProviders = [...AUTOCOMPLETE_PROVIDER_MODELS.keys()]
 			const profiles = [
 				{ id: "1", name: "profile1", apiProvider: "unsupported" },
 				{ id: "2", name: "profile2", apiProvider: supportedProviders[0] },
@@ -90,7 +90,7 @@ describe("GhostModel", () => {
 		})
 
 		it("returns true when profile found", async () => {
-			const supportedProviders = Object.keys(AUTOCOMPLETE_PROVIDER_MODELS)
+			const supportedProviders = [...AUTOCOMPLETE_PROVIDER_MODELS.keys()]
 			const profiles = [{ id: "1", name: "profile1", apiProvider: supportedProviders[0] }] as any
 
 			vi.mocked(mockProviderSettingsManager.listConfig).mockResolvedValue(profiles)
@@ -303,7 +303,7 @@ describe("GhostModel", () => {
 		})
 
 		it("returns provider name from API handler when provider is loaded", async () => {
-			const supportedProviders = Object.keys(AUTOCOMPLETE_PROVIDER_MODELS)
+			const supportedProviders = [...AUTOCOMPLETE_PROVIDER_MODELS.keys()]
 			const profiles = [{ id: "1", name: "profile1", apiProvider: supportedProviders[0] }] as any
 
 			vi.mocked(mockProviderSettingsManager.listConfig).mockResolvedValue(profiles)

src/services/ghost/new-auto-complete/NewAutocompleteModel.ts

@@ -34,50 +34,33 @@ export class NewAutocompleteModel {
 
 	public async reload(providerSettingsManager: ProviderSettingsManager): Promise<boolean> {
 		const profiles = await providerSettingsManager.listConfig()
-		const supportedProviders = Object.keys(AUTOCOMPLETE_PROVIDER_MODELS) as Array<
-			keyof typeof AUTOCOMPLETE_PROVIDER_MODELS
-		>
 
 		this.cleanup()
 
 		// Check providers in order, but skip unusable ones (e.g., kilocode with zero balance)
-		for (const provider of supportedProviders) {
+		for (const [provider, model] of AUTOCOMPLETE_PROVIDER_MODELS) {
 			const selectedProfile = profiles.find((x) => x?.apiProvider === provider)
 			if (!selectedProfile) continue
+			const profile = await providerSettingsManager.getProfile({ id: selectedProfile.id })
 
 			if (provider === "kilocode") {
 				// For all other providers, assume they are usable
-				const profile = await providerSettingsManager.getProfile({ id: selectedProfile.id })
 				if (!profile.kilocodeToken) continue
 				if (!(await checkKilocodeBalance(profile.kilocodeToken, profile.kilocodeOrganizationId))) continue
 			}
 
-			this.loadProfile(providerSettingsManager, selectedProfile, provider)
+			this.apiHandler = buildApiHandler({ ...profile, [modelIdKeysByProvider[provider]]: model })
+
+			if (this.apiHandler instanceof OpenRouterHandler) {
+				await this.apiHandler.fetchModel()
+			}
 			this.loaded = true
 			return true
 		}
 
 		this.loaded = true // we loaded, and found nothing, but we do not wish to reload
 		return false
 	}
-	public async loadProfile(
-		providerSettingsManager: ProviderSettingsManager,
-		selectedProfile: ProviderSettingsEntry,
-		provider: keyof typeof AUTOCOMPLETE_PROVIDER_MODELS,
-	): Promise<void> {
-		this.profile = await providerSettingsManager.getProfile({
-			id: selectedProfile.id,
-		})
-
-		this.apiHandler = buildApiHandler({
-			...this.profile,
-			[modelIdKeysByProvider[provider]]: AUTOCOMPLETE_PROVIDER_MODELS[provider],
-		})
-
-		if (this.apiHandler instanceof OpenRouterHandler) {
-			await this.apiHandler.fetchModel()
-		}
-	}
 
 	/**
 	 * Creates an ILLM-compatible instance from provider settings for autocomplete.
@@ -147,7 +130,11 @@ export class NewAutocompleteModel {
 		}
 
 		const provider = this.profile.apiProvider as AutocompleteProviderKey
-		const model = AUTOCOMPLETE_PROVIDER_MODELS[provider]
+		const model = AUTOCOMPLETE_PROVIDER_MODELS.get(provider)
+		if (!model) {
+			console.warn(`[NewAutocompleteModel] Unsupported provider: ${provider}`)
+			return null
+		}
 
 		switch (provider) {
 			case "mistral":

src/services/ghost/utils/kilocode-utils.ts

@@ -36,17 +36,10 @@ export async function checkKilocodeBalance(kilocodeToken: string, kilocodeOrgani
 	}
 }
 
-export const AUTOCOMPLETE_PROVIDER_MODELS = {
-	mistral: "codestral-latest",
-	kilocode: "mistralai/codestral-2508",
-	openrouter: "mistralai/codestral-2508",
-	bedrock: "mistral.codestral-2508-v1:0",
-} as const
-export type AutocompleteProviderKey = keyof typeof AUTOCOMPLETE_PROVIDER_MODELS
-export const AUTOCOMPLETE_PROVIDER_MAP = new Map([
+export const AUTOCOMPLETE_PROVIDER_MODELS = new Map([
 	["mistral", "codestral-latest"],
 	["kilocode", "mistralai/codestral-2508"],
 	["openrouter", "mistralai/codestral-2508"],
 	["bedrock", "mistral.codestral-2508-v1:0"],
 ] as const)
-export type AutocompleteProviderKey2 = typeof AUTOCOMPLETE_PROVIDER_MAP extends Map<infer K, any> ? K : never
+export type AutocompleteProviderKey = typeof AUTOCOMPLETE_PROVIDER_MODELS extends Map<infer K, any> ? K : never