Extract prompt payload building logic into a shared utility function and refactor handlers

- make sure other files/recent files are properly passed to the prompt builder
- in `apps/editor/src/views/prompt/backend/message-handlers/utils` place util abstracting the use of FilesCollector.collect_files across handlers (to remove code repetition)
- [Pasted text]

└── apps
    └── editor
        └── src
            ├── commands
            │   ├── code-at-cursor-command
            │   │   └── utils
            │   │       └── perform-code-at-cursor.ts
            │   └── copy-markdown-command.ts
            └── views
                └── prompt
                    └── backend
                        └── message-handlers
                            ├── handle-autofill.ts
                            ├── handle-copy-prompt.ts
                            ├── handle-make-api-call.ts
                            └── handle-preview-web-configuration.ts

Author: robertpiosik

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

@@ -13,14 +13,16 @@ export const copy_markdown_commands = (
 ) => {
   return [
     vscode.commands.registerCommand('codeWebChat.copyMarkdown', async () => {
-      let context_text = ''
+      let other_files = ''
+      let recent_files = ''
 
       try {
         const collected = await FilesCollector.collect_files({
           workspace_provider,
           open_editors_provider
         })
-        context_text = collected.other_files + collected.recent_files
+        other_files = collected.other_files
+        recent_files = collected.recent_files
       } catch (error: any) {
         console.error('Error collecting files:', error)
         vscode.window.showErrorMessage(
@@ -31,14 +33,17 @@ export const copy_markdown_commands = (
         return
       }
 
-      if (context_text == '') {
+      if (!other_files && !recent_files) {
         vscode.window.showWarningMessage(t('common.warning.no-files-selected'))
         return
       }
 
-      context_text =
-        PromptBuilder.build_prompt({ context_text, separator: true })
-          .full_prompt + '\n'
+      const context_text =
+        PromptBuilder.build_prompt({
+          other_files,
+          recent_files,
+          separator: true
+        }).full_prompt + '\n'
       await vscode.env.clipboard.writeText(context_text)
       vscode.window.showInformationMessage(
         t('command.copy-markdown.info.context-copied')
@@ -118,8 +123,10 @@ export const copy_markdown_commands = (
         if (context_text == '') return
 
         context_text =
-          PromptBuilder.build_prompt({ context_text, separator: true })
-            .full_prompt + '\n'
+          PromptBuilder.build_prompt({
+            other_files: context_text,
+            separator: true
+          }).full_prompt + '\n'
         await vscode.env.clipboard.writeText(context_text)
         vscode.window.showInformationMessage(
           t('command.copy-markdown.info.context-from-editors-copied')

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

@@ -1,6 +1,6 @@
 import { PromptViewProvider } from '@/views/prompt/backend/prompt-view-provider'
 import * as vscode from 'vscode'
-import { FilesCollector } from '@/utils/files-collector'
+import { build_prompt_payload } from './utils/build-prompt-payload'
 import { get_last_used_web_configuration_key } from '@/constants/state-keys'
 import { ConfigWebConfigurationFormat } from '@/utils/web-configuration-format-converters'
 import { MODE } from '@shared/types/mode'
@@ -14,7 +14,6 @@ import {
   EDIT_FORMAT_INSTRUCTIONS_DIFF
 } from '@/constants/edit-format-instructions'
 import { handle_update_last_used_web_configuration } from './handle-update-last-used-web-configuration'
-import { replace_symbols } from '@/views/prompt/backend/utils/symbols/replace-symbols'
 import { show_configuration_quick_pick } from '@/utils/show-configuration-quick-pick'
 import { PromptBuilder } from '@/utils/prompt-builder'
 
@@ -56,27 +55,17 @@ export const handle_autofill = async (params: {
 
   let sent = false
 
-  const additional_paths: string[] = []
-
-  let context_text = ''
-  if (params.prompt_view_provider.include_selected_files) {
-    const collected = await FilesCollector.collect_files({
-      workspace_provider: params.prompt_view_provider.workspace_provider,
-      open_editors_provider: params.prompt_view_provider.open_editors_provider,
-      additional_paths
-    })
-    context_text = collected.other_files + collected.recent_files
-  }
-
   const current_instructions = params.prompt_view_provider.current_instructions
 
-  const { instructions: processed_instructions, skill_definitions } =
-    await replace_symbols({
-      instructions: current_instructions,
-      extension_context: params.prompt_view_provider.extension_context,
-      workspace_provider: params.prompt_view_provider.workspace_provider,
-      remove_images: true
-    })
+  const {
+    other_files,
+    recent_files,
+    processed_instructions,
+    skill_definitions
+  } = await build_prompt_payload({
+    prompt_view_provider: params.prompt_view_provider,
+    remove_images: true
+  })
 
   let formatted_system_instructions = ''
   const user_instructions = processed_instructions
@@ -93,7 +82,8 @@ export const handle_autofill = async (params: {
   }
 
   const { full_prompt: text } = PromptBuilder.build_prompt({
-    context_text,
+    other_files,
+    recent_files,
     skill_definitions,
     system_instructions: formatted_system_instructions,
     user_instructions,

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

@@ -1,37 +1,27 @@
 import { PromptViewProvider } from '@/views/prompt/backend/prompt-view-provider'
 import * as vscode from 'vscode'
-import { FilesCollector } from '@/utils/files-collector'
+import { build_prompt_payload } from './utils/build-prompt-payload'
 import {
   EDIT_FORMAT_INSTRUCTIONS_WHOLE,
   EDIT_FORMAT_INSTRUCTIONS_TRUNCATED,
   EDIT_FORMAT_INSTRUCTIONS_SEARCH_REPLACE,
   EDIT_FORMAT_INSTRUCTIONS_DIFF
 } from '@/constants/edit-format-instructions'
-import { replace_symbols } from '@/views/prompt/backend/utils/symbols/replace-symbols'
 import { PromptBuilder } from '@/utils/prompt-builder'
 import { t } from '@/i18n'
 
 export const handle_copy_prompt = async (params: {
   prompt_view_provider: PromptViewProvider
 }): Promise<void> => {
-  let context_text = ''
-  if (params.prompt_view_provider.include_selected_files) {
-    const collected = await FilesCollector.collect_files({
-      workspace_provider: params.prompt_view_provider.workspace_provider,
-      open_editors_provider: params.prompt_view_provider.open_editors_provider
-    })
-    context_text = collected.other_files + collected.recent_files
-  }
-
-  const current_instructions = params.prompt_view_provider.current_instructions
-
-  const { instructions: processed_instructions, skill_definitions } =
-    await replace_symbols({
-      instructions: current_instructions,
-      extension_context: params.prompt_view_provider.extension_context,
-      workspace_provider: params.prompt_view_provider.workspace_provider,
-      remove_images: true
-    })
+  const {
+    other_files,
+    recent_files,
+    processed_instructions,
+    skill_definitions
+  } = await build_prompt_payload({
+    prompt_view_provider: params.prompt_view_provider,
+    remove_images: true
+  })
 
   let formatted_system_instructions = ''
   const user_instructions = processed_instructions
@@ -50,7 +40,8 @@ export const handle_copy_prompt = async (params: {
   }
 
   const { full_prompt: text } = PromptBuilder.build_prompt({
-    context_text,
+    other_files,
+    recent_files,
     skill_definitions,
     system_instructions: formatted_system_instructions,
     user_instructions,

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

@@ -1,6 +1,6 @@
 import * as vscode from 'vscode'
 import { t } from '@/i18n'
-import { FilesCollector } from '@/utils/files-collector'
+import { build_prompt_payload } from './utils/build-prompt-payload'
 import { Logger } from '@shared/utils/logger'
 import {
   ModelProvidersManager,
@@ -17,7 +17,6 @@ import { MakeApiCallMessage } from '@/views/prompt/types/messages'
 import { dictionary } from '@shared/constants/dictionary'
 import { default_system_instructions } from '@shared/constants/default-system-instructions'
 import { build_user_content } from '@/utils/build-user-content'
-import { replace_symbols } from '@/views/prompt/backend/utils/symbols/replace-symbols'
 import {
   show_configuration_quick_pick,
   map_api_configuration_to_item
@@ -166,26 +165,15 @@ export const handle_make_api_call = async (
     return
   }
 
-  const { instructions: processed_instructions, skill_definitions } =
-    await replace_symbols({
-      instructions: current_instructions,
-      extension_context: prompt_view_provider.extension_context,
-      workspace_provider: prompt_view_provider.workspace_provider
-    })
-
-  let collected_files = ''
-  let other_files = ''
-  let recent_files = ''
-
-  if (prompt_view_provider.include_selected_files) {
-    const collected = await FilesCollector.collect_files({
-      workspace_provider: prompt_view_provider.workspace_provider,
-      open_editors_provider: prompt_view_provider.open_editors_provider
-    })
-    other_files = collected.other_files
-    recent_files = collected.recent_files
-    collected_files = other_files + recent_files
-  }
+  const {
+    other_files,
+    recent_files,
+    collected_files,
+    processed_instructions,
+    skill_definitions
+  } = await build_prompt_payload({
+    prompt_view_provider
+  })
 
   if (prompt_view_provider.include_selected_files && !collected_files) {
     prompt_view_provider.send_message({

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

@@ -1,15 +1,14 @@
 import * as vscode from 'vscode'
 import { PromptViewProvider } from '@/views/prompt/backend/prompt-view-provider'
 import { PreviewWebConfigurationMessage } from '@/views/prompt/types/messages'
-import { FilesCollector } from '@/utils/files-collector'
+import { build_prompt_payload } from './utils/build-prompt-payload'
 import { WebConfiguration } from '@shared/types/web-configuration'
 import {
   EDIT_FORMAT_INSTRUCTIONS_WHOLE,
   EDIT_FORMAT_INSTRUCTIONS_TRUNCATED,
   EDIT_FORMAT_INSTRUCTIONS_SEARCH_REPLACE,
   EDIT_FORMAT_INSTRUCTIONS_DIFF
 } from '@/constants/edit-format-instructions'
-import { replace_symbols } from '@/views/prompt/backend/utils/symbols/replace-symbols'
 import { PromptBuilder } from '@/utils/prompt-builder'
 
 export const handle_preview_web_configuration = async (
@@ -20,22 +19,15 @@ export const handle_preview_web_configuration = async (
 
   const current_instructions = prompt_view_provider.current_instructions
 
-  let context_text = ''
-  if (prompt_view_provider.include_selected_files) {
-    const collected = await FilesCollector.collect_files({
-      workspace_provider: prompt_view_provider.workspace_provider,
-      open_editors_provider: prompt_view_provider.open_editors_provider
-    })
-    context_text = collected.other_files + collected.recent_files
-  }
-
-  const { instructions: processed_instructions, skill_definitions } =
-    await replace_symbols({
-      instructions: current_instructions,
-      extension_context: prompt_view_provider.extension_context,
-      workspace_provider: prompt_view_provider.workspace_provider,
-      remove_images: true
-    })
+  const {
+    other_files,
+    recent_files,
+    processed_instructions,
+    skill_definitions
+  } = await build_prompt_payload({
+    prompt_view_provider,
+    remove_images: true
+  })
 
   let formatted_system_instructions = ''
   const user_instructions = processed_instructions
@@ -52,7 +44,8 @@ export const handle_preview_web_configuration = async (
   }
 
   const { full_prompt: built_prompt } = PromptBuilder.build_prompt({
-    context_text,
+    other_files,
+    recent_files,
     skill_definitions,
     system_instructions: formatted_system_instructions,
     user_instructions,

apps/editor/src/views/prompt/backend/message-handlers/utils/build-prompt-payload.ts

@@ -0,0 +1,45 @@
+import { PromptViewProvider } from '@/views/prompt/backend/prompt-view-provider'
+import { FilesCollector } from '@/utils/files-collector'
+import { replace_symbols } from '@/views/prompt/backend/utils/symbols/replace-symbols'
+
+export const build_prompt_payload = async (params: {
+  prompt_view_provider: PromptViewProvider
+  remove_images?: boolean
+}): Promise<{
+  other_files: string
+  recent_files: string
+  collected_files: string
+  processed_instructions: string
+  skill_definitions: string
+}> => {
+  const { prompt_view_provider, remove_images } = params
+  let other_files = ''
+  let recent_files = ''
+  let collected_files = ''
+
+  if (prompt_view_provider.include_selected_files) {
+    const collected = await FilesCollector.collect_files({
+      workspace_provider: prompt_view_provider.workspace_provider,
+      open_editors_provider: prompt_view_provider.open_editors_provider
+    })
+    other_files = collected.other_files
+    recent_files = collected.recent_files
+    collected_files = other_files + recent_files
+  }
+
+  const { instructions: processed_instructions, skill_definitions } =
+    await replace_symbols({
+      instructions: prompt_view_provider.current_instructions || '',
+      extension_context: prompt_view_provider.extension_context,
+      workspace_provider: prompt_view_provider.workspace_provider,
+      remove_images
+    })
+
+  return {
+    other_files,
+    recent_files,
+    collected_files,
+    processed_instructions,
+    skill_definitions
+  }
+}