Simplify git symbol replacement by removing unused parameters and improving commit message parsing

Author: robertpiosik

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

@@ -111,14 +111,8 @@ export const handle_copy_prompt = async (params: {
     let processed_instructions = instructions
 
     if (processed_instructions.includes('#Changes:')) {
-      const is_no_context_web_mode =
-        params.panel_provider.mode == MODE.WEB &&
-        params.panel_provider.web_prompt_type == 'no-context'
-
       processed_instructions = await replace_changes_symbol({
-        instruction: processed_instructions,
-        workspace_provider: params.panel_provider.workspace_provider,
-        is_no_context_web_mode
+        instruction: processed_instructions
       })
     }
 
@@ -139,7 +133,7 @@ export const handle_copy_prompt = async (params: {
       processed_instructions = await replace_saved_context_placeholder({
         instruction: processed_instructions,
         context: params.panel_provider.context,
-        workspace_provider: params.panel_provider.workspace_provider,
+        workspace_provider: params.panel_provider.workspace_provider
       })
     }
 

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

@@ -258,8 +258,7 @@ const perform_context_editing = async (params: {
 
   if (processed_instructions.includes('#Changes:')) {
     processed_instructions = await replace_changes_symbol({
-      instruction: processed_instructions,
-      workspace_provider: params.file_tree_provider
+      instruction: processed_instructions
     })
   }
 

packages/vscode/src/views/panel/backend/message-handlers/handle-preview-preset.ts

@@ -11,7 +11,6 @@ import {
 } from '@/views/panel/backend/utils/replace-git-symbols'
 import { Preset } from '@shared/types/preset'
 import { apply_preset_affixes_to_instruction } from '@/utils/apply-preset-affixes'
-import { MODE } from '@/views/panel/types/main-view-mode'
 import { dictionary } from '@shared/constants/dictionary'
 import {
   EDIT_FORMAT_INSTRUCTIONS_WHOLE,
@@ -102,14 +101,8 @@ export const handle_preview_preset = async (
     let processed_instructions = instructions
 
     if (processed_instructions.includes('#Changes:')) {
-      const is_no_context_web_mode =
-        panel_provider.mode == MODE.WEB &&
-        panel_provider.web_prompt_type == 'no-context'
-
       processed_instructions = await replace_changes_symbol({
-        instruction: processed_instructions,
-        workspace_provider: panel_provider.workspace_provider,
-        is_no_context_web_mode
+        instruction: processed_instructions
       })
     }
 
@@ -130,7 +123,7 @@ export const handle_preview_preset = async (
       processed_instructions = await replace_saved_context_placeholder({
         instruction: processed_instructions,
         context: panel_provider.context,
-        workspace_provider: panel_provider.workspace_provider,
+        workspace_provider: panel_provider.workspace_provider
       })
     }
 

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

@@ -185,14 +185,8 @@ export const handle_send_prompt = async (params: {
 
         let processed_instructions = instructions
         if (processed_instructions.includes('#Changes:')) {
-          const is_no_context_web_mode =
-            params.panel_provider.mode == MODE.WEB &&
-            params.panel_provider.web_prompt_type == 'no-context'
-
           processed_instructions = await replace_changes_symbol({
-            instruction: processed_instructions,
-            workspace_provider: params.panel_provider.workspace_provider,
-            is_no_context_web_mode
+            instruction: processed_instructions
           })
         }
 

packages/vscode/src/views/panel/backend/utils/replace-git-symbols.ts

@@ -84,9 +84,6 @@ const build_changes_markdown = (
 
 export const replace_changes_symbol = async (params: {
   instruction: string
-  after_context?: boolean
-  workspace_provider: WorkspaceProvider
-  is_no_context_web_mode?: boolean
 }): Promise<string> => {
   const matches = params.instruction.match(
     /#Changes:([^\s,;:.!?]+(?:\/[^\s,;:.!?]+)?)/
@@ -97,20 +94,6 @@ export const replace_changes_symbol = async (params: {
 
   const branch_spec = matches[1]
 
-  if (params.after_context) {
-    let branch_name = branch_spec
-    const multi_root_match = branch_spec.match(/^([^/]+)\/(.+)$/)
-
-    if (multi_root_match) {
-      branch_name = multi_root_match[2]
-    }
-
-    return params.instruction.replace(
-      new RegExp(`#Changes:${branch_spec}`, 'g'),
-      `(Changes against ${branch_name} branch)`
-    )
-  }
-
   const multi_root_match = branch_spec.match(/^([^/]+)\/(.+)$/)
 
   if (multi_root_match) {
@@ -354,18 +337,8 @@ const build_commit_changes_markdown = (
 
 export const replace_commit_symbol = async (params: {
   instruction: string
-  after_context?: boolean
 }): Promise<string> => {
-  const regex = /#Commit:([^:]+):([a-fA-F0-9]+)\s*(?:"([^"]*)")?/g
-  if (params.after_context) {
-    return params.instruction.replace(
-      regex,
-      (_match, _folder_name, _commit_hash, commit_message) => {
-        if (commit_message) return `(Commit: ${commit_message})`
-        return '(Commit)'
-      }
-    )
-  }
+  const regex = /#Commit:([^:]+):([a-fA-F0-9]+)\s*(?:"((?:[^"\\]|\\.)*)")?/g
 
   let result_instruction = params.instruction
   const matches = [...result_instruction.matchAll(regex)]
@@ -379,7 +352,7 @@ export const replace_commit_symbol = async (params: {
     const full_match = match[0]
     const folder_name = match[1]
     const commit_hash = match[2]
-    const commit_message = match[3]
+    const commit_message = match[3]?.replace(/\\(.)/g, '$1')
 
     const target_folder = workspace_folders.find(
       (folder) => folder.name === folder_name
@@ -452,13 +425,10 @@ const build_context_at_commit_xml = (
 
 export const replace_context_at_commit_symbol = async (params: {
   instruction: string
-  after_context?: boolean
   workspace_provider: WorkspaceProvider
 }): Promise<string> => {
-  const regex = /#ContextAtCommit:([^:]+):([a-fA-F0-9]+)\s*(?:"([^"]*)")?/g
-  if (params.after_context) {
-    return params.instruction.replace(regex, '<archive/>')
-  }
+  const regex =
+    /#ContextAtCommit:([^:]+):([a-fA-F0-9]+)\s*(?:"((?:[^"\\]|\\.)*)")?/g
 
   let result_instruction = params.instruction
   const matches = [...result_instruction.matchAll(regex)]