Remove distinct code completion preset management to streamline preset selection

robertpiosik · robertpiosik · commit 2457fc97963c · 2025-07-14T23:30:35.000+02:00
diff --git a/packages/ui/src/components/editor/Presets/Presets.module.scss b/packages/ui/src/components/editor/Presets/Presets.module.scss
@@ -52,10 +52,6 @@
       }
     }
 
-    &--disabled {
-      cursor: not-allowed;
-    }
-
     &__left {
       display: flex;
       align-items: center;
@@ -76,10 +72,6 @@
         &--selected > svg {
           fill: var(--vscode-textLink-foreground);
         }
-
-        &--disabled {
-          opacity: var(--disabled-opacity);
-        }
       }
 
       &__text {
diff --git a/packages/ui/src/components/editor/Presets/Presets.tsx b/packages/ui/src/components/editor/Presets/Presets.tsx
@@ -23,9 +23,7 @@ export namespace Presets {
     is_disabled: boolean
     on_preset_click: (name: string) => void
     selected_presets: string[]
-    selected_code_completion_presets: string[]
     on_create_preset: () => void
-    is_in_code_completions_mode: boolean
     on_preset_copy: (name: string) => void
     on_presets_reorder: (reordered_presets: Preset[]) => void
     on_preset_edit: (name: string) => void
@@ -99,9 +97,6 @@ export const Presets: React.FC<Presets.Props> = (props) => {
           handle={`.${styles.presets__item__right__drag_handle}`}
         >
           {props.presets.map((preset, i) => {
-            const is_disabled_in_code_completion_mode =
-              props.is_in_code_completions_mode && preset.has_affixes
-
             const is_unnamed =
               !preset.name || /^\(\d+\)$/.test(preset.name.trim())
             const display_name = is_unnamed ? preset.chatbot : preset.name
@@ -129,45 +124,26 @@ export const Presets: React.FC<Presets.Props> = (props) => {
                 key={i}
                 className={cn(styles.presets__item, {
                   [styles['presets__item--highlighted']]:
-                    highlighted_preset_name == preset.name,
-                  [styles['presets__item--disabled']]:
-                    is_disabled_in_code_completion_mode
+                    highlighted_preset_name == preset.name
                 })}
                 onClick={() => {
-                  if (is_disabled_in_code_completion_mode) return
                   props.on_preset_click(preset.name)
                   set_highlighted_preset_name(preset.name)
                 }}
                 role="button"
-                title={
-                  is_disabled_in_code_completion_mode
-                    ? `${display_name} (Presets with prompt prefix or suffix are unaviailable for code completions)`
-                    : display_name
-                }
+                title={display_name}
               >
                 <div className={styles.presets__item__left}>
                   <ChatbotIcon
                     chatbot={preset.chatbot}
-                    is_selected={
-                      !props.is_in_code_completions_mode
-                        ? props.selected_presets.includes(preset.name)
-                        : props.selected_code_completion_presets.includes(
-                            preset.name
-                          )
-                    }
-                    is_disabled={is_disabled_in_code_completion_mode}
+                    is_selected={props.selected_presets.includes(preset.name)}
+                    is_disabled={false}
                   />
 
                   <div
                     className={cn(styles.presets__item__left__text, {
                       [styles['presets__item__left__text--selected']]:
-                        !props.is_in_code_completions_mode
-                          ? props.selected_presets.includes(preset.name)
-                          : props.selected_code_completion_presets.includes(
-                              preset.name
-                            ),
-                      [styles['presets__item__left__text--disabled']]:
-                        is_disabled_in_code_completion_mode
+                        props.selected_presets.includes(preset.name)
                     })}
                   >
                     <span>{display_name}</span>
diff --git a/packages/vscode/src/view/backend/message-handlers/handle-delete-preset.ts b/packages/vscode/src/view/backend/message-handlers/handle-delete-preset.ts
@@ -87,24 +87,6 @@ export const handle_delete_preset = async (
         names: updated_selected
       })
     }
-
-    const selected_fim_names = provider.context.globalState.get<string[]>(
-      'selectedCodeCompletionPresets',
-      []
-    )
-    if (selected_fim_names.includes(preset_name)) {
-      const updated_selected = selected_fim_names.filter(
-        (n) => n != preset_name
-      )
-      await provider.context.globalState.update(
-        'selectedCodeCompletionPresets',
-        updated_selected
-      )
-      provider.send_message<ExtensionMessage>({
-        command: 'SELECTED_CODE_COMPLETION_PRESETS',
-        names: updated_selected
-      })
-    }
   } catch (error) {
     vscode.window.showErrorMessage(`Failed to delete preset: ${error}`)
   }
diff --git a/packages/vscode/src/view/backend/message-handlers/handle-duplicate-preset.ts b/packages/vscode/src/view/backend/message-handlers/handle-duplicate-preset.ts
@@ -40,7 +40,7 @@ export const handle_duplicate_preset = async (
     ? `${base_for_duplication} (${copy_number})`
     : `(${copy_number})`
 
-  while (current_presets.some((p) => p.name === new_name)) {
+  while (current_presets.some((p) => p.name == new_name)) {
     copy_number++
     new_name = base_for_duplication
       ? `${base_for_duplication} (${copy_number})`
diff --git a/packages/vscode/src/view/backend/message-handlers/handle-get-selected-code-completion-presets.ts b/packages/vscode/src/view/backend/message-handlers/handle-get-selected-code-completion-presets.ts
diff --git a/packages/vscode/src/view/backend/message-handlers/handle-show-preset-picker.ts b/packages/vscode/src/view/backend/message-handlers/handle-show-preset-picker.ts
@@ -82,16 +82,9 @@ export const handle_show_preset_picker = async (
       selected_names
     )
 
-    if (provider.web_mode == 'code-completions') {
-      provider.send_message<ExtensionMessage>({
-        command: 'SELECTED_CODE_COMPLETION_PRESETS',
-        names: selected_names
-      })
-    } else {
-      provider.send_message<ExtensionMessage>({
-        command: 'SELECTED_PRESETS',
-        names: selected_names
-      })
-    }
+    provider.send_message<ExtensionMessage>({
+      command: 'SELECTED_PRESETS',
+      names: selected_names
+    })
   }
 }
diff --git a/packages/vscode/src/view/backend/message-handlers/handle-update-preset.ts b/packages/vscode/src/view/backend/message-handlers/handle-update-preset.ts
@@ -3,7 +3,6 @@ import { ViewProvider } from '@/view/backend/view-provider'
 import {
   ExtensionMessage,
   SelectedPresetsMessage,
-  SelectedCodeCompletionPresetsMessage,
   UpdatePresetMessage
 } from '@/view/types/messages'
 import { Preset } from '@shared/types/preset'
@@ -148,49 +147,6 @@ export const handle_update_preset = async (
     })
   }
 
-  // Handle selected code completion presets
-  const selected_fim_names = provider.context.globalState.get<string[]>(
-    'selectedCodeCompletionPresets',
-    []
-  )
-  const was_in_selected_fim = selected_fim_names.includes(
-    message.updating_preset.name
-  )
-
-  if (was_in_selected_fim) {
-    // Check if preset now has prefix or suffix (making it ineligible for FIM)
-    const has_affixes =
-      updated_ui_preset.prompt_prefix || updated_ui_preset.prompt_suffix
-
-    if (has_affixes) {
-      // Remove from selected FIM presets
-      const updated_selected_fim = selected_fim_names.filter(
-        (name) => name !== message.updating_preset.name
-      )
-      await provider.context.globalState.update(
-        'selectedCodeCompletionPresets',
-        updated_selected_fim
-      )
-      provider.send_message<SelectedCodeCompletionPresetsMessage>({
-        command: 'SELECTED_CODE_COMPLETION_PRESETS',
-        names: updated_selected_fim
-      })
-    } else if (final_name != message.updating_preset.name) {
-      // Just update the name if it changed but still no affixes
-      const updated_selected_fim = selected_fim_names.map((name) =>
-        name == message.updating_preset.name ? final_name : name
-      )
-      await provider.context.globalState.update(
-        'selectedCodeCompletionPresets',
-        updated_selected_fim
-      )
-      provider.send_message<SelectedCodeCompletionPresetsMessage>({
-        command: 'SELECTED_CODE_COMPLETION_PRESETS',
-        names: updated_selected_fim
-      })
-    }
-  }
-
   provider.send_presets_to_webview(webview_view.webview)
   provider.send_message<ExtensionMessage>({
     command: 'PRESET_UPDATED'
diff --git a/packages/vscode/src/view/backend/message-handlers/index.ts b/packages/vscode/src/view/backend/message-handlers/index.ts
@@ -6,7 +6,6 @@ export * from './handle-get-code-completions-mode'
 export * from './handle-get-connection-status'
 export * from './handle-get-history'
 export * from './handle-get-instructions'
-export * from './handle-get-selected-code-completion-presets'
 export * from './handle-get-selected-presets'
 export * from './handle-preview-preset'
 export * from './handle-request-editor-selection-state'
diff --git a/packages/vscode/src/view/backend/view-provider.ts b/packages/vscode/src/view/backend/view-provider.ts
@@ -29,7 +29,6 @@ import {
   handle_show_history_quick_pick,
   handle_save_presets_order,
   handle_get_selected_presets,
-  handle_get_selected_code_completion_presets,
   handle_get_connection_status,
   handle_get_history,
   handle_save_history,
@@ -348,17 +347,6 @@ export class ViewProvider implements vscode.WebviewViewProvider {
               'selectedPresets',
               message.names
             )
-          } else if (
-            message.command == 'GET_SELECTED_CODE_COMPLETION_PRESETS'
-          ) {
-            handle_get_selected_code_completion_presets(this)
-          } else if (
-            message.command == 'SAVE_SELECTED_CODE_COMPLETION_PRESETS'
-          ) {
-            await this.context.globalState.update(
-              'selectedCodeCompletionPresets',
-              message.names
-            )
           } else if (message.command == 'SEND_PROMPT') {
             await handle_send_prompt(this, message.preset_names)
           } else if (message.command == 'PREVIEW_PRESET') {
diff --git a/packages/vscode/src/view/frontend/home/Home.tsx b/packages/vscode/src/view/frontend/home/Home.tsx
@@ -28,10 +28,6 @@ export const Home: React.FC<Props> = (props) => {
   const [is_connected, set_is_connected] = useState<boolean>()
   const [presets, set_presets] = useState<Preset[]>()
   const [selected_presets, set_selected_presets] = useState<string[]>([])
-  const [
-    selected_code_completion_presets,
-    set_selected_code_completion_presets
-  ] = useState<string[]>([])
   const [has_active_editor, set_has_active_editor] = useState<boolean>()
   const [has_active_selection, set_has_active_selection] = useState<boolean>()
   const [ask_history, set_ask_history] = useState<string[]>()
@@ -66,9 +62,6 @@ export const Home: React.FC<Props> = (props) => {
         case 'SELECTED_PRESETS':
           set_selected_presets(message.names)
           break
-        case 'SELECTED_CODE_COMPLETION_PRESETS':
-          set_selected_code_completion_presets(message.names)
-          break
         case 'PRESETS_SELECTED_FROM_PICKER':
           set_selected_presets(message.names)
           break
@@ -125,7 +118,6 @@ export const Home: React.FC<Props> = (props) => {
       { command: 'GET_CONNECTION_STATUS' },
       { command: 'GET_PRESETS' },
       { command: 'GET_SELECTED_PRESETS' },
-      { command: 'GET_SELECTED_CODE_COMPLETION_PRESETS' },
       { command: 'REQUEST_EDITOR_STATE' },
       { command: 'REQUEST_EDITOR_SELECTION_STATE' },
       { command: 'GET_HISTORY' },
@@ -461,7 +453,6 @@ export const Home: React.FC<Props> = (props) => {
       is_connected={is_connected}
       presets={presets}
       selected_presets={selected_presets}
-      selected_code_completion_presets={selected_code_completion_presets}
       on_create_preset={handle_create_preset}
       on_quick_action_click={handle_quick_action_click}
       has_active_editor={has_active_editor}
diff --git a/packages/vscode/src/view/frontend/home/HomeView/HomeView.tsx b/packages/vscode/src/view/frontend/home/HomeView/HomeView.tsx
@@ -27,7 +27,6 @@ type Props = {
   is_connected: boolean
   presets: Preset[]
   selected_presets: string[]
-  selected_code_completion_presets: string[]
   has_active_editor: boolean
   has_active_selection: boolean
   chat_history: string[]
@@ -177,9 +176,7 @@ export const HomeView: React.FC<Props> = (props) => {
     if (props.home_view_type == HOME_VIEW_TYPES.WEB) {
       props.initialize_chats({
         prompt: current_prompt,
-        preset_names: !is_in_code_completions_mode
-          ? props.selected_presets
-          : props.selected_code_completion_presets
+        preset_names: props.selected_presets
       })
     } else {
       if (is_in_code_completions_mode) {
@@ -394,9 +391,6 @@ export const HomeView: React.FC<Props> = (props) => {
                   })}
                   is_disabled={!props.is_connected}
                   selected_presets={props.selected_presets}
-                  selected_code_completion_presets={
-                    props.selected_code_completion_presets
-                  }
                   on_create_preset={props.on_create_preset}
                   on_preset_click={(name) => {
                     props.initialize_chats({
@@ -406,7 +400,6 @@ export const HomeView: React.FC<Props> = (props) => {
                   }}
                   on_preset_copy={handle_preset_copy}
                   on_preset_edit={props.on_preset_edit}
-                  is_in_code_completions_mode={is_in_code_completions_mode}
                   on_presets_reorder={props.on_presets_reorder}
                   on_preset_duplicate={props.on_preset_duplicate}
                   on_preset_delete={props.on_preset_delete}
diff --git a/packages/vscode/src/view/types/messages.ts b/packages/vscode/src/view/types/messages.ts
@@ -134,15 +134,6 @@ export interface PreviewPresetMessage extends BaseMessage {
   preset: Preset
 }
 
-export interface GetSelectedCodeCompletionPresetsMessage extends BaseMessage {
-  command: 'GET_SELECTED_CODE_COMPLETION_PRESETS'
-}
-
-export interface SaveSelectedCodeCompletionPresetsMessage extends BaseMessage {
-  command: 'SAVE_SELECTED_CODE_COMPLETION_PRESETS'
-  names: string[]
-}
-
 export interface CaretPositionChangedWebviewMessage extends BaseMessage {
   command: 'CARET_POSITION_CHANGED'
   caret_position: number
@@ -298,11 +289,6 @@ export interface NewlyPickedOpenRouterModelMessage extends BaseMessage {
   model_id: string
 }
 
-export interface SelectedCodeCompletionPresetsMessage extends BaseMessage {
-  command: 'SELECTED_CODE_COMPLETION_PRESETS'
-  names: string[]
-}
-
 export interface ApiProvidersMessage extends BaseMessage {
   command: 'PROVIDERS'
   providers: Array<
@@ -367,8 +353,6 @@ export type WebviewMessage =
   | ShowHistoryQuickPickMessage
   | ShowQuickPickMessage
   | PreviewPresetMessage
-  | GetSelectedCodeCompletionPresetsMessage
-  | SaveSelectedCodeCompletionPresetsMessage
   | CaretPositionChangedWebviewMessage
   | PickOpenRouterModel
   | SaveHomeViewTypeMessage
@@ -399,7 +383,6 @@ export type ExtensionMessage =
   | PresetCreatedMessage
   | PresetUpdatedMessage
   | NewlyPickedOpenRouterModelMessage
-  | SelectedCodeCompletionPresetsMessage
   | ExecuteCommandMessage
   | ApiProvidersMessage
   | HomeViewTypeMessage

Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,6 @@`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`55`		`- &--disabled {`
`56`		`- cursor: not-allowed;`
`57`		`- }`
`58`		`-`
`59`	`55`	`&__left {`
`60`	`56`	`display: flex;`
`61`	`57`	`align-items: center;`
`@@ -76,10 +72,6 @@`
`76`	`72`	`&--selected > svg {`
`77`	`73`	`fill: var(--vscode-textLink-foreground);`
`78`	`74`	`}`
`79`		`-`
`80`		`- &--disabled {`
`81`		`- opacity: var(--disabled-opacity);`
`82`		`- }`
`83`	`75`	`}`
`84`	`76`
`85`	`77`	`&__text {`