Centralize edit format utilities and update intelligent update processing to use search and replace blocks

- rename 'conflict markers' to 'search replace'
- For the intelligent update, we should request and apply 'search replace' blocks. That would speed-up the process.
- intelligent_update_instructions should not directly use [Fragment] but duplicate and simplify for our needs
- the intelligent update process should use intelligent_update_edit_format_instructions in "# System" paragraph. below place markdown separator "---" and intelligent_update_task_instructions. don't edit `apps/editor/src/constants/instructions.ts`

Author: robertpiosik

README.md

@@ -5,7 +5,7 @@ import { exec } from 'child_process'
 import { Logger } from '@shared/utils/logger'
 import { OriginalFileState } from '../types/original-file-state'
 import { create_safe_path } from '@/utils/path-sanitizer'
-import { apply_diff } from '../utils/edit-formats/diffs'
+import { apply_diff } from '../../../utils/edit-formats/diffs'
 import { remove_directory_if_empty } from '../utils/file-operations'
 import { DiffItem } from '../utils/response-parser'
 

apps/editor/src/commands/apply-response-command/handlers/diff-handler.ts

@@ -11,8 +11,8 @@ import {
   handle_deleted_file_item,
   get_rename_source_info
 } from '../utils/file-operations'
-import { apply_conflict_markers_to_content } from '../utils/edit-formats/conflict-markers/apply-conflict-markers-to-content'
-import { parse_conflict_segments } from '../utils/edit-formats/conflict-markers/parse-conflict-segments'
+import { apply_search_replace_to_content } from '../../../utils/edit-formats/search-replace/apply-search-replace-to-content'
+import { parse_search_replace_segments } from '../../../utils/edit-formats/search-replace/parse-search-replace-segments'
 
 export const handle_search_replace = async (params: {
   files: FileItem[]
@@ -109,9 +109,9 @@ export const handle_search_replace = async (params: {
         try {
           let new_content = rename_source_content
           if (has_markers) {
-            new_content = apply_conflict_markers_to_content({
+            new_content = apply_search_replace_to_content({
               original_content: rename_source_content,
-              segments: parse_conflict_segments(file.content)
+              segments: parse_search_replace_segments(file.content)
             })
           } else if (file.content != '') {
             new_content = file.content
@@ -147,9 +147,9 @@ export const handle_search_replace = async (params: {
         try {
           const document = await vscode.workspace.openTextDocument(safe_path)
           const original_content = document.getText()
-          const current_content = apply_conflict_markers_to_content({
+          const current_content = apply_search_replace_to_content({
             original_content,
-            segments: parse_conflict_segments(file.content)
+            segments: parse_search_replace_segments(file.content)
           })
 
           if (current_content !== original_content) {
@@ -169,13 +169,13 @@ export const handle_search_replace = async (params: {
 
           Logger.info({
             function_name: 'handle_search_replace',
-            message: 'Applied conflict markers edit to file',
+            message: 'Applied search replace edit to file',
             data: safe_path
           })
         } catch (error: any) {
           Logger.error({
             function_name: 'handle_search_replace',
-            message: 'Failed to apply conflict markers edit',
+            message: 'Failed to apply search replace edit',
             data: { file_path: safe_path, error }
           })
           failed_files.push(file)
@@ -189,7 +189,7 @@ export const handle_search_replace = async (params: {
 
           let content_to_write = file.content
           if (has_markers) {
-            const segments = parse_conflict_segments(file.content)
+            const segments = parse_search_replace_segments(file.content)
             content_to_write = segments
               .map((s) =>
                 s.type == 'common'
@@ -257,7 +257,7 @@ export const handle_search_replace = async (params: {
   } catch (error: any) {
     Logger.error({
       function_name: 'handle_search_replace',
-      message: 'Error during conflict markers edit',
+      message: 'Error during search replace edit',
       data: error
     })
     vscode.window.showErrorMessage(

apps/editor/src/commands/apply-response-command/handlers/search-replace-handler.ts

@@ -6,7 +6,7 @@ import { dictionary } from '@shared/constants/dictionary'
 import { create_safe_path, sanitize_file_name } from '@/utils/path-sanitizer'
 import { FileItem } from '../utils/response-parser'
 import { OriginalFileState } from '../types/original-file-state'
-import { process_truncated_content } from '../utils/edit-formats/truncations'
+import { process_truncated_content } from '../../../utils/edit-formats/truncations'
 import {
   cleanup_rename_source,
   handle_deleted_file_item,

apps/editor/src/commands/apply-response-command/handlers/truncated-handler.ts

@@ -28,7 +28,7 @@ import { handle_truncated_edit } from './handlers/truncated-handler'
 import { WorkspaceProvider } from '@/context/providers/workspace/workspace-provider'
 import { natural_sort } from '@/utils/natural-sort'
 import { t } from '@/i18n'
-import { is_truncation_line } from './utils/edit-formats/truncations'
+import { is_truncation_line } from '../../utils/edit-formats/truncations'
 import {
   RelevantFileInPreview,
   ItemInPreview

apps/editor/src/commands/apply-response-command/response-processor.ts

@@ -10,7 +10,7 @@ export const parse_relevant_files = (params: {
   workspace_files: string[]
 }): RelevantFilesItem | null => {
   if (
-    params.response.includes('### File:') ||
+    params.response.includes('## File:') ||
     params.response.includes('### Created file:') ||
     params.response.includes('### Updated file:') ||
     params.response.includes('### Deleted file:') ||

apps/editor/src/commands/apply-response-command/utils/edit-formats/conflict-markers/apply-conflict-markers-to-content/index.ts

@@ -25,8 +25,25 @@ The variable is possibly not defined.
 
 Find correct replacement text for the <missing_text> symbol.`
 
-export const intelligent_update_instructions =
-  'Refactor the file according to the attached changes without explanations or any other text. Print the file in FULL.'
+export const intelligent_update_task_instructions =
+  'Refactor the file according to the attached changes without explanations or any other text.'
+
+export const intelligent_update_edit_format_instructions = `Output a markdown code block showing the original and updated code snippets with Git-style merge conflict syntax. Example:
+
+\`\`\`python
+<<<<<<< SEARCH
+GREETING = "Welcome everyone!"
+=======
+WISHES = "Have a nice day!"
+>>>>>>> REPLACE
+<<<<<<< SEARCH
+ def show_greeting():
+   print(GREETING)
+=======
+ def show_wishes():
+   print(WISHES)
+>>>>>>> REPLACE
+\`\`\``
 
 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."

apps/editor/src/commands/apply-response-command/utils/edit-formats/conflict-markers/types.ts

@@ -331,9 +331,9 @@ export class TokenCalculator implements vscode.Disposable {
         }
 
         if (is_binary) {
-          return `### File: \`${display_path}\`\n\nBinary file\n\n`
+          return `## File: \`${display_path}\`\n\nBinary file\n\n`
         } else {
-          return `### File: \`${display_path}\`\n\n\`\`\`\n${text}\n\`\`\`\n\n`
+          return `## File: \`${display_path}\`\n\n\`\`\`\n${text}\n\`\`\`\n\n`
         }
       }