Refactor prompt builder API and Code at Cursor instruction handling, update callers, and add file exclusion support

- should use prompt builder instead of `apps/editor/src/views/prompt/backend/message-handlers/utils/build-cli-prompt.ts`
- assess param names of PromptBuilder.build_prompt, change if needed
- remove separator param, always add it. For code at cursor, adjust instructions so it '# Task' appears above 'Find correct...', but above 'Your response must begin...' we place '# Output formatting' heading
- in 'code at cursor' current file is repeated (when in context)
- in 'code at cursor' if context is empty, there is too much space below '# Files' and the current file with cursor

└── apps
    └── editor
        └── src
            ├── commands
            │   ├── code-at-cursor-command
            │   │   └── utils
            │   │       └── perform-code-at-cursor.ts
            │   ├── copy-markdown-command.ts
            │   └── generate-commit-message-commands
            │       └── utils
            │           └── build-commit-message-prompt.ts
            ├── constants
            │   ├── edit-format-instructions.ts
            │   └── instructions.ts
            ├── utils
            │   ├── agentic-cli-invocation
            │   │   └── invoke-agentic-cli.ts
            │   ├── files-collector.ts
            │   ├── git-repository-utils.ts
            │   └── prompt-builder.ts
            └── views
                └── prompt
                    └── backend
                        └── message-handlers
                            ├── handle-autofill.ts
                            ├── handle-copy-prompt.ts
                            ├── handle-get-edit-format-instructions.ts
                            ├── handle-invoke-agentic-cli.ts
                            ├── handle-make-api-call.ts
                            ├── handle-preview-prompt.ts
                            ├── handle-preview-web-configuration.ts
                            └── utils
                                ├── build-cli-prompt.ts
                                └── build-prompt-payload.ts

Author: robertpiosik

apps/editor/src/commands/code-at-cursor-command/utils/perform-code-at-cursor.ts

@@ -4,7 +4,8 @@ import axios from 'axios'
 import he from 'he'
 import { send_llm_message } from '../../../utils/send-llm-message'
 import {
-  code_at_cursor_instructions,
+  code_at_cursor_system_instructions,
+  code_at_cursor_user_instructions,
   code_at_cursor_instructions_for_chatbots
 } from '../../../constants/instructions'
 import { FilesCollector } from '../../../utils/files-collector'
@@ -225,12 +226,14 @@ export const perform_code_at_cursor = async (params: {
   )
 
   const active_file_path = vscode.workspace.asRelativePath(document.uri)
+  const active_file_path_fs = document.uri.fsPath
   const row = position.line
   const column = position.character
 
   const collected = await FilesCollector.collect_files({
     workspace_provider: params.workspace_provider,
-    open_editors_provider: params.open_editors_provider
+    open_editors_provider: params.open_editors_provider,
+    exclude_paths: [active_file_path_fs]
   })
 
   if (action == 'copy' || action == 'autofill') {
@@ -240,9 +243,9 @@ export const perform_code_at_cursor = async (params: {
       column
     })
 
-    const { part1, part2 } = PromptBuilder.build_prompt({
-      other_files: collected.other_files,
-      recent_files: collected.recent_files,
+    const { full_prompt: chatbot_prompt } = PromptBuilder.build_prompt({
+      files_context_part1: collected.other_files,
+      files_context_part2: collected.recent_files,
       active_file: {
         filepath: active_file_path,
         content: `${text_before_cursor}${
@@ -251,11 +254,10 @@ export const perform_code_at_cursor = async (params: {
             : '<missing_text>'
         }${text_after_cursor}`
       },
-      system_instructions: chatbot_instructions
+      system_instructions: chatbot_instructions,
+      user_instructions: code_at_cursor_user_instructions
     })
 
-    const chatbot_prompt = `${part1}\n\n${part2}`
-
     if (action === 'copy') {
       await vscode.env.clipboard.writeText(chatbot_prompt)
       vscode.window.showInformationMessage(
@@ -379,8 +381,8 @@ export const perform_code_at_cursor = async (params: {
     const abort_controller = new AbortController()
 
     const { part1, part2 } = PromptBuilder.build_prompt({
-      other_files: collected.other_files,
-      recent_files: collected.recent_files,
+      files_context_part1: collected.other_files,
+      files_context_part2: collected.recent_files,
       active_file: {
         filepath: active_file_path,
         content: `${text_before_cursor}${
@@ -389,7 +391,8 @@ export const perform_code_at_cursor = async (params: {
             : '<missing_text>'
         }${text_after_cursor}`
       },
-      system_instructions: code_at_cursor_instructions
+      system_instructions: code_at_cursor_system_instructions,
+      user_instructions: code_at_cursor_user_instructions
     })
 
     const user_content = build_user_content({
@@ -496,7 +499,6 @@ export const perform_code_at_cursor = async (params: {
 
           decoded_completion = decoded_completion.trim()
 
-          const active_file_path_fs = document.uri.fsPath
           const workspace_root =
             params.workspace_provider.get_workspace_root_for_file(
               active_file_path_fs

apps/editor/src/commands/copy-markdown-command.ts

@@ -41,9 +41,8 @@ export const copy_markdown_commands = (
 
       const context_text =
         PromptBuilder.build_prompt({
-          other_files,
-          recent_files,
-          separator: true
+          files_context_part1: other_files,
+          files_context_part2: recent_files,
         }).full_prompt + '\n'
       await vscode.env.clipboard.writeText(context_text)
       vscode.window.showInformationMessage(
@@ -125,8 +124,7 @@ export const copy_markdown_commands = (
 
         context_text =
           PromptBuilder.build_prompt({
-            other_files: context_text,
-            separator: true
+            files_context: context_text,
           }).full_prompt + '\n'
         await vscode.env.clipboard.writeText(context_text)
         vscode.window.showInformationMessage(

apps/editor/src/constants/instructions.ts

@@ -1,11 +1,14 @@
-export const code_at_cursor_instructions =
-  'Find correct replacement for the <missing_text> symbol. Respond with replacement text within "replacement" XML tags, without explanations or any other text.\nExample:\n<replacement>!== undefined</replacement>'
+export const code_at_cursor_system_instructions =
+  '# Output formatting\n\nRespond with replacement text within "replacement" XML tags, without explanations or any other text.\nExample:\n<replacement>!== undefined</replacement>'
+
+export const code_at_cursor_user_instructions =
+  'Find correct replacement text for the <missing_text> symbol.'
 
 export const code_at_cursor_instructions_for_chatbots = (params: {
   file_path: string
   row: number
   column: number
-}) => `Your response must begin with a markdown heading identifying the file and the cursor position, followed by a markdown code block containing the replacement text, followed by a brief explanation. The heading must be: "### Code at cursor: \`${
+}) => `# Output formatting\n\nYour response must begin with a markdown heading identifying the file and the cursor position, followed by a markdown code block containing the replacement text, followed by a brief explanation. The heading must be: "### Code at cursor: \`${
   params.file_path
 }\` (${params.row + 1}:${
   params.column + 1
@@ -17,11 +20,7 @@ export const code_at_cursor_instructions_for_chatbots = (params: {
 !== undefined
 \`\`\`
 
-The variable is possibly not defined.
-
----
-
-Find correct replacement text for the <missing_text> symbol.`
+The variable is possibly not defined.`
 
 export const patch_repair_task_instructions =
   'Apply the attached changes to the file without explanations or any other text.'

apps/editor/src/utils/files-collector.ts

@@ -12,6 +12,7 @@ export namespace FilesCollector {
     workspace_provider: WorkspaceProvider
     open_editors_provider?: OpenEditorsProvider
     additional_paths?: string[]
+    exclude_paths?: string[]
     shrink?: boolean
   }): Promise<{ other_files: string; recent_files: string }> => {
     const workspace_roots = params.workspace_provider.get_workspace_roots()
@@ -33,7 +34,9 @@ export namespace FilesCollector {
       ...additional_paths
     )
 
-    const context_files = [...new Set(context_files_list)]
+    const context_files = [...new Set(context_files_list)].filter(
+      (p) => !(params.exclude_paths ?? []).includes(p)
+    )
 
     // Sort context files based on modification time and selection timestamp
     const { other_files: other_paths, recent_files: recent_paths } =

apps/editor/src/utils/prompt-builder.ts

@@ -60,14 +60,13 @@ export namespace PromptBuilder {
   }
 
   export const build_prompt = (params: {
-    other_files?: string
-    recent_files?: string
-    context_text?: string
+    files_context_part1?: string
+    files_context_part2?: string
+    files_context?: string
     active_file?: { filepath: string; content: string }
     skill_definitions?: string
     system_instructions?: string
     user_instructions?: string
-    separator?: boolean
   }): { part1: string; part2: string; full_prompt: string } => {
     let part1 = ''
     let part2 = ''
@@ -78,25 +77,29 @@ export namespace PromptBuilder {
       active_file_context = build_file_context(params.active_file)
     }
 
-    if (params.context_text !== undefined) {
-      if (params.context_text || active_file_context) {
+    if (params.files_context !== undefined) {
+      if (params.files_context || active_file_context) {
         full_prompt += `# Files\n\n`
-        if (params.context_text) {
-          full_prompt += params.context_text
+        if (params.files_context) {
+          full_prompt += params.files_context
         }
         if (active_file_context) {
           full_prompt += active_file_context
         }
       }
     } else {
       const has_files = !!(
-        params.other_files ||
-        params.recent_files ||
+        params.files_context_part1 ||
+        params.files_context_part2 ||
         active_file_context
       )
       if (has_files) {
-        part1 = `# Files\n\n${params.other_files || ''}`
-        part2 += `${params.recent_files || ''}${active_file_context}`
+        if (params.files_context_part1) {
+          part1 = `# Files\n\n${params.files_context_part1}`
+          part2 += `${params.files_context_part2 || ''}${active_file_context}`
+        } else {
+          part2 += `# Files\n\n${params.files_context_part2 || ''}${active_file_context}`
+        }
         full_prompt = part1 + part2
       }
     }
@@ -115,8 +118,7 @@ export namespace PromptBuilder {
     }
 
     if (
-      params.separator &&
-      (part1.length > 0 || part2.length > 0 || full_prompt.length > 0)
+      part1.length > 0 || part2.length > 0 || full_prompt.length > 0
     ) {
       part2 = part2.trimEnd() + '\n\n# Task\n\n'
       full_prompt = full_prompt.trimEnd() + '\n\n# Task\n\n'

apps/editor/src/views/prompt/backend/message-handlers/handle-autofill.ts

@@ -93,12 +93,11 @@ export const handle_autofill = async (params: {
   }
 
   const { full_prompt: text } = PromptBuilder.build_prompt({
-    other_files,
-    recent_files,
+    files_context_part1: other_files,
+    files_context_part2: recent_files,
     skill_definitions,
     system_instructions: formatted_system_instructions,
     user_instructions,
-    separator: true
   })
 
   const prompt_type = params.prompt_view_provider.web_prompt_type

apps/editor/src/views/prompt/backend/message-handlers/handle-copy-prompt.ts

@@ -43,12 +43,11 @@ export const handle_copy_prompt = async (params: {
   }
 
   const build_result = PromptBuilder.build_prompt({
-    other_files,
-    recent_files,
+    files_context_part1: other_files,
+    files_context_part2: recent_files,
     skill_definitions,
     system_instructions: formatted_system_instructions,
     user_instructions,
-    separator: true
   })
   text = build_result.full_prompt
 

apps/editor/src/views/prompt/backend/message-handlers/handle-make-api-call.ts

@@ -108,12 +108,11 @@ export const handle_make_api_call = async (
         ''
 
       const { part1, part2 } = PromptBuilder.build_prompt({
-        other_files,
-        recent_files,
+      files_context_part1: other_files,
+      files_context_part2: recent_files,
         skill_definitions,
         system_instructions: formatted_system_instructions,
         user_instructions: processed_instructions,
-        separator: true
       })
       user_content = build_user_content({
         provider,

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

@@ -67,12 +67,11 @@ export const handle_preview_prompt = async (params: {
     }
 
     const build_result = PromptBuilder.build_prompt({
-      other_files,
-      recent_files,
+      files_context_part1: other_files,
+      files_context_part2: recent_files,
       skill_definitions,
       system_instructions: formatted_system_instructions,
       user_instructions,
-      separator: true
     })
     text = build_result.full_prompt
   }

apps/editor/src/views/prompt/backend/message-handlers/handle-preview-web-configuration.ts

@@ -45,12 +45,11 @@ export const handle_preview_web_configuration = async (
   }
 
   const { full_prompt: built_prompt } = PromptBuilder.build_prompt({
-    other_files,
-    recent_files,
+    files_context_part1: other_files,
+    files_context_part2: recent_files,
     skill_definitions,
     system_instructions: formatted_system_instructions,
     user_instructions,
-    separator: true
   })
   const text_to_send = built_prompt