From d1e19aad516359c3b8343a3b1f45a15509403be4 Mon Sep 17 00:00:00 2001 From: SuYao Date: Fri, 15 Aug 2025 09:28:43 +0800 Subject: [PATCH] fix: unexpected loading (#9193) fix --- src/renderer/src/services/ApiService.ts | 8 +++----- .../messageStreaming/callbacks/citationCallbacks.ts | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/renderer/src/services/ApiService.ts b/src/renderer/src/services/ApiService.ts index da83fdb660..d447fa7322 100644 --- a/src/renderer/src/services/ApiService.ts +++ b/src/renderer/src/services/ApiService.ts @@ -104,9 +104,9 @@ async function fetchExternalTool( const showListTools = enabledMCPs && enabledMCPs.length > 0 // 是否使用工具 - const hasAnyTool = shouldWebSearch || shouldKnowledgeSearch || shouldSearchMemory || showListTools + const hasAnyTool = shouldWebSearch || shouldKnowledgeSearch || showListTools - // 在工具链开始时发送进度通知 + // 在工具链开始时发送进度通知（不包括记忆搜索） if (hasAnyTool) { onChunkReceived({ type: ChunkType.EXTERNEL_TOOL_IN_PROGRESS }) } @@ -456,8 +456,6 @@ export async function fetchChatCompletion({ const { mcpTools } = await fetchExternalTool(lastUserMessage, assistant, onChunkReceived, lastAnswer) const model = assistant.model || getDefaultModel() - onChunkReceived({ type: ChunkType.LLM_RESPONSE_CREATED }) - const { maxTokens, contextCount } = getAssistantSettings(assistant) const filteredMessages2 = filterUsefulMessages(filteredMessages1) @@ -488,7 +486,7 @@ export async function fetchChatCompletion({ isGenerateImageModel(model) && (isSupportedDisableGenerationModel(model) ? assistant.enableGenerateImage : true) // --- Call AI Completions --- - + onChunkReceived({ type: ChunkType.LLM_RESPONSE_CREATED }) const completionsParams: CompletionsParams = { callType: 'chat', messages: _messages, diff --git a/src/renderer/src/services/messageStreaming/callbacks/citationCallbacks.ts b/src/renderer/src/services/messageStreaming/callbacks/citationCallbacks.ts index 56d0680839..9ba743b2cd 100644 --- a/src/renderer/src/services/messageStreaming/callbacks/citationCallbacks.ts +++ b/src/renderer/src/services/messageStreaming/callbacks/citationCallbacks.ts @@ -40,6 +40,7 @@ export const createCitationCallbacks = (deps: CitationCallbacksDependencies) => status: MessageBlockStatus.SUCCESS } blockManager.smartBlockUpdate(citationBlockId, changes, MessageBlockType.CITATION, true) + citationBlockId = null } else { logger.error('[onExternalToolComplete] citationBlockId is null. Cannot update.') }