Remove internal retry logic from process_file and implement a caller-driven retry strategy for intelligent updates

- you should never retry, instead show model selection (the behavior we currently have after all retries fail)
- you should never retry, instead show model selection (the behavior we currently have after all retries fail)
- "Applying changes to daemon.ts: Request failed with status code 429." -> "Request failed with status code 429."

Author: robertpiosik

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

@@ -8,10 +8,16 @@ import {
 import { sanitize_file_name, create_safe_path } from '@/utils/path-sanitizer'
 import { Logger } from '@shared/utils/logger'
 import { OriginalFileState } from '@/commands/apply-chat-response-command/types/original-file-state'
-import { ToolConfig } from '@/services/model-providers-manager'
+import {
+  ToolConfig,
+  ModelProvidersManager
+} from '@/services/model-providers-manager'
 import { PanelProvider } from '@/views/panel/backend/panel-provider'
 import { dictionary } from '@shared/constants/dictionary'
-import { process_file } from '@/utils/intelligent-update-utils'
+import {
+  process_file,
+  get_intelligent_update_config
+} from '@/utils/intelligent-update-utils'
 
 export const handle_active_editor_intelligent_update = async (params: {
   endpoint_url: string
@@ -144,26 +150,6 @@ export const handle_active_editor_intelligent_update = async (params: {
             progress
           })
         }
-      },
-      on_retry_attempt: () => {
-        if (params.panel_provider) {
-          params.panel_provider.send_message({
-            command: 'SHOW_PROGRESS',
-            title: 'Thinking...',
-            show_elapsed_time: true,
-            cancellable: true
-          })
-        }
-      },
-      on_retry: () => {
-        if (params.panel_provider) {
-          params.panel_provider.send_message({
-            command: 'SHOW_PROGRESS',
-            title: 'Retrying...',
-            show_elapsed_time: true,
-            cancellable: true
-          })
-        }
       }
     })
 
@@ -198,10 +184,30 @@ export const handle_active_editor_intelligent_update = async (params: {
       data: error
     })
 
-    if (!axios.isCancel(error) && error.message != 'Operation cancelled') {
+    if (
+      !axios.isCancel(error) &&
+      error.message != 'Operation cancelled' &&
+      error.message != 'User cancelled the operation'
+    ) {
       vscode.window.showErrorMessage(
         dictionary.error_message.ERROR_APPLYING_CHANGES(error.message)
       )
+
+      const api_providers_manager = new ModelProvidersManager(params.context)
+      const config_result = await get_intelligent_update_config(
+        api_providers_manager,
+        true,
+        params.context
+      )
+
+      if (config_result) {
+        return await handle_active_editor_intelligent_update({
+          ...params,
+          endpoint_url: config_result.provider.base_url,
+          api_key: config_result.provider.api_key,
+          config: config_result.config
+        })
+      }
     }
     return null
   } finally {

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

@@ -223,8 +223,6 @@ export const process_file = async (params: {
   cancel_token?: CancelToken
   on_chunk?: (tokens_per_second: number, total_tokens: number) => void
   on_thinking_chunk?: (text: string) => void
-  on_retry?: (attempt: number, error: any) => void
-  on_retry_attempt?: () => void
 }): Promise<string> => {
   Logger.info({
     function_name: 'process_file',
@@ -253,86 +251,55 @@ export const process_file = async (params: {
     reasoning_effort: params.reasoning_effort
   })
 
-  const MAX_ATTEMPTS = 3
-  let attempt = 0
-  while (attempt < MAX_ATTEMPTS) {
-    attempt++
-    try {
-      const result = await make_api_request({
-        endpoint_url: params.endpoint_url,
-        api_key: params.api_key,
-        body,
-        cancellation_token: params.cancel_token,
-        on_chunk: params.on_chunk,
-        on_thinking_chunk: params.on_thinking_chunk,
-        rethrow_error: true
-      })
-
-      const refactored_content = result?.response
-      if (!refactored_content) {
-        Logger.error({
-          function_name: 'process_file',
-          message: 'API request returned empty response',
-          data: { file_path: params.file_path, attempt }
-        })
-        throw new Error('API request returned empty response')
-      }
+  try {
+    const result = await make_api_request({
+      endpoint_url: params.endpoint_url,
+      api_key: params.api_key,
+      body,
+      cancellation_token: params.cancel_token,
+      on_chunk: params.on_chunk,
+      on_thinking_chunk: params.on_thinking_chunk,
+      rethrow_error: true
+    })
 
-      const cleaned_content = cleanup_api_response({
-        content: refactored_content
-      })
-      Logger.info({
+    const refactored_content = result?.response
+    if (!refactored_content) {
+      Logger.error({
         function_name: 'process_file',
-        message: 'API response received and cleaned',
-        data: {
-          file_path: params.file_path,
-          response_length: cleaned_content?.length
-        }
+        message: 'API request returned empty response',
+        data: { file_path: params.file_path }
       })
-      return cleaned_content
-    } catch (error: any) {
-      if (axios.isCancel(error)) {
-        Logger.info({
-          function_name: 'process_file',
-          message: 'Request cancelled',
-          data: params.file_path
-        })
-        throw error
-      }
+      throw new Error('API request returned empty response')
+    }
 
-      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
+    const cleaned_content = cleanup_api_response({
+      content: refactored_content
+    })
+    Logger.info({
+      function_name: 'process_file',
+      message: 'API response received and cleaned',
+      data: {
+        file_path: params.file_path,
+        response_length: cleaned_content?.length
       }
-
-      Logger.error({
+    })
+    return cleaned_content
+  } catch (error: any) {
+    if (axios.isCancel(error)) {
+      Logger.info({
         function_name: 'process_file',
-        message: `Refactoring error (attempt ${attempt})`,
-        data: { error, file_path: params.file_path }
+        message: 'Request cancelled',
+        data: params.file_path
       })
-      console.error(
-        `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, 3000))
-      params.on_retry_attempt?.()
+      throw error
     }
+
+    Logger.error({
+      function_name: 'process_file',
+      message: `Refactoring error`,
+      data: { error, file_path: params.file_path }
+    })
+    console.error(`Refactoring error for ${params.file_path}:`, error)
+    throw error
   }
-  throw new Error('Processing file failed after maximum attempts')
 }

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

@@ -184,26 +184,6 @@ export const handle_fix_all_failed_files = async (params: {
           })
         }
 
-        const on_retry_attempt = () => {
-          params.panel_provider.send_message({
-            command: 'UPDATE_FILE_PROGRESS',
-            file_path,
-            workspace_name,
-            is_applying: true,
-            apply_status: 'thinking'
-          })
-        }
-
-        const on_retry = () => {
-          params.panel_provider.send_message({
-            command: 'UPDATE_FILE_PROGRESS',
-            file_path,
-            workspace_name,
-            is_applying: true,
-            apply_status: 'retrying'
-          })
-        }
-
         try {
           const updated_content = await process_file({
             endpoint_url: endpoint_url,
@@ -217,9 +197,7 @@ export const handle_fix_all_failed_files = async (params: {
             instruction: instructions,
             cancel_token: cancel_token_source.token,
             on_chunk,
-            on_thinking_chunk,
-            on_retry_attempt,
-            on_retry
+            on_thinking_chunk
           })
 
           if (updated_content) {

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

@@ -172,26 +172,6 @@ export const handle_intelligent_update_file_in_preview = async (
     })
   }
 
-  const on_retry_attempt = () => {
-    panel_provider.send_message({
-      command: 'UPDATE_FILE_PROGRESS',
-      file_path,
-      workspace_name,
-      is_applying: true,
-      apply_status: 'thinking'
-    })
-  }
-
-  const on_retry = () => {
-    panel_provider.send_message({
-      command: 'UPDATE_FILE_PROGRESS',
-      file_path,
-      workspace_name,
-      is_applying: true,
-      apply_status: 'retrying'
-    })
-  }
-
   const content_promise = process_file({
     endpoint_url: endpoint_url,
     api_key: api_provider.api_key,
@@ -204,9 +184,7 @@ export const handle_intelligent_update_file_in_preview = async (
     instruction: instructions,
     cancel_token: cancel_token_source.token,
     on_chunk,
-    on_thinking_chunk,
-    on_retry_attempt,
-    on_retry
+    on_thinking_chunk
   })
 
   try {
@@ -255,20 +233,13 @@ export const handle_intelligent_update_file_in_preview = async (
         message: 'Error during process_file',
         data: { error, file_path }
       })
-      vscode.window.showErrorMessage(
-        dictionary.error_message.INTELLIGENT_UPDATE_FAILED_FOR_FILE(
-          file_name,
-          error.message
-        )
-      )
+      vscode.window.showErrorMessage(error.message)
 
-      if (axios.isAxiosError(error)) {
-        await handle_intelligent_update_file_in_preview(panel_provider, {
-          ...message,
-          force_model_selection: true
-        })
-        return
-      }
+      await handle_intelligent_update_file_in_preview(panel_provider, {
+        ...message,
+        force_model_selection: true
+      })
+      return
     }
   } finally {
     const index =

apps/editor/src/views/panel/types/messages.ts

@@ -69,11 +69,7 @@ export type Checkpoint = {
   is_starred?: boolean
 }
 
-export type FileProgressStatus =
-  | 'waiting'
-  | 'thinking'
-  | 'receiving'
-  | 'retrying'
+export type FileProgressStatus = 'waiting' | 'thinking' | 'receiving'
 
 // === FROM FRONTEND TO BACKEND ===
 export interface GetInstructionsMessage extends BaseMessage {
@@ -484,7 +480,7 @@ export interface UpdateFileProgressMessage extends BaseMessage {
   file_path: string
   workspace_name?: string
   is_applying: boolean
-  apply_status?: 'waiting' | 'thinking' | 'receiving' | 'done' | 'retrying'
+  apply_status?: 'waiting' | 'thinking' | 'receiving' | 'done'
   apply_progress?: number
   apply_tokens_per_second?: number
 }

packages/shared/src/constants/dictionary.ts

@@ -321,8 +321,6 @@ export const dictionary = {
       `Could not find original state for file: ${file_name}.`,
     UPDATE_INSTRUCTIONS_FOR_FILE_NOT_FOUND: (file_name: string) =>
       `Could not find update instructions for file: ${file_name}.`,
-    INTELLIGENT_UPDATE_FAILED_FOR_FILE: (file_name: string, message: string) =>
-      `Applying changes to ${file_name}: ${message}.`,
     FAILED_TO_FETCH_OPEN_ROUTER_MODELS:
       'Failed to fetch Open Router models. Please check your connection.',
     FAILED_TO_GET_CHANGES_FROM_BRANCH: (branch_name: string) =>

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

@@ -12,7 +12,7 @@ export type FileInPreview = {
   apply_failed?: boolean
   ai_content?: string
   is_applying?: boolean
-  apply_status?: 'waiting' | 'thinking' | 'receiving' | 'done' | 'retrying'
+  apply_status?: 'waiting' | 'thinking' | 'receiving' | 'done'
   apply_progress?: number
   apply_tokens_per_second?: number
   applied_with_intelligent_update?: boolean

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

@@ -157,7 +157,6 @@ export const ResponsePreview: FC<Props> = (props) => {
   const get_status_text = (file: FileInPreview) => {
     if (file.apply_status == 'waiting') return 'Waiting for server...'
     if (file.apply_status == 'thinking') return 'Thinking...'
-    if (file.apply_status == 'retrying') return 'Retrying...'
     if (file.apply_status == 'receiving') return 'Receiving...'
     if (file.apply_status == 'done') return 'Done'
     return ''

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

@@ -30,7 +30,6 @@ const get_file_message = (file: FileInPreview): FileMessage | null => {
     let text = 'Applying...'
     if (file.apply_status == 'waiting') text = 'Waiting for server...'
     else if (file.apply_status == 'thinking') text = 'Thinking...'
-    else if (file.apply_status == 'retrying') text = 'Retrying...'
     else if (file.apply_status == 'receiving') text = 'Receiving...'
     else if (file.apply_status == 'done') text = 'Done'