Implement the Prune Context API tool, refactor instruction naming conventions, and enhance symbol processing logic across the extension and UI

Author: robertpiosik

packages/shared/src/constants/dictionary.ts

@@ -41,6 +41,8 @@ export const dictionary = {
       'No matching files found in workspace for the paths in clipboard.',
     NO_CODE_COMPLETIONS_CONFIGURATIONS_FOUND:
       'No "Code Completions" configurations found. Please add one in the settings.',
+    NO_PRUNE_CONTEXT_CONFIGURATIONS_FOUND:
+      'No "Prune Context" configurations found. Please add one in the settings.',
     NO_RECENT_CHANGES_TO_UNDO:
       'No recent changes found to undo or changes were already undone.',
     CONTEXT_COPIED_TO_CLIPBOARD: 'Context copied to clipboard.',

packages/ui/src/components/editor/panel/PromptField/PromptField.tsx

@@ -170,7 +170,6 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
   const highlighted_html = useMemo(() => {
     return get_highlighted_text({
       text: props.value,
-      is_in_code_completions_mode: props.is_in_code_completions_mode,
       has_active_selection: props.has_active_selection,
       context_file_paths: props.context_file_paths ?? []
     })
@@ -424,15 +423,13 @@ export const PromptField: React.FC<PromptFieldProps> = (props) => {
             >
               <Icon variant="AT_SIGN" />
             </button>
-            {!props.is_in_code_completions_mode && (
-              <button
-                onClick={props.on_hash_sign_click}
-                className={cn(styles['footer__left__button'])}
-                title="Insert Symbol"
-              >
-                <Icon variant="HASH_SIGN" />
-              </button>
-            )}
+            <button
+              onClick={props.on_hash_sign_click}
+              className={cn(styles['footer__left__button'])}
+              title="Insert Symbol"
+            >
+              <Icon variant="HASH_SIGN" />
+            </button>
             <button
               onClick={props.on_curly_braces_click}
               className={cn(styles['footer__left__button'])}

packages/ui/src/components/editor/panel/PromptField/utils/get-highlighted-text.tsx

@@ -46,44 +46,11 @@ const process_text_part_for_files = (
 
 export const get_highlighted_text = (params: {
   text: string
-  is_in_code_completions_mode: boolean
   has_active_selection: boolean
   context_file_paths: string[]
 }): string => {
   const saved_context_regex_part =
     '#SavedContext:(?:WorkspaceState|JSON)\\s+"[^"]+"'
-  if (params.is_in_code_completions_mode) {
-    const regex = new RegExp(`(${saved_context_regex_part})`, 'g')
-    const parts = params.text.split(regex)
-    const result = parts
-      .map((part) => {
-        const saved_context_match = part.match(
-          /^#SavedContext:(WorkspaceState|JSON)\s+"([^"]+)"$/
-        )
-        if (part && saved_context_match) {
-          const context_type = saved_context_match[1]
-          const context_name = saved_context_match[2]
-          return `<span class="${cn(
-            styles['keyword'],
-            styles['keyword--saved-context']
-          )}" data-type="saved-context-keyword" data-context-type="${context_type}" data-context-name="${escape_html(
-            context_name
-          )}"><span class="${
-            styles['keyword__icon']
-          }" data-role="keyword-icon"></span><span class="${
-            styles['keyword__text']
-          }" data-role="keyword-text">Context "${escape_html(
-            context_name
-          )}"</span></span>`
-        }
-        return process_text_part_for_files(part, params.context_file_paths)
-      })
-      .join('')
-    if (params.text.endsWith('\n')) {
-      return result + '<br data-role="trailing-break">'
-    }
-    return result
-  }
 
   const commit_regex_part =
     '#(?:Commit|ContextAtCommit):[^:]+:[^\\s"]+\\s+"(?:\\\\.|[^"\\\\])*"'

packages/vscode/src/services/model-providers-manager.ts

@@ -427,6 +427,28 @@ export class ModelProvidersManager {
     return this._get_tool_configs_from_settings('configurationsForPruneContext')
   }
 
+  public async get_default_prune_context_config(): Promise<
+    ToolConfig | undefined
+  > {
+    await this._load_promise
+    const default_config = this._get_default_tool_config_from_settings(
+      'configurationsForPruneContext'
+    )
+    if (default_config) return default_config
+
+    const configs = await this.get_prune_context_tool_configs()
+    if (configs.length == 1) return configs[0]
+
+    return undefined
+  }
+
+  public async set_default_prune_context_config(config: ToolConfig | null) {
+    await this._set_default_tool_config_in_settings(
+      'configurationsForPruneContext',
+      config
+    )
+  }
+
   public async save_prune_context_tool_configs(configs: PruneContextConfigs) {
     await this._save_tool_configs_to_settings(
       'configurationsForPruneContext',

packages/vscode/src/views/i18n/translations.ts

@@ -10,6 +10,7 @@ export const translations = {
     'settings.sidebar.edit-context': 'Edit Context',
     'settings.sidebar.code-completions': 'Code Completions',
     'settings.sidebar.intelligent-update': 'Intelligent Update',
+    'settings.sidebar.prune-context': 'Prune Context',
     'settings.sidebar.commit-messages': 'Commit Messages'
   },
   pl: {

packages/vscode/src/views/panel/backend/message-handlers/handle-at-sign-quick-pick/handle-at-sign-quick-pick.ts

@@ -279,13 +279,15 @@ export const handle_at_sign_quick_pick = async (
       ? panel_provider.web_prompt_type
       : panel_provider.api_prompt_type
   if (mode == 'ask') {
-    current_text = panel_provider.ask_instructions
+    current_text = panel_provider.ask_about_context_instructions
   } else if (mode == 'edit-context') {
-    current_text = panel_provider.edit_instructions
+    current_text = panel_provider.edit_context_instructions
   } else if (mode == 'no-context') {
     current_text = panel_provider.no_context_instructions
   } else if (mode == 'code-completions') {
-    current_text = panel_provider.code_completion_instructions
+    current_text = panel_provider.code_at_cursor_instructions
+  } else if (mode == 'prune-context') {
+    current_text = panel_provider.prune_context_instructions
   }
 
   const is_after_at_sign = current_text

packages/vscode/src/views/panel/backend/message-handlers/handle-code-completion.ts

@@ -18,6 +18,13 @@ import { CodeCompletionMessage } from '@/views/panel/types/messages'
 import { apply_reasoning_effort } from '@/utils/apply-reasoning-effort'
 import { dictionary } from '@shared/constants/dictionary'
 import { randomUUID } from 'crypto'
+import { replace_selection_placeholder } from '../utils/replace-selection-symbol'
+import {
+  replace_changes_symbol,
+  replace_commit_symbol,
+  replace_context_at_commit_symbol
+} from '../utils/replace-git-symbols'
+import { replace_saved_context_placeholder } from '@/utils/replace-saved-context-placeholder'
 
 const get_code_completion_config = async (
   api_providers_manager: ModelProvidersManager,
@@ -262,7 +269,7 @@ export const handle_code_completion = async (
   const api_providers_manager = new ModelProvidersManager(
     panel_provider.context
   )
-  const completion_instructions = panel_provider.code_completion_instructions
+  const completion_instructions = panel_provider.code_at_cursor_instructions
 
   const config_result = await get_code_completion_config(
     api_providers_manager,
@@ -344,6 +351,43 @@ export const handle_code_completion = async (
       position.character
     )
 
+    let processed_completion_instructions = completion_instructions
+
+    if (processed_completion_instructions.includes('#Selection')) {
+      processed_completion_instructions = replace_selection_placeholder(
+        processed_completion_instructions
+      )
+    }
+
+    if (processed_completion_instructions.includes('#Changes:')) {
+      processed_completion_instructions = await replace_changes_symbol({
+        instruction: processed_completion_instructions
+      })
+    }
+
+    if (processed_completion_instructions.includes('#Commit:')) {
+      processed_completion_instructions = await replace_commit_symbol({
+        instruction: processed_completion_instructions
+      })
+    }
+
+    if (processed_completion_instructions.includes('#ContextAtCommit:')) {
+      processed_completion_instructions =
+        await replace_context_at_commit_symbol({
+          instruction: processed_completion_instructions,
+          workspace_provider: panel_provider.workspace_provider
+        })
+    }
+
+    if (processed_completion_instructions.includes('#SavedContext:')) {
+      processed_completion_instructions =
+        await replace_saved_context_placeholder({
+          instruction: processed_completion_instructions,
+          context: panel_provider.context,
+          workspace_provider: panel_provider.workspace_provider
+        })
+    }
+
     const files_collector = new FilesCollector(
       panel_provider.workspace_provider,
       panel_provider.open_editors_provider
@@ -359,8 +403,8 @@ export const handle_code_completion = async (
     }
 
     const content = `${main_instructions}\n${payload.before}${
-      completion_instructions
-        ? `<missing_text>${completion_instructions}</missing_text>`
+      processed_completion_instructions
+        ? `<missing_text>${processed_completion_instructions}</missing_text>`
         : '<missing_text>'
     }${payload.after}\n${main_instructions}`
 
@@ -405,7 +449,7 @@ export const handle_code_completion = async (
               'codeWebChat.applyChatResponse',
               {
                 response: result.response,
-                raw_instructions: completion_instructions,
+                raw_instructions: processed_completion_instructions,
                 original_editor_state: {
                   file_path: document.uri.fsPath,
                   position: {

packages/vscode/src/views/panel/backend/message-handlers/handle-copy-prompt.ts

@@ -86,8 +86,46 @@ export const handle_copy_prompt = async (params: {
       position.line,
       position.character
     )
-    const missing_text_tag = final_instruction
-      ? `<missing_text>${final_instruction}</missing_text>`
+
+    let processed_completion_instructions = final_instruction
+
+    if (processed_completion_instructions.includes('#Selection')) {
+      processed_completion_instructions = replace_selection_placeholder(
+        processed_completion_instructions
+      )
+    }
+
+    if (processed_completion_instructions.includes('#Changes:')) {
+      processed_completion_instructions = await replace_changes_symbol({
+        instruction: processed_completion_instructions
+      })
+    }
+
+    if (processed_completion_instructions.includes('#Commit:')) {
+      processed_completion_instructions = await replace_commit_symbol({
+        instruction: processed_completion_instructions
+      })
+    }
+
+    if (processed_completion_instructions.includes('#ContextAtCommit:')) {
+      processed_completion_instructions =
+        await replace_context_at_commit_symbol({
+          instruction: processed_completion_instructions,
+          workspace_provider: params.panel_provider.workspace_provider
+        })
+    }
+
+    if (processed_completion_instructions.includes('#SavedContext:')) {
+      processed_completion_instructions =
+        await replace_saved_context_placeholder({
+          instruction: processed_completion_instructions,
+          context: params.panel_provider.context,
+          workspace_provider: params.panel_provider.workspace_provider
+        })
+    }
+
+    const missing_text_tag = processed_completion_instructions
+      ? `<missing_text>${processed_completion_instructions}</missing_text>`
       : '<missing_text>'
 
     const text = `${system_instructions}\n<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${system_instructions}`

packages/vscode/src/views/panel/backend/message-handlers/handle-edit-context.ts

@@ -289,7 +289,7 @@ export const handle_edit_context = async (
     panel_provider.open_editors_provider
   )
 
-  let instructions = panel_provider.edit_instructions
+  let instructions = panel_provider.edit_context_instructions
 
   if (!instructions) {
     vscode.window.showWarningMessage(

packages/vscode/src/views/panel/backend/message-handlers/handle-get-instructions.ts

@@ -5,10 +5,10 @@ export const handle_get_instructions = (
 ): void => {
   panel_provider.send_message({
     command: 'INSTRUCTIONS',
-    ask: panel_provider.ask_instructions,
-    edit_context: panel_provider.edit_instructions,
+    ask: panel_provider.ask_about_context_instructions,
+    edit_context: panel_provider.edit_context_instructions,
     no_context: panel_provider.no_context_instructions,
-    code_completions: panel_provider.code_completion_instructions,
+    code_completions: panel_provider.code_at_cursor_instructions,
     prune_context: panel_provider.prune_context_instructions
   })
 }