Remove prompt prefix and suffix functionality from preset configurations and UI components

Author: robertpiosik

apps/editor/src/views/panel/backend/message-handlers/handle-delete-preset-group-or-separator.ts

@@ -29,9 +29,7 @@ export const handle_delete_preset_group_or_separator = async (
     item_type = 'group'
     const item_name = item_to_delete.name
     const is_unnamed = !item_name || /^\(\d+\)$/.test(item_name.trim())
-    const has_affixes =
-      !!item_to_delete.promptPrefix || !!item_to_delete.promptSuffix
-    should_show_confirmation = !is_unnamed || has_affixes
+    should_show_confirmation = !is_unnamed
   } else {
     // It's a separator
     item_type = 'separator'

apps/editor/src/views/panel/backend/message-handlers/handle-hash-sign-quick-pick/handle-hash-sign-quick-pick.ts

@@ -159,7 +159,6 @@ export const handle_hash_sign_quick_pick = async (
   panel_provider: PanelProvider,
   context: vscode.ExtensionContext,
   is_for_code_completions: boolean,
-  target?: 'prompt-field' | 'preset-prefix' | 'preset-suffix'
 ): Promise<void> => {
   const is_find_relevant_files =
     (panel_provider.mode == MODE.WEB &&
@@ -174,21 +173,12 @@ export const handle_hash_sign_quick_pick = async (
   })
 
   if (!replacement) {
-    if (!target || target == 'prompt-field') {
       panel_provider.send_message({
         command: 'FOCUS_PROMPT_FIELD'
       })
-    }
     return
   }
 
-  if (target == 'preset-prefix' || target == 'preset-suffix') {
-    panel_provider.send_message({
-      command: 'INSERT_SYMBOL_AT_CURSOR',
-      text: replacement,
-      target
-    })
-  } else {
     const current_text = panel_provider.current_instruction
 
     const is_after_hash_sign = current_text
@@ -203,5 +193,4 @@ export const handle_hash_sign_quick_pick = async (
     panel_provider.send_message({
       command: 'FOCUS_PROMPT_FIELD'
     })
-  }
 }

apps/editor/src/views/panel/backend/message-handlers/handle-preview-preset.ts

@@ -3,7 +3,6 @@ import { PanelProvider } from '@/views/panel/backend/panel-provider'
 import { PreviewPresetMessage } from '@/views/panel/types/messages'
 import { FilesCollector } from '@/utils/files-collector'
 import { Preset } from '@shared/types/preset'
-import { apply_preset_affixes_to_instruction } from '@/utils/apply-preset-affixes'
 import { dictionary } from '@shared/constants/dictionary'
 import {
   EDIT_FORMAT_INSTRUCTIONS_WHOLE,
@@ -67,15 +66,6 @@ export const handle_preview_preset = async (
 
     text_to_send = `<files>\n${context_text}<file path="${relative_path}">\n<![CDATA[\n${text_before_cursor}${missing_text_tag}${text_after_cursor}\n]]>\n</file>\n</files>\n${skill_definitions}${system_instructions}`
   } else if (panel_provider.web_prompt_type != 'code-at-cursor') {
-    const instructions = apply_preset_affixes_to_instruction({
-      instruction: current_instructions,
-      preset_name: message.preset.name!,
-      presets_config_key: panel_provider.get_presets_config_key(),
-      override_affixes: {
-        promptPrefix: message.preset.prompt_prefix,
-        promptSuffix: message.preset.prompt_suffix
-      }
-    })
 
     const collected =
       panel_provider.web_prompt_type != 'no-context'
@@ -85,7 +75,7 @@ export const handle_preview_preset = async (
 
     const { instruction: processed_instructions, skill_definitions } =
       await replace_symbols({
-        instruction: instructions,
+        instruction: current_instructions,
         context: panel_provider.context,
         workspace_provider: panel_provider.workspace_provider,
         remove_images: true
@@ -131,8 +121,6 @@ export const handle_preview_preset = async (
   const preset_for_preview: Preset = {
     name: message.preset.name,
     chatbot: message.preset.chatbot,
-    prompt_prefix: message.preset.prompt_prefix,
-    prompt_suffix: message.preset.prompt_suffix,
     model: message.preset.model,
     temperature: message.preset.temperature,
     top_p: message.preset.top_p,

apps/editor/src/views/panel/backend/message-handlers/handle-send-to-browser.ts

@@ -1,7 +1,6 @@
 import { PanelProvider } from '@/views/panel/backend/panel-provider'
 import * as vscode from 'vscode'
 import { FilesCollector } from '@/utils/files-collector'
-import { apply_preset_affixes_to_instruction } from '@/utils/apply-preset-affixes'
 import {
   code_at_cursor_instructions_for_panel,
   find_relevant_files_instructions,
@@ -159,15 +158,10 @@ export const handle_send_to_browser = async (params: {
 
     const prepared_chats = await Promise.all(
       resolved_preset_names.map(async (preset_name) => {
-        const instructions = apply_preset_affixes_to_instruction({
-          instruction: current_instructions,
-          preset_name: preset_name,
-          presets_config_key: params.panel_provider.get_presets_config_key()
-        })
 
         const { instruction: processed_instructions, skill_definitions } =
           await replace_symbols({
-            instruction: instructions,
+            instruction: current_instructions,
             context: params.panel_provider.context,
             workspace_provider: params.panel_provider.workspace_provider,
             remove_images: true
@@ -367,9 +361,7 @@ const show_preset_quick_pick = async (params: {
         if (params.get_is_preset_disabled(preset)) {
           if (
             !params.is_in_code_completions_mode &&
-            !params.current_instructions &&
-            !preset.promptPrefix &&
-            !preset.promptSuffix
+            !params.current_instructions
           ) {
             params.panel_provider.send_message({
               command: 'SHOW_AUTO_CLOSING_MODAL',
@@ -496,12 +488,7 @@ const resolve_presets = async (params: {
         (is_in_code_completions_mode &&
           (!params.panel_provider.currently_open_file_path ||
             !!params.panel_provider.current_selection)) ||
-        (!is_in_code_completions_mode &&
-          !(
-            current_instructions ||
-            preset.promptPrefix ||
-            preset.promptSuffix
-          )))) ||
+        (!is_in_code_completions_mode && !current_instructions))) ||
     false
 
   if (params.preset_name !== undefined) {
@@ -510,9 +497,7 @@ const resolve_presets = async (params: {
       if (get_is_preset_disabled(preset)) {
         if (
           !is_in_code_completions_mode &&
-          !current_instructions &&
-          !preset.promptPrefix &&
-          !preset.promptSuffix
+          !current_instructions
         ) {
           params.panel_provider.send_message({
             command: 'SHOW_AUTO_CLOSING_MODAL',
@@ -554,11 +539,9 @@ const resolve_presets = async (params: {
           (p) => p.name && !preset_names.includes(p.name)
         )
         const any_disabled_due_to_instructions = disabled_presets.some(
-          (p) =>
+          () =>
             !is_in_code_completions_mode &&
-            !current_instructions &&
-            !p.promptPrefix &&
-            !p.promptSuffix
+            !current_instructions
         )
         if (any_disabled_due_to_instructions) {
           vscode.window.showWarningMessage(
@@ -572,11 +555,9 @@ const resolve_presets = async (params: {
 
     if (default_presets_in_group.length > 0) {
       const any_disabled_due_to_instructions = default_presets_in_group.some(
-        (p) =>
+        () =>
           !is_in_code_completions_mode &&
-          !current_instructions &&
-          !p.promptPrefix &&
-          !p.promptSuffix
+          !current_instructions
       )
       if (any_disabled_due_to_instructions) {
         params.panel_provider.send_message({
@@ -617,9 +598,7 @@ const resolve_presets = async (params: {
           if (get_is_preset_disabled(item)) {
             if (
               !is_in_code_completions_mode &&
-              !current_instructions &&
-              !item.promptPrefix &&
-              !item.promptSuffix
+              !current_instructions
             ) {
               params.panel_provider.send_message({
                 command: 'SHOW_AUTO_CLOSING_MODAL',

apps/editor/src/views/panel/backend/message-handlers/handle-update-preset.ts

@@ -41,8 +41,6 @@ export const handle_update_preset = async (
     return (
       a.name == b.name &&
       a.chatbot == b.chatbot &&
-      a.prompt_prefix == b.prompt_prefix &&
-      a.prompt_suffix == b.prompt_suffix &&
       a.model == b.model &&
       a.temperature === b.temperature && // can be undefined and 0
       a.top_p === b.top_p && // same

apps/editor/src/views/panel/backend/panel-provider.ts

@@ -895,7 +895,6 @@ export class PanelProvider implements vscode.WebviewViewProvider {
               this,
               this.context,
               message.is_for_code_completions,
-              message.target
             )
           } else if (message.command == 'GO_TO_FILE') {
             handle_go_to_file(message)

apps/editor/src/views/panel/backend/utils/preset-format-converters.ts

@@ -4,8 +4,6 @@ import { Preset } from '@shared/types/preset'
 export type ConfigPresetFormat = {
   name?: string
   chatbot?: keyof typeof CHATBOTS
-  promptPrefix?: string
-  promptSuffix?: string
   model?: string
   temperature?: number
   topP?: number
@@ -26,8 +24,6 @@ export const config_preset_to_ui_format = (
   return {
     name: config_preset.name,
     chatbot: config_preset.chatbot,
-    prompt_prefix: config_preset.promptPrefix,
-    prompt_suffix: config_preset.promptSuffix,
     model: config_preset.model,
     temperature: config_preset.temperature,
     top_p: config_preset.topP,
@@ -49,8 +45,6 @@ export const ui_preset_to_config_format = (
   return {
     name: preset.name || undefined,
     chatbot: preset.chatbot,
-    promptPrefix: preset.prompt_prefix,
-    promptSuffix: preset.prompt_suffix,
     model: preset.model,
     temperature: preset.temperature,
     topP: preset.top_p,

apps/editor/src/views/panel/frontend/Main/Main.tsx

@@ -250,8 +250,6 @@ export const Main: React.FC<Props> = (props) => {
         presets: updated_presets.map((preset) => ({
           name: preset.name,
           chatbot: preset.chatbot,
-          prompt_prefix: preset.prompt_prefix,
-          prompt_suffix: preset.prompt_suffix,
           model: preset.model,
           temperature: preset.temperature,
           top_p: preset.top_p,
@@ -286,8 +284,6 @@ export const Main: React.FC<Props> = (props) => {
         presets: updated_presets.map((preset) => ({
           name: preset.name,
           chatbot: preset.chatbot,
-          prompt_prefix: preset.prompt_prefix,
-          prompt_suffix: preset.prompt_suffix,
           model: preset.model,
           temperature: preset.temperature,
           top_p: preset.top_p,
@@ -322,8 +318,6 @@ export const Main: React.FC<Props> = (props) => {
         presets: updated_presets.map((preset) => ({
           name: preset.name,
           chatbot: preset.chatbot,
-          prompt_prefix: preset.prompt_prefix,
-          prompt_suffix: preset.prompt_suffix,
           model: preset.model,
           temperature: preset.temperature,
           top_p: preset.top_p,
@@ -383,8 +377,6 @@ export const Main: React.FC<Props> = (props) => {
       presets: reordered_presets.map((preset) => ({
         name: preset.name,
         chatbot: preset.chatbot,
-        prompt_prefix: preset.prompt_prefix,
-        prompt_suffix: preset.prompt_suffix,
         model: preset.model,
         temperature: preset.temperature,
         top_p: preset.top_p,

apps/editor/src/views/panel/frontend/Panel.tsx

@@ -243,14 +243,10 @@ export const Panel = () => {
     return undefined
   }
 
-  const has_affixes =
-    !!updated_preset?.prompt_prefix || !!updated_preset?.prompt_suffix
   const has_instructions = !!get_current_instructions().trim()
   const is_preview_disabled =
     !is_connected ||
-    (!has_affixes &&
-      !has_instructions &&
-      web_prompt_type != 'code-at-cursor') ||
+    (!has_instructions && web_prompt_type != 'code-at-cursor') ||
     (web_prompt_type == 'code-at-cursor' &&
       (!currently_open_file_path || !!current_selection))
 
@@ -540,10 +536,9 @@ export const Panel = () => {
                           : web_prompt_type == 'code-at-cursor' &&
                               !!current_selection
                             ? 'Unable to work with text selection'
-                            : !has_affixes &&
-                                !has_instructions &&
+                            : !has_instructions &&
                                 web_prompt_type != 'code-at-cursor'
-                              ? 'Enter instructions or affixes to preview'
+                              ? 'Enter instructions to preview'
                               : ''
                     }
                   >
@@ -555,13 +550,6 @@ export const Panel = () => {
               <EditPresetForm
                 preset={updating_preset}
                 on_update={set_updated_preset}
-                on_insert_symbol_click={(target) => {
-                  post_message(vscode, {
-                    command: 'SHOW_HASH_SIGN_QUICK_PICK',
-                    is_for_code_completions: false,
-                    target
-                  })
-                }}
                 pick_model={(chatbot_name, current_model_id) => {
                   post_message(vscode, {
                     command: 'PICK_MODEL',