Refactor symbol replacement functions to accept instruction arrays instead of single strings

- Refactor `replace_symbols` and its underlying symbol replacement utilities to accept `instructions: string[]` instead of a single string, using a shared Set or the existing cache object to deduplicate definitions across the entire array, and update `build-prompt-payload.ts` and `build-cli-prompt.ts` to pass arrays instead of joining strings with a delimiter.

└── apps
    └── editor
        └── src
            ├── features
            │   └── agentic-search
            │       └── agentic-search.ts
            └── views
                └── prompt
                    └── backend
                        ├── message-handlers
                        │   ├── handle-autofill.ts
                        │   ├── handle-copy-prompt.ts
                        │   ├── handle-invoke-agentic-cli.ts
                        │   ├── handle-make-api-call.ts
                        │   ├── handle-preview-changes-symbol.ts
                        │   ├── handle-preview-commit-symbol.ts
                        │   ├── handle-preview-prompt.ts
                        │   ├── handle-preview-skill-symbol.ts
                        │   ├── handle-preview-web-configuration.ts
                        │   └── utils
                        │       ├── build-cli-prompt.ts
                        │       └── build-prompt-payload.ts
                        ├── prompt-view-provider.ts
                        └── utils
                            └── symbols
                                ├── fragment
                                │   └── replace-fragment-symbol.ts
                                ├── git
                                │   └── replace-git-symbols.ts
                                ├── image
                                │   └── replace-image-symbol.ts
                                ├── pasted-text
                                │   └── replace-pasted-text-symbol.ts
                                ├── replace-symbols.ts
                                ├── saved-context
                                │   └── replace-saved-context-symbol.ts
                                ├── skill
                                │   └── replace-skill-symbol.ts
                                ├── symbol-cache.ts
                                └── website
                                    └── replace-website-symbol.ts

Author: robertpiosik

apps/editor/src/features/agentic-search/agentic-search.ts

@@ -72,14 +72,16 @@ export const agentic_search = async (params: {
       default_agent_key: 'isDefaultForAgenticSearch',
       show_back_button: true,
       build_prompt: async () => {
-        const { instructions: processed_query, skill_definitions } =
+        const { instructions: processed_queries, skill_definitions } =
           await replace_symbols({
-            instructions: query,
+            instructions: [query],
             extension_context: params.extension_context,
             workspace_provider: params.workspace_provider,
             image_as_paths: true
           })
 
+        const processed_query = processed_queries[0]
+
         const final_query = skill_definitions
           ? `${processed_query}\n\n${skill_definitions}`
           : processed_query

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

@@ -8,7 +8,7 @@ export const handle_preview_changes_symbol = async (message: {
   try {
     const instruction = `#Changes(${message.branch_name})`
     const { changes_definitions } = await replace_changes_symbol({
-      instruction
+      instructions: [instruction]
     })
 
     if (changes_definitions) {

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

@@ -14,7 +14,7 @@ export const handle_preview_commit_symbol = async (message: {
       : ''
     const instruction = `#${message.type}(${message.repo_name}:${message.commit_hash}${message_escaped})`
     const { commit_definitions } = await replace_commit_symbol({
-      instruction
+      instructions: [instruction]
     })
 
     if (commit_definitions) {

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

@@ -10,7 +10,7 @@ export const handle_preview_skill_symbol = async (message: {
   try {
     const instruction = `#Skill(${message.agent}:${message.repo}:${message.skill_name})`
     const { skill_definitions } = await replace_skill_symbol({
-      instruction
+      instructions: [instruction]
     })
 
     if (skill_definitions) {

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

@@ -15,24 +15,22 @@ export const build_cli_prompt = async (params: {
 
   const current_instructions = prompt_view_provider.current_instructions.trim()
 
-  const delimiter = `__CWC_TASK_DELIMITER_${Math.random().toString(36).substring(2)}_${Date.now()}__`
-  const combined_instructions = [
+  const instructions_to_process = [
     current_instructions,
     ...prompt_view_provider.completed_tasks
-  ].join(delimiter)
+  ]
 
-  const { instructions: processed_combined, skill_definitions } =
+  const { instructions: processed_instructions_array, skill_definitions } =
     await replace_symbols({
-      instructions: combined_instructions,
+      instructions: instructions_to_process,
       extension_context: prompt_view_provider.extension_context,
       workspace_provider: prompt_view_provider.workspace_provider,
       image_as_paths: true,
       symbols_cache: prompt_view_provider.symbols_cache
     })
 
-  const split_processed = processed_combined.split(delimiter)
-  const processed_query = split_processed[0]
-  const processed_completed_tasks = split_processed.slice(1)
+  const processed_query = processed_instructions_array[0]
+  const processed_completed_tasks = processed_instructions_array.slice(1)
 
   const roots = prompt_view_provider.workspace_provider.get_workspace_roots()
 

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

@@ -26,24 +26,22 @@ export const build_prompt_payload = async (params: {
   recent_files = collected.recent_files
   collected_files = other_files + recent_files
 
-  const delimiter = `__CWC_TASK_DELIMITER_${Math.random().toString(36).substring(2)}_${Date.now()}__`
-  const combined_instructions = [
+  const instructions_to_process = [
     prompt_view_provider.current_instructions.trim() || '',
     ...prompt_view_provider.completed_tasks
-  ].join(delimiter)
+  ]
 
-  const { instructions: processed_combined, skill_definitions } =
+  const { instructions: processed_instructions_array, skill_definitions } =
     await replace_symbols({
-      instructions: combined_instructions,
+      instructions: instructions_to_process,
       extension_context: prompt_view_provider.extension_context,
       workspace_provider: prompt_view_provider.workspace_provider,
       remove_images,
       symbols_cache: prompt_view_provider.symbols_cache
     })
 
-  const split_processed = processed_combined.split(delimiter)
-  const processed_instructions = split_processed[0]
-  const processed_completed_tasks = split_processed.slice(1)
+  const processed_instructions = processed_instructions_array[0]
+  const processed_completed_tasks = processed_instructions_array.slice(1)
 
   return {
     other_files,

apps/editor/src/views/prompt/backend/prompt-view-provider.ts

@@ -562,14 +562,14 @@ export class PromptViewProvider implements vscode.WebviewViewProvider {
 
   public async send_token_count() {
     const edit_instructions_result = await replace_symbols({
-      instructions: this.current_edit_files_instruction.trim(),
+      instructions: [this.current_edit_files_instruction.trim()],
       extension_context: this.extension_context,
       workspace_provider: this.workspace_provider,
       remove_images: true,
       symbols_cache: this.symbols_cache
     })
     const ask_instructions_result = await replace_symbols({
-      instructions: this.current_ask_about_context_instruction.trim(),
+      instructions: [this.current_ask_about_context_instruction.trim()],
       extension_context: this.extension_context,
       workspace_provider: this.workspace_provider,
       remove_images: true,
@@ -580,12 +580,12 @@ export class PromptViewProvider implements vscode.WebviewViewProvider {
       command: 'TOKEN_COUNT_UPDATED',
       selected_files_token_count: this.current_selected_files_token_count,
       edit_instructions_token_count: Math.ceil(
-        (edit_instructions_result.instructions.length +
+        (edit_instructions_result.instructions[0].length +
           edit_instructions_result.skill_definitions.length) /
           4
       ),
       ask_instructions_token_count: Math.ceil(
-        (ask_instructions_result.instructions.length +
+        (ask_instructions_result.instructions[0].length +
           ask_instructions_result.skill_definitions.length) /
           4
       )

apps/editor/src/views/prompt/backend/utils/symbols/fragment/replace-fragment-symbol.ts

@@ -4,81 +4,85 @@ import * as vscode from 'vscode'
 import { WorkspaceProvider } from '@/context/providers/workspace/workspace-provider'
 
 export const replace_fragment_symbol = async (params: {
-  instruction: string
+  instructions: string[]
   workspace_provider: WorkspaceProvider
-}): Promise<string> => {
-  const regex = /#Fragment\((.+?):(\d+):(\d+)-(\d+):(\d+)\)/g
+}): Promise<string[]> => {
+  return Promise.all(
+    params.instructions.map(async (instruction) => {
+      const regex = /#Fragment\((.+?):(\d+):(\d+)-(\d+):(\d+)\)/g
 
-  const matches = [...params.instruction.matchAll(regex)]
-  if (matches.length === 0) return params.instruction
+      const matches = [...instruction.matchAll(regex)]
+      if (matches.length === 0) return instruction
 
-  let result = params.instruction
+      let result = instruction
 
-  for (const match of matches) {
-    const full_match = match[0]
-    const file_path = match[1]
-    const start_line = parseInt(match[2], 10)
-    const end_line = parseInt(match[4], 10)
+      for (const match of matches) {
+        const full_match = match[0]
+        const file_path = match[1]
+        const start_line = parseInt(match[2], 10)
+        const end_line = parseInt(match[4], 10)
 
-    let content = ''
-    try {
-      let absolute_path = file_path
-      if (!path.isAbsolute(file_path)) {
-        const roots = params.workspace_provider.get_workspace_roots()
-        for (const root of roots) {
-          const test_path = path.join(root, file_path)
-          if (fs.existsSync(test_path)) {
-            absolute_path = test_path
-            break
-          }
+        let content = ''
+        try {
+          let absolute_path = file_path
+          if (!path.isAbsolute(file_path)) {
+            const roots = params.workspace_provider.get_workspace_roots()
+            for (const root of roots) {
+              const test_path = path.join(root, file_path)
+              if (fs.existsSync(test_path)) {
+                absolute_path = test_path
+                break
+              }
 
-          if (roots.length > 1) {
-            const workspace_name =
-              params.workspace_provider.get_workspace_name(root)
-            const prefix = `${workspace_name}/`
-            const prefix_win = `${workspace_name}\\`
+              if (roots.length > 1) {
+                const workspace_name =
+                  params.workspace_provider.get_workspace_name(root)
+                const prefix = `${workspace_name}/`
+                const prefix_win = `${workspace_name}\\`
 
-            if (
-              file_path.startsWith(prefix) ||
-              file_path.startsWith(prefix_win)
-            ) {
-              const stripped_test_path = path.join(
-                root,
-                file_path.substring(prefix.length)
-              )
-              if (fs.existsSync(stripped_test_path)) {
-                absolute_path = stripped_test_path
-                break
+                if (
+                  file_path.startsWith(prefix) ||
+                  file_path.startsWith(prefix_win)
+                ) {
+                  const stripped_test_path = path.join(
+                    root,
+                    file_path.substring(prefix.length)
+                  )
+                  if (fs.existsSync(stripped_test_path)) {
+                    absolute_path = stripped_test_path
+                    break
+                  }
+                }
               }
             }
           }
-        }
-      }
 
-      const file_uri = vscode.Uri.file(absolute_path)
-      const document = await vscode.workspace.openTextDocument(file_uri)
+          const file_uri = vscode.Uri.file(absolute_path)
+          const document = await vscode.workspace.openTextDocument(file_uri)
 
-      const start_pos = new vscode.Position(
-        start_line - 1,
-        parseInt(match[3], 10) - 1
-      )
-      const end_pos = new vscode.Position(
-        end_line - 1,
-        parseInt(match[5], 10) - 1
-      )
-      const valid_range = document.validateRange(
-        new vscode.Range(start_pos, end_pos)
-      )
-      content = document.getText(valid_range)
-    } catch (e) {
-      content = `// Error reading file ${file_path}`
-    }
+          const start_pos = new vscode.Position(
+            start_line - 1,
+            parseInt(match[3], 10) - 1
+          )
+          const end_pos = new vscode.Position(
+            end_line - 1,
+            parseInt(match[5], 10) - 1
+          )
+          const valid_range = document.validateRange(
+            new vscode.Range(start_pos, end_pos)
+          )
+          content = document.getText(valid_range)
+        } catch (e) {
+          content = `// Error reading file ${file_path}`
+        }
 
-    const range_str = ` (${start_line}-${end_line})`
-    const replacement = `\n\n\`${file_path}\`${range_str}\n\n\`\`\`\n${content}\n\`\`\`\n\n`
+        const range_str = ` (${start_line}-${end_line})`
+        const replacement = `\n\n\`${file_path}\`${range_str}\n\n\`\`\`\n${content}\n\`\`\`\n\n`
 
-    result = result.replace(full_match, replacement)
-  }
+        result = result.replace(full_match, replacement)
+      }
 
-  return result
+      return result
+    })
+  )
 }