Refactor relevant file search prompt construction to separate system formatting from user instructions and update instruction text

- the checkpionts quick pick should not use relative time

Author: robertpiosik

apps/editor/src/commands/search-files-command/utils/fetch-relevant-files-from-api.ts

@@ -26,8 +26,7 @@ export const fetch_relevant_files_from_api = async (
   }
   xml_files += `</files>`
 
-  const system_instructions_xml = `${find_relevant_files_format}\n${find_relevant_files_instructions}`
-  const part2 = `${system_instructions_xml}\n${instructions}`
+  const part2 = `${find_relevant_files_format}\n\n${find_relevant_files_instructions}\n\n${instructions}`
   const user_content = build_user_content({
     model_provider,
     part1: xml_files,

apps/editor/src/constants/instructions.ts

@@ -33,7 +33,7 @@ export const commit_message_instructions =
   "Write a brief and precise summary for the changes, limited to a single sentence. Because the summary will be used for a commit message, don't use any markdown formatting and don't include a trailing dot. Use an imperative tone to ensure clarity and focus on the primary change or purpose."
 
 export const find_relevant_files_instructions =
-  'Find a complete set of relevant files according to the following query:'
+  'Find a complete set of files relevant to the following query (include the primary files as well as any structural files):'
 
 export const find_relevant_files_format = `# System
 

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

@@ -125,6 +125,7 @@ export const handle_copy_prompt = async (params: {
       })
 
     let formatted_system_instructions = ''
+    let user_instructions = processed_instructions
 
     if (params.panel_provider.web_prompt_type == 'edit-files') {
       const edit_format =
@@ -150,14 +151,15 @@ export const handle_copy_prompt = async (params: {
         formatted_system_instructions = `# System\n\n${edit_format_instructions}`
       }
     } else if (is_in_find_relevant_files_prompt_type) {
-      formatted_system_instructions = `${find_relevant_files_format_for_panel}\n\n${find_relevant_files_instructions}`
+      formatted_system_instructions = find_relevant_files_format_for_panel
+      user_instructions = `${find_relevant_files_instructions}\n\n${processed_instructions}`
     }
 
     const { full_prompt: text } = PromptBuilder.build_prompt({
       context_text,
       skill_definitions,
       system_instructions: formatted_system_instructions,
-      user_instructions: processed_instructions
+      user_instructions
     })
 
     vscode.env.clipboard.writeText(text.trim())

apps/editor/src/views/panel/backend/message-handlers/handle-find-relevant-files.ts

@@ -216,14 +216,12 @@ export const handle_find_relevant_files = async (
 
     const endpoint_url = model_provider.base_url
 
-    const formatted_system_instructions = `${find_relevant_files_format_for_panel}\n\n${find_relevant_files_instructions}`
-
     const { part1, part2 } = PromptBuilder.build_prompt({
       other_files: collected.other_files,
       recent_files: collected.recent_files,
       skill_definitions,
-      system_instructions: formatted_system_instructions,
-      user_instructions: processed_instructions
+      system_instructions: find_relevant_files_format_for_panel,
+      user_instructions: `${find_relevant_files_instructions}\n\n${processed_instructions}`
     })
 
     const user_content = build_user_content({

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

@@ -161,6 +161,7 @@ export const handle_send_to_browser = async (params: {
       })
 
     let formatted_system_instructions = ''
+    let user_instructions = processed_instructions
     if (params.panel_provider.web_prompt_type == 'edit-files') {
       const config = vscode.workspace.getConfiguration('codeWebChat')
       const instructions_key = {
@@ -181,14 +182,15 @@ export const handle_send_to_browser = async (params: {
         formatted_system_instructions = `# System\n\n${edit_format_instructions}`
       }
     } else if (params.panel_provider.web_prompt_type == 'find-relevant-files') {
-      formatted_system_instructions = `${find_relevant_files_format_for_panel}\n\n${find_relevant_files_instructions}`
+      formatted_system_instructions = find_relevant_files_format_for_panel
+      user_instructions = `${find_relevant_files_instructions}\n\n${processed_instructions}`
     }
 
     const { full_prompt: text } = PromptBuilder.build_prompt({
       context_text,
       skill_definitions,
       system_instructions: formatted_system_instructions,
-      user_instructions: processed_instructions
+      user_instructions
     })
 
     sent =