better max tool block

zerob13 · zerob13 · commit ee1a1b556d24 · 2025-03-28T16:58:14.000+08:00
diff --git a/electron.vite.config.ts b/electron.vite.config.ts
@@ -45,6 +45,12 @@ export default defineConfig({
         plugins: [tailwind(), autoprefixer()]
       }
     },
-    plugins: [vue(), svgLoader(), vueDevTools()]
+    plugins: [
+      vue(),
+      svgLoader(),
+      vueDevTools({
+        launchEditor: 'cursor'
+      })
+    ]
   }
 })
diff --git a/src/main/presenter/llmProviderPresenter/baseProvider.ts b/src/main/presenter/llmProviderPresenter/baseProvider.ts
@@ -25,7 +25,7 @@ export interface ChatMessageContent {
 
 export abstract class BaseLLMProvider {
   // 最大工具调用次数限制
-  protected static readonly MAX_TOOL_CALLS = 20
+  protected static readonly MAX_TOOL_CALLS = 2
 
   protected provider: LLM_PROVIDER
   protected models: MODEL_META[] = []
diff --git a/src/main/presenter/llmProviderPresenter/providers/anthropicProvider.ts b/src/main/presenter/llmProviderPresenter/providers/anthropicProvider.ts
@@ -605,8 +605,7 @@ ${context}
                   // 检查是否达到最大工具调用次数
                   if (toolCallCount >= MAX_TOOL_CALLS) {
                     yield {
-                      content: `\n<maximum_tool_calls_reached count="${MAX_TOOL_CALLS}">\n`,
-                      reasoning_content: undefined
+                      maximum_tool_calls_reached: true
                     }
                     needContinueConversation = false
                     break
diff --git a/src/main/presenter/llmProviderPresenter/providers/geminiProvider.ts b/src/main/presenter/llmProviderPresenter/providers/geminiProvider.ts
@@ -678,7 +678,7 @@ export class GeminiProvider extends BaseLLMProvider {
           // 检查是否达到最大工具调用次数
           if (toolCallCount >= MAX_TOOL_CALLS) {
             yield {
-              content: `\n<maximum_tool_calls_reached count="${MAX_TOOL_CALLS}">\n`
+              maximum_tool_calls_reached: true
             }
             needContinueConversation = false
             break
diff --git a/src/main/presenter/llmProviderPresenter/providers/ollamaProvider.ts b/src/main/presenter/llmProviderPresenter/providers/ollamaProvider.ts
@@ -384,7 +384,7 @@ export class OllamaProvider extends BaseLLMProvider {
                 // 检查是否达到最大工具调用次数
                 if (toolCallCount >= MAX_TOOL_CALLS) {
                   yield {
-                    content: `\n<maximum_tool_calls_reached count="${MAX_TOOL_CALLS}">\n`
+                    maximum_tool_calls_reached: true
                   }
                   needContinueConversation = false
                   break
diff --git a/src/main/presenter/llmProviderPresenter/providers/openAICompatibleProvider.ts b/src/main/presenter/llmProviderPresenter/providers/openAICompatibleProvider.ts
@@ -462,7 +462,7 @@ export class OpenAICompatibleProvider extends BaseLLMProvider {
             // 检查是否达到最大工具调用次数
             if (toolCallCount >= MAX_TOOL_CALLS) {
               yield {
-                content: `\n<maximum_tool_calls_reached count="${MAX_TOOL_CALLS}">\n`
+                maximum_tool_calls_reached: true
               }
               needContinueConversation = false
               break
diff --git a/src/main/presenter/threadPresenter/index.ts b/src/main/presenter/threadPresenter/index.ts
@@ -227,7 +227,8 @@ export class ThreadPresenter implements IThreadPresenter {
         tool_call_id,
         tool_call_name,
         tool_call_params,
-        tool_call_response
+        tool_call_response,
+        maximum_tool_calls_reached
       } = msg
       const state = this.generatingMessages.get(eventId)
       if (state) {
@@ -239,6 +240,23 @@ export class ThreadPresenter implements IThreadPresenter {
           })
         }
 
+        // 处理工具调用达到最大次数的情况
+        if (maximum_tool_calls_reached) {
+          const lastBlock = state.message.content[state.message.content.length - 1]
+          if (lastBlock) {
+            lastBlock.status = 'success'
+          }
+          state.message.content.push({
+            type: 'action',
+            content: 'common.error.maximumToolCallsReached',
+            status: 'success',
+            timestamp: Date.now(),
+            action_type: 'maximum_tool_calls_reached'
+          })
+          await this.messageManager.editMessage(eventId, JSON.stringify(state.message.content))
+          return
+        }
+
         // 处理reasoning_content的时间戳
         if (reasoning_content) {
           if (state.reasoningStartTime === null) {
diff --git a/src/renderer/src/components/message/MessageBlockAction.vue b/src/renderer/src/components/message/MessageBlockAction.vue
@@ -0,0 +1,27 @@
+<template>
+  <div
+    class="text-xs bg-red-100 text-red-700 rounded-lg border border-red-400 flex flex-col gap-2 px-2 py-2"
+  >
+    <div class="flex flex-row gap-2 items-center cursor-pointer">
+      <Icon icon="lucide:info" class="w-4 h-4 text-red-700" />
+    </div>
+    <div class="prose prose-sm max-w-full break-all whitespace-pre-wrap leading-7">
+      {{ t(block.content) }}
+      {{ block }}
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from 'vue-i18n'
+import { Icon } from '@iconify/vue'
+
+const { t } = useI18n()
+
+defineProps<{
+  block: {
+    content: string
+    action_type?: string
+  }
+}>()
+</script>
diff --git a/src/renderer/src/components/message/MessageItemAssistant.vue b/src/renderer/src/components/message/MessageItemAssistant.vue
@@ -43,6 +43,7 @@
             :message-id="message.id"
             :thread-id="currentThreadId"
           />
+          <MessageBlockAction v-else-if="block.type === 'action'" :block="block" />
           <MessageBlockError v-else-if="block.type === 'error'" :block="block" />
         </div>
       </div>
@@ -78,7 +79,7 @@ import ModelIcon from '@/components/icons/ModelIcon.vue'
 import { Icon } from '@iconify/vue'
 import { toBlob } from 'html-to-image'
 import { useDark } from '@vueuse/core'
-
+import MessageBlockAction from './MessageBlockAction.vue'
 const props = defineProps<{
   message: AssistantMessage
 }>()
diff --git a/src/renderer/src/i18n/en-US/common.ts b/src/renderer/src/i18n/en-US/common.ts
@@ -20,7 +20,9 @@ export default {
     cleanMessagesFailed: 'Failed to clean messages',
     userCanceledGeneration: 'User canceled generation',
     sessionInterrupted: 'Session was unexpectedly interrupted, generation is incomplete',
-    noModelResponse: 'Model did not return any content, it may have timed out'
+    noModelResponse: 'Model did not return any content, it may have timed out',
+    invalidJson: 'Invalid JSON format',
+    maximumToolCallsReached: 'Maximum tool calls reached'
   },
   resetDataConfirmTitle: 'Reset All Data?',
   resetDataConfirmDescription:
diff --git a/src/renderer/src/i18n/ja-JP/common.ts b/src/renderer/src/i18n/ja-JP/common.ts
@@ -20,7 +20,9 @@ const common = {
     userCanceledGeneration: 'ユーザーが生成をキャンセルしました',
     sessionInterrupted: 'セッションが中断され、生成が完了しませんでした',
     cleanMessagesFailed: 'チャットメッセージのクリーンアップに失敗しました',
-    noModelResponse: 'モデルは何も返しませんでした。タイムアウトの可能性があります'
+    noModelResponse: 'モデルは何も返しませんでした。タイムアウトの可能性があります',
+    invalidJson: '無効なJSON形式',
+    maximumToolCallsReached: '最大のツール呼び出し回数に達しました'
   },
   resetDataConfirmTitle: 'すべてのデータをリセットしますか？',
   resetDataConfirmDescription:
diff --git a/src/renderer/src/i18n/ko-KR/common.ts b/src/renderer/src/i18n/ko-KR/common.ts
@@ -22,7 +22,8 @@ export default {
     userCanceledGeneration: '사용자가 생성을 취소했습니다',
     sessionInterrupted: '세션이 예기치 않게 중단되었습니다. 생성이 완료되지 않았습니다',
     noModelResponse: '모델에서 콘텐츠를 반환하지 않았습니다. 시간 초과되었을 수 있습니다',
-    invalidJson: '무효한 JSON 형식'
+    invalidJson: '무효한 JSON 형식',
+    maximumToolCallsReached: '최대 도구 호출 횟수에 도달했습니다'
   },
   resetDataConfirmTitle: '모든 데이터 초기화?',
   resetDataConfirmDescription:
diff --git a/src/renderer/src/i18n/ru-RU/common.ts b/src/renderer/src/i18n/ru-RU/common.ts
@@ -20,7 +20,9 @@ export default {
     userCanceledGeneration: 'Пользователь отменил генерацию',
     sessionInterrupted: 'Сессия прервана, генерация не завершена',
     noModelResponse: 'Модель не вернула никаких данных, возможно, истекло время ожидания',
-    cleanMessagesFailed: 'Не удалось очистить сообщения чата'
+    cleanMessagesFailed: 'Не удалось очистить сообщения чата',
+    invalidJson: 'Неверный JSON формат',
+    maximumToolCallsReached: 'Достигнуто максимальное количество вызовов инструментов'
   },
   resetDataConfirmTitle: 'Сбросить все данные?',
   resetDataConfirmDescription:
diff --git a/src/renderer/src/i18n/zh-CN/common.ts b/src/renderer/src/i18n/zh-CN/common.ts
@@ -22,7 +22,8 @@ export default {
     userCanceledGeneration: '用户取消了生成',
     sessionInterrupted: '会话意外中断，生成未完成',
     noModelResponse: '模型未返回任何内容，可能是超时了',
-    invalidJson: '无效的JSON格式'
+    invalidJson: '无效的JSON格式',
+    maximumToolCallsReached: '达到最大工具调用次数'
   },
   resetDataConfirmTitle: '确定要重置所有数据吗？',
   resetDataConfirmDescription: '这将会把所有数据恢复到默认设置。此操作无法撤销。',
diff --git a/src/renderer/src/i18n/zh-HK/common.ts b/src/renderer/src/i18n/zh-HK/common.ts
@@ -20,7 +20,9 @@ export default {
     userCanceledGeneration: '用戶取消了生成',
     sessionInterrupted: '會話意外中斷，生成未完成',
     noModelResponse: '模型未返回任何內容，可能是超時了',
-    cleanMessagesFailed: '清空會話消息失敗'
+    cleanMessagesFailed: '清空會話消息失敗',
+    invalidJson: '無效的JSON格式',
+    maximumToolCallsReached: '達到最大工具調用次數'
   },
   resetDataConfirmTitle: '確定要重置所有數據嗎？',
   resetDataConfirmDescription: '這將會把所有數據恢復到默認設置。此操作無法撤銷。',
diff --git a/src/renderer/src/i18n/zh-TW/common.ts b/src/renderer/src/i18n/zh-TW/common.ts
@@ -22,7 +22,8 @@ export default {
     userCanceledGeneration: '使用者取消了生成',
     sessionInterrupted: '工作階段意外中斷，生成未完成',
     noModelResponse: '模型沒有回應，可能已逾時',
-    invalidJson: '無效的JSON格式'
+    invalidJson: '無效的JSON格式',
+    maximumToolCallsReached: '達到最大工具調用次數'
   },
   resetDataConfirmTitle: '確定要重設所有資料嗎？',
   resetDataConfirmDescription: '這將會把所有資料還原到預設設定。此操作無法復原。',
diff --git a/src/renderer/src/stores/chat.ts b/src/renderer/src/stores/chat.ts
@@ -428,14 +428,29 @@ export const useChatStore = defineStore('chat', () => {
     tool_call_name?: string
     tool_call_params?: string
     tool_call_response?: string
+    maximum_tool_calls_reached?: boolean
   }) => {
     // 从缓存中查找消息
     const cached = generatingMessagesCache.value.get(msg.eventId)
     if (cached) {
       const curMsg = cached.message as AssistantMessage
       if (curMsg.content) {
+        // 处理工具调用达到最大次数的情况
+        if (msg.maximum_tool_calls_reached) {
+          const lastBlock = curMsg.content[curMsg.content.length - 1]
+          if (lastBlock) {
+            lastBlock.status = 'success'
+          }
+          curMsg.content.push({
+            type: 'action',
+            content: 'common.error.maximumToolCallsReached',
+            status: 'success',
+            timestamp: Date.now(),
+            action_type: 'maximum_tool_calls_reached'
+          })
+        }
         // 处理工具调用标签内容
-        if (msg.content && msg.content.includes('<tool_call')) {
+        else if (msg.content && msg.content.includes('<tool_call')) {
           // 检查是否为工具调用开始
           if (msg.content.includes('<tool_call_start') && msg.tool_call_name) {
             // 创建新的工具调用块
diff --git a/src/shared/chat.d.ts b/src/shared/chat.d.ts
@@ -58,7 +58,7 @@ export type MessageFile = {
 }
 
 export type AssistantMessageBlock = {
-  type: 'content' | 'search' | 'reasoning_content' | 'error' | 'tool_call'
+  type: 'content' | 'search' | 'reasoning_content' | 'error' | 'tool_call' | 'action'
   content?: string
   extra?: Record<string, string | number | object[]>
   status: 'success' | 'loading' | 'cancel' | 'error' | 'reading' | 'optimizing'
@@ -76,6 +76,7 @@ export type AssistantMessageBlock = {
     language?: string
   }
   tool_call?: { id?: string; name?: string; params?: string; response?: string }
+  action_type?: 'tool_call_permission' | 'maximum_tool_calls_reached'
 }
 // 搜索相关的消息块类型
 export type SearchBlock = {
diff --git a/src/shared/presenter.d.ts b/src/shared/presenter.d.ts
@@ -472,6 +472,7 @@ export type LLMResponseStream = {
   tool_call_params?: string
   tool_call_response?: string
   tool_call_id?: string
+  maximum_tool_calls_reached?: boolean
 }
 export interface IUpgradePresenter {
   checkUpdate(): Promise<void>

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,12 @@ export default defineConfig({`
`45`	`45`	`plugins: [tailwind(), autoprefixer()]`
`46`	`46`	`}`
`47`	`47`	`},`
`48`		`- plugins: [vue(), svgLoader(), vueDevTools()]`
	`48`	`+ plugins: [`
	`49`	`+ vue(),`
	`50`	`+ svgLoader(),`
	`51`	`+ vueDevTools({`
	`52`	`+ launchEditor: 'cursor'`
	`53`	`+ })`
	`54`	`+ ]`
`49`	`55`	`}`
`50`	`56`	`})`
Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,7 @@ export class GeminiProvider extends BaseLLMProvider {`
`678`	`678`	`// 检查是否达到最大工具调用次数`
`679`	`679`	`if (toolCallCount >= MAX_TOOL_CALLS) {`
`680`	`680`	`yield {`
`681`		- content: `\n<maximum_tool_calls_reached count="${MAX_TOOL_CALLS}">\n`
	`681`	`+ maximum_tool_calls_reached: true`
`682`	`682`	`}`
`683`	`683`	`needContinueConversation = false`
`684`	`684`	`break`
Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ export class OllamaProvider extends BaseLLMProvider {`
`384`	`384`	`// 检查是否达到最大工具调用次数`
`385`	`385`	`if (toolCallCount >= MAX_TOOL_CALLS) {`
`386`	`386`	`yield {`
`387`		- content: `\n<maximum_tool_calls_reached count="${MAX_TOOL_CALLS}">\n`
	`387`	`+ maximum_tool_calls_reached: true`
`388`	`388`	`}`
`389`	`389`	`needContinueConversation = false`
`390`	`390`	`break`
Original file line number	Diff line number	Diff line change
`@@ -462,7 +462,7 @@ export class OpenAICompatibleProvider extends BaseLLMProvider {`
`462`	`462`	`// 检查是否达到最大工具调用次数`
`463`	`463`	`if (toolCallCount >= MAX_TOOL_CALLS) {`
`464`	`464`	`yield {`
`465`		- content: `\n<maximum_tool_calls_reached count="${MAX_TOOL_CALLS}">\n`
	`465`	`+ maximum_tool_calls_reached: true`
`466`	`466`	`}`
`467`	`467`	`needContinueConversation = false`
`468`	`468`	`break`