Add fallback full file edit format and retry logic for intelligent updates

- sometimes model returns invalid search-replace blocks, in should re-send using intelligent_update_fallback_edit_format_instructions
- when called with fallback edit format, on chunk should provide param 'using fallback'. Only when using fallback should report progress percentage (as only with fallback we can estimate it by comparing to the full length)

Author: robertpiosik

apps/editor/src/constants/instructions.ts

@@ -28,7 +28,7 @@ Find correct replacement text for the <missing_text> symbol.`
 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:
+export const intelligent_update_edit_format_instructions = `Print a markdown code block showing the original and updated code snippets with Git-style merge conflict syntax. Example:
 
 \`\`\`python
 <<<<<<< SEARCH
@@ -45,6 +45,8 @@ WISHES = "Have a nice day!"
 >>>>>>> REPLACE
 \`\`\``
 
+export const intelligent_update_fallback_edit_format_instructions = `Print the updated file in FULL.`
+
 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/views/prompt/backend/message-handlers/handle-fix-all-failed-files.ts

@@ -165,9 +165,13 @@ export const handle_fix_all_failed_files = async (params: {
         const original_file_size = file_state.content.length
         const estimated_total_tokens = Math.ceil(original_file_size / 4)
 
-        const on_chunk = (tokens_per_second: number, total_tokens: number) => {
-          let progress = 0
-          if (estimated_total_tokens > 0) {
+        const on_chunk = (
+          tokens_per_second: number,
+          total_tokens: number,
+          using_fallback: boolean
+        ) => {
+          let progress: number | undefined
+          if (using_fallback && estimated_total_tokens > 0) {
             progress = Math.min(
               Math.round((total_tokens / estimated_total_tokens) * 100),
               100

apps/editor/src/views/prompt/backend/message-handlers/handle-intelligent-update-file-in-preview.ts

@@ -154,9 +154,13 @@ export const handle_intelligent_update_file_in_preview = async (
   const original_file_size = file_state.content.length
   const estimated_total_tokens = Math.ceil(original_file_size / 4)
 
-  const on_chunk = (tokens_per_second: number, total_tokens: number) => {
-    let progress = 0
-    if (estimated_total_tokens > 0) {
+  const on_chunk = (
+    tokens_per_second: number,
+    total_tokens: number,
+    using_fallback: boolean
+  ) => {
+    let progress: number | undefined
+    if (using_fallback && estimated_total_tokens > 0) {
       progress = Math.min(
         Math.round((total_tokens / estimated_total_tokens) * 100),
         100

apps/editor/src/views/prompt/backend/message-handlers/utils/intelligent-update-utils.ts

@@ -11,7 +11,8 @@ import { send_llm_message } from '@/utils/send-llm-message'
 import { cleanup_api_response } from '@/utils/cleanup-api-response'
 import {
   intelligent_update_task_instructions,
-  intelligent_update_edit_format_instructions
+  intelligent_update_edit_format_instructions,
+  intelligent_update_fallback_edit_format_instructions
 } from '@/constants/instructions'
 import { dictionary } from '@shared/constants/dictionary'
 import { apply_reasoning_effort } from '@/utils/apply-reasoning-effort'
@@ -112,15 +113,28 @@ export const process_file = async (params: {
   file_content: string
   instruction: string
   abort_signal?: AbortSignal
-  on_chunk?: (tokens_per_second: number, total_tokens: number) => void
+  on_chunk?: (
+    tokens_per_second: number,
+    total_tokens: number,
+    using_fallback: boolean
+  ) => void
   on_thinking_chunk?: (text: string) => void
+  use_fallback_edit_format?: boolean
 }): Promise<string> => {
   Logger.info({
     function_name: 'process_file',
     message: 'start',
-    data: { file_path: params.file_path }
+    data: {
+      file_path: params.file_path,
+      use_fallback_format: params.use_fallback_edit_format
+    }
   })
-  const content = `# Task\n\n${intelligent_update_task_instructions}\n\n# File\n\n${params.file_content}\n\n# Output formatting\n\n${intelligent_update_edit_format_instructions}\n\n# Task\n\n${intelligent_update_task_instructions}\n\n# Changes\n\n${params.instruction}`
+
+  const edit_format_instructions = params.use_fallback_edit_format
+    ? intelligent_update_fallback_edit_format_instructions
+    : intelligent_update_edit_format_instructions
+
+  const content = `# Task\n\n${intelligent_update_task_instructions}\n\n# File\n\n${params.file_content}\n\n# Output formatting\n\n${edit_format_instructions}\n\n# Task\n\n${intelligent_update_task_instructions}\n\n# Changes\n\n${params.instruction}`
 
   const messages = [
     {
@@ -146,7 +160,14 @@ export const process_file = async (params: {
       api_key: params.api_key,
       body,
       abort_signal: params.abort_signal,
-      on_chunk: params.on_chunk,
+      on_chunk: params.on_chunk
+        ? (tokens_per_second, total_tokens) =>
+            params.on_chunk!(
+              tokens_per_second,
+              total_tokens,
+              !!params.use_fallback_edit_format
+            )
+        : undefined,
       on_thinking_chunk: params.on_thinking_chunk,
       rethrow_error: true
     })
@@ -166,15 +187,27 @@ export const process_file = async (params: {
     })
 
     let final_content = cleaned_content
-    if (
-      cleaned_content.includes('<<<<<<<') &&
-      cleaned_content.includes('=======') &&
-      cleaned_content.includes('>>>>>>>')
-    ) {
-      final_content = apply_search_replace_to_content({
-        original_content: params.file_content,
-        segments: parse_search_replace_segments(cleaned_content)
-      })
+    if (!params.use_fallback_edit_format) {
+      try {
+        final_content = apply_search_replace_to_content({
+          original_content: params.file_content,
+          segments: parse_search_replace_segments(cleaned_content)
+        })
+      } catch (error: any) {
+        Logger.warn({
+          function_name: 'process_file',
+          message:
+            'Failed to apply search-replace blocks, retrying with fallback edit format',
+          data: { error, file_path: params.file_path }
+        })
+
+        if (!params.abort_signal?.aborted) {
+          return await process_file({
+            ...params,
+            use_fallback_edit_format: true
+          })
+        }
+      }
     }
 
     Logger.info({