refactor: fix merge conflict and code styles

Author: catrielmuller

cli/src/commands/core/types.ts

@@ -3,7 +3,7 @@
  */
 
 import type { RouterModels } from "../../types/messages.js"
-import type { ProviderConfig } from "../../config/types.js"
+import type { CLIConfig, ProviderConfig } from "../../config/types.js"
 import type { ProfileData, BalanceData } from "../../state/atoms/profile.js"
 import type { TaskHistoryData, TaskHistoryFilters } from "../../state/atoms/taskHistory.js"
 
@@ -33,6 +33,7 @@ export interface CommandContext {
 	input: string
 	args: string[]
 	options: Record<string, any>
+	config: CLIConfig
 	sendMessage: (message: any) => Promise<void>
 	addMessage: (message: any) => void
 	clearMessages: () => void
@@ -122,6 +123,7 @@ export interface ArgumentProviderContext {
 
 	// CommandContext properties for providers that need them
 	commandContext?: {
+		config: CLIConfig
 		routerModels: RouterModels | null
 		currentProvider: ProviderConfig | null
 		kilocodeDefaultModel: string

cli/src/commands/theme.ts

@@ -6,22 +6,15 @@ import type { Command, ArgumentProviderContext } from "./core/types.js"
 import type { CLIConfig } from "../config/types.js"
 import { getThemeById, getAvailableThemes } from "../constants/themes/index.js"
 import { messageResetCounterAtom } from "../state/atoms/ui.js"
-import { createStore } from "jotai"
-
-/**
- * Get config from disk
- */
-async function getConfig(): Promise<{ config: CLIConfig }> {
-	const { loadConfig } = await import("../config/persistence.js")
-	const { config } = await loadConfig()
-	return { config }
-}
 
 /**
  * Autocomplete provider for theme names
  */
-async function themeAutocompleteProvider(_context: ArgumentProviderContext) {
-	const { config } = await getConfig()
+async function themeAutocompleteProvider(context: ArgumentProviderContext) {
+	if (!context.commandContext) {
+		return []
+	}
+	const config = context.commandContext.config
 	const availableThemeIds = getAvailableThemes(config)
 
 	// Create theme display info array to apply same sorting logic
@@ -36,8 +29,8 @@ async function themeAutocompleteProvider(_context: ArgumentProviderContext) {
 			}
 		})
 		.sort((a, b) => {
-			// Sort by type (Dark first, then Light, then Custom), then by ID alphabetically
-			const typeOrder = { Dark: 0, Light: 1, Custom: 2 }
+			// Sort by type (dark first, then light, then custom), then by ID alphabetically
+			const typeOrder = { dark: 0, light: 1, custom: 2 }
 			const typeAOrder = typeOrder[a.type as keyof typeof typeOrder] ?? 3
 			const typeBOrder = typeOrder[b.type as keyof typeof typeOrder] ?? 3
 
@@ -102,7 +95,7 @@ export const themeCommand: Command = {
 			 * Validate theme argument against available themes
 			 */
 			validate: async (value, _context) => {
-				const { config } = await getConfig()
+				const config = _context.commandContext?.config
 				const availableThemeIds = getAvailableThemes(config)
 				const isValid = availableThemeIds.includes(value.trim().toLowerCase())
 
@@ -114,8 +107,7 @@ export const themeCommand: Command = {
 		},
 	],
 	handler: async (context) => {
-		const { args, addMessage, setTheme } = context
-		const { config } = await getConfig()
+		const { args, addMessage, setTheme, config } = context
 		const availableThemeIds = getAvailableThemes(config)
 
 		try {
@@ -142,7 +134,7 @@ export const themeCommand: Command = {
 				)
 
 				// Define the order for displaying theme types
-				const typeOrder = ["Dark", "Light", "Custom"]
+				const typeOrder = ["dark", "light", "custom"]
 
 				// Show interactive theme selection menu
 				const helpText: string[] = ["**Available Themes:**", ""]
@@ -187,25 +179,13 @@ export const themeCommand: Command = {
 			const themeName = theme.name || requestedTheme
 
 			try {
-				await setTheme(requestedTheme)
-
-				// Repaint the terminal to immediately show theme changes
-				// Clear the terminal screen and reset cursor position
-				// \x1b[2J - Clear entire screen
-				// \x1b[3J - Clear scrollback buffer (needed for gnome-terminal)
-				// \x1b[H - Move cursor to home position (0,0)
-				process.stdout.write("\x1b[2J\x1b[3J\x1b[H")
-
-				// Increment reset counter to force UI re-render
-				const store = createStore()
-				store.set(messageResetCounterAtom, (prev: number) => prev + 1)
-
 				addMessage({
 					id: Date.now().toString(),
 					type: "system",
 					content: `Switched to **${themeName}** theme.`,
 					ts: Date.now(),
 				})
+				setTheme(requestedTheme)
 			} catch (error) {
 				addMessage({
 					id: Date.now().toString(),

cli/src/constants/themes/alpha.ts

@@ -13,7 +13,7 @@ import type { Theme } from "../../types/theme.js"
 export const alphaTheme: Theme = {
 	id: "alpha",
 	name: "Alpha",
-	type: "Dark",
+	type: "dark",
 
 	brand: {
 		primary: "#faf74f", // Kilo Code yellow

cli/src/constants/themes/ansi-light.ts

@@ -9,7 +9,7 @@ import type { Theme } from "../../types/theme.js"
 export const ansiLightTheme: Theme = {
 	id: "ansi-light",
 	name: "ANSI Light",
-	type: "Light",
+	type: "light",
 
 	brand: {
 		primary: "blue", // Use first gradient color for banner

cli/src/constants/themes/ansi.ts

@@ -9,7 +9,7 @@ import type { Theme } from "../../types/theme.js"
 export const ansiTheme: Theme = {
 	id: "ansi",
 	name: "ANSI",
-	type: "Dark",
+	type: "dark",
 
 	brand: {
 		primary: "cyan", // Use first gradient color for banner

cli/src/constants/themes/atom-one-dark.ts

@@ -9,7 +9,7 @@ import type { Theme } from "../../types/theme.js"
 export const atomOneDarkTheme: Theme = {
 	id: "atom-one-dark",
 	name: "Atom One Dark",
-	type: "Dark",
+	type: "dark",
 
 	brand: {
 		primary: "#61aeee", // Use first gradient color for banner

cli/src/constants/themes/ayu-dark.ts

@@ -9,7 +9,7 @@ import type { Theme } from "../../types/theme.js"
 export const ayuDarkTheme: Theme = {
 	id: "ayu-dark",
 	name: "Ayu Dark",
-	type: "Dark",
+	type: "dark",
 
 	brand: {
 		primary: "#FFB454", // Use first gradient color for banner

cli/src/constants/themes/ayu-light.ts

@@ -9,7 +9,7 @@ import type { Theme } from "../../types/theme.js"
 export const ayuLightTheme: Theme = {
 	id: "ayu-light",
 	name: "Ayu Light",
-	type: "Light",
+	type: "light",
 
 	brand: {
 		primary: "#399ee6", // Use first gradient color for banner

cli/src/constants/themes/custom.ts

@@ -100,7 +100,7 @@ export function addCustomTheme(config: CLIConfig, themeId: string, theme: Theme)
 			[themeId]: {
 				...theme,
 				id: themeId, // Ensure the ID matches the key
-				type: "Custom", // Always set custom themes to "Custom" type
+				type: "custom", // Always set custom themes to "custom" type
 			},
 		},
 	}
@@ -138,7 +138,7 @@ export function updateCustomTheme(config: CLIConfig, themeId: string, theme: Par
 				...config.customThemes[themeId],
 				...theme,
 				id: themeId, // Ensure the ID is preserved
-				type: "Custom", // Always ensure custom themes have "Custom" type
+				type: "custom", // Always ensure custom themes have "custom" type
 			},
 		},
 	}

cli/src/constants/themes/dark.ts

@@ -9,7 +9,7 @@ import type { Theme } from "../../types/theme.js"
 export const darkTheme: Theme = {
 	id: "dark",
 	name: "Dark",
-	type: "Dark",
+	type: "dark",
 
 	brand: {
 		primary: "#faf74f",