Refactor intelligent update handlers to ensure proper cleanup before retrying or aborting operations

- upon manual cancellation, open the configurations quick pick

└── apps
    └── editor
        └── src
            └── views
                └── prompt
                    └── backend
                        └── message-handlers
                            ├── handle-cancel-intelligent-update-file-in-preview.ts
                            ├── handle-fix-all-failed-files.ts
                            ├── handle-intelligent-update-file-in-preview.ts
                            ├── index.ts
                            └── utils
                                └── intelligent-update-utils.ts

Author: robertpiosik

apps/editor/src/views/prompt/backend/message-handlers/handle-fix-all-failed-files.ts

@@ -243,28 +243,29 @@ export const handle_fix_all_failed_files = async (params: {
         } catch (error: any) {
           if (
             !axios.isCancel(error) &&
-            error.message != 'User cancelled the operation'
+            error.message != 'User cancelled the operation' &&
+            error.message != 'Batch operation failed, triggering configuration selection.'
           ) {
             Logger.error({
               function_name: 'handle_fix_all_failed_files',
               message: 'Error during process_file',
               data: { error, file_path }
             })
 
-            batch_abort_controllers.forEach((controller) => {
-              controller.abort(
-                'Batch operation failed, triggering configuration selection.'
-              )
-            })
-
             vscode.window.showErrorMessage(
               dictionary.error_message.APPLYING_CHANGES_GENERIC_ERROR(
                 error.message
               )
             )
-
-            throw error
           }
+
+          batch_abort_controllers.forEach((controller) => {
+            controller.abort(
+              'Batch operation failed, triggering configuration selection.'
+            )
+          })
+
+          throw error
         } finally {
           params.prompt_view_provider.send_message({
             command: 'UPDATE_FILE_PROGRESS',

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

@@ -188,6 +188,8 @@ export const handle_intelligent_update_file_in_preview = async (
     on_thinking_chunk
   })
 
+  let should_retry = false
+
   try {
     const updated_content = await content_promise
 
@@ -235,13 +237,9 @@ export const handle_intelligent_update_file_in_preview = async (
         data: { error, file_path }
       })
       vscode.window.showErrorMessage(error.message)
-
-      await handle_intelligent_update_file_in_preview(prompt_view_provider, {
-        ...message,
-        force_model_selection: true
-      })
-      return
     }
+
+    should_retry = true
   } finally {
     const index =
       prompt_view_provider.intelligent_update_abort_controllers.findIndex(
@@ -257,4 +255,11 @@ export const handle_intelligent_update_file_in_preview = async (
       is_applying: false
     })
   }
+
+  if (should_retry) {
+    await handle_intelligent_update_file_in_preview(prompt_view_provider, {
+      ...message,
+      force_model_selection: true
+    })
+  }
 }