Fix function name inconsistencies and improve error handling with retry logic for API requests

Author: robertpiosik

apps/editor/src/commands/apply-chat-response-command/handlers/active-editor-intelligent-update-handler.ts

@@ -33,7 +33,7 @@ export const handle_active_editor_intelligent_update = async (params: {
       dictionary.error_message.CANNOT_PROCESS_MULTIPLE_FILES_WITHOUT_WORKSPACE
     )
     Logger.warn({
-      function_name: 'handle_intelligent_update',
+      function_name: 'handle_active_editor_intelligent_update',
       message: 'No workspace folder open.'
     })
     return null
@@ -53,12 +53,12 @@ export const handle_active_editor_intelligent_update = async (params: {
     (item): item is FileItem => item.type == 'file'
   )
 
-  if (files.length === 0) {
+  if (files.length == 0) {
     vscode.window.showErrorMessage(
       dictionary.error_message.NO_VALID_FILE_CONTENT_IN_CLIPBOARD
     )
     Logger.warn({
-      function_name: 'handle_intelligent_update',
+      function_name: 'handle_active_editor_intelligent_update',
       message: 'No valid file content found.'
     })
     return null
@@ -80,7 +80,7 @@ export const handle_active_editor_intelligent_update = async (params: {
       dictionary.error_message.INVALID_FILE_PATH_TRAVERSAL(file_item.file_path)
     )
     Logger.error({
-      function_name: 'handle_intelligent_update',
+      function_name: 'handle_active_editor_intelligent_update',
       message: 'Invalid file path',
       data: file_item.file_path
     })

apps/editor/src/commands/code-completion-commands.ts

@@ -228,7 +228,7 @@ const get_code_completion_config = async (
           if (panel_provider) {
             panel_provider.send_message({
               command: 'SELECTED_CONFIGURATION_CHANGED',
-              mode: 'code-at-cursor',
+              prompt_type: 'code-at-cursor',
               id: selected.id
             })
           }
@@ -528,7 +528,7 @@ const perform_code_completion = async (params: {
       }
     } catch (err: any) {
       Logger.error({
-        function_name: 'perform_fim_completion',
+        function_name: 'perform_code_completion',
         message: 'Completion error',
         data: err
       })

apps/editor/src/utils/intelligent-update-utils.ts

@@ -178,9 +178,9 @@ export const process_file = async (params: {
 
   apply_reasoning_effort(body, params.provider, params.reasoning_effort)
 
+  const MAX_ATTEMPTS = 3
   let attempt = 0
-  // eslint-disable-next-line no-constant-condition
-  while (true) {
+  while (attempt < MAX_ATTEMPTS) {
     attempt++
     try {
       const result = await make_api_request({
@@ -189,7 +189,8 @@ export const process_file = async (params: {
         body,
         cancellation_token: params.cancel_token,
         on_chunk: params.on_chunk,
-        on_thinking_chunk: params.on_thinking_chunk
+        on_thinking_chunk: params.on_thinking_chunk,
+        rethrow_error: true
       })
 
       const refactored_content = result?.response
@@ -224,6 +225,21 @@ export const process_file = async (params: {
         throw error
       }
 
+      const is_retryable_error =
+        (axios.isAxiosError(error) &&
+          (error.response?.status == 429 ||
+            (error.response?.status && error.response.status >= 500))) ||
+        error.name == 'StreamAbortError'
+
+      if (!is_retryable_error) {
+        Logger.error({
+          function_name: 'process_file',
+          message: `Refactoring error (attempt ${attempt}) - not retrying`,
+          data: { error, file_path: params.file_path }
+        })
+        throw error
+      }
+
       Logger.error({
         function_name: 'process_file',
         message: `Refactoring error (attempt ${attempt})`,
@@ -233,8 +249,15 @@ export const process_file = async (params: {
         `Refactoring error for ${params.file_path} (attempt ${attempt}):`,
         error
       )
+
+      if (attempt >= MAX_ATTEMPTS) {
+        throw error
+      }
+
       params.on_retry?.(attempt, error)
-      await new Promise((resolve) => setTimeout(resolve, 5000))
+      await new Promise((resolve) => setTimeout(resolve, 3000))
+      params.on_retry_attempt?.()
     }
   }
+  throw new Error('Processing file failed after maximum attempts')
 }