feat: refactor error handling in chat message sending and HTTP requests

Author: hexqi

packages/plugins/robot/src/components/renderers/AgentRenderer.vue

@@ -53,7 +53,7 @@ export default {
       },
       failed: {
         title: '页面生成失败',
-        content: '页面生成失败',
+        content: () => props.content?.slice(-30) || '页面生成失败',
         icon: 'failed.svg'
       }
     }

packages/plugins/robot/src/composables/modes/useAgentMode.ts

@@ -141,10 +141,20 @@ export default function useAgentMode(): ModeHooks {
     updatePageSchema(content, pageSchema!)
   }
 
-  const onRequestEnd = async (finishReason: string, content: string, messages: any[]) => {
+  const onRequestEnd = async (
+    finishReason: string,
+    content: string,
+    messages: any[],
+    extraData?: Record<string, unknown>
+  ) => {
     if (finishReason === 'aborted' || finishReason === 'error') {
       removeLoading(messages)
-      messages.at(-1).renderContent.at(-1).status = 'failed'
+      const errorInfo = { content: extraData?.error || '请求失败', status: 'failed' }
+      if (messages.at(-1).renderContent.at(-1)) {
+        Object.assign(messages.at(-1).renderContent.at(-1), errorInfo)
+      } else {
+        messages.at(-1).renderContent = [{ type: getContentType(), ...errorInfo }]
+      }
     }
   }
 

packages/plugins/robot/src/composables/modes/useChatMode.ts

@@ -10,7 +10,7 @@
  *
  */
 
-import { removeLoading } from '../../utils'
+import { removeLoading, serializeError } from '../../utils'
 import useModelConfig from '../core/useConfig'
 import useMcpServer from '../features/useMcp'
 import type { ModeHooks } from '../../types/mode.types'
@@ -104,9 +104,15 @@ export default function useChatMode(): ModeHooks {
     // Chat 模式不需要处理流式数据
   }
 
-  const onRequestEnd = async (finishReason: string, _content: string, messages: any[]) => {
+  const onRequestEnd = async (
+    finishReason: string,
+    _content: string,
+    messages: any[],
+    extraData?: Record<string, unknown>
+  ) => {
     if (finishReason === 'aborted' || finishReason === 'error') {
       removeLoading(messages)
+      messages.at(-1)!.renderContent.push({ type: 'text', content: serializeError(extraData.error) })
     }
   }
 

packages/plugins/robot/src/composables/useChat.ts

@@ -1,6 +1,6 @@
 import { nextTick } from 'vue'
 import { STATUS, type ChatMessage } from '@opentiny/tiny-robot-kit'
-import { formatMessages, removeLoading, serializeError } from '../utils'
+import { formatMessages, removeLoading } from '../utils'
 import { getClientConfig as getConfig, updateClientConfig as updateConfig, client } from '../services/aiClient'
 import useModelConfig from './core/useConfig'
 import useMode from './modes/useMode'
@@ -107,11 +107,7 @@ const handleFinishRequest = async (finishReason, messages, contextMessages, mess
 
 const handleRequestError = async (error, messages, messageState) => {
   chatStatus = CHAT_STATUS.FINISHED
-
-  await onRequestEnd('error', messages.at(-1).content, messages) // 本次请求结束
-
-  messages.at(-1)!.renderContent.push({ type: 'text', content: serializeError(error) })
-
+  await onRequestEnd('error', messages.at(-1).content, messages, { error }) // 本次请求结束
   messageState.status = STATUS.ERROR
 }
 
@@ -173,27 +169,25 @@ const autoSetTitle = () => {
 }
 
 const sendUserMessage = async () => {
-  try {
-    nextTick(() => {
-      const assistantMessage: ChatMessage = {
-        role: 'assistant',
-        content: '',
-        renderContent: [{ type: getLoadingType() }]
-      }
-      messageManager.messages.value.push(assistantMessage)
-    })
-    await messageManager.send()
-    onMessageSent()
-    autoSetTitle()
-  } catch (error) {
-    removeLoading(messageManager.messages.value)
-    const lastMessage = messageManager.messages.value.at(-1)
-    if (lastMessage) {
-      lastMessage.renderContent.push({ type: 'text', content: serializeError(error) })
+  nextTick(() => {
+    const assistantMessage: ChatMessage = {
+      role: 'assistant',
+      content: '',
+      renderContent: [{ type: getLoadingType() }]
     }
-    // eslint-disable-next-line no-console
-    console.error(error)
+    messageManager.messages.value.push(assistantMessage)
+  })
+  await messageManager.send()
+  if (messageManager.messageState.status === STATUS.ERROR) {
+    removeLoading(messageManager.messages.value)
+    await handleRequestError(
+      messageManager.messageState.errorMsg,
+      messageManager.messages.value,
+      messageManager.messageState
+    )
   }
+  onMessageSent()
+  autoSetTitle()
 }
 
 const abortRequest = () => {

packages/plugins/robot/src/services/OpenAICompatibleProvider.ts

@@ -160,7 +160,11 @@ export class OpenAICompatibleProvider extends BaseModelProvider {
 
         if (!fetchResponse.ok) {
           const errorText = await fetchResponse.text()
-          throw new Error(`HTTP error! status: ${fetchResponse.status}, details: ${errorText}`)
+          const customError: any = new Error(
+            `HTTP error! status: ${fetchResponse.status}${errorText ? ', details: ' + errorText : ''}`
+          )
+          customError.response = fetchResponse
+          throw customError
         }
 
         if (isStream) {
@@ -218,7 +222,12 @@ export class OpenAICompatibleProvider extends BaseModelProvider {
 
     if (!response.ok) {
       const errorText = await response.text()
-      throw new Error(`HTTP error! status: ${response.status}, details: ${errorText}`)
+      const customError: any = new Error(
+        `HTTP error! status: ${response.status}${errorText ? ', details: ' + errorText : ''}`
+      )
+      customError.response = response
+
+      throw customError
     }
 
     return response
@@ -307,7 +316,7 @@ export class OpenAICompatibleProvider extends BaseModelProvider {
       if (signal?.aborted) {
         return
       }
-      handler.onError(this.toAIAdapterError(error))
+      throw error
     }
   }
 
@@ -335,8 +344,9 @@ export class OpenAICompatibleProvider extends BaseModelProvider {
     }
 
     if (httpClientType === 'axios' && axiosClient) {
+      this.httpClientType = 'axios'
       this.axiosClient = axiosClient
-    } else {
+    } else if (httpClientType) {
       this.httpClientType = 'fetch'
     }