Rename diff_fallback_method to diff_application_method and remove is_fallback flag across all files

Author: robertpiosik

packages/shared/src/types/file-in-preview.ts

@@ -7,9 +7,8 @@ export type FileInPreview = {
   is_deleted?: boolean
   lines_added: number
   lines_removed: number
-  is_fallback?: boolean
   is_replaced?: boolean
-  diff_fallback_method?: 'recount' | 'search_and_replace'
+  diff_application_method?: 'recount' | 'search_and_replace'
   content?: string
 }
 

packages/ui/src/components/editor/panel/ResponsePreview/ResponsePreview.stories.tsx

@@ -45,16 +45,14 @@ const files_using_fallbacks = [
   {
     type: 'file',
     file_path: 'src/complex-logic.js',
-    is_fallback: true,
-    diff_fallback_method: 'recount',
+    diff_application_method: 'recount',
     lines_added: 15,
     lines_removed: 12
   },
   {
     type: 'file',
     file_path: 'src/aggressive-fallback.css',
-    is_fallback: true,
-    diff_fallback_method: 'search_and_replace',
+    diff_application_method: 'search_and_replace',
     lines_added: 8,
     lines_removed: 3
   }

packages/ui/src/components/editor/panel/ResponsePreview/ResponsePreview.tsx

@@ -72,7 +72,9 @@ export const ResponsePreview: FC<Props> = (props) => {
   const files_in_preview = props.items.filter(
     (i) => 'file_path' in i
   ) as FileInPreview[]
-  const fallback_count = files_in_preview.filter((f) => f.is_fallback).length
+  const aggressive_fallback_count = files_in_preview.filter(
+    (f) => f.diff_application_method == 'search_and_replace'
+  ).length
 
   const get_instructions_font_size_class = (text: string): string => {
     const length = text.length
@@ -105,13 +107,13 @@ export const ResponsePreview: FC<Props> = (props) => {
             {props.raw_instructions}
           </div>
         )}
-        {fallback_count > 0 && (
+        {aggressive_fallback_count > 0 && (
           <div className={styles.info}>
             {files_in_preview.length > 1
-              ? `${fallback_count} of ${files_in_preview.length} files`
+              ? `${aggressive_fallback_count} of ${files_in_preview.length} files`
               : 'The file'}{' '}
-            required a fallback diff integration method, which may lead to
-            inaccuracies. Looks off? Click{' '}
+            required an aggressive fallback diff integration method, which may
+            lead to inaccuracies. Looks off? Click{' '}
             <span className="codicon codicon-sparkle" /> action to fix a file
             with the Intelligent Update API tool.
           </div>
@@ -142,7 +144,7 @@ export const ResponsePreview: FC<Props> = (props) => {
                   }}
                   role="button"
                   title={`${file.file_path}${
-                    file.diff_fallback_method == 'search_and_replace'
+                    file.diff_application_method == 'search_and_replace'
                       ? '\nUsed aggressive fallback method. Call Intelligent Update API tool, if needed.'
                       : ''
                   }`}
@@ -167,7 +169,7 @@ export const ResponsePreview: FC<Props> = (props) => {
                       })}
                     >
                       <span>
-                        {file.diff_fallback_method == 'search_and_replace' &&
+                        {file.diff_application_method == 'search_and_replace' &&
                           '⚠ '}
                         {file_name}
                       </span>
@@ -182,13 +184,13 @@ export const ResponsePreview: FC<Props> = (props) => {
                   </div>
                   <div className={styles.list__file__right}>
                     <div className={styles['list__file__actions']}>
-                      {(file.is_fallback || file.is_replaced) && (
+                      {(file.diff_application_method || file.is_replaced) && (
                         <IconButton
                           codicon_icon="sparkle"
                           title={`Call Intelligent Update API tool${
-                            file.diff_fallback_method == 'recount'
+                            file.diff_application_method == 'recount'
                               ? ' (fallback used: git apply with --recount flag)'
-                              : file.diff_fallback_method ==
+                              : file.diff_application_method ==
                                   'search_and_replace'
                                 ? ' (fallback used: search and replace matching fragments)'
                                 : ''

packages/vscode/src/commands/apply-chat-response-command/apply-chat-response-command.ts

@@ -202,9 +202,8 @@ export const apply_chat_response_command = (params: {
                 is_deleted,
                 lines_added: diff_stats.lines_added,
                 lines_removed: diff_stats.lines_removed,
-                is_fallback: state.is_fallback,
                 is_replaced: state.is_replaced,
-                diff_fallback_method: state.diff_fallback_method,
+                diff_application_method: state.diff_application_method,
                 content: current_content,
                 is_checked: true
               })

packages/vscode/src/commands/apply-chat-response-command/handlers/diff-handler.ts

@@ -291,7 +291,7 @@ const handle_new_file_patch = async (
 ): Promise<{
   success: boolean
   original_states?: OriginalFileState[]
-  diff_fallback_method?: 'recount' | 'search_and_replace'
+  diff_application_method?: 'recount' | 'search_and_replace'
 }> => {
   const file_paths = extract_file_paths_from_patch(patch_content)
   if (file_paths.length != 1) {
@@ -366,7 +366,7 @@ const handle_deleted_file_patch = async (
 ): Promise<{
   success: boolean
   original_states?: OriginalFileState[]
-  diff_fallback_method?: 'recount' | 'search_and_replace'
+  diff_application_method?: 'recount' | 'search_and_replace'
 }> => {
   const file_paths = extract_file_paths_from_patch(patch_content)
   if (file_paths.length != 1) {
@@ -435,7 +435,7 @@ export const apply_git_patch = async (
 ): Promise<{
   success: boolean
   original_states?: OriginalFileState[]
-  diff_fallback_method?: 'recount' | 'search_and_replace'
+  diff_application_method?: 'recount' | 'search_and_replace'
 }> => {
   const patch_info = parse_patch_header(patch_content, workspace_path)
 
@@ -474,55 +474,33 @@ export const apply_git_patch = async (
 
     let last_error: any = null
     let success = false
-    let diff_fallback_method: 'recount' | 'search_and_replace' | undefined =
+    let diff_application_method: 'recount' | 'search_and_replace' | undefined =
       undefined
 
     if (patch_info.is_renaming) {
       // Skip git apply and fallbacks, renaming here is a base case where no content is changing, just paths. File is already copied.
       success = true
     }
 
-    // Attempt 1: Standard git apply
+    // Attempt 1: git apply with --recount
     if (!success) {
-      try {
-        await execAsync(
-          `git apply --whitespace=fix --ignore-whitespace "${temp_file}"`,
-          { cwd: workspace_path }
-        )
-        success = true
-        Logger.info({
-          function_name: 'apply_git_patch',
-          message: 'Patch applied successfully with standard git apply.'
-        })
-      } catch (error) {
-        last_error = error
-      }
-    }
-
-    // Attempt 2: git apply with --recount
-    if (!success) {
-      Logger.warn({
-        function_name: 'apply_git_patch',
-        message: 'Standard git apply failed, trying with --recount.',
-        data: { error: last_error }
-      })
       try {
         await execAsync(
           `git apply --whitespace=fix --ignore-whitespace --recount "${temp_file}"`,
           { cwd: workspace_path }
         )
         success = true
-        diff_fallback_method = 'recount'
+        diff_application_method = 'recount'
         Logger.info({
           function_name: 'apply_git_patch',
-          message: 'Patch applied successfully with --recount fallback.'
+          message: 'Patch applied successfully with --recount.'
         })
       } catch (error) {
         last_error = error
       }
     }
 
-    // Attempt 3: Custom diff processor
+    // Attempt 2: Custom diff processor
     if (!success) {
       Logger.warn({
         function_name: 'apply_git_patch',
@@ -538,7 +516,7 @@ export const apply_git_patch = async (
           diff_path_patch: temp_file
         })
         success = true
-        diff_fallback_method = 'search_and_replace'
+        diff_application_method = 'search_and_replace'
         Logger.info({
           function_name: 'apply_git_patch',
           message: 'Patch applied successfully with custom processor fallback.'
@@ -555,7 +533,7 @@ export const apply_git_patch = async (
       return {
         success: true,
         original_states: original_states,
-        diff_fallback_method
+        diff_application_method
       }
     } else {
       // All methods failed, throw the last logged error to be handled by the outer catch

packages/vscode/src/commands/apply-chat-response-command/handlers/restore-preview-handler.ts

@@ -83,9 +83,8 @@ export const handle_restore_preview = async (
       workspace_name: file.workspace_name,
       is_deleted: file.is_deleted,
       is_checked: file.is_checked,
-      is_fallback: file.is_fallback,
       is_replaced: file.is_replaced,
-      diff_fallback_method: file.diff_fallback_method
+      diff_application_method: file.diff_application_method
     })
 
     if (file.is_checked !== false) {

packages/vscode/src/commands/apply-chat-response-command/response-processor.ts

@@ -197,7 +197,7 @@ export const process_chat_response = async (
     const applied_patches: {
       patch: Diff
       original_states: OriginalFileState[]
-      diff_fallback_method?: 'recount' | 'search_and_replace'
+      diff_application_method?: 'recount' | 'search_and_replace'
     }[] = []
     let any_patch_used_fallback = false
 
@@ -214,10 +214,9 @@ export const process_chat_response = async (
       const result = await apply_git_patch(patch.content, workspace_path)
 
       if (result.success) {
-        if (result.diff_fallback_method && result.original_states) {
+        if (result.diff_application_method && result.original_states) {
           for (const state of result.original_states) {
-            state.is_fallback = true
-            state.diff_fallback_method = result.diff_fallback_method
+            state.diff_application_method = result.diff_application_method
           }
         }
         success_count++
@@ -228,10 +227,10 @@ export const process_chat_response = async (
           applied_patches.push({
             patch,
             original_states: result.original_states,
-            diff_fallback_method: result.diff_fallback_method
+            diff_application_method: result.diff_application_method
           })
         }
-        if (result.diff_fallback_method) {
+        if (result.diff_application_method) {
           any_patch_used_fallback = true
         }
       } else {
@@ -343,10 +342,10 @@ export const process_chat_response = async (
       if (any_patch_used_fallback) {
         ;(async () => {
           const fallback_patches_count = applied_patches.filter(
-            (p) => p.diff_fallback_method
+            (p) => p.diff_application_method
           ).length
           const fallback_files = applied_patches
-            .filter((p) => p.diff_fallback_method)
+            .filter((p) => p.diff_application_method)
             .map((p) => p.patch.file_path)
 
           Logger.info({

packages/vscode/src/commands/apply-chat-response-command/types/original-file-state.ts

@@ -6,8 +6,7 @@ export type OriginalFileState = {
   cursor_offset?: number
   new_file_path?: string
   file_path_to_restore?: string
-  is_fallback?: boolean
-  diff_fallback_method?: 'recount' | 'search_and_replace'
+  diff_application_method?: 'recount' | 'search_and_replace'
   is_replaced?: boolean
   is_deleted?: boolean
   is_checked?: boolean

packages/vscode/src/commands/apply-chat-response-command/utils/preview/file-preparer.ts

@@ -73,9 +73,8 @@ export const prepare_files_from_original_states = async (params: {
       is_deleted,
       lines_added: diff_stats.lines_added,
       lines_removed: diff_stats.lines_removed,
-      is_fallback: state.is_fallback,
       is_replaced: state.is_replaced,
-      diff_fallback_method: state.diff_fallback_method,
+      diff_application_method: state.diff_application_method,
       is_checked: state.is_checked ?? true
     }